From 46e6bc6179e7b4d9e0d963c931e4ef1eb49ea3a2 Mon Sep 17 00:00:00 2001
From: Jean-Baptiste Bellet <jb.bellet@gmail.com>
Date: Mon, 1 Feb 2021 15:18:45 +0100
Subject: [PATCH] align payment method form

- enlarge the form to be "full size" (four + twelve = 16 columns)
---
 .../admin/payment_methods/_form.html.haml     | 26 +++++++++----------
 .../payment_methods/_providers.html.haml      |  4 +--
 2 files changed, 14 insertions(+), 16 deletions(-)

diff --git a/app/views/spree/admin/payment_methods/_form.html.haml b/app/views/spree/admin/payment_methods/_form.html.haml
index 7c2e1c4085..a205c96f3c 100644
--- a/app/views/spree/admin/payment_methods/_form.html.haml
+++ b/app/views/spree/admin/payment_methods/_form.html.haml
@@ -4,28 +4,28 @@
   .row
     = t '.deactivation_warning'
   .row
-    .alpha.three.columns
+    .alpha.four.columns
       = label_tag nil, t('.name')
-    .omega.eight.columns
+    .omega.twelve.columns
       = text_field :payment_method, :name, class: 'fullwidth'
   .row
-    .alpha.three.columns
+    .alpha.four.columns
       = label_tag nil, t('.description')
-    .omega.eight.columns
+    .omega.twelve.columns
       = text_area :payment_method, :description, {cols: 60, rows: 6, class: 'fullwidth'}
   - if spree_current_user.admin?
     .row
-      .alpha.three.columns
+      .alpha.four.columns
         = label_tag nil, t('.environment')
-      .omega.eight.columns
+      .omega.twelve.columns
         = collection_select(:payment_method, :environment, Rails.configuration.database_configuration.keys.sort, :to_s, :titleize, {}, {id: 'gtwy-env', class: 'select2 fullwidth'})
   .row
-    .alpha.three.columns
+    .alpha.four.columns
       = label_tag nil, t('.display')
-    .omega.eight.columns
+    .omega.twelve.columns
       = select(:payment_method, :display_on, Spree::PaymentMethod::DISPLAY.collect { |display| [t('.' + display.to_s), display == :both ? nil : display.to_s] }, {}, {class: 'select2 fullwidth'})
   .row
-    .alpha.three.columns
+    .alpha.four.columns
       = label_tag nil, t('.active')
     .two.columns
       = radio_button :payment_method, :active, true
@@ -37,14 +37,12 @@
       = label_tag nil, t('.active_no')
 
   .row
-    .alpha.three.columns
+    .alpha.four.columns
       = label(:payment_method, :tags, t('.tags'))
-    .omega.eight.columns
+    .omega.twelve.columns
       = hidden_field(:payment_method, :tag_list, "ng-value" => "paymentMethod.tag_list")
       %tags-with-translation#something{ object: "paymentMethod" }
 
   = render 'providers'
 
-  .row
-    .omega.eleven.columns
-      = render partial: 'spree/admin/shared/calculator_fields', locals: { f: f }
+  = render partial: 'spree/admin/shared/calculator_fields', locals: { f: f }
diff --git a/app/views/spree/admin/payment_methods/_providers.html.haml b/app/views/spree/admin/payment_methods/_providers.html.haml
index 2311eaa78f..aa1fce7fe8 100644
--- a/app/views/spree/admin/payment_methods/_providers.html.haml
+++ b/app/views/spree/admin/payment_methods/_providers.html.haml
@@ -1,8 +1,8 @@
 #provider-settings{ ng: { controller: "ProvidersCtrl" } }
   .row
-    .alpha.three.columns
+    .alpha.four.columns
       = label :payment_method, :type, t('.provider')
-    .omega.eight.columns
+    .omega.twelve.columns
       = collection_select(:payment_method, :type, @providers, :to_s, :clean_name, (!@object.persisted? ? { :selected => "Spree::PaymentMethod::Check"} : {}), { class: 'select2 fullwidth', 'provider-prefs-for' => "#{@object.id}"})
 
   %div{"ng-include" => "include_html" }