Changeset 2496:e33dcbc18e36 for admin/categories.php

Timestamp:

10/27/13 09:52:46 (12 years ago)

Author:

franck <carnet.franck.paul@…>

Branch:

default

Parents:

2495:dc8c7974ff0b (diff), 2494:b168f47c7f9c (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge 2.6 commits to the current 2.7-dev

Files:

• admin/categories.php (modified) (1 diff)
• admin/categories.php (modified) (2 diffs)

admin/categories.php

@@ -109 +109 @@
      && $rs->count()>1) {
           $starting_script .= dcPage::jsLoad('js/jquery/jquery-ui.custom.js');
+          $starting_script .= dcPage::jsLoad('js/jquery/jquery.ui.touch-punch.js');
           $starting_script .= dcPage::jsLoad('js/jquery/jquery.mjs.nestedSortable.js');
 }

admin/categories.php

@@ -103 +103 @@
 
 $starting_script = "";
+
+$core->auth->user_prefs->addWorkspace('accessibility');
 if (!$core->auth->user_prefs->accessibility->nodragdrop
      && $core->auth->check('categories',$core->blog->id)
@@ -185 +187 @@
           }
           echo
-          '<input type="submit"'.$attr_disabled.' class="'.$input_class.'delete" name="delete['.$rs->cat_id.']" value="'.__('Delete category').'"/>'.
+          ' <input type="submit"'.$attr_disabled.' class="'.$input_class.'delete" name="delete['.$rs->cat_id.']" value="'.__('Delete category').'"/>'.
           '</p>';