From fa25991f0f2c200539f52e9ba2d912fcf0905628 Mon Sep 17 00:00:00 2001 From: luisramos0 Date: Tue, 16 Jul 2019 19:36:14 +0100 Subject: [PATCH] Fix problem in previous de-deface, move sections around in general settings page to keep order. No changes in code, just moving --- .../admin/general_settings/edit.html.haml | 24 +++++++++---------- 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/app/views/spree/admin/general_settings/edit.html.haml b/app/views/spree/admin/general_settings/edit.html.haml index ce32f1b5f2..04536bbf96 100644 --- a/app/views/spree/admin/general_settings/edit.html.haml +++ b/app/views/spree/admin/general_settings/edit.html.haml @@ -24,14 +24,6 @@ = 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)) %fieldset.legal.no-border-bottom %legend{:align => "center"}= t('.legal_settings') .field @@ -52,11 +44,14 @@ .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)) - %fieldset.number_localization.no-border-bottom - %legend{:align => "center"}= t('admin.number_localization.number_localization_settings') + %fieldset.embedded_shopfronts.no-border-bottom + %legend{:align => "center"}= t('admin.shopfront_settings.embedded_shopfront_settings') .field - = preference_field_tag(:enable_localized_number?, Spree::Config[:enable_localized_number?], type: Spree::Config.preference_type(:enable_localized_number?)) - = label_tag(:enable_localized_number?, t('admin.number_localization.enable_localized_number')) + tag(:br) + = 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 @@ -90,6 +85,11 @@ = label_tag :currency_thousands_separator, Spree.t(:currency_thousands_separator) %br/ = text_field_tag :currency_thousands_separator, Spree::Config[:currency_thousands_separator], :size => 3 + %fieldset.number_localization.no-border-bottom + %legend{:align => "center"}= t('admin.number_localization.number_localization_settings') + .field + = preference_field_tag(:enable_localized_number?, Spree::Config[:enable_localized_number?], type: Spree::Config.preference_type(:enable_localized_number?)) + = label_tag(:enable_localized_number?, t('admin.number_localization.enable_localized_number')) + tag(:br) .form-buttons.filter-actions.actions{"data-hook" => "buttons"} = button Spree.t('actions.update'), 'icon-refresh'