Make several small changes to wording and top bar links

This commit is contained in:
Jef van Schendel 2011-06-23 16:38:55 +02:00
parent d94b84b437
commit b9bce89f6f
3 changed files with 9 additions and 7 deletions

View File

@ -37,11 +37,9 @@
{% endblock %}{% block mediagoblin_header_title %}{% endblock %} {% endblock %}{% block mediagoblin_header_title %}{% endblock %}
<div class="mediagoblin_header_right"> <div class="mediagoblin_header_right">
{% if request.user %} {% if request.user %}
{{ request.user['username'] }}'s account
<a href="{{ request.urlgen('mediagoblin.user_pages.user_home', <a href="{{ request.urlgen('mediagoblin.user_pages.user_home',
user= request.user['username']) }}">home</a> user= request.user['username']) }}">
<a href="{{ request.urlgen('mediagoblin.user_pages.user_gallery', {{ request.user['username'] }}</a>'s account
user= request.user['username']) }}">gallery</a>
(<a href="{{ request.urlgen('mediagoblin.auth.logout') }}">logout</a>) (<a href="{{ request.urlgen('mediagoblin.auth.logout') }}">logout</a>)
{% else %} {% else %}
<a href="{{ request.urlgen('mediagoblin.auth.login') }}"> <a href="{{ request.urlgen('mediagoblin.auth.login') }}">

View File

@ -26,9 +26,9 @@
{% block mediagoblin_content -%} {% block mediagoblin_content -%}
{% if user %} {% if user %}
<h1>gallery for <a href="{{ request.urlgen( <h1><a href="{{ request.urlgen(
'mediagoblin.user_pages.user_home', '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" %} {% include "mediagoblin/utils/object_gallery.html" %}

View File

@ -26,12 +26,16 @@
{% block mediagoblin_content -%} {% block mediagoblin_content -%}
{% if user %} {% if user %}
<h1>User page for '{{ user.username }}'</h1> <h1>{{ user.username }}'s profile</h1>
{% include "mediagoblin/utils/profile.html" %} {% include "mediagoblin/utils/profile.html" %}
{% include "mediagoblin/utils/object_gallery.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( <a href={{ request.urlgen(
'mediagoblin.user_pages.atom_feed', 'mediagoblin.user_pages.atom_feed',
user=user.username) }}> atom feed</a> user=user.username) }}> atom feed</a>