Make several small changes to wording and top bar links

diff --git a/mediagoblin/templates/mediagoblin/base.html b/mediagoblin/templates/mediagoblin/base.html
index 6adb2fe3d29b5ef06d79e35b3cf84a6347fd9e7b..6250bf3cbe7501d7321ba9e9648cb1aa3de55e4f 100644 (file)
--- a/mediagoblin/templates/mediagoblin/base.html
+++ b/mediagoblin/templates/mediagoblin/base.html
@@ -37,11 +37,9 @@
                   {% endblock %}{% block mediagoblin_header_title %}{% endblock %}
             <div class="mediagoblin_header_right">
               {% if request.user %}
-                    {{ request.user['username'] }}'s account 
                     <a href="{{ request.urlgen('mediagoblin.user_pages.user_home',
-                                                user= request.user['username']) }}">home</a> 
-                    <a href="{{ request.urlgen('mediagoblin.user_pages.user_gallery',
-                                                user= request.user['username']) }}">gallery</a> 
+                                                user= request.user['username']) }}">
+                                                {{ request.user['username'] }}</a>'s account 
                     (<a href="{{ request.urlgen('mediagoblin.auth.logout') }}">logout</a>)
               {% else %}
                     <a href="{{ request.urlgen('mediagoblin.auth.login') }}">

diff --git a/mediagoblin/templates/mediagoblin/user_pages/gallery.html b/mediagoblin/templates/mediagoblin/user_pages/gallery.html
index 1d8fbdaa1140b49b913da1e9ca08aec47cba9aa8..33732d0d8d66cddc8015ce64005253bd0a2648f4 100644 (file)
--- a/mediagoblin/templates/mediagoblin/user_pages/gallery.html
+++ b/mediagoblin/templates/mediagoblin/user_pages/gallery.html
@@ -26,9 +26,9 @@
 
 {% block mediagoblin_content -%}
   {% if user %}
-    <h1>gallery for <a href="{{ request.urlgen(
+    <h1><a href="{{ request.urlgen(
                                    'mediagoblin.user_pages.user_home',
-                                 user=user.username) }}">{{ user.username }}</a></h1>
+                                 user=user.username) }}">{{ user.username }}</a>'s media</h1>
 
     {% include "mediagoblin/utils/object_gallery.html" %}
 

diff --git a/mediagoblin/templates/mediagoblin/user_pages/user.html b/mediagoblin/templates/mediagoblin/user_pages/user.html
index f7a9f3c9c7a2bda08fc114a2b81c469dbf03c55f..99e46a72e880518df4021c5465303b38ae0bd97a 100644 (file)
--- a/mediagoblin/templates/mediagoblin/user_pages/user.html
+++ b/mediagoblin/templates/mediagoblin/user_pages/user.html
@@ -26,12 +26,16 @@
 
 {% block mediagoblin_content -%}
   {% if user %}
-    <h1>User page for '{{ user.username }}'</h1>
+    <h1>{{ user.username }}'s profile</h1>
     
     {% include "mediagoblin/utils/profile.html" %}
 
     {% include "mediagoblin/utils/object_gallery.html" %}
 
+    <p><a href="{{ request.urlgen('mediagoblin.user_pages.user_gallery',
+                    user= request.user['username']) }}">View all of {{ user.username }}'s media</a></p> 
+
+
     <a href={{ request.urlgen(
                    'mediagoblin.user_pages.atom_feed',
                    user=user.username) }}> atom feed</a>