Customizing Subs using Wtforms

[mediagoblin.git] / mediagoblin / templates / mediagoblin / user_pages / gallery.html

diff --git a/mediagoblin/templates/mediagoblin/user_pages/gallery.html b/mediagoblin/templates/mediagoblin/user_pages/gallery.html
index df931d9c012ccd6708713dc77ae05067f70da7e4..f23bb1567eb3e230e3f8f159e93e2c2ad0acacf6 100644 (file)
--- a/mediagoblin/templates/mediagoblin/user_pages/gallery.html
+++ b/mediagoblin/templates/mediagoblin/user_pages/gallery.html
@@ -1,6 +1,6 @@
 {#
 # GNU MediaGoblin -- federated, autonomous media hosting
-# Copyright (C) 2011 MediaGoblin contributors.  See AUTHORS.
+# Copyright (C) 2011, 2012 MediaGoblin contributors.  See AUTHORS.
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License as published by
@@ -26,29 +26,38 @@
                        user=user.username) }}">
 {% endblock mediagoblin_head %}
 
+{% block title %}
+  {%- trans username=user.username -%}
+    {{ username }}'s media
+  {%- endtrans %} — {{ super() }}
+{% endblock %}
+
 {% block mediagoblin_content -%}
-  {% if user %}
-    <h1>
+  <h1>
+    {% if tag %}
+      {%- trans username=user.username,
+                user_url=request.urlgen(
+                           'mediagoblin.user_pages.user_home',
+                            user=user.username),
+                tag_url=request.urlgen(
+                           'mediagoblin.listings.tags_listing',
+                           tag=tag) -%}
+        <a href="{{ user_url }}">{{ username }}</a>'s media with tag <a href="{{ tag_url }}">{{ tag }}</a>
+      {%- endtrans %}
+    {% else %}
       {%- trans username=user.username,
                 user_url=request.urlgen(
                            'mediagoblin.user_pages.user_home',
                             user=user.username) -%}
         <a href="{{ user_url }}">{{ username }}</a>'s media
       {%- endtrans %}
-    </h1>
+    {% endif %}
+  </h1>
 
-    <div class="container_16 media_gallery">
-      {{ object_gallery(request, media_entries, pagination) }}
-    </div>
+  {{ object_gallery(request, media_entries, pagination) }}
 
-    <div class="grid_16">
-      {% set feed_url = request.urlgen(
-                'mediagoblin.user_pages.atom_feed',
-                user=user.username) %}
-      {% include "mediagoblin/utils/feed_link.html" %}
-    </div>
-  {% else %}
-    {# This *should* not occur as the view makes sure we pass in a user. #}
-    <p>{% trans %}Sorry, no such user found.{% endtrans %}<p/>
-  {% endif %}
+  {% set feed_url = request.urlgen('mediagoblin.user_pages.atom_feed',
+                                   user=user.username) %}
+  {% include "mediagoblin/utils/feed_link.html" %}
+    
 {% endblock %}