Merge branch 'dz-fix-appearance-preview' into 'master'

Fix admin appearance settings preview

Render appearance settings preview in devise layout instead of implementing it 2 times. 

See merge request !4792

3 files changed, 9 insertions, 28 deletions

diff --git a/app/controllers/admin/appearances_controller.rb b/app/controllers/admin/appearances_controller.rb
index 26cf74e4849..4b0ec54b3f4 100644
--- a/app/controllers/admin/appearances_controller.rb
+++ b/app/controllers/admin/appearances_controller.rb
@@ -5,6 +5,7 @@ class Admin::AppearancesController < Admin::ApplicationController
   end
 
   def preview
+    render 'preview', layout: 'devise'
   end
 
   def create
diff --git a/app/views/admin/appearances/_form.html.haml b/app/views/admin/appearances/_form.html.haml
index d88f3ad314d..dc083e50178 100644
--- a/app/views/admin/appearances/_form.html.haml
+++ b/app/views/admin/appearances/_form.html.haml
@@ -46,7 +46,7 @@
         Maximum file size is 1MB. Pages are optimized for a 72x72 px header logo
 
   .form-actions
-    = f.submit 'Save', class: 'btn btn-save'
+    = f.submit 'Save', class: 'btn btn-save append-right-10'
     - if @appearance.persisted?
       = link_to 'Preview last save', preview_admin_appearances_path, class: 'btn', target: '_blank'
 
diff --git a/app/views/admin/appearances/preview.html.haml b/app/views/admin/appearances/preview.html.haml
index dd4a64e80bc..6c51639b840 100644
--- a/app/views/admin/appearances/preview.html.haml
+++ b/app/views/admin/appearances/preview.html.haml
@@ -1,29 +1,9 @@
 - page_title "Preview | Appearance"
-%h3.page-title
-  Appearance settings - Preview
-%hr
+.login-box
+  .login-heading
+    %h3 Existing user? Sign in
+  %form
+    = text_field_tag :login, nil, class: "form-control top", placeholder: "Username or Email"
+    = password_field_tag :password, nil, class: "form-control bottom", placeholder: "Password"
+    = button_tag "Sign in", class: "btn-create btn"
 
-.ui-box
-  .title
-    Sign-in page
-  %div
-    .login-page
-      .container
-        .content
-          .login-title
-            %h1= brand_title
-      %hr
-      .container
-        .content
-          .row
-            .col-sm-7
-              .brand-image
-                = brand_image
-              .brand_text
-                = brand_text
-            .col-sm-4
-              .login-box
-                %h3.page-title Sign in
-                = text_field_tag :login, nil, class: "form-control top", placeholder: "Username or Email"
-                = password_field_tag :password, nil, class: "form-control bottom", placeholder: "Password"
-                = button_tag "Sign in", class: "btn-create btn"