Changeset 3090:e4c0a9a29852

Timestamp:

09/08/15 09:16:32 (10 years ago)

Author:

Nicolas <nikrou77@…>

Branch:

default

Message:

Users can now add a background text color button using ckeditor

Location:

plugins/dcCKEditor

Files:

• _define.php (modified) (1 diff)
• _install.php (modified) (1 diff)
• _post_config.php (modified) (3 diffs)
• inc/_config.php (modified) (1 diff)
• index.php (modified) (1 diff)
• locales/fr/main.po (modified) (1 diff)
• tpl/index.tpl (modified) (1 diff)

plugins/dcCKEditor/_define.php

@@ -16 +16 @@
      /* Description*/         "dotclear CKEditor integration",
      /* Author */             "dotclear Team",
-     /* Version */            "1.0.3",
+     /* Version */            "1.1.0",
      array(
           'permissions' =>    'usage,contentadmin',

plugins/dcCKEditor/_install.php

@@ -25 +25 @@
 $settings->dcckeditor->put('list_buttons', true, 'boolean', 'Add list buttons?', false, true);
 $settings->dcckeditor->put('textcolor_button', false, 'boolean', 'Add text color button?', false, true);
+$settings->dcckeditor->put('background_textcolor_button', false, 'boolean', 'Add background text color button?', false, true);
 $settings->dcckeditor->put('cancollapse_button', false, 'boolean', 'Add collapse button?', false, true);
 $settings->dcckeditor->put('format_select', true, 'boolean', 'Add format selection?', false, true);

plugins/dcCKEditor/_post_config.php

@@ -96 +96 @@
      CKEDITOR.plugins.addExternal('media',dotclear.dcckeditor_plugin_url+'/js/ckeditor-plugins/media/');
      CKEDITOR.plugins.addExternal('img',dotclear.dcckeditor_plugin_url+'/js/ckeditor-plugins/img/');
+     <?php if (!empty($dcckeditor_textcolor_button) || !empty($dcckeditor_background_textcolor_button)):?>
+     // button add "More Colors..." can be added if colordialog plugin is enabled
+     CKEDITOR.config.colorButton_enableMore = true;
+     <?php endif;?>
 
 <?php if (!empty($extraPlugins) && count($extraPlugins)>0) {
@@ -120 +124 @@
           // format tags
 <?php if (!empty($dcckeditor_format_tags)):?>
-        format_tags: '<?php echo $dcckeditor_format_tags;?>',
+          format_tags: '<?php echo $dcckeditor_format_tags;?>',
 <?php else:?>
           format_tags: 'p;h1;h2;h3;h4;h5;h6;pre;address',
@@ -178 +182 @@
                          'Source'
 <?php if (!empty($dcckeditor_textcolor_button)):?>
-                ,'TextColor'
+                         ,'TextColor'
+<?php endif;?>
+<?php if (!empty($dcckeditor_background_textcolor_button)):?>
+                         ,'BGColor'
 <?php endif;?>
                     ]
                },
-            {
-                name: 'special',
-                items: [
-                    'Maximize'
-                ]
-            },
+               {
+                    name: 'special',
+                    items: [
+                         'Maximize'
+                    ]
+               },
                <?php // add extra buttons comming from dotclear plugins
                if (!empty($extraPlugins) && count($extraPlugins)>0) {

plugins/dcCKEditor/inc/_config.php

@@ -30 +30 @@
                $dcckeditor_textcolor_button = (empty($_POST['dcckeditor_textcolor_button']))?false:true;
                $core->blog->settings->dcckeditor->put('textcolor_button', $dcckeditor_textcolor_button, 'boolean');
+
+               $dcckeditor_background_textcolor_button = (empty($_POST['dcckeditor_background_textcolor_button']))?false:true;
+               $core->blog->settings->dcckeditor->put('background_textcolor_button', $dcckeditor_background_textcolor_button, 'boolean');
 
                $dcckeditor_cancollapse_button = (empty($_POST['dcckeditor_cancollapse_button']))?false:true;

plugins/dcCKEditor/index.php

@@ -20 +20 @@
 $dcckeditor_list_buttons = $core->blog->settings->dcckeditor->list_buttons;
 $dcckeditor_textcolor_button = $core->blog->settings->dcckeditor->textcolor_button;
+$dcckeditor_background_textcolor_button = $core->blog->settings->dcckeditor->background_textcolor_button;
 $dcckeditor_cancollapse_button = $core->blog->settings->dcckeditor->cancollapse_button;
 $dcckeditor_format_select = $core->blog->settings->dcckeditor->format_select;

plugins/dcCKEditor/locales/fr/main.po

@@ -50 +50 @@
 msgstr "Ajouter le bouton pour changer la couleur du texte"
 
+#: tpl/index.tpl:37
+msgid "Add background text color button"
+msgstr "Ajouter le bouton pour changer la couleur de fond du texte"
+
 #: tpl/index.tpl:41
 msgid "Add collapse button"

plugins/dcCKEditor/tpl/index.tpl

@@ -33 +33 @@
        <?php echo form::checkbox('dcckeditor_textcolor_button', 1, $dcckeditor_textcolor_button); ?>
        <label class="classic" for="dcckeditor_textcolor_button">&nbsp;<?php echo __('Add text color button');?></label>
+     </p>
+     <p>
+       <?php echo form::checkbox('dcckeditor_background_textcolor_button', 1, $dcckeditor_background_textcolor_button); ?>
+       <label class="classic" for="dcckeditor_background_textcolor_button">&nbsp;<?php echo __('Add background text color button');?></label>
      </p>
      <p>