From 8178f5388cdcd448875a653ceff7892118d7fb01 Mon Sep 17 00:00:00 2001 From: luisramos0 Date: Tue, 16 Jul 2019 14:27:32 +0100 Subject: [PATCH] Move legal settings deface to general settings view --- .../edit/legal_settings.html.haml.deface | 22 ------------------- .../admin/general_settings/edit.html.haml | 20 +++++++++++++++++ 2 files changed, 20 insertions(+), 22 deletions(-) delete mode 100644 app/overrides/spree/admin/general_settings/edit/legal_settings.html.haml.deface diff --git a/app/overrides/spree/admin/general_settings/edit/legal_settings.html.haml.deface b/app/overrides/spree/admin/general_settings/edit/legal_settings.html.haml.deface deleted file mode 100644 index 5cbe3a577f..0000000000 --- a/app/overrides/spree/admin/general_settings/edit/legal_settings.html.haml.deface +++ /dev/null @@ -1,22 +0,0 @@ -/ insert_after "fieldset.security" - -%fieldset.legal.no-border-bottom - %legend{:align => "center"}= t('.legal_settings') - .field - = label_tag(:footer_tos_url, t('.footer_tos_url')) + tag(:br) - = preference_field_tag(:footer_tos_url, Spree::Config[:footer_tos_url], type: Spree::Config.preference_type(:footer_tos_url)) - .field - = preference_field_tag(:enterprises_require_tos, Spree::Config[:enterprises_require_tos], :type => Spree::Config.preference_type(:enterprises_require_tos)) - = label_tag(:enterprises_require_tos, t('.enterprises_require_tos')) + tag(:br) - .field - = preference_field_tag(:cookies_consent_banner_toggle, Spree::Config[:cookies_consent_banner_toggle], :type => Spree::Config.preference_type(:cookies_consent_banner_toggle)) - = label_tag(:cookies_consent_banner_toggle, t('.cookies_consent_banner_toggle')) + tag(:br) - .field - = preference_field_tag(:cookies_policy_matomo_section, Spree::Config[:cookies_policy_matomo_section], :type => Spree::Config.preference_type(:cookies_policy_matomo_section)) - = label_tag(:cookies_policy_matomo_section, t('.cookies_policy_matomo_section')) + tag(:br) - .field - = preference_field_tag(:cookies_policy_ga_section, Spree::Config[:cookies_policy_ga_section], :type => Spree::Config.preference_type(:cookies_policy_ga_section)) - = label_tag(:cookies_policy_ga_section, t('.cookies_policy_ga_section')) + tag(:br) - .field - = label_tag(:privacy_policy_url, t('.privacy_policy_url')) + tag(:br) - = preference_field_tag(:privacy_policy_url, Spree::Config[:privacy_policy_url], type: Spree::Config.preference_type(:privacy_policy_url)) diff --git a/app/views/spree/admin/general_settings/edit.html.haml b/app/views/spree/admin/general_settings/edit.html.haml index 473e913de8..0425240f69 100644 --- a/app/views/spree/admin/general_settings/edit.html.haml +++ b/app/views/spree/admin/general_settings/edit.html.haml @@ -32,6 +32,26 @@ .field = label_tag(:embedded_shopfronts_whitelist, t('admin.shopfront_settings.embedded_shopfronts_whitelist')) + tag(:br) = preference_field_tag(:embedded_shopfronts_whitelist, Spree::Config[:embedded_shopfronts_whitelist], type: Spree::Config.preference_type(:embedded_shopfronts_whitelist)) + %fieldset.legal.no-border-bottom + %legend{:align => "center"}= t('.legal_settings') + .field + = label_tag(:footer_tos_url, t('.footer_tos_url')) + tag(:br) + = preference_field_tag(:footer_tos_url, Spree::Config[:footer_tos_url], type: Spree::Config.preference_type(:footer_tos_url)) + .field + = preference_field_tag(:enterprises_require_tos, Spree::Config[:enterprises_require_tos], :type => Spree::Config.preference_type(:enterprises_require_tos)) + = label_tag(:enterprises_require_tos, t('.enterprises_require_tos')) + tag(:br) + .field + = preference_field_tag(:cookies_consent_banner_toggle, Spree::Config[:cookies_consent_banner_toggle], :type => Spree::Config.preference_type(:cookies_consent_banner_toggle)) + = label_tag(:cookies_consent_banner_toggle, t('.cookies_consent_banner_toggle')) + tag(:br) + .field + = preference_field_tag(:cookies_policy_matomo_section, Spree::Config[:cookies_policy_matomo_section], :type => Spree::Config.preference_type(:cookies_policy_matomo_section)) + = label_tag(:cookies_policy_matomo_section, t('.cookies_policy_matomo_section')) + tag(:br) + .field + = preference_field_tag(:cookies_policy_ga_section, Spree::Config[:cookies_policy_ga_section], :type => Spree::Config.preference_type(:cookies_policy_ga_section)) + = label_tag(:cookies_policy_ga_section, t('.cookies_policy_ga_section')) + tag(:br) + .field + = label_tag(:privacy_policy_url, t('.privacy_policy_url')) + tag(:br) + = preference_field_tag(:privacy_policy_url, Spree::Config[:privacy_policy_url], type: Spree::Config.preference_type(:privacy_policy_url)) .omega.six.columns %fieldset.currency.no-border-bottom