X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=mediagoblin%2Ftemplates%2Fmediagoblin%2Fuser_pages%2Fgallery.html;h=f23bb1567eb3e230e3f8f159e93e2c2ad0acacf6;hb=330f409ee91ad142a70617cf05a68916ef6c591e;hp=28290cfda88f86f44b35a9fbea230dad58c3207e;hpb=da0683b48c9ed6fc4ada1aff758e493bd2311d48;p=mediagoblin.git

diff --git a/mediagoblin/templates/mediagoblin/user_pages/gallery.html b/mediagoblin/templates/mediagoblin/user_pages/gallery.html
index 28290cfd..f23bb156 100644
--- 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 Free Software Foundation, Inc
+# 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
@@ -17,6 +17,8 @@
 #}
 {% extends "mediagoblin/base.html" %}
 
+{% from "mediagoblin/utils/object_gallery.html" import object_gallery %}
+
 {% block mediagoblin_head %}
     <link rel="alternate" type="application/atom+xml"
           href="{{ request.urlgen(
@@ -24,20 +26,38 @@
                        user=user.username) }}">
 {% endblock mediagoblin_head %}
 
+{% block title %}
+  {%- trans username=user.username -%}
+    {{ username }}'s media
+  {%- endtrans %} &mdash; {{ super() }}
+{% endblock %}
+
 {% block mediagoblin_content -%}
-  {% if user %}
-    <h1>
-      <a href="{{ request.urlgen(
-                      'mediagoblin.user_pages.user_home',
-                      user=user.username) }}">{{ user.username }}</a>'s media</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 %}
+    {% endif %}
+  </h1>
 
-    {% include "mediagoblin/utils/object_gallery.html" %}
+  {{ object_gallery(request, media_entries, pagination) }}
 
-    <a href={{ request.urlgen(
-                   'mediagoblin.user_pages.atom_feed',
-                   user=user.username) }}> atom feed</a>
-  {% else %}
-    {# This *should* not occur as the view makes sure we pass in a user. #}
-    <p>Sorry, no such user found.<p/>
-  {% endif %}
+  {% set feed_url = request.urlgen('mediagoblin.user_pages.atom_feed',
+                                   user=user.username) %}
+  {% include "mediagoblin/utils/feed_link.html" %}
+    
 {% endblock %}