{% block mediagoblin_head %}
<!--[if lte IE 8]><link rel="stylesheet"
href="{{ request.staticdirect('/extlib/leaflet/leaflet.ie.css') }}" /><![endif]-->
+
+ <link rel="stylesheet" type="text/css" href="{{ request.staticdirect('/css/lightbox.css') }}">
<script type="text/javascript"
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/lightbox.js') }}"></script>
+ {% template_hook("location_head") %}
{% template_hook("media_head") %}
{% endblock mediagoblin_head %}
{% block mediagoblin_content %}
<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>
</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
#}
{% if media.media_files.has_key('medium') %}
<a href="{{ request.app.public_store.file_url(
- media.media_files['original']) }}">
+ media.media_files['original']) }}" class="lightbox">
<img class="media_image"
src="{{ display_media }}"
alt="{% trans media_title=media.title -%}
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>
{% 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>
<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
{% 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">
{% 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_uploader.username,
+ user=media.get_actor.username,
media=media.slug_or_id,
comment=comment.id) }}">
{% trans %}Report{% endtrans %}</a>
{%- 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>
</p>
{%- endif %}
+ {%- if media.subtitle_files|count %}
+ <h3>{% trans %}Subtitles{% endtrans %}</h3>
+ <ul>
+ {%- for subtitle in media.subtitle_files %}
+ <li>
+ <!-- <a href="{{ request.app.public_store.file_url(subtitle.filepath) }}"> -->
+ <a href="{{ request.urlgen('mediagoblin.edit.edit_subtitles',
+ path=subtitle.filepath) }}">
+ {{- subtitle.name -}}
+ <!-- </a> -->
+ </li>
+ {%- endfor %}
+ </ul>
+ {%- endif %}
+ {%- if app_config['allow_subtitles']
+ and request.user
+ and (media.actor == request.user.id
+ or request.user.has_privilege('admin')) %}
+ {%- if not media.subtitle_files|count %}
+ <h3>{% trans %}Subtitles{% endtrans %}</h3>
+ {%- endif %}
+ <p>
+ <a href="{{ request.urlgen('mediagoblin.edit.subtitles',
+ user=media.get_actor.username,
+ media_id=media.id) }}">
+ {%- trans %}Add subtitle{% endtrans -%}
+ </a>
+ </p>
+ {%- endif %}
+
+ {% block mediagoblin_sidebar %}
+ {% endblock %}
+ {%- set model = media %}
+ {% template_hook("location_info") %}
{% template_hook("media_sideinfo") %}
</div><!--end media_sidebar-->
projects / mediagoblin.git / blobdiff