Changes in [2183:f6c52cbace25:2184:0176916f2d71]

Files:

• admin/_charte.php (modified) (2 diffs)
• admin/auth.php (modified) (1 diff)
• admin/blog.php (modified) (1 diff)
• admin/blog_del.php (modified) (1 diff)
• admin/blog_pref.php (modified) (2 diffs)
• admin/blog_theme.php (modified) (2 diffs)
• admin/blogs.php (modified) (3 diffs)
• admin/categories.php (modified) (1 diff)
• admin/category.php (modified) (1 diff)
• admin/comment.php (modified) (2 diffs)
• admin/comments.php (modified) (3 diffs)
• admin/help.php (modified) (1 diff)
• admin/images/date-picker.png (modified) (previous)
• admin/images/favicon-off.png (deleted)
• admin/images/favicon.ico (added)
• admin/images/favicon.png (deleted)
• admin/images/favicon96-login.png (added)
• admin/images/favicon96-logout.png (added)
• admin/images/menu/blog-theme-b-update.png (added)
• admin/images/menu/plugins-b-update.png (added)
• admin/index.php (modified) (2 diffs)
• admin/js/jquery/jquery.pageTabs.js (modified) (1 diff)
• admin/js/jsToolBar/jsToolBar.wysiwyg.js (modified) (1 diff)
• admin/langs.php (modified) (1 diff)
• admin/media.php (modified) (5 diffs)
• admin/media_item.php (modified) (1 diff)
• admin/plugin.php (modified) (1 diff)
• admin/plugins.php (modified) (1 diff)
• admin/post.php (modified) (2 diffs)
• admin/posts.php (modified) (3 diffs)
• admin/preferences.php (modified) (2 diffs)
• admin/search.php (modified) (1 diff)
• admin/style/default.css (modified) (10 diffs)
• admin/update.php (modified) (1 diff)
• admin/user.php (modified) (1 diff)
• admin/users.php (modified) (3 diffs)
• admin/users_actions.php (modified) (2 diffs)
• favicon.ico (modified) (previous)
• inc/admin/actions/class.dcaction.php (modified) (2 diffs)
• inc/admin/actions/class.dcactioncomments.php (modified) (4 diffs)
• inc/admin/actions/class.dcactionposts.php (modified) (15 diffs)
• inc/admin/lib.admincombos.php (modified) (2 diffs)
• inc/admin/lib.dc.page.php (modified) (7 diffs)
• inc/admin/lib.pager.php (modified) (3 diffs)
• inc/admin/prepend.php (modified) (1 diff)
• inc/core/class.dc.auth.php (modified) (2 diffs)
• inc/dbschema/upgrade.php (modified) (2 diffs)
• locales/fr/main.po (modified) (1 diff)
• plugins/aboutConfig/index.php (modified) (1 diff)
• plugins/antispam/index.php (modified) (2 diffs)
• plugins/blogroll/edit.php (modified) (1 diff)
• plugins/blogroll/index.php (modified) (1 diff)
• plugins/blowupConfig/index.php (modified) (1 diff)
• plugins/daInstaller/index.php (modified) (1 diff)
• plugins/importExport/index.php (modified) (2 diffs)
• plugins/maintenance/_admin.php (modified) (1 diff)
• plugins/maintenance/icon-big-update.png (added)
• plugins/maintenance/index.php (modified) (3 diffs)
• plugins/pages/class.actionpage.php (modified) (3 diffs)
• plugins/pages/list.php (modified) (1 diff)
• plugins/pages/page.php (modified) (1 diff)
• plugins/pings/index.php (modified) (1 diff)
• plugins/simpleMenu/index.php (modified) (2 diffs)
• plugins/tags/_admin.php (modified) (4 diffs)
• plugins/tags/js/post.js (modified) (1 diff)
• plugins/tags/style.css (modified) (6 diffs)
• plugins/tags/tag_posts.php (modified) (1 diff)
• plugins/tags/tags.php (modified) (1 diff)
• plugins/themeEditor/index.php (modified) (1 diff)
• plugins/userPref/index.php (modified) (3 diffs)
• plugins/widgets/index.php (modified) (1 diff)
• tests/functional/spec/page_tabs.js (modified) (1 diff)

admin/_charte.php

@@ -23 +23 @@
      <meta name="viewport" content="width=device-width, initial-scale=1.0" />
      <title>Bibliothèque de styles - Dotclear - 2.6</title>
-     <link rel="icon" type="image/png" href="images/favicon.png" />
+     <link rel="icon" type="image/png" href="images/favicon96-login.png" />
      <!--[if lt IE 9]>
      <script type="text/javascript" src="js/ie7/IE9.js"></script>
@@ -158 +158 @@
                               </div><!--
                               --><div class="two-boxes even">
-                                   <p><span class="step">2</span> S'il n'y a que deux boîtes, une autre class n'est pas nécessaire. S'il y en a plusieurs, il est conseillé de leur attribuer alternativement les class <code>"odd"</code> et <code>"even"</code> pour que les marges se placent correctement.</p>
+                                   <p><span class="step">2</span> On peut assortir une boîte des class <code>"odd"</code> (nothing left) et <code>"even"</code> pour que les marges se placent correctement.</p>
                               </div><!--
                               --><div class="two-boxes odd">

admin/auth.php

@@ -268 +268 @@
   <meta name="viewport" content="width=device-width, initial-scale=1.0" />
   <title><?php echo html::escapeHTML(DC_VENDOR_NAME); ?></title>
-  <link rel="icon" type="image/png" href="images/favicon-off.png" />
+  <link rel="icon" type="image/png" href="images/favicon96-logout.png" />
+  <link rel="shortcut icon" href="favicon.ico" type="image/x-icon" />
+
   
 <?php

admin/blog.php

@@ -72 +72 @@
                     __('System') => '',
                     __('Blogs') => 'blogs.php',
-                    '<span class="page-title">'.__('New blog').'</span>' => ''
+                    __('New blog') => ''
                ))
      );

admin/blog_del.php

@@ -54 +54 @@
                __('System') => '',
                __('Blogs') => 'blogs.php',
-               '<span class="page-title">'.__('Delete a blog').'</span>' => ''
+               __('Delete a blog') => ''
           ))
 );

admin/blog_pref.php

@@ -270 +270 @@
           array(
                html::escapeHTML($blog_name) => '',
-               '<span class="page-title">'.__('Blog settings').'</span>' => ''
-          ));
+               __('Blog settings') => ''
+          )
+     );
 } else {
      $breadcrumb = dcPage::breadcrumb(
@@ -277 +278 @@
                __('System') => '',
                __('Blogs') => 'blogs.php',
-               '<span class="page-title">'.__('Blog settings').' : '.html::escapeHTML($blog_name).'</span>' => ''
+               __('Blog settings').' : '.html::escapeHTML($blog_name) => ''
           ));
 }

admin/blog_theme.php

