Set the admin layout to 100% of the window. Add IE fix stylesheet for admin theme, reduce height of admin header.

5 files changed, 72 insertions, 283 deletions

diff --git a/themes/admin_default/css/fix-ie.css b/themes/admin_default/css/fix-ie.css
new file mode 100644
index 00000000..71b399a3
--- /dev/null
+++ b/themes/admin_default/css/fix-ie.css
@@ -0,0 +1,6 @@
+/**
+ * Fix display in IE 7 and earlier
+ */
+#gHeader {
+  zoom: 1;
+}
diff --git a/themes/admin_default/css/screen.css b/themes/admin_default/css/screen.css
index bd7cd93e..0ceef1dd 100644
--- a/themes/admin_default/css/screen.css
+++ b/themes/admin_default/css/screen.css
@@ -1,41 +1,82 @@
-#gContent {
-  font-size: 1.1em;
-}
+/**
+ * Gallery 3 Default Admin Theme Screen Styles
+ *
+ * Extends themes/default/css/screen.css
+ *
+ *
+ * @todo Default user icon (user w/ camera) 
+ * @todo Group Credits and gLoginMenu seperator styles
+ * @todo Apply :hover bg image to #gViewMenu (will clear fix correct this?)
+ * @todo Refactor form layout styles to reserve room for validation messages in default state. This
+ *       will eliminate layout shifts when validation messages are displayed.
+ */
 
+/** *******************************************************************
+ *  Reusable content blocks
+ **********************************************************************/
+ 
 .gBlock {
   border: 1px solid #e7e7e7;
   margin-bottom: 1em;
   padding: 1em .4em;
 }
 
-#gContent .gBlock h2 {
-  margin: -.8em -.3em 0 -.3em;
-  cursor: move;
+.gBlockContent {
+  padding-top: 1em;
 }
 
-#gSidebar .gBlock h2 {
-  margin: -.9em -.4em 0 -.3em;
-  cursor: move;
+/** *******************************************************************
+ *  Page layout containers
+ **********************************************************************/
+
+#gHeader {
+	border-bottom: 1px solid #ccc;
+	min-width: 1000px;
+	padding: 0 20px;
 }
 
-.gBlockContent {
-  padding-top: 1em;
+#gContent {
+  font-size: 1.1em;
 }
 
-#gPhotoStream .gBlockContent {
-  overflow: scroll;
+/** *******************************************************************
+ *  Content blocks in specific layout containers
+ *********************************************************************/
+
+#gHeader #gLogo {
+  float: left;
+  margin: 11px 10px 0 0;
 }
 
-#gSiteAdminMenu {
-  border-bottom: 1px solid #ccc;
+#gHeader #gSiteAdminMenu {
+  clear: none;
+  float: left;
   font-size: 1.2em;
-  padding: 0 20px;
+  margin-top: 12px;
 }
 
-#gSiteAdminMenu ul {
+#gHeader #gSiteAdminMenu ul {
   margin-bottom: 0;
 }
 
+#gContent .gBlock {
+  margin-right: 1em;
+}
+
+#gContent .gBlock h2 {
+  cursor: move;
+  margin: -.8em -.3em 0 -.3em;
+}
+
+#gSidebar .gBlock h2 {
+  margin: -.9em -.4em 0 -.3em;
+  cursor: move;
+}
+
+#gPhotoStream .gBlockContent {
+  overflow: scroll;
+}
+
 .gBlockContent .gError,
 .gBlockContent .gInfo,
 .gBlockContent .gSuccess,
@@ -44,14 +85,13 @@
 }
 
 /** *******************************************************************
- * N) Browser hacks
+ *  Browser hacks
  *********************************************************************/
 
-#gSiteAdminMenu:after {
+#gHeader:after {
   clear: both;
   content: ".";
   display: block;
   height: 0;
   visibility: hidden;
 }
