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

Improve styles for users interest list

Browse Source
This commit is contained in:
decabeza
2017-10-18 18:55:55 +02:00
parent c5aeaa26ae
commit f6ee472a66
5 changed files with 17 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
app/assets/stylesheets/layout.scss
View File

@@ -2070,10 +2070,9 @@ table {
} }
.public-interests { .public-interests {
margin-top: $line-height;
.column { li {
padding-left: 0; margin-right: $line-height / 4;
} }
} }

17
app/views/users/_interests.html.erb
View File

@@ -3,15 +3,11 @@
<% if user.interests.any? %> <% if user.interests.any? %>
<% user.interests.in_groups_of(10, false) do |interests_group| %> <ul class="no-bullet tags">
<div class="small-4 column end"> <% user.interests.each do |interest| %>
<ul class="no-bullet"> <li class="inline-block"><span><%= interest %></span></li>
<% interests_group.each do |interest| %> <% end %>
<li> <small><%= interest %></small> </li> </ul>
<% end %>
</ul>
</div>
<% end %>
<% else %> <% else %>
@@ -20,5 +16,4 @@
</div> </div>
<% end %> <% end %>
</div>
</div>

4
app/views/users/show.html.erb
View File

@@ -43,7 +43,9 @@
<%= render "activity_page" %> <%= render "activity_page" %>
<% else %> <% else %>
<p><%= t('users.show.private_activity') %></p> <div class="callout warning margin">
<%= t('users.show.private_activity') %>
</div>
<% end %> <% end %>
<%= render 'interests', user: @user if valid_interests_access? %> <%= render 'interests', user: @user if valid_interests_access? %>

6
config/locales/en/general.yml
View File

@@ -14,8 +14,8 @@ en:
phone_number_label: Phone number phone_number_label: Phone number
public_activity_label: Keep my list of activities public public_activity_label: Keep my list of activities public
public_interests_label: Keep my interests public public_interests_label: Keep my interests public
public_interests_my_title_list: List of interests (Tags of elements you follow) 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_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_my_empty_list: You do not follow any elements yet.
public_interests_user_empty_list: This user does not follow any elements yet. public_interests_user_empty_list: This user does not follow any elements yet.
save_changes_submit: Save changes save_changes_submit: Save changes
@@ -731,7 +731,7 @@ en:
other: "%{count} Following" other: "%{count} Following"
no_activity: User has no public activity no_activity: User has no public activity
no_private_messages: "This user doesn't accept private messages." 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" send_private_message: "Send private message"
proposals: proposals:
send_notification: "Send notification" send_notification: "Send notification"

6
config/locales/es/general.yml
View File

@@ -14,8 +14,8 @@ es:
phone_number_label: Teléfono phone_number_label: Teléfono
public_activity_label: Mostrar públicamente mi lista de actividades public_activity_label: Mostrar públicamente mi lista de actividades
public_interests_label: Mostrar públicamente mis intereses public_interests_label: Mostrar públicamente mis intereses
public_interests_my_title_list: Lista de intereses (Etiquetas de los elementos que sigues) 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_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_my_empty_list: Aún no sigues ningún elemento.
public_interests_user_empty_list: Este usuario no sigue ningún elemento todavía. public_interests_user_empty_list: Este usuario no sigue ningún elemento todavía.
save_changes_submit: Guardar cambios save_changes_submit: Guardar cambios
@@ -731,7 +731,7 @@ es:
other: "%{count} Siguiendo" other: "%{count} Siguiendo"
no_activity: Usuario sin actividad pública no_activity: Usuario sin actividad pública
no_private_messages: "Este usuario no acepta mensajes privados." 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" send_private_message: "Enviar un mensaje privado"
proposals: proposals:
send_notification: "Enviar notificación" send_notification: "Enviar notificación"