Dotclear


Ignore:
Timestamp:
08/31/13 11:10:09 (11 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:
2 edited

Legend:

Unmodified
Added
Removed
  • admin/categories.php

    r1636 r1662  
    8787$rs = $core->blog->getCategories(array('post_type'=>'post')); 
    8888 
    89 $starting_script = dcPage::jsToolMan()."\n"; 
     89$starting_script = ""; 
    9090if (!$core->auth->user_prefs->accessibility->nodragdrop 
    9191     && $core->auth->check('categories',$core->blog->id) 
    9292     && $rs->count()>1) { 
    93         $starting_script .= dcPage::jsLoad('js/jquery/jquery-ui.custom.js'); 
    94      $starting_script .= dcPage::jsLoad('js/jquery/jquery.mjs.nestedSortable.js'); 
     93          $starting_script .= dcPage::jsLoad('js/jquery/jquery-ui.custom.js'); 
     94          $starting_script .= dcPage::jsLoad('js/jquery/jquery.mjs.nestedSortable.js'); 
    9595} 
    9696$starting_script .= dcPage::jsLoad('js/_categories.js'); 
  • admin/categories.php

    r1655 r1662  
    9191     && $core->auth->check('categories',$core->blog->id) 
    9292     && $rs->count()>1) { 
    93         $starting_script .= dcPage::jsLoad('js/jquery/jquery-ui.custom.js'); 
     93          $starting_script .= dcPage::jsLoad('js/jquery/jquery-ui.custom.js'); 
    9494          $starting_script .= dcPage::jsLoad('js/jquery/jquery.mjs.nestedSortable.js'); 
    9595} 
     
    133133if ($rs->isEmpty()) 
    134134{ 
    135      echo '<p>'.__('No category yet.').'</p>'; 
     135     echo '<p>'.__('No category so far.').'</p>'; 
    136136} 
    137137else 
Note: See TracChangeset for help on using the changeset viewer.

Sites map