Changeset 1662:be1cbef7145c

Timestamp:

08/31/13 11:10:09 (10 years ago)

Author:

Lepeltier kévin

Branch:

Ticket #1604 - widgets

Children:

1663:5577f8054312, 1667:e3a815f11f70

Parents:

1661:14832508668c (diff), 1638:9a3c2618fa60 (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:

Fusion avec default

Files:

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

admin/categories.php

@@ -87 +87 @@
 $rs = $core->blog->getCategories(array('post_type'=>'post'));
 
-$starting_script = dcPage::jsToolMan()."\n";
+$starting_script = "";
 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/jquery/jquery-ui.custom.js');
+          $starting_script .= dcPage::jsLoad('js/jquery/jquery.mjs.nestedSortable.js');
 }
 $starting_script .= dcPage::jsLoad('js/_categories.js');

admin/categories.php

@@ -91 +91 @@
      && $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-ui.custom.js');
           $starting_script .= dcPage::jsLoad('js/jquery/jquery.mjs.nestedSortable.js');
 }
@@ -133 +133 @@
 if ($rs->isEmpty())
 {
-     echo '<p>'.__('No category yet.').'</p>';
+     echo '<p>'.__('No category so far.').'</p>';
 }
 else