diff options
| author | Christopher Allan Webber <cwebber@dustycloud.org> | 2011-07-03 08:31:35 -0500 |
|---|---|---|
| committer | Christopher Allan Webber <cwebber@dustycloud.org> | 2011-07-03 08:31:35 -0500 |
| commit | 8c9b1b2c14f68e559efb6f655e5d6ce082342f16 (patch) | |
| tree | f19b0df06667d15afbad7936add61f56a71ef319 /mediagoblin/templates | |
| parent | 5949be9ad686b161b6c63696d9b0f5f1cff932d9 (diff) | |
| parent | a0cf14fe7cbfe013a9973ad72a7bbd662656c9c9 (diff) | |
| download | mediagoblin-8c9b1b2c14f68e559efb6f655e5d6ce082342f16.tar.lz mediagoblin-8c9b1b2c14f68e559efb6f655e5d6ce082342f16.tar.xz mediagoblin-8c9b1b2c14f68e559efb6f655e5d6ce082342f16.zip | |
Merge remote branch 'remotes/gullydwarf-cfdv/b388+b391_edit_profile_link_on_user_page'
Diffstat (limited to 'mediagoblin/templates')
4 files changed, 8 insertions, 4 deletions
diff --git a/mediagoblin/templates/mediagoblin/edit/edit_profile.html b/mediagoblin/templates/mediagoblin/edit/edit_profile.html index 7efd0ee3..cf228977 100644 --- a/mediagoblin/templates/mediagoblin/edit/edit_profile.html +++ b/mediagoblin/templates/mediagoblin/edit/edit_profile.html @@ -21,8 +21,8 @@ {% block mediagoblin_content %} - <form action="{{ request.urlgen('mediagoblin.edit.profile', - user=user.username) }}" + <form action="{{ request.urlgen('mediagoblin.edit.profile') }}?username={{ + user['username'] }}" method="POST" enctype="multipart/form-data"> <div class="grid_6 prefix_1 suffix_1 edit_box form_box"> <h1>Editing {{ user['username'] }}'s profile</h1> 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/media.html b/mediagoblin/templates/mediagoblin/user_pages/media.html index 142082ea..85ba985c 100644 --- a/mediagoblin/templates/mediagoblin/user_pages/media.html +++ b/mediagoblin/templates/mediagoblin/user_pages/media.html @@ -95,7 +95,8 @@ {% include "mediagoblin/utils/prev_next.html" %} <h3>Sidebar content here!</h3> <p> - {% if media['uploader'] == request.user['_id'] %} + {% if media['uploader'] == request.user['_id'] or + request.user['is_admin'] %} <p> <a href="{{ request.urlgen('mediagoblin.edit.edit_media', user= media.uploader().username, diff --git a/mediagoblin/templates/mediagoblin/user_pages/user.html b/mediagoblin/templates/mediagoblin/user_pages/user.html index b884a1f5..da8db261 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" %} |