Changeset 1468:3132a0aca046 for admin

Timestamp:

08/19/13 09:55:29 (12 years ago)

Author:

franck <carnet.franck.paul@…>

Branch:

default

Parents:

1466:e67efe636ce1 (diff), 1467:917fc08f3a59 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge 2.5 commits into default branch (should be verified)

Location:

admin

Files:

• categories.php (modified) (3 diffs)
• categories.php (modified) (4 diffs)
• index.php (modified) (3 diffs)
• index.php (modified) (7 diffs)
• js/_post.js (modified) (1 diff)
• js/_post.js (modified) (3 diffs)
• post.php (modified) (3 diffs)
• post.php (modified) (14 diffs)
• posts_actions.php (modified) (4 diffs)
• posts_actions.php (modified) (3 diffs)
• preferences.php (modified) (2 diffs)
• preferences.php (modified) (7 diffs)
• style/default.css (modified) (2 diffs)
• style/default.css (modified) (58 diffs)
• update.php (modified) (4 diffs)
• update.php (modified) (1 diff)

admin/categories.php

@@ -31 +31 @@
           $mov_cat = $mov_cat ? $mov_cat : null;
           if ($mov_cat !== null) {
-               $c = $core->blog->getCategory((integer) $_POST['del_cat']);
+               $c = $core->blog->getCategory((integer) $_POST['mov_cat']);
                if ($c->isEmpty()) {
                     throw new Exception(__('This category does not exist.'));
@@ -144 +144 @@
 echo '</div>';
 
+$categories_combo = array();
+if (!$rs->isEmpty())
+{
+     while ($rs->fetch()) {
+          $catparents_combo[] = $categories_combo[] = new formSelectOption(
+               str_repeat('&nbsp;&nbsp;',$rs->level-1).($rs->level-1 == 0 ? '' : '&bull; ').html::escapeHTML($rs->cat_title),
+               $rs->cat_id
+          );
+     }
+}
+
 echo '<div class="col">'.
 
@@ -149 +160 @@
 '<h3>'.__('Add a new category').'</h3>'.
 '<p><label class="required" for="cat_title"><abbr title="'.__('Required field').'">*</abbr> '.__('Title:').'</label> '.
-form::field('cat_title',30,255).'</p>'.
+form::field('cat_title',30,255,'','maximal').'</p>'.
 '<p><label for="new_cat_parent">'.__('Parent:').'</label> '.
-'<select id="new_cat_parent" name="new_cat_parent">'.
-'<option value="0">'.__('Top level').'</option>';
-while ($rs->fetch()) {
-     echo '<option value="'.$rs->cat_id.'">'.
-          str_repeat('&nbsp;&nbsp;',$rs->level-1).($rs->level-1 == 0 ? '' : '&bull; ').
-          html::escapeHTML($rs->cat_title).'</option>';
-}
-echo
-'</select></p>'.
+form::combo('new_cat_parent',array_merge(array(__('(No cat)') => 0),$categories_combo),'','maximal').
+'</p>'.
 '<p><input type="submit" value="'.__('Create').'" />'.
 $core->formNonce().'</p>'.
+
 '</form>';
 
 if (!$rs->isEmpty())
 {
-     $cats = array();
-     $dest = array('&nbsp;' => '');
-     $l = $rs->level;
-     $full_name = array($rs->cat_title);
-     while ($rs->fetch())
-     {
-          if ($rs->level < $l) {
-               $full_name = array();
-          } elseif ($rs->level == $l) {
-               array_pop($full_name);
-          }
-          $full_name[] = html::escapeHTML($rs->cat_title);
-          
-          $cats[implode(' / ',$full_name)] = $rs->cat_id;
-          $dest[implode(' / ',$full_name)] = $rs->cat_id;
-          
-          $l = $rs->level;
-     }
-     
      echo
-     '<form action="categories.php" method="post" id="delete-category" class="border-top">'.
+     '<form action="categories.php" method="post" id="delete-category">'.
      '<h3>'.__('Remove a category').'</h3>'.
      '<p><label for="del_cat">'.__('Choose a category to remove:').'</label> '.
-     form::combo('del_cat',$cats).'</p> '.
+     form::combo('del_cat',$categories_combo,'','maximal').'</p> '.
      '<p><label for="mov_cat">'.__('And choose the category which will receive its entries:').'</label> '.
-     form::combo('mov_cat',$dest).'</p> '.
+     form::combo('mov_cat',array_merge(array(__('(No cat)') => ''),$categories_combo),'','maximal').'</p> '.
      '<p><input type="submit" value="'.__('Delete').'" class="delete" />'.
      $core->formNonce().'</p>'.
+
      '</form>';
      

admin/categories.php

@@ -73 +73 @@
 dcPage::open(__('Categories'),
      dcPage::jsToolMan()."\n".
-     dcPage::jsLoad('js/_categories.js')
+     dcPage::jsLoad('js/_categories.js'),
+     dcPage::breadcrumb(
+          array(
+               html::escapeHTML($core->blog->name) => '',
+               '<span class="page-title">'.__('Categories').'</span>' => ''
+          ))
 );
 
@@ -88 +93 @@
      dcPage::message(__('The category has been successfully moved.'));
 }
-
-echo '<h2>'.html::escapeHTML($core->blog->name).' &rsaquo; <span class="page-title">'.__('Categories').'</span></h2>';
 
 $rs = $core->blog->getCategories(array('post_type'=>'post'));
@@ -155 +158 @@
 
 '<form action="category.php" method="post">'.
-'<fieldset><legend>'.__('Add a new category').'</legend>'.
-'<p><label class="required" for="cat_title"><abbr title="'.__('Required field').'">*</abbr> '.__('Title:').' '.
-form::field('cat_title',30,255,'','maximal').'</label></p>'.
-'<p><label for="new_cat_parent">'.__('Parent:').' '.
+'<h3>'.__('Add a new category').'</h3>'.
+'<p><label class="required" for="cat_title"><abbr title="'.__('Required field').'">*</abbr> '.__('Title:').'</label> '.
+form::field('cat_title',30,255,'','maximal').'</p>'.
+'<p><label for="new_cat_parent">'.__('Parent:').'</label> '.
 form::combo('new_cat_parent',array_merge(array(__('(No cat)') => 0),$categories_combo),'','maximal').
-'</label></p>'.
-'<p><input type="submit" value="'.__('Create').'" /></p>'.
-$core->formNonce().
-'</fieldset>'.
+'</p>'.
+'<p><input type="submit" value="'.__('Create').'" />'.
+$core->formNonce().'</p>'.
+
 '</form>';
 
@@ -170 +173 @@
      echo
      '<form action="categories.php" method="post" id="delete-category">'.
-     '<fieldset><legend>'.__('Remove a category').'</legend>'.
-     '<p><label for="del_cat">'.__('Choose a category to remove:').' '.
-     form::combo('del_cat',$categories_combo,'','maximal').'</label></p> '.
-     '<p><label for="mov_cat">'.__('And choose the category which will receive its entries:').' '.
-     form::combo('mov_cat',array_merge(array(__('(No cat)') => ''),$categories_combo),'','maximal').'</label></p> '.
-     '<p><input type="submit" value="'.__('Delete').'" class="delete" /></p>'.
-     $core->formNonce().
-     '</fieldset>'.
+     '<h3>'.__('Remove a category').'</h3>'.
+     '<p><label for="del_cat">'.__('Choose a category to remove:').'</label> '.
+     form::combo('del_cat',$categories_combo,'','maximal').'</p> '.
+     '<p><label for="mov_cat">'.__('And choose the category which will receive its entries:').'</label> '.
+     form::combo('mov_cat',array_merge(array(__('(No cat)') => ''),$categories_combo),'','maximal').'</p> '.
+     '<p><input type="submit" value="'.__('Delete').'" class="delete" />'.
+     $core->formNonce().'</p>'.
+
      '</form>';
      
      echo
-     '<form action="categories.php" method="post" id="reset-order">'.
-     '<fieldset><legend>'.__('Reorder categories').'</legend>'.
+     '<form action="categories.php" method="post" id="reset-order" class="border-top">'.
+     '<h3>'.__('Reorder categories').'</h3>'.
      '<p>'.__('This will relocate all categories on the top level').'</p> '.
-     '<p><input type="submit" value="'.__('Reorder').'" /></p>'.
+     '<p><input type="submit" value="'.__('Reorder').'" />'.
      form::hidden(array('reset'),1).
-     $core->formNonce().
-     '</fieldset>'.
+     $core->formNonce().'</p>'.
      '</form>';
 }

admin/index.php

@@ -59 +59 @@
 if (!$core->auth->user_prefs->dashboard->prefExists('quickentry')) {
      if (!$core->auth->user_prefs->dashboard->prefExists('quickentry',true)) {
-          $core->auth->user_prefs->dashboard->put('quickentry',true,'boolean','',null,true);
-     }
-     $core->auth->user_prefs->dashboard->put('quickentry',true,'boolean');
+          $core->auth->user_prefs->dashboard->put('quickentry',false,'boolean','',null,true);
+     }
+     $core->auth->user_prefs->dashboard->put('quickentry',false,'boolean');
 }
 