@@ -212 +212 @@
           array(
                html::escapeHTML($core->blog->name) => '',
-               '<span class="page-title">'.__('Blog appearance').'</span>' => ''
+               __('Blog appearance') => ''
           ));
 } else {
@@ -219 +219 @@
                html::escapeHTML($core->blog->name) => '',
                __('Blog appearance') => 'blog_theme.php',
-               '<span class="page-title">'.__('Theme configuration').'</span>' => ''
+               __('Theme configuration') => ''
           ));
 }

admin/blogs.php

@@ -73 +73 @@
 -------------------------------------------------------- */
 
-$form_filter_title = __('Filter blogs list and display options');
+$form_filter_title = __('Show filters and display options');
 $starting_script  = dcPage::jsLoad('js/filter-controls.js');
 $starting_script .=
@@ -80 +80 @@
      dcPage::jsVar('dotclear.msg.show_filters', $show_filters ? 'true':'false')."\n".
      dcPage::jsVar('dotclear.msg.filter_posts_list',$form_filter_title)."\n".
-     dcPage::jsVar('dotclear.msg.cancel_the_filter',__('Cancel the filter'))."\n".
+     dcPage::jsVar('dotclear.msg.cancel_the_filter',__('Cancel filters and display options'))."\n".
      "//]]>".
      "</script>";
@@ -88 +88 @@
           array(
                __('System') => '',
-               '<span class="page-title">'.__('List of blogs').'</span>' => ''
+               __('List of blogs')
           ))
 );

admin/categories.php

@@ -107 +107 @@
           array(
                html::escapeHTML($core->blog->name) => '',
-               '<span class="page-title">'.__('Categories').'</span>' => ''
+               __('Categories') => ''
           ))
 );

admin/category.php

@@ -166 +166 @@
      }
 }
-$elements['<span class="page-title">'.$title.'</span>'] = '';
+$elements[$title] = '';
 
 dcPage::open($title,

admin/comment.php

@@ -164 +164 @@
                html::escapeHTML($core->blog->name) => '',
                html::escapeHTML($post_title) => $core->getPostAdminURL($post_type,$post_id).'&co=1#c'.$comment_id,
-               '<span class="page-title">'.__('Edit comment').'</span>' => ''
+               __('Edit comment') => ''
           ));
 } else {
@@ -171 +171 @@
                html::escapeHTML($core->blog->name) => '',
                html::escapeHTML($post_title) => $core->getPostAdminURL($post_type,$post_id),
-               '<span class="page-title">'.__('Edit comment').'</span>' => ''
+               __('Edit comment') => ''
           ));
 }

admin/comments.php

@@ -153 +153 @@
 -------------------------------------------------------- */
 
-$form_filter_title = __('Filter comments, trackbacks list and display options');
+$form_filter_title = __('Show filters and display options');
 $starting_script  = dcPage::jsLoad('js/_comments.js');
 $starting_script .= dcPage::jsLoad('js/filter-controls.js');
@@ -161 +161 @@
      dcPage::jsVar('dotclear.msg.show_filters', $show_filters ? 'true':'false')."\n".
      dcPage::jsVar('dotclear.msg.filter_posts_list',$form_filter_title)."\n".
-     dcPage::jsVar('dotclear.msg.cancel_the_filter',__('Cancel the filter'))."\n".
+     dcPage::jsVar('dotclear.msg.cancel_the_filter',__('Cancel filters and display options'))."\n".
      "//]]>".
      "</script>";
@@ -169 +169 @@
           array(
                html::escapeHTML($core->blog->name) => '',
-               '<span class="page-title">'.__('Comments and trackbacks').'</span>' => ''
+               __('Comments and trackbacks') => ''
           ))
 );

admin/help.php

@@ -77 +77 @@
           array(
                __('Global help') => 'help.php',
-               '<span class="page-title">'.$content_array['title'].'</span>' => ''
+               $content_array['title'] => ''
           ));
 } else {
      $breadcrumb = dcPage::breadcrumb(
           array(
-               '<span class="page-title">'.__('Global help').'</span>' => ''
+               __('Global help') => ''
           ));
 }

admin/index.php

@@ -205 +205 @@
      dcPage::breadcrumb(
           array(
-          '<span class="page-title">'.__('Dashboard').' : '.html::escapeHTML($core->blog->name).'</span>' => ''
+          __('Dashboard').' : '.html::escapeHTML($core->blog->name) => ''
           ),
-          false)
+          array('home_link' =>false)
+     )
 );
 
@@ -228 +229 @@
 }
 
-if ($core->auth->getInfo('user_default_blog') != $core->blog->id && $core->auth->blog_count > 1) {
+if ($core->auth->getInfo('user_default_blog') != $core->blog->id && $core->auth->getBlogCount() > 1) {
      echo
      '<p><a href="index.php?default_blog=1" class="button">'.__('Make this blog my default blog').'</a></p>';

admin/js/jquery/jquery.pageTabs.js

@@ -72 +72 @@
      
      $.pageTabs.clickTab = function(tab) {
+          if (tab=='') {
+               tab = getHash($('ul li a', '.'+$.pageTabs.options.containerClass+':eq(0)').attr('href'));
+          }
+
           $('ul li a', '.'+$.pageTabs.options.containerClass).filter(function() {
                return getHash($(this).attr('href'))==tab;

admin/js/jsToolBar/jsToolBar.wysiwyg.js

@@ -89 +89 @@
                var idoc = This.iwin.document;
                var para = idoc.createElement('p');
-               para.appendChild(idoc.createTextNode(''));
+               para.appendChild(idoc.createElement('br'));
                while (idoc.body.hasChildNodes()) {
                     idoc.body.removeChild(idoc.body.lastChild);

admin/langs.php

@@ -133 +133 @@
      array(
           __('System') => '',
-          '<span class="page-title">'.__('Languages management').'</span>' => ''
+          __('Languages management') => ''
      ))
 );

admin/media.php

@@ -212 +212 @@
                     html::escapeHTML($core->blog->name) => '',
                     __('Media manager') => '',
-                    '<span class="page-title">'.__('confirm removal').'</span>' => ''
-               ),!$popup)
+                    __('confirm removal') => ''
+               ),
+               array('home_link' => !$popup)
+          )
      );
      
@@ -240 +242 @@
           array(
                html::escapeHTML($core->blog->name) => '',
-               '<span class="page-title">'.__('Media manager').'</span>' => ''
-          ),!$popup);
+               __('Media manager') => ''
+          ),
+          array('home_link' => !$popup)
+     );
 } else {
      $breadcrumb_media = $core->media->breadCrumb(html::escapeURL($page_url).'&amp;d=%s','<span class="page-title">%s</span>');
@@ -248 +252 @@
                array(
                     html::escapeHTML($core->blog->name) => '',
-                    '<span class="page-title">'.__('Media manager').'</span>' => ''
-               ),!$popup);
+                    __('Media manager') => ''
+               ),
+               array('home_link' => !$popup)
+          );
      } else {
           $breadcrumb = dcPage::breadcrumb(
@@ -256 +262 @@
                     __('Media manager') => html::escapeURL($page_url.'&d='),
                     $breadcrumb_media => ''
-               ),!$popup);
+               ),
+               array(
+                    'home_link' => !$popup,
+                    'hl' => false
+               )
+          );
      }
 }
