heckyel/mediagoblin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

some fixes to the panel looks

Browse Source
This commit is contained in:
Boris Bobrov 2014-08-17 00:43:21 +03:00
parent 906a00b667
commit 75972f0afa
2 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
mediagoblin/templates/mediagoblin/user_pages/processing_panel.html
View File

@ -17,6 +17,8 @@
#} #}
{% extends "mediagoblin/base.html" %} {% extends "mediagoblin/base.html" %}
{% from "mediagoblin/utils/pagination.html" import render_pagination %}
{% block title -%} {% block title -%}
{% trans %}Media processing panel{% endtrans %} — {{ super() }} {% trans %}Media processing panel{% endtrans %} — {{ super() }}
{%- endblock %} {%- endblock %}
@ -42,12 +44,13 @@ Show:
</p> </p>
{% if entries.count() %} {% if entries.count() %}
{{ render_pagination(request, pagination) }}
<table class="media_panel processing"> <table class="media_panel processing">
<tr> <tr>
<th>Thumbnail</th> <th width="210">Thumbnail</th>
<th>Title</th> <th>Title</th>
<th>When submitted</th> <th width="20%">When submitted</th>
<th>Transcoding progress</th> <th width="200">Transcoding progress</th>
</tr> </tr>
{% for media_entry in entries %} {% for media_entry in entries %}
<tr> <tr>
@ -85,6 +88,7 @@ Show:
</tr> </tr>
{% endfor %} {% endfor %}
</table> </table>
{{ render_pagination(request, pagination) }}
{% else %} {% else %}
<p><em>{% trans %}You have not uploaded anything yet!{% endtrans %}</em></p> <p><em>{% trans %}You have not uploaded anything yet!{% endtrans %}</em></p>
{% endif %} {% endif %}

11
mediagoblin/user_pages/views.py
View File

@ -637,8 +637,10 @@ def collection_atom_feed(request):
return feed.get_response() return feed.get_response()
@active_user_from_url
@uses_pagination
@require_active_login @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... Show to the user what media is still in conversion/processing...
and what failed, and why! and what failed, and why!
@ -665,12 +667,17 @@ def processing_panel(request):
# show all entries # show all entries
pass pass
pagination = Pagination(page, entries)
pagination.per_page = 30
entries_on_a_page = pagination()
# Render to response # Render to response
return render_to_response( return render_to_response(
request, request,
'mediagoblin/user_pages/processing_panel.html', 'mediagoblin/user_pages/processing_panel.html',
{'user': user, {'user': user,
'entries': entries}) 'entries': entries_on_a_page,
'pagination': pagination})
@allow_reporting @allow_reporting
@get_user_media_entry @get_user_media_entry