@@ -309 +309 @@
      if ($core->auth->check('usage,contentadmin',$core->blog->id))
      {
-          $categories_combo = array(' ' => '');
+          # Getting categories
+          $categories_combo = array(__('(No cat)') => '');
           try {
                $categories = $core->blog->getCategories(array('post_type'=>'post'));
-               while ($categories->fetch()) {
-                    $categories_combo[] = new formSelectOption(
-                         str_repeat('  ',$categories->level-1).
-                         ($categories->level-1 == 0 ? '' : '• ').html::escapeHTML($categories->cat_title),
-                         $categories->cat_id
-                    );
+               if (!$categories->isEmpty()) {
+                    while ($categories->fetch()) {
+                         $catparents_combo[] = $categories_combo[] = new formSelectOption(
+                              str_repeat('  ',$categories->level-1).($categories->level-1 == 0 ? '' : '• ').html::escapeHTML($categories->cat_title),
+                              $categories->cat_id
+                         );
+                    }
                }
           } catch (Exception $e) { }
@@ -333 +335 @@
           form::textarea('post_content',50,7).
           '</p>'.
-          '<p><label for="cat_id" class="classic">'.__('Category:').'</label> '.
-          form::combo('cat_id',$categories_combo).'</p>'.
+          '<p><label for="cat_id" class="classic">'.__('Category:').' '.
+          form::combo('cat_id',$categories_combo).'</label></p>'.
+          ($core->auth->check('categories', $core->blog->id)
+               ? '<div>'.
+               '<p id="new_cat">'.__('Add a new category').'</p>'.
+               '<p><label for="new_cat_title">'.__('Title:').' '.
+               form::field('new_cat_title',30,255,'','maximal').'</label></p>'.
+               '<p><label for="new_cat_parent">'.__('Parent:').' '.
+               form::combo('new_cat_parent',$categories_combo,'','maximal').
+               '</label></p>'.
+               '</div>'
+               : '').
           '<p><input type="submit" value="'.__('Save').'" name="save" /> '.
           ($core->auth->check('publish',$core->blog->id)

admin/index.php

@@ -121 +121 @@
 $__dashboard_items = new ArrayObject(array(new ArrayObject,new ArrayObject));
 
-# Documentation links
 $dashboardItem = 0;
-if ($core->auth->user_prefs->dashboard->doclinks) {
-     if (!empty($__resources['doc']))
-     {
-          $doc_links = '<h3>'.__('Documentation and support').'</h3><ul>';
-     
-          foreach ($__resources['doc'] as $k => $v) {
-               $doc_links .= '<li><a href="'.$v.'" title="'.$k.' '.__('(external link)').'">'.$k.'</a></li>';
-          }
-     
-          $doc_links .= '</ul>';
-          $__dashboard_items[$dashboardItem][] = $doc_links;
-          $dashboardItem++;
-     }
-}
 
 if ($core->auth->user_prefs->dashboard->dcnews) {
@@ -180 +165 @@
 }
 
+# Documentation links
+if ($core->auth->user_prefs->dashboard->doclinks) {
+     if (!empty($__resources['doc']))
+     {
+          $doc_links = '<h3>'.__('Documentation and support').'</h3><ul>';
+     
+          foreach ($__resources['doc'] as $k => $v) {
+               $doc_links .= '<li><a href="'.$v.'" title="'.$k.' '.__('(external link)').'">'.$k.'</a></li>';
+          }
+     
+          $doc_links .= '</ul>';
+          $__dashboard_items[$dashboardItem][] = $doc_links;
+          $dashboardItem++;
+     }
+}
+
 $core->callBehavior('adminDashboardItems', $core, $__dashboard_items);
 
@@ -193 +194 @@
      dcPage::jsLoad('js/_index.js').
      # --BEHAVIOR-- adminDashboardHeaders
-     $core->callBehavior('adminDashboardHeaders')
+     $core->callBehavior('adminDashboardHeaders'),
+     dcPage::breadcrumb(
+          array(
+          '<span class="page-title">'.__('Dashboard').' : '.html::escapeHTML($core->blog->name).'</span>' => ''
+          ),
+          false)
 );
 
-echo '<h2>'.html::escapeHTML($core->blog->name).' &rsaquo; <span class="page-title">'.__('Dashboard').'</span></h2>';
+# Dotclear updates notifications
+if ($core->auth->isSuperAdmin() && is_readable(DC_DIGESTS))
+{
+     $updater = new dcUpdate(DC_UPDATE_URL,'dotclear',DC_UPDATE_VERSION,DC_TPL_CACHE.'/versions');
+     $new_v = $updater->check(DC_VERSION);
+     $version_info = $new_v ? $updater->getInfoURL() : '';
+
+     if ($updater->getNotify() && $new_v) {
+          $message =
+          '<div><p>'.sprintf(__('Dotclear %s is available!'),$new_v).'</p> '.
+          '<ul><li><strong><a href="update.php">'.sprintf(__('Upgrade now'),$new_v).'</a></strong>'.
+          '</li><li><a href="update.php?hide_msg=1">'.__('Remind me later').'</a>'.
+          ($version_info ? ' </li><li><a href="'.$version_info.'">'.__('information about this version').'</a>' : '').
+          '</li></ul></div>';
+          dcPage::message($message,false,true);
+     }
+}
 
 if ($core->auth->getInfo('user_default_blog') != $core->blog->id && $core->auth->blog_count > 1) {
@@ -246 +268 @@
 $dashboardItems = '';
 
-# Dotclear updates notifications
-if ($core->auth->isSuperAdmin() && is_readable(DC_DIGESTS))
-{
-     $updater = new dcUpdate(DC_UPDATE_URL,'dotclear',DC_UPDATE_VERSION,DC_TPL_CACHE.'/versions');
-     $new_v = $updater->check(DC_VERSION);
-     $version_info = $new_v ? $updater->getInfoURL() : '';
-     
-     if ($updater->getNotify() && $new_v) {
-          $dashboardItems .=
-          '<div id="upg-notify" class="static-msg"><p>'.sprintf(__('Dotclear %s is available!'),$new_v).'</p> '.
-          '<ul><li><strong><a href="update.php">'.sprintf(__('Upgrade now'),$new_v).'</a></strong>'.
-          '</li><li><a href="update.php?hide_msg=1">'.__('Remind me later').'</a>'.
-          ($version_info ? ' </li><li><a href="'.$version_info.'">'.__('information about this version').'</a>' : '').
-          '</li></ul></div>';
-     }
-}
-
 # Errors modules notifications
 if ($core->auth->isSuperAdmin())
@@ -283 +288 @@
      if ($i->count() > 0)
      {
-          $dashboardItems .= '<div>';
+          $dashboardItems .= '<div class="db-item">';
           foreach ($i as $v) {
                $dashboardItems .= $v;
@@ -317 +322 @@
                }
           } catch (Exception $e) { }
-          
+     
           echo
           '<div id="quick">'.
@@ -323 +328 @@
           '<form id="quick-entry" action="post.php" method="post">'.
           '<fieldset><legend>'.__('New entry').'</legend>'.
-          '<p class="col"><label for="post_title" class="required"><abbr title="'.__('Required field').'">*</abbr> '.__('Title:').
+          '<p class="col"><label for="post_title" class="required"><abbr title="'.__('Required field').'">*</abbr> '.__('Title:').'</label>'.
           form::field('post_title',20,255,'','maximal').
-          '</label></p>'.
+          '</p>'.
           '<p class="area"><label class="required" '.
           'for="post_content"><abbr title="'.__('Required field').'">*</abbr> '.__('Content:').'</label> '.

admin/js/_post.js

@@ -115 +115 @@
                hide: $('#post_notes').val() == ''
           });
+          $('#new_cat').toggleWithLegend(
+               $('#new_cat').parent().children().not('#new_cat'),
+               {} // no cookie on new category as we don't use this every day
+          );
           $('#post_lang').parent().toggleWithLegend($('#post_lang'),{
                cookie: 'dcx_post_lang'

admin/js/_post.js

@@ -79 +79 @@
           // Get document format and prepare toolbars
           var formatField = $('#post_format').get(0);
-          var last_post_format = $(formatField).val();
           $(formatField).change(function() {
-               // Confirm post format change
-               if(window.confirm(dotclear.msg.confirm_change_post_format_noconvert)){
-                    excerptTb.switchMode(this.value);
-                    contentTb.switchMode(this.value);
-                    last_post_format = $(this).val();
-               }else{
-                    // Restore last format if change cancelled
-                    $(this).val(last_post_format);
-               }
+               excerptTb.switchMode(this.value);
+               contentTb.switchMode(this.value);
           });
           
@@ -134 +126 @@
                hide: $('#post_password').val() == ''
           });
-          
+          $('#post_status').parent().toggleWithLegend($('#post_status'),{
+               cookie: 'dcx_post_status'
+          });
+          $('#post_dt').parent().toggleWithLegend($('#post_dt').parent().children().not('label'),{
+               cookie: 'dcx_post_dt'
+          });
+          $('#post_format').parent().toggleWithLegend($('#post_format').parent().children().not('label').add($('#post_format').parents('p').next()),{
+               cookie: 'dcx_post_format'
+          });
+          $('#cat_id').parent().toggleWithLegend($('#cat_id'),{
+               cookie: 'cat_id'
+          });
+          $('#post_url').parent().toggleWithLegend($('#post_url').parent().children().not('label'),{
+               cookie: 'post_url'
+          });
           // We load toolbar on excerpt only when it's ready
           $('#excerpt-area label').toggleWithLegend($('#excerpt-area').children().not('label'),{
@@ -161 +167 @@
           var a = document.createElement('a');
           a.href = '#';
+          a.className = 'button';
           $(a).click(function() {
                var params = {

admin/post.php

@@ -218 +218 @@
 if (!empty($_POST) && !empty($_POST['save']) && $can_edit_post && !$bad_dt)
 {
+     # Create category
+     if (!empty($_POST['new_cat_title']) && $core->auth->check('categories', $core->blog->id)) {
+     
+          $cur_cat = $core->con->openCursor($core->prefix.'category');
+          $cur_cat->cat_title = $_POST['new_cat_title'];
+          $cur_cat->cat_url = '';
+          
+          $parent_cat = !empty($_POST['new_cat_parent']) ? $_POST['new_cat_parent'] : '';
+          
+          # --BEHAVIOR-- adminBeforeCategoryCreate
+          $core->callBehavior('adminBeforeCategoryCreate', $cur_cat);
+          
+          $cat_id = $core->blog->addCategory($cur_cat, (integer) $parent_cat);
+          
+          # --BEHAVIOR-- adminAfterCategoryCreate
+          $core->callBehavior('adminAfterCategoryCreate', $cur_cat, $cat_id);
+     }
+     
      $cur = $core->con->openCursor($core->prefix.'post');
      
@@ -283 +301 @@
      }
 }
+
+# Getting categories
+$categories_combo = array(__('(No cat)') => '');
+try {
+     $categories = $core->blog->getCategories(array('post_type'=>'post'));
+     if (!$categories->isEmpty()) {
+          while ($categories->fetch()) {
+               $catparents_combo[] = $categories_combo[] = new formSelectOption(
+                    str_repeat('  ',$categories->level-1).($categories->level-1 == 0 ? '' : '• ').html::escapeHTML($categories->cat_title),
+                    $categories->cat_id
+               );
+          }
+     }
+} catch (Exception $e) { }
 
 /* DISPLAY
@@ -423 +455 @@
                          '<p><label for="cat_id" class="ib">'.__('Category').'</label>'.
                          form::combo('cat_id',$categories_combo,$cat_id,'maximal').
-                         '</p>')),
+                         '</p>'.
+                         ($core->auth->check('categories', $core->blog->id) ?
+                              '<div>'.
+                              '<p id="new_cat">'.__('Add a new category').'</p>'.
+                              '<p><label for="new_cat_title">'.__('Title:').' '.
+                              form::field('new_cat_title',30,255,'','maximal').'</label></p>'.
+                              '<p><label for="new_cat_parent">'.__('Parent:').' '.
+                              form::combo('new_cat_parent',$categories_combo,'','maximal').
+                              '</label></p>'.
+                              '</div>'
+                         : ''))),
           'options-box' => array(
                'title' => __('Options'),

admin/post.php

@@ -50 +50 @@
 }
 
+# Getting categories
+$categories_combo = array(' ' => '');
+try {
+     $categories = $core->blog->getCategories(array('post_type'=>'post'));
+     while ($categories->fetch()) {
+          $categories_combo[] = new formSelectOption(
+               str_repeat('  ',$categories->level-1).($categories->level-1 == 0 ? '' : '• ').html::escapeHTML($categories->cat_title),
+               $categories->cat_id
+          );
+     }
+} catch (Exception $e) { }
+
 # Status combo
 foreach ($core->blog->getAllPostStatus() as $k => $v) {
@@ -82 +94 @@
 if (!empty($_REQUEST['id']))
 {
+     $page_title = __('Edit entry');
+     
      $params['post_id'] = $_REQUEST['id'];
      
@@ -111 +125 @@
           $post_open_tb = (boolean) $post->post_open_tb;
           
-          $page_title = __('Edit entry');
-          
           $can_edit_post = $post->isEditable();
           $can_delete= $post->isDeletable();
@@ -121 +133 @@
           if ($next_rs !== null) {
                $next_link = sprintf($post_link,$next_rs->post_id,
-                    html::escapeHTML($next_rs->post_title),__('next entry').' »');
+                    html::escapeHTML($next_rs->post_title),__('Next entry').' »');
                $next_headlink = sprintf($post_headlink,'next',
                     html::escapeHTML($next_rs->post_title),$next_rs->post_id);
@@ -128 +140 @@
           if ($prev_rs !== null) {
                $prev_link = sprintf($post_link,$prev_rs->post_id,
-                    html::escapeHTML($prev_rs->post_title),'« '.__('previous entry'));
+                    html::escapeHTML($prev_rs->post_title),'« '.__('Previous entry'));
                $prev_headlink = sprintf($post_headlink,'previous',
                     html::escapeHTML($prev_rs->post_title),$prev_rs->post_id);
@@ -314 +326 @@
 }
 
+if ($post_id) {
+     switch ($post_status) {
+          case 1:
+               $img_status = sprintf($img_status_pattern,__('Published'),'check-on.png');
+               break;
+          case 0:
+               $img_status = sprintf($img_status_pattern,__('Unpublished'),'check-off.png');
+               break;
+          case -1:
+               $img_status = sprintf($img_status_pattern,__('Scheduled'),'scheduled.png');
+               break;
+          case -2:
+               $img_status = sprintf($img_status_pattern,__('Pending'),'check-wrn.png');
+               break;
+          default:
+               $img_status = '';
+     }
+     $edit_entry_str = __('“%s”');
+     $page_title_edit = sprintf($edit_entry_str, html::escapeHTML($post_title)).' '.$img_status;
+} else {
+     $img_status = '';
+}
+
+
 dcPage::open($page_title.' - '.__('Entries'),
      dcPage::jsDatePicker().
@@ -324 +360 @@
      $core->callBehavior('adminPostHeaders').
      dcPage::jsPageTabs($default_tab).
-     $next_headlink."\n".$prev_headlink
+     $next_headlink."\n".$prev_headlink,
+     dcPage::breadcrumb(
+          array(
+               html::escapeHTML($core->blog->name) => '',
+               __('Entries') => 'posts.php',
+               '<span class="page-title">'.($post_id ? $page_title_edit : $page_title).'</span>' => ''
+          ))
 );
 
@@ -354 +396 @@
 }
 
-echo '<h2>'.html::escapeHTML($core->blog->name).' &rsaquo; '.'<a href="posts.php">'.__('Entries').'</a> &rsaquo; <span class="page-title">';
-if ($post_id) {
-     switch ($post_status) {
-          case 1:
-               $img_status = sprintf($img_status_pattern,__('published'),'check-on.png');
-               break;
-          case 0:
-               $img_status = sprintf($img_status_pattern,__('unpublished'),'check-off.png');
-               break;
-          case -1:
-               $img_status = sprintf($img_status_pattern,__('scheduled'),'scheduled.png');
-               break;
-          case -2:
-               $img_status = sprintf($img_status_pattern,__('pending'),'check-wrn.png');
-               break;
-          default:
-               $img_status = '';
-     }
-     $edit_entry_str = __('Edit entry &ldquo;%s&rdquo;');
-     echo sprintf($edit_entry_str, html::escapeHTML($post_title)).' '.$img_status;
-} else {
-     echo $page_title;
-}
-echo '</span></h2>';
-
 if ($post_id && $post->post_status == 1) {
-     echo '<p><a href="'.$post->getURL().'" onclick="window.open(this.href);return false;" title="'.$post_title.' ('.__('new window').')'.'">'.__('Go to this entry on the site').' <img src="images/outgoing-blue.png" alt="" /></a></p>';
+     echo '<p><a class="onblog_link" href="'.$post->getURL().'" onclick="window.open(this.href);return false;" title="'.$post_title.' ('.__('new window').')'.'">'.__('Go to this entry on the site').' <img src="images/outgoing-blue.png" alt="" /></a></p>';
 }
 if ($post_id)
 {
-     echo '<p>';
+     echo '<p class="nav_prevnext">';
      if ($prev_link) { echo $prev_link; }
-     if ($next_link && $prev_link) { echo ' - '; }
+     if ($next_link && $prev_link) { echo ' | '; }
      if ($next_link) { echo $next_link; }
      
@@ -401 +418 @@
      exit;
 }
-
 /* Post form if we can edit post
 -------------------------------------------------------- */
 if ($can_edit_post)
 {
-     echo '<div class="multi-part" title="'.__('Edit entry').'" id="edit-entry">';
+     $sidebar_items = new ArrayObject(array(
+          'status-box' => array(
+               'title' => __('Status'),
+               'items' => array(
+                    'post_status' => 
+                         '<p class="entry-status"><label for="post_status" class="ib">'.__('Entry status').' '.$img_status.'</label>'.
+                         form::combo('post_status',$status_combo,$post_status,'maximal','',!$can_publish).
+                         '</p>',
+                    'post_dt' => 
+                         '<p><label for="post_dt" class="ib">'.__('Publication date and hour').'</label>'.
+                         form::field('post_dt',16,16,$post_dt,($bad_dt ? 'invalid' : '')).
+                         '</p>',
+                    'post_lang' =>
+                         '<p><label for="post_lang" class="ib">'.__('Entry lang').'</label>'.
+                         form::combo('post_lang',$lang_combo,$post_lang).
+                         '</p>',
+                    'post_format' =>
+                         '<p><label for="post_format" class="ib">'.__('Text formating').'</label>'.
+                         form::combo('post_format',$formaters_combo,$post_format,'maximal').
+                         '</p>'.
+                         '<p>'.($post_id && $post_format != 'xhtml' ? 
+                         '<a id="convert-xhtml" class="button maximal" href="post.php?id='.$post_id.'&amp;xconv=1">'.
+                         __('Convert to XHTML').'</a>' : '').'</p>')),
+          'metas-box' => array(
+               'title' => __('Ordering'),
+               'items' => array(
+                    'post_selected' => 
+                         '<p><label for="post_selected" class="classic">'.
+                         form::checkbox('post_selected',1,$post_selected).' '.
+                         __('Selected entry').'</label></p>',
+                    'cat_id' =>
+                         '<p><label for="cat_id" class="ib">'.__('Category').'</label>'.
+                         form::combo('cat_id',$categories_combo,$cat_id,'maximal').
+                         '</p>'.
+                         ($core->auth->check('categories', $core->blog->id) ?
+                              '<div>'.
+                              '<p id="new_cat">'.__('Add a new category').'</p>'.
+                              '<p><label for="new_cat_title">'.__('Title:').' '.
+                              form::field('new_cat_title',30,255,'','maximal').'</label></p>'.
+                              '<p><label for="new_cat_parent">'.__('Parent:').' '.
+                              form::combo('new_cat_parent',$categories_combo,'','maximal').
+                              '</label></p>'.
+                              '</div>'
+                         : ''))),
+          'options-box' => array(
+               'title' => __('Options'),
+               'items' => array(
+                    'post_open_comment' =>
+                         '<p><label for="post_open_comment" class="classic">'.
+                         form::checkbox('post_open_comment',1,$post_open_comment).' '.
+                         __('Accept comments').'</label></p>'.
+                         ($core->blog->settings->system->allow_comments ? 
+                              (isContributionAllowed($post_id,strtotime($post_dt),true) ? 
+                                   '' :
+                                   '<p class="form-note warn">'.
+                                   __('Warning: Comments are not more accepted for this entry.').'</p>') : 
+                              '<p class="form-note warn">'.
+                              __('Warning: Comments are not accepted on this blog.').'</p>'),
+                    'post_open_tb' =>
+                         '<p><label for="post_open_tb" class="classic">'.
+                         form::checkbox('post_open_tb',1,$post_open_tb).' '.
+                         __('Accept trackbacks').'</label></p>'.
+                         ($core->blog->settings->system->allow_trackbacks ? 
+                              (isContributionAllowed($post_id,strtotime($post_dt),false) ? 
+                                   '' :
+                                   '<p class="form-note warn">'.
+                                   __('Warning: Trackbacks are not more accepted for this entry.').'</p>') : 
+                              '<p class="form-note warn">'.__('Warning: Trackbacks are not accepted on this blog.').'</p>'),
+                    'post_password' =>
+                         '<p><label for="post_password" class="ib">'.__('Password').'</label>'.
+                         form::field('post_password',10,32,html::escapeHTML($post_password),'maximal').
+                         '</p>',
+                    'post_url' =>
+                         '<div class="lockable">'.
+                         '<p><label for="post_url" class="ib">'.__('Edit basename').'</label>'.
+                         form::field('post_url',10,255,html::escapeHTML($post_url),'maximal').
+                         '</p>'.
+                         '<p class="form-note warn">'.
+                         __('Warning: If you set the URL manually, it may conflict with another entry.').
+                         '</p></div>'
+     ))));
+
+     $main_items = new ArrayObject(array(
+          "post_title" =>
+               '<p class="col">'.
+               '<label class="required no-margin"><abbr title="'.__('Required field').'">*</abbr> '.__('Title:').'</label>'.
+               form::field('post_title',20,255,html::escapeHTML($post_title),'maximal').
+               '</p>',
+          
+          "post_excerpt" =>
+               '<p class="area" id="excerpt-area"><label for="post_excerpt">'.__('Excerpt:').'<span class="form-note">'.
+               __('Add an introduction to the post.').'</span></label> '.
+               form::textarea('post_excerpt',50,5,html::escapeHTML($post_excerpt)).
+               '</p>',
+          
+          "post_content" =>
+               '<p class="area"><label class="required" '.
+               'for="post_content"><abbr title="'.__('Required field').'">*</abbr> '.__('Content:').'</label> '.
+               form::textarea('post_content',50,$core->auth->getOption('edit_size'),html::escapeHTML($post_content)).
+               '</p>',
+          
+          "post_notes" =>
+               '<p class="area" id="notes-area"><label for="post_notes">'.__('Personal notes:').'<span class="form-note">'.
+               __('Add unpublished notes.').'</span></label>'.
+               form::textarea('post_notes',50,5,html::escapeHTML($post_notes)).
+               '</p>'
+          )
+     );
+     
+     # --BEHAVIOR-- adminPostFormItems
+     $core->callBehavior('adminPostFormItems',$main_items,$sidebar_items, isset($post) ? $post : null);
+
+     echo '<div class="multi-part" title="'.($post_id ? __('Edit entry') : __('New entry')).'" id="edit-entry">';
      echo '<form action="post.php" method="post" id="entry-form">';
      echo '<div id="entry-wrapper">';
      echo '<div id="entry-content"><div class="constrained">';
+
+     echo '<h3 class="hidden">'.__('Edit post').'</h3>';
+     
+     foreach ($main_items as $id => $item) {
+          echo $item;
+     }
+
+     # --BEHAVIOR-- adminPostForm (may be deprecated)
+     $core->callBehavior('adminPostForm',isset($post) ? $post : null);
      
      echo
-     '<p class="col"><label class="required"><abbr title="'.__('Required field').'">*</abbr> '.__('Title:').
-     form::field('post_title',20,255,html::escapeHTML($post_title),'maximal').
-     '</label></p>'.
-     
-     '<p class="area" id="excerpt-area"><label for="post_excerpt">'.__('Excerpt:').'</label> '.
-     form::textarea('post_excerpt',50,5,html::escapeHTML($post_excerpt)).
-     '</p>'.
-     
-     '<p class="area"><label class="required" '.
-     'for="post_content"><abbr title="'.__('Required field').'">*</abbr> '.__('Content:').'</label> '.
-     form::textarea('post_content',50,$core->auth->getOption('edit_size'),html::escapeHTML($post_content)).
-     '</p>'.
-     
-     '<p class="area" id="notes-area"><label for="post_notes">'.__('Notes:').'</label>'.
-     form::textarea('post_notes',50,5,html::escapeHTML($post_notes)).
-     '</p>';
-     
-     # --BEHAVIOR-- adminPostForm
-     $core->callBehavior('adminPostForm',isset($post) ? $post : null);
-     
-     echo
-     '<p>'.
+     '<p class="border-top">'.
      ($post_id ? form::hidden('id',$post_id) : '').
      '<input type="submit" value="'.__('Save').' (s)" '.
@@ -458 +574 @@
      echo '<div id="entry-sidebar">';
      
-     echo
-     '<p><label for="cat_id">'.__('Category:').
-     form::combo('cat_id',$categories_combo,$cat_id,'maximal').
-     '</label></p>'.
-     
-     ($core->auth->check('categories', $core->blog->id) ?
-          '<div>'.
-          '<p id="new_cat">'.__('Add a new category').'</p>'.
-          '<p><label for="new_cat_title">'.__('Title:').' '.
-          form::field('new_cat_title',30,255,'','maximal').'</label></p>'.
-          '<p><label for="new_cat_parent">'.__('Parent:').' '.
-          form::combo('new_cat_parent',$categories_combo,'','maximal').
-          '</label></p>'.
-          '</div>'
-     : '').
-     
-     '<p><label for="post_status">'.__('Entry status:').
-     form::combo('post_status',$status_combo,$post_status,'','',!$can_publish).
-     '</label></p>'.
-     
-     '<p><label for="post_dt">'.__('Published on:').
-     form::field('post_dt',16,16,$post_dt,($bad_dt ? 'invalid' : '')).
-     '</label></p>'.
-     
-     '<p><label for="post_format">'.__('Text formating:').
-     form::combo('post_format',$formaters_combo,$post_format).
-     '</label>'.
-     '</p>'.
-     '<p>'.($post_id && $post_format != 'xhtml' ? '<a id="convert-xhtml" class="button" href="post.php?id='.$post_id.'&amp;xconv=1">'.__('Convert to XHTML').'</a>' : '').'</p>'.
-     
-     '<p><label for="post_open_comment" class="classic">'.form::checkbox('post_open_comment',1,$post_open_comment).' '.
-     __('Accept comments').'</label></p>'.
-     ($core->blog->settings->system->allow_comments ? 
-          (isContributionAllowed($post_id,strtotime($post_dt),true) ? 
-               '' :
-               '<p class="form-note warn">'.__('Warning: Comments are not more accepted for this entry.').'</p>') : 
-          '<p class="form-note warn">'.__('Warning: Comments are not accepted on this blog.').'</p>').
-
-     '<p><label for="post_open_tb" class="classic">'.form::checkbox('post_open_tb',1,$post_open_tb).' '.
-     __('Accept trackbacks').'</label></p>'.
-     ($core->blog->settings->system->allow_trackbacks ? 
-          (isContributionAllowed($post_id,strtotime($post_dt),false) ? 
-               '' :
-               '<p class="form-note warn">'.__('Warning: Trackbacks are not more accepted for this entry.').'</p>') : 
-          '<p class="form-note warn">'.__('Warning: Trackbacks are not accepted on this blog.').'</p>').
-
-     '<p><label for="post_selected" class="classic">'.form::checkbox('post_selected',1,$post_selected).' '.
-     __('Selected entry').'</label></p>'.
-     
-     '<p><label for="post_lang">'.__('Entry lang:').
-     form::combo('post_lang',$lang_combo,$post_lang).
-     '</label></p>'.
-     
-     '<p><label for="post_password">'.__('Entry password:').
-     form::field('post_password',10,32,html::escapeHTML($post_password),'maximal').
-     '</label></p>'.
-     
-     '<div class="lockable">'.
-     '<p><label for="post_url">'.__('Basename:').
-     form::field('post_url',10,255,html::escapeHTML($post_url),'maximal').
-     '</label></p>'.
-     '<p class="form-note warn">'.
-     __('Warning: If you set the URL manually, it may conflict with another entry.').
-     '</p>'.
-     '</div>';
-     
-     # --BEHAVIOR-- adminPostFormSidebar
+     foreach ($sidebar_items as $id => $c) {
+          echo '<div id="'.$id.'" class="box">'.
+               '<h4>'.$c['title'].'</h4>';
+          foreach ($c['items'] as $e_name=>$e_content) {
+               echo $e_content;
+          }
+          echo '</div>';
+     }
+     
+     
+     # --BEHAVIOR-- adminPostFormSidebar (may be deprecated)
      $core->callBehavior('adminPostFormSidebar',isset($post) ? $post : null);
-     
      echo '</div>';      // End #entry-sidebar
 
@@ -557 +616 @@
      if ($can_edit_post && $core->auth->check('publish,contentadmin',$core->blog->id))
      {
-          $combo_action[__('publish')] = 'publish';
-          $combo_action[__('unpublish')] = 'unpublish';
-          $combo_action[__('mark as pending')] = 'pending';
-          $combo_action[__('mark as junk')] = 'junk';
+          $combo_action[__('Publish')] = 'publish';
+          $combo_action[__('Unpublish')] = 'unpublish';
+          $combo_action[__('Mark as pending')] = 'pending';
+          $combo_action[__('Mark as junk')] = 'junk';
      }
      
@@ -622 +681 @@
      '<form action="comment.php" method="post" id="comment-form">'.
      '<div class="constrained">'.
-     '<p><label for="comment_author" class="required"><abbr title="'.__('Required field').'">*</abbr> '.__('Name:').
+     '<p><label for="comment_author" class="required"><abbr title="'.__('Required field').'">*</abbr> '.__('Name:').'</label>'.
      form::field('comment_author',30,255,html::escapeHTML($core->auth->getInfo('user_cn'))).
-     '</label></p>'.
-     
-     '<p><label for="comment_email">'.__('Email:').
+     '</p>'.
+     
+     '<p><label for="comment_email">'.__('Email:').'</label>'.
      form::field('comment_email',30,255,html::escapeHTML($core->auth->getInfo('user_email'))).
-     '</label></p>'.
-     
-     '<p><label for="comment_site">'.__('Web site:').
+     '</p>'.
+     
+     '<p><label for="comment_site">'.__('Web site:').'</label>'.
      form::field('comment_site',30,255,html::escapeHTML($core->auth->getInfo('user_url'))).
-     '</label></p>'.
+     '</p>'.
      
      '<p class="area"><label for="comment_content" class="required"><abbr title="'.__('Required field').'">*</abbr> '.
@@ -688 +747 @@
           switch ($rs->comment_status) {
                case 1:
-                    $img_status = sprintf($img,__('published'),'check-on.png');
+                    $img_status = sprintf($img,__('Published'),'check-on.png');
                     break;
                case 0:
-                    $img_status = sprintf($img,__('unpublished'),'check-off.png');
+                    $img_status = sprintf($img,__('Unpublished'),'check-off.png');
                     break;
                case -1:
-                    $img_status = sprintf($img,__('pending'),'check-wrn.png');
+                    $img_status = sprintf($img,__('Pending'),'check-wrn.png');
                     break;
                case -2:
-                    $img_status = sprintf($img,__('junk'),'junk.png');
+                    $img_status = sprintf($img,__('Junk'),'junk.png');
                     break;
           }
@@ -720 +779 @@
 }
 
-dcPage::helpBlock('core_post','core_wiki');
+dcPage::helpBlock('core_post','core_trackbacks','core_wiki');
 dcPage::close();
 ?>

admin/posts_actions.php

@@ -16 +16 @@
 
 $params = array();
+$action = '';
 
 /* Actions
@@ -126 +127 @@
      elseif ($action == 'category' && isset($_POST['new_cat_id']))
      {
-          try
-          {
-               $core->blog->updPostsCategory($posts_ids,$_POST['new_cat_id']);
+          $new_cat_id = $_POST['new_cat_id'];
+          
+          try
+          {
+               if (!empty($_POST['new_cat_title']) && $core->auth->check('categories', $core->blog->id))
+               {
+                    $cur_cat = $core->con->openCursor($core->prefix.'category');
+                    $cur_cat->cat_title = $_POST['new_cat_title'];
+                    $cur_cat->cat_url = '';
+                    
+                    $parent_cat = !empty($_POST['new_cat_parent']) ? $_POST['new_cat_parent'] : '';
+                    
+                    # --BEHAVIOR-- adminBeforeCategoryCreate
+                    $core->callBehavior('adminBeforeCategoryCreate', $cur_cat);
+                    
+                    $new_cat_id = $core->blog->addCategory($cur_cat, (integer) $parent_cat);
+                    
+                    # --BEHAVIOR-- adminAfterCategoryCreate
+                    $core->callBehavior('adminAfterCategoryCreate', $cur_cat, $new_cat_id);
+               }
+               
+               $core->blog->updPostsCategory($posts_ids, $new_cat_id);
                
                http::redirect($redir);
@@ -246 +266 @@
      echo '<h2 class="page-title">'.__('Change category for entries').'</h2>';
      
-     # categories list
      # Getting categories
-     $categories_combo = array('&nbsp;' => '');
+     $categories_combo = array(__('(No cat)') => '');
      try {
           $categories = $core->blog->getCategories(array('post_type'=>'post'));
-          while ($categories->fetch()) {
-               $categories_combo[] = new formSelectOption(
-                    str_repeat('&nbsp;&nbsp;',$categories->level-1).
-                    ($categories->level-1 == 0 ? '' : '&bull; ').html::escapeHTML($categories->cat_title),
-                    $categories->cat_id
-               );
+          if (!$categories->isEmpty()) {
+               while ($categories->fetch()) {
+                    $catparents_combo[] = $categories_combo[] = new formSelectOption(
+                         str_repeat('&nbsp;&nbsp;',$categories->level-1).($categories->level-1 == 0 ? '' : '&bull; ').html::escapeHTML($categories->cat_title),
+                         $categories->cat_id
+                    );
+               }
           }
      } catch (Exception $e) { }
@@ -264 +284 @@
      '<p><label for="new_cat_id" class="classic">'.__('Category:').'</label> '.
      form::combo('new_cat_id',$categories_combo,'');
+     
+     if ($core->auth->check('categories', $core->blog->id)) {
+          echo 
+          '<div>'.
+          '<p id="new_cat">'.__('Add a new category').'</p>'.
+          '<p><label for="new_cat_title">'.__('Title:').' '.
+          form::field('new_cat_title',30,255,'','maximal').'</label></p>'.
+          '<p><label for="new_cat_parent">'.__('Parent:').' '.
+          form::combo('new_cat_parent',$categories_combo,'','maximal').
+          '</label></p>'.
+          '</div>';
+     }
      
      echo

admin/posts_actions.php

@@ -282 +282 @@
      echo
      '<form action="posts_actions.php" method="post">'.
-     '<p><label for="new_cat_id" class="classic">'.__('Category:').' '.
-     form::combo('new_cat_id',$categories_combo,'').
-     '</label> ';
+     '<p><label for="new_cat_id" class="classic">'.__('Category:').'</label> '.
+     form::combo('new_cat_id',$categories_combo,'');
      
      if ($core->auth->check('categories', $core->blog->id)) {
@@ -327 +326 @@
      echo
      '<form action="posts_actions.php" method="post">'.
-     '<p><label for="new_lang" class="classic">'.__('Entry lang:').' '.
-     form::combo('new_lang',$lang_combo,'').
-     '</label> ';
+     '<p><label for="new_lang" class="classic">'.__('Entry lang:').'</label> '.
+     form::combo('new_lang',$lang_combo,'');
      
      echo
@@ -345 +343 @@
      echo
      '<form action="posts_actions.php" method="post">'.
-     '<p><label for="new_auth_id" class="classic">'.__('Author ID:').' '.
-     form::field('new_auth_id',20,255).
-     '</label> ';
+     '<p><label for="new_auth_id" class="classic">'.__('Author ID:').'</label> '.
+     form::field('new_auth_id',20,255);
      
      echo

admin/preferences.php

@@ -344 +344 @@
      ($user_acc_nodragdrop ? '' : dcPage::jsLoad('js/_preferences-dragdrop.js')).
      dcPage::jsLoad('js/jquery/jquery-ui.custom.js').
+     dcPage::jsLoad('js/jquery/jquery.pwstrength.js').
+          '<script type="text/javascript">'."\n".
+          "//<![CDATA[\n".
+          "\$(function() {\n".
+          "    \$('#new_pwd').pwstrength({texts: ['".
+                    sprintf(__('Password strength: %s'),__('very weak'))."', '".
+                    sprintf(__('Password strength: %s'),__('weak'))."', '".
+                    sprintf(__('Password strength: %s'),__('mediocre'))."', '".
+                    sprintf(__('Password strength: %s'),__('strong'))."', '".
+                    sprintf(__('Password strength: %s'),__('very strong'))."']});\n".
+          "});\n".
+          "\n//]]>\n".
+          "</script>\n".
      dcPage::jsPageTabs($default_tab).
      dcPage::jsConfirmClose('user-form').
@@ -420 +433 @@
      '<legend>'.__('Change your password').'</legend>'.
      
-     '<p><label for="new_pwd">'.__('New password:').'</label>'.
-     form::password('new_pwd',20,255).'</p>'.
+     '<div class="pw-table">'.
+     '<p class="pw-cell"><label for="new_pwd">'.__('New password:').'</label>'.
+     form::password('new_pwd',20,255,'','','',false,' data-indicator="pwindicator" ').'</p>'.
+     '<div id="pwindicator">'.
+     '    <div class="bar"></div>'.
+     '    <p class="label no-margin"></p>'.
+     '</div>'.
+     '</div>'.
      
      '<p><label for="new_pwd_c">'.__('Confirm password:').'</label>'.

admin/preferences.php

@@ -361 +361 @@
      
      # --BEHAVIOR-- adminPreferencesHeaders
-     $core->callBehavior('adminPreferencesHeaders')
+     $core->callBehavior('adminPreferencesHeaders'),
+
+     dcPage::breadcrumb(
+     array(
+          html::escapeHTML($core->auth->userID()) => '',
+          '<span class="page-title">'.$page_title.'</span>' => ''
+     ))
 );
 
@@ -382 +388 @@
      dcPage::message(__('Default favorites have been successfully updated.'));
 }
-
-echo '<h2>'.html::escapeHTML($core->blog->name).' &rsaquo; <span class="page-title">'.$page_title.'</span></h2>';
 
 # User profile
@@ -393 +397 @@
 '<div class="two-cols">'.
 '<div class="col">'.
-'<p><label for="user_name">'.__('Last Name:').
-form::field('user_name',20,255,html::escapeHTML($user_name)).'</label></p>'.
-
-'<p><label for="user_firstname">'.__('First Name:').
-form::field('user_firstname',20,255,html::escapeHTML($user_firstname)).'</label></p>'.
-
-'<p><label for="user_displayname">'.__('Display name:').
-form::field('user_displayname',20,255,html::escapeHTML($user_displayname)).'</label></p>'.
-
-'<p><label for="user_email">'.__('Email:').
-form::field('user_email',20,255,html::escapeHTML($user_email)).'</label></p>'.
-
-'<p><label for="user_url">'.__('URL:').
-form::field('user_url',30,255,html::escapeHTML($user_url)).'</label></p>'.
+'<p><label for="user_name">'.__('Last Name:').'</label>'.
+form::field('user_name',20,255,html::escapeHTML($user_name)).'</p>'.
+
+'<p><label for="user_firstname">'.__('First Name:').'</label>'.
+form::field('user_firstname',20,255,html::escapeHTML($user_firstname)).'</p>'.
+
+'<p><label for="user_displayname">'.__('Display name:').'</label>'.
+form::field('user_displayname',20,255,html::escapeHTML($user_displayname)).'</p>'.
+
+'<p><label for="user_email">'.__('Email:').'</label>'.
+form::field('user_email',20,255,html::escapeHTML($user_email)).'</p>'.
+
+'<p><label for="user_url">'.__('URL:').'</label>'.
+form::field('user_url',30,255,html::escapeHTML($user_url)).'</p>'.
 
 '</div>'.
@@ -412 +416 @@
 '<div class="col">'.
 
-'<p><label for="user_lang">'.__('User language:').
-form::combo('user_lang',$lang_combo,$user_lang,'l10n').'</label></p>'.
-
-'<p><label for="user_tz">'.__('User timezone:').
-form::combo('user_tz',dt::getZones(true,true),$user_tz).'</label></p>'.
+'<p><label for="user_lang">'.__('User language:').'</label>'.
+form::combo('user_lang',$lang_combo,$user_lang,'l10n').'</p>'.
+
+'<p><label for="user_tz">'.__('User timezone:').'</label>'.
+form::combo('user_tz',dt::getZones(true,true),$user_tz).'</p>'.
 
 '</div>'.
@@ -432 +436 @@
      '<p class="pw-cell"><label for="new_pwd">'.__('New password:').'</label>'.
      form::password('new_pwd',20,255,'','','',false,' data-indicator="pwindicator" ').'</p>'.
-    '<div id="pwindicator">'.
-    '    <div class="bar"></div>'.
-    '    <p class="label no-margin"></p>'.
-    '</div>'.
-    '</div>'.
+     '<div id="pwindicator">'.
+     '    <div class="bar"></div>'.
+     '    <p class="label no-margin"></p>'.
+     '</div>'.
+     '</div>'.
      
      '<p><label for="new_pwd_c">'.__('Confirm password:').'</label>'.
@@ -462 +466 @@
 '<fieldset><legend>'.__('My options').'</legend>'.
 
-'<p><label for="user_post_format">'.__('Preferred format:').
-form::combo('user_post_format',$formaters_combo,$user_options['post_format']).'</label></p>'.
-
-'<p><label for="user_post_status">'.__('Default entry status:').
-form::combo('user_post_status',$status_combo,$user_post_status).'</label></p>'.
-
-'<p><label for="user_edit_size">'.__('Entry edit field height:').
-form::field('user_edit_size',5,4,(integer) $user_options['edit_size']).'</label></p>'.
+'<p><label for="user_post_format">'.__('Preferred format:').'</label>'.
+form::combo('user_post_format',$formaters_combo,$user_options['post_format']).'</p>'.
+
+'<p><label for="user_post_status">'.__('Default entry status:').'</label>'.
+form::combo('user_post_status',$status_combo,$user_post_status).'</p>'.
+
+'<p><label for="user_edit_size">'.__('Entry edit field height:').'</label>'.
+form::field('user_edit_size',5,4,(integer) $user_options['edit_size']).'</p>'.
 
 '<p><label for="user_wysiwyg" class="classic">'.
@@ -485 +489 @@
 if (count($iconsets_combo) > 1) {
      echo 
-          '<p><label for="user_ui_iconset">'.__('Iconset:').
-          form::combo('user_ui_iconset',$iconsets_combo,$user_ui_iconset).'</label></p>';
+          '<p><label for="user_ui_iconset">'.__('Iconset:').'</label>'.
+          form::combo('user_ui_iconset',$iconsets_combo,$user_ui_iconset).'</p>';
 } else {
      form::hidden('user_ui_iconset','');

admin/style/default.css

@@ -541 +541 @@
 }
 
+#upg-notify {
+}
+#upg-notify ul {
+     padding-left: 15px;
+}
+#upg-notify li {
+     color: #fff;
+}
 /* ------------------------------------------------------------------ post */
 #entry-wrapper {
@@ -1617 +1625 @@
 }
 
+/* --------------------------------------------------------------- password indcator */
+.pw-table {
+     display: table;
+     margin-bottom: 1em;
+}
+.pw-cell {
+     display: table-cell;
+     margin-bottom: 1em;
+}
+#pwindicator {
+     display: table-cell;
+     vertical-align: bottom;
+     padding-left: 1.5em;
+     height: 3.8em;
+}
+#pwindicator .bar {
+     height: 6px;
+     margin-bottom: 4px;
+}
+.pw-very-weak .bar {
+     background: #900;
+     width: 30px;
+}
+.pw-weak .bar {
+     background: #c00;
+     width: 60px;
+}
+.pw-mediocre .bar {
+     background: #f60;
+     width: 90px;
+}
+.pw-strong .bar {
+     background: #060;
+     width: 120px;
+}
+.pw-very-strong .bar {
+     background: #0c0;
+     width: 150px;
+}
+
 /* ---------------------------------------------------------------------------
      Media queries vite fait en attendant la reprise complète du layout

admin/style/default.css

@@ -13 +13 @@
 
 /* ------------------------------------------------------------------ html */
+html {
+     font-size: 62.5%;
+}
 body {
-     font: 75%/1.5em Helvetica,Arial,sans-serif;
+     font: 1.2rem/1.5 Arial,Helvetica,sans-serif;
      color: #333;
-     background: #f5f5f5;
+     background: #fff;
      margin: 0;
      padding: 0;
-}
-body.auth {
-     background: #fff;
 }
 
@@ -36 +36 @@
 }
 
-h1, h2, h3, h4, h5, h6, p {
+h1, h2, h3, .as_h3, h4, h5, h6, p {
      margin-top: 0;
-     margin-bottom: 0.6em;
+     margin-bottom: 1rem;
 }
 h2 {
      color: #666;
-     font-size: 1.4em;
-     padding: 4px 0;
+     font-size: 1.8rem;
+     padding: 0 0 1.8rem;
+     font-weight: normal;
+}
+h2 a:link, h2 a:visited {
+     color: #666;
+     border-color: #000;
 }
 .page-title {
      color: #d30e60;
 }
-h3 {
+.page-title img {
+     padding-left: .6rem;
+     vertical-align: middle;
+}
+#content > h2 {
+     padding: 0 1.8rem .6rem;
+     margin: 0 -1.8rem 1rem;
+     background: #fff url(bg_h2.png) repeat-x center bottom;
+}
+h3, .as_h3 {
+     color: #575859;
+     font-size: 1.4rem;
+}
+h4 {
+     font-size: 1.1em;
+     color: #575859;
+}
+h5 {
+     font-size: 1em;
+     color: #575859;
+}
+#entry-sidebar h5 {
+     font-weight: normal;
      color: #333;
-     font-size: 1.2em;
+}
+.entry-status label img {
+     padding-left: .4rem;
+     vertical-align: text-top;
 }
 p, div.p {
@@ -57 +87 @@
 hr {
      height: 1px;
-     border-width: 1px 0 0 0;
+     border-width: 1px 0 0;
      border-color: #999;
      border-style: solid;
@@ -83 +113 @@
 #header {
      background: #575859;
-     height: 3em;
      position: relative;
+     border-bottom: 4px solid #A2CBE9;
+     width: 100%;
 }
 #prelude {
-     background: #575859;
-     line-height: 1.5em;
-     margin: 0;
-     padding: 0 1.7em 0 1em;
+     line-height: 1.9;
+     margin: 0;
+     padding: 0;
      overflow: hidden;
      position: absolute;
-     top: 1.2em;
+     top: 3em;
      left: 0;
+     background: #A2CBE9;
+     width: 14.5em;
      }
 #prelude li {
      list-style-type: none;
-     margin: 0 1em 0 0;
+     margin: 0;
      background:transparent;
-     }
+}
 #prelude li a {
