Merge remote-tracking branch 'gsoc2016/Subtitle-1'

[mediagoblin.git] / mediagoblin / templates / mediagoblin / user_pages / media.html

diff --git a/mediagoblin/templates/mediagoblin/user_pages/media.html b/mediagoblin/templates/mediagoblin/user_pages/media.html
index ed493390abfb74615ea02099577bf361d413b13a..b93da06ee0c232fd8bce1cae503f5e797c346bc9 100644 (file)
--- a/mediagoblin/templates/mediagoblin/user_pages/media.html
+++ b/mediagoblin/templates/mediagoblin/user_pages/media.html
@@ -25,14 +25,12 @@
 {% 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>
+          src="{{ request.staticdirect('/js/post_comment.js') }}"></script>
 
   {% template_hook("location_head") %}
   {% template_hook("media_head") %}
@@ -61,7 +59,7 @@
          #}
         {% if media.media_files.has_key('medium') %}
           <a href="{{ request.app.public_store.file_url(
-                        media.media_files['original']) }}" class="lightbox">
+                        media.media_files['original']) }}">
             <img class="media_image"
                  src="{{ display_media }}"
                  alt="{% trans media_title=media.title -%}
@@ -79,6 +77,7 @@
     <h2 class="media_title">
       {{ media.title }}
     </h2>
+    {% template_hook("media_titleinfo") %}
     {% if request.user and
           (media.actor == request.user.id or
            request.user.has_privilege('admin')) %}
@@ -120,6 +119,7 @@
             <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>
@@ -233,35 +233,7 @@
         </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.custom_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 %}
+    {% template_hook("subtitle_sidebar") %}
 
     {% block mediagoblin_sidebar %}
     {% endblock %}