consul/nairobi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Resolves conflicts and improves styles for stats

Browse Source
This commit is contained in:
Alberto Garcia Cabeza
2016-06-16 18:07:13 +02:00
parent f9a2f5d5dc
commit 352f3fa2f9
3 changed files with 52 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
app/views/admin/stats/direct_messages.html.erb
View File

@@ -2,30 +2,20 @@
<h2><%= t("admin.stats.direct_messages.title")%></h2> <h2><%= t("admin.stats.direct_messages.title")%></h2>
<div class="stats row-full"> <div class="stats">
<div class="row">
<div class="small-12 column">
<div class="row stats-numbers"> <div class="row stats-numbers">
<div class="small-12 medium-3 column"> <div class="small-12 medium-3 column">
<p class="featured"> <p class="featured">
<%= t("admin.stats.direct_messages.total") %><br> <%= t("admin.stats.direct_messages.total") %><br>
<span class="number" id="direct_messages_count"> <span id="direct_messages_count" class="number"><%= @direct_messages.count %></span>
<%= @direct_messages.count %>
</span>
</p> </p>
</div> </div>
<div class="small-12 medium-3 column"> <div class="small-12 medium-6 column end">
<p class="featured"> <p>
<%= t("admin.stats.direct_messages.users_who_have_sent_message") %><br> <%= t("admin.stats.direct_messages.users_who_have_sent_message") %><br>
<span class="number" id="users_who_have_sent_message_count"> <span id="users_who_have_sent_message_count" class="number"><%= @users_who_have_sent_message.count %></span>
<%= @users_who_have_sent_message.count %>
</span>
</p> </p>
</div> </div>
</div> </div>
</div>
</div>
</div> </div>

38
app/views/admin/stats/proposal_notifications.html.erb
View File

@@ -2,40 +2,36 @@
<h2><%= t("admin.stats.proposal_notifications.title")%></h2> <h2><%= t("admin.stats.proposal_notifications.title")%></h2>
<div class="stats row-full"> <div class="stats">
<div class="row">
<div class="small-12 column">
<div class="row stats-numbers"> <div class="row stats-numbers">
<div class="small-12 medium-3 column"> <div class="small-12 medium-3 column">
<p class="featured"> <p class="featured">
<%= t("admin.stats.proposal_notifications.total") %><br> <%= t("admin.stats.proposal_notifications.total") %><br>
<span class="number" id="proposal_notifications_count"> <span id="proposal_notifications_count" class="number"><%= @proposal_notifications.count %></span>
<%= @proposal_notifications.count %>
</span>
</p> </p>
</div> </div>
<div class="small-12 medium-3 column"> <div class="small-12 medium-6 column end">
<p class="featured"> <p>
<%= t("admin.stats.proposal_notifications.proposals_with_notifications") %><br> <%= t("admin.stats.proposal_notifications.proposals_with_notifications") %><br>
<span class="number" id="proposals_with_notifications_count"> <span id="proposals_with_notifications_count" class="number"><%= @proposals_with_notifications.count %></span>
<%= @proposals_with_notifications.count %>
</span>
</p> </p>
</div> </div>
</div> </div>
</div>
</div>
</div> </div>
<div id="proposal_notifications"> <table id="proposal_notifications">
<tbody>
<% @proposal_notifications.each do |notification| %> <% @proposal_notifications.each do |notification| %>
<div class="proposal_notification"> <tr class="proposal_notification">
<p><%= link_to notification.proposal.title, proposal_path(notification.proposal) %></p> <td>
<p><%= notification.title %></p> <h3>
<%= notification.title %>
<small><%= link_to notification.proposal.title, proposal_path(notification.proposal) %></small>
</h3>
<p><%= notification.body %></p> <p><%= notification.body %></p>
</div> </td>
</tr>
<% end %> <% end %>
</div> </tbody>
</table>

17
app/views/admin/stats/show.html.erb
View File

@@ -1,22 +1,21 @@
<% content_for :head do %> <% content_for :head do %>
<%= javascript_include_tag "stat_graphs", 'data-turbolinks-track' => true %> <%= javascript_include_tag "stat_graphs", 'data-turbolinks-track' => true %>
<% end %> <% end %>
<div class="stats row-full"> <div class="stats">
<div class="row"> <div class="row">
<div class="small-12 column"> <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="row"> <div class="float-right clear">
<div class="small-24 medium-6 column">
<%= link_to t("admin.stats.show.direct_messages"), <%= link_to t("admin.stats.show.direct_messages"),
direct_messages_admin_stats_path %> direct_messages_admin_stats_path, class: "button hollow" %>
</div>
<div class="small-24 medium-6 column">
<%= link_to t("admin.stats.show.proposal_notifications"), <%= link_to t("admin.stats.show.proposal_notifications"),
proposal_notifications_admin_stats_path %> proposal_notifications_admin_stats_path, class: "button hollow" %>
</div>
</div> </div>
<div class="clear"></div>
<div class="row stats-numbers"> <div class="row stats-numbers">
<div class="small-12 medium-3 column"> <div class="small-12 medium-3 column">
<p class="featured"> <p class="featured">