-
diff --git a/themes/admin_default/css/superfish.css b/themes/admin_default/css/superfish.css
deleted file mode 100644
index e87756b2..00000000
--- a/themes/admin_default/css/superfish.css
+++ /dev/null
@@ -1,136 +0,0 @@
-
-/*** ESSENTIAL STYLES ***/
-.sf-menu, .sf-menu * {
-  margin: 0;
-  padding: 0;
-  list-style: none;
-}
-.sf-menu {
-  line-height: 1.0;
-}
-.sf-menu ul {
-  position: absolute;
-  top: -999em;
-  width: 10em; /* left offset of submenus need to match (see below) */
-}
-.sf-menu ul li {
-  width: 100%;
-}
-.sf-menu li:hover {
-  visibility: inherit; /* fixes IE7 'sticky bug' */
-}
-.sf-menu li {
-  float: left;
-  position: relative;
-}
-.sf-menu a {
-  display: block;
-  position: relative;
-}
-.sf-menu li:hover ul,
-.sf-menu li.sfHover ul {
-  left: 0;
-  top: 2.5em; /* match top ul list item height */
-  z-index: 99;
-}
-ul.sf-menu li:hover li ul,
-ul.sf-menu li.sfHover li ul {
-  top: -999em;
-}
-ul.sf-menu li li:hover ul,
-ul.sf-menu li li.sfHover ul {
-  left: 10em; /* match ul width */
-  top: 0;
-}
-ul.sf-menu li li:hover li ul,
-ul.sf-menu li li.sfHover li ul {
-  top: -999em;
-}
-ul.sf-menu li li li:hover ul,
-ul.sf-menu li li li.sfHover ul {
-  left: 10em; /* match ul width */
-  top: 0;
-}
-
-/*** DEMO SKIN ***/
-.sf-menu {
-  float: left;
-  margin-bottom: 1em;
-}
-.sf-menu a {
-  border-left: 1px solid #fff;
-  border-top: 1px solid #CFDEFF;
-  padding: .75em 1em;
-  text-decoration: none;
-}
-.sf-menu a, .sf-menu a:visited  { /* visited pseudo selector so IE6 applies text colour*/
-  color: #13a;
-}
-.sf-menu li {
-  background: #BDD2FF;
-}
-.sf-menu li li {
-  background: #AABDE6;
-}
-.sf-menu li li li {
-  background: #9AAEDB;
-}
-.sf-menu li:hover, .sf-menu li.sfHover,
-.sf-menu a:focus, .sf-menu a:hover, .sf-menu a:active {
-  background: #CFDEFF;
-  outline: 0;
-}
-
-/*** arrows **/
-.sf-menu a.sf-with-ul {
-  padding-right: 2.25em;
-  min-width: 1px; /* trigger IE7 hasLayout so spans position accurately */
-}
-.sf-sub-indicator {
-  position: absolute;
-  display: block;
-  right: .75em;
-  top: 1.05em; /* IE6 only */
-  width: 10px;
-  height: 10px;
-  text-indent: -999em;
-  overflow: hidden;
-  background: url('../images/arrows-ffffff.png') no-repeat -10px -100px; /* 8-bit indexed alpha png. IE6 gets solid image only */
-}
-a > .sf-sub-indicator {  /* give all except IE6 the correct values */
-  top: .8em;
-  background-position: 0 -100px; /* use translucent arrow for modern browsers*/
-}
-/* apply hovers to modern browsers */
-a:focus > .sf-sub-indicator,
-a:hover > .sf-sub-indicator,
-a:active > .sf-sub-indicator,
-li:hover > a > .sf-sub-indicator,
-li.sfHover > a > .sf-sub-indicator {
-  background-position: -10px -100px; /* arrow hovers for modern browsers*/
-}
-
-/* point right for anchors in subs */
-.sf-menu ul .sf-sub-indicator { background-position: -10px 0; }
-.sf-menu ul a > .sf-sub-indicator { background-position: 0 0; }
-/* apply hovers to modern browsers */
-.sf-menu ul a:focus > .sf-sub-indicator,
-.sf-menu ul a:hover > .sf-sub-indicator,
-.sf-menu ul a:active > .sf-sub-indicator,
-.sf-menu ul li:hover > a > .sf-sub-indicator,
-.sf-menu ul li.sfHover > a > .sf-sub-indicator {
-  background-position: -10px 0; /* arrow hovers for modern browsers*/
-}
-
-/*** shadows for all but IE6 ***/
-.sf-shadow ul {
-  background: url('../images/shadow.png') no-repeat bottom right;
-  padding: 0 8px 9px 0;
-  -moz-border-radius-bottomleft: 17px;
-  -moz-border-radius-topright: 17px;
-  -webkit-border-top-right-radius: 17px;
-  -webkit-border-bottom-left-radius: 17px;
-}
-.sf-shadow ul.sf-shadow-off {
-  background: transparent;
-}
diff --git a/themes/admin_default/js/superfish.js b/themes/admin_default/js/superfish.js
deleted file mode 100644
index c6a9c7de..00000000
--- a/themes/admin_default/js/superfish.js
+++ /dev/null
@@ -1,121 +0,0 @@
-
-/*
- * Superfish v1.4.8 - jQuery menu widget
- * Copyright (c) 2008 Joel Birch
- *
- * Dual licensed under the MIT and GPL licenses:
- * 	http://www.opensource.org/licenses/mit-license.php
- * 	http://www.gnu.org/licenses/gpl.html
- *
- * CHANGELOG: http://users.tpg.com.au/j_birch/plugins/superfish/changelog.txt
- */
-
-;(function($){
-	$.fn.superfish = function(op){
-
-		var sf = $.fn.superfish,
-			c = sf.c,
-			$arrow = $(['<span class="',c.arrowClass,'"> &#187;</span>'].join('')),
-			over = function(){
-				var $$ = $(this), menu = getMenu($$);
-				clearTimeout(menu.sfTimer);
-				$$.showSuperfishUl().siblings().hideSuperfishUl();
-			},
-			out = function(){
-				var $$ = $(this), menu = getMenu($$), o = sf.op;
-				clearTimeout(menu.sfTimer);
-				menu.sfTimer=setTimeout(function(){
-					o.retainPath=($.inArray($$[0],o.$path)>-1);
-					$$.hideSuperfishUl();
-					if (o.$path.length && $$.parents(['li.',o.hoverClass].join('')).length<1){over.call(o.$path);}
-				},o.delay);	
-			},
-			getMenu = function($menu){
-				var menu = $menu.parents(['ul.',c.menuClass,':first'].join(''))[0];
-				sf.op = sf.o[menu.serial];
-				return menu;
-			},
-			addArrow = function($a){ $a.addClass(c.anchorClass).append($arrow.clone()); };
-			
-		return this.each(function() {
-			var s = this.serial = sf.o.length;
-			var o = $.extend({},sf.defaults,op);
-			o.$path = $('li.'+o.pathClass,this).slice(0,o.pathLevels).each(function(){
-				$(this).addClass([o.hoverClass,c.bcClass].join(' '))
-					.filter('li:has(ul)').removeClass(o.pathClass);
-			});
-			sf.o[s] = sf.op = o;
-			
-			$('li:has(ul)',this)[($.fn.hoverIntent && !o.disableHI) ? 'hoverIntent' : 'hover'](over,out).each(function() {
-				if (o.autoArrows) addArrow( $('>a:first-child',this) );
-			})
-			.not('.'+c.bcClass)
-				.hideSuperfishUl();
-			
-			var $a = $('a',this);
-			$a.each(function(i){
-				var $li = $a.eq(i).parents('li');
-				$a.eq(i).focus(function(){over.call($li);}).blur(function(){out.call($li);});
-			});
-			o.onInit.call(this);
-			
-		}).each(function() {
-			var menuClasses = [c.menuClass];
-			if (sf.op.dropShadows  && !($.browser.msie && $.browser.version < 7)) menuClasses.push(c.shadowClass);
-			$(this).addClass(menuClasses.join(' '));
-		});
-	};
-
-	var sf = $.fn.superfish;
-	sf.o = [];
-	sf.op = {};
-	sf.IE7fix = function(){
-		var o = sf.op;
-		if ($.browser.msie && $.browser.version > 6 && o.dropShadows && o.animation.opacity!=undefined)
-			this.toggleClass(sf.c.shadowClass+'-off');
-		};
-	sf.c = {
-		bcClass     : 'sf-breadcrumb',
-		menuClass   : 'sf-js-enabled',
-		anchorClass : 'sf-with-ul',
-		arrowClass  : 'sf-sub-indicator',
-		shadowClass : 'sf-shadow'
-	};
-	sf.defaults = {
-		hoverClass	: 'sfHover',
-		pathClass	: 'overideThisToUse',
-		pathLevels	: 1,
-		delay		: 800,
-		animation	: {opacity:'show'},
-		speed		: 'normal',
-		autoArrows	: true,
-		dropShadows : true,
-		disableHI	: false,		// true disables hoverIntent detection
-		onInit		: function(){}, // callback functions
-		onBeforeShow: function(){},
-		onShow		: function(){},
-		onHide		: function(){}
-	};
-	$.fn.extend({
-		hideSuperfishUl : function(){
-			var o = sf.op,
-				not = (o.retainPath===true) ? o.$path : '';
-			o.retainPath = false;
-			var $ul = $(['li.',o.hoverClass].join(''),this).add(this).not(not).removeClass(o.hoverClass)
-					.find('>ul').hide().css('visibility','hidden');
-			o.onHide.call($ul);
-			return this;
-		},
-		showSuperfishUl : function(){
-			var o = sf.op,
-				sh = sf.c.shadowClass+'-off',
-				$ul = this.addClass(o.hoverClass)
-					.find('>ul:hidden').css('visibility','visible');
-			sf.IE7fix.call($ul);
-			o.onBeforeShow.call($ul);
-			$ul.animate(o.animation,o.speed,function(){ sf.IE7fix.call($ul); o.onShow.call($ul); });
-			return this;
-		}
-	});
-
-})(jQuery);
diff --git a/themes/admin_default/views/admin.html.php b/themes/admin_default/views/admin.html.php
index a08b2aaa..895ea00b 100644
--- a/themes/admin_default/views/admin.html.php
+++ b/themes/admin_default/views/admin.html.php
@@ -9,30 +9,30 @@
         type="text/css" media="screen,projection">
     <link rel="stylesheet" href="<?= url::file("themes/default/css/screen.css") ?>"
         type="text/css" media="screen,projection">
