From: Caleb Forbes Davis V Date: Sun, 3 Jul 2011 07:37:19 +0000 (-0500) Subject: moves edit profile link to user page X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=42de4c5379cd313d470e09aa71b009e731ee2264;p=mediagoblin.git moves edit profile link to user page --- 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 %}

Submit an item - Edit profile

{% else %}

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 %}

{{ user.username }}'s profile

+ {% if request.user == user.username or request.user['is_admin'] %} + Edit + {% endif %} {% include "mediagoblin/utils/profile.html" %}