From c955efc247c408bca503474caa07f78698044dff Mon Sep 17 00:00:00 2001 From: Juerg Hunziker Date: Thu, 10 Aug 2017 11:48:35 +0200 Subject: [PATCH 1/2] possibility to define default content in theme options --- .../repaircafe/components/eventlist/default.htm | 6 +++++- plugins/liip/repaircafe/lang/de/lang.php | 3 +++ themes/repair-cafe/config/fields.yaml | 12 ++++++++++++ themes/repair-cafe/pages/cafe.htm | 13 +++++++++++-- 4 files changed, 31 insertions(+), 3 deletions(-) diff --git a/plugins/liip/repaircafe/components/eventlist/default.htm b/plugins/liip/repaircafe/components/eventlist/default.htm index 2d01d1dc..bc5256b7 100644 --- a/plugins/liip/repaircafe/components/eventlist/default.htm +++ b/plugins/liip/repaircafe/components/eventlist/default.htm @@ -16,7 +16,11 @@

{{ event.title ? event.title : event.cafe.title }}

{% else %}
- {{ event.cafe.title }} + {% if event.cafe.logo is not empty %} + {{ event.cafe.title }} + {% elseif this.theme.repair_cafe_default_logo is not empty %} + {{ event.cafe.title }} + {% endif%}

{{ event.cafe.title }}{{ event.title ? ': ' ~ event.title }}

{% partial __SELF__ ~ '::date' start=event.start end=event.end %} diff --git a/plugins/liip/repaircafe/lang/de/lang.php b/plugins/liip/repaircafe/lang/de/lang.php index b0816e45..51386586 100644 --- a/plugins/liip/repaircafe/lang/de/lang.php +++ b/plugins/liip/repaircafe/lang/de/lang.php @@ -100,12 +100,15 @@ 'fields' => [ 'site_title' => 'Seitentitel', 'contact_email' => 'Kontakt Email-Adresse', + 'repair_cafe_default_image' => 'Standard Repair Café Bild', + 'repair_cafe_default_logo' => 'Standard Repair Café Logo', 'social_facebook' => 'Facebook Page', 'social_twitter' => 'Twitter Page', 'social_googleplus' => 'Google+ Page', 'tab' => [ 'general' => 'Allgemein', 'social_media' => 'Social Media', + 'default_content' => 'Standardcontent', ], ], ], diff --git a/themes/repair-cafe/config/fields.yaml b/themes/repair-cafe/config/fields.yaml index 694d2553..fd28a508 100644 --- a/themes/repair-cafe/config/fields.yaml +++ b/themes/repair-cafe/config/fields.yaml @@ -10,6 +10,18 @@ tabs: span: full type: text tab: 'liip.repaircafe::lang.theme.fields.tab.general' + repair_cafe_default_image: + label: 'liip.repaircafe::lang.theme.fields.repair_cafe_default_image' + span: left + type: mediafinder + mode: image + tab: 'liip.repaircafe::lang.theme.fields.tab.default_content' + repair_cafe_default_logo: + label: 'liip.repaircafe::lang.theme.fields.repair_cafe_default_logo' + span: right + type: mediafinder + mode: image + tab: 'liip.repaircafe::lang.theme.fields.tab.default_content' social_facebook: label: 'liip.repaircafe::lang.theme.fields.social_facebook' span: full diff --git a/themes/repair-cafe/pages/cafe.htm b/themes/repair-cafe/pages/cafe.htm index 4e925ffb..ea539ffb 100644 --- a/themes/repair-cafe/pages/cafe.htm +++ b/themes/repair-cafe/pages/cafe.htm @@ -11,12 +11,21 @@ == {% put page %}
- {% partial 'components/page-header' title=cafeDetail.cafe.title header_image_url=cafeDetail.cafe.image.path %} + {% if cafeDetail.cafe.image is not empty %} + {% set header_image_url = cafeDetail.cafe.image.path %} + {% elseif this.theme.repair_cafe_default_image is not empty %} + {% set header_image_url = this.theme.repair_cafe_default_image|media %} + {% endif%} + {% partial 'components/page-header' title=cafeDetail.cafe.title header_image_url=header_image_url %}
- {{ cafeDetail.cafe.title }} + {% if cafeDetail.cafe.logo is not empty %} + {{ cafeDetail.cafe.title }} + {% elseif this.theme.repair_cafe_default_logo is not empty %} + {{ cafeDetail.cafe.title }} + {% endif%}
{{ cafeDetail.cafe.description|raw }} From d520836af310d1d24d8077d64511f40c7e7493b8 Mon Sep 17 00:00:00 2001 From: Juerg Hunziker Date: Thu, 10 Aug 2017 11:56:09 +0200 Subject: [PATCH 2/2] define missing else case --- themes/repair-cafe/pages/cafe.htm | 2 ++ 1 file changed, 2 insertions(+) diff --git a/themes/repair-cafe/pages/cafe.htm b/themes/repair-cafe/pages/cafe.htm index ea539ffb..136d05f2 100644 --- a/themes/repair-cafe/pages/cafe.htm +++ b/themes/repair-cafe/pages/cafe.htm @@ -15,6 +15,8 @@ {% set header_image_url = cafeDetail.cafe.image.path %} {% elseif this.theme.repair_cafe_default_image is not empty %} {% set header_image_url = this.theme.repair_cafe_default_image|media %} + {% else %} + {% set header_image_url = null %} {% endif%} {% partial 'components/page-header' title=cafeDetail.cafe.title header_image_url=header_image_url %}