From ca8f41031918ecfe608761f2c0e53dee3eada0a8 Mon Sep 17 00:00:00 2001
From: Alberto Garcia Cabeza <alberto@decabeza.es>
Date: Fri, 6 Nov 2015 12:28:04 +0100
Subject: [PATCH] Adds styles for user's activity page

---
 app/assets/stylesheets/layout.scss        | 56 +++++++++++++++++++++++
 app/assets/stylesheets/participation.scss |  9 +++-
 app/views/users/_activity_page.html.erb   |  1 -
 app/views/users/_comments.html.erb        |  7 +--
 app/views/users/_debates.html.erb         |  2 +-
 app/views/users/_proposals.html.erb       |  2 +-
 app/views/users/show.html.erb             |  4 +-
 config/locales/en.yml                     |  1 -
 config/locales/es.yml                     |  1 -
 db/schema.rb                              |  4 +-
 10 files changed, 73 insertions(+), 14 deletions(-)

diff --git a/app/assets/stylesheets/layout.scss b/app/assets/stylesheets/layout.scss
index 2a78d3cc7..0be3d4eea 100644
--- a/app/assets/stylesheets/layout.scss
+++ b/app/assets/stylesheets/layout.scss
@@ -20,6 +20,7 @@
 // 18. Comments
 // 19. Flags
 // 20. Accesibility
+// 21. Activity
 //
 
 // 01. Variables
@@ -2015,3 +2016,58 @@ table {
   clip: rect(0, 0, 0, 0);
   border: 0;
 }
