From 52667b6ab0ac04b8f90b09d1485cf27dfbd73f06 Mon Sep 17 00:00:00 2001
From: Krzysztof Kalisz <krzysztof.kalisz@sparksolutions.co>
Date: Tue, 25 Sep 2018 14:26:48 +0200
Subject: [PATCH 1/3] Migrate to bootstrap 4

---
 .../add_pages_to_admin_sidebar_menu.rb        |  4 +-
 app/views/spree/admin/pages/_form.html.erb    | 46 +++++++++----------
 app/views/spree/admin/pages/index.html.erb    |  2 +-
 .../admin/shared/_pages_sidebar_menu.html.erb |  2 +-
 4 files changed, 27 insertions(+), 27 deletions(-)

diff --git a/app/overrides/add_pages_to_admin_sidebar_menu.rb b/app/overrides/add_pages_to_admin_sidebar_menu.rb
index 182e79d2..4e2a19a2 100644
--- a/app/overrides/add_pages_to_admin_sidebar_menu.rb
+++ b/app/overrides/add_pages_to_admin_sidebar_menu.rb
@@ -1,6 +1,6 @@
 Deface::Override.new(
-  virtual_path: 'spree/layouts/admin',
+  virtual_path: 'spree/admin/shared/_main_menu',
   name: 'pages_admin_sidebar_menu',
-  insert_bottom: '#main-sidebar',
+  insert_bottom: 'nav',
   partial: 'spree/admin/shared/pages_sidebar_menu'
 )
diff --git a/app/views/spree/admin/pages/_form.html.erb b/app/views/spree/admin/pages/_form.html.erb
index ec603c46..115e741f 100644
--- a/app/views/spree/admin/pages/_form.html.erb
+++ b/app/views/spree/admin/pages/_form.html.erb
@@ -4,7 +4,7 @@
 
 <%= form_for [:admin, resource] do |f| %>
   <div class="row" data-hook="admin_page_form_fields">
-    <div class="col-md-6" data-hook="admin_page_form_left">
+    <div class="col-lg-6" data-hook="admin_page_form_left">
       <div class="form-group">
         <%= f.label :title %> <span class="required">*</span>
         <%= f.text_field :title, class: 'form-control' %>
@@ -24,7 +24,7 @@
       </div>
     </div>
 
-    <div class="col-md-6" data-hook="admin_page_form_right">
+    <div class="col-lg-6" data-hook="admin_page_form_right">
       <div class="form-group">
         <%= f.label :layout %>
         <%= f.text_field :layout, class: 'form-control' %>
@@ -40,47 +40,47 @@
         <%= f.number_field :position, min: 0, class: 'form-control' %>
       </div>
 
-      <div class="checkbox">
-        <%= f.label :show_in_sidebar do %>
-          <%= f.check_box :show_in_sidebar %>
+      <div class="checkbox form-check">
+        <%= f.label :show_in_sidebar, { class: 'form-check-label' } do %>
+          <%= f.check_box :show_in_sidebar, { class: 'form-check-input' } %>
           <%= Spree::Page.human_attribute_name(:show_in_sidebar) %>
         <% end %>
       </div>
 
-      <div class="checkbox">
-        <%= f.label :show_in_header do %>
-          <%= f.check_box :show_in_header %>
+      <div class="checkbox form-check">
+        <%= f.label :show_in_header, { class: 'form-check-label' } do %>
+          <%= f.check_box :show_in_header, { class: 'form-check-input' } %>
           <%= Spree::Page.human_attribute_name(:show_in_header) %>
         <% end %>
       </div>
 
-      <div class="checkbox">
-        <%= f.label :show_in_footer do %>
-          <%= f.check_box :show_in_footer %>
+      <div class="checkbox form-check">
+        <%= f.label :show_in_footer, { class: 'form-check-label' } do %>
+          <%= f.check_box :show_in_footer, { class: 'form-check-input' } %>
           <%= Spree::Page.human_attribute_name(:show_in_footer) %>
         <% end %>
       </div>
 
-      <div class="checkbox">
-        <%= f.label :visible do %>
-          <%= f.check_box :visible %>
+      <div class="checkbox form-check">
+        <%= f.label :visible, { class: 'form-check-label' } do %>
+          <%= f.check_box :visible, { class: 'form-check-input' }%>
           <%= Spree::Page.human_attribute_name(:visible) %>
         <% end %>
       </div>
 
-      <div class="checkbox">
-        <%= f.label :render_layout_as_partial do %>
-          <%= f.check_box :render_layout_as_partial %>
+      <div class="checkbox form-check">
+        <%= f.label :render_layout_as_partial, { class: 'form-check-label' } do %>
+          <%= f.check_box :render_layout_as_partial, { class: 'form-check-input' } %>
           <%= Spree::Page.human_attribute_name(:render_layout_as_partial) %>
         <% end %>
       </div>
 
-      <div class="form-group">
+      <div class="form-group mt-3">
         <%= f.label :stores, plural_resource_name(Spree::Store) %>
         <% Spree::Store.all.each do |store| %>
