Merge commit 'Memories as 1.3'

[memories.git] / templates / macros

diff --git a/templates/macros b/templates/macros
index f97cdd3acca801ff49ca90c4b03a8df99f30c251..05824ef88ce77ba83437d3613c0422b23bd796f5 100644 (file)
--- a/templates/macros
+++ b/templates/macros
@@ -1,15 +1,20 @@
-[% MACRO thumb(photo, album) BLOCK %]
-<table class="thumb">
-    <tr><td>
+[% MACRO minithumb(photo) BLOCK %]
         <a href="[%base%]/photo/view/[%photo.id%]">
         <img src="[% photo.thumb_url |uri%]" alt="[%photo.title|html%]"/>
         </a>
+[% END; MACRO thumb(photo, album) BLOCK %]
+<table class="thumb">
+    <tr><td>
+        [% minithumb(photo) %]
         </td> </tr>
     <tr><td> 
         <a href="[%base%]/photo/view/[%photo.id%]">
         <b>[% photo.title |html%] </b>
         </a>
         
+        <br>
+        <small>[% FOR tag = photo.tags %] <a
+        href="[%base%]/tag/view/[%tag%]">[%tag %]</a> [% END %]</small>
         </td></tr>
     <tr><td> Uploaded by 
         <a href="[%base%]/user/view/[%photo.uploader.id%]">