X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=mediagoblin%2Ftemplates%2Fmediagoblin%2Fuser_pages%2Fmedia.html;h=81e5013e88e812ab04caa2d696e168e4a7f1a4d6;hb=56c4ad89ebef32bd5a40c00d987811ce4501ce22;hp=08e9d8ea1d1ebed858e97a3a5a3c3ac62090b25b;hpb=744f1c83b9c94a82612c981ec56782f3db457357;p=mediagoblin.git

diff --git a/mediagoblin/templates/mediagoblin/user_pages/media.html b/mediagoblin/templates/mediagoblin/user_pages/media.html
index 08e9d8ea..81e5013e 100644
--- a/mediagoblin/templates/mediagoblin/user_pages/media.html
+++ b/mediagoblin/templates/mediagoblin/user_pages/media.html
@@ -72,7 +72,7 @@
     </h2>
     {% if request.user and
           (media.uploader == request.user.id or
-           request.user.is_admin) %}
+           request.user.has_privilege('admin')) %}
       {% set edit_url = request.urlgen('mediagoblin.edit.edit_media',
                                  user= media.get_uploader.username,
                                  media_id=media.id) %}
@@ -81,19 +81,23 @@
                                  user= media.get_uploader.username,
                                  media_id=media.id) %}
       <a class="button_action" href="{{ delete_url }}">{% trans %}Delete{% endtrans %}</a>
+
     {% endif %}
     {% autoescape False %}
       <p>{{ media.description_html }}</p>
     {% endautoescape %}
-    {% if comments %}
-      {% if app_config['allow_comments'] and auth %}
+    {% if comments and request.user and request.user.has_privilege('commenter') %}
+      {% 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',
@@ -104,7 +108,10 @@
             <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_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 %}
@@ -139,6 +146,15 @@
               {{ comment.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,
+                             media=media.slug_or_id,
+                             comment=comment.id) }}">
+                    {% trans %}Report{% endtrans %}</a>
+            {% endif %}
+          </div>
         </li>
       {% endfor %}
       </ul>
@@ -149,24 +165,13 @@
   <div class="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" %}
@@ -174,6 +179,10 @@
 
     {% 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" %}
@@ -193,7 +202,7 @@
     {%- if app_config['allow_attachments']
           and request.user
           and (media.uploader == request.user.id
-               or request.user.is_admin) %}
+               or request.user.has_privilege('admin')) %}
       {%- if not media.attachment_files|count %}
         <h3>{% trans %}Attachments{% endtrans %}</h3>
       {%- endif %}