From 0b34ec4e8b1f97db0dc6807bdb3a5ece8e1b83e4 Mon Sep 17 00:00:00 2001
From: jhilden <jakobhilden@gmail.com>
Date: Tue, 30 Jun 2009 22:22:29 -0400
Subject: UI enhancement: made the 'back to the Gallery' links a little bit
 easier to discover

---
 themes/admin_default/css/screen.css       | 20 ++++++++++++++++++--
 themes/admin_default/views/admin.html.php |  4 ++--
 themes/default/css/fix-ie.css             |  2 +-
 themes/default/css/screen.css             |  4 ++--
 themes/default/views/header.html.php      |  4 ++--
 5 files changed, 25 insertions(+), 9 deletions(-)

(limited to 'themes')

diff --git a/themes/admin_default/css/screen.css b/themes/admin_default/css/screen.css
index f4173d4b..629d0451 100644
--- a/themes/admin_default/css/screen.css
+++ b/themes/admin_default/css/screen.css
@@ -98,12 +98,28 @@
  * 4) Content blocks in specific layout containers
  *********************************************************************/
 
-#gHeader #gLogo {
+#gHeader #gLogo img {
   float: left;
   margin: -22px 10px 0 0;
 }
 
-.rtl #gHeader #gLogo {
+#gHeader #gLogo {
+  position: relative;
+  display: block;
+  text-decoration: none;
+}
+#gHeader #gLogo span {
+  display: none;
+  position: absolute;
+  top: -20px;
+  left: 2px;
+  color: #FF6600;
+}
+#gHeader #gLogo:hover span {
+  display: inline;
+}
+
+.rtl #gHeader #gLogo img {
   float: left;
 }
 
diff --git a/themes/admin_default/views/admin.html.php b/themes/admin_default/views/admin.html.php
index 36deea9e..1be454c3 100644
--- a/themes/admin_default/views/admin.html.php
+++ b/themes/admin_default/views/admin.html.php
@@ -44,10 +44,10 @@
       <div id="gHeader">
         <?= $theme->admin_header_top() ?>
         <ul id="gLoginMenu">
-          <li class="first"><?= html::anchor("albums/1", t("Browse the Gallery")) ?></li>
+          <li class="first"><?= html::anchor("albums/1", "&larr; ".t("Back to the Gallery")) ?></li>
           <li id="gLogoutLink"><a href="<?= url::site("logout?continue=albums/1&csrf=$csrf") ?>"><?= t("Logout") ?></a></li>
         </ul>
-        <a href="<?= url::site("albums/1") ?>"><img src="<?= url::file("themes/default/images/logo.png") ?>" id="gLogo" alt="<?= t("Gallery 3: Your Photos on Your Web Site") ?>" /></a>
+        <a id="gLogo" href="<?= url::site("albums/1") ?>" title="<?= t("go back to the Gallery") ?>"><img src="<?= url::file("themes/default/images/logo.png") ?>" alt="<?= t("Gallery logo: Your Photos on Your Web Site") ?>" /><span>&larr; <?= t("back") ?></span></a>
         <div id="gSiteAdminMenu" style="display: none">
           <?= $theme->admin_menu() ?>
         </div>
diff --git a/themes/default/css/fix-ie.css b/themes/default/css/fix-ie.css
index 0b37acd2..3d9604e6 100644
--- a/themes/default/css/fix-ie.css
+++ b/themes/default/css/fix-ie.css
@@ -10,7 +10,7 @@
   zoom: 1;
 }
 
-#gHeader #gLogo {
+#gHeader #gLogo img {
   margin-top: 5px;
   margin-bottom: 0;
 }
