From 05a713790f4f0cf41c08fd3185da3f8300ee8971 Mon Sep 17 00:00:00 2001 From: decabeza Date: Wed, 18 Oct 2017 18:54:01 +0200 Subject: [PATCH 1/5] improves edit debate button on debate show --- app/assets/stylesheets/participation.scss | 4 ---- app/views/debates/show.html.erb | 16 +++++++++------- config/locales/en/general.yml | 1 + config/locales/es/general.yml | 1 + 4 files changed, 11 insertions(+), 11 deletions(-) diff --git a/app/assets/stylesheets/participation.scss b/app/assets/stylesheets/participation.scss index a887d83de..55645309f 100644 --- a/app/assets/stylesheets/participation.scss +++ b/app/assets/stylesheets/participation.scss @@ -363,10 +363,6 @@ width: rem-calc(48); } - .edit-debate { - margin-bottom: 0; - } - .debate-info, .proposal-info, .investment-project-info, diff --git a/app/views/debates/show.html.erb b/app/views/debates/show.html.erb index 44fa08a06..5f6d6b50f 100644 --- a/app/views/debates/show.html.erb +++ b/app/views/debates/show.html.erb @@ -9,13 +9,6 @@
<%= back_link_to %> - <% if current_user && @debate.editable_by?(current_user) %> - <%= link_to edit_debate_path(@debate), class: 'edit-debate button success small float-right' do %> - - <%= t("debates.show.edit_debate_link") %> - <% end %> - <% end %> -

<%= @debate.title %>

<% if @debate.conflictive? %>
@@ -47,6 +40,15 @@
\ No newline at end of file + 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 %> -

<%= t('users.show.private_activity') %>

+
+ <%= t('users.show.private_activity') %> +
<% 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" From 2148ee7492cd6026bd723e5b2554799b2ff7d7a0 Mon Sep 17 00:00:00 2001 From: decabeza Date: Wed, 18 Oct 2017 19:37:20 +0200 Subject: [PATCH 5/5] updates texts on specs --- spec/features/users_spec.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/spec/features/users_spec.rb b/spec/features/users_spec.rb index ae2bac6d1..5a73209df 100644 --- a/spec/features/users_spec.rb +++ b/spec/features/users_spec.rb @@ -314,7 +314,7 @@ feature 'Users' do @user.update(public_interests: true) visit user_path(@user) - expect(page).to have_content("List of interests (Tags of elements this user follows)") + expect(page).to have_content("List of interests (tags of elements this user follows)") end scenario 'Should display custom interests title when user is visiting own user page' do @@ -322,7 +322,7 @@ feature 'Users' do login_as(@user) visit user_path(@user) - expect(page).to have_content("List of interests (Tags of elements you follow)") + expect(page).to have_content("List of interests (tags of elements you follow)") end scenario 'Should display generic empty interests list message when visited user has not interests defined' do