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

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

Browse Source
This commit is contained in:
Jef van Schendel 2011-11-04 01:54:41 +01:00
parent baf03e9bf9
commit 157c60267e
3 changed files with 14 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
mediagoblin/static/css/base.css
View File

@ -245,8 +245,12 @@ text-align: center;
font-size: 0.9em; font-size: 0.9em;
} }
.comment_content {
margin-bottom: 30px;
}
.comment_content p { .comment_content p {
margin-bottom: 4px; margin-bottom: 0px;
} }
/* media galleries */ /* media galleries */

BIN
mediagoblin/static/images/icon_comment.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 283 B

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

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