@@ -409 +420 @@
 {
      echo
-     '<div class="two-boxes fieldset">';     
+     '<div class="two-boxes fieldset even">';     
      if ($user_ui_enhanceduploader) {
           echo

admin/media_item.php

@@ -206 +206 @@
                __('Media manager') => html::escapeURL($media_page_url),
                $core->media->breadCrumb(html::escapeURL($media_page_url).'&amp;d=%s').'<span class="page-title">'.$file->basename.'</span>' => ''
-          ),!$popup)
+          ),
+          array(
+               'home_link' => !$popup,
+               'hl' => false
+          )
+     )
 );
 

admin/plugin.php

@@ -85 +85 @@
                array(
                     __('System') => '',
-                    '<span class="page-title">'.__('Plugin not found').'</span>' => ''
+                    __('Plugin not found') => ''
                ))
      );

admin/plugins.php

@@ -195 +195 @@
           array(
                __('System') => '',
-               '<span class="page-title">'.__('Plugins management').'</span>' => ''
+               __('Plugins management') => ''
           ))
 );

admin/post.php

@@ -298 +298 @@
                # --BEHAVIOR-- adminAfterPostUpdate
                $core->callBehavior('adminAfterPostUpdate',$cur,$post_id);
-               
-               http::redirect('post.php?id='.$post_id.'&upd=1');
+               dcPage::addSuccessNotice (sprintf('The post "%s" has been successfully updated',html::escapeHTML($cur->post_title)));
+               http::redirect('post.php?id='.$post_id);
           }
           catch (Exception $e)
@@ -385 +385 @@
                html::escapeHTML($core->blog->name) => '',
                __('Entries') => 'posts.php',
-               '<span class="page-title">'.($post_id ? $page_title_edit : $page_title).'</span>' => ''
+               ($post_id ? $page_title_edit : $page_title) => ''
           ))
 );

admin/posts.php

@@ -213 +213 @@
 -------------------------------------------------------- */
 
-$form_filter_title = __('Filter users list and display options');
+$form_filter_title = __('Show filters and display options');
 $starting_script  = dcPage::jsLoad('js/_posts_list.js');
 $starting_script .= dcPage::jsLoad('js/filter-controls.js');
@@ -221 +221 @@
      dcPage::jsVar('dotclear.msg.show_filters', $show_filters ? 'true':'false')."\n".
      dcPage::jsVar('dotclear.msg.filter_posts_list',$form_filter_title)."\n".
-     dcPage::jsVar('dotclear.msg.cancel_the_filter',__('Cancel the filter'))."\n".
+     dcPage::jsVar('dotclear.msg.cancel_the_filter',__('Cancel filters and display options'))."\n".
      "//]]>".
      "</script>";
@@ -229 +229 @@
           array(
                html::escapeHTML($core->blog->name) => '',
-               '<span class="page-title">'.__('Entries').'</span>' => ''
+               __('Entries') => ''
           ))
 );

admin/preferences.php

@@ -382 +382 @@
      array(
           html::escapeHTML($core->auth->userID()) => '',
-          '<span class="page-title">'.$page_title.'</span>' => ''
+          $page_title => ''
      ))
 );
@@ -543 +543 @@
 echo '<h3>'.__('My dashboard').'</h3>';
 
-echo '<form action="preferences.php" method="post" id="favs-form" class="two-boxes">';
+echo '<form action="preferences.php" method="post" id="favs-form" class="two-boxes odd">';
 
 echo '<div id="my-favs" class="fieldset"><h4>'.__('My favorites').'</h4>';

admin/search.php

@@ -74 +74 @@
           array(
                html::escapeHTML($core->blog->name) => '',
-               '<span class="page-title">'.__('Search').'</span>' => ''
+               __('Search') => ''
           ))
 );

admin/style/default.css

@@ -149 +149 @@
           }
 /* ------------------------------------------------- layout: optionnal one/two-boxes */
-.one-box, .two-boxes, .three-boxes, .box {
-     margin-bottom: 1em;
-     }
 .one-box {
      text-align: justify;
      }
+.two-boxes, .three-boxes, .box {
+     display: inline-block;
+     vertical-align: top;
+     margin: 0 1.5% 1em;
+     -moz-box-sizing: border-box; 
+     -webkit-box-sizing: border-box; 
+     box-sizing: border-box;  
+     }
 .two-boxes {
      width: 47%;
-     display: inline-block;
-     vertical-align: top;
-     margin-right: 2%;
-     -moz-box-sizing: border-box; 
-     -webkit-box-sizing: border-box; 
-     box-sizing: border-box;
-     }
-     .two-boxes:first-child, .two-boxes.odd, .two-boxes.odd:last-child {
-          margin-right: 3%;
-          margin-left: 0;
-          }
-     .two-boxes.even:last-child, .two-boxes.even {
-          margin-left: 3%;
-          margin-right: 0;
-          }
+     }
 .three-boxes {
      width: 30%;
-     display: inline-block;
-     vertical-align: top;
-     margin-left: 1.5%;
-     margin-right: 1.5%; 
-     -moz-box-sizing: border-box; 
-     -webkit-box-sizing: border-box; 
-     box-sizing: border-box;
-     }
-     .three-boxes:first-child, .three-boxes.first-child {
-          margin-left: 0;
-          }
-     .three-boxes:last-child, .three-boxes.last-child {
-          margin-right: 0;
-          }
-/* boîtes intérieures distribuées horizontalement */
+     }
 .box {
-     display: inline-block;
-     vertical-align: top;
-     margin-right: 3%; 
-     text-align: left;
-     }
-.box:last-child {
+     margin-left: 0;
+     margin-right: 0;
+     }
+.odd {
+     margin-left: 0;
+     }
+.even {
      margin-right: 0;
      }
