X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=templates%2Fphoto%2Fview;h=0fbccbba48aa0c1b6559f8665bb88822b11b194e;hb=a1a5f8caa6a6d7af6f3b69fe36300a0d07c53d2d;hp=0285d7584966b04dc91d1bb8c0131ebb10b0e678;hpb=d8b282730b07b6aaadcc683112863f22ea20e459;p=memories.git

diff --git a/templates/photo/view b/templates/photo/view
index 0285d75..0fbccbb 100644
--- a/templates/photo/view
+++ b/templates/photo/view
@@ -20,62 +20,49 @@
     </form>
 [% END %]
 </td>
-<td align="right" class="tagbrowse">
-[% FOR tag = photo.tags;
-    "<a href=\""; base;"/tag/view/";tag.name | html | uri;"\">";
-    tag;
-    "</a>&nbsp;(";
-    tag.taggings.size; ")";
-    ", " UNLESS tag == photo.tags.last;
-END %]
-</td>
-</tr>
-<tr>
-<td>
+<td align="right">
 [% IF photo.albums %]
 In albums:
 [% FOR album = photo.albums; %]
 <a href="[%base%]/album/view/[%album.id%]">[%album.name%]</a> ([%album.photos.size%])
 [% ";" UNLESS album == photo.albums.last %]
 [% END %]
+<br>
 [% END %]
-
-</td>
-<td align="right" class="tagbrowse"><small>
+<small>
 <i>Photo shot on [% photo.shot.ymd %] </i> <br>
 Uploaded by <a href="[%base%]/user/view/[%photo.uploader.id%]"> [%
 photo.uploader %] </a>
-</small></td>
+</small> <br>
+[% photo.hit_count %] view[%IF photo.hit_count > 1%]s[%END%]
+</td>
 </tr>
 </table>
-<div class="photoview">
-    [% SET sizes = request.config.sizes %]
-    [% IF request.params.exists("scale") %]
-        [% SET size =  request.params.scale  %]
-    [% ELSIF request.session.scale %]
-        [% SET size =  request.session.scale  %]
-    [% ELSE; SET size =  1; END; %]
-    <img src="[% photo.sized_url(size) %]">
-    <p> (Original size [%photo.dimensions %]) </p>
-    <p>
-    Size: 
-    [% SET i = 0; WHILE i < sizes.size %]
-        [% IF photo.is_bigger(sizes.$i);  %]
-            [% IF i == size %]
-                [% sizes.$i %]
-            [% ELSIF sizes.$i == "full" %]
-                <a href="[%photo.path("url")%]">full</a>
-            [% ELSE %]
-                <a href="[%url%]?scale=[% i %]&active=[%tab%]">[% sizes.$i %]</a>
-            [% END %]
-        [% END; %] 
-    [% SET i = i + 1 %]
-    [% END %]
-    </p>
-    [%# Now put it back in the session %]
-    [% SET request.session.scale = size %]
+
+<div class="tagbrowse smaller">
+[% SET tagset = {}; FOR tag = photo.tags;
+    SET name = tag.name; tagset.$name = tag.taggings.size;
+  END;
+  SET sorted = tagset.nsort.reverse;
+%]
+[% SET counter = 0;
+  FOR tag = sorted;
+    counter = counter + 1;
+    IF tagset.$tag > 1; 
+        "<a href=\""; base;"/tag/view/";tag | html | uri;"\">";
+        tag;
+        "</a>&nbsp;(";
+        tagset.$tag; ")";
+    ELSE; 
+        tag; 
+        IF counter > 20; "..."; LAST; END;
+    END;
+    ", " UNLESS tag == sorted.last;
+END %]
 </div>
 
+[% PROCESS sized %]
+
 [% IF photo.description OR photo.copyright OR photo.license %]
 <div class="photodesc"> 
     [% photo.description | html %]