From 670eb52d6fb52ca5144698268efb11b5c0e78ec2 Mon Sep 17 00:00:00 2001
From: decabeza <alberto@decabeza.es>
Date: Thu, 11 Oct 2018 17:47:15 +0200
Subject: [PATCH] Improves styles for admin dashboard administrator tasks views

---
 .../administrator_tasks/_form.html.erb        | 44 ++++++++-----
 .../administrator_tasks/edit.html.erb         | 13 ++--
 .../administrator_tasks/index.html.erb        | 61 ++++++++++---------
 3 files changed, 65 insertions(+), 53 deletions(-)

diff --git a/app/views/admin/dashboard/administrator_tasks/_form.html.erb b/app/views/admin/dashboard/administrator_tasks/_form.html.erb
index e363c1a2a..989abe1fe 100644
--- a/app/views/admin/dashboard/administrator_tasks/_form.html.erb
+++ b/app/views/admin/dashboard/administrator_tasks/_form.html.erb
@@ -1,16 +1,28 @@
-<%= form_for administrator_task, url: { action: 'update' } do |f| %>
-
-  <div class="callout">
-    <h5><%= t("admin.dashboard.administrator_tasks.form.proposal", title: administrator_task.source.proposal.title) %></h5>
-    <p><%= t("admin.dashboard.administrator_tasks.form.request", title: administrator_task.source.action.title) %></p>
-    <%= link_to t("admin.dashboard.administrator_tasks.form.check_details"),
-                proposal_path(administrator_task.source.proposal),
-                target: '_blank' %>
-  </div>
-
-  <div class="row">
-    <div class="actions small-12 large-3 medium-3 column">
-      <%= f.submit(class: 'button expanded', value: t("admin.dashboard.administrator_tasks.form.solve")) %>
-    </div>
-  </div>
-<% end %>
+<div class="small-12 column">
+  <table>
+    <thead>
+      <tr>
+        <th><%= t("admin.dashboard.administrator_tasks.form.proposal") %></th>
+        <th><%= t("admin.dashboard.administrator_tasks.form.request") %></th>
+        <th class="text-right"><%= t("admin.actions.actions") %></th>
+      </tr>
+    </thead>
+    <tbody>
+      <tr>
+        <%= form_for administrator_task, url: { action: 'update' } do |f| %>
+          <td>
+            <%= link_to administrator_task.source.proposal.title,
+                        proposal_path(administrator_task.source.proposal), target: "_blank" %>
+          </td>
+          <td>
+            <%= administrator_task.source.action.title %>
+          </td>
+          <td class="text-right">
+            <%= f.submit(value: t("admin.dashboard.administrator_tasks.form.solve"),
+                         class: "button") %>
+          </td>
+        <% end %>
+      </tr>
+    </tbody>
+  </table>
+</div>
diff --git a/app/views/admin/dashboard/administrator_tasks/edit.html.erb b/app/views/admin/dashboard/administrator_tasks/edit.html.erb
index 0894c11af..aaae4582d 100644
--- a/app/views/admin/dashboard/administrator_tasks/edit.html.erb
+++ b/app/views/admin/dashboard/administrator_tasks/edit.html.erb
@@ -1,9 +1,8 @@
-<div class="row">
-  <div class="small-12 column">
-    <%= back_link_to admin_dashboard_administrator_tasks_path, t("admin.dashboard.administrator_tasks.edit.back") %>
+<div class="small-12 column">
+  <%= back_link_to admin_dashboard_administrator_tasks_path,
+                   t("admin.dashboard.administrator_tasks.edit.back") %>
 
-    <h1><%= t("admin.dashboard.administrator_tasks.edit.solving") %></h1>
-
-    <%= render 'form' %>
-  </div>
+  <h2><%= t("admin.dashboard.administrator_tasks.edit.solving") %></h2>
 </div>
+
+<%= render 'form' %>
diff --git a/app/views/admin/dashboard/administrator_tasks/index.html.erb b/app/views/admin/dashboard/administrator_tasks/index.html.erb
index bd6eb04b8..6a54d164c 100644
--- a/app/views/admin/dashboard/administrator_tasks/index.html.erb
+++ b/app/views/admin/dashboard/administrator_tasks/index.html.erb
@@ -1,34 +1,35 @@
-<h2 class="inline-block">
-  <%= t("admin.dashboard.administrator_tasks.index.title") %>
-</h2>
+<h2><%= t("admin.dashboard.administrator_tasks.index.title") %></h2>
 
-<table>
-  <thead>
-    <tr>
-      <th><%= t("admin.dashboard.administrator_tasks.index.source") %></th>
-      <th></th>
-    </tr>
-  </thead>
-
-  <tbody>
-    <% if @administrator_tasks.empty? %>
+<% if @administrator_tasks.any? %>
+  <table>
+    <thead>
       <tr>
-        <td colspan="100%"><%= t("admin.dashboard.administrator_tasks.index.no_records") %></td>
+        <th><%= t("admin.dashboard.administrator_tasks.index.source") %></th>
+        <th><%= t("admin.dashboard.administrator_tasks.index.resource") %></th>
+        <th class="text-right"><%= t("admin.actions.actions") %></th>
       </tr>
-    <% end %>
+    </thead>
 
-    <% @administrator_tasks.each do |task| %>
-      <tr id="<%= dom_id(task) %>">
-        <td>
-          <%= task.source.proposal.title %>:
-          <%= task.source.action.title %>
-        </td>
-        <td style="text-align: right">
-          <%= link_to t("admin.dashboard.administrator_tasks.index.solve"), 
-                      edit_admin_dashboard_administrator_task_path(task), 
-                      class: 'edit-banner button hollow' %>
-        </td>
-      </tr>
-    <% end %>
-  </tbody>
-</table>
+    <tbody>
+      <% @administrator_tasks.each do |task| %>
+        <tr id="<%= dom_id(task) %>">
+          <td>
+            <%= task.source.proposal.title %>
+          </td>
+          <td>
+            <%= task.source.action.title %>
+          </td>
+          <td class="text-right">
+            <%= link_to t("admin.dashboard.administrator_tasks.index.solve"),
+                        edit_admin_dashboard_administrator_task_path(task),
+                        class: "button hollow" %>
+          </td>
+        </tr>
+      <% end %>
+    </tbody>
+  </table>
+<% else %>
+  <div class="callout primary">
+    <%= t("admin.dashboard.administrator_tasks.index.no_records") %>
+  </div>
+<% end %>