diff options
| author | Christopher Allan Webber <cwebber@dustycloud.org> | 2013-04-13 11:42:34 -0500 |
|---|---|---|
| committer | Christopher Allan Webber <cwebber@dustycloud.org> | 2013-04-13 11:42:34 -0500 |
| commit | 6432755db3e5bcb2cdfa7720b5d14bfaaebc57be (patch) | |
| tree | 4c0cf605636919d7b9a7c3d0289736a3fcf36d1a /mediagoblin/templates | |
| parent | 36748921c27deb3f8c9d88f9b7a3c368a427d418 (diff) | |
| parent | 88dd6fc2e29864a047d11b49ebf93fb6c1331ca3 (diff) | |
| download | mediagoblin-6432755db3e5bcb2cdfa7720b5d14bfaaebc57be.tar.lz mediagoblin-6432755db3e5bcb2cdfa7720b5d14bfaaebc57be.tar.xz mediagoblin-6432755db3e5bcb2cdfa7720b5d14bfaaebc57be.zip | |
Merge remote-tracking branch 'refs/remotes/tsyesika/394-fuzzy-timestamp'
Diffstat (limited to 'mediagoblin/templates')
| -rw-r--r-- | mediagoblin/templates/mediagoblin/admin/panel.html | 2 | ||||
| -rw-r--r-- | mediagoblin/templates/mediagoblin/user_pages/media.html | 8 |
2 files changed, 6 insertions, 4 deletions
diff --git a/mediagoblin/templates/mediagoblin/admin/panel.html b/mediagoblin/templates/mediagoblin/admin/panel.html index 6bcb5c24..1c3c866e 100644 --- a/mediagoblin/templates/mediagoblin/admin/panel.html +++ b/mediagoblin/templates/mediagoblin/admin/panel.html @@ -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("%F %R") }}</td> + <td><span title='{{ media_entry.created.strftime("%F %R") }}'>{{ timesince(media_entry.created) }}</span></td> </tr> {% endfor %} </table> diff --git a/mediagoblin/templates/mediagoblin/user_pages/media.html b/mediagoblin/templates/mediagoblin/user_pages/media.html index b77c12b9..58b9cdce 100644 --- a/mediagoblin/templates/mediagoblin/user_pages/media.html +++ b/mediagoblin/templates/mediagoblin/user_pages/media.html @@ -125,7 +125,9 @@ comment=comment.id, user=media.get_uploader.username, media=media.slug_or_id) }}#comment"> - {{- comment.created.strftime("%I:%M%p %Y-%m-%d") -}} + <span title='{{- comment.created.strftime("%I:%M%p %Y-%m-%d") -}}'> + {{ timesince(comment.created) }} + </span> </a>: </div> <div class="comment_content"> @@ -141,9 +143,9 @@ {% endif %} </div> <div class="media_sidebar"> - {% trans date=media.created.strftime("%Y-%m-%d") -%} + {% trans date=media.created.strftime("%Y-%m-%d"), formatted_time=timesince(media.created) -%} <h3>Added on</h3> - <p>{{ date }}</p> + <p><span title="{{ date }}">{{ formatted_time }}</span></p> {%- endtrans %} {% if media.tags %} {% include "mediagoblin/utils/tags.html" %} |