Updated CSS organization and headings, removed unused styles, added placeholders for a few styles, including gThumbnail. Simplified album grid loop, the thumbnail container markup for albums and items was almost identical, no need to repeat all of it. Switched album grid markup from <div> to <ul>. Updated element nesting in photo template.

2 files changed, 66 insertions, 74 deletions

diff --git a/themes/default/views/album.html.php b/themes/default/views/album.html.php
index ba995276..0d181536 100644
--- a/themes/default/views/album.html.php
+++ b/themes/default/views/album.html.php
@@ -1,39 +1,32 @@
 <? defined("SYSPATH") or die("No direct script access."); ?>
-<div id="gAlbumGrid" class="gAlbumView">
   <div id="gAlbumGridHeader">
     <h1><?= $item->title ?></h1>
     <span class="understate"><?= $item->description ?></span>
     <a href="#" id="gSlideshowLink" class="buttonlink">Slideshow</a>
   </div>
 
+  <ul id="gAlbumGrid">
   <? foreach ($children as $i => $child): ?>
-  <? if ($child->is_album()): ?>
-  <div class="gAlbumContainer gAlbum <?= text::alternate("first", "", "") ?>">
-    <a href="<?= url::site("album/{$child->id}") ?>">
-      <img id="photo-id-<?= $child->id ?>" class="photo"
-           alt="photo" src="<?= $child->thumbnail_url() ?>"
-           width="<?= $child->thumbnail_width ?>"
-           height="<?= $child->thumbnail_height ?>" />
-    </a>
-    <h2>Album title</h2>
-    <ul class="gMetadata">
-      <li>Views: 321</li>
-      <li>By: <a href="#">username</a></li>
-    </ul>
-  </div>
-  <? else: ?>
-  <div class="gItemContainer <?= text::alternate("first", "", "") ?>">
-    <a href="<?= url::site("photo/{$child->id}") ?>">
-      <img id="photo-id-<?= $child->id ?>" class="photo"
-           alt="photo" src="<?= $child->thumbnail_url() ?>"
-           width="<?= $child->thumbnail_width ?>"
-           height="<?= $child->thumbnail_height ?>" />
-    </a>
-    <h2><?= $child->title ?></h2>
-  </div>
-  <? endif ?>
+    <? $album_class = ""; ?>
+    <? if ($child->is_album()): ?>
+      <? $album_class = "gAlbum "; ?>
+    <? endif ?>
+    <li class="gItem <?= $album_class . text::alternate("first", "", "") ?>">
+      <a href="<?= url::site("photo/{$child->id}") ?>">
+        <img id="gPhotoID-<?= $child->id ?>" class="gThumbnail"
+             alt="photo" src="<?= $child->thumbnail_url() ?>"
+             width="<?= $child->thumbnail_width ?>"
+             height="<?= $child->thumbnail_height ?>" />
+      </a>
+      <h2><?= $child->title ?></h2>
+      <ul class="gMetadata">
+        <li>Views: 321</li>
+        <li>By: <a href="#">username</a></li>
+      </ul>
+    </li>  
   <? endforeach ?>
-
+  </ul>
+  
   <div id="gPagination">
     Items 1-10 of 34
     <span class="first_inactive">first</span>
@@ -41,4 +34,3 @@
     <a href="#" class="next">next</a>
     <a href="#" class="last">last</a>
   </div>
-</div>
diff --git a/themes/default/views/photo.html.php b/themes/default/views/photo.html.php
index 74e01050..9448b51e 100644
--- a/themes/default/views/photo.html.php
+++ b/themes/default/views/photo.html.php
@@ -3,53 +3,53 @@
   <a href="" class="buttonlink">Full size (1024x768)</a>
   <a href="" class="buttonlink">Slideshow</a>
 
-  <img id="photo-id-<?= $item->id ?>" alt="photo" src="<?= $item->resize_url() ?>"
+  <img id="gPhotoID-<?= $item->id ?>" alt="photo" src="<?= $item->resize_url() ?>"
        width="<?= $item->resize_width ?>"
        height="<?= $item->resize_height ?>" />
   <h1><?= $item->title ?></h1>
