Merge remote branch 'remotes/elrond/dev/init'

[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 8c88c174ae78c7850c6f6a16f643cc1acdded1b8..2c7a71293ad78814e8eeb7a2f6187dd9b53430ad 100644 (file)
--- a/mediagoblin/templates/mediagoblin/utils/object_gallery.html
+++ b/mediagoblin/templates/mediagoblin/utils/object_gallery.html
@@ -16,20 +16,22 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #}
 
-{% block object_gallery_content -%}
-  <div>
-    {% if media_entries %}
-      <ul class="media_thumbnail">
-        {% for entry in media_entries %}
-          <li class="media_thumbnail">
-            <a href="{{ entry.url_for_self(request.urlgen) }}">
-            <img src="{{ request.app.public_store.file_url(
-                  entry['media_files']['thumb']) }}" /></a>
-          </li>
-        {% endfor %}
-      </ul>
-      {% include "mediagoblin/utils/pagination.html" %}
-    {%  endif %}
+{% from "mediagoblin/utils/pagination.html" import render_pagination %}
 
-  </div>
-{% endblock %}    
+{% 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>
+    {% endfor %}
+    {% 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 %}
+  {% endif %}
+{% endblock %}