Changeset 1532:f6c9584b4677

Timestamp:

08/23/13 13:16:14 (10 years ago)

Author:

Nicolas <nikrou77@…>

Branch:

default

Message:

Fix issue #1535 : Allow categories to be ordered by drag and drop
Need to close isse #655 : duplicated

Files:

• admin/categories.php (modified) (5 diffs)
• admin/js/_categories.js (modified) (1 diff)
• admin/js/jquery/jquery.mjs.nestedSortable.js (added)
• admin/style/default.css (modified) (1 diff)
• inc/core/class.dc.blog.php (modified) (1 diff)
• inc/core/class.dc.categories.php (modified) (1 diff)
• locales/fr/main.po (modified) (1 diff)

admin/categories.php

@@ -55 +55 @@
 }
 
+# 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);
+          }
+     }
+     http::redirect('categories.php?reord=1');
+}
+
 # Reset order
 if (!empty($_POST['reset']))
@@ -78 +91 @@
 /* Display
 -------------------------------------------------------- */
-dcPage::open(__('Categories'),
-     dcPage::jsToolMan()."\n".
-     dcPage::jsLoad('js/_categories.js'),
+$rs = $core->blog->getCategories(array('post_type'=>'post'));
+
+$starting_script = dcPage::jsToolMan()."\n";
+if (!$core->auth->user_prefs->accessibility->nodragdrop
+     && $core->auth->check('categories',$core->blog->id)
+     && $rs->count()>1) {
+        $starting_script .= dcPage::jsLoad('js/jquery/jquery-ui.custom.js');
+     $starting_script .= dcPage::jsLoad('js/jquery/jquery.mjs.nestedSortable.js');
+}
+$starting_script .= dcPage::jsLoad('js/_categories.js');
+
+dcPage::open(__('Categories'),$starting_script,
      dcPage::breadcrumb(
           array(
@@ -99 +121 @@
 }
 
-$rs = $core->blog->getCategories(array('post_type'=>'post'));
-
 $categories_combo = array();
 if (!$rs->isEmpty())
@@ -131 +151 @@
      while ($rs->fetch())
      {
-          $attr = 'id="cat'.$rs->cat_id.'"';
+          $attr = 'id="cat_'.$rs->cat_id.'"';
           if ($rs->nb_total == 0) {
                $attr .= ' class="deletable"';
@@ -188 +208 @@
      '</form>'.
      '</div>';
+
+     if (!$core->auth->user_prefs->accessibility->nodragdrop
+          && $core->auth->check('categories',$core->blog->id)
+          && $rs->count()>1) {
+          echo
+          '<div class="col clear">'.
+          '<form action="categories.php" method="post">'.
+          '<p>'.
+          '<input type="hidden" id="categories_order" name="categories_order" value=""/>'.
+          '<input id="save-set-order" type="submit" value="'.__('Save categories order').'"/>'.
+          $core->formNonce().'</p>'.
+          '</form>'.
+          '</div>';
+     }
 }
 

admin/js/_categories.js

@@ -1 @@
-/* TODO: Some nice drag and drop on categories */
 $(function() {
+     if ($.fn['nestedSortable']!==undefined) {
+          $('#categories ul li').css('cursor','move');
+          $('#save-set-order').prop('disabled',true).addClass('disabled');
+          $('#categories ul').nestedSortable({
+               listType: 'ul',
+               items: 'li',
+               placeholder: 'placeholder',
+               update: function() {
+                    $('#categories_order').attr('value',JSON.stringify($('#categories ul').nestedSortable('toArray')));
+                    $('#save-set-order').prop('disabled',false).removeClass('disabled');
+               }
+          });
+     }
+
      $('.checkboxes-helpers').each(function() {
           dotclear.checkboxesHelpers(this);

admin/style/default.css

@@ -632 +632 @@
      font-weight: bold;
      margin-top: 2em;
+}
+#categories .placeholder {
+        outline: 1px dashed #4183C4;
+        min-height: 2.5em;
+}
+#save-set-order.disabled {
+        text-shadow: none;
+        color: #000;
+        background: #F5F5F5;
+        background: -webkit-gradient(linear, left top, left bottom, from(#DFDFDF), to(#F5F5F5));
+        background: -moz-linear-gradient(center top , #F5F5F5, #DFDFDF) repeat scroll 0 0 transparent;
+        border: 1px solid #CCCCCC;
+}
+#save-set-order.disabled:hover {
+        color: #666;
+        background: #DFDFDF;
+        border: 1px solid #CCCCCC;
 }
 /* ------------------------------------------------------------------ media */

inc/core/class.dc.blog.php

@@ -555 +555 @@
           $this->triggerBlog();
      }
+
+        /**
+        Set category position
+
+        @param  id              <b>integer</b>          Category ID
+        @param  left            <b>integer</b>          Category ID before
+        @param  right           <b>integer</b>          Category ID after
+        */
+        public function updCategoryPosition($id,$left,$right)
+        {
+                $this->categories()->updatePosition($id,$left,$right);
+                $this->triggerBlog();
+        }
      
      /**

inc/core/class.dc.categories.php

@@ -188 +188 @@
      }
      
+        public function updatePosition($id,$left,$right)
+        {
+                $sql = 'UPDATE '.$this->table.' SET '
+                        .$this->f_left.' = '.$left.', '
+                        .$this->f_right.' = '.$right
+                        .' WHERE '.$this->f_id .' = '.(integer) $id
+                        .$this->getCondition();
+
+                $this->con->begin();
+                try {
+                        $this->con->execute($sql);
+                        $this->con->commit();
+                } catch (Exception $e) {
+                        $this->con->rollback();
+                        throw $e;
+                }
+        }
+
      public function deleteNode($node,$keep_children=true)
      {

locales/fr/main.po

@@ -649 +649 @@
 msgstr "Choisissez une catégorie à supprimer :"
 
+msgid "Save categories order"
+msgstr "Sauver l'ordre des catégories"
+
 msgid "And choose the category which will receive its entries:"
 msgstr "Et sélectionnez la catégorie qui recevra ses (éventuels) billets :"