From 1eba5b900508e7b9bfa9fa9ab4d557ad11dfd0cf Mon Sep 17 00:00:00 2001 From: nmaillat Date: Fri, 7 Aug 2020 09:34:14 +0200 Subject: [PATCH 1/5] PHRAS-3139 subview size and flaten attibute --- lib/conf.d/data_templates/DublinCore.xml | 25 ++++++++----- lib/conf.d/data_templates/en-simple.xml | 45 +++++++----------------- lib/conf.d/data_templates/fr-simple.xml | 45 +++++++----------------- lib/conf.d/data_templates/gs1.xml | 45 +++++++----------------- 4 files changed, 55 insertions(+), 105 deletions(-) diff --git a/lib/conf.d/data_templates/DublinCore.xml b/lib/conf.d/data_templates/DublinCore.xml index 83e7e139fc..479c15b708 100644 --- a/lib/conf.d/data_templates/DublinCore.xml +++ b/lib/conf.d/data_templates/DublinCore.xml @@ -5,12 +5,13 @@ {{datapathnoweb}}{{basename}}/subdefs - 1024 + 1280 resample - 72 + 300 yes 75 yes + yes screen image @@ -18,22 +19,25 @@ {{datapathnoweb}}{{basename}}/subdefs - 240 + 384 resample 72 yes 75 no + yes screen image - 480 + 640 72 + resample yes 75 + yes {{datapathnoweb}}{{basename}}/subdefs image no @@ -42,9 +46,11 @@ - 150 + 192 72 + resample yes + yes 75 {{datapathnoweb}}{{basename}}/subdefs image @@ -57,7 +63,7 @@ {{datapathnoweb}}{{basename}}/subdefs - 240 + 384 screen image no @@ -66,7 +72,7 @@ {{datapathnoweb}}{{basename}}/subdefs - 240 + 250 gif 150 screen @@ -147,7 +153,7 @@ {{datapathnoweb}}{{basename}}/subdefs image - 240 + 384 screen no @@ -177,7 +183,8 @@ image resample 72 - 240 + 380 + yes no screen diff --git a/lib/conf.d/data_templates/en-simple.xml b/lib/conf.d/data_templates/en-simple.xml index 81ce397169..f32ff7bcce 100644 --- a/lib/conf.d/data_templates/en-simple.xml +++ b/lib/conf.d/data_templates/en-simple.xml @@ -5,10 +5,11 @@ {{datapathnoweb}}{{basename}}/subdefs - 1024 + 1280 resample - 72 - no + 300 + yes + yes 75 yes screen @@ -18,10 +19,11 @@ {{datapathnoweb}}{{basename}}/subdefs - 240 + 384 resample 72 yes + yes 75 no screen @@ -33,6 +35,7 @@ 480 72 yes + yes 75 {{datapathnoweb}}{{basename}}/subdefs image @@ -42,9 +45,10 @@ - 150 + 192 72 yes + yes 75 {{datapathnoweb}}{{basename}}/subdefs image @@ -57,7 +61,7 @@ {{datapathnoweb}}{{basename}}/subdefs - 240 + 384 screen image no @@ -110,7 +114,7 @@ {{datapathnoweb}}{{basename}}/subdefs image - 240 + 384 screen no @@ -140,7 +144,8 @@ image resample 72 - 240 + 384 + yes no screen @@ -155,30 +160,6 @@ - - - {{datapathnoweb}}{{basename}}/subdefs - image - 240 - no - resample - 72 - screen - - - - - {{datapathnoweb}}{{basename}}/subdefs - image - 800 - no - resample - 72 - screen - - - - diff --git a/lib/conf.d/data_templates/fr-simple.xml b/lib/conf.d/data_templates/fr-simple.xml index 48d628cedd..6526d094b8 100644 --- a/lib/conf.d/data_templates/fr-simple.xml +++ b/lib/conf.d/data_templates/fr-simple.xml @@ -5,10 +5,11 @@ {{datapathnoweb}}{{basename}}/subdefs - 1024 + 1280 resample - 72 - no + 300 + yes + yes 75 yes screen @@ -18,10 +19,11 @@ {{datapathnoweb}}{{basename}}/subdefs - 240 + 384 resample 72 yes + yes 75 no screen @@ -30,9 +32,10 @@ - 480 + 640 72 yes + yes 75 {{datapathnoweb}}{{basename}}/subdefs image @@ -42,9 +45,10 @@ - 150 + 190 72 yes + yes 75 {{datapathnoweb}}{{basename}}/subdefs image @@ -57,7 +61,7 @@ {{datapathnoweb}}{{basename}}/subdefs - 240 + 384 screen image no @@ -140,7 +144,8 @@ image resample 72 - 240 + 384 + yes no screen @@ -155,30 +160,6 @@ - - - {{datapathnoweb}}{{basename}}/subdefs - image - 240 - no - resample - 72 - screen - - - - - {{datapathnoweb}}{{basename}}/subdefs - image - 800 - no - resample - 72 - screen - - - - diff --git a/lib/conf.d/data_templates/gs1.xml b/lib/conf.d/data_templates/gs1.xml index 3ace5361c3..edbbf398ca 100644 --- a/lib/conf.d/data_templates/gs1.xml +++ b/lib/conf.d/data_templates/gs1.xml @@ -5,10 +5,11 @@ {{datapathnoweb}}{{basename}}/subdefs - 1024 + 1280 resample - 72 + 300 no + yes 75 yes screen @@ -18,10 +19,11 @@ {{datapathnoweb}}{{basename}}/subdefs - 240 + 384 resample 72 yes + yes 75 no screen @@ -30,9 +32,10 @@ - 480 + 640 72 yes + yes 75 {{datapathnoweb}}{{basename}}/subdefs image @@ -42,9 +45,10 @@ - 150 + 192 72 yes + yes 75 {{datapathnoweb}}{{basename}}/subdefs image @@ -57,7 +61,7 @@ {{datapathnoweb}}{{basename}}/subdefs - 240 + 384 screen image no @@ -140,7 +144,8 @@ image resample 72 - 240 + 384 + yes no screen @@ -148,37 +153,13 @@ {{datapathnoweb}}{{basename}}/subdefs - flexpaper + pdf no screen - - - {{datapathnoweb}}{{basename}}/subdefs - image - 240 - no - resample - 72 - screen - - - - - {{datapathnoweb}}{{basename}}/subdefs - image - 800 - no - resample - 72 - screen - - - - From 30d0a5e490cc2b96e89e2a3031404c137675d61f Mon Sep 17 00:00:00 2001 From: nmaillat Date: Fri, 7 Aug 2020 09:57:35 +0200 Subject: [PATCH 2/5] PHRAS-3139 default configuration fields for geoloc --- lib/conf.d/configuration.yml | 12 ++++++------ lib/conf.d/data_templates/en-simple.xml | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/lib/conf.d/configuration.yml b/lib/conf.d/configuration.yml index 967446ee73..b0ee7a3dfc 100644 --- a/lib/conf.d/configuration.yml +++ b/lib/conf.d/configuration.yml @@ -293,12 +293,12 @@ geocoding-providers: #- # name: GpsCompositePosition # type: latlng - # - - # name: Longitude - # type: lon - # - - # name: Latitude - # type: lat + - + name: Longitude + type: lon + - + name: Latitude + type: lat geonames-field-mapping: true cityfields: 'City, Ville' provincefields: Province diff --git a/lib/conf.d/data_templates/en-simple.xml b/lib/conf.d/data_templates/en-simple.xml index f32ff7bcce..51393782a3 100644 --- a/lib/conf.d/data_templates/en-simple.xml +++ b/lib/conf.d/data_templates/en-simple.xml @@ -32,7 +32,7 @@ - 480 + 640 72 yes yes From 278e2cb300e70ac9529a40e81b1a43185bb818d7 Mon Sep 17 00:00:00 2001 From: nmaillat Date: Fri, 7 Aug 2020 10:43:02 +0200 Subject: [PATCH 3/5] PHRAS-3139 fix typo in config --- lib/conf.d/configuration.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/conf.d/configuration.yml b/lib/conf.d/configuration.yml index b0ee7a3dfc..633402269d 100644 --- a/lib/conf.d/configuration.yml +++ b/lib/conf.d/configuration.yml @@ -289,7 +289,7 @@ geocoding-providers: - 48.879162 default-zoom: 2 marker-default-zoom: 11 - position-fields: [] + position-fields: #- # name: GpsCompositePosition # type: latlng From 2a2e920a8282081defe09fb38aad16d55420bda0 Mon Sep 17 00:00:00 2001 From: nmaillat Date: Fri, 7 Aug 2020 13:44:28 +0200 Subject: [PATCH 4/5] default position and geonames fields --- lib/conf.d/configuration.yml | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/lib/conf.d/configuration.yml b/lib/conf.d/configuration.yml index 633402269d..2db18bebd2 100644 --- a/lib/conf.d/configuration.yml +++ b/lib/conf.d/configuration.yml @@ -285,24 +285,26 @@ geocoding-providers: speed: '2.2' curve: '1.42' default-position: - - 2.335062 - - 48.879162 + - 42.488 + - 3.779 default-zoom: 2 marker-default-zoom: 11 position-fields: #- # name: GpsCompositePosition # type: latlng - - - name: Longitude - type: lon - name: Latitude type: lat + - + name: Longitude + type: lon geonames-field-mapping: true cityfields: 'City, Ville' provincefields: Province countryfields: 'Country, Pays' + latitudefields: Latitude + longitudefields: Longitude video-editor: ChapterVttFieldName: VideoTextTrackChapters seekBackwardStep: 500 # in ms From 20f52af54022c3a0965efe98698092de77cf6a01 Mon Sep 17 00:00:00 2001 From: nmaillat Date: Fri, 7 Aug 2020 14:47:00 +0200 Subject: [PATCH 5/5] PHRAS-3139 set compression for thumbnail --- lib/conf.d/data_templates/DublinCore.xml | 4 ++-- lib/conf.d/data_templates/en-simple.xml | 23 +++++++++++++++++++---- lib/conf.d/data_templates/fr-simple.xml | 23 +++++++++++++++++++---- lib/conf.d/data_templates/gs1.xml | 19 +++++++++++++++++-- 4 files changed, 57 insertions(+), 12 deletions(-) diff --git a/lib/conf.d/data_templates/DublinCore.xml b/lib/conf.d/data_templates/DublinCore.xml index 479c15b708..8853948f56 100644 --- a/lib/conf.d/data_templates/DublinCore.xml +++ b/lib/conf.d/data_templates/DublinCore.xml @@ -23,7 +23,7 @@ resample 72 yes - 75 + 50 no yes screen @@ -51,7 +51,7 @@ resample yes yes - 75 + 50 {{datapathnoweb}}{{basename}}/subdefs image no diff --git a/lib/conf.d/data_templates/en-simple.xml b/lib/conf.d/data_templates/en-simple.xml index 51393782a3..6b0125af58 100644 --- a/lib/conf.d/data_templates/en-simple.xml +++ b/lib/conf.d/data_templates/en-simple.xml @@ -24,7 +24,7 @@ 72 yes yes - 75 + 50 no screen image @@ -49,7 +49,7 @@ 72 yes yes - 75 + 50 {{datapathnoweb}}{{basename}}/subdefs image no @@ -94,6 +94,21 @@ + + {{datapathnoweb}}{{basename}}/subdefs + 1 + 1280 + image + yes + screen + 72 + yes + yes + 75 + jpeg + + + {{datapathnoweb}}{{basename}}/subdefs 748 @@ -180,8 +195,8 @@ - - + + diff --git a/lib/conf.d/data_templates/fr-simple.xml b/lib/conf.d/data_templates/fr-simple.xml index 6526d094b8..0dc46ebfd4 100644 --- a/lib/conf.d/data_templates/fr-simple.xml +++ b/lib/conf.d/data_templates/fr-simple.xml @@ -24,7 +24,7 @@ 72 yes yes - 75 + 50 no screen image @@ -49,7 +49,7 @@ 72 yes yes - 75 + 50 {{datapathnoweb}}{{basename}}/subdefs image no @@ -94,6 +94,21 @@ + + {{datapathnoweb}}{{basename}}/subdefs + 1 + 1280 + image + yes + screen + 72 + yes + yes + 75 + jpeg + + + {{datapathnoweb}}{{basename}}/subdefs 748 @@ -180,8 +195,8 @@ - - + + diff --git a/lib/conf.d/data_templates/gs1.xml b/lib/conf.d/data_templates/gs1.xml index edbbf398ca..b1a6a7610d 100644 --- a/lib/conf.d/data_templates/gs1.xml +++ b/lib/conf.d/data_templates/gs1.xml @@ -24,7 +24,7 @@ 72 yes yes - 75 + 50 no screen image @@ -49,7 +49,7 @@ 72 yes yes - 75 + 50 {{datapathnoweb}}{{basename}}/subdefs image no @@ -94,6 +94,21 @@ + + {{datapathnoweb}}{{basename}}/subdefs + 1 + 1280 + image + yes + screen + 72 + yes + yes + 75 + jpeg + + + {{datapathnoweb}}{{basename}}/subdefs 748