some fixes to the panel looks
authorBoris Bobrov <breton@cynicmansion.ru>
Sat, 16 Aug 2014 21:43:21 +0000 (00:43 +0300)
committerBoris Bobrov <breton@cynicmansion.ru>
Sun, 31 Jan 2016 23:30:30 +0000 (00:30 +0100)
mediagoblin/templates/mediagoblin/user_pages/processing_panel.html
mediagoblin/user_pages/views.py

index 88eef82751deff705325fbc7e8af0ebaec3c6d1f..96786937fac9d2d7355e1816e6afc3ba434d65d7 100644 (file)
@@ -17,6 +17,8 @@
 #}
 {% extends "mediagoblin/base.html" %}
 
+{% from "mediagoblin/utils/pagination.html" import render_pagination %}
+
 {% block title -%}
   {% trans %}Media processing panel{% endtrans %} &mdash; {{ super() }}
 {%- endblock %}
@@ -42,12 +44,13 @@ Show:
 </p>
     
 {% if entries.count() %}
+  {{ render_pagination(request, pagination) }}
   <table class="media_panel processing">
     <tr>
-      <th>Thumbnail</th>
+      <th width="210">Thumbnail</th>
       <th>Title</th>
-      <th>When submitted</th>
-      <th>Transcoding progress</th>
+      <th width="20%">When submitted</th>
+      <th width="200">Transcoding progress</th>
     </tr>
     {% for media_entry in entries %}
       <tr>
@@ -85,6 +88,7 @@ Show:
       </tr>
     {% endfor %}
   </table>
+  {{ render_pagination(request, pagination) }}
 {% else %}
   <p><em>{% trans %}You have not uploaded anything yet!{% endtrans %}</em></p>
 {% endif %}  
index 97f0bac198f22fa3c4e8567fc1fbf331b0be2f3a..c4f86b299eb180b4f8f3ae070940798469388663 100644 (file)
@@ -637,8 +637,10 @@ def collection_atom_feed(request):
 
     return feed.get_response()
 
+@active_user_from_url
+@uses_pagination
 @require_active_login
-def processing_panel(request):
+def processing_panel(request, page, url_user):
     """
     Show to the user what media is still in conversion/processing...
     and what failed, and why!
@@ -665,12 +667,17 @@ def processing_panel(request):
         # show all entries
         pass
 
+    pagination = Pagination(page, entries)
+    pagination.per_page = 30
+    entries_on_a_page = pagination()
+
     # Render to response
     return render_to_response(
         request,
         'mediagoblin/user_pages/processing_panel.html',
         {'user': user,
-         'entries': entries})
+         'entries': entries_on_a_page,
+         'pagination': pagination})
 
 @allow_reporting
 @get_user_media_entry