From 6727583c0e4ccbf87c5fcfddb52a9b3533abfe13 Mon Sep 17 00:00:00 2001
From: decabeza <alberto@decabeza.es>
Date: Thu, 19 Jul 2018 17:56:36 +0200
Subject: [PATCH] Unifies styles and views for admin site content section

---
 app/views/admin/banners/index.html.erb        | 10 ++--
 .../site_customization/pages/_form.html.erb   | 52 +++++++++----------
 .../site_customization/pages/edit.html.erb    | 13 +++--
 .../site_customization/pages/index.html.erb   | 30 ++++++-----
 .../site_customization/pages/new.html.erb     | 11 ++--
 5 files changed, 57 insertions(+), 59 deletions(-)

diff --git a/app/views/admin/banners/index.html.erb b/app/views/admin/banners/index.html.erb
index bc1cec4e8..f25841420 100644
--- a/app/views/admin/banners/index.html.erb
+++ b/app/views/admin/banners/index.html.erb
@@ -1,5 +1,5 @@
 <%= link_to t("admin.banners.index.create"),
-              new_admin_banner_path, class: "button success float-right" %>
+              new_admin_banner_path, class: "button float-right" %>
 
 <h2 class="inline-block"><%= t("admin.banners.index.title") %></h2>
 
@@ -13,14 +13,14 @@
       <tr id="<%= dom_id(banner) %>">
         <th scope="col"><%= t("admin.banners.banner.post_started_at")%></th>
         <th scope="col"><%= t("admin.banners.banner.post_ended_at")%></th>
-        <th scope="col" class="text-center"><%= t("admin.actions.actions")%></th>
+        <th scope="col" class="small-4"><%= t("admin.actions.actions")%></th>
       </tr>
     </thead>
     <tbody>
       <tr>
         <td><%= banner.post_started_at %></td>
         <td><%= banner.post_ended_at %></td>
-        <td class="text-right">
+        <td>
           <div class="small-12 medium-6 column">
             <%= link_to t("admin.banners.index.edit"), edit_admin_banner_path(banner),
                         class: 'button hollow expanded' %>
@@ -32,11 +32,9 @@
           </div>
         </td>
       </tr>
-      <tr>
-        <th colspan="3" scope="col" class="text-center"><%= t("admin.banners.index.preview") %></th>
-      </tr>
       <tr>
         <td colspan="3">
+          <span class="help-text"><%= t("admin.banners.index.preview") %></span>
           <div class="banner" style="background-color:<%= banner.background_color %>">
             <%= link_to banner.target_url do %>
               <h2 style="color:<%= banner.font_color %>"><%= banner.title %></h2>
diff --git a/app/views/admin/site_customization/pages/_form.html.erb b/app/views/admin/site_customization/pages/_form.html.erb
index a8c2788b3..88c2288b1 100644
--- a/app/views/admin/site_customization/pages/_form.html.erb
+++ b/app/views/admin/site_customization/pages/_form.html.erb
@@ -13,34 +13,32 @@
     </div>
   <% end %>
 
-  <div class="row">
-    <div class="small-12 column">
-      <hr>
-    </div>
-    <div class="small-12 medium-5 column">
-      <h3><%= t("admin.site_customization.pages.form.options") %></h3>
-      <%= f.check_box :more_info_flag, class: "small" %>
-      <%= f.check_box :print_content_flag %>
-    </div>
-    <div class="small-12 medium-3 column">
-      <%= f.label :status %>
-      <% ::SiteCustomization::Page::VALID_STATUSES.each do |status| %>
-        <%= f.radio_button :status, status, label: false %>
-        <%= f.label "status_#{status}", t("admin.site_customization.pages.page.status_#{status}") %>
-        <br>
-      <% end %>
-    </div>
-    <div class="small-12 medium-4 column">
-      <%= f.label :locale %>
-      <%= f.select :locale, I18n.available_locales.map { |l| [name_for_locale(l), l.to_s] }, { include_blank: true, label: false } %>
-    </div>
-    <div class="small-12 medium-4 column">
-      <%= f.label :slug %>
-      <%= f.text_field :slug, label: false, size: 80, maxlength: 80 %>
-    </div>
+  <div class="small-12 column">
+    <hr>
+  </div>
+
+  <div class="small-12 medium-5 column">
+    <h3><%= t("admin.site_customization.pages.form.options") %></h3>
+    <%= f.check_box :more_info_flag, class: "small" %>
+    <%= f.check_box :print_content_flag %>
+  </div>
+  <div class="small-12 medium-3 column">
+    <%= f.label :status %>
+    <% ::SiteCustomization::Page::VALID_STATUSES.each do |status| %>
+      <%= f.radio_button :status, status, label: false %>
+      <%= f.label "status_#{status}", t("admin.site_customization.pages.page.status_#{status}") %>
+      <br>
+    <% end %>
+  </div>
+  <div class="small-12 medium-4 column">
+    <%= f.label :locale %>
+    <%= f.select :locale, I18n.available_locales.map { |l| [name_for_locale(l), l.to_s] }, { include_blank: true, label: false } %>
+  </div>
+  <div class="small-12 medium-4 column">
+    <%= f.label :slug %>
+    <%= f.text_field :slug, label: false, size: 80, maxlength: 80 %>
   </div>
 
-  <div class="row">
     <div class="small-12 column">
       <hr>
 
