Changes in admin/index.php [1358:f117338392dc:1422:fe4e2c4c0fc6]

File:

• admin/index.php (modified) (6 diffs)

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);
 
@@ -201 +202 @@
 );
 
+# 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) {
      echo
@@ -249 +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())
@@ -286 +288 @@
      if ($i->count() > 0)
      {
-          $dashboardItems .= '<div>';
+          $dashboardItems .= '<div class="db-item">';
           foreach ($i as $v) {
                $dashboardItems .= $v;
@@ -324 +326 @@
           '<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> '.
           form::textarea('post_content',50,7).
           '</p>'.
-          '<p><label for="cat_id" class="classic">'.__('Category:').' '.
-          form::combo('cat_id',$categories_combo).'</label></p>'.
+          '<p><label for="cat_id" class="classic">'.__('Category:').'</label> '.
+          form::combo('cat_id',$categories_combo).'</p>'.
           '<p><input type="submit" value="'.__('Save').'" name="save" /> '.
           ($core->auth->check('publish',$core->blog->id)