Simplify/Robustify the thumbnail URL usage in templates

[mediagoblin.git] / mediagoblin / templates / mediagoblin / utils / object_gallery.html

diff --git a/mediagoblin/templates/mediagoblin/utils/object_gallery.html b/mediagoblin/templates/mediagoblin/utils/object_gallery.html
index c7286678c4f2d3f43cb38891657ed2d0e517dad1..b4da5bc111bea12f9269fffcc871c93dbeb2532e 100644 (file)
--- a/mediagoblin/templates/mediagoblin/utils/object_gallery.html
+++ b/mediagoblin/templates/mediagoblin/utils/object_gallery.html
@@ -1,6 +1,6 @@
 {#
 # GNU MediaGoblin -- federated, autonomous media hosting
-# Copyright (C) 2011 Free Software Foundation, Inc
+# Copyright (C) 2011, 2012 MediaGoblin contributors.  See AUTHORS.
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License as published by
@@ -18,44 +18,30 @@
 
 {% from "mediagoblin/utils/pagination.html" import render_pagination %}
 
-{% macro media_grid(request, media_list, col_number=5) %}
-    {% set num_items = media_list.count() %}
-    {% set col_counter = 0 %}
-    {% set row_counter = 0 %}
-    {% set item_counter = 0 %}
-    
-    {% set num_rows = num_items // col_number %}
-    {% if num_items % col_number != 0 %}
-        {% set num_rows = num_rows + 1 %}
-    {% endif %}
-    
-    <div class="thumb_gallery">
-    {% for entry in media_list %}
-        {% if col_counter == 0 %}
-        <div class="thumb_row {% if row_counter == 0 %}thumb_row_first{% endif %}{% if num_rows == row_counter + 1 %}thumb_row_last{% endif %}">
-        {% endif %}
-        
-            <div class="media_thumbnail thumb_entry {% if col_counter == 0 %}thumb_entry_first{% endif %}{% if col_number == col_counter + 1 or num_items == item_counter + 1 %}thumb_entry_last{% endif %}">
-            <a href="{{ entry.url_for_self(request.urlgen) }}">
-            <img src="{{ request.app.public_store.file_url(
-                             entry['media_files']['thumb']) }}" /></a>
-            </div>
-        
-        {% if col_number == col_counter + 1 or num_items == item_counter + 1 %}
-        </div>
-        {% set row_counter = row_counter + 1 %}
-        {% endif %}
-        
-        {% set item_counter = item_counter + 1 %}
-        {% set col_counter = col_counter + 1 %}
-        {% if col_counter == col_number %}
-            {% set col_counter = 0 %}
-        {% endif %}
+{% macro media_grid(request, media_entries, col_number=5) %}
+  <table class="thumb_gallery">
+    {% for row in gridify_cursor(media_entries, col_number) %}
+      <tr class="thumb_row
+                 {%- if loop.first %} thumb_row_first
+                 {%- elif loop.last %} thumb_row_last{% endif %}">
+        {% for entry in row %}
+          {% set entry_url = entry.url_for_self(request.urlgen) %}
+          <td class="media_thumbnail thumb_entry
+                     {%- if loop.first %} thumb_entry_first
+                     {%- elif loop.last %} thumb_entry_last{% endif %}">
+            <a href="{{ entry_url }}">
+              <img src="{{ entry.thumb_url }}" />
+            </a>
+            {% if entry.title %}
+              <a class="thumb_entry_title" href="{{ entry_url }}">{{ entry.title }}</a>
+            {% endif %}
+          </td>
+        {% endfor %}
+      </tr>
     {% endfor %}
-    </div>
+  </table>
 {%- endmacro %}
 
-
 {#
   Render a media gallery with pagination.
 
@@ -80,7 +66,11 @@
     {% endif %}
   {% else %}
     <p>
-      <i>There doesn't seem to be any media here yet...</i>
+      <i>
+        {%- trans -%}
+          There doesn't seem to be any media here yet...
+        {%- endtrans -%}
+      </i>
     </p>
   {% endif %}
 {% endmacro %}