diff --git a/themes/default/css/screen.css b/themes/default/css/screen.css
index e37de70e..48ded542 100644
--- a/themes/default/css/screen.css
+++ b/themes/default/css/screen.css
@@ -422,7 +422,7 @@ form .gError,
 
 /* Header  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
-#gHeader #gLogo {
+#gHeader #gLogo img {
   float: left;
   margin: -4px 10px 0 0;
 }
@@ -1046,7 +1046,7 @@ form .gError,
 .rtl input[type="submit"],
 .rtl input[type="reset"],
 .rtl .gShortForm li,
-.rtl #gHeader #gLogo,
+.rtl #gHeader #gLogo img,
 .rtl #gContent #gAlbumGrid .gItem,
 .rtl #gSiteMenu,
 .rtl .gBreadcrumbs li,
diff --git a/themes/default/views/header.html.php b/themes/default/views/header.html.php
index b38cffed..51f55b41 100644
--- a/themes/default/views/header.html.php
+++ b/themes/default/views/header.html.php
@@ -3,8 +3,8 @@
 <? if ($header_text = module::get_var("gallery", "header_text")): ?>
 <?= $header_text ?>
 <? else: ?>
-<a href="<?= url::site("albums/1") ?>">
-  <img width="107" height="48" id="gLogo" alt="<?= t("Gallery: Your photos on your web site") ?>" src="<?= $theme->theme_url("images/logo.png") ?>" />
+<a id="gLogo" href="<?= url::site("albums/1") ?>" title="<?= t("go back to the Gallery home") ?>">
+  <img width="107" height="48" alt="<?= t("Gallery logo: Your photos on your web site") ?>" src="<?= $theme->theme_url("images/logo.png") ?>" />
 </a>
 <? endif ?>
 
-- 
cgit v1.2.3


From 979d32759514cdff790b3fd4a5a59764edfb6b02 Mon Sep 17 00:00:00 2001
From: jhilden <jakobhilden@gmail.com>
Date: Wed, 1 Jul 2009 02:17:38 -0400
Subject: change to the 'back to the Gallery' link from the admin.

---
 themes/admin_default/css/screen.css       | 28 +++++++++-------------------
 themes/admin_default/views/admin.html.php |  4 ++--
 2 files changed, 11 insertions(+), 21 deletions(-)

(limited to 'themes')

diff --git a/themes/admin_default/css/screen.css b/themes/admin_default/css/screen.css
index 629d0451..98e0905e 100644
--- a/themes/admin_default/css/screen.css
+++ b/themes/admin_default/css/screen.css
@@ -98,30 +98,20 @@
  * 4) Content blocks in specific layout containers
  *********************************************************************/
 
-#gHeader #gLogo img {
+#gHeader #gLogo {
   float: left;
   margin: -22px 10px 0 0;
-}
-
-#gHeader #gLogo {
-  position: relative;
   display: block;
+  padding-left: 2px;
+  width: 105px; /* 107px - padding-left */
+  height: 48px;
+  background-image: url('../../default/images/logo.png');
+  color: gray ! important;
+}
+#gHeader #gLogo:hover {
+  color: #FF6600 ! important;
   text-decoration: none;
 }
-#gHeader #gLogo span {
-  display: none;
-  position: absolute;
-  top: -20px;
-  left: 2px;
-  color: #FF6600;
-}
-#gHeader #gLogo:hover span {
-  display: inline;
-}
-
-.rtl #gHeader #gLogo img {
-  float: left;
-}
 
 #gHeader #gLoginMenu {
   float: none;
diff --git a/themes/admin_default/views/admin.html.php b/themes/admin_default/views/admin.html.php
index 1be454c3..76f59d4a 100644
--- a/themes/admin_default/views/admin.html.php
+++ b/themes/admin_default/views/admin.html.php
@@ -47,8 +47,8 @@
           <li class="first"><?= html::anchor("albums/1", "&larr; ".t("Back to the Gallery")) ?></li>
           <li id="gLogoutLink"><a href="<?= url::site("logout?continue=albums/1&csrf=$csrf") ?>"><?= t("Logout") ?></a></li>
         </ul>
-        <a id="gLogo" href="<?= url::site("albums/1") ?>" title="<?= t("go back to the Gallery") ?>"><img src="<?= url::file("themes/default/images/logo.png") ?>" alt="<?= t("Gallery logo: Your Photos on Your Web Site") ?>" /><span>&larr; <?= t("back") ?></span></a>
-        <div id="gSiteAdminMenu" style="display: none">
+        <a id="gLogo" href="<?= url::site("albums/1") ?>" title="<?= t("go back to the Gallery") ?>"><!--<img src="<?= url::file("themes/default/images/logo.png") ?>" alt="<?= t("Gallery logo: Your Photos on Your Web Site") ?>" />-->&larr; <?= t("back to the ...") ?></a>
+        <div id="gSiteAdminMenu" style="display: none;">
           <?= $theme->admin_menu() ?>
         </div>
         <?= $theme->admin_header_bottom() ?>
-- 
cgit v1.2.3


From 0add4ced22662918b6e5c3f0d0447e6e8aad4962 Mon Sep 17 00:00:00 2001
From: Chad Kieffer <ckieffer@gmail.com>
Date: Wed, 1 Jul 2009 00:35:33 -0600
Subject: Add a bit more contrast to superfish sub-menus.

---
 themes/default/css/screen.css | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

(limited to 'themes')