-     color:#fff;
-     }
+     padding-left: 1.6rem;
+     background: #A2CBE9;
+     color: #000;
+     border-bottom-color: #A2CBE9;
+}
 #top {
      margin: 0;
      padding: 0;
-     width: 13em;
+     width: 14.5em;
      float: left;
 }
@@ -113 +148 @@
      padding: 0;
      margin: 0;
-     height: 3em;
+     height: 3.6rem;
      text-indent: -1000px;
-     background: transparent url(dc_logo.png) no-repeat 0 50%;
 }
 #top h1 a {
      position: absolute;
-     top: 3px;
+     top: 0;
      left: 0;
-     width: 130px;
-     height: 60px;
+     width: 17.4rem;
+     height: 3.6rem;
      border: none;
-     outline: none;
      color: #fff;
 }
+#top h1 a:link {
+     background: transparent url(dc_logos/b-dotclear120.png) no-repeat 0 6px;
+}
+#top h1 a:hover, #top h1 a:focus {
+     background: transparent url(dc_logos/b-dotclear120.png) no-repeat 0 -94px; 
+}
 #info-boxes {
-     background: #575859;
-     font-size: .95em;
-     height: 3em;
+     font-size: 1em;
+     line-height: 3em;
 }
 #info-box1 {
      margin: 0;
