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

Merge remote-tracking branch 'refs/remotes/merge-requests/40'

Browse Source
This commit is contained in:
Christopher Allan Webber 2012-08-19 12:14:39 -05:00
commit 944b92dc2f
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
mediagoblin/templates/mediagoblin/admin/panel.html
View File

@ -45,7 +45,7 @@
<td>{{ media_entry._id }}</td> <td>{{ media_entry._id }}</td>
<td>{{ media_entry.get_uploader.username }}</td> <td>{{ media_entry.get_uploader.username }}</td>
<td>{{ media_entry.title }}</td> <td>{{ media_entry.title }}</td>
<td>{{ media_entry.created.strftime("%m-%d-%Y %I:%M %p") }}</td> <td>{{ media_entry.created.strftime("%F %R") }}</td>
{% if media_entry.transcoding_progress %} {% if media_entry.transcoding_progress %}
<td>{{ media_entry.transcoding_progress }}%</td> <td>{{ media_entry.transcoding_progress }}%</td>
{% else %} {% else %}
@ -75,7 +75,7 @@
<td>{{ media_entry._id }}</td> <td>{{ media_entry._id }}</td>
<td>{{ media_entry.get_uploader.username }}</td> <td>{{ media_entry.get_uploader.username }}</td>
<td>{{ media_entry.title }}</td> <td>{{ media_entry.title }}</td>
<td>{{ media_entry.created.strftime("%m-%d-%Y %I:%M %p") }}</td> <td>{{ media_entry.created.strftime("%F %R") }}</td>
{% if media_entry.get_fail_exception() %} {% if media_entry.get_fail_exception() %}
<td>{{ media_entry.get_fail_exception().general_message }}</td> <td>{{ media_entry.get_fail_exception().general_message }}</td>
<td>{{ media_entry.fail_metadata }}</td> <td>{{ media_entry.fail_metadata }}</td>
@ -104,7 +104,7 @@
<td>{{ media_entry._id }}</td> <td>{{ media_entry._id }}</td>
<td>{{ media_entry.get_uploader.username }}</td> <td>{{ media_entry.get_uploader.username }}</td>
<td><a href="{{ media_entry.url_for_self(request.urlgen) }}">{{ media_entry.title }}</a></td> <td><a href="{{ media_entry.url_for_self(request.urlgen) }}">{{ media_entry.title }}</a></td>
<td>{{ media_entry.created.strftime("%m-%d-%Y %I:%M %p") }}</td> <td>{{ media_entry.created.strftime("%F %R") }}</td>
</tr> </tr>
{% endfor %} {% endfor %}
</table> </table>

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

@ -43,7 +43,7 @@
<tr> <tr>
<td>{{ media_entry._id }}</td> <td>{{ media_entry._id }}</td>
<td>{{ media_entry.title }}</td> <td>{{ media_entry.title }}</td>
<td>{{ media_entry.created.strftime("%m-%d-%Y %I:%M %p") }}</td> <td>{{ media_entry.created.strftime("%F %R") }}</td>
{% if media_entry.transcoding_progress %} {% if media_entry.transcoding_progress %}
<td>{{ media_entry.transcoding_progress }}%</td> <td>{{ media_entry.transcoding_progress }}%</td>
{% else %} {% else %}
@ -71,7 +71,7 @@
<tr> <tr>
<td>{{ media_entry._id }}</td> <td>{{ media_entry._id }}</td>
<td>{{ media_entry.title }}</td> <td>{{ media_entry.title }}</td>
<td>{{ media_entry.created.strftime("%m-%d-%Y %I:%M %p") }}</td> <td>{{ media_entry.created.strftime("%F %R") }}</td>
{% if media_entry.get_fail_exception() %} {% if media_entry.get_fail_exception() %}
<td>{{ media_entry.get_fail_exception().general_message }}</td> <td>{{ media_entry.get_fail_exception().general_message }}</td>
<td>{{ media_entry.fail_metadata }}</td> <td>{{ media_entry.fail_metadata }}</td>
@ -99,7 +99,7 @@
<tr> <tr>
<td>{{ entry._id }}</td> <td>{{ entry._id }}</td>
<td><a href="{{ entry.url_for_self(request.urlgen) }}">{{ entry.title }}</a></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> <td>{{ entry.created.strftime("%F %R") }}</td>
</tr> </tr>
{% endfor %} {% endfor %}
</table> </table>