Changeset 3412:a07474dc68c1 for admin/index.php

Timestamp:

11/19/16 10:56:00 (9 years ago)

Author:

franck <carnet.franck.paul@…>

Branch:

default

Message:

Separate dashboard items boxes (usually official DC infos/links) from dashboard contents boxes (usually 3rd party plugins), get advantage of flexbox system to display all of them

File:

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

admin/index.php

@@ -173 +173 @@
 
 # Dashboard content
-$dashboardContents = '';
 $__dashboard_contents = new ArrayObject(array(new ArrayObject,new ArrayObject));
 $core->callBehavior('adminDashboardContents', $core, $__dashboard_contents);
@@ -312 +311 @@
 }
 
-# Dashboard columns (processed first, as we need to know the result before displaying the icons.)
+# Dashboard items and contents (processed first, as we need to know the result before displaying the icons.)
 $dashboardItems = '';
-
 foreach ($__dashboard_items as $i)
 {
-     if ($i->count() > 0)
-     {
-          $dashboardItems .= '';
-          foreach ($i as $v) {
-               $dashboardItems .= $v;
-          }
-          $dashboardItems .= '';
-     }
-}
-
-# Dashboard elements
+     foreach ($i as $v) {
+          $dashboardItems .= $v;
+     }
+}
+$dashboardContents = '';
+foreach ($__dashboard_contents as $i)
+{
+     foreach ($i as $v) {
+          $dashboardContents .= $v;
+     }
+}
+
+# Dashboard elements: icons then boxes (items then contents)
 echo '<div id="dashboard-main">';
 
@@ -391 +391 @@
 }
 
-foreach ($__dashboard_contents as $i)
-{
-     if ($i->count() > 0)
-     {
-          $dashboardContents .= '';
-          foreach ($i as $v) {
-               $dashboardContents .= $v;
-          }
-          $dashboardContents .= '';
-     }
-}
-
 if ($dashboardContents != '' || $dashboardItems != '') {
      echo
      '<div id="dashboard-boxes">'.
-     '<div class="db-items">'.$dashboardItems.$dashboardContents.'</div>'.
+     '<div class="db-items">'.$dashboardItems.'</div>'.
+     '<div class="db-contents">'.$dashboardContents.'</div>'.
      '</div>';
 }