@@ -448 +426 @@
 h1 a:link, h1 a:visited {
      border:   none;
+     }
+.discrete a {
+     color: #333;
      }
 /* ----------------------------------------------------------------------------
@@ -1474 +1455 @@
           }
           .box.small {
-               width: 300px;
+               width: 320px;
                }
           .box.medium {
-               width: 640px;
+               width: 660px;
                }
           .box.large {
@@ -2394 +2375 @@
      display: block;
      }
+/* ---------------------------------------------- Couleurs ajoutées via javascript   
+/* color-picker.js */
+.color-color-picker {
+     border: 1px solid #000;
+     width: 195px;
+     background: #fff;
+     }
+/* _blog_theme.js */
+.select-button {
+     font-weight: bold;
+     }
+/* _media_item.js */
+.color-div {
+     border: 1px solid #ccc;
+     }
+/* fadings ('color' est utilisé comme variable, pas comme text color) */
+.colorBeginPassword, .colorBeginValidatorErr, .colorBeginUserMail {
+     color: #fff;
+     }
+.colorEndPassword, .colorEndError, .colorEndValidatorErr, .colorEndUserMail {
+     color: #ffbaba;
+     }
+.colorBeginMessage {
+     color: #ccc;
+     }
+.colorEndMessage, .colorBeginValidatorMsg {
+     color: #676e78;
+     }
+.colorBeginError {
+     color: #ffdec8;
+     }
+.colorBeginSuccess {
+     color: #9BCA1C;
+     }
+.colorEndSuccess {
+     color: #bee74b;
+     }
+ .colorEndValidatorMsg {
+     color: #ffcc00;
+     }
 /* ------------------------------------------------------------------------------------
                                                                            UN POIL DE MEDIA QUERIES
@@ -2433 +2454 @@
      #top-info-user a.active {
           padding: 2px 8px;
+          background: #999;
+          color: #FFF;
+          border-width: 0;
+          -webkit-border-radius: 6px;
+                  border-radius: 6px;
           } 
      .three-boxes, .three-boxes .box,
-     .three-boxes:first-child, .three-boxes.first-child,
-     .three-boxes:last-child, .three-boxes.last-child,
      .two-cols .col70, .two-cols .col30 {
           width: 100%;
@@ -2457 +2481 @@
           top: 77px;
           }
-     .one-box, .two-boxes,
-     .one-box .box, .two-boxes .box, .two-boxes.odd, .two-boxes.even,
-     .two-boxes:first-child, .two-boxes.odd, .two-boxes.odd:last-child,
-     .two-boxes.even:last-child, .two-boxes.even,
+     .one-box, .two-boxes, .two-boxes.odd, .two-boxes.even, .box,
      .two-cols .col {
           width: 100%;
@@ -2493 +2514 @@
           display: inline;
           }
-     #content {
+     #content, .hide-mm #content {
           margin: 0;
           padding: 0 .5em !important;
@@ -2502 +2523 @@
      #main #content > h2 {
           margin: 0;
-          padding: 6px 0;
+          padding: 6px 30px 6px 0;
           }
      #dashboard-boxes .box.medium,
      #dashboard-boxes .box.small,
      #dashboard-boxes .box.large {
-          width: 90%;
+          width: 100%;
           margin: 10px auto;
           }
      }
-@media screen and (max-width: 500px) {
+@media screen and (max-width: 420px) {
      h1, h1 a {
           padding: 0;
@@ -2519 +2540 @@
           display: none;
           }
+     #top-info-blog {
+          margin-bottom: .5em;
+          max-width: 75%;
+          }
      #top-info-blog select {
           margin-bottom: .5em;
-          margin-right: 0 !important;
-          }
-     #top-info-blog p {
-          display: block;
           }
      #icons p {
@@ -2533 +2554 @@
           }
      }
-/* ---------------------------------------------- Couleurs ajoutées via javascript   
-/* color-picker.js */
-.color-color-picker {
-     border: 1px solid #000;
-     width: 195px;
-     background: #fff;
-     }
-/* _blog_theme.js */
-.select-button {
-     font-weight: bold;
-     }
-/* _media_item.js */
-.color-div {
-     border: 1px solid #ccc;
-     }
-/* fadings ('color' est utilisé comme variable, pas comme text color) */
-.colorBeginPassword, .colorBeginValidatorErr, .colorBeginUserMail {
-     color: #fff;
-     }
-.colorEndPassword, .colorEndError, .colorEndValidatorErr, .colorEndUserMail {
-     color: #ffbaba;
-     }
-.colorBeginMessage {
-     color: #ccc;
-     }
-.colorEndMessage, .colorBeginValidatorMsg {
-     color: #676e78;
-     }
-.colorBeginError {
-     color: #ffdec8;
-     }
-.colorBeginSuccess {
-     color: #9BCA1C;
-     }
-.colorEndSuccess {
-     color: #bee74b;
-     }
- .colorEndValidatorMsg {
-     color: #ffcc00;
-     }

admin/update.php

@@ -178 +178 @@
           array(
                __('System') => '',
-               '<span class="page-title">'.__('Dotclear update').'</span>' => ''
+               __('Dotclear update') => ''
           ))
 );

admin/user.php

@@ -186 +186 @@
                __('System') => '',
                __('Users') => 'users.php',
-               '<span class="page-title">'.$page_title.'</span>' => ''
+               $page_title => ''
           ))
 );

admin/users.php

@@ -93 +93 @@
 -------------------------------------------------------- */
 
-$form_filter_title = __('Filter users list and display options');
+$form_filter_title = __('Show filters and display options');
 $starting_script  = dcPage::jsLoad('js/_users.js');
 $starting_script .= dcPage::jsLoad('js/filter-controls.js');
@@ -101 +101 @@
      dcPage::jsVar('dotclear.msg.show_filters', $show_filters ? 'true':'false')."\n".
      dcPage::jsVar('dotclear.msg.filter_posts_list',$form_filter_title)."\n".
-     dcPage::jsVar('dotclear.msg.cancel_the_filter',__('Cancel the filter'))."\n".
+     dcPage::jsVar('dotclear.msg.cancel_the_filter',__('Cancel filters and display options'))."\n".
      "//]]>".
      "</script>";
@@ -109 +109 @@
           array(
                __('System') => '',
-               '<span class="page-title">'.__('Users').'</span>' => ''
+               __('Users') => ''
           ))
 );

admin/users_actions.php

@@ -136 +136 @@
                __('System') => '',
                __('Users') => 'users.php',
-               '<span class="page-title">'.__('Permissions').'</span>' => ''
+               __('Permissions') => ''
           ));
 } else {
@@ -143 +143 @@
                __('System') => '',
                __('Users') => 'users.php',
-               '<span class="page-title">'.__('Actions').'</span>' => ''
+               __('Actions') => ''
           ));
 }

inc/admin/actions/class.dcaction.php

@@ -225 +225 @@
      * @return string the redirection url
      */
-     public function getRedirection($params=array(),$with_selected_entries=false) {
+     public function getRedirection($with_selected_entries=false,$params=array()) {
           $redir_args = array_merge($params,$this->redir_args);
           if ($with_selected_entries) {
@@ -240 +240 @@
      * @access public
      */
-     public function redirect($params=array(),$with_selected_entries=false) {
-          http::redirect($this->getRedirection($params,$with_selected_entries));
+     public function redirect($with_selected_entries=false,$params=array()) {
+          http::redirect($this->getRedirection($with_selected_entries,$params));
           exit;
      }    

inc/admin/actions/class.dcactioncomments.php

@@ -46 +46 @@
 
           }
-          echo '<p><a class="back" href="'.$this->getRedirection(array(),true).'">'.__('Back to comments list').'</a></p>';
+          echo '<p><a class="back" href="'.$this->getRedirection(true).'">'.__('Back to comments list').'</a></p>';
      }
      
@@ -59 +59 @@
                     html::escapeHTML($this->core->blog->name) => '',
                     __('Comments') => 'comments.php',
-                    '<span class="page-title">'.__('Comments actions').'</span>' => ''
+                    __('Comments actions') => ''
                ))
           );
@@ -149 +149 @@
           
           $core->blog->updCommentsStatus($co_ids,$status);
