From 1f9e7dee25dfd002b6b1ab4636faa9a24f74d09f Mon Sep 17 00:00:00 2001
From: Tomas Bzatek <tbzatek@users.sourceforge.net>
Date: Sun, 4 Jan 2015 19:58:05 +0100
Subject: generators: Use single function for all templates

This commit makes use of a common function for all template parsing and page
writing. The behaviour is controlled by the "item" argument passed in. This
allows us to have a single code that generates code for list of items as well
as for a single item. In the future, this can be used for e.g. combining
thumbnails and large images on the same page.

Other than that this commit also brings several other changes:
 - further clarification of theming setup XML file
 - <protected_thumbnail> tag has been moved out of the <album> structure into
   the <index> structure where it functionally belongs. Only whole albums can
   be protected and the substitute thumbnail is displayed on index pages.
 - position marker format has been broken out to a constant
 - added few more FIXMEs to mark places that will change soon
 - some template variables have been renamed
---
 templates/template_album.html | 26 ++++----------------------
 1 file changed, 4 insertions(+), 22 deletions(-)

(limited to 'templates/template_album.html')

diff --git a/templates/template_album.html b/templates/template_album.html
index 5413c5e..fde340f 100644
--- a/templates/template_album.html
+++ b/templates/template_album.html
@@ -52,33 +52,15 @@
   <!--  ##  Images  -->
   <div class="album_thumbs">
   <!-- $(BEGIN_IMG_LIST) -->
-    <!-- $(BEGIN_IMG_LIST_LANDSCAPE) -->
+    <!-- $(BEGIN_LIST_PICTURE) -->
       <div class="album_item">
-        <div class="position_marker" id="$(IMG_LIST_ID)"></div>
+        <div class="position_marker" id="$(IMG_POS_MARKER)"></div>
         <a href="$(IMG_SUBPAGE)">
-          <img src="$(IMG_THUMBNAIL)" width="$(IMG_SIZE_THUMB_W)" height="$(IMG_SIZE_THUMB_H)" alt="$(IMG_TITLE)" />
+          <img src="$(IMG_SRC_THUMB)" width="$(IMG_SIZE_THUMB_W)" height="$(IMG_SIZE_THUMB_H)" alt="$(IMG_TITLE)" class="$(THUMB_ORIENTATION)" />
           <span class="album_thumb_text"><!-- $(IMG_FILENAME) --></span>
         </a>
       </div>
-    <!-- $(END_IMG_LIST_LANDSCAPE) -->
-    <!-- $(BEGIN_IMG_LIST_PORTRAIT) -->
-      <div class="album_item">
-        <div class="position_marker" id="$(IMG_LIST_ID)"></div>
-        <a href="$(IMG_SUBPAGE)">
-          <img src="$(IMG_THUMBNAIL)" width="$(IMG_SIZE_THUMB_W)" height="$(IMG_SIZE_THUMB_H)" alt="$(IMG_TITLE)" class="portrait" />
-          <span class="album_thumb_text"><!-- $(IMG_FILENAME) --></span>
-        </a>
-      </div>
-    <!-- $(END_IMG_LIST_PORTRAIT) -->
-    <!-- $(BEGIN_IMG_LIST_SQUARED) -->
-      <div class="album_item">
-        <div class="position_marker" id="$(IMG_LIST_ID)"></div>
-        <a href="$(IMG_SUBPAGE)">
-          <img src="$(IMG_THUMBNAIL)" width="$(IMG_SIZE_THUMB_W)" height="$(IMG_SIZE_THUMB_H)" alt="$(IMG_TITLE)" class="squared" />
-          <span class="album_thumb_text"><!-- $(IMG_FILENAME) --></span>
-        </a>
-      </div>
-    <!-- $(END_IMG_LIST_SQUARED) -->
+    <!-- $(END_LIST_PICTURE) -->
     <!-- $(BEGIN_LIST_SEPARATOR) -->
       <div class="separators">
         <div class="index_separator"><!-- $(LIST_SEPARATOR_TITLE) --></div>
-- 
cgit v1.2.3