Changeset 3330:cd9381e6be7b

Timestamp:

08/30/16 16:21:38 (9 years ago)

Author:

franck <carnet.franck.paul@…>

Branch:

default

Message:

Rich-text-editor (xhtml) may be disabled for Blog/Category? description, widget's textareas, …

Files:

• admin/blog_pref.php (modified) (2 diffs)
• admin/category.php (modified) (1 diff)
• admin/preferences.php (modified) (5 diffs)
• locales/fr/main.po (modified) (1 diff)
• locales/fr/plugins.po (modified) (1 diff)
• plugins/widgets/_admin.php (modified) (2 diffs)
• plugins/widgets/_define.php (modified) (1 diff)
• plugins/widgets/index.php (modified) (1 diff)

admin/blog_pref.php

@@ -313 +313 @@
 
 $desc_editor = $core->auth->getOption('editor');
+$rte_flag = true;
+$rte_flags  = @$core->auth->user_prefs->interface->rte_flags;
+if (is_array($rte_flags) && in_array('blog_descr',$rte_flags)) {
+     $rte_flag = $rte_flags['blog_descr'];
+}
 
 dcPage::open(__('Blog settings'),
@@ -324 +329 @@
      "</script>".
      dcPage::jsConfirmClose('blog-form').
-     $core->callBehavior('adminPostEditor',$desc_editor['xhtml'],'blog_desc',array('#blog_desc'),'xhtml').
+     ($rte_flag ? $core->callBehavior('adminPostEditor',$desc_editor['xhtml'],'blog_desc',array('#blog_desc'),'xhtml') : '').
      dcPage::jsLoad('js/_blog_pref.js').
-
 
      # --BEHAVIOR-- adminBlogPreferencesHeaders

admin/category.php

@@ -175 +175 @@
 
 $category_editor = $core->auth->getOption('editor');
+$rte_flag = true;
+$rte_flags  = @$core->auth->user_prefs->interface->rte_flags;
+if (is_array($rte_flags) && in_array('cat_descr',$rte_flags)) {
+     $rte_flag = $rte_flags['cat_descr'];
+}
 
 dcPage::open($title,
      dcPage::jsConfirmClose('category-form').
      dcPage::jsLoad('js/_category.js').
-     $core->callBehavior('adminPostEditor',$category_editor['xhtml'],'category',array('#cat_desc'),'xhtml'),
+     ($rte_flag ? $core->callBehavior('adminPostEditor',$category_editor['xhtml'],'category',array('#cat_desc'),'xhtml') : ''),
      dcPage::breadcrumb($elements)
 );

admin/preferences.php

@@ -98 +98 @@
 # Language codes
 $lang_combo = dcAdminCombos::getAdminLangsCombo();
+
+# Get 3rd parts xhtml editor flags
+$rte = array(
+     'blog_descr' => array(true,__('Blog description (in blog parameters)')),
+     'cat_descr' => array(true,__('Category description'))
+);
+$rte = new ArrayObject($rte);
+$core->callBehavior('adminRteFlags',$core,$rte);
+# Load user settings
+$rte_flags = @$core->auth->user_prefs->interface->rte_flags;
+if (is_array($rte_flags)) {
+     foreach ($rte_flags as $fk => $fv) {
+          if (isset($rte[$fk])) {
+               $rte[$fk][0] = $fv;
+          }
+     }
+}
 
 # Get default colums (admin lists)
@@ -233 +250 @@
           }
           $core->auth->user_prefs->interface->put('cols',$cu,'array');
+
+          # Update user xhtml editor flags
+          $rf = array();
+          foreach ($rte as $rk => $rv) {
+               $rf[$rk] = isset($_POST['rte_flags']) && in_array($rk,$_POST['rte_flags'],true) ? true : false;
+          }
+          $core->auth->user_prefs->interface->put('rte_flags',$rf,'array');
 
           # Update user
@@ -501 +525 @@
 '<div class="fieldset">'.
 '<h4>'.__('Optional columns displayed in lists').'</h4>';
+$odd = true;
 foreach ($cols as $col_type => $col_list) {
+     echo '<div class="two-boxes '.($odd ? 'odd' : 'even').'">';
      echo '<h5>'.$col_list[0].'</h5>';
      foreach ($col_list[1] as $col_name => $col_data) {
           echo
-          '<p><label for="cols_'.$col_type.'-"'.$col_name.'" class="classic">'.
+          '<p><label for="cols_'.$col_type.'-'.$col_name.'" class="classic">'.
           form::checkbox(array('cols_'.$col_type.'[]','cols_'.$col_type.'-'.$col_name),$col_name,$col_data[0]).$col_data[1].'</label>';
      }
+     echo '</div>';
+     $odd = !$odd;
 }
 echo '</div>';
