diff options
| author | Jef van Schendel <mail@jefvanschendel.nl> | 2012-10-21 21:18:08 +0200 |
|---|---|---|
| committer | Jef van Schendel <mail@jefvanschendel.nl> | 2012-10-21 21:18:08 +0200 |
| commit | 9e443248aad8de07710f46aab05008107122b5ff (patch) | |
| tree | f6420ecf80eff21df22a124b865e847782a2bec0 | |
| parent | 30a8828f9b4efc4ff8026a375f11756ca76e412b (diff) | |
| download | mediagoblin-9e443248aad8de07710f46aab05008107122b5ff.tar.lz mediagoblin-9e443248aad8de07710f46aab05008107122b5ff.tar.xz mediagoblin-9e443248aad8de07710f46aab05008107122b5ff.zip | |
Move "Add collection" and "Change account settings" links to root.html
| -rw-r--r-- | mediagoblin/templates/mediagoblin/base.html | 1 | ||||
| -rw-r--r-- | mediagoblin/templates/mediagoblin/root.html | 9 | ||||
| -rw-r--r-- | mediagoblin/templates/mediagoblin/user_pages/user.html | 6 |
3 files changed, 9 insertions, 7 deletions
diff --git a/mediagoblin/templates/mediagoblin/base.html b/mediagoblin/templates/mediagoblin/base.html index b6ba8818..5620debd 100644 --- a/mediagoblin/templates/mediagoblin/base.html +++ b/mediagoblin/templates/mediagoblin/base.html @@ -64,7 +64,6 @@ <div class="dropdown_items"> {% if request.user and request.user.status == 'active' %} <a href="{{ request.urlgen('mediagoblin.submit.start') }}">{% trans %}+ Add media{% endtrans %}</a> - <a href="{{ request.urlgen('mediagoblin.submit.collection') }}">{% trans %}+ Add collection{% endtrans %}</a> {% endif %} <a href="{{ request.urlgen('mediagoblin.user_pages.user_home', user= request.user.username) }}">{% trans %}View your profile{% endtrans %}</a> <a class="button_action" href="{{ request.urlgen('mediagoblin.auth.logout') }}">{% trans %}Log out{% endtrans %}</a> diff --git a/mediagoblin/templates/mediagoblin/root.html b/mediagoblin/templates/mediagoblin/root.html index 5c6eb52f..99d3269f 100644 --- a/mediagoblin/templates/mediagoblin/root.html +++ b/mediagoblin/templates/mediagoblin/root.html @@ -21,6 +21,15 @@ {% block mediagoblin_content %} {% if request.user %} + {% if request.user.status == 'active' %} + <h1>{% trans %}Actions{% endtrans %}</h1> + <p><a href="{{ request.urlgen('mediagoblin.submit.collection') }}"> + {% trans %}Create new collection{% endtrans %} + </a></p> + <p><a href="{{ request.urlgen('mediagoblin.edit.account') }}"> + {%- trans %}Change account settings{% endtrans -%} + </a></p> + {% endif %} <h1>{% trans %}Explore{% endtrans %}</h1> {% else %} <h1>{% trans %}Hi there, welcome to this MediaGoblin site!{% endtrans %}</h1> diff --git a/mediagoblin/templates/mediagoblin/user_pages/user.html b/mediagoblin/templates/mediagoblin/user_pages/user.html index a58d745f..4f7b1208 100644 --- a/mediagoblin/templates/mediagoblin/user_pages/user.html +++ b/mediagoblin/templates/mediagoblin/user_pages/user.html @@ -119,12 +119,6 @@ </a> {% endif %} {% endif %} - - {% if request.user and (request.user._id == user._id) %} - <a href="{{ request.urlgen('mediagoblin.edit.account') }}"> - {%- trans %}Change account settings{% endtrans -%} - </a> - {% endif %} </div> {% if media_entries.count() %} |