some fixes to the panel looks

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

View File

@ -17,6 +17,8 @@
#}
{% extends "mediagoblin/base.html" %}
{% from "mediagoblin/utils/pagination.html" import render_pagination %}
{% block title -%}
{% trans %}Media processing panel{% endtrans %} — {{ 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 %}

View 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