From 352f3fa2f9ff21b5a17d9a1cda26505e3e100e4f Mon Sep 17 00:00:00 2001
From: Alberto Garcia Cabeza <alberto@decabeza.es>
Date: Thu, 16 Jun 2016 18:07:13 +0200
Subject: [PATCH] Resolves conflicts and improves styles for stats

---
 .../admin/stats/direct_messages.html.erb      | 38 +++++-------
 .../stats/proposal_notifications.html.erb     | 60 +++++++++----------
 app/views/admin/stats/show.html.erb           | 21 ++++---
 3 files changed, 52 insertions(+), 67 deletions(-)

diff --git a/app/views/admin/stats/direct_messages.html.erb b/app/views/admin/stats/direct_messages.html.erb
index 17532f00f..432152db5 100644
--- a/app/views/admin/stats/direct_messages.html.erb
+++ b/app/views/admin/stats/direct_messages.html.erb
@@ -2,30 +2,20 @@
 
 <h2><%= t("admin.stats.direct_messages.title")%></h2>
 
-<div class="stats row-full">
-  <div class="row">
-    <div class="small-12 column">
-
-      <div class="row stats-numbers">
-        <div class="small-12 medium-3 column">
-          <p class="featured">
-            <%= t("admin.stats.direct_messages.total") %><br>
-            <span class="number" id="direct_messages_count">
-              <%= @direct_messages.count %>
-            </span>
-          </p>
-        </div>
-
-        <div class="small-12 medium-3 column">
-          <p class="featured">
-            <%= t("admin.stats.direct_messages.users_who_have_sent_message") %><br>
-            <span class="number" id="users_who_have_sent_message_count">
-              <%= @users_who_have_sent_message.count %>
-            </span>
-          </p>
-        </div>
-      </div>
+<div class="stats">
+  <div class="row stats-numbers">
+    <div class="small-12 medium-3 column">
+      <p class="featured">
+        <%= t("admin.stats.direct_messages.total") %><br>
+        <span id="direct_messages_count" class="number"><%= @direct_messages.count %></span>
+      </p>
+    </div>
 
+    <div class="small-12 medium-6 column end">
+      <p>
+        <%= t("admin.stats.direct_messages.users_who_have_sent_message") %><br>
+        <span id="users_who_have_sent_message_count" class="number"><%= @users_who_have_sent_message.count %></span>
+      </p>
     </div>
   </div>
-</div>
\ No newline at end of file
+</div>
diff --git a/app/views/admin/stats/proposal_notifications.html.erb b/app/views/admin/stats/proposal_notifications.html.erb
index 10f620ff6..75b1c04f5 100644
--- a/app/views/admin/stats/proposal_notifications.html.erb
+++ b/app/views/admin/stats/proposal_notifications.html.erb
@@ -2,40 +2,36 @@
 
 <h2><%= t("admin.stats.proposal_notifications.title")%></h2>
 
-<div class="stats row-full">
-  <div class="row">
-    <div class="small-12 column">
-
-      <div class="row stats-numbers">
-        <div class="small-12 medium-3 column">
-          <p class="featured">
-            <%= t("admin.stats.proposal_notifications.total") %><br>
-            <span class="number" id="proposal_notifications_count">
-              <%= @proposal_notifications.count %>
-            </span>
-          </p>
-        </div>
-
-        <div class="small-12 medium-3 column">
-          <p class="featured">
-            <%= t("admin.stats.proposal_notifications.proposals_with_notifications") %><br>
-            <span class="number" id="proposals_with_notifications_count">
-              <%= @proposals_with_notifications.count %>
-            </span>
-          </p>
-        </div>
-      </div>
+<div class="stats">
+  <div class="row stats-numbers">
+    <div class="small-12 medium-3 column">
+      <p class="featured">
+        <%= t("admin.stats.proposal_notifications.total") %><br>
+        <span id="proposal_notifications_count" class="number"><%= @proposal_notifications.count %></span>
+      </p>
+    </div>
 
+    <div class="small-12 medium-6 column end">
+      <p>
+        <%= t("admin.stats.proposal_notifications.proposals_with_notifications") %><br>
+        <span id="proposals_with_notifications_count" class="number"><%= @proposals_with_notifications.count %></span>
+      </p>
     </div>
   </div>
 </div>
 
-<div id="proposal_notifications">
-  <% @proposal_notifications.each do |notification| %>
-    <div class="proposal_notification">
-      <p><%= link_to notification.proposal.title, proposal_path(notification.proposal) %></p>
-      <p><%= notification.title %></p>
-      <p><%= notification.body %></p>
-    </div>
-  <% end %>
-</div>
+<table id="proposal_notifications">
+  <tbody>
+    <% @proposal_notifications.each do |notification| %>
+      <tr class="proposal_notification">
+        <td>
+          <h3>
+            <%= notification.title %>
+            <small><%= link_to notification.proposal.title, proposal_path(notification.proposal) %></small>
+          </h3>
+          <p><%= notification.body %></p>
+        </td>
+      </tr>
+    <% end %>
+  </tbody>
+</table>
diff --git a/app/views/admin/stats/show.html.erb b/app/views/admin/stats/show.html.erb
index 66d4cbf6c..ef17536c3 100644
--- a/app/views/admin/stats/show.html.erb
+++ b/app/views/admin/stats/show.html.erb
@@ -1,22 +1,21 @@
 <% content_for :head do %>
   <%= javascript_include_tag "stat_graphs", 'data-turbolinks-track' => true %>
 <% end %>
-<div class="stats row-full">
+<div class="stats">
   <div class="row">
     <div class="small-12 column">
-      <h1><%= t "admin.stats.show.stats_title" %></h1>
+      <h1 class="inline-block"><%= t "admin.stats.show.stats_title" %></h1>
+
+      <div class="float-right clear">
+        <%= link_to t("admin.stats.show.direct_messages"),
+                    direct_messages_admin_stats_path, class: "button hollow" %>
+        <%= link_to t("admin.stats.show.proposal_notifications"),
+                    proposal_notifications_admin_stats_path, class: "button hollow" %>
 
-      <div class="row">
-        <div class="small-24 medium-6 column">
-          <%= link_to t("admin.stats.show.direct_messages"),
-                      direct_messages_admin_stats_path %>
-        </div>
-        <div class="small-24 medium-6 column">
-          <%= link_to t("admin.stats.show.proposal_notifications"),
-                      proposal_notifications_admin_stats_path %>
-        </div>
       </div>
 
+      <div class="clear"></div>
+
       <div class="row stats-numbers">
         <div class="small-12 medium-3 column">
           <p class="featured">