From 7db1758e93775c3f59c4a874da36225585dcbab5 Mon Sep 17 00:00:00 2001
From: Chad Kieffer <chad@2tbsp.com>
Date: Fri, 2 Jan 2009 22:06:12 +0000
Subject: More admin menu cleanup to reduce it's height. Removed redundant
 admin theme images, these are included in the default theme. Added a favicon.

---
 themes/admin_default/css/screen.css           |  16 ++++++++++++----
 themes/admin_default/images/arrows-ffffff.png | Bin 244 -> 0 bytes
 themes/admin_default/images/ico-draggable.png | Bin 227 -> 0 bytes
 themes/admin_default/images/ico-error.png     | Bin 701 -> 0 bytes
 themes/admin_default/images/ico-info.png      | Bin 778 -> 0 bytes
 themes/admin_default/images/ico-success.png   | Bin 537 -> 0 bytes
 themes/admin_default/images/ico-warning.png   | Bin 666 -> 0 bytes
 themes/admin_default/images/logo-sm.png       | Bin 0 -> 5715 bytes
 themes/admin_default/images/logo.png          | Bin 10222 -> 0 bytes
 themes/admin_default/images/photostream.png   | Bin 100391 -> 0 bytes
 themes/admin_default/images/shadow.png        | Bin 1698 -> 0 bytes
 themes/admin_default/views/admin.html.php     |   9 +++++----
 themes/default/images/favicon.ico             | Bin 0 -> 1150 bytes
 themes/default/views/page.html.php            |   1 +
 14 files changed, 18 insertions(+), 8 deletions(-)
 delete mode 100644 themes/admin_default/images/arrows-ffffff.png
 delete mode 100644 themes/admin_default/images/ico-draggable.png
 delete mode 100755 themes/admin_default/images/ico-error.png
 delete mode 100755 themes/admin_default/images/ico-info.png
 delete mode 100755 themes/admin_default/images/ico-success.png
 delete mode 100755 themes/admin_default/images/ico-warning.png
 create mode 100644 themes/admin_default/images/logo-sm.png
 delete mode 100644 themes/admin_default/images/logo.png
 delete mode 100644 themes/admin_default/images/photostream.png
 delete mode 100644 themes/admin_default/images/shadow.png
 create mode 100644 themes/default/images/favicon.ico

diff --git a/themes/admin_default/css/screen.css b/themes/admin_default/css/screen.css
index 4ff093eb..a4f6bb00 100644
--- a/themes/admin_default/css/screen.css
+++ b/themes/admin_default/css/screen.css
@@ -30,8 +30,9 @@
  **********************************************************************/
 
 #gHeader {
+	background-color: #e8e8e8;
 	border-bottom: 1px solid #ccc;
-	min-width: 1000px;
+	min-width: 1024px;
 	padding: 0 20px;
 }
 
@@ -46,20 +47,27 @@
 
 #gHeader #gLogo {
   float: left;
-  margin: 11px 10px 0 0;
+  margin: 0 10px 0 0;
 }
 
 #gHeader #gSiteAdminMenu {
-  clear: none;
   float: left;
   font-size: 1.2em;
-  margin-top: 12px;
 }
 
 #gHeader #gSiteAdminMenu ul {
   margin-bottom: 0;
 }
 
+#gHeader #gLoginMenu {
+	float: right;
+  margin: 1em 0 0 1em;	
+}
+
+#gHeader #gLoginMenu li {
+  margin: 0 0 0 1em;
+}
+
 #gContent .gBlock h2 {
   cursor: move;
   margin: -.8em -.3em 0 -.3em;
