From 3bf9f7ddb059e46772e71e83d22d912f614071e3 Mon Sep 17 00:00:00 2001 From: Pratik Kamble Date: Fri, 2 Dec 2016 18:03:07 +0400 Subject: [PATCH] /people page explanatory text and "related question" button, fixes #991 & fixes #979 (#1041) * Ask a question updated. * Short introductory text added. * Explanatory text added at correct(?) location. * col-md-3 changed. --- app/views/users/list.html.erb | 9 ++++++--- config/locales/views/sidebar/_related/de.yml | 2 +- config/locales/views/sidebar/_related/en.yml | 2 +- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/app/views/users/list.html.erb b/app/views/users/list.html.erb index bc720dd7b9..7b39d3aab0 100644 --- a/app/views/users/list.html.erb +++ b/app/views/users/list.html.erb @@ -1,11 +1,14 @@ -
+
+
+
+

This page shows a list of all Public Lab contributors and is sorted by those who have posted most recently. Click the profile link to view their posting activity.

+
+
<% if current_user && current_user.role = "admin" && current_user.role = "moderator" %>

<%= t('users.list.user_moderation') %>

<%= t('users.list.admins_ban_spam') %>

<% end %> - -

<%= raw t('users.list.members_last_activity') %>

diff --git a/config/locales/views/sidebar/_related/de.yml b/config/locales/views/sidebar/_related/de.yml index f9de8adc5c..ab88db2e9a 100644 --- a/config/locales/views/sidebar/_related/de.yml +++ b/config/locales/views/sidebar/_related/de.yml @@ -5,7 +5,7 @@ de: _related: write_research_note: "Schreiben Sie eine Research Note" share_your_work: "Teilen Sie Ihre Arbeit mit anderen" - ask_a_question: "Stelle eine Frage" + ask_a_question: "Stelle Sie eine Frage" translation: "Übersetzung" response_to: "Dies ist eine Antwort auf" responses_to_note: "Die Antworten auf diese Notiz" diff --git a/config/locales/views/sidebar/_related/en.yml b/config/locales/views/sidebar/_related/en.yml index 9b710240b8..ea1524b994 100644 --- a/config/locales/views/sidebar/_related/en.yml +++ b/config/locales/views/sidebar/_related/en.yml @@ -5,7 +5,7 @@ en: _related: write_research_note: "Write a research note" share_your_work: "Share your work with others" - ask_a_question: "Ask a question" + ask_a_question: "Ask a related question" translation: "Translation" response_to: "This is a response to" responses_to_note: "Responses to this note"