IE fixes, sidebar is now fixed in IE (we were missing a yui-g class). Removed .first class, it's not needed, at least not now. Moved all top-level layout containers to page.html.php so that if themers want to replace YUI grids with something else, like Blueprint, they only really need to edit page.html.php.

7 files changed, 68 insertions, 68 deletions

diff --git a/themes/default/css/screen.css b/themes/default/css/screen.css
index 3c2d3ebb..aa51116a 100644
--- a/themes/default/css/screen.css
+++ b/themes/default/css/screen.css
@@ -172,17 +172,17 @@ table.gBlockContent td {
  
  }
 
-/* ~~~~~~~~~ album ~~~~~~~~~~ */
+/* ~~~~~~~~~ Album ~~~~~~~~~~ */
 
-#gAlbumGridHeader {
+#gAlbumHeader {
   height: 40px;
   position: relative;
 }
-#gAlbumGridHeader h1 {
+#gAlbumHeader h1 {
   display: inline;
 }
-#gAlbumGridHeader span {
-  padding-left: 10px;
+#gAlbumHeader span {
+  padding-right: 10px;
 }
 
 #gAlbumGrid {
@@ -192,15 +192,11 @@ table.gBlockContent td {
   border: 1px solid #ccc;
   float: left;
   list-style: none;
-  margin: 0 14px 10px 0;
+  margin: 0 24px 10px 0;
   padding: 5px 0 5px 0;
   text-align: center;
 }
 
-#gAlbumGrid .first {
-  clear: left;
-}
-
 .gAlbum {
   background-color: #d4daff;
 }
@@ -217,7 +213,7 @@ table.gBlockContent td {
 #gItem {
   margin: 0;
 }
-#gItem a.buttonlink {
+#gItem a.gButtonLink {
   float: right;
 }
 #gItem img {
@@ -361,11 +357,9 @@ table.gMetadata td.toggle {
 #gLoginMenu {
   border: 1px solid #c0c0c0;
   border-top: none;
+  float: right;
+  margin-right: 5px;
   padding: 5px;
-  position: absolute;
-  right: 13px;
-  text-align: right;
-  top: 0;
 }
 #gLoginMenu form {
   margin-top: 5px;