-  <p><?= $item->description ?></p>
+  <div><?= $item->description ?></div>
+  
+  <div id="gComments">
+    <h2>Comments</h2>
+  
+    <ul id="gCommentThread">
+      <li id="gComment-1" class="gComment odd">
+        <p><a href="#" class="gAuthor">Andy</a> said 2 hours ago <span class="understate">(October 23, 2008 11:30am)</span></p>
+        <div>
+          Lorem ipsum dolor sit amet.
+        </div>
+      </li>
+      <li id="gComment-2" class="gComment even">
+        <p>
+          <a href="#" class="gAuthor">Other user</a> said 30 minutes ago <span class="understate">(October 23, 2008 1:00pm)</span>
+        </p>
+        <div>
+          Lorem Ipsum is simply dummy text of the printing and typesetting industry. Lorem Ipsum has been the industry's standard
+          dummy text ever since the 1500s, when an unknown printer took a galley of type and scrambled it to make a type specimen book.
+          It has survived not only five centuries, but also the leap into electronic typesetting, remaining essentially unchanged. It
+          was popularised in the 1960s with the release of Letraset sheets containing Lorem Ipsum passages, and more recently with
+          desktop publishing software like Aldus PageMaker including versions of Lorem Ipsum.
+        </div>
+      </li>
+    </ul>
+  
+    <form id="gCommentAdd" class="gExpandedForm">
+      <fieldset>
+        <legend>Add comment</legend>
+        <div class="row">
+          <label for="gCommentAuthor">Your Name</label>
+          <input type="text" id="gCommentAuthor" class="text" />
+        </div>
+        <div>
+          <label for="gCommentEmail">Your Email (not displayed)</label>
+          <input type="text" id="gCommentEmail" class="text" />
+        </div>
+        <div class="row">
+          <label for="gCommentText">Comment</label>
+          <textarea id="gCommentText"></textarea>
+        </div>
+        <input type="submit" class="button" value="Add" />
+      </fieldset>
+    </form>
+  </div><!-- END #gComments -->
 </div>
-
-<div id="gComments">
-  <h2>Comments</h2>
-
-  <ul id="gCommentThread">
-    <li id="gComment-1" class="gComment odd">
-      <p><a href="#" class="gAuthor">Andy</a> said 2 hours ago <span class="understate">(October 23, 2008 11:30am)</span></p>
-      <div>
-        Lorem ipsum dolor sit amet.
-      </div>
-    </li>
-    <li id="gComment-2" class="gComment even">
-      <p>
-        <a href="#" class="gAuthor">Other user</a> said 30 minutes ago <span class="understate">(October 23, 2008 1:00pm)</span>
-      </p>
-      <div>
-        Lorem Ipsum is simply dummy text of the printing and typesetting industry. Lorem Ipsum has been the industry's standard
-        dummy text ever since the 1500s, when an unknown printer took a galley of type and scrambled it to make a type specimen book.
-        It has survived not only five centuries, but also the leap into electronic typesetting, remaining essentially unchanged. It
-        was popularised in the 1960s with the release of Letraset sheets containing Lorem Ipsum passages, and more recently with
-        desktop publishing software like Aldus PageMaker including versions of Lorem Ipsum.
-      </div>
-    </li>
-  </ul>
-
-  <form id="gCommentAdd" class="gExpandedForm">
-    <fieldset>
-      <legend>Add comment</legend>
-      <div class="row">
-        <label for="gCommentAuthor">Your Name</label>
-        <input type="text" id="gCommentAuthor" class="text" />
-      </div>
-      <div>
-        <label for="gCommentEmail">Your Email (not displayed)</label>
-        <input type="text" id="gCommentEmail" class="text" />
-      </div>
-      <div class="row">
-        <label for="gCommentText">Comment</label>
-        <textarea id="gCommentText"></textarea>
-      </div>
-      <input type="submit" class="button" value="Add" />
-    </fieldset>
-  </form>
-</div><!-- END #gComments -->