Dotclear

Changeset 2509:5ab9027dee05


Ignore:
Timestamp:
11/01/13 14:26:00 (10 years ago)
Author:
franck <carnet.franck.paul@…>
Branch:
2.6
Message:

Add success messages in widgets/index.php, fixes #1834

Files:
5 edited

Legend:

Unmodified
Added
Removed
  • locales/_pot/main.pot

    r2508 r2509  
    88"Project-Id-Version: Dotclear 2\n" 
    99"Report-Msgid-Bugs-To: \n" 
    10 "POT-Creation-Date: 2013-11-01 08:06+0100\n" 
     10"POT-Creation-Date: 2013-11-01 14:23+0100\n" 
    1111"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" 
    1212"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" 
  • locales/_pot/plugins.pot

    r2508 r2509  
    88"Project-Id-Version: Dotclear 2\n" 
    99"Report-Msgid-Bugs-To: \n" 
    10 "POT-Creation-Date: 2013-11-01 08:06+0100\n" 
     10"POT-Creation-Date: 2013-11-01 14:23+0100\n" 
    1111"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" 
    1212"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" 
     
    275275#: plugins/antispam/filters/class.dc.filter.ip.php:131 
    276276#: plugins/antispam/filters/class.dc.filter.words.php:122 
    277 #: plugins/widgets/index.php:259 
     277#: plugins/widgets/index.php:261 
    278278msgid "Add" 
    279279msgstr "" 
     
    12791279 
    12801280#: plugins/importExport/inc/class.dc.ieModule.php:77 
    1281 #: plugins/widgets/index.php:319 
     1281#: plugins/widgets/index.php:321 
    12821282msgid "or" 
    12831283msgstr "" 
     
    26652665msgstr "" 
    26662666 
    2667 #: plugins/widgets/index.php:213 plugins/widgets/index.php:240 
     2667#: plugins/widgets/index.php:186 
     2668msgid "Sidebars and their widgets have been saved." 
     2669msgstr "" 
     2670 
     2671#: plugins/widgets/index.php:204 
     2672msgid "Sidebars have been resetting." 
     2673msgstr "" 
     2674 
     2675#: plugins/widgets/index.php:215 plugins/widgets/index.php:242 
    26682676msgid "Widgets" 
    26692677msgstr "" 
    26702678 
    2671 #: plugins/widgets/index.php:230 
     2679#: plugins/widgets/index.php:232 
    26722680msgid "Are you sure you want to reset sidebars?" 
    26732681msgstr "" 
    26742682 
    2675 #: plugins/widgets/index.php:247 
     2683#: plugins/widgets/index.php:249 
    26762684msgid "Available widgets" 
    26772685msgstr "" 
    26782686 
    2679 #: plugins/widgets/index.php:248 
     2687#: plugins/widgets/index.php:250 
    26802688msgid "Drag widgets from this list to one of the sidebars, for add." 
    26812689msgstr "" 
    26822690 
    2683 #: plugins/widgets/index.php:255 plugins/widgets/index.php:371 
     2691#: plugins/widgets/index.php:257 plugins/widgets/index.php:373 
    26842692msgid "order" 
    26852693msgstr "" 
    26862694 
    2687 #: plugins/widgets/index.php:257 
     2695#: plugins/widgets/index.php:259 
    26882696msgid "Append to:" 
    26892697msgstr "" 
    26902698 
    2691 #: plugins/widgets/index.php:268 
     2699#: plugins/widgets/index.php:270 
    26922700msgid "Add widgets to sidebars" 
    26932701msgstr "" 
    26942702 
    2695 #: plugins/widgets/index.php:275 
     2703#: plugins/widgets/index.php:277 
    26962704msgid "Navigation sidebar" 
    26972705msgstr "" 
    26982706 
    2699 #: plugins/widgets/index.php:281 
     2707#: plugins/widgets/index.php:283 
    27002708msgid "Extra sidebar" 
    27012709msgstr "" 
    27022710 
    2703 #: plugins/widgets/index.php:287 
     2711#: plugins/widgets/index.php:289 
    27042712msgid "Custom sidebar" 
    27052713msgstr "" 
    27062714 
    2707 #: plugins/widgets/index.php:293 
     2715#: plugins/widgets/index.php:295 
    27082716msgid "Update sidebars" 
    27092717msgstr "" 
    27102718 
    2711 #: plugins/widgets/index.php:294 
     2719#: plugins/widgets/index.php:296 
    27122720msgid "Reset sidebars" 
    27132721msgstr "" 
    27142722 
    2715 #: plugins/widgets/index.php:303 
     2723#: plugins/widgets/index.php:305 
    27162724msgid "Widget ID:" 
    27172725msgstr "" 
    27182726 
    2719 #: plugins/widgets/index.php:310 
     2727#: plugins/widgets/index.php:312 
    27202728msgid "No setting for this widget" 
    27212729msgstr "" 
    27222730 
    2723 #: plugins/widgets/index.php:319 
     2731#: plugins/widgets/index.php:321 
    27242732msgid "boolean" 
    27252733msgstr "" 
    27262734 
    2727 #: plugins/widgets/index.php:319 plugins/widgets/index.php:323 
     2735#: plugins/widgets/index.php:321 plugins/widgets/index.php:325 
    27282736msgid "possible values:" 
    27292737msgstr "" 
    27302738 
    2731 #: plugins/widgets/index.php:323 
     2739#: plugins/widgets/index.php:325 
    27322740msgid "listitem" 
    27332741msgstr "" 
    27342742 
    2735 #: plugins/widgets/index.php:328 
     2743#: plugins/widgets/index.php:330 
    27362744msgid "string" 
    27372745msgstr "" 
    27382746 
    2739 #: plugins/widgets/index.php:334 
     2747#: plugins/widgets/index.php:336 
    27402748msgid "Setting name:" 
    27412749msgstr "" 
    27422750 
    2743 #: plugins/widgets/index.php:357 
     2751#: plugins/widgets/index.php:359 
    27442752msgid "No widget as far." 
    27452753msgstr "" 
    27462754 
    2747 #: plugins/widgets/index.php:364 plugins/widgets/index.php:375 
     2755#: plugins/widgets/index.php:366 plugins/widgets/index.php:377 
    27482756msgid "Up the widget" 
    27492757msgstr "" 
    27502758 
    2751 #: plugins/widgets/index.php:365 plugins/widgets/index.php:376 
     2759#: plugins/widgets/index.php:367 plugins/widgets/index.php:378 
    27522760msgid "Down the widget" 
    27532761msgstr "" 
    27542762 
    2755 #: plugins/widgets/index.php:377 
     2763#: plugins/widgets/index.php:379 
    27562764msgid "Remove the widget" 
    27572765msgstr "" 
    27582766 
    2759 #: plugins/widgets/index.php:377 
     2767#: plugins/widgets/index.php:379 
    27602768msgid "Remove widget" 
    27612769msgstr "" 
    27622770 
    2763 #: plugins/widgets/index.php:390 
     2771#: plugins/widgets/index.php:392 
    27642772msgid "Drag widgets here to remove." 
    27652773msgstr "" 
  • locales/fr/main.po

    r2508 r2509  
    1111"Project-Id-Version: Dotclear\n" 
    1212"Report-Msgid-Bugs-To: \n" 
    13 "POT-Creation-Date: 2013-11-01 08:06+0100\n" 
     13"POT-Creation-Date: 2013-11-01 14:23+0100\n" 
    1414"PO-Revision-Date: 2012-08-13 07:13+0000\n" 
    1515"Last-Translator: xave <xave@dotclear.net>\n" 
  • locales/fr/plugins.po

    r2508 r2509  
    1111"Project-Id-Version: Dotclear\n" 
    1212"Report-Msgid-Bugs-To: \n" 
    13 "POT-Creation-Date: 2013-11-01 08:06+0100\n" 
     13"POT-Creation-Date: 2013-11-01 14:23+0100\n" 
    1414"PO-Revision-Date: 2012-11-06 10:04+0100\n" 
    1515"Last-Translator: Franck Paul <carnet.franck.paul@gmail.com>\n" 
     
    19021902msgstr "chaîne vide" 
    19031903 
     1904msgid "Sidebars and their widgets have been saved." 
     1905msgstr "Les volets et leurs widgets ont été enregistrés." 
     1906 
     1907msgid "Sidebars have been resetting." 
     1908msgstr "Les volets ont été réinitialisés." 
     1909 
    19041910msgid "Widgets" 
    19051911msgstr "Widgets" 
  • plugins/widgets/index.php

    r2448 r2509  
    5353          } 
    5454     } 
    55            
     55 
    5656     # Append 1 widget 
    5757     $wid = false; 
     
    6060          $wid = $wid[0]; 
    6161     } 
    62       
     62 
    6363     # Append widgets 
    6464     if (!empty($addw)) 
     
    7373               $widgets_custom = new dcWidgets(); 
    7474          } 
    75            
     75 
    7676          foreach ($addw as $k => $v) 
    7777          { 
     
    9191               } 
    9292          } 
    93            
     93 
    9494          try { 
    9595               $core->blog->settings->addNamespace('widgets'); 
     
    151151          $_POST['w'] = array(); 
    152152     } 
    153       
     153 
    154154     try 
    155155     { 
     
    163163               } 
    164164          } 
    165            
     165 
    166166          if (!isset($_POST['w']['nav'])) { 
    167167               $_POST['w']['nav'] = array(); 
     
    173173               $_POST['w']['custom'] = array(); 
    174174          } 
    175            
     175 
    176176          $widgets_nav = dcWidgets::loadArray($_POST['w']['nav'],$__widgets); 
    177177          $widgets_extra = dcWidgets::loadArray($_POST['w']['extra'],$__widgets); 
    178178          $widgets_custom = dcWidgets::loadArray($_POST['w']['custom'],$__widgets); 
    179            
     179 
    180180          $core->blog->settings->addNamespace('widgets'); 
    181181          $core->blog->settings->widgets->put('widgets_nav',$widgets_nav->store()); 
     
    183183          $core->blog->settings->widgets->put('widgets_custom',$widgets_custom->store()); 
    184184          $core->blog->triggerBlog(); 
    185            
     185 
     186          dcPage::addSuccessNotice(__('Sidebars and their widgets have been saved.')); 
    186187          http::redirect($p_url); 
    187188     } 
     
    200201          $core->blog->settings->widgets->put('widgets_custom',''); 
    201202          $core->blog->triggerBlog(); 
    202            
     203 
     204          dcPage::addSuccessNotice(__('Sidebars have been resetting.')); 
    203205          http::redirect($p_url); 
    204206     } 
     
    218220               dcPage::jsLoad('index.php?pf=widgets/widgets.js'); 
    219221  ?> 
    220   <?php  
    221      $core->auth->user_prefs->addWorkspace('accessibility');  
     222  <?php 
     223     $core->auth->user_prefs->addWorkspace('accessibility'); 
    222224     $user_dm_nodragdrop = $core->auth->user_prefs->accessibility->nodragdrop; 
    223225  ?> 
     
    304306     ($w->desc() != '' ? ' <span class="form-note">'.__($w->desc()).'</span>' : '').'</dt>'. 
    305307     '<dd>'; 
    306       
     308 
    307309     $w_settings = $w->settings(); 
    308310     if (empty($w_settings)) 
     
    329331                         break; 
    330332               } 
    331                 
     333 
    332334               $widget_elements->content .= 
    333335               '<li>'. 
     
    347349{ 
    348350     $res = '<h3>'.$title.'</h3>'; 
    349       
     351 
    350352     if (!($widgets instanceof dcWidgets)) 
    351353     { 
    352354          $widgets = $default_widgets; 
    353355     } 
    354       
     356 
    355357     $res .= '<ul id="'.$id.'" class="connected">'; 
    356       
     358 
    357359     $res .= '<li class="empty-widgets" '.(!$widgets->isEmpty() ? 'style="display: none;"' : '').'>'.__('No widget as far.').'</li>'; 
    358       
     360 
    359361     $i = 0; 
    360362     foreach ($widgets->elements() as $w) 
     
    364366          $altUp = $i == 0 ? ' alt=""' : ' alt="'.__('Up the widget').'"'; 
    365367          $altDown = $i == count($widgets->elements())-1 ? ' alt=""' : ' alt="'.__('Down the widget').'"'; 
    366            
     368 
    367369          $iname = 'w['.$pr.']['.$i.']'; 
    368            
     370 
    369371          $res .= 
    370372          '<li>'.form::hidden(array($iname.'[id]'),html::escapeHTML($w->id())). 
     
    380382          '<div class="widgetSettings hidden-if-drag">'.$w->formSettings($iname,$j).'</div>'. 
    381383          '</li>'; 
    382            
     384 
    383385          $i++; 
    384386          $j++; 
    385387     } 
    386       
     388 
    387389     $res .= '</ul>'; 
    388       
     390 
    389391     $res .= '<ul class="sortable-delete"'.($i > 0 ? '':' style="display: none;"').'><li class="sortable-delete-placeholder">'. 
    390392               __('Drag widgets here to remove.').'</li></ul>'; 
    391       
     393 
    392394     return $res; 
    393395} 
Note: See TracChangeset for help on using the changeset viewer.

Sites map