diff options
| author | Christopher Allan Webber <cwebber@dustycloud.org> | 2012-08-19 12:14:39 -0500 |
|---|---|---|
| committer | Christopher Allan Webber <cwebber@dustycloud.org> | 2012-08-19 12:14:39 -0500 |
| commit | 944b92dc2fef2932136020709d2037548a29e7e0 (patch) | |
| tree | 7cbd9e44a807896a22784ecaa6b9dcdc86c78a55 | |
| parent | 2a9f519b29d73a8db1012891d77b256c321b62a1 (diff) | |
| parent | b3b42bbe7b46f2ff0560d60acef749489dc51837 (diff) | |
| download | mediagoblin-944b92dc2fef2932136020709d2037548a29e7e0.tar.lz mediagoblin-944b92dc2fef2932136020709d2037548a29e7e0.tar.xz mediagoblin-944b92dc2fef2932136020709d2037548a29e7e0.zip | |
Merge remote-tracking branch 'refs/remotes/merge-requests/40'
| -rw-r--r-- | mediagoblin/templates/mediagoblin/admin/panel.html | 6 | ||||
| -rw-r--r-- | mediagoblin/templates/mediagoblin/user_pages/processing_panel.html | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/mediagoblin/templates/mediagoblin/admin/panel.html b/mediagoblin/templates/mediagoblin/admin/panel.html index 618c5c40..d3c6c958 100644 --- a/mediagoblin/templates/mediagoblin/admin/panel.html +++ b/mediagoblin/templates/mediagoblin/admin/panel.html @@ -45,7 +45,7 @@ <td>{{ media_entry._id }}</td> <td>{{ media_entry.get_uploader.username }}</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 %} <td>{{ media_entry.transcoding_progress }}%</td> {% else %} @@ -75,7 +75,7 @@ <td>{{ media_entry._id }}</td> <td>{{ media_entry.get_uploader.username }}</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() %} <td>{{ media_entry.get_fail_exception().general_message }}</td> <td>{{ media_entry.fail_metadata }}</td> @@ -104,7 +104,7 @@ <td>{{ media_entry._id }}</td> <td>{{ media_entry.get_uploader.username }}</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> {% endfor %} </table> diff --git a/mediagoblin/templates/mediagoblin/user_pages/processing_panel.html b/mediagoblin/templates/mediagoblin/user_pages/processing_panel.html index f6fa69d0..e673902b 100644 --- a/mediagoblin/templates/mediagoblin/user_pages/processing_panel.html +++ b/mediagoblin/templates/mediagoblin/user_pages/processing_panel.html @@ -43,7 +43,7 @@ <tr> <td>{{ media_entry._id }}</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 %} <td>{{ media_entry.transcoding_progress }}%</td> {% else %} @@ -71,7 +71,7 @@ <tr> <td>{{ media_entry._id }}</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() %} <td>{{ media_entry.get_fail_exception().general_message }}</td> <td>{{ media_entry.fail_metadata }}</td> @@ -99,7 +99,7 @@ <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> + <td>{{ entry.created.strftime("%F %R") }}</td> </tr> {% endfor %} </table> |