diff options
| author | Jef van Schendel <jefvanschendel@gmail.com> | 2011-11-04 01:54:41 +0100 |
|---|---|---|
| committer | Jef van Schendel <jefvanschendel@gmail.com> | 2011-11-04 01:54:41 +0100 |
| commit | 157c60267e0c0e464f89779a190d8b2d11d5a4be (patch) | |
| tree | 5865506d7f8b1b9f977e2cd2df1089d778b467e0 | |
| parent | baf03e9bf93483c474b5fcba379452071a8ae029 (diff) | |
| download | mediagoblin-157c60267e0c0e464f89779a190d8b2d11d5a4be.tar.lz mediagoblin-157c60267e0c0e464f89779a190d8b2d11d5a4be.tar.xz mediagoblin-157c60267e0c0e464f89779a190d8b2d11d5a4be.zip | |
Several small changes (reordering/restyling) for media descriptions and comments
| -rw-r--r-- | mediagoblin/static/css/base.css | 6 | ||||
| -rw-r--r-- | mediagoblin/static/images/icon_comment.png | bin | 0 -> 283 bytes | |||
| -rw-r--r-- | mediagoblin/templates/mediagoblin/user_pages/media.html | 28 |
3 files changed, 14 insertions, 20 deletions
diff --git a/mediagoblin/static/css/base.css b/mediagoblin/static/css/base.css index 0dadacd0..b026a819 100644 --- 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 Binary files differnew file mode 100644 index 00000000..76860a92 --- /dev/null +++ b/mediagoblin/static/images/icon_comment.png diff --git a/mediagoblin/templates/mediagoblin/user_pages/media.html b/mediagoblin/templates/mediagoblin/user_pages/media.html index 11fa72cf..17beffb2 100644 --- 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">— - <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> |