-          $ap->redirect(array('upd'=>1),true);
+          $ap->redirect(true,array('upd'=>1));
      }
 
@@ -168 +168 @@
           
           $core->blog->delComments($co_ids);
-          $ap->redirect(array('del'=>1), false);
+          $ap->redirect(false,array('del'=>1));
      }
 }

inc/admin/actions/class.dcactionposts.php

@@ -44 +44 @@
                );
           }
-          echo '<p><a class="back" href="'.$this->getRedirection(array(),true).'">'.__('Back to entries list').'</a></p>';
+          echo '<p><a class="back" href="'.$this->getRedirection(true).'">'.__('Back to entries list').'</a></p>';
      }
      
@@ -60 +60 @@
                array(
                     html::escapeHTML($this->core->blog->name) => '',
-                    $this->getCallerTitle() => $this->getRedirection(array(),true),
-                    '<span class="page-title">'.__('Entries actions').'</span>' => ''
+                    $this->getCallerTitle() => $this->getRedirection(true),
+                    __('Entries actions') => ''
                ))
           );
@@ -159 +159 @@
           }
           $core->blog->updPostsStatus($posts_ids,$status);
-          
-          $ap->redirect(array('upd' => 1),true);
+          dcPage::addSuccessNotice(sprintf(
+               __(
+                    '%d entry has been successfully updated to status : "%s"',
+                    '%d entries have been successfully updated to status : "%s"',
+                    count($posts_ids)
+               ),
+               count($posts_ids),
+               $core->blog->getPostStatus($status))
+          );
+          $ap->redirect(true);
      }
      
@@ -170 +178 @@
           $action = $ap->getAction();
           $core->blog->updPostsSelected($posts_ids,$action == 'selected');
-          
-          $ap->redirect(array('upd' => 1),true);
+          if ($action == 'selected') {
+               dcPage::addSuccessNotice(sprintf(
+                    __(
+                         '%d entry has been successfully marked as selected',
+                         '%d entries have been successfully marked as selected',
+                         count($posts_ids)
+                    ),
+                    count($posts_ids))
+               );
+          } else {
+               dcPage::addSuccessNotice(sprintf(
+                    __(
+                         '%d entry has been successfully marked as unselected',
+                         '%d entries have been successfully marked as unselected',
+                         count($posts_ids)
+                    ),
+                    count($posts_ids))
+               );
+          }
+          $ap->redirect(true);
      }
      
@@ -191 +217 @@
           
           $core->blog->delPosts($posts_ids);
+          dcPage::addSuccessNotice(sprintf(
+               __(
+                    '%d entry has been successfully deleted',
+                    '%d entries have been successfully deleted',
+                    count($posts_ids)
+               ),
+               count($posts_ids))
+          );
           
-          $ap->redirect(array('del',1),false);
+          $ap->redirect(false);
      }
 
@@ -207 +241 @@
                     $cur_cat->cat_title = $post['new_cat_title'];
                     $cur_cat->cat_url = '';
+                    $title = $cur_cat->cat_title;
                     
                     $parent_cat = !empty($post['new_cat_parent']) ? $post['new_cat_parent'] : '';
@@ -220 +255 @@
                
                $core->blog->updPostsCategory($posts_ids, $new_cat_id);
-               
-               $ap->redirect(array('upd'=>1),true);
+               $title = $core->blog->getCategory($new_cat_id);
+               dcPage::addSuccessNotice(sprintf(
+                    __(
+                         '%d entry has been successfully moved to category "%s"',
+                         '%d entries have been successfully moved to category "%s"',
+                         count($posts_ids)
+                    ),
+                    count($posts_ids),
+                    html::escapeHTML($title->cat_title))
+               );
+
+               $ap->redirect(true);
           } else {
 
@@ -228 +273 @@
                          array(
                               html::escapeHTML($core->blog->name) => '',
-                              $ap->getCallerTitle() => $ap->getRedirection(array(),true),
-                              '<span class="page-title">'.__('Change category for this selection').'</span>' => ''
+                              $ap->getCallerTitle() => $ap->getRedirection(true),
+                              __('Change category for this selection') => ''
                )));
                # categories list
@@ -237 +282 @@
                );             
                echo
-               '<form action="'.$ap->getRedirection(array(),true).'" method="post">'.
+               '<form action="'.$ap->getURI().'" method="post">'.
                $ap->getCheckboxes().
                '<p><label for="new_cat_id" class="classic">'.__('Category:').'</label> '.
@@ -279 +324 @@
                $cur->user_id = $new_user_id;
                $cur->update('WHERE post_id '.$core->con->in($posts_ids));
-               
-               $ap->redirect(array('upd' => 1),true);
+               dcPage::addSuccessNotice(sprintf(
+                    __(
+                         '%d entry has been successfully set to user "%s"',
+                         '%d entries have been successfully set to user "%s"',
+                         count($posts_ids)
+                    ),
+                    count($posts_ids),
+                    html::escapeHTML($new_user_id))
+               );
+
+
+               $ap->redirect(true);
           } else {
                $usersList = '';
@@ -298 +353 @@
                          array(
                               html::escapeHTML($core->blog->name) => '',
-                              $ap->getCallerTitle() => $ap->getRedirection(array(),true),
-                              '<span class="page-title">'.__('Change author for this selection').'</span>' => '')),
+                              $ap->getCallerTitle() => $ap->getRedirection(true),
+                              __('Change author for this selection') => '')),
                          dcPage::jsLoad('js/jquery/jquery.autocomplete.js').
                          '<script type="text/javascript">'."\n".
@@ -309 +364 @@
 
                echo
-               '<form action="'.$ap->getRedirection(array(),true).'" method="post">'.
+               '<form action="'.$ap->getURI().'" method="post">'.
                $ap->getCheckboxes().
                '<p><label for="new_auth_id" class="classic">'.__('New author (author ID):').'</label> '.
@@ -332 +387 @@
                $cur->post_lang = $new_lang;
                $cur->update('WHERE post_id '.$core->con->in($posts_ids));
-               
-               $ap->redirect(array('upd' => 1),true);
+               dcPage::addSuccessNotice(sprintf(
+                    __(
+                         '%d entry has been successfully set to language "%s"',
+                         '%d entries have been successfully set to language "%s"',
+                         count($posts_ids)
+                    ),
+                    count($posts_ids),
+                    html::escapeHTML(l10n::getLanguageName($new_lang)))
+               );
+               $ap->redirect(true);
           } else {
                $ap->beginPage(
@@ -339 +402 @@
                          array(
                               html::escapeHTML($core->blog->name) => '',
-                              $ap->getCallerTitle() => $ap->getRedirection(array(),true),
-                              '<span class="page-title">'.__('Change language for this selection').'</span>' => ''
+                              $ap->getCallerTitle() => $ap->getRedirection(true),
+                              _('Change language for this selection') => ''
                )));
                # lang list
@@ -359 +422 @@
                
                echo
-               '<form action="'.$ap->getRedirection(array(),true).'" method="post">'.
+               '<form action="'.$ap->getURI().'" method="post">'.
                $ap->getCheckboxes().
                

