Changeset 1594:2c7be9167efb

Timestamp:

08/26/13 21:28:25 (11 years ago)

Author:

Nicolas <nikrou77@…>

Branch:

default

Message:

Fix issue 1541 : make action without javascript
Refactoring : only one form

Files:

• admin/categories.php (modified) (7 diffs)
• admin/js/_categories.js (modified) (2 diffs)
• admin/js/common.js (modified) (1 diff)
• admin/style/default.css (modified) (1 diff)
• locales/fr/main.po (modified) (1 diff)

admin/categories.php

@@ -16 +16 @@
 
 # Remove a categories
-if (!empty($_POST['categories'])) {
+if (!empty($_POST['categories']) && !empty($_POST['delete'])) {
      try {
           # Check if category where to move posts exists
@@ -56 +56 @@
 
 # Update order
-if (!empty($_POST['categories_order']))
-{
-        $categories = json_decode($_POST['categories_order']);
-
-     foreach ($categories as $category) {
-             if (!empty($category->item_id)) {
-                  $core->blog->updCategoryPosition($category->item_id, $category->left, $category->right);
-          }
-     }
+if (!empty($_POST['save_order']))
+{
+     if (!empty($_POST['categories_order'])) { // js is enable
+         $categories = json_decode($_POST['categories_order']);
+
+         foreach ($categories as $category) {
+           if (!empty($category->item_id)) {
+          $core->blog->updCategoryPosition($category->item_id, $category->left, $category->right);
+           }
+         }
+     } elseif (!empty($_POST['cat_rank'])) {
+          function countChildren($t, $id) {
+               $c = 0;
+               foreach ($t as $k => $v) {
+                    if (preg_match('`^'.$id.'\..*`', $k)) {
+                         $c++;
+                    }
+               }
+
+               return $c;
+          }
+
+          $i = 1;
+          $ranks = array_flip($_POST['cat_rank']);
+          uksort($ranks, 'version_compare');
+          foreach ($ranks as $str => $id) {
+               $core->blog->updCategoryPosition($id, $i, ($i + 2 * countChildren($ranks, $str) + 1));
+               $i = $i+2;
+          }
+     }
+
      http::redirect('categories.php?reord=1');
 }
@@ -143 +165 @@
 
      $ref_level = $level = $rs->level-1;
+     $parts = array();
      while ($rs->fetch())
      {
@@ -149 +172 @@
           if ($rs->level > $level) {
                echo str_repeat('<ul><li '.$attr.'>',$rs->level - $level);
+               $parts[] = 1;
           } elseif ($rs->level < $level) {
                echo str_repeat('</li></ul>',-($rs->level - $level));
+               $parts = array_slice($parts,0,(count($parts) - ($level - $rs->level)));
+               $parts[count($parts)-1]++;
+          } else {
+               $parts[count($parts)-1]++;
           }
 
@@ -157 +185 @@
           }
 
+          $cat_rank = implode('.',$parts);
           echo
           '<p>'.
@@ -164 +193 @@
           sprintf(($rs->nb_post > 1 ? __('%d entries') : __('%d entry') ),$rs->nb_post).'</a>'.
           ', '.__('total:').' '.$rs->nb_total.') '.
-          '<span class="cat-url">'.__('URL:').' <code>'.html::escapeHTML($rs->cat_url).'</code></span></p>';
+          '<span class="cat-url">'.__('URL:').' <code>'.html::escapeHTML($rs->cat_url).'</code></span>'.
+          form::field('cat_rank['.$rs->cat_id.']',10,10,$cat_rank,'cat-rank').
+          '</p>';
 
           $level = $rs->level;
@@ -183 +214 @@
      '</p>'.
      '<p class="right">'.
-     $core->formNonce().
-     '<input type="submit" value="'.__('Delete selected categories').'"/>'.
+     '<input type="submit" name="delete" value="'.__('Delete selected categories').'"/>'.
      '</p>'.
-     '</div>'.
-     '</form>';
+     '</div>';
 
      echo '<h3 class="clear">'.__('Categories order').'</h3>';
 
      if ($core->auth->check('categories',$core->blog->id) && $rs->count()>1) {
+          if (!$core->auth->user_prefs->accessibility->nodragdrop) {
+               echo '<p class="no-js-hidden">'.__('To rearrange categories order, move items by drag and drop, then click on “Save categories order” button.').'</p>';
+          }
           echo
-          '<form action="categories.php" method="post">';
-          if (!$core->auth->user_prefs->accessibility->nodragdrop) {
-                  echo '<p class="no-js-hidden">'.__('To rearrange categories order, move items by drag and drop, then click on “Save categories order” button.').'</p>';
-          }
-          echo
-          '<p class="js-hidden">'.__('To rearrange categories order, change position number and click on “Save categories order” button.').'</p>'.
+          '<p class="dragdrop-hidden">'.__('To rearrange categories order, change position number and click on “Save categories order” button.').'</p>'.
           '<p>'.
           '<input type="hidden" id="categories_order" name="categories_order" value=""/>'.
-          '<input type="submit" id="save-set-order" value="'.__('Save categories order').'" />'.
-          $core->formNonce().'</p>'.
-          '</form>';
-     }
-
-     echo
-     '<form action="categories.php" method="post" id="reset-order">'.
-     '<p><input type="submit" value="'.__('Reorder all categories on the top level').'" />'.
-     form::hidden(array('reset'),1).
+          '<input type="submit" name="save_order" id="save-set-order" value="'.__('Save categories order').'" />'.
+          '</p>';
+     }
+
+     echo
+     '<p><input type="submit" name="reset" value="'.__('Reorder all categories on the top level').'" />'.
      $core->formNonce().'</p>'.
      '</form>';

admin/js/_categories.js

@@ -1 +1 @@
 $(function() {
      if ($.fn['nestedSortable']!==undefined) {
+          $('.dragdrop-hidden, .cat-rank').hide();
           $('#categories ul li').css('cursor','move');
           $('#save-set-order').prop('disabled',true).addClass('disabled');
@@ -18 +19 @@
      });
 
-     dotclear.categoriesActionsHelper();
+     $('input[name="delete"]').click(function() {
+          var nb_ckecked = $('input[name="categories[]"]:checked').length;
+          if (nb_ckecked==0) {
+               return false;
+          }
 
+          return window.confirm(dotclear.msg.confirm_delete_categories.replace('%s',nb_ckecked));
+     });
 
-     $('form#reset-order').submit(function() {
+     $('input[name="reset"]').click(function() {
           return window.confirm(dotclear.msg.confirm_reorder_categories);
      });

admin/js/common.js

@@ -299 +299 @@
 
                return true;
-          });
-     },
-
-     categoriesActionsHelper: function() {
-          $('#form-categories').submit(function() {
-              var nb_ckecked = $('input[name="categories[]"]:checked').length;
-              if (nb_ckecked==0) {
-               return false;
-              }
-
-              return window.confirm(dotclear.msg.confirm_delete_categories.replace('%s',nb_ckecked));
           });
      },

admin/style/default.css

@@ -689 +689 @@
         outline: 1px dashed #4183C4;
         min-height: 2.5em;
+}
+#categories input.cat-rank {
+  float: right;
+  margin-left: 30px;
 }
 #save-set-order.disabled {

locales/fr/main.po

@@ -2246 +2246 @@
 msgstr "Êtes-vous certain de vouloir supprimer la catégorie \"%s\" ?"
 
+#, php-format
+msgid "Are you sure you want to delete selected categories (%s)?"
+msgstr "Êtes-vous certain de vouloir supprimer les categories sélectionnées (%s) ?"
+
 msgid "Are you sure you want to reorder all categories?"
 msgstr "Êtes-vous certain de vouloir réinitialiser l'ordre des catégories ?"