From 39b9ad5e90585b994ac19dbba5e52795f8d73918 Mon Sep 17 00:00:00 2001 From: jywarren Date: Mon, 7 Mar 2016 17:30:22 -0500 Subject: [PATCH 1/2] fix for post image choose button --- app/views/editor/_main_image.html.erb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/app/views/editor/_main_image.html.erb b/app/views/editor/_main_image.html.erb index df5ecd9409..21593c2115 100644 --- a/app/views/editor/_main_image.html.erb +++ b/app/views/editor/_main_image.html.erb @@ -3,6 +3,7 @@ style="display:none;" <% end %>src="<% if @node && @node.main_image %><%= @node.main_image.path(:default) %><% elsif params[:main_image] && Image.find_by_id(params[:main_image]) %><%= Image.find_by_id(params[:main_image]).path %><% elsif @image %><%= @image.path(:default) %><% end %>" /> +

-

<% if current_user.following("everything") %> - Following all research notes + Following all research notes <% else %> Subscribe to all notes <% end %> diff --git a/app/views/like/_like.html.erb b/app/views/like/_like.html.erb index 946c9704fc..66fcef992a 100644 --- a/app/views/like/_like.html.erb +++ b/app/views/like/_like.html.erb @@ -1,6 +1,6 @@

diff --git a/app/views/tag/contributors-index.html.erb b/app/views/tag/contributors-index.html.erb index fdf4e55017..5a4ecf554c 100644 --- a/app/views/tag/contributors-index.html.erb +++ b/app/views/tag/contributors-index.html.erb @@ -46,9 +46,9 @@
RSS <% if current_user.following(tag.name) %> - Following <%= tag.name %> + Following <%= tag.name %> <% else %> - Follow <%= tag.name %> + Follow <%= tag.name %> <% end %>
diff --git a/app/views/tag/contributors.html.erb b/app/views/tag/contributors.html.erb index c32fbec92f..fc0f2c5cd3 100644 --- a/app/views/tag/contributors.html.erb +++ b/app/views/tag/contributors.html.erb @@ -45,9 +45,9 @@
RSS <% if current_user.following(params[:id]) %> - Following <%= params[:id] %> + Following <%= params[:id] %> <% else %> - Follow <%= params[:id] %> + Follow <%= params[:id] %> <% end %>
diff --git a/app/views/tag/show.html.erb b/app/views/tag/show.html.erb index 8e6c8807b7..49c0e6dfec 100644 --- a/app/views/tag/show.html.erb +++ b/app/views/tag/show.html.erb @@ -46,9 +46,9 @@ RSS <% unless @wildcard %> <% if current_user.following(params[:id]) %> - Following <%= params[:id] %> + Following <%= params[:id] %> <% else %> - Follow <%= params[:id] %> + Follow <%= params[:id] %> <% end %> <%= DrupalTag.follower_count(params[:id]) %> <% end %> diff --git a/app/views/users/profile.html.erb b/app/views/users/profile.html.erb index bf72c7ec60..6081b7ed28 100644 --- a/app/views/users/profile.html.erb +++ b/app/views/users/profile.html.erb @@ -1,5 +1,10 @@
- <% if @user.user && @user.user.photo_file_name %><% end %> + <% if @user.user && @user.user.photo_file_name %> + +
+ +
+ <% end %> Follow <%= @user.name %> @@ -36,19 +41,21 @@
- <% if @wikis && @wikis.length > 0 %> -

Wiki pages recently contributed to

-
    - <% @wikis.each do |wiki| %> - <% unless (!@node.nil? && wiki.nid == @node.nid) %> -
  • <%= wiki.latest.title %> updated <%= time_ago_in_words(wiki.updated_at) %> ago by <%= wiki.latest.author.name %>
    • +
- <% end %> +
diff --git a/app/views/wiki/show.html.erb b/app/views/wiki/show.html.erb index 294e2b8448..49dac20b71 100644 --- a/app/views/wiki/show.html.erb +++ b/app/views/wiki/show.html.erb @@ -44,7 +44,7 @@
    • <% if current_user && current_user.role == "admin" %>
  • <%= link_to "/wiki/delete/"+@node.id.to_s, :confirm => "Are you absolutely sure you want to delete '"+@node.path+"'? All revisions will be lost, and you cannot undo this action. If this is a spam page, be sure that it did not overwrite valid content before deleting the entire page." do %><% end %>
    • <% end %>
    • -
    • +