Changeset 2085:c9f71758ed62 for admin

Timestamp:

09/25/13 08:14:11 (12 years ago)

Author:

Anne Kozlika <kozlika@…>

Branch:

default

Message:

En attendant la réorga du dashboard, organisation des boîtes.

Location:

admin

Files:

• index.php (modified) (6 diffs)
• style/default.css (modified) (3 diffs)

admin/index.php

@@ -144 +144 @@
           if ($feed)
           {
-               $latest_news = '<h3>'.__('Dotclear news').'</h3><dl id="news">';
+               $latest_news = '<div class="box medium dc-box"><h3>'.__('Dotclear news').'</h3><dl id="news">';
                $i = 1;
                foreach ($feed->items as $item)
@@ -164 +164 @@
                     if ($i > 2) { break; }
                }
-               $latest_news .= '</dl>';
+               $latest_news .= '</dl></div>';
                $__dashboard_items[$dashboardItem][] = $latest_news;
                $dashboardItem++;
@@ -176 +176 @@
      if (!empty($__resources['doc']))
      {
-          $doc_links = '<h3>'.__('Documentation and support').'</h3><ul>';
+          $doc_links = '<div class="box small dc-box"><h3>'.__('Documentation and support').'</h3><ul>';
      
           foreach ($__resources['doc'] as $k => $v) {
@@ -183 +183 @@
           }
      
-          $doc_links .= '</ul>';
+          $doc_links .= '</ul></div>';
           $__dashboard_items[$dashboardItem][] = $doc_links;
           $dashboardItem++;
@@ -324 +324 @@
      if ($i->count() > 0)
      {
-          $dashboardItems .= '<div class="box dc-box">';
+          $dashboardItems .= '';
           foreach ($i as $v) {
                $dashboardItems .= $v;
           }
-          $dashboardItems .= '</div>';
+          $dashboardItems .= '';
      }
 }
@@ -395 +395 @@
      if ($i->count() > 0)
      {
-          $dashboardContents .= '<div class="box">';
+          $dashboardContents .= '';
           foreach ($i as $v) {
                $dashboardContents .= $v;
           }
-          $dashboardContents .= '</div>';
+          $dashboardContents .= '';
      }
 }

admin/style/default.css

@@ -1460 +1460 @@
           }
      #dashboard-boxes .box {
-          min-width: 300px;
-          max-width: 580px;
           padding: 10px;
           border:   1px solid #ccc;
@@ -1470 +1468 @@
           }
           .box.small {
-               width: 280px;
+               width: 300px;
+               }
+          .box.medium {
+               width: 640px;
                }
           .box.large {
-               width: 580px;
+               width: 100%;
                }
           .dc-box {
@@ -2495 +2496 @@
           width: 150px;
           }
-     #dashboard-boxes .box { /* a revoir quand le dashboard sera fini */
+     #dashboard-boxes .box.small
+     #dashboard-boxes .box.medium {
           margin: 10px 0;
-          min-width: 280px;
           width: 280px;
           }