-    <link rel="stylesheet" href="<?= $theme->url("css/screen.css") ?>"
-        type="text/css" media="screen,projection">
-    <link rel="stylesheet" href="<?= $theme->url("css/superfish.css") ?>"
+    <link rel="stylesheet" href="<?= url::file("themes/default/css/superfish.css") ?>"
         type="text/css" media="screen,projection">
     <link rel="stylesheet" href="<?= $theme->url("css/superfish-navbar.css") ?>"
         type="text/css" media="screen,projection">
+    <link rel="stylesheet" href="<?= $theme->url("css/screen.css") ?>"
+        type="text/css" media="screen,projection">
     <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>
     <script src="<?= url::file("lib/gallery.dialog.js") ?>" type="text/javascript"></script>
-    <script src="<?= $theme->url("js/superfish.js") ?>" type="text/javascript"></script>
+    <script src="<?= url::file("themes/default/js/superfish.js") ?>" type="text/javascript"></script>
     <script src="<?= $theme->url("js/ui.init.js") ?>" type="text/javascript"></script>
     <?= $theme->admin_head() ?>
   </head>
 
   <body>
     <?= $theme->admin_page_top() ?>
-    <div id="doc4" class="yui-t5 gView">
+    <div id="doc3" class="yui-t5 gView">
       <div id="hd">
         <div id="gHeader">
           <?= $theme->site_status() ?>
           <?= $theme->admin_header_top() ?>
           <ul id="gLoginMenu">
-            <li><?= html::anchor("albums/1", "Browse Gallery") ?></li>
+            <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") ?>" />