@@ -599,14 +593,14 @@ table.gMetadata td.toggle {
  ** *******************************************************************
  */
 
-.buttonlink {
+.gButtonLink {
   border: 1px solid #d3d3d3;
   padding: 5px;
 }
-.buttonlink:hover {
+.gButtonLink:hover {
   background-color: #f3f3f3;
 }
-.understate {
+.gUnderState {
   color: #c0c0c0;
 }
 
diff --git a/themes/default/views/album.html.php b/themes/default/views/album.html.php
index d9db24d9..b59dba01 100644
--- a/themes/default/views/album.html.php
+++ b/themes/default/views/album.html.php
@@ -1,8 +1,8 @@
 <? defined("SYSPATH") or die("No direct script access."); ?>
-<div id="gAlbumGridHeader">
+<div id="gAlbumHeader">
   <h1><?= $item->title_edit ?></h1>
-  <span class="understate"><?= $item->description_edit ?></span>
-  <a href="#" id="gSlideshowLink" class="buttonlink">Slideshow</a>
+  <span class="gUnderState"><?= $item->description_edit ?></span>
+  <a href="#" id="gSlideshowLink" class="gButtonLink">Slideshow</a>
 </div>
 
 <ul id="gAlbumGrid">
@@ -11,7 +11,7 @@
   <? if ($child->is_album()): ?>
   <? $album_class = "gAlbum "; ?>
   <? endif ?>
-  <li class="gItem <?= $album_class . text::alternate("first", "", "") ?>">
+  <li class="gItem <?= $album_class ?>">
     <a href="<?= url::site("{$child->type}/{$child->id}") ?>">
       <img id="gPhotoID-<?= $child->id ?>" class="gThumbnail"
            alt="photo" src="<?= $child->thumbnail_url() ?>"
@@ -22,7 +22,7 @@
     <ul class="gMetadata">
       <li>Views: 321</li>
       <? if ($child->owner): ?>
-      <li><?= _("By:") ?><a href="#"><?= $child->owner->name ?></a></li>
+      <li><?= _("By: ") ?><a href="#"><?= $child->owner->name ?></a></li>
       <? endif ?>
     </ul>
   </li>
diff --git a/themes/default/views/footer.html.php b/themes/default/views/footer.html.php
index 58d3b916..6e0ef428 100644
--- a/themes/default/views/footer.html.php
+++ b/themes/default/views/footer.html.php
@@ -1,6 +1,2 @@
 <? defined("SYSPATH") or die("No direct script access."); ?>
-<div id="ft">
-  <div id="gFooter">
-    Powered by <a href="#">Gallery3</a> | <a href="#">About this Gallery</a> | ...
-  </div>
-</div>
+Powered by <a href="#">Gallery3</a> | <a href="#">About this Gallery</a>
diff --git a/themes/default/views/header.html.php b/themes/default/views/header.html.php
index f2a72bef..7fe44398 100644
--- a/themes/default/views/header.html.php
+++ b/themes/default/views/header.html.php
@@ -1,29 +1,29 @@
 <? defined("SYSPATH") or die("No direct script access."); ?>
-<div id="gHeader">
-  <img id="gLogo" alt="<?= _("Logo") ?>" src="<?= $theme->url("images/logo.png") ?>" />
-  <h1><?= $item->title_edit ?></h1>
-  <div id="gLoginMenu">
-    <a href="#"><?= _("Register") ?></a> |
-    <a href="#"><?= _("Login") ?></a>
-  </div>
+<img id="gLogo" alt="<?= _("Logo") ?>" src="<?= $theme->url("images/logo.png") ?>" />
 
-  <ul id="gSiteMenu">
-    <li><a href="index.html"><?= _("HOME") ?></a></li>
-    <li><a class="active" href="browse.html"><?= _("BROWSE") ?></a></li>
-    <li><a href="upload.html"><?= _("UPLOAD") ?></a></li>
-    <li><a href="upload.html"><?= _("MY GALLERY") ?></a></li>
-    <li><a href="#"><?= _("ADMIN") ?></a></li>
-  </ul>
+<h1><?= $item->title_edit ?></h1>
 
-  <ul id="gBreadcrumbs">
-    <? foreach ($parents as $parent): ?>
-    <li><a href="<?= url::site("album/{$parent->id}") ?>"><?= $parent->title_edit ?></a></li>
-    <? endforeach ?>
-    <li class="active"><?= $item->title_edit ?></li>
-  </ul>
-
-  <form id="gSearchForm">
-    <input type="text" class="text" value="<?= _("Search Gallery ...") ?>"/>
-    <input type="submit" class="submit" value="search" />
-  </form>
+<div id="gLoginMenu">
+  <a href="#"><?= _("Register") ?></a> |
+  <a href="#"><?= _("Login") ?></a>
 </div>
+
+<ul id="gSiteMenu">
+  <li><a href="index.php"><?= _("HOME") ?></a></li>
+  <li><a class="active" href="index.php/album/1"><?= _("BROWSE") ?></a></li>
+  <li><a href="#"><?= _("UPLOAD") ?></a></li>
+  <li><a href="#"><?= _("MY GALLERY") ?></a></li>
+  <li><a href="#"><?= _("ADMIN") ?></a></li>
+</ul>
+
+<ul id="gBreadcrumbs">
+  <? foreach ($parents as $parent): ?>
+  <li><a href="<?= url::site("album/{$parent->id}") ?>"><?= $parent->title_edit ?></a></li>
+  <? endforeach ?>
+  <li class="active"><?= $item->title_edit ?></li>
+</ul>
+
+<form id="gSearchForm">
+  <input type="text" class="text" value="<?= _("Search Gallery ...") ?>"/>
+  <input type="submit" class="submit" value="search" />
+</form>
diff --git a/themes/default/views/page.html.php b/themes/default/views/page.html.php
index f394b076..2f6a30d4 100644
--- a/themes/default/views/page.html.php
+++ b/themes/default/views/page.html.php
@@ -9,24 +9,36 @@
           media="screen,print,projection" />
     <link rel="stylesheet" type="text/css" href="<?= url::file("lib/yui/base-min.css") ?>"
           media="screen,print,projection" />
-    <link rel="stylesheet" type="text/css" href="<?=
-      $theme->url("css/screen.css") ?>" media="screen,print,projection" />
+    <link rel="stylesheet" type="text/css" href="<?= $theme->url("css/screen.css") ?>" 
+          media="screen,print,projection" />
     <script src="<?= url::file("lib/jquery.js") ?>" type="text/javascript"></script>
     <script src="<?= url::file("lib/jquery.jeditable.js") ?>" type="text/javascript"></script>
   </head>
 
   <body>
-    <div id="doc2" class="yui-t5 gView">
-      <?= $theme->display("header.html") ?>
+    <div id="doc4" class="yui-t5 gView">
+      <div id="hd">
+        <div id="gHeader">
+          <?= $theme->display("header.html") ?>
+        </div>
+      </div>
       <div id="bd">
         <div id="yui-main">
-          <div id="gContent" class="yui-b">
-            <?= $content ?>
+          <div class="yui-b">
+            <div id="gContent" class="yui-g">
+              <?= $content ?>
+            </div>
           </div>
         </div>
-        <?= $theme->display("sidebar.html") ?>
+        <div id="gSidebar" class="yui-b">
+          <?= $theme->display("sidebar.html") ?>
+        </div>
+      </div>
+      <div id="ft">
+        <div id="gFooter">
+          <?= $theme->display("footer.html") ?>
+        </div>
       </div>
-      <?= $theme->display("footer.html") ?>
     </div>
     <?= $theme->in_place_edit(); ?>
   </body>
diff --git a/themes/default/views/photo.html.php b/themes/default/views/photo.html.php
index 9448b51e..e5a3ba11 100644
--- a/themes/default/views/photo.html.php
+++ b/themes/default/views/photo.html.php
@@ -1,7 +1,7 @@
 <? defined("SYSPATH") or die("No direct script access."); ?>
 <div id="gItem">
-  <a href="" class="buttonlink">Full size (1024x768)</a>
-  <a href="" class="buttonlink">Slideshow</a>
+  <a href="" class="gButtonLink">Full size (1024x768)</a>
+  <a href="" class="gButtonLink">Slideshow</a>
 
   <img id="gPhotoID-<?= $item->id ?>" alt="photo" src="<?= $item->resize_url() ?>"
        width="<?= $item->resize_width ?>"
diff --git a/themes/default/views/sidebar.html.php b/themes/default/views/sidebar.html.php
index e3e853c6..a24e2e36 100644
--- a/themes/default/views/sidebar.html.php
+++ b/themes/default/views/sidebar.html.php
@@ -1,6 +1,4 @@
 <? defined("SYSPATH") or die("No direct script access."); ?>
-<div id="gSidebar" class="yui-b">
-  <? foreach ($theme->blocks() as $block): ?>
-    <?= $block ?>
-  <? endforeach ?>
-</div>
+<? foreach ($theme->blocks() as $block): ?>
+  <?= $block ?>
+<? endforeach ?>