Several small changes (reordering/restyling) for media descriptions and comments

diff --git a/mediagoblin/static/css/base.css b/mediagoblin/static/css/base.css
index 0dadacd09199e5e7a130a49bbca6a39667a81218..b026a8196a0d2b6e727af164b20e0bb1b4727539 100644 (file)
--- a/mediagoblin/static/css/base.css
+++ b/mediagoblin/static/css/base.css
@@ -245,8 +245,12 @@ text-align: center;
   font-size: 0.9em;
 }
 
+.comment_content {
+  margin-bottom: 30px;
+}
+
 .comment_content p {
-  margin-bottom: 4px;
+  margin-bottom: 0px;
 }
 
 /* media galleries */

diff --git a/mediagoblin/static/images/icon_comment.png b/mediagoblin/static/images/icon_comment.png
new file mode 100644 (file)
index 0000000..76860a9
Binary files /dev/null and b/mediagoblin/static/images/icon_comment.png differ

diff --git a/mediagoblin/templates/mediagoblin/user_pages/media.html b/mediagoblin/templates/mediagoblin/user_pages/media.html
index 11fa72cf86de52fc47779ac5e178115bf6fcfea9..17beffb26fb3806c1eb576b5e8ceb939e6cf80c9 100644 (file)
--- a/mediagoblin/templates/mediagoblin/user_pages/media.html
+++ b/mediagoblin/templates/mediagoblin/user_pages/media.html
@@ -47,28 +47,22 @@
       <h2 class="media_title">
         {{ media.title }}
       </h2>
-
+      {% autoescape False %}
+        <p>{{ media.description_html }}</p>
+      {% endautoescape %}
       <p class="media_uploader">
         {% trans date=media.created.strftime("%Y-%m-%d"),
                  user_url=request.urlgen(
                    'mediagoblin.user_pages.user_home',
                    user=media.uploader().username),
                  username=media.uploader().username -%}
-          Uploaded on {{ date }} by <a href="{{ user_url }}">{{ username }}</a>
+          By <a href="{{ user_url }}">{{ username }}</a> on {{ date }}
         {%- endtrans %}
       </p>
-
-      {% autoescape False %}
-        <p>{{ media.description_html }}</p>
-      {% endautoescape %}
-
-      <br />
-      <h3>{% trans %}Comments{% endtrans %}</h3>
-
+      <h3></h3>
       {% if request.user %}
         <p><a href="#comment_form">{% trans %}Post a comment{% endtrans %}</a></p>
       {% endif %}
-
       {% if comments %}
         {% for comment in comments %}
           {% set comment_author = comment.author() %}
@@ -79,14 +73,10 @@
               <div class="comment_wrapper" id="comment-{{ comment['_id'] }}">
            {% endif %}
 
-            <div class="comment_content">
-              {% autoescape False %}
-                {{ comment.content_html }}
+            <div class="comment_content">{% autoescape False %}{{ comment.content_html }}
               {% endautoescape %}
-            </div>
-
-            <div class="comment_author">&mdash; 
-              <a href="{{ request.urlgen('mediagoblin.user_pages.user_home',
+            <img src="{{ request.staticdirect('/images/icon_comment.png') }}" />
+            <a href="{{ request.urlgen('mediagoblin.user_pages.user_home',
                             user = comment_author['username']) }}">
                 {{ comment_author['username'] }}</a>
               {% trans %}at{% endtrans %} 
@@ -94,7 +84,7 @@
                       comment = comment['_id'],
                       user = media.uploader().username,
                       media = media._id) }}#comment">
-                {{ comment.created.strftime("%Y-%m-%d %I:%M%p") }}
+                {{ comment.created.strftime("%I:%M%p %Y-%m-%d") }}
               </a>
             </div>
           </div>