aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCaleb Forbes Davis V <caldavis@gmail.com>2011-07-03 02:37:19 -0500
committerCaleb Forbes Davis V <caldavis@gmail.com>2011-07-03 02:37:19 -0500
commit42de4c5379cd313d470e09aa71b009e731ee2264 (patch)
treedc039a5f0cc45f4b8373a968d41d3fd3d018ff23
parent230e1bd7706b823bf0e57877ec22d17e4903b1a2 (diff)
downloadmediagoblin-42de4c5379cd313d470e09aa71b009e731ee2264.tar.lz
mediagoblin-42de4c5379cd313d470e09aa71b009e731ee2264.tar.xz
mediagoblin-42de4c5379cd313d470e09aa71b009e731ee2264.zip
moves edit profile link to user page
-rw-r--r--mediagoblin/templates/mediagoblin/root.html1
-rw-r--r--mediagoblin/templates/mediagoblin/user_pages/user.html4
2 files changed, 4 insertions, 1 deletions
diff --git a/mediagoblin/templates/mediagoblin/root.html b/mediagoblin/templates/mediagoblin/root.html
index e29abd51..5b744999 100644
--- a/mediagoblin/templates/mediagoblin/root.html
+++ b/mediagoblin/templates/mediagoblin/root.html
@@ -23,7 +23,6 @@
{% if request.user %}
<p>
<a href="{{ request.urlgen('mediagoblin.submit.start') }}">Submit an item</a>
- <a href="{{ request.urlgen('mediagoblin.edit.profile') }}">Edit profile</a>
</p>
{% else %}
<p>
diff --git a/mediagoblin/templates/mediagoblin/user_pages/user.html b/mediagoblin/templates/mediagoblin/user_pages/user.html
index 99e46a72..22defcbd 100644
--- a/mediagoblin/templates/mediagoblin/user_pages/user.html
+++ b/mediagoblin/templates/mediagoblin/user_pages/user.html
@@ -27,6 +27,10 @@
{% block mediagoblin_content -%}
{% if user %}
<h1>{{ user.username }}'s profile</h1>
+ {% if request.user == user.username or request.user['is_admin'] %}
+ <a href="{{ request.urlgen('mediagoblin.edit.profile') }}?username={{
+ user.username }}"> Edit</a>
+ {% endif %}
{% include "mediagoblin/utils/profile.html" %}