Changeset 489:2e9dba880461

Timestamp:

07/02/11 16:07:33 (14 years ago)

Author:

kozlika

Branch:

default

Message:

Ergo : déplacement du lien dashboard dans le header, stylage de l'item actif dans le header…

… et une petite fantaisie pour le titre de boîte des favoris (après tout le nom de code est bien All You Need Is Love, non ?). J'attends les tomates pourries de pied ferme.

Files:

• admin/style/default.css (modified) (5 diffs)
• inc/admin/lib.dc.page.php (modified) (1 diff)
• inc/admin/prepend.php (modified) (1 diff)

admin/style/default.css

@@ -96 +96 @@
      }
 
+#header {
+     background: #575859;
+     height: 3em;
+     position: relative;
+}
 #top {
      margin: 0;
      padding: 0;
-     background: #575859 url(dc_bg.png) repeat-x 0 3em;
+     width: 13em;
+     float: left;
 }
 #top h1 {
@@ -118 +124 @@
      color: #fff;
 }
-
-#info-box {
+#info-boxes {
      background: #575859;
-     position: absolute;
-     left: 13em;
-     top: 3px;
-     margin: 0;
-     padding: 3px 3px 4px 0;
+}
+#info-box1 {
+     margin: 0;
+     padding: .5em 3px 4px 0;
      color: #fff;
+     float: left;
+     background: #575859;
 }
 #info-box2 {
+     margin: 0;
+     padding: .5em 1em 4px 0;
+     color: #fff;
+     float: right;
+     text-align: right;
      background: #575859;
-     position: absolute;
-     right: 0.5em;
-     top: 3px;
-     margin: 0;
-     padding: 3px 3px 4px 0;
-     color: #fff;
-}
-#info-box div, #info-box2 div {
-     margin: 0; padding: 0;
-}
-#info-box div div, #info-box2 div div {
-     display: inline;
-}
-#info-box>form>div, #info-box2>form>div {
-     line-height: 1.5;
-}
-#info-box select {
+     height: 2em;
+}
+#info-box1 select {
      width: 20em;
 }
-#info-box a img, #info-box2 a img {
+#info-box1 a img, #info-box2 a img {
      vertical-align: middle;
      padding-left: .3em;
      }
-#info-box a, #info-box2 a {
+#info-box1 a, #info-box2 a {
      background: #575859;
      font-weight: bold;
@@ -160 +157 @@
      margin-left: 0.5em;
      margin-right: 0.5em;
-}
-#info-box a {
-     margin-left: 2em;
+     white-space: nowrap;
+}
+#info-box1 a {
+     margin-left: 1.5em;
 }
 #info-box2 a.active {
      border-bottom-color: #f5f5f5;
+     margin: 0;
      padding: 1.2em .5em;
      background-color: #f5f5f5;
      color: #333;
+}
+#info-box2 span {
+     color: #575859;
 }
 #wrapper {
@@ -195 +197 @@
      width: 13em;
      float: left;
-     margin-top: 1em;
+     margin-top: 2em;
      margin-bottom: 1em;
 }
@@ -237 +239 @@
      margin-left: 0;
 }
+#favorites-menu h3 {
+     margin-right: .5em;
+     background: transparent url(../images/menu/favorite.png) no-repeat right;
+}
 #favorites-menu {
      background: #D9E1D9;
+     padding: .2em 0 .1em 0;
+     margin: 0 .5em 0 0;
 }
 #favorites-menu ul {
-     padding: .2em 0 .66em 0;
 }
 #favorites-menu a {

inc/admin/lib.dc.page.php

@@ -123 +123 @@
           '">'."\n".
           
+          '<div id=header>'.
           '<ul id="prelude"><li><a href="#content">Aller au contenu</a></li><li><a href="#main-menu">Aller au menu</a></li></ul>'."\n".
-          '<div id="top"><h1><a href="index.php">'.DC_VENDOR_NAME.'</a></h1></div>'."\n";
-          
-          
-          echo
-          '<div id="info-box">'.
-          '<form action="index.php" method="post"><div>'.
+          '<div id="top"><h1><a href="index.php">'.DC_VENDOR_NAME.'</a></h1></div>'."\n"; 
+          
+          echo
+          '<div id="info-boxes">'.
+          '<div id="info-box1">'.
+          '<form action="index.php" method="post">'.
           $blog_box.
           '<a href="'.$core->blog->url.'" onclick="window.open(this.href);return false;" title="'.__('Go to site').' ('.__('new window').')'.'">'.__('Go to site').' <img src="images/outgoing.png" alt="" /></a>'.
-          '</div></form>'.
+          '</form>'.
           '</div>'.
-          '<div id="info-box2"><div>'.
-          ' <a'.(preg_match('/preferences.php(\?.*)?$/',$_SERVER['REQUEST_URI']) ? ' class="active"' : '').' href="preferences.php">'.__('My preferences').'</a>'.
-          ' | <a href="index.php?logout=1" class="logout">'.sprintf(__('Logout %s'),$core->auth->userID()).' <img src="images/logout.png" alt="" /></a>'.
+          '<div id="info-box2">'.
+          '<a'.(preg_match('/index.php$/',$_SERVER['REQUEST_URI']) ? ' class="active"' : '').' href="index.php">'.__('My dashboard').'</a>'.
+          '<span> | </span><a'.(preg_match('/preferences.php(\?.*)?$/',$_SERVER['REQUEST_URI']) ? ' class="active"' : '').' href="preferences.php">'.__('My preferences').'</a>'.
+          '<span> | </span><a href="index.php?logout=1" class="logout">'.sprintf(__('Logout %s'),$core->auth->userID()).' <img src="images/logout.png" alt="" /></a>'.
+          '</div>'.
           '</div>'.
           '</div>';

inc/admin/prepend.php

@@ -267 +267 @@
      }
 */
-     $_menu['Dashboard']->prependItem(__('Dashboard'),'index.php','images/menu/dashboard.png',
-          preg_match('/index.php$/',$_SERVER['REQUEST_URI']),
-          $core->auth->check('usage,contentadmin',$core->blog->id));
-     
      $_menu['Blog']->prependItem(__('Blog appearance'),'blog_theme.php','images/menu/themes.png',
           preg_match('/blog_theme.php(\?.*)?$/',$_SERVER['REQUEST_URI']),