inc/admin/lib.admincombos.php

@@ -30 +30 @@
      @return   <b>array</b> the combo box (form::combo -compatible format)
      */
-     public static function getCategoriesCombo($categories,$include_empty = true) {
+     public static function getCategoriesCombo($categories,$include_empty = true,$use_url = false) {
           $categories_combo = array();
           if ($include_empty) {
@@ -38 +38 @@
                $categories_combo[] = new formSelectOption (
                     html::escapeHTML($categories->cat_title).' ('.$categories->nb_post.')',
-                    $categories->cat_id,
+                    ($use_url ? $categories->cat_url : $categories->cat_id),
                     ($categories->level-1 ? 'sub-option'.($categories->level-1) : '')
                );

inc/admin/lib.dc.page.php

@@ -54 +54 @@
 
           # List of user's blogs
-          if ($core->auth->blog_count == 1 || $core->auth->blog_count > 20)
+          if ($core->auth->getBlogCount() == 1 || $core->auth->getBlogCount() > 20)
           {
                $blog_box =
@@ -60 +60 @@
                html::escapeHTML($core->blog->name).'</strong>';
 
-               if ($core->auth->blog_count > 20) {
+               if ($core->auth->getBlogCount() > 20) {
                     $blog_box .= ' - <a href="blogs.php">'.__('Change blog').'</a>';
                }
@@ -108 +108 @@
           $user_ui_hide_std_favicon = $core->auth->user_prefs->interface->hide_std_favicon;
           if (!$user_ui_hide_std_favicon) {
-               echo '<link rel="icon" type="image/png" href="images/favicon.png" />';
-          }
-
+               echo 
+               '<link rel="icon" type="image/png" href="images/favicon96-login.png" />'.
+               '<link rel="shortcut icon" href="images/favicon.ico" type="image/x-icon" />';
+          }
           echo
           self::jsCommon().
@@ -174 +175 @@
                '</div>';
           }
-     }
-
+          
+          if (isset($_SESSION['notifications'])) {
+               $types = array("success" => "success", "warning" => "warning-msg");
+               $notifications = $_SESSION['notifications'];
+               foreach ($types as $type => $class) {
+                    if (isset($notifications[$type])) {
+                         foreach ($notifications[$type] as $n) {
+                              echo self::getNotification($n,$class);
+                         }
+                    }
+               }
+               unset($_SESSION['notifications']);
+          }
+          
+     }
+     public static function AddNotice($type,$message) {
+          $notification = isset($_SESSION['notifications']) ? $_SESSION['notifications']:array();
+          $notification[$type][] = array('ts' => time(), 'text' => $message);
+          $_SESSION['notifications'] = $notification;
+     }
+     public static function addSuccessNotice($message) {
+          self::addNotice("success",$message);
+     }
+     public static function addWarningNotice($message) {
+          self::addNotice("warning",$message);
+     }
+     
+     protected static function getNotification($msg,$class) {
+          global $core;
+          $res = '<p class="'.$class.'">'.
+          dt::str(__('[%H:%M:%S] '),$msg['ts'],$core->auth->getInfo('user_tz')).' '.$msg['text'].
+          '</p>';
+          return $res;   
+     }
      public static function close()
      {
@@ -303 +336 @@
      }
 
-     public static function breadcrumb($elements=null,$with_home_link=true,$echo=false)
-     {
+     public static function breadcrumb($elements=null,$options=array())
+     {
+          $with_home_link = isset($options['home_link'])?$options['home_link']:true;
+          $hl = isset($options['hl'])?$options['hl']:true;
+          $hl_pos = isset($options['hl_pos'])?$options['hl_pos']:-1;
           // First item of array elements should be blog's name, System or Plugins
           $res = '<h2>'.($with_home_link ?
@@ -310 +346 @@
                '<img src="style/dashboard-alt.png" alt="" />');
           $index = 0;
+          if ($hl_pos < 0) {
+               $hl_pos = count($elements)+$hl_pos;
+          }
           foreach ($elements as $element => $url) {
+               if ($hl && $index == $hl_pos) {
+                    $element = sprintf('<span class="page-title">%s</span>',$element);
+               }
                $res .= ($with_home_link ? ($index == 1 ? ' : ' : ' &rsaquo; ') : ($index == 0 ? ' ' : ' &rsaquo; ')).
                     ($url ? '<a href="'.$url.'">' : '').$element.($url ? '</a>' : '');
@@ -316 +358 @@
           }
           $res .= '</h2>';
-          if ($echo) {
-               echo $res;
-          }
           return $res;
      }

inc/admin/lib.pager.php

@@ -409 +409 @@
                '<th scope="col">'.__('Date').'</th>'.
                '<th scope="col" class="txt-center">'.__('Status').'</th>'.
-               '<th scope="col" abbr="entry">'.__('Entry title').'</th>'.
+               '<th scope="col" abbr="entry">'.__('Entry').'</th>'.
                '</tr>%s</table></div>';
 
@@ -469 +469 @@
           
           $post_title = html::escapeHTML($this->rs->post_title);
-          if (mb_strlen($post_title) > 60) {
-               $post_title = mb_strcut($post_title,0,57).'...';
+          if (mb_strlen($post_title) > 70) {
+               $post_title = mb_strcut($post_title,0,67).'...';
           }
           $comment_title = sprintf(__('Edit the %1$s from %2$s'),
@@ -489 +489 @@
           '<td class="nowrap count">'.dt::dt2str(__('%Y-%m-%d %H:%M'),$this->rs->comment_dt).'</td>'.
           '<td class="nowrap status txt-center">'.$img_status.'</td>'.
-          '<td class="nowrap"><a href="'.$post_url.'">'.
+          '<td class="nowrap discrete"><a href="'.$post_url.'">'.
           html::escapeHTML($post_title).'</a>'.
           ($this->rs->post_type != 'post' ? ' ('.html::escapeHTML($this->rs->post_type).')' : '').'</td>';

inc/admin/prepend.php

@@ -351 +351 @@
           preg_match('/blogs.php$/',$_SERVER['REQUEST_URI']),
           $core->auth->isSuperAdmin() ||
-          $core->auth->check('usage,contentadmin',$core->blog->id) && $core->auth->blog_count > 1);
+          $core->auth->check('usage,contentadmin',$core->blog->id) && $core->auth->getBlogCount() > 1);
 
      if (!$user_ui_nofavmenu) {

inc/core/class.dc.auth.php

@@ -377 +377 @@
                return $this->blogs[$blog_id];
           }
-          
-          if ($this->blog_count === null) {
-               $this->blog_count = $this->core->getBlogs(array(),true)->f(0);
-          }
-          
+
           if ($this->user_admin) {
                $strReq = 'SELECT blog_id '.
@@ -404 +400 @@
           return $this->blogs[$blog_id];
      }
+
+    public function getBlogCount() {
+          if ($this->blog_count === null) {
+               $this->blog_count = $this->core->getBlogs(array(),true)->f(0);
+          }
+
+        return $this->blog_count;
+    }
      
      public function findUserBlog($blog_id=null)

inc/dbschema/upgrade.php

@@ -14 +14 @@
 function dotclearUpgrade($core)
 {
+    $cleanup_sessions = false; // update it in a step that needed sessions to be removed
      $version = $core->getVersion('core');
      
@@ -344 +345 @@
                $core->blogDefaults();
                
-               # Drop content from session table
-               $core->con->execute('DELETE FROM '.$core->prefix.'session ');
+               # Drop content from session table if changes or if needed
+               if ($changes != 0 || $cleanup_sessions) {
+                    $core->con->execute('DELETE FROM '.$core->prefix.'session ');
+               }
                
                # Empty templates cache directory

locales/fr/main.po

@@ -3699 +3699 @@
 msgid "Trackbacks received"
 msgstr "Rétroliens reçus"
+
+msgid "Show filters and display options"
+msgstr "Afficher les filtres et options d'affichage"
+
+msgid "Cancel filters and display options"
+msgstr "Annuler les filtres et options d'affichage"

plugins/aboutConfig/index.php

@@ -119 +119 @@
           __('System') => '',
           html::escapeHTML($core->blog->name) => '',
-          '<span class="page-title">'.__('about:config').'</span>' => ''
+          __('about:config') => ''
      ));
 if (!empty($_GET['upd'])) {

plugins/antispam/index.php

@@ -127 +127 @@
                __('Plugins') => '',
                $page_name => $p_url,
-               '<span class="page-title">'.sprintf(__('%s filter configuration'),$filter->name).'</span>' => ''
+               sprintf(__('%s filter configuration'),$filter->name) => ''
           ));
 
