Changeset 2736:09dd799a19bd for admin

Timestamp:

08/25/14 09:20:20 (11 years ago)

Author:

Nicolas <nikrou77@…>

Branch:

default

Message:

Addresses #1896
Preferences: one editor for each available formats.

Location:

admin

Files:

• js/_preferences.js (modified) (1 diff)
• post.php (modified) (6 diffs)
• preferences.php (modified) (5 diffs)

admin/js/_preferences.js

@@ -20 +20 @@
           return true;
      });
-
-     // choose format depending of editor based on formats_by_editor defined in preferences.php
-     if (formats_by_editor !== undefined) {
-          var _editors = $.parseJSON(formats_by_editor);
-     
-          $('#user_editor').change(function() {
-               if (!_editors[$(this).val()]) {return;}
-               
-               $('#user_post_format option').remove();
-               for (var format in _editors[$(this).val()]) {
-                    $('#user_post_format').append('<option value="'+format+'">'+format+'</option>');
-               }
-          });
-     }
 });

admin/post.php

@@ -60 +60 @@
 $img_status_pattern = '<img class="img_select_option" alt="%1$s" title="%1$s" src="images/%2$s" />';
 
-# Formaters combo
-$formaters_combo = dcAdminCombos::getFormatersCombo();
-foreach ($formaters_combo as $editor => $formats) {
+# Formats combo
+$core_formaters = $core->getFormaters();
+$available_formats = array('' => '');
+foreach ($core_formaters as $editor => $formats) {
      foreach ($formats as $format) {
-          $formaters_combo[$editor][$format] = "$editor:$format";
-     }
+        $available_formats[$format] = $format;
+    }
 }
 
@@ -78 +79 @@
 $TB = new dcTrackback($core);
 $tb_urls = $tb_excerpt = '';
-
-if (count($formaters_combo)==0 || !$core->auth->getOption('editor') || $core->auth->getOption('editor')=='') {
-     dcPage::addNotice("message",
-                           sprintf(__('Choose an active editor in %s.'),
-                                          '<a href="'.$core->adminurl->get("admin.user.preferences").'#user-options">'.__('your preferences').'</a>'
-                                          )
-                           );
-}
 
 # Get entry informations
@@ -195 +188 @@
 # Format excerpt and content
 elseif (!empty($_POST) && $can_edit_post) {
-    list(, $post_format) = explode(':', $_POST['post_format']);
+     $post_format = $_POST['post_format'];
      $post_excerpt = $_POST['post_excerpt'];
      $post_content = $_POST['post_content'];
@@ -382 +375 @@
 
 $admin_post_behavior = '';
-if (($core->auth->getOption('editor')==$post_editor)
-    && in_array($post_format, $core->getFormaters($core->auth->getOption('editor')))) {
-    $admin_post_behavior = $core->callBehavior('adminPostEditor');
+if (!empty($core->auth->getOption('editor')) && !empty($core->auth->getOption('editor')[$post_format])) {
+     $admin_post_behavior = $core->callBehavior('adminPostEditor', $core->auth->getOption('editor')[$post_format]);
 }
 
@@ -461 +453 @@
 -------------------------------------------------------- */
 if ($can_edit_post) {
-     if (count($formaters_combo)>0 && ($core->auth->getOption('editor') && $core->auth->getOption('editor')!='')) {
-        $post_format_field = form::combo('post_format',$formaters_combo,"$post_editor:$post_format",'maximal');
-     } else {
-          $post_format_field = sprintf(__('Choose an active editor in %s.'),
-          '<a href="'.$core->adminurl->get("admin.user.preferences").'#user-options">'.__('your preferences').'</a>'
-          );
-          $post_format_field .= form::hidden('post_format','xhtml');
-     }
-
      $sidebar_items = new ArrayObject(array(
           'status-box' => array(
@@ -489 +472 @@
                          '<div>'.
                          '<h5 id="label_format"><label for="post_format" class="classic">'.__('Text formatting').'</label></h5>'.
-                         '<p>'.$post_format_field.'</p>'.
+                         '<p>'.form::combo('post_format',$available_formats,$post_format,'maximal').'</p>'.
                          '<p class="format_control control_no_xhtml">'.
                          '<a id="convert-xhtml" class="button'.($post_id && $post_format != 'wiki' ? ' hide' : '').'" href="'.

admin/preferences.php

@@ -27 +27 @@
 
 $user_options = $core->auth->getOptions();
-if (empty($user_options['editor'])) {
-    $user_options['editor'] = '';
+if (empty($user_options['editor']) || !is_array($user_options['editor'])) {
+     $user_options['editor'] = array();
 }
 
@@ -65 +65 @@
 $editors = array_keys($editors_combo);
 
-# Formaters combo
-$formaters_combo = dcAdminCombos::getFormatersCombo();
-$formaters_combo_editor = array();
-
-if (!empty($user_options['editor']) && !empty($formaters_combo[$user_options['editor']])) {
-    $formaters_combo_editor = $formaters_combo[$user_options['editor']];
-} elseif (count($editors)!=0) {
-    $formaters_combo_editor = $formaters_combo[$editors[0]];
-} else {
-    $formaters_combo = array();
-}
-
+# Format by editors
+$formaters = $core->getFormaters();
+$format_by_editors = array();
+foreach ($formaters as $editor => $formats) {
+     foreach ($formats as $format) {
+          $format_by_editors[$format][$editor] = $editor;
+     }
+}
+$available_formats = array('' => '');
+foreach (array_keys($format_by_editors) as $format) {
+     $available_formats[$format] = $format;
+     if (!isset($user_options['editor'][$format])) {
+          $user_options['editor'][$format] = '';
+     }
+}
 $status_combo = dcAdminCombos::getPostStatusescombo();
 
@@ -150 +153 @@
 
 # Update user options
-if (isset($_POST['user_post_format']))
+if (isset($_POST['user_editor']))
 {
      try
@@ -333 +336 @@
                     sprintf(__('Password strength: %s'),__('strong'))."', '".
                     sprintf(__('Password strength: %s'),__('very strong'))."']});\n".
-          "});\n".
-        'var formats_by_editor = \''.json_encode($formaters_combo).'\';'.
+          "});".
           "\n//]]>\n".
           "</script>\n".
@@ -471 +473 @@
 echo
 '<div class="fieldset">'.
-'<h4>'.__('Edition').'</h4>'.
-
-'<p class="field"><label for="user_editor">'.__('Preferred editor:').'</label>'.
-form::combo('user_editor',array_merge(array(__('Choose an editor') => ''),$editors_combo),$user_options['editor']).'</p>'.
-
+'<h4>'.__('Edition').'</h4>';
+
+foreach ($format_by_editors as $format => $editors) {
+     echo
+     '<p class="field"><label for="user_editor">'.sprintf(__('Preferred editor for %s:'),$format).'</label>'.
+     form::combo(
+          'user_editor['.$format.']',
+          array_merge(array(__('Choose an editor') => ''),$editors),$user_options['editor'][$format]
+     ).'</p>';
+}
+echo
 '<p class="field"><label for="user_post_format">'.__('Preferred format:').'</label>'.
-form::combo('user_post_format',array_merge(array('' => ''), $formaters_combo_editor),$user_options['post_format']).'</p>'.
-
+form::combo('user_post_format',$available_formats,$user_options['post_format']).'</p>';
+
+echo
 '<p class="field"><label for="user_post_status">'.__('Default entry status:').'</label>'.
 form::combo('user_post_status',$status_combo,$user_post_status).'</p>'.