@@ -55,7 +53,7 @@
         <%= f.cktext_area :content, label: false, cols: 80, rows: 10, ckeditor: { language: I18n.locale } %>
       </div>
 
-      <div class="small-12 medium-6 large-4">
+      <div class="small-12 medium-6 large-3">
         <%= f.submit class: "button success expanded" %>
       </div>
     </div>
diff --git a/app/views/admin/site_customization/pages/edit.html.erb b/app/views/admin/site_customization/pages/edit.html.erb
index 9a2fc92ab..fed4b2b33 100644
--- a/app/views/admin/site_customization/pages/edit.html.erb
+++ b/app/views/admin/site_customization/pages/edit.html.erb
@@ -1,14 +1,13 @@
 <% provide :title do %>
-  Admin - <%= t("admin.menu.site_customization.pages") %> - <%= @page.title %>
+  <%= t("admin.header.title") %> - <%= t("admin.menu.site_customization.pages") %> - <%= @page.title %>
 <% end %>
 
 <%= back_link_to admin_site_customization_pages_path %>
 
-<%= button_to t("admin.site_customization.pages.index.delete"), admin_site_customization_page_path(@page), method: :delete, class: "button hollow alert small float-right" %>
+<div class="small-12 column">
+  <h2 class="inline-block"><%= t("admin.site_customization.pages.edit.title", page_title: @page.title) %></h2>
 
-<div class="row">
-  <div class="small-12 column">
-    <h2><%= t("admin.site_customization.pages.edit.title", page_title: @page.title) %></h2>
-    <%= render 'form' %>
-  </div>
+  <%= link_to t("admin.site_customization.pages.index.delete"), admin_site_customization_page_path(@page), method: :delete, class: "delete float-right" %>
 </div>
+
+<%= render 'form' %>
diff --git a/app/views/admin/site_customization/pages/index.html.erb b/app/views/admin/site_customization/pages/index.html.erb
index 897549caf..ab442d351 100644
--- a/app/views/admin/site_customization/pages/index.html.erb
+++ b/app/views/admin/site_customization/pages/index.html.erb
@@ -1,5 +1,5 @@
 <% provide :title do %>
-  Admin - <%= t("admin.menu.site_customization.pages") %>
+  <%= t("admin.header.title") %> - <%= t("admin.menu.site_customization.pages") %>
 <% end %>
 
 <%= link_to t("admin.site_customization.pages.index.create"), new_admin_site_customization_page_path, class: "button float-right" %>
@@ -16,7 +16,7 @@
         <th><%= t("admin.site_customization.pages.page.updated_at") %></th>
         <th><%= t("admin.site_customization.pages.page.status") %></th>
         <th><%= t("admin.site_customization.pages.page.locale") %></th>
-        <th colspan="2"><%= t("admin.actions.actions") %></th>
+        <th class="small-4"><%= t("admin.actions.actions") %></th>
       </tr>
     </thead>
     <tbody>
@@ -29,17 +29,21 @@
         <td><%= I18n.l page.created_at, format: :short %></td>
         <td><%= t("admin.site_customization.pages.page.status_#{page.status}") %></td>
         <td><%= name_for_locale(page.locale) %></td>
-        <td class="small">
-          <span class="icon-eye"></span>
-          <% if page.status == "published" %>
-            <%= link_to t("admin.site_customization.pages.index.see_page"), page.url, target: "_blank" %>
-          <% else %>
-            <%= t("admin.site_customization.pages.index.see_page") %>
-          <% end %>
-        </td>
-        <td class="small delete">
-          <span class="icon-x"></span>
-          <%= link_to t("admin.site_customization.pages.index.delete"), admin_site_customization_page_path(page), method: :delete, class: "delete" %>
+        <td>
+          <div class="small-6 column">
+            <% if page.status == "published" %>
+              <%= link_to t("admin.site_customization.pages.index.see_page"),
+                          page.url,
+                          target: "_blank",
+                          class: "button hollow expanded" %>
+            <% end %>
+          </div>
+          <div class="small-6 column end">
+            <%= link_to t("admin.site_customization.pages.index.delete"),
+                        admin_site_customization_page_path(page),
+                        method: :delete,
+                        class: "button hollow alert expanded" %>
+          </div>
         </td>
       </tr>
     <% end %>
diff --git a/app/views/admin/site_customization/pages/new.html.erb b/app/views/admin/site_customization/pages/new.html.erb
index 2d555c5b8..a059f0eb5 100644
--- a/app/views/admin/site_customization/pages/new.html.erb
+++ b/app/views/admin/site_customization/pages/new.html.erb
@@ -1,12 +1,11 @@
 <% provide :title do %>
-  Admin - <%= t("admin.menu.site_customization.pages") %> - <%= t("admin.site_customization.pages.new.title") %>
+  <%= t("admin.header.title") %> - <%= t("admin.menu.site_customization.pages") %> - <%= t("admin.site_customization.pages.new.title") %>
 <% end %>
 
 <%= back_link_to admin_site_customization_pages_path %>
 
-<div class="row">
-  <div class="small-12 column">
-    <h2><%= t("admin.site_customization.pages.new.title") %></h2>
-    <%= render 'form' %>
-  </div>
+<div class="small-12 column">
+  <h2><%= t("admin.site_customization.pages.new.title") %></h2>
 </div>
+
+<%= render 'form' %>