Style changes for media_uploader (now media_specs); removed margins from button_action buttons

2 files changed, 15 insertions, 17 deletions

diff --git a/mediagoblin/static/css/base.css b/mediagoblin/static/css/base.css
index 89988c8b..c1239abb 100644
--- a/mediagoblin/static/css/base.css
+++ b/mediagoblin/static/css/base.css
@@ -96,6 +96,7 @@ input, textarea {
 a.mediagoblin_logo{
   color: #fff;
   font-weight: bold;
+  margin-right: 8px;
 }
 
 .mediagoblin_footer {
@@ -123,7 +124,6 @@ a.mediagoblin_logo{
   border: 1px solid;
   border-color: #464646 #2B2B2B #252525;
   border-radius: 4px;
-  margin: 8px;
   padding: 3px 8px;
   text-decoration: none;
   font-style: normal;
@@ -285,24 +285,28 @@ textarea#comment_content {
 
 /* media detail */
 
-h2.media_title{
+h2.media_title {
   margin-bottom: 0px;
 }
 
-p.media_uploader{
+p.media_specs {
   font-size: 0.9em;
+  border-top: 1px solid #222;
+  border-bottom: 1px solid #222;
+  padding: 10px 0px;
+  color: #888;
 }
 
 /* icons */
 
-img.media_icon{
+img.media_icon {
   margin: 0 4px;
   vertical-align: sub;
 }
 
 /* navigation */
 
-.navigation_button{
+.navigation_button {
   width: 135px;
   display: block;
   float: left;
@@ -317,7 +321,7 @@ img.media_icon{
   margin: 0 0 20px
 }
 
-.navigation_left{
+.navigation_left {
   margin-right: 6px;
 }
 
diff --git a/mediagoblin/templates/mediagoblin/user_pages/media.html b/mediagoblin/templates/mediagoblin/user_pages/media.html
index 000b1b80..1a19443c 100644
--- a/mediagoblin/templates/mediagoblin/user_pages/media.html
+++ b/mediagoblin/templates/mediagoblin/user_pages/media.html
@@ -68,28 +68,22 @@
       {% autoescape False %}
         <p>{{ media.description_html }}</p>
       {% endautoescape %}
-      <p class="media_uploader">
+      <p class="media_specs">
         {% trans date=media.created.strftime("%Y-%m-%d") -%}
-          {{ date }}
+          Added on {{ date }}. Licensed under an <a href="#">X license</a>.
         {%- endtrans %}
-      </p>
-      
-      {% if media['uploader'] == request.user._id or 
+        {% if media['uploader'] == request.user._id or 
                                  request.user['is_admin'] %}
-        <p>
           {% set edit_url = request.urlgen('mediagoblin.edit.edit_media',
                                      user= media.get_uploader().username,
                                      media= media._id) %}
           <a class="button_action" href="{{ edit_url }}">{% trans %}Edit{% endtrans %}</a>
-        </p>
-        <p>
           {% set delete_url = request.urlgen('mediagoblin.user_pages.media_confirm_delete',
                                      user= media.get_uploader().username,
                                      media= media._id) %}
           <a class="button_action" href="{{ delete_url }}">{% trans %}Delete{% endtrans %}</a>
-        </p>
-      {% endif %}
-      
+        {% endif %}
+      </p>
       <h3>{% trans %}23 comments{% endtrans %} <div class="right_align"><a {% if not request.user %}href="{{ request.urlgen('mediagoblin.auth.login') }}"{% endif %}class="button_action" id="button_addcomment" title="Add a comment">{% trans %}Add one{% endtrans %}</a></div></h3>
       {# 0 comments. Be the first to add one! #}
       {% if request.user %}