diff --git a/app/views/blocks/profile_info_actions/_join_leave_community.html.erb b/app/views/blocks/profile_info_actions/_join_leave_community.html.erb index 284c0c8..787a8eb 100644 --- a/app/views/blocks/profile_info_actions/_join_leave_community.html.erb +++ b/app/views/blocks/profile_info_actions/_join_leave_community.html.erb @@ -1,4 +1,4 @@ -
+
<% if logged_in? %> <% if profile.members.include?(user) %> <%= button(:delete, content_tag('span', _('Leave community')), profile.leave_url, diff --git a/app/views/layouts/application-ng.html.erb b/app/views/layouts/application-ng.html.erb index 86d5afc..90fab3c 100644 --- a/app/views/layouts/application-ng.html.erb +++ b/app/views/layouts/application-ng.html.erb @@ -78,6 +78,5 @@ if content.respond_to?(:call) then instance_exec(&content).html_safe else content.html_safe end end.join("\n") %> - <%= javascript_include_tag 'require_login' %> diff --git a/plugins/require_auth_to_comment/views/require_auth_to_comment_plugin_admin/index.html.erb b/plugins/require_auth_to_comment/views/require_auth_to_comment_plugin_admin/index.html.erb index cc5ae02..3d537b1 100644 --- a/plugins/require_auth_to_comment/views/require_auth_to_comment_plugin_admin/index.html.erb +++ b/plugins/require_auth_to_comment/views/require_auth_to_comment_plugin_admin/index.html.erb @@ -1,6 +1,6 @@

<%= _('Require auth to comment Settings')%>

-<% form_for(:settings) do |f| %> +<%= form_for(:settings) do |f| %>
diff --git a/plugins/vote/public/style.css b/plugins/vote/public/style.css index 8c72b1b..d128764 100644 --- a/plugins/vote/public/style.css +++ b/plugins/vote/public/style.css @@ -1,5 +1,4 @@ .vote-actions { - position: absolute; top: 40px; right: 0px; } diff --git a/plugins/vote/views/vote/_vote.html.erb b/plugins/vote/views/vote/_vote.html.erb index 9d6019e..0c2bc14 100644 --- a/plugins/vote/views/vote/_vote.html.erb +++ b/plugins/vote/views/vote/_vote.html.erb @@ -5,7 +5,7 @@ reload_url = url_for(:controller => 'vote_plugin_profile', :profile => profile.i class="vote-action action <%= action %>-action"> - <%= link_to content_tag(:span, count, :class=>'like-action-counter') + content_tag(:span, '', :class=>"action-icon #{action}"), url, :class => "#{active ? 'like-action-active':''} require-login-popup" %> + <%= link_to content_tag(:span, count, :class=>'like-action-counter') + content_tag(:span, '', :class=>"action-icon #{action}"), url, :class => "#{active ? 'like-action-active':''} #{user ? '':'disabled'} require-login-popup" %> <% if !voters.blank? %> diff --git a/public/javascripts/application.js b/public/javascripts/application.js index 3718063..59957cd 100644 --- a/public/javascripts/application.js +++ b/public/javascripts/application.js @@ -27,6 +27,7 @@ *= require manage-products.js *= require catalog.js *= require autogrow.js +*= require require_login.js */ // scope for noosfero stuff -- libgit2 0.21.2