Dotclear

Changeset 2520:6c1482f9960e


Ignore:
Timestamp:
11/08/13 08:12:13 (10 years ago)
Author:
Dsls
Branch:
default
Parents:
2505:62775923ddff (diff), 2519:61b3fb5e6a1f (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 with 2.6

Files:
2 edited

Legend:

Unmodified
Added
Removed
  • plugins/widgets/index.php

    r2496 r2520  
    184184          $core->blog->triggerBlog(); 
    185185 
     186          dcPage::addSuccessNotice(__('Sidebars and their widgets have been saved.')); 
    186187          http::redirect($p_url); 
    187188     } 
     
    201202          $core->blog->triggerBlog(); 
    202203 
     204          dcPage::addSuccessNotice(__('Sidebars have been resetting.')); 
    203205          http::redirect($p_url); 
    204206     } 
     
    356358     $res .= '<ul id="'.$id.'" class="connected">'; 
    357359 
    358      $res .= '<li class="empty-widgets" '.(!$widgets->isEmpty() ? 'style="display: none;"' : '').'>'.__('No widget for now.').'</li>'; 
     360     $res .= '<li class="empty-widgets" '.(!$widgets->isEmpty() ? 'style="display: none;"' : '').'>'.__('No widget as far.').'</li>'; 
    359361 
    360362     $i = 0; 
  • plugins/widgets/index.php

    r2509 r2520  
    218218          echo 
    219219               dcPage::jsLoad('js/jquery/jquery-ui.custom.js'). 
     220               dcPage::jsLoad('js/jquery/jquery.ui.touch-punch.js'). 
    220221               dcPage::jsLoad('index.php?pf=widgets/widgets.js'); 
    221222  ?> 
     
    366367          $altUp = $i == 0 ? ' alt=""' : ' alt="'.__('Up the widget').'"'; 
    367368          $altDown = $i == count($widgets->elements())-1 ? ' alt=""' : ' alt="'.__('Down the widget').'"'; 
    368  
     369           
    369370          $iname = 'w['.$pr.']['.$i.']'; 
    370371 
Note: See TracChangeset for help on using the changeset viewer.

Sites map