heckyel/mediagoblin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote branch 'remotes/schendjes/master'

Browse Source
This commit is contained in:
Christopher Allan Webber 2011-08-08 09:44:00 -05:00
commit dffbc4e099
2 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
mediagoblin/templates/mediagoblin/user_pages/media.html
View File

@ -103,11 +103,9 @@
<div class="grid_5 omega"> <div class="grid_5 omega">
{% include "mediagoblin/utils/prev_next.html" %} {% include "mediagoblin/utils/prev_next.html" %}
<h3>Sidebar content here!</h3>
<p>
{% if media['uploader'] == request.user['_id'] or {% if media['uploader'] == request.user['_id'] or
request.user['is_admin'] %} request.user['is_admin'] %}
<h3>Temporary button holder</h3>
<p> <p>
<a href="{{ request.urlgen('mediagoblin.edit.edit_media', <a href="{{ request.urlgen('mediagoblin.edit.edit_media',
user= media.uploader().username, user= media.uploader().username,
@ -120,7 +118,6 @@
class="media_icon" />delete class="media_icon" />delete
</p> </p>
{% endif %} {% endif %}
</p>
{% if media.tags %} {% if media.tags %}
{% include "mediagoblin/utils/tags.html" %} {% include "mediagoblin/utils/tags.html" %}

2
mediagoblin/templates/mediagoblin/utils/tags.html
View File

@ -17,7 +17,7 @@
#} #}
{% block tags_content -%} {% block tags_content -%}
<h4>Tags</h4> <h3>Tags</h3>
<ul class="mediaentry_tags"> <ul class="mediaentry_tags">
{% for tag in media.tags %} {% for tag in media.tags %}
<li class="tag"> <li class="tag">