-     padding: .5em 3px 4px 0;
+     padding: 0 3px 0 1.8rem;
      color: #fff;
-     float: left;
-     background: #575859;
+     display: inline-block;
 }
 #info-box2 {
-     margin: .1em 0 0 0;
-     padding: .5em 1.3em 4px 0;
+     margin: 0;
+     padding: 0 1.3em 0 0;
      color: #fff;
      float: right;
      text-align: right;
-     background: #575859;
-     height: 2em;
 }
 #info-box1 p {
@@ -153 +188 @@
 }
 #info-box1 select {
-     width: 15em;
+     width: 14.5em;
 }
 #info-box1 a img, #info-box2 a img {
@@ -159 +194 @@
      padding-left: .3em;
      }
-#info-box1 a, #info-box2 a {
-     background: #575859;
+#info-boxes a {
      font-weight: bold;
      color: #fff;
@@ -173 +207 @@
 }
 #info-box2 a.active {
-     border-bottom-color: #f5f5f5;
+     border-bottom-color: #fff;
      margin: 0;
      padding: 1.2em .5em;
-     background-color: #f5f5f5;
+     background-color: #fff;
      color: #333;
      font-weight: bold;
 }
 #info-box2 span {
-     color: #575859;
-}
-/* prelude */
+     color: #999;
+}
+/* main blocks */
 #wrapper {
      width: 100%;
