Merge remote-tracking branch 'upstream/master' into basic_auth

mediagoblin/config_spec.ini

@@ -134,7 +134,7 @@ spectrogram_fft_size = integer(default=4096)
 thumbnail_font = string(default=None)
 
 [media_type:mediagoblin.media_types.pdf]
-pdf_js = boolean(default=False)
+pdf_js = boolean(default=True)
 
 
 [celery]

mediagoblin/static/css/base.css

@@ -433,9 +433,12 @@ a.thumb_entry_title {
   padding: 8px;
 }
 
-.media_thumbnail img {
-  max-height: 135px;
-}
+/* For now, this is commented out since our thumbnails are actually 180px high.
+ *
+ * .media_thumbnail img {
+ *   max-height: 135px;
+ * }
+ */
 
 .thumb_entry_last {
   margin-right: 0px;

mediagoblin/templates/mediagoblin/media_displays/image.html

@@ -27,3 +27,20 @@
   {{ super() }}
   {% template_hook("image_sideinfo") %}
 {% endblock %}
+
+{% block mediagoblin_after_added_sidebar %}
+  {% 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 %}
+{% endblock %}
+

mediagoblin/templates/mediagoblin/user_pages/media.html

@@ -154,19 +154,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" %}