diff options
Diffstat (limited to 'mediagoblin/templates/mediagoblin/user_pages/media.html')
| -rw-r--r-- | mediagoblin/templates/mediagoblin/user_pages/media.html | 46 |
1 files changed, 27 insertions, 19 deletions
diff --git a/mediagoblin/templates/mediagoblin/user_pages/media.html b/mediagoblin/templates/mediagoblin/user_pages/media.html index 0b2ae898..ce19717f 100644 --- a/mediagoblin/templates/mediagoblin/user_pages/media.html +++ b/mediagoblin/templates/mediagoblin/user_pages/media.html @@ -29,7 +29,10 @@ src="{{ request.staticdirect('/js/comment_show.js') }}"></script> <script type="text/javascript" src="{{ request.staticdirect('/js/keyboard_navigation.js') }}"></script> + <script type="text/javascript" + src="{{ request.staticdirect('/js/post_comment.js') }}"></script> + {% template_hook("location_head") %} {% template_hook("media_head") %} {% endblock mediagoblin_head %} {% block mediagoblin_content %} @@ -37,8 +40,8 @@ <p class="eleven columns context"> {%- trans user_url=request.urlgen( 'mediagoblin.user_pages.user_home', - user=media.get_uploader.username), - username=media.get_uploader.username -%} + user=media.get_actor.username), + username=media.get_actor.username -%} ❖ Browsing media by <a href="{{user_url}}">{{username}}</a> {%- endtrans -%} </p> @@ -47,8 +50,8 @@ </div> </div> <div class="media_pane eleven columns"> - <div class="media_image_container"> - {% block mediagoblin_media %} + {% block mediagoblin_media %} + <div class="media_image_container"> {% set display_media = request.app.public_store.file_url( media.get_display_media()[1]) %} {# if there's a medium file size, that means the medium size @@ -68,22 +71,23 @@ alt="{% trans media_title=media.title -%} Image for {{ media_title }}{% endtrans %}" /> {% endif %} - {% endblock %} - </div> + </div> + {% endblock %} <div class="row head foot"> <h2 class="media_title"> {{ media.title }} </h2> + {% template_hook("media_titleinfo") %} {% if request.user and - (media.uploader == request.user.id or + (media.actor == request.user.id or request.user.has_privilege('admin')) %} <div class="pull-right" style="padding-top:20px;"> {% set edit_url = request.urlgen('mediagoblin.edit.edit_media', - user= media.get_uploader.username, + user= media.get_actor.username, media_id=media.id) %} <a class="button_action" href="{{ edit_url }}">{% trans %}Edit{% endtrans %}</a> {% set delete_url = request.urlgen('mediagoblin.user_pages.media_confirm_delete', - user= media.get_uploader.username, + user= media.get_actor.username, media_id=media.id) %} <a class="button_action button_warning" href="{{ delete_url }}">{% trans %}Delete{% endtrans %}</a> </div> @@ -92,7 +96,7 @@ <p>{{ media.description_html }}</p> {% endautoescape %} </div> - {% if comments and request.user and request.user.has_privilege('commenter') %} + {% if request.user and request.user.has_privilege('commenter') %} <div class="media_comments"> {% if app_config['allow_comments'] %} <a @@ -108,13 +112,14 @@ {% endif %} {% if request.user %} <form action="{{ request.urlgen('mediagoblin.user_pages.media_post_comment', - user= media.get_uploader.username, + user= media.get_actor.username, media_id=media.id) }}" method="POST" id="form_comment"> {{ wtforms_util.render_divs(comment_form) }} <div class="form_submit_buttons"> <input type="submit" value="{% trans %}Add this comment{% endtrans %}" class="button_action" /> {{ csrf_token }} </div> + <input type="hidden" value="{{ request.urlgen('mediagoblin.user_pages.media_post_comment', user= media.get_actor.username, media_id=media.id) }}" id="postCommentURL" /> <input type="hidden" value="{{ request.urlgen('mediagoblin.user_pages.media_preview_comment') }}" id="previewURL" /> <input type="hidden" value="{% trans %}Comment Preview{% endtrans %}" id="previewText"/> </form> @@ -122,7 +127,8 @@ {% endif %} <ul style="list-style:none"> {% for comment in comments %} - {% set comment_author = comment.get_author %} + {% set comment_object = comment.comment() %} + {% set comment_author = comment_object.get_actor %} <li id="comment-{{ comment.id }}" {%- if pagination.active_id == comment.id %} class="comment_wrapper comment_active"> @@ -139,24 +145,24 @@ </a> <a href="{{ request.urlgen('mediagoblin.user_pages.media_home.view_comment', comment=comment.id, - user=media.get_uploader.username, + user=media.get_actor.username, media=media.slug_or_id) }}#comment" class="comment_whenlink"> - <span title='{{- comment.created.strftime("%I:%M%p %Y-%m-%d") -}}'> - {%- trans formatted_time=timesince(comment.created) -%} + <span title='{{- comment_object.created.strftime("%I:%M%p %Y-%m-%d") -}}'> + {%- trans formatted_time=timesince(comment_object.created) -%} {{ formatted_time }} ago {%- endtrans -%} </span></a>: </div> <div class="comment_content"> {% autoescape False -%} - {{ comment.content_html }} + {{ comment_object.content_html }} {%- endautoescape %} </div> <div> {% if app_config.allow_reporting %} <a href="{{ request.urlgen('mediagoblin.user_pages.media_home.report_comment', - user=media.get_uploader.username, + user=media.get_actor.username, media=media.slug_or_id, comment=comment.id) }}"> {% trans %}Report{% endtrans %}</a> @@ -214,14 +220,14 @@ {%- endif %} {%- if app_config['allow_attachments'] and request.user - and (media.uploader == request.user.id + and (media.actor == request.user.id or request.user.has_privilege('admin')) %} {%- if not media.attachment_files|count %} <h3>{% trans %}Attachments{% endtrans %}</h3> {%- endif %} <p> <a href="{{ request.urlgen('mediagoblin.edit.attachments', - user=media.get_uploader.username, + user=media.get_actor.username, media_id=media.id) }}"> {%- trans %}Add attachment{% endtrans -%} </a> @@ -231,6 +237,8 @@ {% block mediagoblin_sidebar %} {% endblock %} + {%- set model = media %} + {% template_hook("location_info") %} {% template_hook("media_sideinfo") %} </div><!--end media_sidebar--> |