@@ -190 +224 @@
      width: 100%;
      float: right;
-     margin-left: -13em;
+     margin-left: -14.5em;
      margin-top: 0;
+     background: #fff url(bg_menu.png);
 }
 #content {
-     margin: 1.5em 1.5em .5em 13em;
-     padding: 1em;
+     margin: 0 0 0 14.5em;
+     padding: .9rem 1.8rem 1.8rem;
      background: #fff;
-     border-radius: .5em;
-     border: 1px solid #ddd;
 }
      /* Micro clearfix thx to Nicolas Gallagher */
@@ -219 +252 @@
 }
 .two-cols .col {
-     width: 49%;
+     width: 47%;
      margin-left: 2%;
      float: left;
 }
-.two-cols .col:first-child {
-     width: 49%;
-     margin-left: 0;
-}
 .two-cols .col70{
-     width: 69%;
+     width: 68%;
      margin-left: 0;
      float: left;
 }
-.two-cols .col30 {
+.col30 {
      width: 28%;
      margin-left: 2%;
      float: left;
 }
+.two-cols .col:first-child,
+.two-cols .col30.first-col {
+     margin-left: 0;
+     margin-right: 2%;
+}
+.two-cols .col:last-child,
+.two-cols .col70.last-col {
+     margin-left: 2%;
+     margin-right: 0;
+}
 /* -------------------------------------------------------------- layout - onglets */
 .part-tabs ul {
-     padding: .3em 0 1px 1em;
-     border-bottom: 1px solid #999;
+     padding: .5em 0 .3em 1.2rem;
+     border-bottom: 1px solid #ddd;
 }
 .part-tabs li {
@@ -248 +287 @@
 }
 .part-tabs li a {
-     padding: .3em 0.5em;
-     margin-right: .5em;
-     border: 1px solid #999;
+     padding: .5em 2em;
+     margin-right: -1px;
+     border: 1px solid #aaa;
      border-bottom: none;
-     background: #dfdfdf;
      text-decoration: none;
-     border-top-left-radius: .3em;
-     border-top-right-radius: .3em;
-     color: #000;
-}
-.part-tabs li.part-tabs-link a {
-     background: #ffe;
+     color: #333;
+     background-color:#E4E0EC;
 }
 .part-tabs li a:hover, .part-tabs li a:focus {
@@ -268 +302 @@
 .part-tabs li.part-tabs-active a {
      background: #fff;
-     border-bottom: 1px solid #fff;
-     color: #000;
      font-weight: bold;
+     border-bottom-color: #fff;
+     padding-bottom: .7rem;
 }
 /* ------------------------------------------------------------------ main-menu */
 #main-menu {
-     width: 13em;
+     width: 14.5em;
      float: left;
-     margin-top: 1.2em;
-     margin-bottom: .5em;
+     margin:0;
+     padding-top: 4.5em;
+     padding-bottom: 1em;
+     background: #f7f7f7;
 }
 #main-menu h3 {
-     margin: 0 0 0.5em;
-     padding: .5em 0 0 .5em;
-     text-transform: uppercase;
+     margin: 0;
+     padding: 1.2rem 0 1rem 2.2rem;
+     text-indent: -1.6rem;
      color: #666;
-     font-size: 1.1em;
+     font-size: 1.4rem;
+}
+#main-menu h3 img[alt="cacher"] {
+     vertical-align: top;
 }
 #main-menu ul {
