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 %}
- <p class="context">
+<div class="row foot">
+ <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>
- {% include "mediagoblin/utils/prev_next.html" %}
- <div class="media_pane">
- <div class="media_image_container">
- {% block mediagoblin_media %}
+ <div class="five columns">
+ {% include "mediagoblin/utils/prev_next.html" %}
+ </div>
+</div>
+ <div class="media_pane eleven columns">
+ {% 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
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
- request.user.is_admin) %}
+ (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" href="{{ delete_url }}">{% trans %}Delete{% endtrans %}</a>
+ <a class="button_action button_warning" href="{{ delete_url }}">{% trans %}Delete{% endtrans %}</a>
+ </div>
{% endif %}
{% autoescape False %}
<p>{{ media.description_html }}</p>
{% endautoescape %}
- {% if comments %}
+ </div>
+ {% if request.user and request.user.has_privilege('commenter') %}
+ <div class="media_comments">
{% if app_config['allow_comments'] %}
<a
{% if not request.user %}
- href="{{ request.urlgen('mediagoblin.auth.login') }}"
+ href="{{ request.urlgen('mediagoblin.auth.login') }}?next={{
+ request.base_url|urlencode }}"
{% endif %}
class="button_action" id="button_addcomment" title="Add a comment">
{% trans %}Add a comment{% endtrans %}
</a>
+ {% include "mediagoblin/utils/comment-subscription.html" %}
+
{% 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>
+ <div id="comment_preview"></div>
{% 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">
</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_actor.username,
+ media=media.slug_or_id,
+ comment=comment.id) }}">
+ {% trans %}Report{% endtrans %}</a>
+ {% endif %}
+ </div>
</li>
{% endfor %}
</ul>
{{ render_pagination(request, pagination,
media.url_for_self(request.urlgen)) }}
+ {% else %}
+ <div class="empty_space no_background">
{% endif %}
</div>
- <div class="media_sidebar">
+
+ </div>
+
+
+ <div class="five columns media_sidebar">
<h3>{% trans %}Added{% endtrans %}</h3>
<p><span title="{{ media.created.strftime("%I:%M%p %Y-%m-%d") }}">
- {%- trans formatted_time=timesince(media.created) -%}
+ {%- trans formatted_time=timesince(media.created) -%}
{{ formatted_time }} ago
{%- endtrans -%}
</span></p>
- {% if app_config['original_date_visible'] %}
- {% set original_date = media.media_manager.get_original_date() %}
-
- {% if original_date %}
- <h3>{% trans %}Created{% endtrans %}</h3>
-
- <p><span title="{{ original_date.strftime("%I:%M%p %Y-%m-%d") }}">
- {%- trans formatted_time=timesince(original_date) -%}
- {{ formatted_time }} ago
- {%- endtrans -%}
- </span></p>
- {%- endif %}
- {% endif %}
+ {% block mediagoblin_after_added_sidebar %}
+ {% endblock %}
{% if media.tags %}
{% include "mediagoblin/utils/tags.html" %}
{% include "mediagoblin/utils/collections.html" %}
+ {% if app_config.allow_reporting %}
+ {% include "mediagoblin/utils/report.html" %}
+ {% endif %}
+
{% include "mediagoblin/utils/license.html" %}
{% include "mediagoblin/utils/exif.html" %}
{%- endif %}
{%- if app_config['allow_attachments']
and request.user
- and (media.uploader == request.user.id
- or request.user.is_admin) %}
+ 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>
</p>
{%- endif %}
-
- {% template_hook("media_sideinfo") %}
+ {% template_hook("subtitle_sidebar") %}
{% block mediagoblin_sidebar %}
{% endblock %}
- </div>
+ {%- set model = media %}
+ {% template_hook("location_info") %}
+ {% template_hook("media_sideinfo") %}
+
+ </div><!--end media_sidebar-->
+
<div class="clear"></div>
{% endblock %}
projects / mediagoblin.git / blobdiff