diff options
Diffstat (limited to 'mediagoblin/templates/mediagoblin/user_pages/media.html')
| -rw-r--r-- | mediagoblin/templates/mediagoblin/user_pages/media.html | 40 |
1 files changed, 18 insertions, 22 deletions
diff --git a/mediagoblin/templates/mediagoblin/user_pages/media.html b/mediagoblin/templates/mediagoblin/user_pages/media.html index afc0d903..2086d3d6 100644 --- a/mediagoblin/templates/mediagoblin/user_pages/media.html +++ b/mediagoblin/templates/mediagoblin/user_pages/media.html @@ -29,33 +29,32 @@ media.get_display_media(media.media_files)) }}" /> </div> - <h2> - {{media.title}} + <h2 class="media_title"> + {{ media.title }} </h2> - {% autoescape False %} - <p>{{ media.description_html }}</p> - {% endautoescape %} - - <p> - {% trans date="%4d-%02d-%02d"|format( - media.created.year, - media.created.month, media.created.day), + <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> + Uploaded on {{ date }} by <a href="{{ user_url }}">{{ username }}</a> {%- endtrans %} </p> - <br /> + {% autoescape False %} + <p>{{ media.description_html }}</p> + {% endautoescape %} + + <br /> <h3>{% trans %}Comments{% endtrans %}</h3> + {% if request.user %} <form action="{{ request.urlgen('mediagoblin.user_pages.media_post_comment', user= media.uploader().username, media=media._id) }}" method="POST"> - {{ wtforms_util.render_field_div(comment_form.comment_content) }} + {{ wtforms_util.render_divs(comment_form) }} <div class="form_submit_buttons"> <input type="submit" value="{% trans %}Post comment!{% endtrans %}" class="button" /> </div> @@ -71,26 +70,23 @@ {% else %} <div class="comment_wrapper" id="comment-{{ comment['_id'] }}"> {% endif %} + <div class="comment_content"> {% autoescape False %} {{ comment.content_html }} {% endautoescape %} </div> + <div class="comment_author">— <a href="{{ request.urlgen('mediagoblin.user_pages.user_home', - user = comment_author['username']) }}"> - {{ comment_author['username'] }}</a> {% trans %}at{% endtrans %} - <!--</div> - <div class="comment_datetime">--> + user = comment_author['username']) }}"> + {{ comment_author['username'] }}</a> + {% trans %}at{% endtrans %} <a href="{{ request.urlgen('mediagoblin.user_pages.media_home.view_comment', comment = comment['_id'], user = media.uploader().username, media = media._id) }}#comment"> - {{ "%4d-%02d-%02d %02d:%02d"|format(comment.created.year, - comment.created.month, - comment.created.day, - comment.created.hour, - comment.created.minute) }} + {{ comment.created.strftime("%Y-%m-%d %I:%M%p") }} </a> </div> </div> |