-     font-size: .95em;
-     margin: 0 0 1em 0;
+     margin: 0 0 1.8rem 0;
      padding: 0;
      list-style: none;
@@ -295 +333 @@
      display: block;
      margin: 0.5em 0 0;
-     padding: .2em 0 0 32px;
+     padding: .3rem 0 0 30px;
      background-repeat: no-repeat;
-     background-position: 12px .4em;
+     background-position: 8px .3em;
+}
+#main-menu li.active {
+     background-color: #fff;
 }
 #main-menu a {
-     font-weight: bold;
+     color: #333;
+     border-bottom-color: #ccc;
 }
 #main-menu .active a {
      border-bottom: none;
-     color: #333;
+     color: #d30e60;
 }
 #main-menu .active {
-     background-color: #fff;
-     padding: .4em 0 .1em 32px;
-     background-position: 12px .4em;
-     border-top: 1px solid #ddd;
-     border-bottom: 1px solid #ddd;
-     margin-right: -1px;
-}
-#favorites-menu {
-     margin: 0 0 2em;
+     font-weight: bolder;
+}
+#search-menu {
+     padding: .3rem .4rem 0;
+     font-size: 100%
+}
+#search-menu p {
+     display: inline-block;
+     border: 1px solid #999;
+     border-radius: .6em;
+     position: relative;
+     height: 2rem;
+     overflow: hidden;
+}
+#search-menu #q {
+     width: 12rem;
+     border-bottom-left-radius: .6em;
+     border-top-left-radius: .6em;
+     background: transparent url(search.png) no-repeat 4px center;
+     text-indent: 18px;
+     height: 2rem;
+     padding: 0 2px; 
+     border: none;
+}
+#search-menu input[type="submit"] {
+     padding: 0 0.3rem;
+     background: #dfdfdf;
+     border-color: #999;
+     color: #444;
+     border-bottom-right-radius: .6em;
+     border-top-right-radius: .6em;
+     border-top-left-radius: 0;
+     border-bottom-left-radius: 0;
+     text-shadow: none;
+     height: 2rem;
+     border: none;
+     border-left: 1px solid #aaa;
+     font-size: 1rem;
+}
+#search-menu input[type="submit"]:hover,
+#search-menu input[type="submit"]:focus {
+     background: #575859;
+     color: #fff;
+}
+#favorites-menu, #blog-menu, #system-menu, #plugins-menu {
+     border-bottom: 1px dashed #A2CBE9;
 }
 #favorites-menu h3 {
-     color: #333;
-     text-transform: none;
-}
-#favorites-menu a {
-     color: #333;
-}
-#favorites-menu .active {
-     background-color: transparent;
-     border: none;
-}
-#favorites-menu .active a {
-     font-weight: bold;
-     color: #666;
+     color: #000;
+     font-variant: small-caps;
+     padding-top: .6rem;
 }
 /* ------------------------------------------------------------------ footer */
 #footer {
      clear: both;
-     padding: .75em .75em 0 0;
+     padding: .6rem 1.2rem .6rem 0;
      text-align: right;
+     border-top: .1rem solid #ccc;
 }
 #footer p {
      margin: 0;
      padding: 0 1em;
-     text-align: center;
-     font-size: 1.1em;
-}
-#footer a {
+     font-size: 1em;
 }
 #footer p span.credit {
-     font-size: .85em;
+     font-size: 1rem;
      font-weight: normal;
 }
@@ -355 +422 @@
      width: 18em;
      margin: 1.5em auto 0;
-     font-size: 1.1em;
+     font-size: 1.4rem;
 }
 #login-screen h1 {
      text-indent: -2000px;
-     background: transparent url(dotclear-logo2.png) no-repeat top left;
-     height: 50px;
+     background: transparent url(dc_logos/w-dotclear240.png) no-repeat top left;
+     height: 66px;
      margin-bottom: .5em;
-     margin-left: .5em;
+     margin-left: 0;
 }
 #login-screen fieldset, #login-screen .fieldset {
-     border: 1px solid #999;
+     border: 1px solid #A8DC26;
      padding: 1em 1em 0 1em;
      border-radius: 4px;
+     background: #fff;
+}
+#login-screen legend {
+     border: 1px solid #A8DC26;
 }
 #login-screen input[type=text], #login-screen input[type=password], #login-screen input[type=submit] {
@@ -373 +444 @@
 }
 #login-screen #issue {
-     margin-left: 1em;
-     font-size: 1em;
+     margin-left: 1.5rem;
+     font-size: 1.2rem;
 }
 #login-screen #issue strong {font-weight: normal;}
@@ -381 +452 @@
 /* ------------------------------------------------------------------ dashboard */
 #dashboard-main {
-     float: left;
-     overflow: hidden;
-     padding: 1em 2% 1em 0;
-     width: 70%;
-}
-#dashboard-main.fullwidth {
-     width: 100%;
      padding: 1em 0;
-     float: none;
 }
 #icons {
@@ -399 +462 @@
      width: 210px;
      text-align: center;
-     margin: 2em 0 0 0;
+     margin: 1em 0 2em;
+     padding: 1em 0;
      display:inline-block;
+     vertical-align: top;
 }
 #icons a,
@@ -412 +477 @@
 #icons a span {
      border-bottom: 1px dotted #f90;
+     color: #333;
+}
+#icons a img {
+     padding: 2em;
+     background: #eee;
+     border-radius: 1.6rem;
+     box-shadow: 0 3px 3px 0 #ccc;
+     margin-bottom: .6rem;
+}
+#icons a img:hover, #icons a:focus img {
+     background-color: #BBDB58;
 }
 #icons a:focus span, #icons a:hover span {
@@ -417 +493 @@
 }
 #quick {
-     clear: left;
      margin-top: 2em;
 }
@@ -432 +507 @@
 }
 #dashboard-items {
