From 83634c992a46add42c833836c7224e1da8f64d35 Mon Sep 17 00:00:00 2001
From: decabeza <alberto@decabeza.es>
Date: Thu, 11 Oct 2018 17:45:37 +0200
Subject: [PATCH] Improves styles for admin dashboard actions views

---
 .../admin/dashboard/actions/_form.html.erb    | 81 ++++++++-----------
 .../admin/dashboard/actions/edit.html.erb     | 17 ++--
 .../admin/dashboard/actions/index.html.erb    | 24 +++---
 .../admin/dashboard/actions/new.html.erb      | 17 ++--
 4 files changed, 61 insertions(+), 78 deletions(-)

diff --git a/app/views/admin/dashboard/actions/_form.html.erb b/app/views/admin/dashboard/actions/_form.html.erb
index 75cb982a0..478d3c169 100644
--- a/app/views/admin/dashboard/actions/_form.html.erb
+++ b/app/views/admin/dashboard/actions/_form.html.erb
@@ -1,88 +1,73 @@
 <%= render 'shared/errors' %>
 
-<div class="row">
+<div class="row expanded">
+  <div class="small-12 medium-4 column">
+    <%= f.label :action_type %>
+    <% ::Dashboard::Action.action_types.keys.each do |action_type_value| %>
+      <span class="margin-right">
+        <%= f.radio_button :action_type, action_type_value, label: false %>
+        <%= f.label "action_type_#{action_type_value}", t("admin.dashboard.actions.action_type.#{action_type_value}") %>
+      </span>
+    <% end %>
+  </div>
+
+  <div class="small-12 medium-4 column margin-top">
+    <%= f.check_box :request_to_administrators, label: ::Dashboard::Action.human_attribute_name(:request_to_administrators) %>
+  </div>
+
+  <div class="small-12 medium-4 column margin-top">
+    <%= f.check_box :active, label: ::Dashboard::Action.human_attribute_name(:active) %>
+  </div>
+</div>
+
+<div class="row expanded">
   <div class="small-12 column">
     <%= f.label :title %>
     <%= f.text_field :title, label: false %>
-  </div>
-</div>
 
-<div class="row">
-  <div class="small-12 column">
     <%= f.label :short_description %>
     <%= f.text_field :short_description, label: false %>
-  </div>
-</div>
 
-<div class="row">
-  <div class="small-12 column">
     <%= f.cktext_area :description,
                       ckeditor: { language: I18n.locale } %>
   </div>
 </div>
 
-<div class="row">
-  <div class="small-12 medium-3 column">
-    <%= f.label :action_type %>
-    <% ::Dashboard::Action.action_types.keys.each do |action_type_value| %>
-      <%= f.radio_button :action_type, action_type_value, label: false %>
-      <%= f.label "action_type_#{action_type_value}", t("admin.dashboard.actions.action_type.#{action_type_value}") %>
-      <br>
-    <% end %>
-  </div>
-</div>
-
-<div class="small-12 column">
-  <%= f.check_box :request_to_administrators, label: ::Dashboard::Action.human_attribute_name(:request_to_administrators) %>
-</div>
-
-<div class="row">
-  <div class="small-12 medium-4 large-4 column">
+<div class="row expanded margin-top">
+  <div class="small-12 medium-4 column">
     <%= f.label :day_offset %>
-    <%= f.number_field :day_offset, label: false, step: 1, min: 0 %>
     <p class="help-text"><%= t("admin.dashboard.actions.form.day_offset_help_text") %></p>
+    <%= f.number_field :day_offset, label: false, step: 1, min: 0 %>
   </div>
 
-  <div class="small-12 medium-4 large-4 column">
+  <div class="small-12 medium-4 column">
     <%= f.label :required_supports %>
-    <%= f.number_field :required_supports, label: false, step: 1, min: 0 %>
     <p class="help-text"><%= t("admin.dashboard.actions.form.required_supports_help_text") %></p>
+    <%= f.number_field :required_supports, label: false, step: 1, min: 0 %>
   </div>
 
-  <div class="small-12 medium-4 large-4 column">
+  <div class="small-12 medium-4 column">
     <%= f.label :order %>
+    <p class="help-text"><%= t("admin.dashboard.actions.form.order_help_text") %></p>
     <%= f.number_field :order, label: false, step: 1, min: 0 %>
   </div>
 </div>
 
-<div class="small-12 column">
-  <%= f.check_box :active, label: ::Dashboard::Action.human_attribute_name(:active) %>
-</div>
-
-<div class="small-12 column">
-  <hr>
-</div>
-
 <% if feature?(:allow_attached_documents) %>
   <div class="documents small-12 column">
+    <hr>
     <%= render 'documents/nested_documents', documentable: dashboard_action, f: f %>
+    <hr>
   </div>
 <% end %>
 
-<div class="small-12 column">
-  <hr>
-</div>
-
 <div class="links small-12 column">
   <%= render 'links/nested_links', linkable: dashboard_action, f: f %>
-</div>
-
-<div class="small-12 column">
   <hr>
 </div>
 