@@ -515 +543 @@
 '<h4>'.__('Edition').'</h4>';
 
+echo '<div class="two-boxes odd">';
 foreach ($format_by_editors as $format => $editors) {
      echo
@@ -544 +573 @@
 
 '</div>';
+
+echo '<div class="two-boxes even">';
+echo '<h5>'.__('Use xhtml editor for:').'</h5>';
+foreach ($rte as $rk => $rv) {
+     echo
+          '<p><label for="rte_'.$rk.'" class="classic">'.
+          form::checkbox(array('rte_flags[]','rte_'.$rk),$rk,$rv[0]).$rv[1].'</label>';
+}
+echo '</div>';
+
+echo '</div>'; // fieldset
 
 echo

locales/fr/main.po

@@ -2228 +2228 @@
 msgstr "Afficher la barre d'outil des éditeurs en bas de la zone de saisie (si possible)"
 
+msgid "Use xhtml editor for:"
+msgstr "Utiliser l'éditeur xhtml pour :"
+
+msgid "Blog description (in blog parameters)"
+msgstr "La description du blog (paramètres du blog)"
+
+msgid "Category description"
+msgstr "La description des catégories"
+
 msgid "Other options"
 msgstr "Autres options"

locales/fr/plugins.po

@@ -2440 +2440 @@
 msgid "Search:"
 msgstr "Recherche :"
+
+msgid "Widget's textareas"
+msgstr "Les zones de texte multilignes des widgets"

plugins/widgets/_admin.php

@@ -12 +12 @@
 if (!defined('DC_CONTEXT_ADMIN')) { return; }
 
-$core->addBehavior('adminDashboardFavorites','widgets_dashboard_favorites');
-
-function widgets_dashboard_favorites($core,$favs)
-{
-     $favs->register('widgets', array(
-          'title' => __('Presentation widgets'),
-          'url' => $core->adminurl->get('admin.plugin.widgets'),
-          'small-icon' => dcPage::getPF('widgets/icon.png'),
-          'large-icon' => dcPage::getPF('widgets/icon-big.png'),
-     ));
-}
+$core->addBehavior('adminDashboardFavorites',array('widgetsBehaviors','widgets_dashboard_favorites'));
+$core->addBehavior('adminRteFlags',array('widgetsBehaviors','adminRteFlags'));
 
 $_menu['Blog']->addItem(__('Presentation widgets'),
@@ -29 +20 @@
           preg_match('/'.preg_quote($core->adminurl->get('admin.plugin.widgets')).'(&.*)?$/',$_SERVER['REQUEST_URI']),
           $core->auth->check('admin',$core->blog->id));
+
+class widgetsBehaviors
+{
+     public static function widgets_dashboard_favorites($core,$favs)
+     {
+          $favs->register('widgets', array(
+               'title' => __('Presentation widgets'),
+               'url' => $core->adminurl->get('admin.plugin.widgets'),
+               'small-icon' => dcPage::getPF('widgets/icon.png'),
+               'large-icon' => dcPage::getPF('widgets/icon-big.png'),
+          ));
+     }
+
+     public static function adminRteFlags($core,$rte)
+     {
+          $rte['widgets_text'] = array(true,__('Widget\'s textareas'));
+     }
+}

plugins/widgets/_define.php

@@ -16 +16 @@
      /* Description*/         "Widgets for your blog sidebars",
      /* Author */             "Olivier Meunier & Dotclear Team",
-     /* Version */            '3.3',
+     /* Version */            '3.4',
      array(
           'permissions' =>    'admin',

plugins/widgets/index.php

@@ -236 +236 @@
   <?php
           $widget_editor = $core->auth->getOption('editor');
-          echo $core->callBehavior('adminPostEditor',$widget_editor['xhtml'],'widget',array('#sidebarsWidgets textarea'),'xhtml');
+          $rte_flag = true;
+          $rte_flags  = @$core->auth->user_prefs->interface->rte_flags;
+          if (is_array($rte_flags) && in_array('widgets_text',$rte_flags)) {
+               $rte_flag = $rte_flags['widgets_text'];
+          }
+          if ($rte_flag) {
+               echo $core->callBehavior('adminPostEditor',$widget_editor['xhtml'],'widget',array('#sidebarsWidgets textarea'),'xhtml');
+          }
   ?>
   <?php echo(dcPage::jsConfirmClose('sidebarsWidgets')); ?>