Changeset 2348

Timestamp:

06/10/10 07:53:30 (13 years ago)

Author:

Osku

Message:

smiliesEditor 0.4.1 :

• use full image URL in admin page with $core->blog->host (closes #468)
• add option to set public label (closes #467)

Location:

plugins/smiliesEditor

Files:

• _admin.php (modified) (2 diffs)
• _define.php (modified) (1 diff)
• _public.php (modified) (3 diffs)
• index.php (modified) (7 diffs)

plugins/smiliesEditor/_admin.php

@@ -81 +81 @@
                     $res .= "jsToolBar.prototype.elements.smilieseditor_s".$id." = {type: 'button', title: '".html::escapeJS($smiley['code'])."', fn:{} }; ".
                          //"jsToolBar.prototype.elements.smilieseditor_s".$id.".context = 'post'; ".
-                         "jsToolBar.prototype.elements.smilieseditor_s".$id.".icon = '".html::escapeJS($sE->smilies_base_url.$smiley['name'])."'; ".
+                         "jsToolBar.prototype.elements.smilieseditor_s".$id.".icon = '".html::escapeJS($core->blog->host.$sE->smilies_base_url.$smiley['name'])."'; ".
                          "jsToolBar.prototype.elements.smilieseditor_s".$id.".fn.wiki = function() { this.encloseSelection('".html::escapeJS($smiley['code'])."  ',''); }; ".
                          "jsToolBar.prototype.elements.smilieseditor_s".$id.".fn.xhtml = function() { this.encloseSelection('".html::escapeJS($smiley['code'])."  ',''); }; ".
@@ -91 +91 @@
                }
           $res .= "//]]></script>\n";
+
           return $res;
      }

plugins/smiliesEditor/_define.php

@@ -17 +17 @@
      /* Description*/         "Smilies Editor",
      /* Author */             "Osku and contributors",
-     /* Version */            '0.3.8',
+     /* Version */            '0.4.1',
      /* Permissions */        'contentadmin'
 );

plugins/smiliesEditor/_public.php