-<div class="row">
-  <div class="actions small-12 large-3 medium-3 column">
-    <%= f.submit(class: 'button expanded', value: t("admin.dashboard.actions.form.submit_button")) %>
+<div class="row expanded">
+  <div class="small-12 medium-6 large-4 column">
+    <%= f.submit(class: "button expanded", value: t("admin.dashboard.actions.form.submit_button")) %>
   </div>
 </div>
diff --git a/app/views/admin/dashboard/actions/edit.html.erb b/app/views/admin/dashboard/actions/edit.html.erb
index f38dcff2e..d3361524c 100644
--- a/app/views/admin/dashboard/actions/edit.html.erb
+++ b/app/views/admin/dashboard/actions/edit.html.erb
@@ -1,11 +1,8 @@
-<div class="row">
-  <div class="small-12 column">
-    <%= back_link_to admin_dashboard_actions_path, t("admin.dashboard.actions.edit.back") %>
-
-    <h1><%= t("admin.dashboard.actions.edit.editing") %></h1>
-
-    <%= form_for dashboard_action, url: { action: 'update' } do |f| %>
-      <%= render 'form', f: f %>
-    <% end %>
-  </div>
+<div class="small-12 column">
+  <%= back_link_to admin_dashboard_actions_path, t("admin.dashboard.actions.edit.back") %>
+  <h2><%= t("admin.dashboard.actions.edit.editing") %></h2>
 </div>
+
+<%= form_for dashboard_action, url: { action: 'update' } do |f| %>
+  <%= render 'form', f: f %>
+<% end %>
diff --git a/app/views/admin/dashboard/actions/index.html.erb b/app/views/admin/dashboard/actions/index.html.erb
index 980e561a1..660fa7398 100644
--- a/app/views/admin/dashboard/actions/index.html.erb
+++ b/app/views/admin/dashboard/actions/index.html.erb
@@ -10,9 +10,11 @@
     <tr>
       <th><%= t("admin.dashboard.actions.index.action_title") %></th>
       <th><%= t("admin.dashboard.actions.index.action_type") %></th>
-      <th class="text-right"><%= t("admin.dashboard.actions.index.required_supports") %></th>
       <th class="text-center"><%= t("admin.dashboard.actions.index.action_active") %></th>
-      <th></th>
+      <th class="text-center"><%= t("admin.dashboard.actions.index.day_offset") %></th>
+      <th class="text-center"><%= t("admin.dashboard.actions.index.required_supports") %></th>
+      <th class="text-center"><%= t("admin.dashboard.actions.index.order") %></th>
+      <th class="text-right"><%= t("admin.actions.actions") %></th>
     </tr>
   </thead>
 
@@ -27,16 +29,18 @@
       <tr id="<%= dom_id(action) %>">
         <td><%= action.title %></td>
         <td><%= t("admin.dashboard.actions.action_type.#{action.action_type}") %></td>
-        <td class="text-right"><%= number_with_delimiter(action.required_supports, delimiter: '.') %></td>
         <td class="text-center"><%= active_human_readable(action.active) %></td>
+        <td class="text-center"><%= number_with_delimiter(action.day_offset, delimiter: '.') %></td>
+        <td class="text-center"><%= number_with_delimiter(action.required_supports, delimiter: '.') %></td>
+        <td class="text-center"><%= action.order %></td>
         <td class="text-right">
-          <%= link_to t("admin.dashboard.actions.index.edit"), 
-                      edit_admin_dashboard_action_path(action), 
-                      class: 'edit-banner button hollow' %>
-          <%= link_to t("admin.dashboard.actions.index.delete"), 
-                      admin_dashboard_action_path(action), 
-                      method: :delete, 
-                      class: 'button hollow alert',
+          <%= link_to t("admin.dashboard.actions.index.edit"),
+                      edit_admin_dashboard_action_path(action),
+                      class: "button hollow" %>
+          <%= link_to t("admin.dashboard.actions.index.delete"),
+                      admin_dashboard_action_path(action),
+                      method: :delete,
+                      class: "button hollow alert",
                       data: { confirm: t("admin.actions.confirm") } %>
         </td>
       </tr>
diff --git a/app/views/admin/dashboard/actions/new.html.erb b/app/views/admin/dashboard/actions/new.html.erb
index 81b0098ea..adcb1a9a1 100644
--- a/app/views/admin/dashboard/actions/new.html.erb
+++ b/app/views/admin/dashboard/actions/new.html.erb
@@ -1,11 +1,8 @@
-<div class="dashboard-action-new row">
-  <div class="small-12 column">
-    <%= back_link_to admin_dashboard_actions_path, t("admin.dashboard.actions.new.back") %>
-
-    <h1><%= t("admin.dashboard.actions.new.creating") %></h1>
-
-    <%= form_for dashboard_action, url: { action: 'create' } do |f| %>
-      <%= render 'form', f: f %>
-    <% end %>
-  </div>
+<div class="small-12 column">
+  <%= back_link_to admin_dashboard_actions_path, t("admin.dashboard.actions.new.back") %>
+  <h2><%= t("admin.dashboard.actions.new.creating") %></h2>
 </div>
+
+<%= form_for dashboard_action, url: { action: 'create' } do |f| %>
+  <%= render 'form', f: f %>
+<% end %>