Update the CSS item ID and class application for items and albums in albums. Miscellaneous CSS updates.

2 files changed, 19 insertions, 29 deletions

diff --git a/themes/default/css/screen.css b/themes/default/css/screen.css
index ee1c8472..dbe1c014 100644
--- a/themes/default/css/screen.css
+++ b/themes/default/css/screen.css
@@ -356,17 +356,19 @@ li.gError select {
   margin-right: 20px;
 }
 
-/* Album content ~~~~~~~~~~~~~~~~~~~~~~~~~ */
+/* Album/Photo information ~~~~~~~~~~~~~~~ */
 
-#gContent #gAlbumHeader {
+#gContent #gInfo {
 }
 
-#gContent #gAlbumHeader .gDescription {
+#gContent #gInfo .gDescription {
 }
 
+/* Album content ~~~~~~~~~~~~~~~~~~~~~~~~~ */
+
 #gContent #gAlbumGrid {
   border-right: 1px solid #e8e8e8;
-  margin-top: 20px;
+  margin: 1em 0;
 }
 
 #gContent #gAlbumGrid .gItem {
@@ -382,9 +384,6 @@ li.gError select {
   width: 213px;
 }
 
-#gContent #gAlbumGrid .gItem .gThumbnail {
-}
-
 #gContent #gAlbumGrid .gItem h2 {
   margin: 5px 0;
 }
@@ -393,20 +392,9 @@ li.gError select {
   background-color: #e8e8e8;
 }
 
-#gContent #gAlbumGrid .gAlbum h2 {
-  color: #006;
-}
-
 /* Individual photo content ~~~~~~~~~~~~~~ */
 
 #gContent #gItem {
-  margin: 1em 0;
-}
-
-#gContent #gItemHeader {
-}
-
-#gContent #gItemHeader .gDescription {
 }
 
 #gContent #gComments {
@@ -602,7 +590,6 @@ li.gError select {
 
 #gPager {
   clear: both;
-  padding-top: 2em;
 }
 
 #gPager li {
@@ -668,7 +655,9 @@ li.gError select {
  *********************************************************************/
 
 #gSiteMenu:after,
-#gBreadcrumbs:after {
+#gBreadcrumbs:after,
+#gAlbumGrid:after,
+#gPager:after {
   clear: both;
   content: ".";
   display: block;
diff --git a/themes/default/views/album.html.php b/themes/default/views/album.html.php
index 009160d3..beab0ab0 100644
--- a/themes/default/views/album.html.php
+++ b/themes/default/views/album.html.php
@@ -1,5 +1,5 @@
 <?php defined("SYSPATH") or die("No direct script access.") ?>
-<div id="gAlbumHeader">
+<div id="gInfo">
   <?= $theme->album_top() ?>
   <h1><?= $item->title ?></h1>
   <div class="gDescription"><?= $item->description ?></div>
@@ -7,20 +7,21 @@
 
 <ul id="gAlbumGrid">
   <? foreach ($children as $i => $child): ?>
-  <? $album_class = ""; ?>
-  <? if ($child->is_album()): ?>
-  <? $album_class = "gAlbum "; ?>
-  <? endif ?>
-  <li id="g<?= $child->id ?>" class="gItem <?= $album_class ?>">
+    <? $item_class = "gPhoto"; ?>
+    <? if ($child->is_album()): ?>
+      <? $item_class = "gAlbum"; ?>
+    <? endif ?>
+  <li id="gItemId-<?= $child->id ?>" class="gItem <?= $item_class ?>">
     <?= $theme->thumb_top($child) ?>
     <a href="<?= $child->url() ?>">
-      <img id="gPhotoId-<?= $child->id ?>" class="gThumbnail"
-           alt="photo" src="<?= $child->thumb_url() ?>"
+      <img class="gThumbnail"
+           src="<?= $child->thumb_url() ?>"
+           alt="<?= $child->title ?>" 
            width="<?= $child->thumb_width ?>"
            height="<?= $child->thumb_height ?>" />
     </a>
-    <h2><a href="<?= $child->url() ?>"><?= $child->title ?></a></h2>
     <?= $theme->thumb_bottom($child) ?>
+    <h2><a href="<?= $child->url() ?>"><?= $child->title ?></a></h2>
     <ul class="gMetadata">
       <?= $theme->thumb_info($child) ?>
     </ul>