diff --git a/app/views/dashboard/dashboard.html.erb b/app/views/dashboard/dashboard.html.erb
index cb74b08bbc4..81c417f3620 100644
--- a/app/views/dashboard/dashboard.html.erb
+++ b/app/views/dashboard/dashboard.html.erb
@@ -10,7 +10,7 @@
To get started at Public Lab, try:
<%= feature('dashboard-feature') %>
diff --git a/app/views/editor/_editor.html.erb b/app/views/editor/_editor.html.erb
index d5b179a1ba8..c001c928db9 100644
--- a/app/views/editor/_editor.html.erb
+++ b/app/views/editor/_editor.html.erb
@@ -13,15 +13,15 @@
-
+
Drag and drop to add an image or file, or
diff --git a/app/views/editor/_images.html.erb b/app/views/editor/_images.html.erb
index 3d83fdaa165..198b4185194 100644
--- a/app/views/editor/_images.html.erb
+++ b/app/views/editor/_images.html.erb
@@ -14,7 +14,7 @@
<% if current_user %>
<% current_user.images.reverse[0..3].each do |image| %>
\ No newline at end of file
+
diff --git a/app/views/features/_form.html.erb b/app/views/features/_form.html.erb
index 893eae40273..a1e096af707 100644
--- a/app/views/features/_form.html.erb
+++ b/app/views/features/_form.html.erb
@@ -2,9 +2,9 @@
<% end %>
@@ -51,4 +51,4 @@
<%= render :partial => "sidebar/author" %>
<% else %>
<%= render :partial => "sidebar/user" %>
-<% end %>
\ No newline at end of file
+<% end %>
diff --git a/app/views/notes/show.html.erb b/app/views/notes/show.html.erb
index e5202bd6959..f880a804fbf 100644
--- a/app/views/notes/show.html.erb
+++ b/app/views/notes/show.html.erb
@@ -1,6 +1,6 @@
-
+
<% if current_user && @node.tags.length == 0 %>
<%= raw t('notes.show.note_no_tags', url: 'javascript: $(".tag-input").focus();') %>
<% end %>
<% if @node.has_power_tag('status:candidate') %>
This was marked as a candidate activity -- read about how to adapt its content into a fully-fledged, step-by-step activity that can be easily replicated.
<% end %>
<% if @node.has_power_tag('replication') %>
<%= render :partial => "comments/form", :locals => { title: "Post Comment", comment: false, placeholder: "Help the author refine their post, or point them at other helpful information on the site. Mention users by @username to notify them of this thread by email", type: "question" } %>
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.
<%= node.title %> <% if node.status == 3 %>Draft<% end %>
+<%= node.title %> <% if node.status == 3 %>Draft<% end %>
<%= render partial: "dashboard/node_meta", locals: { node: node } %>
diff --git a/app/views/dashboard/_node_event.html.erb b/app/views/dashboard/_node_event.html.erb index be514942508..58be9a8b40d 100644 --- a/app/views/dashboard/_node_event.html.erb +++ b/app/views/dashboard/_node_event.html.erb @@ -1,4 +1,4 @@ -<%= node.title %>
- RSVP + RSVPEvent <%= render partial: "dashboard/node_meta", locals: { node: node } %>
diff --git a/app/views/dashboard/_node_meta.html.erb b/app/views/dashboard/_node_meta.html.erb index ec78f4e6e75..125438d3a96 100644 --- a/app/views/dashboard/_node_meta.html.erb +++ b/app/views/dashboard/_node_meta.html.erb @@ -17,13 +17,13 @@ <% end %> | <%= node.fetch_comments(current_user).length %> | - | <%= number_with_delimiter(node.views) %> + | <%= number_with_delimiter(node.views) %> | <%= node.likes %> <% if params[:mod] %>| <% end %> <% if current_user %> -<% if logged_in_as(['admin','moderator']) %> <%= t('dashboard._node_moderate.first_time_post') %> - <%= t('dashboard.moderate.approve') %> - <%= t('dashboard.moderate.spam') %> + <%= t('dashboard.moderate.approve') %> + <%= t('dashboard.moderate.spam') %> <% else %> <%= raw t('dashboard.moderate.pending_approval', :url => '/wiki/moderation') %> <% end %> diff --git a/app/views/dashboard/_node_question.html.erb b/app/views/dashboard/_node_question.html.erb index 794c94be012..ea0749aae56 100644 --- a/app/views/dashboard/_node_question.html.erb +++ b/app/views/dashboard/_node_question.html.erb @@ -1,4 +1,4 @@ -
<%= node.title %>
<% if node.answers.collect(&:accepted).include?(true) %> -Answered
+Answered
<% end %> - <%= t('dashboard._node_question.post_answer') %> + <%= t('dashboard._node_question.post_answer') %><%= t('dashboard._node_question.question') %> <%= render partial: "dashboard/node_meta", locals: { node: node } %>
diff --git a/app/views/dashboard/_node_wiki.html.erb b/app/views/dashboard/_node_wiki.html.erb index ca40795a71e..5bf3c3c0b41 100644 --- a/app/views/dashboard/_node_wiki.html.erb +++ b/app/views/dashboard/_node_wiki.html.erb @@ -1,4 +1,4 @@ -<%= render partial: "dashboard/node_meta", locals: { node: node } %>
<% if node.is_a?(Revision) && node.previous %> - + +<%= raw t('dashboard._wiki.shared_knowledge_base', :url => '/wiki') %>
- + Asking a question @@ -26,7 +26,7 @@
- <%=raw translation('dashboard.dashboard.from_blog', :url => '/blog') %> + <%=raw translation('dashboard.dashboard.from_blog', :url => '/blog') %> <%= @blog.title %> <%= t('dashboard.dashboard.by') %> <%= @blog.author.username %>
Main image
+Main image
-- + Drag and drop to add an image, or
-+
<% end %> + <% unless @widget %>
<% end %> <% if ((i+1)/4.0).to_i == ((i+1)/4.0) %>
<%= raw strip_tags(sanitize(RDiscount.new(node.body).to_html)).truncate(150) %>
-<%= raw (strip_tags(sanitize(RDiscount.new(node.body).to_html)).truncate(150)) %>
+<%= raw strip_tags(sanitize(RDiscount.new(node.body).to_html)).truncate(150) %>
+<%= raw (strip_tags(sanitize(RDiscount.new(node.body).to_html)).truncate(150)) %>
<%= t('notes._tagged_notes.read_more') %> »
<% node.tags[0..3].each do |tag| %> - <%= tag.name %> + <%= tag.name %> <% end %>
<% if params[:mod] %> - <%= t('notes._tagged_notes.spam') %> + <%= t('notes._tagged_notes.spam') %> <% end %>+
<% if ((i+1)/4.0).to_i == ((i+1)/4.0) %>
+
<%= raw t('notes.index.search_results_for', :params => params[:id]) %> (<%= t('notes.index.advanced_search') %>)
@@ -18,21 +18,21 @@ <% if params[:controller] == "notes" && (params[:action] == "popular" || params[:action] == "index" || params[:action] == "liked" || params[:action] == "recent") %> <%= render :partial => "notes/format_toggle" %> - <% if params[:action] == "liked" %><% end %> + <% if params[:action] == "liked" %><% end %>- class="active"<% end %>>
- <%= t('notes.index.recent') %>
-
- class="active"<% end %>>
- <%= t('notes.index.popular') %>
-
- class="active"<% end %>>
- <%= t('notes.index.liked') %>
-
- -
- <%= raw t('notes.index.wiki_pages') %>
+
-
+ active <% end %>" href="/notes/recent"> <%= t('notes.index.recent') %>
+ -
+ active <% end %> " href="/notes/popular/"> <%= t('notes.index.popular') %>
+
+ -
+ active <% end %> " href="/notes/liked/"> <%= t('notes.index.liked') %>
+
+ -
+ <%= raw t('notes.index.wiki_pages') %>
+
<% end %> @@ -51,4 +51,4 @@ <%= render :partial => "sidebar/author" %> <% else %> <%= render :partial => "sidebar/user" %> -<% end %> \ No newline at end of file +<% end %> diff --git a/app/views/notes/show.html.erb b/app/views/notes/show.html.erb index e5202bd6959..f880a804fbf 100644 --- a/app/views/notes/show.html.erb +++ b/app/views/notes/show.html.erb @@ -1,6 +1,6 @@ -+
Read more: <%= request.host %>/n/<%= @node.id %>
@@ -94,7 +94,7 @@ <% end %> -<% if @node.has_tag('event:rsvp') %> diff --git a/app/views/notes/tools_places.html.erb b/app/views/notes/tools_places.html.erb index 19159f8dd73..e0d67f116b0 100644 --- a/app/views/notes/tools_places.html.erb +++ b/app/views/notes/tools_places.html.erb @@ -18,18 +18,16 @@
<% if params[:controller] == "notes" && (params[:action] == "popular" || params[:action] == "index" || params[:action] == "liked") %>
- class="active"<% end %>> <%= t('notes.tools_places.tools') %>
- class="active"<% end %>> <%= t('notes.tools_places.places') %>
-
-+- active <% end %>"> <%= t('notes.tools_places.tools') %>
+ - active <% end %>"> <%= t('notes.tools_places.places') %>
+
<%= @node.answers.length %> Answers
asked <%= render partial: "dashboard/node_meta", locals: { node: node } %>
<% end %> + <% unless @widget %>
<% end %> <% if ((i+1)/3.0).to_i == ((i+1)/3.0) %>
<% end %> + <% unless @widget %>
<% end %>
Recently Answered Recently answered questions
+Recently Answered Recently answered questions
<% elsif params[:action] == 'popular' %> -Popular Questions Most viewed questions
+Popular Questions Most viewed questions
<% elsif params[:action] == 'unanswered' %> -Unanswered Questions Unanswered questions
+Unanswered Questions Unanswered questions
<% elsif params[:action] == 'liked' %> -Liked Questions Most liked questions
+Liked Questions Most liked questions
<% else %>Ask a question here
<% if !current_user %>To ask a question, please log in or sign up first.
<% end %> -- class="active"<% end %>>
-
- Recently Asked
+ -
+ active <% end %>" href="/questions/">
+ Recently Asked
- class="active"<% end %>>
-
- Recently Answered
+ -
+ active <% end %>" href="/questions/answered/">
+ Recently Answered
- class="active"<% end %>>
-
- Popular
+ -
+ active <% end %>" href="/questions/popular/">
+ Popular
- class="active"<% end %>>
-
- Unanswered
+ -
+ active <% end %>" href="/questions/unanswered/">
+ Unanswered
- class="active"<% end %>>
-
- Liked
+ -
+ active <%end %>" href="/questions/liked/">
+ Liked
diff --git a/app/views/questions/show.html.erb b/app/views/questions/show.html.erb index 18aed6ca06c..875eafe6656 100644 --- a/app/views/questions/show.html.erb +++ b/app/views/questions/show.html.erb @@ -4,12 +4,12 @@ <%= javascript_include_tag('question') %> -<%= @node.author.name %> asked on <%= @node.created_at.to_s(:long) %> <% if @node.status == 0 || @node.status == 4 %>| UNPUBLISHED<% end %>
+- <%= number_with_delimiter(@node.views) %> views | <%= @node.answers.length %> answers | #<%= @node.id %>
<%= @node.author.name %> asked on <%= @node.created_at.to_s(:long) %> <% if @node.status == 0 || @node.status == 4 %>| UNPUBLISHED<% end %>
+ <%= number_with_delimiter(@node.views) %> views | <%= @node.answers.length %> answers | #<%= @node.id %>
@@ -60,7 +60,7 @@
Results for <%= @search_criteria.query %>
Searched users' profiles by username and bio
<% if @profiles.present? %>
Searched users' profiles by usertag
<% if @tag_profiles.present?%> @@ -67,4 +67,4 @@
<%= raw t('sidebar._author.recent_tags_for_author', :url1 => "/people/"+@user.name, :author => @user.name) %>
-+
- <%= t('dashboard._header.share_work') %>
+
+ <%= t('dashboard._header.share_work') %>
+
Toggle Dropdown
-
+ <%= t('dashboard._header.dropdown.share_activity') %>
+ <%= t('dashboard._header.dropdown.share_research_note') %>
+ <%= t('dashboard._header.dropdown.ask_question') %>
+ <%= t('dashboard._header.dropdown.post_event') %>
+
+ <%= t('dashboard._header.dropdown.tell_story_blog') %>
+
+
-
+
+
+
+
<% end %>
diff --git a/app/views/sidebar/_featured.html.erb b/app/views/sidebar/_featured.html.erb
index 3762e733006..1acaa2780e4 100644
--- a/app/views/sidebar/_featured.html.erb
+++ b/app/views/sidebar/_featured.html.erb
@@ -1,8 +1,8 @@
-
+
-
+
-
+
<% if params[:controller] != "home" && params[:action] != "home" %>
<%= render :partial => "sidebar/post_button" %>
diff --git a/app/views/sidebar/_list.html.erb b/app/views/sidebar/_list.html.erb
index 5dee9e6055f..b9267772fe5 100644
--- a/app/views/sidebar/_list.html.erb
+++ b/app/views/sidebar/_list.html.erb
@@ -1,27 +1,28 @@
<% if @node.has_mailing_list? %>
-
- <% mailing_list = @node.power_tag("list") %>
+
+
+ <% mailing_list = @node.power_tag("list") %>
-
+
-
-<% end %>
\ No newline at end of file
+
+<% end %>
diff --git a/app/views/sidebar/_none.html.erb b/app/views/sidebar/_none.html.erb
index dcf6d9fab8d..df0ea6edfd7 100644
--- a/app/views/sidebar/_none.html.erb
+++ b/app/views/sidebar/_none.html.erb
@@ -1,3 +1,3 @@
-
+
<%= render partial: 'tag/tagging', locals: { sidebar_tagging: true } %>
diff --git a/app/views/sidebar/_notes.html.erb b/app/views/sidebar/_notes.html.erb
index baed810a5b7..614bead8a69 100644
--- a/app/views/sidebar/_notes.html.erb
+++ b/app/views/sidebar/_notes.html.erb
@@ -1,5 +1,5 @@
<% if notes && notes.length > 0 %>
-
+
+ <%= t('sidebar._post_button.write_research_note') %>
+
<%= t('sidebar._post_button.post_research') %>
-
-
+
+
+
+ <%= t('sidebar._post_button.post_research_note') %>
+ <%= t('sidebar._post_button.create_wiki_page') %>
+
+ <%= t('sidebar._post_button.about_posting') %>
+ <% if current_user && (current_user.role == "moderator" || current_user.role == "admin") %>
+ <%= t('sidebar._post_button.moderate_spam') %>
+ <%= t('sidebar._post_button.email_search') %>
+ <% end %>
+
+
diff --git a/app/views/sidebar/_question.html.erb b/app/views/sidebar/_question.html.erb
index b066d546299..7d20bf1d11f 100644
--- a/app/views/sidebar/_question.html.erb
+++ b/app/views/sidebar/_question.html.erb
@@ -1,8 +1,8 @@
-
+
-
+
-
+
Ask related question »
diff --git a/app/views/sidebar/_related.html.erb b/app/views/sidebar/_related.html.erb
index bf295dccafa..55616bcf2ad 100644
--- a/app/views/sidebar/_related.html.erb
+++ b/app/views/sidebar/_related.html.erb
@@ -1,10 +1,10 @@
-
+
-
+
-
+
- <%= t('sidebar._related.write_research_note') %> »
+ <%= t('sidebar._related.write_research_note') %> »
<% tagnames = (@node.normal_tags.collect(&:name) + @node.location_tags).join(',') if @tagnames %>
<%= t('sidebar._related.ask_a_question') %> »
@@ -49,7 +49,7 @@
<% elsif @node&.has_power_tag('place') && !@node.lat && !@node.lon %>
-
+
Learn about location privacy
<% end %>
diff --git a/app/views/sidebar/_user.html.erb b/app/views/sidebar/_user.html.erb
index db1f51ddc5d..19a51af49f7 100644
--- a/app/views/sidebar/_user.html.erb
+++ b/app/views/sidebar/_user.html.erb
@@ -1,4 +1,4 @@
-
+
<%= render :partial => "sidebar/post_button" %>
diff --git a/app/views/sidebar/_wikis.html.erb b/app/views/sidebar/_wikis.html.erb
index b2e78c4680f..7ed44bf901e 100644
--- a/app/views/sidebar/_wikis.html.erb
+++ b/app/views/sidebar/_wikis.html.erb
@@ -1,5 +1,5 @@
<% if wikis && wikis.length > 0 %>
-
+
-
+
" value="<%= @start.strftime("%d-%m-%Y") %>" data-date-format="dd-mm-yyyy" tabindex="1" class="form-control" type="text" name="start">
-
+
" value="<%=@end.strftime("%d-%m-%Y") %>" data-date-format="dd-mm-yyyy" tabindex="1" class="form-control" type="text" name="end">
-
+
<%= submit_tag "Go" , class: 'btn btn-primary', :style=>'margin-top:2em;' %>
@@ -32,11 +32,11 @@
-
<% tagnames.each do |tagname| %> -- <%= tagname %>
+ - <%= tagname %>
<% end %>
<% end %> diff --git a/app/views/sidebar/_dashboard.html.erb b/app/views/sidebar/_dashboard.html.erb index 711a78409bb..cc1cc4935cf 100644 --- a/app/views/sidebar/_dashboard.html.erb +++ b/app/views/sidebar/_dashboard.html.erb @@ -1,32 +1,34 @@-
-- <%= t('dashboard._header.dropdown.share_activity') %>
- - <%= t('dashboard._header.dropdown.share_research_note') %>
- - <%= t('dashboard._header.dropdown.ask_question') %>
- - <%= t('dashboard._header.dropdown.post_event') %>
-
- - <%= t('dashboard._header.dropdown.tell_story_blog') %>
-
+--
-
-
- Ask a question
+
-
+
+
+ Ask a question
- -
-
-
- <%= t('dashboard._sidebar.wiki') %>
+
-
+
+
+ <%= t('dashboard._sidebar.wiki') %>
diff --git a/app/views/sidebar/_events.html.erb b/app/views/sidebar/_events.html.erb index 6691411fa29..1a5006cc503 100644 --- a/app/views/sidebar/_events.html.erb +++ b/app/views/sidebar/_events.html.erb @@ -1,15 +1,17 @@ <% if @node.has_power_tag('events') %> -<%= t('sidebar._events.local_events') %>
-- <% events = @node.power_tags('events') %> - <% events.each do |power_tag| %> - <% Tag.find_nodes_by_type_with_all_tags(["event",power_tag]).sort_by{|a| a.changed}.each do |node| %> -- <% if node.has_power_tag('date') %> <%= DateTime.strptime(node.power_tag('date'),'%m-%d-%Y').to_date.to_s(:long) %><% end %> <%= node.title %>
- <% end %>
- <% end %>
- <% if events.length == 0 %>- <%= t('sidebar._events.no_events') %>
<% end %>
-
-<%= t('sidebar._events.post_event') %>
-<%= t('sidebar._events.local_events') %>
++ <% events = @node.power_tags('events') %> + <% events.each do |power_tag| %> + <% Tag.find_nodes_by_type_with_all_tags(["event",power_tag]).sort_by{|a| a.changed}.each do |node| %> +- <% if node.has_power_tag('date') %> <%= DateTime.strptime(node.power_tag('date'),'%m-%d-%Y').to_date.to_s(:long) %><% end %> <%= node.title %>
+ <% end %>
+ <% end %>
+ <% if events.length == 0 %>- <%= t('sidebar._events.no_events') %>
<% end %>
+
+<%= t('sidebar._events.post_event') %>
+-
<%= t('sidebar._list.recent_discussion_topics') %>
++
<%= t('sidebar._list.recent_discussion_topics') %>
-- <% @node.mailing_list[0..4].each do |item| %> --
- <%= item.title.gsub('Re: ','').gsub('['+mailing_list+']','') %>
-
- <% end %>
-
-<%= distance_of_time_in_words(item.pubDate, Time.current, { include_seconds: false, scope: 'datetime.time_ago_in_words' }) %>
-<%= t('sidebar._list.all_topics') %> »
-+ <% @node.mailing_list[0..4].each do |item| %> +-
+ <%= item.title.gsub('Re: ','').gsub('['+mailing_list+']','') %>
+
+ <% end %>
+
+<%= distance_of_time_in_words(item.pubDate, Time.current, { include_seconds: false, scope: 'datetime.time_ago_in_words' }) %>
+<%= t('sidebar._list.all_topics') %> »
+<%= title %>
diff --git a/app/views/sidebar/_post_button.html.erb b/app/views/sidebar/_post_button.html.erb index 5176a952b0f..c8b27b7f300 100644 --- a/app/views/sidebar/_post_button.html.erb +++ b/app/views/sidebar/_post_button.html.erb @@ -1,18 +1,21 @@ - <%= t('sidebar._post_button.write_research_note') %> --- <%= t('sidebar._post_button.post_research_note') %>
- - <%= t('sidebar._post_button.create_wiki_page') %>
-
- - <%= t('sidebar._post_button.about_posting') %>
- <% if current_user && (current_user.role == "moderator" || current_user.role == "admin") %>
- - <%= t('sidebar._post_button.moderate_spam') %>
- - <%= t('sidebar._post_button.email_search') %>
- <% end %>
-
+<%= title %>
diff --git a/app/views/stats/_range.html.erb b/app/views/stats/_range.html.erb index 203ebbeb602..6b4be86c74a 100644 --- a/app/views/stats/_range.html.erb +++ b/app/views/stats/_range.html.erb @@ -1,15 +1,15 @@Choose a starting and an ending date in the field below to see activity during that range
<%= form_tag request.url, method: 'get', enforce_utf8: false do %>diff --git a/app/views/users/_answered.html.erb b/app/views/users/_answered.html.erb index 45b18daa2e8..7dd2d19e1a4 100644 --- a/app/views/users/_answered.html.erb +++ b/app/views/users/_answered.html.erb @@ -5,21 +5,21 @@ <% @answered_questions.each_with_index do |question,i| %> <% answers = if user then question&.answers.where(uid: user.uid) else question.answers end %> -
<%= question.title %>
<% if answers.collect(&:accepted).include?(true) %> -Accepted
+Accepted
<% end %><%= question.author.name %> asked about <%= time_ago_in_words(question.created_at) %> ago
-answered on <%= answer.created_at.strftime("%b %d, %Y") %><% if answer.accepted %> <% end %> <%= answer.likers.length %>
+answered on <%= answer.created_at.strftime("%b %d, %Y") %><% if answer.accepted %> <% end %> <%= answer.likers.length %>
<% end %> Show all <%= question.answers.count %> answers »+
+
<%= t('users._photo.profile_photo') %>
- <%= t('users._photo.drag_and_drop_image') %> + <%= t('users._photo.drag_and_drop_image') %> - <%= t('users._photo.choose_image') %> + <%= t('users._photo.choose_image') %>
-+