1 files changed, 5 insertions, 13 deletions
diff --git a/mediagoblin/templates/mediagoblin/user_pages/media.html b/mediagoblin/templates/mediagoblin/user_pages/media.html
index 92c01c48..c16e4c78 100644
--- a/mediagoblin/templates/mediagoblin/user_pages/media.html
+++ b/mediagoblin/templates/mediagoblin/user_pages/media.html
@@ -81,6 +81,7 @@
                                  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>
@@ -94,6 +95,8 @@
           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',
@@ -154,19 +157,8 @@
         {%- 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" %}