From c333522b47f6c9901963ed0b73cd86d125b1176e Mon Sep 17 00:00:00 2001
From: decabeza <alberto@decabeza.es>
Date: Fri, 20 Oct 2017 10:40:07 +0200
Subject: [PATCH] improves styles for admin activity views

---
 app/helpers/admin_helper.rb            |  2 +-
 app/views/admin/_menu.html.erb         |  2 +-
 app/views/admin/activity/show.html.erb | 87 +++++++++++++++-----------
 config/locales/en/admin.yml            |  1 +
 config/locales/es/admin.yml            |  3 +-
 5 files changed, 55 insertions(+), 40 deletions(-)

diff --git a/app/helpers/admin_helper.rb b/app/helpers/admin_helper.rb
index e508cf813..37a186ff1 100644
--- a/app/helpers/admin_helper.rb
+++ b/app/helpers/admin_helper.rb
@@ -29,7 +29,7 @@ module AdminHelper
   end
 
   def menu_profiles?
-    ["administrators", "organizations", "officials", "moderators", "valuators", "managers", "users"].include? controller_name
+    ["administrators", "organizations", "officials", "moderators", "valuators", "managers", "users", "activity"].include? controller_name
   end
 
   def menu_banners?
diff --git a/app/views/admin/_menu.html.erb b/app/views/admin/_menu.html.erb
index f2af2c116..b573f6b41 100644
--- a/app/views/admin/_menu.html.erb
+++ b/app/views/admin/_menu.html.erb
@@ -115,7 +115,7 @@
           <%= link_to t("admin.menu.officials"), admin_officials_path %>
         </li>
 
-        <li <%= "class=active" if controller_name == "moderators" %>>
+        <li <%= "class=active" if controller_name == "moderators" || controller_name == "activity" %>>
           <%= link_to t('admin.menu.moderators'), admin_moderators_path%>
         </li>
 
diff --git a/app/views/admin/activity/show.html.erb b/app/views/admin/activity/show.html.erb
index 92ff3e26a..dd4cee125 100644
--- a/app/views/admin/activity/show.html.erb
+++ b/app/views/admin/activity/show.html.erb
@@ -1,43 +1,56 @@
+<%= back_link_to admin_moderators_path %>
+
 <h2><%= t("admin.activity.show.title") %></h2>
 
 <%= render 'shared/filter_subnav', i18n_namespace: "admin.activity.show" %>
 
-<h3><%= page_entries_info @activity %></h3>
+<% if @activity.any? %>
+  <h3 class="margin"><%= page_entries_info @activity %></h3>
 
-<table>
-  <tr>
-    <th><%= t("admin.activity.show.type") %></th>
-    <th><%= t("admin.activity.show.action") %></th>
-    <th class="text-left"><%= t("admin.activity.show.content") %></th>
-    <th><%= t("admin.activity.show.by") %></th>
-  </tr>
-  <% @activity.each do |activity| %>
-    <tr id="<%= dom_id(activity) %>">
-      <td>
-        <%= activity.actionable_type.constantize.model_name.human %><br>
-        <span class="date"><%= l activity.actionable.created_at.to_date %></span>
-      </td>
-      <td>
-        <%= t("admin.activity.show.actions.#{activity.action}") %><br>
-        <span class="date"><%= l activity.created_at.to_date %></span>
-      </td>
-      <td>
-        <% case activity.actionable_type %>
-        <% when "User" %>
-          <%= activity.actionable.username %> (<%= activity.actionable.email %>)
-        <% when "Comment" %>
-          <%= activity.actionable.body %>
-        <% else %>
-          <strong><%= activity.actionable.title %></strong>
-          <br>
-          <div class="proposal-description">
-            <%= activity.actionable.description %>
-          </div>
-        <% end %>
-      </td>
-      <td><%= activity.user.name %> (<%= activity.user.email %>)</td>
-    </tr>
-  <% end %>
-</table>
+  <table>
+    <thead>
+      <tr>
+        <th scope="col"><%= t("admin.activity.show.type") %></th>
+        <th scope="col"><%= t("admin.activity.show.action") %></th>
+        <th scope="col" class="small-6"><%= t("admin.activity.show.content") %></th>
+        <th scope="col"><%= t("admin.activity.show.by") %></th>
+      </tr>
+    </thead>
+    <tbody>
+      <% @activity.each do |activity| %>
+        <tr id="<%= dom_id(activity) %>">
+          <td class="align-top">
+            <strong><%= activity.actionable_type.constantize.model_name.human %></strong><br>
+            <span class="date"><%= l activity.actionable.created_at.to_date %></span>
+          </td>
+          <td class="align-top">
+            <%= t("admin.activity.show.actions.#{activity.action}") %><br>
+            <span class="date"><%= l activity.created_at.to_date %></span>
+          </td>
+          <td class="align-top">
+            <% case activity.actionable_type %>
+            <% when "User" %>
+              <%= activity.actionable.username %> (<%= activity.actionable.email %>)
+            <% when "Comment" %>
+              <%= activity.actionable.body %>
+            <% else %>
+              <strong><%= activity.actionable.title %></strong>
+              <br>
+              <div class="proposal-description">
+                <%= activity.actionable.description %>
+              </div>
+            <% end %>
+          <td class="align-top">
+            <%= activity.user.name %> (<%= activity.user.email %>)
+          </td>
+        </tr>
+      <% end %>
+    </tbody>
+  </table>
 
-<%= paginate @activity %>
+  <%= paginate @activity %>
+<% else %>
+  <div class="callout primary">
+    <%= t("admin.activity.show.no_activity") %>
+  </div>
+<% end %>
diff --git a/config/locales/en/admin.yml b/config/locales/en/admin.yml
index ff1d83cd9..d92dcbf05 100644
--- a/config/locales/en/admin.yml
+++ b/config/locales/en/admin.yml
@@ -62,6 +62,7 @@ en:
           on_users: Users
         title: Moderator activity
         type: Type
+        no_activity: There ares no moderators activity.
     budgets:
       index:
         title: Participatory budgets
diff --git a/config/locales/es/admin.yml b/config/locales/es/admin.yml
index af3ef5830..0fe04d2be 100644
--- a/config/locales/es/admin.yml
+++ b/config/locales/es/admin.yml
@@ -60,8 +60,9 @@ es:
           on_debates: Debates
           on_proposals: Propuestas
           on_users: Usuarios
-        title: Actividad de los Moderadores
+        title: Actividad de Moderadores
         type: Tipo
+        no_activity: No hay actividad de moderadores.
     budgets:
       index:
         title: Presupuestos participativos