@@ -139 +139 @@
           array(
                __('Plugins') => '',
-               '<span class="page-title">'.$page_name.'</span>' => ''
+               $page_name => ''
           ));
 

plugins/blogroll/edit.php

@@ -99 +99 @@
           array(
                html::escapeHTML($core->blog->name) => '',
-               '<span class="page-title">'.__('Blogroll').'</span>' => $p_url
+               __('Blogroll') => $p_url
           ));
 ?>

plugins/blogroll/index.php

@@ -181 +181 @@
           array(
                html::escapeHTML($core->blog->name) => '',
-               '<span class="page-title">'.__('Blogroll').'</span>' => ''
+               __('Blogroll') => ''
           ));
 ?>

plugins/blowupConfig/index.php

@@ -231 +231 @@
           html::escapeHTML($core->blog->name) => '',
           __('Blog appearance') => 'blog_theme.php',
-          '<span class="page-title">'.__('Blowup configuration').'</span>' => ''
+          __('Blowup configuration') => ''
      ));
 

plugins/daInstaller/index.php

@@ -259 +259 @@
      array(
           __('System') => '',
-          '<span class="page-title">'.__('DotAddict.org Installer').'</span>' => ''
+          __('DotAddict.org Installer') => ''
      )).
 

plugins/importExport/index.php

@@ -78 +78 @@
                __('Plugins') => '',
                $title => $p_url,
-               '<span class="page-title">'.html::escapeHTML($module->name).'</span>' => ''
+               html::escapeHTML($module->name) => ''
           ));
 
@@ -92 +92 @@
           array(
                __('Plugins') => '',
-               '<span class="page-title">'.$title.'</span>' => ''
+               $title => ''
           ));
 

plugins/maintenance/_admin.php

@@ -128 +128 @@
 
           $icon[0] .= '<br />'.sprintf(__('One task to execute', '%s tasks to execute', $count), $count);
+          $icon[2] = 'index.php?pf=maintenance/icon-big-update.png';
      }
 

plugins/maintenance/index.php

@@ -133 +133 @@
           array(
                __('Plugins') => '',
-               '<span class="page-title">'.__('Maintenance').'</span>' => ''
+               __('Maintenance') => ''
           )
      ).
@@ -159 +159 @@
                __('Plugins') => '',
                '<a href="'.$p_url.'">'.__('Maintenance').'</a>' => '',
-               '<span class="page-title">'.html::escapeHTML($task->name()).'</span>' => ''
+               html::escapeHTML($task->name())=> ''
           )
      );
@@ -193 +193 @@
           array(
                __('Plugins') => '',
-               '<span class="page-title">'.__('Maintenance').'</span>' => ''
+               __('Maintenance') => ''
           )
      );

plugins/pages/class.actionpage.php

@@ -25 +25 @@
                array(
                     html::escapeHTML($this->core->blog->name) => '',
-                    __('Pages') => $this->getRedirection(array(),true),
-                    '<span class="page-title">'.__('Pages actions').'</span>' => ''
+                    __('Pages') => $this->getRedirection(true),
+                    __('Pages actions') => ''
                ))
           );
@@ -37 +37 @@
                '</script></head><body>'.
                $breadcrumb;
-          echo '<p><a class="back" href="'.$this->getRedirection(array(),true).'">'.__('Back to pages list').'</a></p>';
+          echo '<p><a class="back" href="'.$this->getRedirection(true).'">'.__('Back to pages list').'</a></p>';
 
      }
@@ -80 +80 @@
                
           }
-          $ap->redirect(array('reo'=>1),false);
+          $ap->redirect(false,array('reo'=>1));
      }    
 }

plugins/pages/list.php

@@ -75 +75 @@
      array(
           html::escapeHTML($core->blog->name) => '',
-          '<span class="page-title">'.__('Pages').'</span>' => ''
+          __('Pages') => ''
      ));
 

plugins/pages/page.php

@@ -329 +329 @@
           html::escapeHTML($core->blog->name) => '',
           __('Pages') => $p_url,
-          '<span class="page-title">'.$edit_entry_title.'</span>' => ''
+          $edit_entry_title => ''
      ));
 

plugins/pings/index.php

@@ -55 +55 @@
      array(
           __('Plugins') => '',
-          '<span class="page-title">'.__('Pings configuration').'</span>' => ''
+          __('Pings configuration') => ''
      ));
 

plugins/simpleMenu/index.php

@@ -25 +25 @@
 $categories_label = array();
 $rs = $core->blog->getCategories(array('post_type'=>'post'));
-$categories_combo = dcAdminCombos::getCategoriesCombo($rs,false);
-
+$categories_combo = dcAdminCombos::getCategoriesCombo($rs,false,true);
 $rs->moveStart();
 while ($rs->fetch()) {
-     $categories_label[$rs->cat_id] = html::escapeHTML($rs->cat_title);
-}
+     $categories_label[$rs->cat_url] = html::escapeHTML($rs->cat_title);
+}
+
 # Liste des langues utilisées
 $langs_combo = dcAdminCombos::getLangscombo(
@@ -374 +374 @@
                html::escapeHTML($core->blog->name) => '',
                $page_title => $p_url,
-               '<span class="page-title">'.__('Add item').'</span>' => '',
+               __('Add item') => '',
                $step_label => ''
-          ));
+          ),
+          array(
+               'hl_pos' => -2)
+     );
 } else {
      echo dcPage::breadcrumb(
           array(
                html::escapeHTML($core->blog->name) => '',
-               '<span class="page-title">'.$page_title.'</span>' => ''
+               $page_title => ''
           ));
 }