-     float: left;
-     width: 27%;
-     overflow: hidden;
-     padding-bottom: 1em;
-     padding-top: 3em;
+     margin: 3em auto;
+     display: table;
+     width: 100%;
+     border-collapse: collapse;
+}
+.db-item {
+     display: table-cell;
+     padding: 1em 3em;
+     vertical-align: top;
+     border: 1px solid #ccc;
 }
 #dashboard-items img {
@@ -476 +556 @@
 }
 #entry-content {
-     margin-right: 18em;
+     margin-right: 19em;
+     margin-left: 0;
+}
+.multi-part {
+     padding-left: 1.2rem;
+}
+#entry-content label {
+     text-transform: uppercase;
+     font-weight: bold;
+     margin-top: 2em;
 }
 #entry-sidebar {
      width: 17em;
      float: right;
+}
+#entry-sidebar input[type="text"],
+#entry-sidebar select {
+     width: 14em; /* to prevent inline with label */
+}
+.box {
+     border-bottom: 1px solid #ddd;
+     margin-bottom: 1em;
 }
 #comments {
@@ -518 +615 @@
 }
 #media-details {
+}
+.near-icon {
      margin-left: 70px;
+     margin-bottom: 3em;
 }
 #media-details ul {
@@ -653 +753 @@
 /* -------------------------------------------------------------------- Themes */
 #themes {
-     border-bottom: 1px solid #ccc;
-     margin: 1em 0;
+     margin: 0;
+     width: 100%;
+     padding: 0;
+}
+#themes h3 {
 }
 #themes div.theme-details {
-     clear: left;
      border-top: 1px solid #ccc;
-     padding: 1em 0;
+     padding: 12px;
+     display: inline-block;
+     vertical-align: top;
+     width: 284px;
+}
+.current-theme {
+     background: #eef;
 }
 #themes div.theme-details:hover {
-     background: #eee;
+     background: #f0f0f0;
 }
 #themes div.theme-details div.theme-shot {
-     float: left;
 }
 #themes div.theme-details div.theme-shot img {
      display: block;
-     width: 57px;
-     height: 50px;
      border: 1px solid #ccc;
+     margin-bottom: 1.5em;
 }
 #themes div.theme-details div.theme-info {
-     margin-left: 67px;
 }
 #themes div.theme-details div.theme-info span.theme-desc {
@@ -683 +788 @@
 }
 #themes div.theme-details div.theme-actions {
-     margin-left: 67px;
-}
+}
+#themes-actions {
+     border-bottom: 1px solid #999;
+     margin-bottom: 3em;
+}
+.theme-css {
+     display: block;
+}
+
 /* Themes list, JS version */
 #themes-wrapper {
+     display: table;
+}
+#themes-wrapper #themes {
+     display: table-cell;
+     vertical-align: top;
+     padding-left: 1em;
 }
 #theme-box {
-     border: 1px solid #999;
-     border-left: none;
-     padding: 5px;
-     float: right;
-     height: 420px;
-     width: 320px;
-     overflow: auto;
+     display: table-cell;
+     vertical-align: top;
+     padding: 1rem 0; 
+     width: 312px;
+     background: #eef;
+     border: 1px solid #ccc;
+     border-radius: 3px;
 }
 #theme-box div.theme-shot img {
      display: block;
-     margin: 0 0 0 10px;
+     margin: 0 16px;
      width: 280px;
      height: 245px;
@@ -705 +823 @@
 }
 #theme-box div.theme-info {
-     margin: 1em 0 0 10px;
-}
-#theme-box h3 {
-     margin: 0;
-}
-#theme-box div.theme-info span {
-     display: block;
+     margin: 1em 16px;
+}
+#theme-box h4 {
+     color: #000;
 }
 #theme-box span.theme-version {
@@ -724 +839 @@
 }
 #theme-box div.theme-actions {
-     margin-left: 10px;
-}
-#themes-wrapper #themes {
-     border: 1px solid #999;
-     overflow: auto;
-     height: 420px;
-     padding: 5px;
-     margin: 0;
+     padding: 0 16px;
 }
 #themes div.theme-details-js {
@@ -737 +845 @@
      width: 120px;
      height: 150px;
-     margin: 0 10px 20px;
-     padding: 10px 10px 0;
+     margin: 0 12px 24px;
+     padding: 12px 12px 0;
      text-align: center;
      background: #f3f3f3;
-     border: 1px solid #f3f3f3;
+     border: 1px solid #ddd;
      cursor: pointer;
      border-radius: 4px;
@@ -749 +857 @@
 }
 #themes div.theme-details-js.theme-selected {
-     background: #E5E3DA;
+     background: #ddd;
      border: 1px solid #999;
 }
@@ -757 +865 @@
      border: 1px solid #fff;
 }
-#themes div.theme-details-js h3 {
-     font-family: inherit;
-     font-weight: normal;
-     margin: 0;
-     padding: 0;
-}
 /* ----------------------------------------------------------  Plugins list */
 #plugins td.action {
@@ -776 +878 @@
 /* ------------------------------------------------------------------ contextual help */
 #help {
-     margin-top: 2em;
+     margin-top: 4em;
      background: #f5f5f5;
      z-index: 100;
 }
 #help-button {
-     position: fixed;
-     top: 3.2em;
+     background: transparent url(../images/page_help.png) no-repeat 6px center;
+     position: absolute;
+     top: 3.6rem;
      right: 0px;
+     padding: 0 2rem 0 3rem;
      cursor: pointer;
-     background: #fc3;
-     border: 1px solid #dde;
-     border-right: none;
-     font-size: 1.1em;
-     font-weight: bold;
-     text-transform: capitalize;
-     padding: .33em .75em .33em 1em;
-     border-radius: 1em 0 0 1em;
-     color: #444;
+     color: #2373A8;
+     line-height: 4.2rem;
+}
+#help-button span {
+     padding: .6rem 0 .1rem 0;
+     border-bottom: 1px solid #2373A8;
 }
 .help-box {
@@ -803 +904 @@
 }
 #content.with-help #help-button {
-     right: 282px;
+     right: 28.2rem;
+     background-color: #f5f5f5;
+     position: fixed;
+     border-top: 2px solid #FFD478;
+     border-left: 2px solid #FFD478;
+     border-bottom: 2px solid #FFD478;
+     border-bottom-left-radius: 1rem;
+     border-top-left-radius: 1rem;
 }
 #content.with-help #help {
      display: block;
      position: absolute;
-     top: 40px;
+     top: 3.6rem;
      right: 0;
-     width: 280px;
-     border-left: 2px solid #fc3;
+     width: 28rem;
+     border-left: 2px solid #FFD478;
+     border-top: 2px solid #FFD478;
      margin-top: 0;
      padding: 10px 0 0 0;
@@ -829 +938 @@
 /* ------------------------------------------------------------------ popups */
 body.popup #wrapper, body.popup #top {
-     margin-top: -1.5em;
+     width: 100%;
+     padding: 0;
+}
+body.popup #wrapper {
      float: none;
-}
-body.popup #top h1 {
-     background: transparent;
+     margin:0;
+     display: block;
+}
+body.popup h1, body.popup #top {
+     margin: 0;
+     border-bottom: 1px solid;
+     font-weight: normal;
+     color: #fff;
+     background: #575859;
+     font-size: 1.5em;
+     text-indent: .6rem;
+     line-height: 1.3em;
 }
 body.popup #main {
-     margin-left: -35px;
-     margin-bottom: 1em;
+     margin-bottom: 1em 0;
 }
 body.popup #content {
-     margin-left: 35px;
-     margin-left: 2em;  /* 3.2 */
-}
-body.popup #footer {
-     display: none; /* 3.2 */
+     margin: 0;
+     padding: .6rem 0 !important;
+}
+body.popup #content h2 {
+     margin: 0 0 1em;
 }
 body.popup #footer p {
-     margin-left: 35px;
      border: none;
 }
