diff options
| author | Tomas Bzatek <tbzatek@users.sourceforge.net> | 2015-01-04 19:58:05 +0100 |
|---|---|---|
| committer | Tomas Bzatek <tbzatek@users.sourceforge.net> | 2015-01-04 19:58:05 +0100 |
| commit | 1f9e7dee25dfd002b6b1ab4636faa9a24f74d09f (patch) | |
| tree | fb8343fddb4e6931cd361f78b30b292532a03dfa /templates/template_picture.html | |
| parent | 6f6d8002d318d502ca1f645f95a4c018871c70b3 (diff) | |
| download | cataract-1f9e7dee25dfd002b6b1ab4636faa9a24f74d09f.tar.xz | |
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
Diffstat (limited to 'templates/template_picture.html')
| -rw-r--r-- | templates/template_picture.html | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/templates/template_picture.html b/templates/template_picture.html index 6bd5291..f7e553e 100644 --- a/templates/template_picture.html +++ b/templates/template_picture.html @@ -3,6 +3,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <head profile="http://www.w3.org/2005/10/profile"> <meta http-equiv="content-type" content="text/html; charset=UTF-8" /> +<!-- $(BEGIN_SINGLE_PICTURE) --> <title>$(PAGE_TITLE)</title> <!-- $(CGG_META_TAGS) --> <!-- $(CGG_ATOM_FEED_TAGS) --> @@ -34,7 +35,7 @@ <!-- $(END_NAV_BAR) --> </div> <div class="navposition"> - <span class="navposnumber"><!-- $(FILE_NO) --></span> of <span class="navposnumber"><!-- $(TOTAL_ITEMS) --></span> + <span class="navposnumber"><!-- $(ITEM_INDEX) --></span> of <span class="navposnumber"><!-- $(TOTAL_ITEMS) --></span> <span class="navposspacer"></span> <a href="$(LINK_PREV)" rel="prev">< Previous</a> :: <a href="$(LINK_NEXT)" rel="next">Next ></a> </div> @@ -47,8 +48,8 @@ <div class="master_content"> <!-- ## Description --> <div class="description"> - <div class="desc_title"><!-- $(TITLE) --></div> - <div class="desc_text"><!-- $(DESCRIPTION) --></div> + <div class="desc_title"><!-- $(IMG_TITLE) --></div> + <div class="desc_text"><!-- $(IMG_DESCRIPTION) --></div> </div> <!-- ## Image --> @@ -56,7 +57,7 @@ <a href="$(LINK_NEXT)" rel="next"><img src="$(IMG_SRC)" width="$(IMG_SIZE_W)" height="$(IMG_SIZE_H)" alt="" id="$(value(BORDER_STYLE))" /></a> <!-- $(ifdef(HAS_FULLSIZE)) --> <div class="img_preview_full"> - <a href="$(IMG_SRC_FULL)">See original size (<!-- $(IMG_SIZE_ORIG_W) -->x<!-- $(IMG_SIZE_ORIG_H) -->)</a> + <a href="$(IMG_SRC_FULLSIZE)">See original size (<!-- $(IMG_SIZE_FULLSIZE_W) -->x<!-- $(IMG_SIZE_FULLSIZE_H) -->)</a> </div> <!-- $(endif(HAS_FULLSIZE)) --> </div> @@ -91,10 +92,10 @@ </div> <!-- $(endif(SHOW_EXIF_TABLE)) --> +<!-- $(END_SINGLE_PICTURE) --> + <!-- ## Footnote, also acts as a bottom border --> - <div class="footnote"> - <div class="desc_text"><!-- $(FOOTNOTE) --></div> - </div> + <div class="footnote"></div> </div> <!-- end of master_content --> |