Switched admin menu from navbar back to plain menu, plain dropdowns are more usable. Minor text formatting updates.

4 files changed, 47 insertions, 14 deletions

diff --git a/themes/admin_default/css/screen.css b/themes/admin_default/css/screen.css
index d95610c5..bd7cd93e 100644
--- a/themes/admin_default/css/screen.css
+++ b/themes/admin_default/css/screen.css
@@ -1,17 +1,27 @@
 #gContent {
   font-size: 1.1em;
 }
+
 .gBlock {
   border: 1px solid #e7e7e7;
   margin-bottom: 1em;
-  padding: .4em;
+  padding: 1em .4em;
 }
-.gBlock h2 {
-  background-color: #e7e7e7;
-  margin: -.4em;
-  padding: .2em .6em;
+
+#gContent .gBlock h2 {
+  margin: -.8em -.3em 0 -.3em;
   cursor: move;
 }
+
+#gSidebar .gBlock h2 {
+  margin: -.9em -.4em 0 -.3em;
+  cursor: move;
+}
+
+.gBlockContent {
+  padding-top: 1em;
+}
+
 #gPhotoStream .gBlockContent {
   overflow: scroll;
 }
@@ -19,9 +29,29 @@
 #gSiteAdminMenu {
   border-bottom: 1px solid #ccc;
   font-size: 1.2em;
-  padding: 0 20px 0;
+  padding: 0 20px;
 }
 
 #gSiteAdminMenu ul {
   margin-bottom: 0;
 }
+
+.gBlockContent .gError,
+.gBlockContent .gInfo,
+.gBlockContent .gSuccess,
+.gBlockContent .gWarning {
+  background-color: transparent;
+}
+
+/** *******************************************************************
+ * N) Browser hacks
+ *********************************************************************/
+
+#gSiteAdminMenu:after {
+  clear: both;
+  content: ".";
+  display: block;
+  height: 0;
+  visibility: hidden;
+}
+
diff --git a/themes/admin_default/js/ui.init.js b/themes/admin_default/js/ui.init.js
index 49a18669..f7f3c1d7 100644
--- a/themes/admin_default/js/ui.init.js
+++ b/themes/admin_default/js/ui.init.js
@@ -1,7 +1,7 @@
 $(document).ready(function(){
 
   // Add Superfish menu class
-  $("#gSiteAdminMenu ul.gMenu").addClass("sf-menu sf-navbar");
+  $("#gSiteAdminMenu ul.gMenu").addClass("sf-menu");
 
   // Superfish menu options
   $('ul.sf-menu').superfish({
diff --git a/themes/admin_default/views/admin.html.php b/themes/admin_default/views/admin.html.php
index 1fa70d5b..a08b2aaa 100644
--- a/themes/admin_default/views/admin.html.php
+++ b/themes/admin_default/views/admin.html.php
@@ -36,19 +36,17 @@
             <li id="gLogoutLink"><a href="<?= url::site("logout?continue=albums/1") ?>">Logout</a></li>
           </ul>
           <img src="<?= $theme->url("images/logo.png") ?>" id="gLogo" alt="<?= _("Gallery 3: Your Photos on Your Web Site") ?>" />
-          <div id="gSiteAdminMenu" class="gClearFix">
+          <div id="gSiteAdminMenu">
             <?= $theme->admin_menu() ?>
           </div>
           <?= $theme->admin_header_bottom() ?>
         </div>
       </div>
-
-      <?= $theme->messages() ?>
-
       <div id="bd">
         <div id="yui-main">
           <div class="yui-b">
             <div id="gContent" class="yui-g">
+              <?= $theme->messages() ?>
               <?= $content ?>
             </div>
           </div>
diff --git a/themes/default/css/screen.css b/themes/default/css/screen.css
index dbe1c014..d7867df3 100644
--- a/themes/default/css/screen.css
+++ b/themes/default/css/screen.css
@@ -47,15 +47,19 @@ h1, h2, h3, h4, h5 {
 }
 
 h1 {
-  font-size: 1.7em
+  font-size: 1.7em;
 }
 
 h2 {
-  font-size: 1.4em
+  font-size: 1.4em;
+}
+
+#gSidebar .gBlock h2 {
+  font-size: 1.2em;
 }
 
 h3 {
-  font-size: 1.2em
+  font-size: 1.2em;
 }
 
 /* Links ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
@@ -173,6 +177,7 @@ form ul ul li {
 }
 
 input,
+select,
 textarea {
   display: block;
   clear: both;