Changeset 2567:6c11245cbf04 for admin

Timestamp:

11/17/13 20:30:21 (12 years ago)

Author:

franck <carnet.franck.paul@…>

Branch:

default

Parents:

2564:c8bf313d697e (diff), 2566:9bf417837888 (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 from 2.6

Location:

admin

Files:

• categories.php (modified) (1 diff)
• categories.php (modified) (1 diff)
• preferences.php (modified) (1 diff)
• preferences.php (modified) (1 diff)

admin/categories.php

@@ -224 +224 @@
 dcPage::helpBlock('core_categories');
 dcPage::close();
-?>

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/preferences.php

@@ -632 +632 @@
 dcPage::helpBlock('core_user_pref');
 dcPage::close();
-?>

admin/preferences.php

@@ -305 +305 @@
      ($user_acc_nodragdrop ? '' : dcPage::jsLoad('js/_preferences-dragdrop.js')).
      dcPage::jsLoad('js/jquery/jquery-ui.custom.js').
+     dcPage::jsLoad('js/jquery/jquery.ui.touch-punch.js').
      dcPage::jsLoad('js/jquery/jquery.pwstrength.js').
           '<script type="text/javascript">'."\n".