1 files changed, 46 insertions, 50 deletions
diff --git a/templates/template-index.tmpl b/templates/template-index.tmpl
index f335014..0545fe2 100644
--- a/templates/template-index.tmpl
+++ b/templates/template-index.tmpl
@@ -13,64 +13,60 @@
 
 <!--  ##  Navigation bar  -->
 <div class="navigation">
-<table cellpadding="0" cellspacing="0" border="0" width="100%"><tr><td>
-  <!-- $(NAV_BAR) -->
-</td>
-<td align="right"><b><!-- $(TOTAL_ITEMS) --> albums</b></td></tr></table>
+  <div class="navlinks"><!-- $(NAV_BAR) --></div>
+  <div class="navposition">
+    <span class="navposnumber"><!-- $(TOTAL_ITEMS) --> albums</span>
+  </div>
 </div>
 
+
 <div class="master_content">
+  <!--  ##  Description  -->
+  <div class="description">
+    <!-- $(BEGIN_GO_UP) -->
+    <div class="desc_go_up">:. <a href="$(GO_UP_LINK)">Go Up</a></div>
+    <!-- $(END_GO_UP) -->
+    <div class="desc_title"><!-- $(TITLE) --></div>
+    <div class="desc_text"><!-- $(DESCRIPTION) --></div>
+  </div>
 
-<!--  ##  Description  -->
-<div class="desc">
-<!-- $(BEGIN_GO_UP) -->
-<div class="desc_date">:. <a href="$(GO_UP_LINK)" id="exif_line_a">Go Up</a><br /><br /><br /></div>
-<!-- $(END_GO_UP) -->
-<!-- $(TITLE) -->
-<div class="desc_text"><!-- $(DESCRIPTION) --></div>
-</div>
+  <!--  ##  Albums  -->
+  <div class="index_thumbs">
+  <!-- $(BEGIN_IMG_LIST) -->
+    <!-- $(BEGIN_IMG_LIST_LANDSCAPE) -->
+      <a class="index_item" href="<!-- $(ALBUM_SUBPATH) -->" id="<!-- $(IMG_LIST_ID) -->">
+         <img src="<!-- $(IMG_THUMBNAIL) -->" alt="<!-- $(IMG_TITLE) -->" />
+         <span class="album_text"><!-- $(IMG_TITLE) --></span><br />
+         <span class="album_subtext"><!-- $(IMG_DESCRIPTION) --></span>
+         <span class="album_note">(<!-- $(ALBUM_NUM_ITEMS) --> items)</span>
+      </a>
+    <!-- $(END_IMG_LIST_LANDSCAPE) -->
+    <!-- $(BEGIN_IMG_LIST_PORTRAIT) -->
+      <a class="index_item" href="<!-- $(ALBUM_SUBPATH) -->" id="<!-- $(IMG_LIST_ID) -->">
+         <img src="<!-- $(IMG_THUMBNAIL) -->" alt="<!-- $(IMG_TITLE) -->" />
+         <span class="album_text_portrait"><!-- $(IMG_TITLE) --></span><br />
+         <span class="album_subtext_portrait"><!-- $(IMG_DESCRIPTION) --></span>
+         <span class="album_note">(<!-- $(ALBUM_NUM_ITEMS) --> items)</span>
+      </a>
+    <!-- $(END_IMG_LIST_PORTRAIT) -->
+    <!-- $(BEGIN_LIST_SEPARATOR) -->
+      <div class="separators">
+        <div class="album_list_separator"><!-- $(LIST_SEPARATOR_TITLE) --></div>
+      </div>
+    <!-- $(END_LIST_SEPARATOR) -->
+  <!-- $(END_IMG_LIST) -->
+  </div>
 
+  <!--  ##  Footnote, also acts as a bottom border  -->
+  <div class="footnote">
+    <div class="desc_text"><!-- $(FOOTNOTE) --></div>
+  </div>
+</div> <!-- end of master_content -->
 
-<!--  ##  Albums  -->
-<div class="albumlist">
-<!-- $(BEGIN_IMG_LIST) -->
-  <!-- $(BEGIN_IMG_LIST_LANDSCAPE) -->
-   <div class="one_album" id="<!-- $(IMG_LIST_ID) -->">
-     <a href="<!-- $(ALBUM_SUBPATH) -->">
-       <img src="<!-- $(IMG_THUMBNAIL) -->" alt="<!-- $(IMG_TITLE) -->" />
-       <span class="album_text"><!-- $(IMG_TITLE) --></span><br /><br /><br />
-       <span class="album_subtext"><!-- $(IMG_DESCRIPTION) --></span><br /><br />
-       <span class="album_note">(<!-- $(ALBUM_NUM_ITEMS) --> items)</span>
-     </a>
-   </div>
-  <!-- $(END_IMG_LIST_LANDSCAPE) -->
-  <!-- $(BEGIN_IMG_LIST_PORTRAIT) -->
-   <div class="one_album" id="<!-- $(IMG_LIST_ID) -->">
-     <a href="<!-- $(ALBUM_SUBPATH) -->">
-       <img src="<!-- $(IMG_THUMBNAIL) -->" alt="<!-- $(IMG_TITLE) -->" />
-       <span class="album_text_portrait"><!-- $(IMG_TITLE) --></span><br /><br /><br />
-       <span class="album_subtext_portrait"><!-- $(IMG_DESCRIPTION) --></span><br /><br />
-       <span class="album_note">(<!-- $(ALBUM_NUM_ITEMS) --> items)</span>
-     </a>
-   </div>
-  <!-- $(END_IMG_LIST_PORTRAIT) -->
-  <!-- $(BEGIN_LIST_SEPARATOR) -->
-   <div class="separators">
-     <div class="album_list_separator"><!-- $(LIST_SEPARATOR_TITLE) --></div>
-   </div>
-  <!-- $(END_LIST_SEPARATOR) -->
-<!-- $(END_IMG_LIST) -->
-</div>
 
-<!--  ##  Footnote  -->
-<div class="desc" style="clear: both;">
-<div class="desc_text"><!-- $(FOOTNOTE) --></div>
-</div>
-
-</div> <!-- end of master_content -->
 <!--  ##  Footer  -->
-<!-- $(FOOTER) -->
-
+<div class="footer"><!-- $(FOOTER) --></div>
 
 </body>
 </html>
+