From f6ee472a66e07196f97d4f6be733e10c34bdffc7 Mon Sep 17 00:00:00 2001
From: decabeza <alberto@decabeza.es>
Date: Wed, 18 Oct 2017 18:55:55 +0200
Subject: [PATCH] Improve styles for users interest list

---
 app/assets/stylesheets/layout.scss  |  5 ++---
 app/views/users/_interests.html.erb | 17 ++++++-----------
 app/views/users/show.html.erb       |  4 +++-
 config/locales/en/general.yml       |  6 +++---
 config/locales/es/general.yml       |  6 +++---
 5 files changed, 17 insertions(+), 21 deletions(-)

diff --git a/app/assets/stylesheets/layout.scss b/app/assets/stylesheets/layout.scss
index 55ab2159f..56a1fe187 100644
--- a/app/assets/stylesheets/layout.scss
+++ b/app/assets/stylesheets/layout.scss
@@ -2070,10 +2070,9 @@ table {
 }
 
 .public-interests {
-  margin-top: $line-height;
 
-  .column {
-    padding-left: 0;
+  li {
+    margin-right: $line-height / 4;
   }
 }
 
diff --git a/app/views/users/_interests.html.erb b/app/views/users/_interests.html.erb
index 41dd53bdf..a0d110346 100644
--- a/app/views/users/_interests.html.erb
+++ b/app/views/users/_interests.html.erb
@@ -3,15 +3,11 @@
 
   <% if user.interests.any? %>
 
-    <% user.interests.in_groups_of(10, false) do |interests_group| %>
-      <div class="small-4 column end">
-        <ul class="no-bullet">
-          <% interests_group.each do |interest| %>
-            <li> <small><%= interest %></small> </li>
-          <% end %>
-        </ul>
-      </div>
-    <% end %>
+    <ul class="no-bullet tags">
+      <% user.interests.each do |interest| %>
+        <li class="inline-block"><span><%= interest %></span></li>
+      <% end %>
+    </ul>
 
   <% else %>
 
@@ -20,5 +16,4 @@
     </div>
 
   <% end %>
-
-</div>
\ No newline at end of file
+</div>
diff --git a/app/views/users/show.html.erb b/app/views/users/show.html.erb
index e4085c8e5..4e6b6f0e5 100644
--- a/app/views/users/show.html.erb
+++ b/app/views/users/show.html.erb
@@ -43,7 +43,9 @@
 
         <%= render "activity_page" %>
       <% else %>
-        <p><%= t('users.show.private_activity') %></p>
+        <div class="callout warning margin">
+          <%= t('users.show.private_activity') %>
+        </div>
       <% end %>
 
       <%= render 'interests', user: @user if valid_interests_access? %>
diff --git a/config/locales/en/general.yml b/config/locales/en/general.yml
index d42a24ac9..172c8e2bf 100644
--- a/config/locales/en/general.yml
+++ b/config/locales/en/general.yml
@@ -14,8 +14,8 @@ en:
       phone_number_label: Phone number
       public_activity_label: Keep my list of activities public
       public_interests_label: Keep my interests public
-      public_interests_my_title_list: List of interests (Tags of elements you follow)
-      public_interests_user_title_list: List of interests (Tags of elements this user follows)
+      public_interests_my_title_list: List of interests (tags of elements you follow)
+      public_interests_user_title_list: List of interests (tags of elements this user follows)
       public_interests_my_empty_list: You do not follow any elements yet.
       public_interests_user_empty_list: This user does not follow any elements yet.
       save_changes_submit: Save changes
@@ -731,7 +731,7 @@ en:
           other: "%{count} Following"
       no_activity: User has no public activity
       no_private_messages: "This user doesn't accept private messages."
-      private_activity: This user decided to keep the activity list private
+      private_activity: This user decided to keep the activity list private.
       send_private_message: "Send private message"
     proposals:
       send_notification: "Send notification"
diff --git a/config/locales/es/general.yml b/config/locales/es/general.yml
index 05c810a76..e56f725c9 100644
--- a/config/locales/es/general.yml
+++ b/config/locales/es/general.yml
@@ -14,8 +14,8 @@ es:
       phone_number_label: Teléfono
       public_activity_label: Mostrar públicamente mi lista de actividades
       public_interests_label: Mostrar públicamente mis intereses
-      public_interests_my_title_list: Lista de intereses (Etiquetas de los elementos que sigues)
-      public_interests_user_title_list: Lista de intereses (Etiquetas de los elementos seguidos este usuario)
+      public_interests_my_title_list: Lista de intereses (etiquetas de los elementos que sigues)
+      public_interests_user_title_list: Lista de intereses (etiquetas de los elementos seguidos este usuario)
       public_interests_my_empty_list: Aún no sigues ningún elemento.
       public_interests_user_empty_list: Este usuario no sigue ningún elemento todavía.
       save_changes_submit: Guardar cambios
@@ -731,7 +731,7 @@ es:
           other: "%{count} Siguiendo"
       no_activity: Usuario sin actividad pública
       no_private_messages: "Este usuario no acepta mensajes privados."
-      private_activity: Este usuario ha decidido mantener en privado su lista de actividades
+      private_activity: Este usuario ha decidido mantener en privado su lista de actividades.
       send_private_message: "Enviar un mensaje privado"
     proposals:
       send_notification: "Enviar notificación"