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 c9c3e0db2ab69966e5d38f0e7a634e3a921bdc41..4e2886f8db9f54189e415c7d3a2059cb4508769d 100644 (file)
--- a/mediagoblin/templates/mediagoblin/utils/object_gallery.html
+++ b/mediagoblin/templates/mediagoblin/utils/object_gallery.html
@@ -16,10 +16,12 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #}
 
+{% from "mediagoblin/utils/pagination.html" import render_pagination %}
+
 {% block object_gallery_content -%}
   <div>
     {% if media_entries %}
-      <ul>
+      <ul class="media_thumbnail">
         {% for entry in media_entries %}
           <li class="media_thumbnail">
             <a href="{{ entry.url_for_self(request.urlgen) }}">
@@ -28,8 +30,12 @@
           </li>
         {% endfor %}
       </ul>
-      {% include "mediagoblin/utils/pagination.html" %}
-    {%  endif %}
-
+      {% 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 %}