X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=templates%2Fmacros;h=5b6dc3a2b2fc0fb54649f399959c59caa9657254;hb=3b371b0c2e584c3b9164fef7df7faae8d58401d0;hp=f97cdd3acca801ff49ca90c4b03a8df99f30c251;hpb=3741acaec618fde1e4c230ee2a503987746235e4;p=memories.git

diff --git a/templates/macros b/templates/macros
index f97cdd3..5b6dc3a 100644
--- a/templates/macros
+++ b/templates/macros
@@ -1,20 +1,39 @@
-[% MACRO thumb(photo, album) BLOCK %]
-<table class="thumb">
-    <tr><td>
+[% MACRO ministar(rating, photo) BLOCK;
+IF photo.rated > 0; %]
+<span class="inline-rating"><ul class="star-rating small-star">
+<li class="current-rating" style="width:[%rating * 20 %]%">Currently [%rating%]/5 Stars.</li>
+</ul></span>
+[% END; END %]
+[% MACRO minithumb(photo) BLOCK %]
         <a href="[%base%]/photo/view/[%photo.id%]">
-        <img src="[% photo.thumb_url |uri%]" alt="[%photo.title|html%]"/>
+        <img src="[% photo.thumb_url %]" 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 
+    <tr><td style="background:#fff"> Uploaded by 
         <a href="[%base%]/user/view/[%photo.uploader.id%]">
             [% photo.uploader.name |html%]
-        </a><br/> at [% photo.uploaded %] </td></tr>
+        </a><br/> at [% photo.uploaded %] 
+        [% SET r = photo.approx_rating %]
+        <br/>
+[% IF r > 0 OR photo.hit_count > 0 %]
+    [% photo.hit_count %] view[%IF photo.hit_count>1%]s[% END %]
+    [% IF r > 0 %] <br> [% ministar(r, photo) %] in [%photo.rated %]
+    rating[%IF photo.rated > 1%]s[%END%] [% END %]
+[% END %]
+    </td></tr>
         [% IF request.user %]
     [% IF album == 1 %]
         <tr><td> Add to album: <input type="checkbox" name="add[%photo.id%]" value="[%photo.id%]"> </td></tr>