Changeset 112:d71829bc12e2

Timestamp:

05/02/11 19:33:57 (14 years ago)

Author:

xave <xave@…>

Branch:

userprefs

Message:

New class for dashboard icon panel when no other items.

Location:

admin

Files:

• index.php (modified) (2 diffs)
• style/info.png (modified) (1 prop) (previous)

admin/index.php

@@ -251 +251 @@
 }
 
+# Dashboard columns (processed first, as we need to know the result before displaying the icons.)
+$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);
+     
+     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>'.
+          '</li></ul></div>';
+     }
+}
+
+# Errors modules notifications
+if ($core->auth->isSuperAdmin())
+{
+     $list = array();
+     foreach ($core->plugins->getErrors() as $k => $error) {
+          $list[] = '<li>'.$error.'</li>';
+     }
+     
+     if (count($list) > 0) {
+          $dashboardItems .=
+          '<div id="module-errors" class="error"><p>'.__('Some plugins are installed twice:').'</p> '.
+          '<ul>'.implode("\n",$list).'</ul></div>';
+     }
+     
+}
+
+foreach ($__dashboard_items as $i)
+{    
+     if ($i->count() > 0)
+     {
+          $dashboardItems .= '<div>';
+          foreach ($i as $v) {
+               $dashboardItems .= $v;
+          }
+          $dashboardItems .= '</div>';
+     }
+}
+
 # Dashboard icons
-echo '<div id="dashboard-main"><div id="icons">';
+echo '<div id="dashboard-main"><div id="icons"'.($dashboardItems ? '' : 'class="fullwidth"').'>';
 foreach ($__dashboard_icons as $i)
 {
@@ -308 +354 @@
 echo '</div>';
 
-# Dashboard columns
-$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);
-     
-     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>'.
-          '</li></ul></div>';
-     }
-}
-
-# Errors modules notifications
-if ($core->auth->isSuperAdmin())
-{
-     $list = array();
-     foreach ($core->plugins->getErrors() as $k => $error) {
-          $list[] = '<li>'.$error.'</li>';
-     }
-     
-     if (count($list) > 0) {
-          $dashboardItems .=
-          '<div id="module-errors" class="error"><p>'.__('Some plugins are installed twice:').'</p> '.
-          '<ul>'.implode("\n",$list).'</ul></div>';
-     }
-     
-}
-
-foreach ($__dashboard_items as $i)
-{    
-     if ($i->count() > 0)
-     {
-          $dashboardItems .= '<div>';
-          foreach ($i as $v) {
-               $dashboardItems .= $v;
-          }
-          $dashboardItems .= '</div>';
-     }
-}
 echo ($dashboardItems ? '<div id="dashboard-items">'.$dashboardItems.'</div>' : '');