X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=templates%2Fmacros;h=5b6dc3a2b2fc0fb54649f399959c59caa9657254;hb=8401bd41697a1ea149074cb1058aad7b387c519c;hp=514f270cb5c4047ce0f1d7df31b4762d273413d7;hpb=d1391b6c98b7f74a85b2a83ce2f0d48a3bf5bfc2;p=memories.git

diff --git a/templates/macros b/templates/macros
index 514f270..5b6dc3a 100644
--- a/templates/macros
+++ b/templates/macros
@@ -6,7 +6,7 @@ IF photo.rated > 0; %]
 [% 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">
@@ -29,8 +29,9 @@ IF photo.rated > 0; %]
         [% SET r = photo.approx_rating %]
         <br/>
 [% IF r > 0 OR photo.hit_count > 0 %]
-    [% photo.hit_count %] views
-    [% IF r > 0 %] <br> [% ministar(r, photo) %] in [%photo.rated %] ratings [% END %]
+    [% 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 %]