From bc34b471d56896acf8d97c403a7f05e24be63c07 Mon Sep 17 00:00:00 2001 From: Mike Linksvayer Date: Fri, 12 Oct 2012 14:03:40 -0700 Subject: [PATCH 001/639] Mention necessary operation per http://lists.mediagoblin.org/pipermail/devel/2012-April/000173.html --- docs/source/siteadmin/media-types.rst | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/docs/source/siteadmin/media-types.rst b/docs/source/siteadmin/media-types.rst index 5653217f..2f2eadbc 100644 --- a/docs/source/siteadmin/media-types.rst +++ b/docs/source/siteadmin/media-types.rst @@ -43,6 +43,11 @@ video media types, then the list would look like this:: media_types = mediagoblin.media_types.image, mediagoblin.media_types.video +After adding new media types to ``mediagoblin_local.ini``, you need to run:: + + ./bin/gmg dbupdate + + How does MediaGoblin decide which media type to use for a file? =============================================================== From 200433dc38a2139462e0331be36ee49a80a81a12 Mon Sep 17 00:00:00 2001 From: Mike Linksvayer Date: Fri, 12 Oct 2012 15:05:29 -0700 Subject: [PATCH 002/639] mention dependencies, dbupdate, refer to docs http://issues.mediagoblin.org/ticket/470 --- mediagoblin.ini | 2 ++ 1 file changed, 2 insertions(+) diff --git a/mediagoblin.ini b/mediagoblin.ini index f10a452f..31877742 100644 --- a/mediagoblin.ini +++ b/mediagoblin.ini @@ -16,6 +16,8 @@ email_debug_mode = true allow_registration = true ## Uncomment this to turn on video or enable other media types +## You may have to install dependencies, and will have to run ./bin/dbupdate +## See http://docs.mediagoblin.org/siteadmin/media-types.html for details. # media_types = mediagoblin.media_types.image, mediagoblin.media_types.video ## Uncomment this to put some user-overriding templates here From 24d310e46fc237eccfc7859ae273ddaaf04e2fbc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tryggvi=20Bj=C3=B6rgvinsson?= Date: Thu, 8 Nov 2012 00:14:17 +0000 Subject: [PATCH 003/639] A template fix to show the EXIF DateTimeOriginal (as creation date). Added as a configurable option 'original_date_visible' (default false). Since the EXIF tag is a string with the date formatted as 'YYYY:MM:DD HH:MM:SS' the fix slices the string to give only the date and then replaces : by - to conform with the 'Added on' date. --- mediagoblin/config_spec.ini | 1 + mediagoblin/templates/mediagoblin/user_pages/media.html | 8 ++++++++ 2 files changed, 9 insertions(+) diff --git a/mediagoblin/config_spec.ini b/mediagoblin/config_spec.ini index 17df2819..7b56f768 100644 --- a/mediagoblin/config_spec.ini +++ b/mediagoblin/config_spec.ini @@ -58,6 +58,7 @@ csrf_cookie_name = string(default='mediagoblin_csrftoken') push_urls = string_list(default=list()) exif_visible = boolean(default=False) +original_date_visible = boolean(default=False) geolocation_map_visible = boolean(default=False) # Theming stuff diff --git a/mediagoblin/templates/mediagoblin/user_pages/media.html b/mediagoblin/templates/mediagoblin/user_pages/media.html index ac15dd2f..5932174d 100644 --- a/mediagoblin/templates/mediagoblin/user_pages/media.html +++ b/mediagoblin/templates/mediagoblin/user_pages/media.html @@ -153,6 +153,14 @@

Added on

{{ date }}

{%- endtrans %} + {% if app_config['original_date_visible'] + and media.media_data.exif_all is defined + and 'EXIF DateTimeOriginal' in media.media_data.exif_all %} + {% trans date=media.media_data.exif_all['EXIF DateTimeOriginal']['printable'][:10].replace(':','-') -%} +

Created on

+

{{ date }}

+ {%- endtrans %} + {% endif %} {% if media.tags %} {% include "mediagoblin/utils/tags.html" %} {% endif %} From 5e5b8acfec73ad7f12eb685ff81c6962aee655f1 Mon Sep 17 00:00:00 2001 From: LotusEcho Date: Mon, 24 Sep 2012 16:15:34 -0400 Subject: [PATCH 004/639] Don't put checkbox text on separate line (#475) Manually render the "notify me" checkbox line in the account settings to not put the form label as a heading but in the same line as the checkbox. Edit forms.py to use the label attribute for the caption. Original patch modified by Sebastian Spaeth to 1) not translate the checkbox label in the template, it is translated in forms.py already. 2) Simplify the HTML, manually constructing the