Layout cleanup and simplification. Move view-mode buttons into sidebar, search to header_top. Reduced borders. Started album grid improvements. Minor white space improvements. Still need to handle text/photo alignment in album grid, improve placement of search.

3 files changed, 10 insertions, 14 deletions

diff --git a/themes/default/views/album.html.php b/themes/default/views/album.html.php
index cad41509..addd6c3a 100644
--- a/themes/default/views/album.html.php
+++ b/themes/default/views/album.html.php
@@ -1,11 +1,6 @@
 <? defined("SYSPATH") or die("No direct script access."); ?>
 <div id="gAlbumHeader">
-  <ul id="gItemMenu" class="sf-menu">
-    <li><a href="#" id="gAlbumLink" title="<?= _("View album") ?>"><?= _("Album view") ?></a></li>
-    <li><a href="#" id="gHybridLink" title="<?= _("View album in hybrid mode") ?>"><?= _("Hybrid view") ?></a></li>
-    <li><?= $theme->album_top() ?></li>
-  </ul>
-
+  <?= $theme->album_top() ?>
   <h1><?= $item->title_edit ?></h1>
   <div class="gDescription"><?= $item->description_edit ?></div>
 </div>
diff --git a/themes/default/views/photo.html.php b/themes/default/views/photo.html.php
index 5b4da2b7..8b00f0a5 100644
--- a/themes/default/views/photo.html.php
+++ b/themes/default/views/photo.html.php
@@ -1,16 +1,11 @@
 <? defined("SYSPATH") or die("No direct script access."); ?>
 <div id="gItemHeader">
-  <ul id="gItemMenu" class="sf-menu">
-    <li><a href="#" id="gFullsizeLink" title="<?= _("View full size image") ?>"><?= _("View full size image") ?></a></li>
-    <li><a href="#" id="gHybridLink" title="<?= _("View album in hybrid mode") ?>"><?= _("Hybrid view") ?></a></li>
-    <li><?= $theme->album_top() ?></li>
-  </ul>
-
+  <?= $theme->photo_top() ?>
   <h1><?= $item->title_edit ?></h1>
 </div>
 
 <div id="gItem">
-  <img id="gPhotoID-<?= $item->id ?>" alt="photo" src="<?= $item->resize_url() ?>"
+  <img id="gPhotoID-<?= $item->id ?>" alt="<?= $item->title ?>" src="<?= $item->resize_url() ?>"
        width="<?= $item->resize_width ?>"
        height="<?= $item->resize_height ?>" />
   <div><?= $item->description_edit ?></div>
diff --git a/themes/default/views/sidebar.html.php b/themes/default/views/sidebar.html.php
index f05ee025..d030a242 100644
--- a/themes/default/views/sidebar.html.php
+++ b/themes/default/views/sidebar.html.php
@@ -1,4 +1,10 @@
 <? defined("SYSPATH") or die("No direct script access."); ?>
-<?= $theme->sidebar_top() ?>
+<ul id="gViewMenu" class="sf-menu">
+  <li><a href="#" id="gFullsizeLink" title="<?= _("View full size image") ?>"><?= _("View full size image") ?></a></li>
+  <li><a href="#" id="gAlbumLink" title="<?= _("View album") ?>"><?= _("Album view") ?></a></li>
+  <li><a href="#" id="gHybridLink" title="<?= _("View album in hybrid mode") ?>"><?= _("Hybrid view") ?></a></li>
+  <li><?= $theme->sidebar_top() ?></li>
+</ul>
+
 <?= $theme->sidebar_blocks() ?>
 <?= $theme->sidebar_bottom() ?>