Changeset 2496:e33dcbc18e36
- Timestamp:
- 10/27/13 09:52:46 (12 years ago)
- Branch:
- default
- Parents:
- 2495:dc8c7974ff0b (diff), 2494:b168f47c7f9c (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. - Files:
-
- 16 deleted
- 14 edited
-
admin/_charte.php (modified) (1 diff)
-
admin/_charte.php (modified) (9 diffs)
-
admin/categories.php (modified) (1 diff)
-
admin/categories.php (modified) (2 diffs)
-
admin/preferences.php (modified) (17 diffs)
-
admin/preferences.php (modified) (1 diff)
-
inc/prepend.php (modified) (1 diff)
-
inc/prepend.php (modified) (2 diffs)
-
locales/en/help/blog_pref.html (deleted)
-
locales/en/help/categories.html (deleted)
-
locales/en/help/comments.html (deleted)
-
locales/en/help/main.html (deleted)
-
locales/en/help/media.html (deleted)
-
locales/en/help/post.html (deleted)
-
locales/en/help/posts.html (deleted)
-
locales/en/help/trackbacks.html (deleted)
-
locales/en/help/user.html (deleted)
-
locales/en/help/user_pref.html (deleted)
-
locales/en/help/wiki.html (deleted)
-
locales/fr/help/blowupConfig.html (deleted)
-
locales/fr/help/themeEditor.html (deleted)
-
plugins/blowupConfig/help.html (deleted)
-
plugins/maintenance/_config.php (deleted)
-
plugins/pages/list.php (modified) (2 diffs)
-
plugins/pages/list.php (modified) (1 diff)
-
plugins/simpleMenu/index.php (modified) (1 diff)
-
plugins/simpleMenu/index.php (modified) (1 diff)
-
plugins/themeEditor/help.html (deleted)
-
plugins/widgets/index.php (modified) (15 diffs)
-
plugins/widgets/index.php (modified) (6 diffs)
Legend:
- Unmodified
- Added
- Removed
-
admin/_charte.php
r2392 r2496 31 31 <script type="text/javascript" src="js/jquery/jquery.js"></script> 32 32 <script type="text/javascript" src="js/jquery/jquery-ui.custom.js"></script> 33 <script type="text/javascript" src="js/jquery/jquery.ui.touch-punch.js"></script> 33 34 <script type="text/javascript" src="js/jquery/jquery.pageTabs.js"></script> 34 35 <script type="text/javascript" src="js/jquery/jquery.biscuit.js"></script> -
admin/_charte.php
r2495 r2496 84 84 <div id="main"> 85 85 <div id="content" class="clearfix"> 86 <div class="info">87 <p>Cette page vise à présenter les règles graphiques et conventions utilisées dans les pages de l'administration88 d'une installation Dotclear, à l'usage des contributeurs et développeurs d'extensions. Elle en est elle-même89 une illustration. L'observation de son code source peut donc servir de complément aux descriptions.</p>90 </div>91 92 86 <h2>Typographie</h2> 93 87 <h3 id="texte">Textes</h3> … … 166 160 </div><!-- 167 161 --><div class="two-boxes even"> 168 <div class="box odd"> 169 <p><span class="step">4</span> Toutes les boîtes de class <code>"box"</code><br /> 170 placées au sein d'une boîte <code>"two-boxes"</code>…</p> 171 </div> 172 <div class="box even"> 173 <p><span class="step">4 bis</span>… se distribuent horizontalement comme dans <br /> 174 une boîte <code>"one-box"</code>.</p> 162 <div class="two-boxes odd"> 163 <p><span class="step">4</span> On peut bien sûr imbriquer des boîtes de class <code>"two-boxes"</code> 164 au sein d'une boîte <code>"two-boxes" afin qu'elles…</code>…</p> 165 </div><div class="two-boxes even"> 166 <p><span class="step">4 bis</span>… se distribuent horizontalement comme dans une boîte <code>"one-box"</code>.</p> 175 167 </div> 176 168 </div> … … 249 241 <p><label for="ex1">Label simple + input text :</label><input id="ex1" type="text" /></p> 250 242 <p class="form-note">p class="form-note".</p> 251 <p><label for="ex2" class="required"><abbr title="'.__('Required field').'">*</abbr> Label class="required" :</label> <input id="ex2" type="text" /></p> 243 <p><label for="ex4" class="classic">Label class="classic" + input text :</label> <input id="ex4" type="text" /></p> 244 <p><label for="ex2" class="required"><abbr title="'.__('Required field').'">*</abbr> Label class="required" :</label> <input id="ex2" type="text" /><span class="form-note">span class="form-note"</span></p> 245 <p><label for="ex11" class="bold">Label class="bold" :</label> <input id="ex11" type="text" /></p> 246 <p class="form-note">La class="bold" est bien sûr à écrire en minuscules.</p> 252 247 <p><label for="ex3">Input class="maximal" :</label> <input id="ex3" type="text" class="maximal" /></p> 253 <p><label for="ex4" class="classic">Label class="classic" :</label> <input id="ex4" type="text" /></p>254 248 </div> 255 249 <div class="col"> … … 262 256 <p><label class="classic" for="ex8-1"><input type="radio" checked="checked" id="ex8-1" value="ex8-1" name="ex8-1" /> 263 257 Bouton radio 1 (label.classic)</label></p> 264 258 <p><label class="classic" for="ex8-2"><input type="radio" id="ex8-2" value="ex8-2" name="ex8-2" /> 265 259 Bouton radio 2 (label.classic)</label></p> 266 <p class="form-note">Les checkboxes et les boutons radio sont dans la balise <label>.</p> 260 <p class="form-note">Les checkboxes et les boutons radio sont dans la balise <label>.</p> 261 <p><label class="classic" for="ex9"><input type="checkbox" 262 checked="checked" id="ex9" value="1" title="intitulé du champ" /></label> <label 263 for="ex10" class="classic">checkbox.classic + label class="classic" :</label> <input id="ex10" type="text" /></p> 267 264 </div> 268 265 </form> … … 337 334 <p class="nav_prevnext"><a title="Titre de l'élément précédente" href="post.php?id=4145">« Élément précédent</a> | <a title="Titre de l'élément suivant" href="#">Élément suivant »</a></p> 338 335 339 <h2>Tableaux</h2> 336 <h3 id="pseudo-tabs">Pseudo-onglets </h3> 337 <p>Les pseudo-onglets permettent d'ajouter des sous-pages qui sont des liens vers d'autres pages, par opposition aux onglets qui sont des sections internes à la page.</p> 338 <p>Les pseudo-onglets sont à positionner immédiatement après le breadcrumb (ici un hr simule le trait sous le breadcrumb).</p> 339 <hr style="margin-bottom: .75em;" /> 340 <ul class="pseudo-tabs"> 341 <li><a href="#">Page 1</a></li> 342 <li><a href="#">Autre faux onglet</a></li> 343 <li><a href="#" class="active">Onglet actif</a></li> 344 <li><a href="#">Liste 4</a></li> 345 </ul> 346 347 <h2 id="common">Tableaux</h2> 340 348 <p>Il existe deux mises en forme type de tableaux selon que l'on cherche à faire un tableau ordinaire 341 349 ou un tableau dont on peut déplacer les lignes par glisser déposer (voir plus bas). Cependant certaines règles 342 350 sont communes à tout les tableaux.</p> 343 351 344 <h3 id="communes">Règles communes</h3>352 <h3>Règles communes</h3> 345 353 <h4>Largeur du tableau</h4> 346 354 <p>Sauf pour des tableaux particuliers (absents dans l'admin mais qui pourraient être nécessaires … … 366 374 <li><code>count</code> : le contenu de la cellule sera aligné à droite avec un petit retrait.</li> 367 375 </ul> 368 <h3 id=" ordinaires">Tableau classique</h3>376 <h3 id="courants">Tableau classique</h3> 369 377 <div class="table-outer"> 370 378 <table> … … 432 440 </div> 433 441 434 <h3 >Tableau avec ordonnancement</h3>442 <h3 id="dragable">Tableau avec ordonnancement</h3> 435 443 <p>Les tableaux permettant l'ordonnancement doivent offrir la possibilité d'effectuer le classement grâce à 436 444 des inputs placés en début de ligne pour que le classement soit possible même lorsque cette fonctionnalité est … … 539 547 </table> 540 548 </div> 549 550 <h2 id="iconset">Icônes</h2> 551 <p>Les icônes utilisées dans l'administration sont présentes en deux formats 64*64px pour les grandes 552 (qui sont affichées sur le tableau de bord si la page correspondante est choisie en favori par l'utilisateur) et 553 16*16px pour les petits formats.</p> 554 <p>La plupart sont dérivées de la fonte d'icônes <a href="http://www.elegantthemes.com/blog/resources/elegant-icon-font">Elegant Font</a>. Les autres sont des images vectorielles réalisées 555 par la DC Team. Nous les avons nommées <em>Traviata</em>. La palette de couleurs utilisée est la suivante :</p> 556 <p class="txt-center"><img src="images/palette-traviata.png" alt="palette des couleurs utilisées pour les icônes" /></p> 557 <p class="txt-center">Bleu : #137bbb - Vert : #9ac123 - Rouge : #c44d58 - Bleu ciel : #a2cbe9 - Gris clair : #ececec - 558 Gris moyen : #b2b2b2 - Gris foncé : #676e78.</p> 541 559 </div><!-- /content --> 542 560 </div><!-- /main --> 543 561 <div id="main-menu"> 544 <form id="search-menu" action="search.php" method="get"> 545 <p><label for="qx" class="hidden">Chercher : </label><input type="text" size="30" name="qx" id="qx" maxlength="255" /><input type="submit" value="OK" /></p> 546 </form> 547 <div id="favorites-menu"> 548 <h3>Typo</h3> 562 <ul><li class="pretty-title">Typographie 549 563 <ul> 550 564 <li><a href="#texte">Texte</a></li> 551 565 <li><a href="#titres">Titres hx</a></li> 552 566 </ul> 553 </div><!-- /favorites-menu --> 554 <div id="blog-menu"> 555 <h3>Layouts</h3> 567 </li> 568 <li class="pretty-title">Layouts 556 569 <ul> 557 570 <li><a href="#onglets">Onglets</a></li> 558 571 <li><a href="#multi-colonnage">Multi-colonnage</a></li> 559 572 </ul> 560 </div><!-- /blog-menu --> 561 <div id="system-menu"> 562 <h3>Interactions</h3> 573 </li> 574 <li class="pretty-title">Interactions 563 575 <ul> 564 576 <li><a href="#elements">Éléments de formulaire</a></li> … … 566 578 <li><a href="#messages">Messages</a></li> 567 579 </ul> 568 </div><!-- /system-menu --> 569 <div id="plugins-menu"> 570 <h3>Navigation</h3> 580 </li> 581 <li class="pretty-title">Navigation 571 582 <ul> 572 583 <li><a href="#direct">Accès direct</a></li> 573 584 <li><a href="#prevnext">Précédent, suivant</a></li> 585 <li><a href="#pseudo-tabs">Pseudo-onglets</a></li> 574 586 </ul> 575 </div><!-- /plugins-menu --> 587 </li> 588 <li class="pretty-title">Tableaux 589 <ul> 590 <li><a href="#commons">Règles communes</a></li> 591 <li><a href="#courants">Tableaux courants</a></li> 592 <li><a href="#dragables">Tableaux ordonnancés</a></li> 593 </ul> 594 </li> 595 </ul> 596 <div class="info vertical-separator"> 597 <p>Cette page vise à présenter les règles graphiques et conventions utilisées dans les pages de l'administration 598 d'une installation Dotclear, à l'usage des contributeurs et développeurs d'extensions. Elle en est elle-même 599 une illustration. L'observation de son code source peut donc servir de complément aux descriptions.</p> 600 </div> 576 601 </div><!-- /main-menu --> 577 602 -
admin/categories.php
r2464 r2496 109 109 && $rs->count()>1) { 110 110 $starting_script .= dcPage::jsLoad('js/jquery/jquery-ui.custom.js'); 111 $starting_script .= dcPage::jsLoad('js/jquery/jquery.ui.touch-punch.js'); 111 112 $starting_script .= dcPage::jsLoad('js/jquery/jquery.mjs.nestedSortable.js'); 112 113 } -
admin/categories.php
r2495 r2496 103 103 104 104 $starting_script = ""; 105 106 $core->auth->user_prefs->addWorkspace('accessibility'); 105 107 if (!$core->auth->user_prefs->accessibility->nodragdrop 106 108 && $core->auth->check('categories',$core->blog->id) … … 185 187 } 186 188 echo 187 ' <input type="submit"'.$attr_disabled.' class="'.$input_class.'delete" name="delete['.$rs->cat_id.']" value="'.__('Delete category').'"/>'.189 ' <input type="submit"'.$attr_disabled.' class="'.$input_class.'delete" name="delete['.$rs->cat_id.']" value="'.__('Delete category').'"/>'. 188 190 '</p>'; 189 191 -
admin/preferences.php
r2449 r2496 47 47 $default_tab = !empty($_GET['tab']) ? html::escapeHTML($_GET['tab']) : 'user-profile'; 48 48 49 if (!empty($_GET['append']) || !empty($_GET['removed']) || !empty($_GET['neworder']) || 50 !empty($_GET['replaced']) || !empty($_POST['appendaction']) || !empty($_POST['removeaction']) || 49 if (!empty($_GET['append']) || !empty($_GET['removed']) || !empty($_GET['neworder']) || 50 !empty($_GET['replaced']) || !empty($_POST['appendaction']) || !empty($_POST['removeaction']) || 51 51 !empty($_GET['db-updated'])) { 52 52 $default_tab = 'user-favorites'; … … 84 84 { 85 85 $pwd_check = !empty($_POST['cur_pwd']) && $core->auth->checkPassword(crypt::hmac(DC_MASTER_KEY,$_POST['cur_pwd'])); 86 86 87 87 if ($core->auth->allowPassChange() && !$pwd_check && $user_email != $_POST['user_email']) { 88 88 throw new Exception(__('If you want to change your email or password you must provide your current password.')); 89 89 } 90 90 91 91 $cur = $core->con->openCursor($core->prefix.'user'); 92 92 93 93 $cur->user_name = $user_name = $_POST['user_name']; 94 94 $cur->user_firstname = $user_firstname = $_POST['user_firstname']; … … 100 100 101 101 $cur->user_options = new ArrayObject($user_options); 102 102 103 103 if ($core->auth->allowPassChange() && !empty($_POST['new_pwd'])) 104 104 { … … 106 106 throw new Exception(__('If you want to change your email or password you must provide your current password.')); 107 107 } 108 108 109 109 if ($_POST['new_pwd'] != $_POST['new_pwd_c']) { 110 110 throw new Exception(__("Passwords don't match")); 111 111 } 112 112 113 113 $cur->user_pwd = $_POST['new_pwd']; 114 114 } 115 115 116 116 # --BEHAVIOR-- adminBeforeUserUpdate 117 117 $core->callBehavior('adminBeforeUserProfileUpdate',$cur,$core->auth->userID()); 118 118 119 119 # Udate user 120 120 $core->updUser($core->auth->userID(),$cur); 121 121 122 122 # --BEHAVIOR-- adminAfterUserUpdate 123 123 $core->callBehavior('adminAfterUserProfileUpdate',$cur,$core->auth->userID()); 124 124 125 125 dcPage::addSuccessNotice(__('Personal information has been successfully updated.')); 126 126 … … 134 134 135 135 # Update user options 136 if (isset($_POST['user_post_format'])) 136 if (isset($_POST['user_post_format'])) 137 137 { 138 138 try 139 139 { 140 140 $cur = $core->con->openCursor($core->prefix.'user'); 141 141 142 142 $cur->user_name = $user_name; 143 143 $cur->user_firstname = $user_firstname; … … 149 149 150 150 $cur->user_post_status = $user_post_status = $_POST['user_post_status']; 151 151 152 152 $user_options['edit_size'] = (integer) $_POST['user_edit_size']; 153 153 if ($user_options['edit_size'] < 1) { … … 156 156 $user_options['post_format'] = $_POST['user_post_format']; 157 157 $user_options['enable_wysiwyg'] = !empty($_POST['user_wysiwyg']); 158 158 159 159 $cur->user_options = new ArrayObject($user_options); 160 160 161 161 # --BEHAVIOR-- adminBeforeUserOptionsUpdate 162 162 $core->callBehavior('adminBeforeUserOptionsUpdate',$cur,$core->auth->userID()); 163 163 164 164 # Update user prefs 165 165 $core->auth->user_prefs->accessibility->put('nodragdrop',!empty($_POST['user_acc_nodragdrop']),'boolean'); … … 170 170 } 171 171 $core->auth->user_prefs->interface->put('media_by_page',(integer)$_POST['user_ui_media_by_page'],'integer'); 172 172 173 173 # Udate user 174 174 $core->updUser($core->auth->userID(),$cur); 175 175 176 176 # --BEHAVIOR-- adminAfterUserOptionsUpdate 177 177 $core->callBehavior('adminAfterUserOptionsUpdate',$cur,$core->auth->userID()); 178 178 179 179 dcPage::addSuccessNotice(__('Personal options has been successfully updated.')); 180 180 http::redirect('preferences.php#user-options'); … … 192 192 # --BEHAVIOR-- adminBeforeUserOptionsUpdate 193 193 $core->callBehavior('adminBeforeDashboardOptionsUpdate',$core->auth->userID()); 194 194 195 195 # Update user prefs 196 196 $core->auth->user_prefs->dashboard->put('doclinks',!empty($_POST['user_dm_doclinks']),'boolean'); … … 199 199 $core->auth->user_prefs->interface->put('iconset',(!empty($_POST['user_ui_iconset']) ? $_POST['user_ui_iconset'] : '')); 200 200 $core->auth->user_prefs->interface->put('nofavmenu',empty($_POST['user_ui_nofavmenu']),'boolean'); 201 201 202 202 # --BEHAVIOR-- adminAfterUserOptionsUpdate 203 203 $core->callBehavior('adminAfterDashboardOptionsUpdate',$core->auth->userID()); 204 204 205 205 dcPage::addSuccessNotice(__('Dashboard options has been successfully updated.')); 206 206 http::redirect('preferences.php#user-favorites'); … … 213 213 214 214 # Add selected favorites 215 if (!empty($_POST['appendaction'])) 215 if (!empty($_POST['appendaction'])) 216 216 { 217 217 try { … … 280 280 unset($order[$k]); 281 281 } 282 } 282 } 283 283 $core->favs->setFavoriteIDs($order,false); 284 284 if (!$core->error->flag()) { … … 305 305 ($user_acc_nodragdrop ? '' : dcPage::jsLoad('js/_preferences-dragdrop.js')). 306 306 dcPage::jsLoad('js/jquery/jquery-ui.custom.js'). 307 dcPage::jsLoad('js/jquery/jquery.ui.touch-punch.js'). 307 308 dcPage::jsLoad('js/jquery/jquery.pwstrength.js'). 308 309 '<script type="text/javascript">'."\n". … … 320 321 dcPage::jsPageTabs($default_tab). 321 322 dcPage::jsConfirmClose('user-form'). 322 323 323 324 # --BEHAVIOR-- adminPreferencesHeaders 324 325 $core->callBehavior('adminPreferencesHeaders'), … … 386 387 echo 387 388 '<h4 class="vertical-separator pretty-title">'.__('Change my password').'</h4>'. 388 389 389 390 '<div class="pw-table">'. 390 391 '<p class="pw-cell"><label for="new_pwd">'.__('New password:').'</label>'. … … 395 396 '</div>'. 396 397 '</div>'. 397 398 398 399 '<p><label for="new_pwd_c">'.__('Confirm new password:').'</label>'. 399 400 form::password('new_pwd_c',20,255).'</p>'. 400 401 401 402 '<p><label for="cur_pwd">'.__('Your current password:').'</label>'. 402 403 form::password('cur_pwd',20,255).'</p>'. … … 589 590 590 591 if (count($iconsets_combo) > 1) { 591 echo 592 echo 592 593 '<div class="fieldset">'. 593 594 '<h4>'.__('Dashboard icons').'</h4>'. -
admin/preferences.php
r2495 r2496 597 597 '</div>'; 598 598 } else { 599 echo form::hidden('user_ui_iconset','');599 echo '<p class="hidden">'.form::hidden('user_ui_iconset','').'</p>'; 600 600 } 601 601 -
inc/prepend.php
r2492 r2496 135 135 # Constants 136 136 define('DC_ROOT',path::real(dirname(__FILE__).'/..')); 137 define('DC_VERSION','2. 6-RC');137 define('DC_VERSION','2.7-dev'); 138 138 define('DC_DIGESTS',dirname(__FILE__).'/digests'); 139 139 define('DC_L10N_ROOT',dirname(__FILE__).'/../locales'); -
inc/prepend.php
r2341 r2496 35 35 $__autoload['dcPostMedia'] = dirname(__FILE__).'/core/class.dc.postmedia.php'; 36 36 $__autoload['dcModules'] = dirname(__FILE__).'/core/class.dc.modules.php'; 37 $__autoload['dcPlugins'] = dirname(__FILE__).'/core/class.dc.plugins.php'; 37 38 $__autoload['dcThemes'] = dirname(__FILE__).'/core/class.dc.themes.php'; 38 39 $__autoload['dcRestServer'] = dirname(__FILE__).'/core/class.dc.rest.php'; … … 280 281 # 60 : template processing error 281 282 # 70 : blog is offline 282 283 283 284 if (CLI_MODE) 284 285 { -
plugins/pages/list.php
r2442 r2496 55 55 <title><?php echo __('Pages'); ?></title> 56 56 <?php 57 echo dcPage::jsLoad('js/jquery/jquery-ui.custom.js'). 57 echo 58 dcPage::jsLoad('js/jquery/jquery-ui.custom.js'). 59 dcPage::jsLoad('js/jquery/jquery.ui.touch-punch.js'). 58 60 dcPage::jsLoad('index.php?pf=pages/list.js'). 59 61 '<script type="text/javascript">'. … … 89 91 $post_list->display($page,$nb_per_page, 90 92 '<form action="plugin.php" method="post" id="form-entries">'. 91 93 92 94 '%s'. 93 95 94 96 '<div class="two-cols">'. 95 97 '<p class="col checkboxes-helpers"></p>'. 96 98 97 99 '<p class="col right"><label for="action" class="classic">'.__('Selected pages action:').'</label> '. 98 100 form::combo('action',$pages_actions_page->getCombo()). -
plugins/pages/list.php
r2495 r2496 99 99 '<p class="col right"><label for="action" class="classic">'.__('Selected pages action:').'</label> '. 100 100 form::combo('action',$pages_actions_page->getCombo()). 101 '<input type="submit" value="'.__('ok').'" /> </p>'.101 '<input type="submit" value="'.__('ok').'" />'. 102 102 form::hidden(array('post_type'),'page'). 103 103 form::hidden(array('p'),'pages'). 104 104 form::hidden(array('act'),'list'). 105 '</div>'.106 105 $core->formNonce(). 106 '</p></div>'. 107 107 '<p class="clear form-note hidden-if-js">'. 108 108 __('To rearrange pages order, change number at the begining of the line, then click on “Save pages order” button.').'</p>'. 109 109 '<p class="clear form-note hidden-if-no-js">'. 110 110 __('To rearrange pages order, move items by drag and drop, then click on “Save pages order” button.').'</p>'. 111 '< input type="submit" value="'.__('Save pages order').'" name="reorder" class="clear"/>'.111 '<p><input type="submit" value="'.__('Save pages order').'" name="reorder" class="clear" /></p>'. 112 112 '</form>'); 113 113 } -
plugins/simpleMenu/index.php
r2455 r2496 347 347 echo 348 348 dcPage::jsLoad('js/jquery/jquery-ui.custom.js'). 349 dcPage::jsLoad('js/jquery/jquery.ui.touch-punch.js'). 349 350 dcPage::jsLoad('index.php?pf=simpleMenu/simplemenu.js'); 350 351 } -
plugins/simpleMenu/index.php
r2495 r2496 350 350 dcPage::jsLoad('index.php?pf=simpleMenu/simplemenu.js'); 351 351 } 352 echo dcPage::jsConfirmClose('additem','menuitems'); 352 353 ?> 353 354 </head> -
plugins/widgets/index.php
r2448 r2496 53 53 } 54 54 } 55 55 56 56 # Append 1 widget 57 57 $wid = false; … … 60 60 $wid = $wid[0]; 61 61 } 62 62 63 63 # Append widgets 64 64 if (!empty($addw)) … … 73 73 $widgets_custom = new dcWidgets(); 74 74 } 75 75 76 76 foreach ($addw as $k => $v) 77 77 { … … 91 91 } 92 92 } 93 93 94 94 try { 95 95 $core->blog->settings->addNamespace('widgets'); … … 151 151 $_POST['w'] = array(); 152 152 } 153 153 154 154 try 155 155 { … … 163 163 } 164 164 } 165 165 166 166 if (!isset($_POST['w']['nav'])) { 167 167 $_POST['w']['nav'] = array(); … … 173 173 $_POST['w']['custom'] = array(); 174 174 } 175 175 176 176 $widgets_nav = dcWidgets::loadArray($_POST['w']['nav'],$__widgets); 177 177 $widgets_extra = dcWidgets::loadArray($_POST['w']['extra'],$__widgets); 178 178 $widgets_custom = dcWidgets::loadArray($_POST['w']['custom'],$__widgets); 179 179 180 180 $core->blog->settings->addNamespace('widgets'); 181 181 $core->blog->settings->widgets->put('widgets_nav',$widgets_nav->store()); … … 183 183 $core->blog->settings->widgets->put('widgets_custom',$widgets_custom->store()); 184 184 $core->blog->triggerBlog(); 185 185 186 186 http::redirect($p_url); 187 187 } … … 200 200 $core->blog->settings->widgets->put('widgets_custom',''); 201 201 $core->blog->triggerBlog(); 202 202 203 203 http::redirect($p_url); 204 204 } … … 216 216 echo 217 217 dcPage::jsLoad('js/jquery/jquery-ui.custom.js'). 218 dcPage::jsLoad('js/jquery/jquery.ui.touch-punch.js'). 218 219 dcPage::jsLoad('index.php?pf=widgets/widgets.js'); 219 220 ?> 220 <?php 221 $core->auth->user_prefs->addWorkspace('accessibility'); 221 <?php 222 $core->auth->user_prefs->addWorkspace('accessibility'); 222 223 $user_dm_nodragdrop = $core->auth->user_prefs->accessibility->nodragdrop; 223 224 ?> … … 304 305 ($w->desc() != '' ? ' <span class="form-note">'.__($w->desc()).'</span>' : '').'</dt>'. 305 306 '<dd>'; 306 307 307 308 $w_settings = $w->settings(); 308 309 if (empty($w_settings)) … … 329 330 break; 330 331 } 331 332 332 333 $widget_elements->content .= 333 334 '<li>'. … … 347 348 { 348 349 $res = '<h3>'.$title.'</h3>'; 349 350 350 351 if (!($widgets instanceof dcWidgets)) 351 352 { 352 353 $widgets = $default_widgets; 353 354 } 354 355 355 356 $res .= '<ul id="'.$id.'" class="connected">'; 356 357 $res .= '<li class="empty-widgets" '.(!$widgets->isEmpty() ? 'style="display: none;"' : '').'>'.__('No widget as far.').'</li>';358 357 358 $res .= '<li class="empty-widgets" '.(!$widgets->isEmpty() ? 'style="display: none;"' : '').'>'.__('No widget for now.').'</li>'; 359 359 360 $i = 0; 360 361 foreach ($widgets->elements() as $w) … … 366 367 367 368 $iname = 'w['.$pr.']['.$i.']'; 368 369 369 370 $res .= 370 371 '<li>'.form::hidden(array($iname.'[id]'),html::escapeHTML($w->id())). … … 380 381 '<div class="widgetSettings hidden-if-drag">'.$w->formSettings($iname,$j).'</div>'. 381 382 '</li>'; 382 383 383 384 $i++; 384 385 $j++; 385 386 } 386 387 387 388 $res .= '</ul>'; 388 389 389 390 $res .= '<ul class="sortable-delete"'.($i > 0 ? '':' style="display: none;"').'><li class="sortable-delete-placeholder">'. 390 391 __('Drag widgets here to remove.').'</li></ul>'; 391 392 392 393 return $res; 393 394 } -
plugins/widgets/index.php
r2495 r2496 212 212 <head> 213 213 <title><?php echo __('Widgets'); ?></title> 214 <style type="text/css"> 215 <?php echo file_get_contents(dirname(__FILE__).'/style.css'); ?> 216 </style> 214 <link type="text/css" rel="stylesheet" href="index.php?pf=widgets/style.css"/> 217 215 <?php 218 216 echo … … 268 266 echo 269 267 '</ul>'. 270 $core->formNonce().268 '<p>'.$core->formNonce().'</p>'. 271 269 '<p class="remove-if-drag"><input type="submit" name="append" value="'.__('Add widgets to sidebars').'" /></p>'. 272 270 '</form>'; … … 299 297 300 298 $widget_elements = new stdClass; 301 $widget_elements->content = 302 '<h4>'.__('Use of widgets').'</h4>'. 303 '<p>'.__('Widgets may be used to add various blocks of content to be displayed on your public pages. To add a widget, '. 304 'drag it from the Available widgets list on the left to one of the sidebars on the right of this page. You can order '. 305 'your widgets in a sidebar by dragging them up or down. You must update sidebars to apply your changes.').'</p>'. 306 '<p>'.__('Once included in a sidebar, widgets have configuration options that you can reach by clicking on the arrow next '. 307 'to their name.').'</p>'. 308 '<p>'.__('Reset sidebars to get back to default widgets installation.').'</p>'. 309 '<h4>'.__('Widget templates tags').'</h4>'. 310 '<div id="widgets-tpl">'. 311 '<p>'.__('If you are allowed to edit your theme templates, you can directly add widgets as '. 312 'templates tags, with their own configuration.').'</p>'. 313 '<p>'.__('To add a widget in your template, you need to write code like this:').'</p>'. 314 '<pre><tpl:Widget id="<strong>'.__('Widget ID').'</strong>"> 315 <setting name="<strong>'.__('Setting name').'</strong>"><strong>'.__('Setting value').'</strong></setting> 316 ... 317 </tpl:Widget></pre>'. 318 '<p>'.__('Here are the following available widgets for your blog:').'</p>'; 319 320 $widget_elements->content .= '<dl>'; 299 $widget_elements->content = '<dl>'; 321 300 foreach ($__widgets->elements() as $w) 322 301 { … … 364 343 $widget_elements->content .= '</dl></div>'; 365 344 366 dcPage::helpBlock( $widget_elements);345 dcPage::helpBlock('widgets',$widget_elements); 367 346 368 347 function sidebarWidgets($id,$title,$widgets,$pr,$default_widgets,&$j) … … 382 361 foreach ($widgets->elements() as $w) 383 362 { 384 $upDisabled = $i == 0 ? '" disabled="" src="images/disabled_' : '" src="images/'; 385 $downDisabled = $i == count($widgets->elements())-1 ? '" disabled="" src="images/disabled_' : '" src="images/'; 386 363 $upDisabled = $i == 0 ? ' disabled" src="images/disabled_' : '" src="images/'; 364 $downDisabled = $i == count($widgets->elements())-1 ? ' disabled" src="images/disabled_' : '" src="images/'; 365 $altUp = $i == 0 ? ' alt=""' : ' alt="'.__('Up the widget').'"'; 366 $altDown = $i == count($widgets->elements())-1 ? ' alt=""' : ' alt="'.__('Down the widget').'"'; 367 387 368 $iname = 'w['.$pr.']['.$i.']'; 388 369 … … 393 374 ($w->desc() != '' ? ' <span class="form-note">'.__($w->desc()).'</span>' : ''). 394 375 '<span class="toolsWidget remove-if-drag">'. 395 '<input type="image" class="upWidget'.$upDisabled.'up.png" name="'.$iname.'[_up]" value="'.__('Up the widget').'" />'.396 '<input type="image" class="downWidget'.$downDisabled.'down.png" name="'.$iname.'[_down]" value="'.__('Down the widget').'" />'.' '.397 '<input type="image" class="removeWidget" src="images/trash.png" name="'.$iname.'[_rem]" value="'.__('Remove widget').'" />'.376 '<input type="image" class="upWidget'.$upDisabled.'up.png" name="'.$iname.'[_up]" value="'.__('Up the widget').'"'.$altUp.' /> '. 377 '<input type="image" class="downWidget'.$downDisabled.'down.png" name="'.$iname.'[_down]" value="'.__('Down the widget').'"'.$altDown.' /> '.' '. 378 '<input type="image" class="removeWidget" src="images/trash.png" name="'.$iname.'[_rem]" value="'.__('Remove widget').'" alt="'.__('Remove the widget').'" />'. 398 379 '</span>'. 399 380 '<br class="clear"/></p>'.
Note: See TracChangeset
for help on using the changeset viewer.