Skip to content

Commit

Permalink
/people page explanatory text and "related question" button, fixes pu…
Browse files Browse the repository at this point in the history
…bliclab#991 & fixes publiclab#979 (publiclab#1041)

* Ask a question updated.

* Short introductory text added.

* Explanatory text added at correct(?) location.

* col-md-3 changed.
  • Loading branch information
Pk13055 authored and jywarren committed Dec 2, 2016
1 parent 6b1604d commit 3bf9f7d
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 5 deletions.
9 changes: 6 additions & 3 deletions app/views/users/list.html.erb
Original file line number Diff line number Diff line change
@@ -1,11 +1,14 @@
<div class="col-md-3">

<div class="col-md-3">
<div class='row'>
<div class='col-md-12'>
<p> 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. </p>
</div>
</div>
<% if current_user && current_user.role = "admin" && current_user.role = "moderator" %>
<h2><%= t('users.list.user_moderation') %></h2>
<p><%= t('users.list.admins_ban_spam') %> </p>
<% end %>


</div>
<div class="col-md-9">
<h2><%= raw t('users.list.members_last_activity') %></h2>
Expand Down
2 changes: 1 addition & 1 deletion config/locales/views/sidebar/_related/de.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion config/locales/views/sidebar/_related/en.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down

0 comments on commit 3bf9f7d

Please sign in to comment.