diff --git a/mediagoblin/static/css/base.css b/mediagoblin/static/css/base.css index 924d68b2..2dd276b0 100644 --- a/mediagoblin/static/css/base.css +++ b/mediagoblin/static/css/base.css @@ -254,26 +254,7 @@ li.media_thumbnail { /* icons */ -.iconFeed{ - width:16px; - height:16px; - background-image:url('../images/iconFeed.png'); - float:left; - margin-right:5px; -} - -.iconEdit{ - width:16px; - height:16px; - background-image:url('../images/iconEdit.png'); - float:left; - margin-right:5px; -} - -.iconDelete{ - width:16px; - height:16px; - background-image:url('../images/iconDelete.png'); - float:left; - margin-right:5px; +img.media_icon{ + margin:0 4px; + vertical-align:sub; } diff --git a/mediagoblin/templates/mediagoblin/user_pages/media.html b/mediagoblin/templates/mediagoblin/user_pages/media.html index 175e5c60..8ed25f9d 100644 --- a/mediagoblin/templates/mediagoblin/user_pages/media.html +++ b/mediagoblin/templates/mediagoblin/user_pages/media.html @@ -23,38 +23,32 @@ {# temporarily, an "image gallery" that isn't one really ;) #} {% if media %}
{{ media.description_html }}
+ {% endautoescape %}- Uploaded on + — uploaded on {{ "%4d-%02d-%02d"|format(media.created.year, media.created.month, media.created.day) }} by {{- media.uploader().username }} -
- - {% autoescape False %} -{{ media.description_html }}
- {% endautoescape %} - - {% if media['uploader'] == request.user['_id'] %} - - {% endif %} + +
This is a sidebar! Yay!
+Sidebar content here!
++ {% if media['uploader'] == request.user['_id'] %} +
edit
+
delete
+ {% endif %} +Sorry, no such media found.