diff options
| author | Christopher Allan Webber <cwebber@dustycloud.org> | 2011-08-08 09:44:00 -0500 |
|---|---|---|
| committer | Christopher Allan Webber <cwebber@dustycloud.org> | 2011-08-08 09:44:00 -0500 |
| commit | dffbc4e0990c8f74bc8408c0ac94e0ad65b1d29e (patch) | |
| tree | ae42fb2b3884a14f9dcafdfe1623d34c691dbe9e | |
| parent | 3965f0f5fae2fdd3d1242a31806f8fe305d69273 (diff) | |
| parent | aaa46f5a156093c4295e4cb0d85eae72e28468ea (diff) | |
| download | mediagoblin-dffbc4e0990c8f74bc8408c0ac94e0ad65b1d29e.tar.lz mediagoblin-dffbc4e0990c8f74bc8408c0ac94e0ad65b1d29e.tar.xz mediagoblin-dffbc4e0990c8f74bc8408c0ac94e0ad65b1d29e.zip | |
Merge remote branch 'remotes/schendjes/master'
| -rw-r--r-- | mediagoblin/templates/mediagoblin/user_pages/media.html | 5 | ||||
| -rw-r--r-- | mediagoblin/templates/mediagoblin/utils/tags.html | 2 |
2 files changed, 2 insertions, 5 deletions
diff --git a/mediagoblin/templates/mediagoblin/user_pages/media.html b/mediagoblin/templates/mediagoblin/user_pages/media.html index a1382518..ddcf3ce9 100644 --- a/mediagoblin/templates/mediagoblin/user_pages/media.html +++ b/mediagoblin/templates/mediagoblin/user_pages/media.html @@ -103,11 +103,9 @@ <div class="grid_5 omega"> {% include "mediagoblin/utils/prev_next.html" %} - <h3>Sidebar content here!</h3> - - <p> {% if media['uploader'] == request.user['_id'] or request.user['is_admin'] %} + <h3>Temporary button holder</h3> <p> <a href="{{ request.urlgen('mediagoblin.edit.edit_media', user= media.uploader().username, @@ -120,7 +118,6 @@ class="media_icon" />delete </p> {% endif %} - </p> {% if media.tags %} {% include "mediagoblin/utils/tags.html" %} diff --git a/mediagoblin/templates/mediagoblin/utils/tags.html b/mediagoblin/templates/mediagoblin/utils/tags.html index ade41944..32db6e31 100644 --- a/mediagoblin/templates/mediagoblin/utils/tags.html +++ b/mediagoblin/templates/mediagoblin/utils/tags.html @@ -17,7 +17,7 @@ #} {% block tags_content -%} - <h4>Tags</h4> + <h3>Tags</h3> <ul class="mediaentry_tags"> {% for tag in media.tags %} <li class="tag"> |