plugins/tags/_admin.php

@@ -136 +136 @@
                     }
                }
-               $ap->redirect(array('upd' => 1),true);
+               $ap->redirect(true,array('upd' => 1));
           } 
           else 
@@ -150 +150 @@
                          array(
                               html::escapeHTML($core->blog->name) => '',
-                              __('Entries') => $ap->getRedirection(array(),true),
-                              '<span class="page-title">'.__('Add tags to this selection').'</span>' => ''
+                              __('Entries') => $ap->getRedirection(true),
+                              __('Add tags to this selection') => ''
                     )),
                     dcPage::jsLoad('js/jquery/jquery.autocomplete.js').
@@ -201 +201 @@
                     }
                }
-               $ap->redirect(array('upd' => 1),true);
+               $ap->redirect(true,array('upd' => 1));
           }
           else
@@ -228 +228 @@
                                    html::escapeHTML($core->blog->name) => '',
                                    __('Entries') => 'posts.php',
-                                   '<span class="page-title">'.__('Remove selected tags from this selection').'</span>' => ''
+                                   __('Remove selected tags from this selection') => ''
                )));
                $posts_count = count($_POST['entries']);

plugins/tags/js/post.js

@@ -26 +26 @@
                delay: 1000,
                multiple: true,
+               multipleSeparator: ", ",
                matchSubset: false,
                matchContains: true,

plugins/tags/style.css

@@ -10 +10 @@
 .tag90 { font-size: 220%; }
 .tag100 { font-size: 230%; }
-
 table.tags {
      margin-left: 3em;
-}
-
-
+     }
 tr.tagLetter span {
      font-size : 250%;
@@ -24 +21 @@
      top: 0.80em;
      left: -2ex;
-}
-
+     }
 ul.metaList {
      margin: 0 0 1em 0;
      padding: 0;
-}
+     }
 ul.metaList li {
      margin: 0;
@@ -35 +31 @@
      list-style: square;
      list-style-position: inside;
-}
-
+     }
 a.metaRemove {
      color : #999 !important;
      border: none;
-}
+     }
 a.metaRemove:hover, a.metaRemove:focus {
      color : #06c !important;
-}
-
+     }
 .addMeta a {
      border: none;
-}
+     }
 .addMeta a:hover, .addMeta a:focus {
      background: #fc0;
      color: #000;
-}
+     }
 .addMeta a.metaGetMore {
      font-weight: bold;
-}
+     }
 /* Auto Complete */
 .ac_results {
@@ -62 +56 @@
      overflow: hidden;
      z-index: 99999;
-}
+     }
 .ac_results ul {
      width: 100%;
@@ -69 +63 @@
      padding: 0;
      margin: 0;
-}
+     }
 .ac_results li {
      margin: 0px;
@@ -88 +82 @@
      line-height: 16px;
      overflow: hidden;
-}
+     }
 .ac_loading {
      background: transparent url('index.php?pf=tags/img/loader.gif') right center no-repeat;
-}
+     }
 .ac_odd {
      background-color: #eee;
-}
+     }
 .ac_over {
      background-color: #06c;
      color: white;
-}
-#post_meta_input {
-    margin: 0 0.5em 0 0;
-    width: 13em;
-}
+     }
 #post_meta_input:focus {
      -moz-box-sizing: content-box;
-}
-#tags-edit input[type=button] {
-     width: 3.5em;
-}
+     }
+#tags-edit input[type=text] {
+     width: 11.5em;
+     }
 .tag-actions form {
      display: inline-block;
      margin-right: 1.5em;
-}
+     }

plugins/tags/tag_posts.php

@@ -91 +91 @@
           html::escapeHTML($core->blog->name) => '',
           __('Tags') => $p_url.'&m=tags',
-          '<span class="page-title">'.__('Tag').' &ldquo;'.html::escapeHTML($tag).'&rdquo;'.'</span>' => ''
+          __('Tag').' &ldquo;'.html::escapeHTML($tag).'&rdquo;' => ''
      ));
 ?>

plugins/tags/tags.php

@@ -24 +24 @@
      array(
           html::escapeHTML($core->blog->name) => '',
-          '<span class="page-title">'.__('Tags').'</span>' => ''
+          __('Tags') => ''
      ));
 ?>

plugins/themeEditor/index.php

@@ -91 +91 @@
           html::escapeHTML($core->blog->name) => '',
           __('Blog appearance') => 'blog_theme.php',
-          '<span class="page-title">'.__('Edit theme files').'</span>' => ''
+          __('Edit theme files') => ''
      ));
 ?>

plugins/userPref/index.php

@@ -115 +115 @@
           __('System') => '',
           html::escapeHTML($core->auth->userID()) => '',
-          '<span class="page-title">'.__('user:preferences').'</span>' => ''
+          __('user:preferences') => ''
      ));
 
@@ -160 +160 @@
           '<label for="lp_nav" class="classic">'.__('Goto:').'</label> '.form::combo('lp_nav',$ws_combo).
           ' <input type="submit" value="'.__('Ok').'" id="lp_submit" />'.
-          '<input type="hidden" name="p" value="aboutConfig" />'.
+          '<input type="hidden" name="p" value="userPref" />'.
           $core->formNonce().'</p></form>';
 }
@@ -210 +210 @@
           '<label for="gp_nav" class="classic">'.__('Goto:').'</label> '.form::combo('gp_nav',$ws_combo).
           ' <input type="submit" value="'.__('Ok').'" id="gp_submit" />'.
-          '<input type="hidden" name="p" value="aboutConfig" />'.
+          '<input type="hidden" name="p" value="userPref" />'.
           $core->formNonce().'</p></form>';
 }

plugins/widgets/index.php

@@ -190 +190 @@
      array(
           html::escapeHTML($core->blog->name) => '',
-          '<span class="page-title">'.__('Widgets').'</span>' => ''
+          __('Widgets') => ''
      ));
 

tests/functional/spec/page_tabs.js

@@ -131 +131 @@
           expect($('#part-user-favorites')).not.toBeVisible();
      });
+
+     it("Must open first tab when clicking back until hash is empty", function() {
+          loadFixtures('tabs.html');
+          loadStyleFixtures('default.css');
+
+          var navigation = ['', 'user-profile', 'user-favorites'];
+          var current_index = 0;
+
+          $.pageTabs();
+          current_index++;
+          $.pageTabs.clickTab(navigation[current_index]);
+          // tab is now user-profile
+
+          // simulate back : window.history.back();
+          current_index--;
+          spyOn(jQuery.pageTabs, 'getLocationHash').andReturn(navigation[current_index]);
+          jQuery.event.trigger('hashchange');
+
+          expect($('#part-user-options')).toBeVisible();
+          expect($('#part-user-profile')).not.toBeVisible();
+          expect($('#part-user-favorites')).not.toBeVisible();
+     });
 });