Merge remote branch 'remotes/jwandborg/f409-redirect_to_user_page_upon_submit'

[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 9e8c1875b4cf3f27ff0f5065bfdd102a0e67f14a..4e2886f8db9f54189e415c7d3a2059cb4508769d 100644 (file)
--- a/mediagoblin/templates/mediagoblin/utils/object_gallery.html
+++ b/mediagoblin/templates/mediagoblin/utils/object_gallery.html
@@ -16,22 +16,26 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #}
 
-{% import 'mediagoblin/utils/pagination.html' as paginationmacro  %}   
+{% from "mediagoblin/utils/pagination.html" import render_pagination %}
 
-<div>
-  {% if media_entries %}
-    <ul>
-      {% for entry in media_entries %}
-        <li>
-          <a href="{{ request.urlgen('mediagoblin.user_pages.media_home',
-               user= entry.uploader.username, m_id= entry._id) }}">
-          <img src="{{ request.app.public_store.file_url(
-                 entry['media_files']['thumb']) }}" /></a>
-        </li>
-      {% endfor %}
-    </ul>
-
-    {{ paginationmacro.render_pagination(pagination) }}
-
-  {%  endif %}
-</div>
+{% 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>
+      {% 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 %}
+  </div>
+{% endblock %}