X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=mediagoblin%2Ftemplates%2Fmediagoblin%2Futils%2Fobject_gallery.html;h=1b4a15ed7682548502193872108750b93415d82c;hb=5970a855f619d29bb8a9119659411e551795ee67;hp=b451946d601de888d53673efb1ca1acffa176ad4;hpb=bd3b566dbecdcc9e0ee0f919e63ae753869db187;p=mediagoblin.git

diff --git a/mediagoblin/templates/mediagoblin/utils/object_gallery.html b/mediagoblin/templates/mediagoblin/utils/object_gallery.html
index b451946d..1b4a15ed 100644
--- 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
@@ -19,24 +19,27 @@
 {% from "mediagoblin/utils/pagination.html" import render_pagination %}
 
 {% 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
+  <div class="thumb_gallery">
+    {% for row in media_entries|batch(col_number) %}
+      <div class="row thumb_row
                  {%- if loop.first %} thumb_row_first
                  {%- elif loop.last %} thumb_row_last{% endif %}">
         {% for entry in row %}
-          <td class="media_thumbnail thumb_entry
+          {% set entry_url = entry.url_for_self(request.urlgen) %}
+          <div class="three columns media_thumbnail thumb_entry
                      {%- if loop.first %} thumb_entry_first
                      {%- elif loop.last %} 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 href="{{ entry_url }}">
+              <img src="{{ entry.thumb_url }}" />
             </a>
-          </td>
+            {% if entry.title %}
+              <a class="thumb_entry_title" href="{{ entry_url }}">{{ entry.title }}</a>
+            {% endif %}
+          </div>
         {% endfor %}
-      </tr>
+      </div>
     {% endfor %}
-  </table>
+  </div>
 {%- endmacro %}
 
 {#
@@ -44,7 +47,7 @@
 
   Args:
    - request: Request
-   - media_entries: pymongo cursor of media entries
+   - media_entries: db cursor of media entries
    - pagination: Paginator object
    - pagination_base_url: If you want the pagination to point to a
      different URL, point it here
@@ -63,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 %}