diff --git a/themes/default/css/screen.css b/themes/default/css/screen.css
index 48ded542..7a41e970 100644
--- a/themes/default/css/screen.css
+++ b/themes/default/css/screen.css
@@ -13,7 +13,6 @@
  *  7)  Browser hacks
  *  8)  jQuery and jQuery UI
  *  9)  Right-to-left language styles
- * 10)  Digibug Print
  */
 
 /** *******************************************************************
@@ -755,6 +754,16 @@ form .gError,
  * 7) jQuery and jQuery UI
  *********************************************************************/
 
+/* Superfish menu overrides ~~~~~~~~~~~~~~ */
+
+.sf-menu li li, .sf-menu li li ul li {
+  background-color: #bdd2ff;
+}
+
+.sf-menu li:hover {
+  background-color: #dfe9ff;
+}
+
 /* Ajax loading indicator ~~~~~~~~~~~~~~~~ */
 
 .gLoadingLarge {
-- 
cgit v1.2.3


From b943b0f7c120774e5461e14185cac6982eacc590 Mon Sep 17 00:00:00 2001
From: jhilden <jakobhilden@gmail.com>
Date: Wed, 1 Jul 2009 02:39:00 -0400
Subject: made the 'back to gallery' link in the admin a lighter grey (and
 removed the commented out <img>)

---
 themes/admin_default/css/screen.css       | 5 +----
 themes/admin_default/views/admin.html.php | 4 +++-
 2 files changed, 4 insertions(+), 5 deletions(-)

(limited to 'themes')

diff --git a/themes/admin_default/css/screen.css b/themes/admin_default/css/screen.css
index 98e0905e..e68620a5 100644
--- a/themes/admin_default/css/screen.css
+++ b/themes/admin_default/css/screen.css
@@ -106,7 +106,7 @@
   width: 105px; /* 107px - padding-left */
   height: 48px;
   background-image: url('../../default/images/logo.png');
-  color: gray ! important;
+  color: #A5A5A5 ! important;
 }
 #gHeader #gLogo:hover {
   color: #FF6600 ! important;
@@ -117,9 +117,6 @@
   float: none;
   margin: 0;
   padding: 5px 0 10px 0;
-}
-
-#gHeader #gLoginMenu {
   text-align: right;
 }
 
diff --git a/themes/admin_default/views/admin.html.php b/themes/admin_default/views/admin.html.php
index 76f59d4a..56632684 100644
--- a/themes/admin_default/views/admin.html.php
+++ b/themes/admin_default/views/admin.html.php
@@ -47,7 +47,9 @@
           <li class="first"><?= html::anchor("albums/1", "&larr; ".t("Back to the Gallery")) ?></li>
           <li id="gLogoutLink"><a href="<?= url::site("logout?continue=albums/1&csrf=$csrf") ?>"><?= t("Logout") ?></a></li>
         </ul>
-        <a id="gLogo" href="<?= url::site("albums/1") ?>" title="<?= t("go back to the Gallery") ?>"><!--<img src="<?= url::file("themes/default/images/logo.png") ?>" alt="<?= t("Gallery logo: Your Photos on Your Web Site") ?>" />-->&larr; <?= t("back to the ...") ?></a>
+        <a id="gLogo" href="<?= url::site("albums/1") ?>" title="<?= t("go back to the Gallery") ?>">
+          &larr; <?= t("back to the ...") ?>
+        </a>
         <div id="gSiteAdminMenu" style="display: none;">
           <?= $theme->admin_menu() ?>
         </div>
-- 
cgit v1.2.3


From 9beac1132e7d6ffec2192d5a4e54e14985218d6e Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Wed, 1 Jul 2009 01:08:00 -0700
Subject: Fix a typo in the Doctype.  Fixes ticket #497.

---
 themes/admin_default/views/admin.html.php | 2 +-
 themes/default/views/page.html.php        | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'themes')

diff --git a/themes/admin_default/views/admin.html.php b/themes/admin_default/views/admin.html.php
index 76f59d4a..33e7f58f 100644
--- a/themes/admin_default/views/admin.html.php
+++ b/themes/admin_default/views/admin.html.php
@@ -1,5 +1,5 @@
 <?php defined("SYSPATH") or die("No direct script access.") ?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Tranisitional//EN"
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
   "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
   <head>
diff --git a/themes/default/views/page.html.php b/themes/default/views/page.html.php
index a21e9eff..181a2c46 100644
--- a/themes/default/views/page.html.php
+++ b/themes/default/views/page.html.php
@@ -1,5 +1,5 @@
 <?php defined("SYSPATH") or die("No direct script access.") ?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Tranisitional//EN"
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
           "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
   <head>
-- 
cgit v1.2.3