+
+// 21. Activity
+// - - - - - - - - - - - - - - - - - - - - - - - - -
+
+.activity {
+  margin-bottom: rem-calc(48);
+  margin-top: rem-calc(24);
+
+  .sub-nav {
+    background: none;
+    border-bottom: 1px solid $border;
+    border-radius: 0;
+    padding-bottom: 0;
+
+    dd.active {
+      background: none;
+      border-bottom: 2px solid $brand;
+      border-radius: 0;
+      color: $brand;
+    }
+  }
+
+  table {
+    border: 0;
+
+    td {
+      padding-left: rem-calc(36);
+      position: relative;
+
+      &:before {
+        color: $brand;
+        font-family: "icons" !important;
+        font-size: rem-calc(24);
+        left: 4px;
+        position: absolute;
+
+      }
+    }
+
+    &.activity-comments td:before {
+      content: "e";
+      top: 18px;
+    }
+
+    &.activity-debates td:before {
+      content: "i";
+      top: 14px;
+    }
+
+    &.activity-proposals td:before {
+      content: "h";
+      top: 18px;
+    }
+  }
+}
diff --git a/app/assets/stylesheets/participation.scss b/app/assets/stylesheets/participation.scss
index 583b614b3..1415ef33d 100644
--- a/app/assets/stylesheets/participation.scss
+++ b/app/assets/stylesheets/participation.scss
@@ -416,8 +416,15 @@
   }
 
   .author {
-    color: $text;
     font-weight: bold;
+
+    a {
+      color: $link !important;
+
+      &:hover {
+        color: $link-hover !important;
+      }
+    }
   }
 
   aside {
diff --git a/app/views/users/_activity_page.html.erb b/app/views/users/_activity_page.html.erb
index 0b39ad241..296f7e5c2 100644
--- a/app/views/users/_activity_page.html.erb
+++ b/app/views/users/_activity_page.html.erb
@@ -1,4 +1,3 @@
 <%= render "proposals" if @proposals.present? %>
 <%= render "debates" if @debates.present? %>
 <%= render "comments" if @comments.present? %>
-
diff --git a/app/views/users/_comments.html.erb b/app/views/users/_comments.html.erb
index 1340fdb7e..2a8c9d66b 100644
--- a/app/views/users/_comments.html.erb
+++ b/app/views/users/_comments.html.erb
@@ -1,11 +1,8 @@
-<table class="clear">
+<table class="clear activity-comments">
   <% @comments.each do |comment| %>
     <tr id="debate_<%= comment.id %>">
       <td>
-        <i>
-          <%= t("users.show.comment_to") %>
-          <%= comment.commentable.hidden? ? comment.commentable.title : link_to(comment.commentable.title, comment.commentable) %>
-        </i>
+        <%= comment.commentable.hidden? ? comment.commentable.title : link_to(comment.commentable.title, comment.commentable) %>
         <br>
         <%= comment.body %>
       </td>
diff --git a/app/views/users/_debates.html.erb b/app/views/users/_debates.html.erb
index bc1be352f..53fc0d58e 100644
--- a/app/views/users/_debates.html.erb
+++ b/app/views/users/_debates.html.erb
@@ -1,4 +1,4 @@
-<table class="clear">
+<table class="clear activity-debates">
   <% @debates.each do |debate| %>
     <tr id="debate_<%= debate.id %>">
       <td>
diff --git a/app/views/users/_proposals.html.erb b/app/views/users/_proposals.html.erb
index f41c6d49d..a8ec5061e 100644
--- a/app/views/users/_proposals.html.erb
+++ b/app/views/users/_proposals.html.erb
@@ -1,4 +1,4 @@
-<table class="clear">
+<table class="clear activity-proposals">
   <% @proposals.each do |proposal| %>
     <tr id="proposal_<%= proposal.id %>">
       <td>
diff --git a/app/views/users/show.html.erb b/app/views/users/show.html.erb
index 51bfee34c..2be31b272 100644
--- a/app/views/users/show.html.erb
+++ b/app/views/users/show.html.erb
@@ -1,6 +1,6 @@
 <section role="main">
-  <div class="wrap row">
-    <div class="small-12 medium-9 column">
+  <div class="activity row">
+    <div class="small-12 column">
 
       <h2><%= avatar_image(@user, seed: @user.id, size: 60) %> <%= @user.name %></h2>
 
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 52f246518..2f61df27e 100755
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -340,7 +340,6 @@ en:
           other: "%{count} Comments"
       no_activity: "User has no public activity"
       private_activity: "This user decided to keep the activity list private"
-      comment_to: "Comment in: "
   unauthorized:
     default: "You do not have permission to access this page."
     manage:
diff --git a/config/locales/es.yml b/config/locales/es.yml
index df76271c1..aa2036f1d 100644
--- a/config/locales/es.yml
+++ b/config/locales/es.yml
@@ -340,7 +340,6 @@ es:
           other: "%{count} Comentarios"
       no_activity: "Usuario sin actividad pública"
       private_activity: "Este usuario ha decidido mantener en privado su lista de actividades"
-      comment_to: "Comentario en: "
   unauthorized:
     default: "No tienes permiso para acceder a esta página."
     manage:
diff --git a/db/schema.rb b/db/schema.rb
index fe174eb0c..95bd4a36d 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -95,10 +95,10 @@ ActiveRecord::Schema.define(version: 20151103194329) do
     t.string   "visit_id"
     t.datetime "hidden_at"
     t.integer  "flags_count",                             default: 0
-    t.datetime "ignored_flag_at"
     t.integer  "cached_votes_total",                      default: 0
     t.integer  "cached_votes_up",                         default: 0
     t.integer  "cached_votes_down",                       default: 0
+    t.datetime "ignored_flag_at"
     t.integer  "comments_count",                          default: 0
     t.datetime "confirmed_hide_at"
     t.integer  "cached_anonymous_votes_total",            default: 0
@@ -114,6 +114,7 @@ ActiveRecord::Schema.define(version: 20151103194329) do
   add_index "debates", ["cached_votes_total"], name: "index_debates_on_cached_votes_total", using: :btree
   add_index "debates", ["cached_votes_up"], name: "index_debates_on_cached_votes_up", using: :btree
   add_index "debates", ["confidence_score"], name: "index_debates_on_confidence_score", using: :btree
+  add_index "debates", ["description"], name: "index_debates_on_description", using: :btree
   add_index "debates", ["hidden_at"], name: "index_debates_on_hidden_at", using: :btree
   add_index "debates", ["hot_score"], name: "index_debates_on_hot_score", using: :btree
   add_index "debates", ["title"], name: "index_debates_on_title", using: :btree
@@ -220,6 +221,7 @@ ActiveRecord::Schema.define(version: 20151103194329) do
   add_index "proposals", ["author_id"], name: "index_proposals_on_author_id", using: :btree
   add_index "proposals", ["cached_votes_up"], name: "index_proposals_on_cached_votes_up", using: :btree
   add_index "proposals", ["confidence_score"], name: "index_proposals_on_confidence_score", using: :btree
+  add_index "proposals", ["description"], name: "index_proposals_on_description", using: :btree
   add_index "proposals", ["hidden_at"], name: "index_proposals_on_hidden_at", using: :btree
   add_index "proposals", ["hot_score"], name: "index_proposals_on_hot_score", using: :btree
   add_index "proposals", ["question"], name: "index_proposals_on_question", using: :btree