@@ -859 +978 @@
 }
 p.error, p.message, p.static-msg {
-     padding-top: 1em;
-     padding-bottom: 1em;
+     padding-top: 1rem;
+     padding-bottom: 1rem;
 }
 div.error, p.error {
@@ -874 +993 @@
 div.static-msg a, p.static-msg a {
      color: #fff;
+}
+/* ------------------------------------------------------------------ navigation */
+.anchor-nav {
+     background: #575859;
+     color: #fff;
+     padding: .4rem 1.2rem;
+     float: right;
+}
+.nav_prevnext {
+     margin-bottom: 2em;
+     color: #fff;
+}
+.nav_prevnext a, a.back {
+     border: 1px solid #ddd;
+     padding: .2rem 2rem;
+     border-radius: 1rem;
+     background-color: #f0f0f0;
+}
+a.back:before {
+     content: "\ab\a0";
+}
+a.onblog_link {
+     color: #333;
+     float: right;
+     border: 1px solid #eee;
+     padding: .2rem 2rem;
+     border-radius: 1rem;
+     background-color: #ffe;
 }
 /* ------------------------------------------------------------------ debug */
@@ -898 +1045 @@
 /* -------------------------------------------------------------------- CLASSES COMMUNES */
 
-.no-margin {
-     margin: 0;
-}
+.no-margin, #entry-content label.no-margin {
+     margin: 0;
+}
+.border-top {
+     border-top: 1px solid #999;
+     padding-top: 1em;
+     margin-top:    1em;
+}
+.fieldset {
+     background: #fff;
+     border: 1px solid #aaa;
+     border-radius: 6px; 
+     padding: 1em .7em .5em;
+     margin-bottom: 1em;
+}
+.fieldset h3 {
+     color: #333;
+}
+
 /* paragraphe pour bouton Nouveau bidule */
 p.top-add {
@@ -991 +1154 @@
 -------------------------------------------------------- */
 table {
-     font-size: 1em;
+     font-size: 1.2rem;
      border-collapse: collapse;
      margin: 0 0 1em 0;
 }
 tr.line:hover {
-     background: #ddd;
+     background: #f3f3f3;
 }
 caption {
      color: #333;
-     font-size: 1.2em;
      font-weight: bold;
      text-align: left;
@@ -1006 +1168 @@
 }
 
-th, td {
+td {
      border-width: 0 0 1px 0;
      border-style: solid;
+     border-color: #e3e3e3;
+     padding: .4rem .5rem;
+     vertical-align: top;
+}
+th {
+     border-width: 1px 0 1px 0;
+     border-style: solid;
      border-color: #ccc;
-     padding: 3px 5px;
+     background: #f3f3ff;
+     padding: .4rem .5rem;
      vertical-align: top;
-}
-th {
      text-align: left;
-     border-bottom-color: #666;
 }
 .noborder td, td.noborder, .noborder th, th.noborder {
-     border-width: 0;
+     border-width: 0 0 1px 0;
+     border-color: #ddd;
+     line-height: 2.4rem;
+     padding-bottom: 0;
+}
+.noborder p {
+     margin-bottom: 0;
 }
 table .maximal, table.maximal {
@@ -1032 +1205 @@
 table.settings, table.prefs {
      width: 80%;
+     border: 1px solid #999;
+     margin-bottom: 3em; 
+}
+table.settings th, table.prefs th {
+     background: #eef;
 }
 table.settings th:first-child, table.prefs th:first-child {
@@ -1045 +1223 @@
      width: 40%;
 }
-
 td.status {
      vertical-align: middle;
@@ -1084 +1261 @@
      padding-left: 15px;
 }
-
 /* ----------------------------------------------------------------- FORMS */
 form {
@@ -1091 +1267 @@
      padding: 0;
 }
-fieldset, .fieldset {
+fieldset {
      display: block;
      margin: 0 0 1em 0;
@@ -1105 +1281 @@
      border-width: 1px;
      border-style: solid;
-     border-color: #ccc;
-     background: #f5f5f5;
+     border-color: #333;
+     background: #fff;
      margin-bottom: 0.5em;
+     border-radius: 3px;
 }
 optgroup {
@@ -1121 +1298 @@
      border-width: 1px;
      border-style: solid;
-     border-color: #000 #ccc #ccc #000;
+     border-color: #666 #ccc #ccc #999;
 }
 input.invalid, textarea.invalid, select.invalid {
@@ -1130 +1307 @@
 }
 input, textarea, select, option {
-     font: 1em "DejaVu Sans","Lucida Grande","Lucida Sans Unicode",Arial,sans-serif;
+     font: 100% "DejaVu Sans","Lucida Grande","Lucida Sans Unicode",Arial,sans-serif;
 }
 input[type=text], input[type=password], textarea {
@@ -1136 +1313 @@
      margin-right: .3em;
 }
-input[type=checkbox], input[type=radio] {
-     border: none;
-}
 textarea {
      padding: 2px 0;
 }
-
-input[type=checkbox], input[type=radio] {
+input[type=checkbox], input[type=radio], input[type=file] {
+     border: none;
      margin: 0;
      padding: 0;
@@ -1162 +1336 @@
      font-style:italic;
      font-weight: normal;
+     text-transform: none;
      color: #666;
 }
@@ -1173 +1348 @@
 }
 p.form-note.info {
-     background: #eef url(info.png) no-repeat .3em .2em;
-     border: 1px solid #99f;
-}
-.form-note a {border-bottom: 1px solid #99f;}
-
+     background: #f5eaff url(info.png) no-repeat .3em .2em;
+     border: 1px solid #ddbaff;
+}
+.form-note a {border-bottom: 1px solid #ddbaff;}
+
+label.ib {
+     display: inline-block;
+}
 label.classic {
      display: inline;
@@ -1214 +1392 @@
      display: inline;
      position: absolute;
-     left: 15em;
+     left: 14.5em;
      top: 0;
 }
@@ -1226 +1404 @@
 a.form-control {
      display: none;
-     font-weight: bold;
-     background: url(magnifier.png) no-repeat 0 0;
-     color: green;
+     background: url(../images/expand.png) no-repeat .4rem center;
      padding-left: 20px;
+     color: #000;
 }
 .constrained {
@@ -1239 +1416 @@
 
 /* --------------------------------------------------------------- buttons */
-h2 a.button {
-     color: #333;
-     font-weight: normal;
-     font-size: .75em;
-     vertical-align: middle;
-}
 /* commun */
 input[type=submit],
@@ -1250 +1421 @@
 input[type=button],
 a.button,
-a.back,
 a.submit {
      display: inline-block;
@@ -1257 +1427 @@
      text-align: center;
      text-decoration: none;
-     padding: .1em .5em 0 .5em;
+     padding: .1em .5em;
      text-shadow: 0 1px 1px rgba(0,0,0,.3);
      border-radius: .2em;
      margin-bottom: .1em;
 }
+h4 a.button {font-weight: normal;}
+
 /* validation */
 input[type=submit],
@@ -1286 +1458 @@
 /* suppression et reset */
 a.button,
-a.back,
 input[type=submit].reset,
 input[type=submit].delete {
@@ -1297 +1468 @@
      }
 a.button:hover,
-a.back:hover,
 input[type=reset]:hover,
 input[type=submit].reset:hover,
 input[type=submit].delete:hover,
 a.button:focus,
-a.back:focus,
 input[type=reset]:focus,
 input[type=submit].reset:focus,
@@ -1315 +1484 @@
 input[type=submit].delete {
      color: #c00;
-     padding-bottom: .1em;
+     padding-bottom: .2rem;
 }
 #entry-content .delete {
@@ -1336 +1505 @@
      margin-left: 2em;
 }
-a.back:before {
-     content: "\ab\a0";
-}
-a.button.add {
-     border-radius: .5em;
-     margin-bottom: .1em;     
-     background: #2C8FD1 url(../images/add.png) no-repeat 6px center;
-     color: #fff;
-     padding: .2em 16px .2em 30px;
-     border: 1px solid #2373A8;
-}
-a.button.add:hover, a.button.add:focus {
-     background-color: #2373A8;
+.button.add {
+     background:-webkit-gradient( linear, left top, left bottom, color-stop(0.05, #9dce2c), color-stop(1, #8cb82b) );
+     background:-moz-linear-gradient( center top, #9dce2c 5%, #8cb82b 100% );
+     filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#9dce2c', endColorstr='#8cb82b');
+     background-color:#9dce2c;
+     border:1px solid #83c41a;
+     padding:.6rem 1.8rem;
+     color: #000;
+     text-shadow: 1px 1px 0 #BBDB58;
+     font-weight: normal;
+     font-size: 1.4rem;
+}
+.button.add:hover, .button.add:focus {
+     background:-webkit-gradient( linear, left top, left bottom, color-stop(0.05, #8cb82b), color-stop(1, #9dce2c) );
+     background:-moz-linear-gradient( center top, #8cb82b 5%, #9dce2c 100% );
+     filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#8cb82b', endColorstr='#9dce2c');
+     background-color:#8cb82b;
+     border:1px solid #83c41a;
+}
+.button-add:focus {
+     outline: dotted 1px;
 }
 
@@ -1384 +1561 @@
 }
 
+/* ------------------------------------------------------- Filters */
+#filters-form {
+     border: 1px dashed #999;
+     border-radius: .6rem;
+     margin-bottom: 2em;
+     padding: .5em 1em 0;
+}
+#filters-form .table {
+     display: table;
+     width: 100%;
+     padding: 0;
+     margin-bottom: 1em;
+     margin-top: 1.5em;
+}
+#filters-form .cell {
+     padding: 0 2em 0 0;
+     display: table-cell;
+     vertical-align: top;
+}
+#filters-form .filters-options {
+     padding-left: 2em;
+     border-left: 1px solid #ccc;
+}
+#filters-form label.ib, span.ib {
+     width:7em;
+     display: inline-block;
+}
+#filters-form label.ibw, span.ibw {
+     width: 9em;
+     display: inline-block;
+}
+#filters-form select {
+     width: 14em;
+}
+
+/* ---------------------------------------------------- Pagination */
+.pagination {
+     height: 22px;
+     margin-top: 1em;
+     line-height: 22px;
+     padding: 0 1rem; 
+     border: 1px solid #ddd;
+     overflow: hidden; 
+     background: #e1e1e1; 
+     background: -moz-linear-gradient(center top , #f2f2f2, #e1e1e1); 
+     background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#f2f2f2), color-stop(100%,#e1e1e1)); 
+     -moz-border-radius: 4px; 
+     -webkit-border-radius: 4px; 
+     border-radius: 4px; 
+     clear: left;
+}
+.pagination a, .pagination strong {
+     height: 20px;
+     border: none;
+     padding: 2px 6px; 
+     background-color : transparent;
+     background-position : 50% 50%;
+     background-repeat: no-repeat;
+}
+.pagination a:hover, .pagination strong {
+     border-color : #ccc;
+     background-color: #fff;
+}
+
 /* --------------------------------------------------------------- password indcator */
 .pw-table {
@@ -1423 +1664 @@
      width: 150px;
 }
+
+/* ---------------------------------------------------------------------------
+     Media queries vite fait en attendant la reprise complète du layout
+---------------------------------------------------------------------------- */
+@media screen and (max-width: 920px) {
+     #top, #top h1 a {width: 42px !important; height:100%; overflow: hidden;
+}
+     #top h1 a:link {
+          background: transparent url(dc_logos/b-dotclear120.png) no-repeat -180px 6px; 
+          border-right: 1px solid #ccc;
+     }
+     #top h1 a:hover, #top h1 a:focus {
+          background: url(dc_logos/b-dotclear120.png) no-repeat -180px -94px;
+          border-right: 1px solid #A2CBE9;
+     }
+}
+@media screen and (max-width: 800px) {
+     #top, #info-boxes, #info-box1, #info-box2 {
+          display:inline-block;
+          vertical-align:middle;
+          margin:0;
+          padding:0;
+          line-height: 3.2rem;
+     }
+     #info-box1 {margin-left: 1rem;}
+     #info-box1 select {width: 14rem;}
+     #main-menu, #main, #content, #content h2, #entry-wrapper, #entry-sidebar, #entry-content, .two-cols .col, .two-cols .col:first-child {
+     display:block;
+     width: 98%;
+     margin:0 auto;
+     padding:0;
+     float:none;
+     text-align: left;
+     clear: both;
+     }
+     #content {
+          width: 100%;
+          padding-top: .5em;
+     }
+}
+@media screen and (max-width: 720px) {
+     .smallscreen {display: none;}
+     #help-button {width:20px; overflow: hidden;}
+     #info-box2 {float:none;}
+     #dashboard-items div {display: block;margin-bottom: 1em; padding: 0 1em;}
+}
+@media screen and (max-width: 492px) {
+     #header {height:3.6rem;}
+     #wrapper {font-size: 1.6rem;}
+     .page-title, #info-boxes, .media-item {display: inline-block;}
+     div.media-list .media-item {width: 90%; float: none}
+     #info-box1 select {width: 12rem; margin-right: .6rem;}
+     #info-box1 p.nomobile, label.nomobile {display: none;}
+     #help-button {height:26px; width:26px; background-color: #A2CBE9; padding: 0; margin:0;font-size: 1rem;line-height: 68px}
+}

admin/update.php

@@ -27 +27 @@
 
 $updater = new dcUpdate(DC_UPDATE_URL,'dotclear',DC_UPDATE_VERSION,DC_TPL_CACHE.'/versions');
-$new_v = $updater->check(DC_VERSION);
+$new_v = $updater->check(DC_VERSION, !empty($_GET['nocache']));
 $zip_file = $new_v ? DC_BACKUP_PATH.'/'.basename($updater->getFileURL()) : '';
 $version_info = $new_v ? $updater->getInfoURL() : '';
@@ -168 +168 @@
 -------------------------------------------------------- */
 dcPage::open(__('Dotclear update'),
-     (!$step ? dcPage::jsPageTabs($default_tab) : ''),
+     (!$step ? 
+          dcPage::jsPageTabs($default_tab).
+          dcPage::jsLoad('js/_update.js')
+          : ''),
      dcPage::breadcrumb(
           array(
@@ -176 +179 @@
 );
 
+if (!$core->error->flag()) {
+     echo '<h2>'.__('Dotclear update').'</h2>';
+     
+     if (!empty($_GET['nocache'])) {
+          dcPage::message(__('Manual checking of update done successfully.'));
+     }
+}
+
 if (!$step)
 {
@@ -181 +192 @@
      if (empty($new_v))
      {
-          echo '<p><strong>'.__('No newer Dotclear version available.').'</strong></p>';
+          echo '<p><strong>'.__('No newer Dotclear version available.').'</strong></p>'.
+          '<form action="'.$p_url.'" method="get">'.
+          '<p><input type="hidden" name="nocache" value="1" />'.
+          '<input type="submit" value="'.__('Force checking update Dotclear').'" /></p>'.
+          '</form>';
      }
      else

admin/update.php

@@ -171 +171 @@
           dcPage::jsPageTabs($default_tab).
           dcPage::jsLoad('js/_update.js')
-     : '')
+          : ''),
+     dcPage::breadcrumb(
+          array(
+               __('System') => '',
+               '<span class="page-title">'.__('Dotclear update').'</span>' => ''
+          ))
 );