X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=mediagoblin%2Ftemplates%2Fmediagoblin%2Futils%2Fobject_gallery.html;h=b4da5bc111bea12f9269fffcc871c93dbeb2532e;hb=2e4ad359623916f5ca9f6ec11f5353a1a85a77d2;hp=2c7a71293ad78814e8eeb7a2f6187dd9b53430ad;hpb=51ca54a8356cb6c628a565693702616067af0bda;p=mediagoblin.git

diff --git a/mediagoblin/templates/mediagoblin/utils/object_gallery.html b/mediagoblin/templates/mediagoblin/utils/object_gallery.html
index 2c7a7129..b4da5bc1 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
@@ -18,20 +18,59 @@
 
 {% from "mediagoblin/utils/pagination.html" import render_pagination %}
 
-{% block object_gallery_content -%}
-  {% if media_entries %}
-    {% for entry in media_entries %}
-      <div class="media_thumbnail">
-        <a href="{{ entry.url_for_self(request.urlgen) }}">
-        <img src="{{ request.app.public_store.file_url(
-                         entry['media_files']['thumb']) }}" /></a>
-      </div>
+{% 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 %}
+  </table>
+{%- endmacro %}
+
+{#
+  Render a media gallery with pagination.
+
+  Args:
+   - request: Request
+   - media_entries: pymongo cursor of media entries
+   - pagination: Paginator object
+   - pagination_base_url: If you want the pagination to point to a
+     different URL, point it here
+   - col_number: How many columns per row (default 5)
+#}
+{% macro object_gallery(request, media_entries, pagination,
+                        pagination_base_url=None, col_number=5) %}
+  {% if media_entries and media_entries.count() %}
+    {{ media_grid(request, media_entries, col_number=col_number) }}
+    <div class="clear"></div>
     {% if pagination_base_url %}
       {# different url, so set that and don't keep the get params #}
       {{ render_pagination(request, pagination, pagination_base_url, False) }}
     {% else %}
       {{ render_pagination(request, pagination) }}
     {% endif %}
+  {% else %}
+    <p>
+      <i>
+        {%- trans -%}
+          There doesn't seem to be any media here yet...
+        {%- endtrans -%}
+      </i>
+    </p>
   {% endif %}
-{% endblock %}
+{% endmacro %}