aboutsummaryrefslogtreecommitdiffstats
path: root/mediagoblin/templates
diff options
context:
space:
mode:
authorJoar Wandborg <git@wandborg.com>2012-07-11 00:36:42 +0200
committerJoar Wandborg <git@wandborg.com>2012-07-11 00:36:42 +0200
commit6471291575c97f03d129051dc3d2bef28b4d89f2 (patch)
tree0c1252c0c23c2978736dd6eb819aefa89c1e355a /mediagoblin/templates
parent51eb0267d901bafcc90879dadbc2b8616ecdc4f5 (diff)
downloadmediagoblin-6471291575c97f03d129051dc3d2bef28b4d89f2.tar.lz
mediagoblin-6471291575c97f03d129051dc3d2bef28b4d89f2.tar.xz
mediagoblin-6471291575c97f03d129051dc3d2bef28b4d89f2.zip
Panel improvements
- Added progress meter for video and audio media types. - Changed the __repr__ method of a MediaEntry to display a bit more useful explanation. - Added a new MediaEntry.state, 'processing', which means that the task is running the processor on the item currently. - Fixed some PEP8 issues in user_pages/views.py - Fixed the ATOM TAG URI to show the correct year.
Diffstat (limited to 'mediagoblin/templates')
-rw-r--r--mediagoblin/templates/mediagoblin/user_pages/processing_panel.html34
1 files changed, 30 insertions, 4 deletions
diff --git a/mediagoblin/templates/mediagoblin/user_pages/processing_panel.html b/mediagoblin/templates/mediagoblin/user_pages/processing_panel.html
index e868456b..ac2fd44c 100644
--- a/mediagoblin/templates/mediagoblin/user_pages/processing_panel.html
+++ b/mediagoblin/templates/mediagoblin/user_pages/processing_panel.html
@@ -33,19 +33,23 @@
<th>ID</th>
<th>Title</th>
<th>When submitted</th>
- <th>Status</th>
+ <th>Transcoding progress</th>
</tr>
{% for media_entry in processing_entries %}
<tr>
<td>{{ media_entry._id }}</td>
<td>{{ media_entry.title }}</td>
<td>{{ media_entry.created.strftime("%m-%d-%Y %I:%M %p") }}</td>
- <td></td>
+ {% if media_entry.transcoding_progress %}
+ <td>{{ media_entry.transcoding_progress }}%</td>
+ {% else %}
+ <td>Unknown</td>
+ {% endif %}
</tr>
{% endfor %}
</table>
{% else %}
- <p><i>{% trans %}No media in-processing{% endtrans %}</i></p>
+ <p><em>{% trans %}No media in-processing{% endtrans %}</em></p>
{% endif %}
{% if failed_entries.count() %}
@@ -74,5 +78,27 @@
</tr>
{% endfor %}
</table>
-{% endif %}
+{% else %}
+ <p><em>{% trans %}No failed entries!{% endtrans %}</em></p>
+{% endif %}
+{% if processed_entries.count() %}
+ <h2>{% trans %}Your last 10 successful uploads{% endtrans %}</h2>
+
+ <table class="media_panel processed">
+ <tr>
+ <th>ID</th>
+ <th>Title</th>
+ <th>Submitted</th>
+ </tr>
+ {% for entry in processed_entries %}
+ <tr>
+ <td>{{ entry._id }}</td>
+ <td><a href="{{ entry.url_for_self(request.urlgen) }}">{{ entry.title }}</a></td>
+ <td>{{ entry.created.strftime("%m-%d-%Y %I:%M %p") }}</td>
+ </tr>
+ {% endfor %}
+ </table>
+{% else %}
+ <p><em>{% trans %}No processed entries, yet!{% endtrans %}</em></p>
+{% endif %}
{% endblock %}