Make the admin theme header fully visible at 1024px wide. Revert to larger Gallery logo.

3 files changed, 22 insertions, 12 deletions

diff --git a/themes/admin_default/css/screen.css b/themes/admin_default/css/screen.css
index fcdd3ee1..a4783f6c 100644
--- a/themes/admin_default/css/screen.css
+++ b/themes/admin_default/css/screen.css
@@ -22,10 +22,14 @@
  *  Page layout containers
  **********************************************************************/
 
+#gView {
+}
+
 #gHeader {
 	background-color: #e8e8e8;
 	border-bottom: 1px solid #ccc;
-	min-width: 1024px;
+	margin-top: 0;
+  min-width: 944px;
 	padding: 0 20px;
 }
 
@@ -40,7 +44,17 @@
 
 #gHeader #gLogo {
   float: left;
-  margin: 0 10px 0 0;
+  margin: -22px 10px 0 0;
+}
+
+#gHeader #gLoginMenu {
+  float: none;
+  margin: 0;
+  padding: 5px 0 10px 0;
+}
+
+#gHeader #gLoginMenu {
+  text-align: right;
 }
 
 #gHeader #gSiteAdminMenu {
@@ -52,10 +66,6 @@
   margin-bottom: 0;
 }
 
-#gHeader #gLoginMenu {
-  margin-right: 0;
-}
-
 #gContent .gBlock h2 {
   background-color: #e8e8e8;
   margin: -.8em -.3em 0 -.3em;
diff --git a/themes/admin_default/images/logo-sm.png b/themes/admin_default/images/logo-sm.png
deleted file mode 100644
index 86465856..00000000
--- a/themes/admin_default/images/logo-sm.png
+++ /dev/null
diff --git a/themes/admin_default/views/admin.html.php b/themes/admin_default/views/admin.html.php
index 9e9973f9..7cffb945 100644
--- a/themes/admin_default/views/admin.html.php
+++ b/themes/admin_default/views/admin.html.php
@@ -17,8 +17,8 @@
     <link rel="stylesheet" href="<?= $theme->url("css/screen.css") ?>"
         type="text/css" media="screen,projection">
     <!-- This is temporary, to support tabview -->
-    <link rel="stylesheet" href="http://ui.jquery.com/latest/themes/flora/flora.all.css" type="text/css" media="screen" title="Flora (Default)">
-        
+    <link rel="stylesheet" href="http://ui.jquery.com/latest/themes/flora/flora.all.css"
+        type="text/css" media="screen" title="Flora (Default)">
     <script src="<?= url::file("lib/jquery.js") ?>" type="text/javascript"></script>
     <script src="<?= url::file("lib/jquery.form.js") ?>" type="text/javascript"></script>
     <script src="<?= url::file("lib/jquery-ui.js") ?>" type="text/javascript"></script>
@@ -35,14 +35,14 @@
       <div id="hd">
         <div id="gHeader">
           <?= $theme->admin_header_top() ?>
-          <a href="http://gallery.menalto.com/"><img src="<?= $theme->url("images/logo-sm.png") ?>" id="gLogo" alt="<?= t("Gallery 3: Your Photos on Your Web Site") ?>" /></a>
-          <div id="gSiteAdminMenu">
-            <?= $theme->admin_menu() ?>
-          </div>
           <ul id="gLoginMenu">
             <li class="first"><?= html::anchor("albums/1", "Browse the Gallery") ?></li>
             <li id="gLogoutLink"><a href="<?= url::site("logout?continue=albums/1") ?>">Logout</a></li>
           </ul>
+          <a href="http://gallery.menalto.com/"><img src="<?= url::file("themes/default/images/logo.png") ?>" id="gLogo" alt="<?= t("Gallery 3: Your Photos on Your Web Site") ?>" /></a>
+          <div id="gSiteAdminMenu">
+            <?= $theme->admin_menu() ?>
+          </div>
           <?= $theme->admin_header_bottom() ?>
         </div>
       </div>