diff --git a/themes/admin_default/images/arrows-ffffff.png b/themes/admin_default/images/arrows-ffffff.png
deleted file mode 100644
index 995df520..00000000
Binary files a/themes/admin_default/images/arrows-ffffff.png and /dev/null differ
diff --git a/themes/admin_default/images/ico-draggable.png b/themes/admin_default/images/ico-draggable.png
deleted file mode 100644
index 2fb361f2..00000000
Binary files a/themes/admin_default/images/ico-draggable.png and /dev/null differ
diff --git a/themes/admin_default/images/ico-error.png b/themes/admin_default/images/ico-error.png
deleted file mode 100755
index c37bd062..00000000
Binary files a/themes/admin_default/images/ico-error.png and /dev/null differ
diff --git a/themes/admin_default/images/ico-info.png b/themes/admin_default/images/ico-info.png
deleted file mode 100755
index 12cd1aef..00000000
Binary files a/themes/admin_default/images/ico-info.png and /dev/null differ
diff --git a/themes/admin_default/images/ico-success.png b/themes/admin_default/images/ico-success.png
deleted file mode 100755
index a9925a06..00000000
Binary files a/themes/admin_default/images/ico-success.png and /dev/null differ
diff --git a/themes/admin_default/images/ico-warning.png b/themes/admin_default/images/ico-warning.png
deleted file mode 100755
index 628cf2da..00000000
Binary files a/themes/admin_default/images/ico-warning.png and /dev/null differ
diff --git a/themes/admin_default/images/logo-sm.png b/themes/admin_default/images/logo-sm.png
new file mode 100644
index 00000000..86465856
Binary files /dev/null and b/themes/admin_default/images/logo-sm.png differ
diff --git a/themes/admin_default/images/logo.png b/themes/admin_default/images/logo.png
deleted file mode 100644
index 7d7b9b9b..00000000
Binary files a/themes/admin_default/images/logo.png and /dev/null differ
diff --git a/themes/admin_default/images/photostream.png b/themes/admin_default/images/photostream.png
deleted file mode 100644
index 602017c3..00000000
Binary files a/themes/admin_default/images/photostream.png and /dev/null differ
diff --git a/themes/admin_default/images/shadow.png b/themes/admin_default/images/shadow.png
deleted file mode 100644
index c04d21b7..00000000
Binary files a/themes/admin_default/images/shadow.png and /dev/null differ
diff --git a/themes/admin_default/views/admin.html.php b/themes/admin_default/views/admin.html.php
index cbee078f..f05f24eb 100644
--- a/themes/admin_default/views/admin.html.php
+++ b/themes/admin_default/views/admin.html.php
@@ -5,6 +5,7 @@
   <head>
     <meta http-equiv="content-type" content="text/html; charset=UTF-8" />
     <title>G3: Admin Dashboard</title>
+    <link rel="shortcut icon" href="<?= url::file("themes/default/images/favicon.ico") ?>" type="image/x-icon" />
     <link rel="stylesheet" href="<?= url::file("lib/yui/reset-fonts-grids.css") ?>"
         type="text/css" media="screen,projection">
     <link rel="stylesheet" href="<?= url::file("themes/default/css/screen.css") ?>"
@@ -29,14 +30,14 @@
         <div id="gHeader">
           <?= $theme->site_status() ?>
           <?= $theme->admin_header_top() ?>
+          <a href="http://gallery.menalto.com/"><img src="<?= $theme->url("images/logo-sm.png") ?>" id="gLogo" alt="<?= _("Gallery 3: Your Photos on Your Web Site") ?>" /></a>
+          <div id="gSiteAdminMenu">
+            <?= $theme->admin_menu() ?>
+          </div>
           <ul id="gLoginMenu">
             <li><?= html::anchor("albums/1", "Browse the Gallery") ?></li>
             <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">
-            <?= $theme->admin_menu() ?>
-          </div>
           <?= $theme->admin_header_bottom() ?>
         </div>
       </div>
diff --git a/themes/default/images/favicon.ico b/themes/default/images/favicon.ico
new file mode 100644
index 00000000..66531d8e
Binary files /dev/null and b/themes/default/images/favicon.ico differ
diff --git a/themes/default/views/page.html.php b/themes/default/views/page.html.php
index ed938486..ff508093 100644
--- a/themes/default/views/page.html.php
+++ b/themes/default/views/page.html.php
@@ -11,6 +11,7 @@
       <?= _("Browse Photos") ?> :: <?= $item->title ?>
       <? endif ?>
     </title>
+    <link rel="shortcut icon" href="<?= $theme->url("images/favicon.ico") ?>" type="image/x-icon" />
     <link rel="stylesheet" type="text/css" href="<?= url::file("lib/yui/reset-fonts-grids.css") ?>"
           media="screen,print,projection" />
     <link rel="stylesheet" type="text/css" href="<?= $theme->url("css/superfish.css") ?>"
-- 
cgit v1.2.3