From c0c5e9d7dd7efa47e2d73b025136cf3aa08bd9e0 Mon Sep 17 00:00:00 2001 From: luisramos0 Date: Tue, 16 Jul 2019 14:25:50 +0100 Subject: [PATCH] Move embedded_shopfronts deface to general settings view --- .../edit/embedded_shopfront_settings.html.haml.deface | 11 ----------- app/views/spree/admin/general_settings/edit.html.haml | 9 +++++++++ 2 files changed, 9 insertions(+), 11 deletions(-) delete mode 100644 app/overrides/spree/admin/general_settings/edit/embedded_shopfront_settings.html.haml.deface diff --git a/app/overrides/spree/admin/general_settings/edit/embedded_shopfront_settings.html.haml.deface b/app/overrides/spree/admin/general_settings/edit/embedded_shopfront_settings.html.haml.deface deleted file mode 100644 index 980a97a268..0000000000 --- a/app/overrides/spree/admin/general_settings/edit/embedded_shopfront_settings.html.haml.deface +++ /dev/null @@ -1,11 +0,0 @@ -/ insert_after "fieldset.security" - -%fieldset.embedded_shopfronts.no-border-bottom - %legend{:align => "center"}= t('admin.shopfront_settings.embedded_shopfront_settings') - .field - = preference_field_tag(:enable_embedded_shopfronts, Spree::Config[:enable_embedded_shopfronts], type: Spree::Config.preference_type(:enable_embedded_shopfronts)) - = label_tag(:enable_embedded_shopfronts, t('admin.shopfront_settings.enable_embedded_shopfronts')) + tag(:br) - .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)) - diff --git a/app/views/spree/admin/general_settings/edit.html.haml b/app/views/spree/admin/general_settings/edit.html.haml index 4f8a10f992..473e913de8 100644 --- a/app/views/spree/admin/general_settings/edit.html.haml +++ b/app/views/spree/admin/general_settings/edit.html.haml @@ -24,6 +24,15 @@ = label_tag(key, Spree.t(key) + ': ') + tag(:br) if type != :boolean = preference_field_tag(key, Spree::Config[key], :type => type) = label_tag(key, Spree.t(key)) + tag(:br) if type == :boolean + %fieldset.embedded_shopfronts.no-border-bottom + %legend{:align => "center"}= t('admin.shopfront_settings.embedded_shopfront_settings') + .field + = preference_field_tag(:enable_embedded_shopfronts, Spree::Config[:enable_embedded_shopfronts], type: Spree::Config.preference_type(:enable_embedded_shopfronts)) + = label_tag(:enable_embedded_shopfronts, t('admin.shopfront_settings.enable_embedded_shopfronts')) + tag(:br) + .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)) + .omega.six.columns %fieldset.currency.no-border-bottom %legend{:align => "center"}= Spree.t(:currency_settings)