aboutsummaryrefslogtreecommitdiffstats
path: root/mediagoblin/templates
diff options
context:
space:
mode:
authorChristopher Allan Webber <cwebber@dustycloud.org>2013-02-21 15:55:26 -0600
committerChristopher Allan Webber <cwebber@dustycloud.org>2013-02-21 15:55:26 -0600
commit60a7eb9ca5f614a31f17158b791e1a6b7d7bf352 (patch)
treedaf7ecc6f74f4d6921d4f2bb4cf9ae8bf1fa6162 /mediagoblin/templates
parent9b2cd962af78ce8fbe2bce88d7b9d3a9d01e4aa9 (diff)
parentf2c0bf3e34f1b56908444fc11504bb0114d0e0a3 (diff)
downloadmediagoblin-60a7eb9ca5f614a31f17158b791e1a6b7d7bf352.tar.lz
mediagoblin-60a7eb9ca5f614a31f17158b791e1a6b7d7bf352.tar.xz
mediagoblin-60a7eb9ca5f614a31f17158b791e1a6b7d7bf352.zip
Merge remote-tracking branch 'refs/remotes/spaetz/WIP/user_tag_gallery'
Diffstat (limited to 'mediagoblin/templates')
-rw-r--r--mediagoblin/templates/mediagoblin/user_pages/gallery.html5
1 files changed, 3 insertions, 2 deletions
diff --git a/mediagoblin/templates/mediagoblin/user_pages/gallery.html b/mediagoblin/templates/mediagoblin/user_pages/gallery.html
index e234914f..097cec54 100644
--- a/mediagoblin/templates/mediagoblin/user_pages/gallery.html
+++ b/mediagoblin/templates/mediagoblin/user_pages/gallery.html
@@ -39,11 +39,12 @@
'mediagoblin.user_pages.user_home',
user=user.username) -%}
<a href="{{ user_url }}">{{ username }}</a>'s media
- {%- endtrans %}
+ {%- endtrans %}{% if tag %}{% trans %} with tag '{{tag}}'{% endtrans %}
+ {%- endif %}
</h1>
{{ object_gallery(request, media_entries, pagination) }}
-
+
{% set feed_url = request.urlgen('mediagoblin.user_pages.atom_feed',
user=user.username) %}
{% include "mediagoblin/utils/feed_link.html" %}