@@ -35 +35 @@
      {
           global $core;
-          if (!version_compare(DC_VERSION,'2.2-alpha','<')) { 
+     
+          if (!version_compare(DC_VERSION,'2.2-alpha','>=')) { 
+               $use_smilies =  (boolean) $core->blog->settings->use_smilies; 
+               $smilies_bar_flag = (boolean) $core->blog->settings->smilies_bar_flag;
+          } else { 
                $use_smilies = (boolean) $core->blog->settings->system->use_smilies; 
                $smilies_bar_flag = (boolean) $core->blog->settings->smilieseditor->smilies_bar_flag;
-          } else { 
-               $use_smilies =  (boolean) $core->blog->settings->use_smilies; 
-               $smilies_bar_flag = (boolean) $core->blog->settings->smilies_bar_flag;
           }
           
@@ -56 +57 @@
           global $core;
           
-          if (!version_compare(DC_VERSION,'2.2-alpha','<')) { 
+          if (!version_compare(DC_VERSION,'2.2-alpha','>=')) { 
+               $use_smilies =  (boolean) $core->blog->settings->use_smilies; 
+               $smilies_bar_flag = (boolean) $core->blog->settings->smilies_bar_flag;
+               $public_text = $core->blog->settings->smilies_public_text;
+          } else { 
                $use_smilies = (boolean) $core->blog->settings->system->use_smilies; 
                $smilies_bar_flag = (boolean) $core->blog->settings->smilieseditor->smilies_bar_flag;
-          } else { 
-               $use_smilies =  (boolean) $core->blog->settings->use_smilies; 
-               $smilies_bar_flag = (boolean) $core->blog->settings->smilies_bar_flag;
+               $public_text = $core->blog->settings->smilieseditor->smilies_public_text;
           }
           if (!$smilies_bar_flag || !$use_smilies) {
@@ -70 +73 @@
           $sE = new smiliesEditor($core);
           $smilies = $sE->getSmilies();
-          $field = '<p class="field smilies"><label>'.(__('Smilies')).'&nbsp;:</label><span>%s</span></p>';
+          $field = '<p class="field smilies"><label>'.html::escapeHTML($public_text).'&nbsp;:</label><span>%s</span></p>';
           
           $res = '';

plugins/smiliesEditor/index.php

@@ -41 +41 @@
 $smilies_bar_flag = (boolean)$s->smilies_bar_flag;
 $smilies_preview_flag = (boolean)$s->smilies_preview_flag;
+$smilies_public_text = $s->smilies_public_text;
+
 
 // Get theme Infos
@@ -79 +81 @@
      try
      {
-
           $show = (empty($_POST['smilies_bar_flag']))?false:true;
           $preview = (empty($_POST['smilies_preview_flag']))?false:true;
+          $formtext = (empty($_POST['smilies_public_text']))? __('Smilies') : $_POST['smilies_public_text'];
 
           $s->put('smilies_bar_flag',$show,'boolean');
           $s->put('smilies_preview_flag',$preview,'boolean');
+          $s->put('smilies_public_text',$formtext,'string');
           
           $core->blog->triggerBlog();
@@ -318 +321 @@
        <script type="text/javascript">
        //<![CDATA[
-       <?php echo dcPage::jsVar('dotclear.smilies_base_url',$o->smilies_base_url);?>
+       <?php echo dcPage::jsVar('dotclear.smilies_base_url',$core->blog->host.$o->smilies_base_url);?>
        dotclear.msg.confirm_image_delete = '<?php echo html::escapeJS(sprintf(__('Are you sure you want to remove these %s ?'),'images')) ?>';
        $(function() {
@@ -414 +417 @@
           '<fieldset>'.
                '<legend>'.__('Smilies configuration').'</legend>'.
-                    '<div>'.
-                         '<p class="field">'.
+                    '<div class="two-cols">'.
+                         '<p>'.
+                              sprintf(__('Don\'t forget to <a href="%s">display smilies</a> on your blog configuration.'),'blog_pref.php').
+                         '</p>'.
+                         '<p class="col">'.
                               form::checkbox('smilies_bar_flag', '1', $smilies_bar_flag).
-                              '<label class=" classic" for="smilies_bar_flag">'.__('Show toolbar smilies').'</label>'.
+                              '<label class="classic" for="smilies_bar_flag">'.__('Show toolbar smilies').'</label>'.
                          '</p>'.
-                         '<p class="field">'.
+                         '<p class="col">'.
                               form::checkbox('smilies_preview_flag', '1', $smilies_preview_flag).
                               '<label class=" classic" for="smilies_preview_flag">'.__('Show smilies on preview').'</label>'.
                          '</p>'.
-                         '<p class="form-note">'.
-                              sprintf(__('Don\'t forget to <a href="%s">display smilies</a> on your blog configuration.'),'blog_pref.php').
+
+                         '<p class="clear">'.
+                              '<label class="required classic" for="smilies_preview_flag">'.__('Public form text:').'</label>&nbsp;&nbsp;'.
+                              form::field('smilies_public_text', 50,255,html::escapeHTML($smilies_public_text)).
+
                          '</p>'.
-                         '<p>'.
+                         '<p class="clear">'.
                               form::hidden(array('p'),'smiliesEditor').
                               $core->formNonce().
@@ -471 +480 @@
           '<td class="minimal status">'.form::checkbox(array('select[]'),$k).'</td>'.
           '<td class="minimal">'.form::field(array('code[]','c'.$k),10,255,html::escapeHTML($v['code']),'','',$disabled).'</td>'.
-          '<td class="minimal smiley"><img src="'.$o->smilies_base_url.$v['name'].'" alt="'.$v['code'].'" /></td>'.
+          '<td class="minimal smiley"><img src="'.$core->blog->host.$o->smilies_base_url.$v['name'].'" alt="'.$v['code'].'" /></td>'.
           '<td class="nowrap">'.form::combo(array('name[]','n'.$k),$smileys_list,$v['name'],'','',$disabled).'</td>'.
           '<td class="nowrap status">'.$status.'</td>'.
@@ -517 +526 @@
      {
           $val = array_values($images_all);
-          $preview_smiley = '<img class="smiley" src="'.$val[0]['url'].'" alt="'.$val[0]['name'].'" title="'.$val[0]['name'].'" id="smiley-preview" />';
+          $preview_smiley = '<img class="smiley" src="'.$core->blog->host.$val[0]['url'].'" alt="'.$val[0]['name'].'" title="'.$val[0]['name'].'" id="smiley-preview" />';
 
           echo
@@ -571 +580 @@
           foreach ($o->images_list as $k => $v)
           {
-               echo '<img src="'.$v['url'].'" alt="'.$v['name'].'" title="'.$v['name'].'" />';
+               echo '<img src="'.$core->blog->host.$v['url'].'" alt="'.$v['name'].'" title="'.$v['name'].'" />';
           }
           echo '</p>';