-          <div class="checkbox">
-            <%= f.label store.name.downcase.to_sym do %>
-              <%= check_box_tag 'page[store_ids][]', store.id, @page.stores.include?(store) %>
+          <div class="checkbox form-check">
+            <%= f.label store.name.downcase.to_sym, { class: 'form-check-label' } do %>
+              <%= check_box_tag 'page[store_ids][]', store.id, @page.stores.include?(store), { class: 'form-check-input' } %>
               <%= store.name %>
             <% end %>
           </div>
@@ -90,7 +90,7 @@
   </div>
 
   <div class="row" data-hook="admin_page_form_meta">
-    <div class="col-md-12">
+    <div class="col-lg-12">
       <div class="form-group">
         <%= f.label :meta_title %>
         <%= f.text_field :meta_title, class: 'form-control' %>
@@ -112,7 +112,7 @@
   </div>
 
   <div class="row" data-hook="admin_page_form_additional_fields">
-    <div class="col-md-12"></div>
+    <div class="col-lg-12"></div>
   </div>
 
   <%= render "spree/admin/shared/#{resource.new_record? ? 'new' : 'edit'}_resource_links" %>
diff --git a/app/views/spree/admin/pages/index.html.erb b/app/views/spree/admin/pages/index.html.erb
index 30da5638..666089bd 100644
--- a/app/views/spree/admin/pages/index.html.erb
+++ b/app/views/spree/admin/pages/index.html.erb
@@ -31,7 +31,7 @@
           <td class="actions text-right" data-hook="admin_pages_index_row_actions">
             <%= link_to_edit page, no_text: true %>
             <% if defined?(SpreeGlobalize) %>
-              <%= link_to '', spree.admin_translations_path('page', page.id), class: 'btn btn-primary btn-sm icon icon-translate with-tip', data: { 'original-title' => Spree.t(:'i18n.translations') } %>
+              <%= link_to content_tag(:span, '', class: 'icon icon-translate'), spree.admin_translations_path('page', page.id), class: 'btn btn-primary btn-sm icon-link with-tip', data: { 'original-title' => Spree.t(:'i18n.translations') } %>
             <% end %>
             <%= link_to_delete page, no_text: true %>
           </td>
diff --git a/app/views/spree/admin/shared/_pages_sidebar_menu.html.erb b/app/views/spree/admin/shared/_pages_sidebar_menu.html.erb
index 865efc7e..b8532e3d 100644
--- a/app/views/spree/admin/shared/_pages_sidebar_menu.html.erb
+++ b/app/views/spree/admin/shared/_pages_sidebar_menu.html.erb
@@ -1,5 +1,5 @@
 <% if can? :admin, Spree::Page %>
-  <ul class="nav nav-sidebar">
+  <ul class="nav nav-sidebar border-bottom">
     <%= tab Spree::Page, url: spree.admin_pages_url, icon: 'leaf', label: plural_resource_name(Spree::Page) %>
   </ul>
 <% end %>

From af802cbf81d74611557ce1faeb511d7880b35a23 Mon Sep 17 00:00:00 2001
From: Krzysztof Kalisz <krzysztof.kalisz@sparksolutions.co>
Date: Tue, 25 Sep 2018 14:45:16 +0200
Subject: [PATCH 2/3] Update bootstrap4 classes in translations page

---
 app/views/spree/admin/translations/page.html.erb | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/views/spree/admin/translations/page.html.erb b/app/views/spree/admin/translations/page.html.erb
index 1ce9e67a..5e705e23 100644
--- a/app/views/spree/admin/translations/page.html.erb
+++ b/app/views/spree/admin/translations/page.html.erb
@@ -9,19 +9,19 @@
 <%= render :partial => 'spree/shared/error_messages', :locals => { :target => @page } %>
 
 <div class="row">
-  <fieldset class="no-border-top translations">
+  <fieldset class="w-100 no-border-top translations">
 
     <%= render 'settings' %>
     <%= form_for [:admin, @resource] do |f| %>
 
       <div class="row translations">
-        <div class="col-md-8">
+        <div class="col-lg-8">
           <%= form_for [:admin, @resource] do |f| %>
             <%= render 'form_fields', f: f %>
             <%= render 'spree/admin/shared/edit_resource_links' %>
           <% end %>
         </div>
-        <div class="col-md-4">
+        <div class="col-lg-4">
           <%= render 'fields' %>
         </div>
       </div>

From d409c5ed9f2fe8df01cf68af880f6ab0635232ae Mon Sep 17 00:00:00 2001
From: Krzysztof Kalisz <krzysztof.kalisz@sparksolutions.co>
Date: Tue, 25 Sep 2018 14:54:30 +0200
Subject: [PATCH 3/3] Fix icon button on translations page

---
 app/views/spree/admin/translations/page.html.erb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/spree/admin/translations/page.html.erb b/app/views/spree/admin/translations/page.html.erb
index 5e705e23..1bff1bff 100644
--- a/app/views/spree/admin/translations/page.html.erb
+++ b/app/views/spree/admin/translations/page.html.erb
@@ -3,7 +3,7 @@
 <% end %>
 
 <% content_for :page_actions do %>
-  <%= button_link_to Spree.t(:back_to_page_list), spree.admin_pages_path, :icon => 'icon-arrow-left' %>
+  <%= button_link_to Spree.t(:back_to_page_list), spree.admin_pages_path, :icon => 'arrow-left' %>
 <% end %>
 
 <%= render :partial => 'spree/shared/error_messages', :locals => { :target => @page } %>