Merge branch 'login_popup' into 'master'

Display login popup to non logged users in actions that require login Create infrastructure to display login popup to non logged users in actions that require login This infra was applied for join community, make a vote and create comment when require auth to comment plugin is activated See merge request !572

Merge branch 'login_popup' into 'master'
Display login popup to non logged users in actions that require login Create infrastructure to display login popup to non logged users in actions that require login This infra was applied for join community, make a vote and create comment when require auth to comment plugin is activated See merge request !572
Leandro Santos
2 parents 8e2f02dc 33b629d3
Showing 11 changed files with 117 additions and 7 deletions Show diff stats
app/views/blocks/profile_info_actions/_join_leave_community.html.erb
lib/authenticated_system.rb
plugins/require_auth_to_comment/controllers/require_auth_to_comment_plugin_admin_controller.rb
plugins/require_auth_to_comment/lib/require_auth_to_comment_plugin.rb
plugins/require_auth_to_comment/public/comment_require_login.js
plugins/require_auth_to_comment/test/unit/require_auth_to_comment_plugin_test.rb
plugins/require_auth_to_comment/views/require_auth_to_comment_plugin_admin/index.html.erb
plugins/vote/public/style.css
plugins/vote/views/vote/_vote.html.erb
public/javascripts/application.js
public/javascripts/require_login.js
-<div class='join-leave-button'>
+<div class='join-leave-button require-login-popup'>
   <% if logged_in? %>
     <% if profile.members.include?(user) %>
       <%= button(:delete, content_tag('span', _('Leave community')), profile.leave_url,
@@ -60,7 +60,11 @@ module AuthenticatedSystem
       if logged_in? && authorized?
         true
       else
-        access_denied
+        if params[:require_login_popup]
+          render :json => { :require_login_popup => true }
+        else
+          access_denied
+        end
       end
     end
@@ -0,0 +1,14 @@
+class RequireAuthToCommentPluginAdminController < AdminController
+
+  def index
+    settings = params[:settings]
+    settings ||= {}
+    @settings = Noosfero::Plugin::Settings.new(environment, RequireAuthToCommentPlugin, settings)
+    if request.post?
+      @settings.save!
+      session[:notice] = 'Settings succefully saved.'
+      redirect_to :action => 'index'
+    end
+  end
+
+end
@@ -21,11 +21,20 @@ class RequireAuthToCommentPlugin &lt; Noosfero::Plugin
   end
   def stylesheet?
-    true
+    !display_login_popup?
+  end
+
+  def display_login_popup?
+    settings = Noosfero::Plugin::Settings.new(context.environment, self.class)
+    settings.require_type == 'display_login_popup'
+  end
+
+  def self.require_type_default_setting
+    'hide_button'
   end
   def js_files
-    ['hide_comment_form.js', 'jquery.livequery.min.js']
+    ['hide_comment_form.js', 'jquery.livequery.min.js'] + (display_login_popup? ? ['comment_require_login.js'] : [])
   end
   def body_beginning
@@ -0,0 +1,8 @@
+(function($) {
+  $(window).bind('userDataLoaded', function(event, data) {
+    if (!data.login && $('meta[name="profile.allow_unauthenticated_comments"]').length <= 0) {
+      $('.display-comment-form').unbind();
+      $('.display-comment-form').addClass('require-login-popup');
+    }
+  });
+})(jQuery);
@@ -5,9 +5,10 @@ class RequireAuthToCommentPluginTest &lt; ActiveSupport::TestCase
   def setup
     @plugin = RequireAuthToCommentPlugin.new
     @comment = Comment.new
+    @environment = fast_create(Environment)
   end
-  attr_reader :plugin, :comment
+  attr_reader :plugin, :comment, :environment
   should 'reject comments for unauthenticated users' do
     plugin.context = logged_in(false)
@@ -29,6 +30,35 @@ class RequireAuthToCommentPluginTest &lt; ActiveSupport::TestCase
     assert !comment.rejected?
   end
+  should 'the default require type setting be hide_button' do
+    assert_equal 'hide_button', plugin.class.require_type_default_setting
+  end
+
+  should 'display_login_popup? be false by default' do
+    context = mock();
+    context.expects(:environment).returns(environment)
+    plugin.expects(:context).returns(context)
+    assert !plugin.display_login_popup?
+  end
+
+  should 'display_login_popup? be true if require_type is defined as display_login_popup' do
+    context = mock();
+    context.expects(:environment).returns(environment)
+    environment[:settings] = {:require_auth_to_comment_plugin => {:require_type => "display_login_popup"}}
+    plugin.expects(:context).returns(context)
+    assert plugin.display_login_popup?
+  end
+
+  should 'not display stylesheet if login popup is active' do
+    plugin.expects(:display_login_popup?).returns(true)
+    assert !plugin.stylesheet?
+  end
+
+  should 'display stylesheet if login popup is inactive' do
+    plugin.expects(:display_login_popup?).returns(false)
+    assert plugin.stylesheet?
+  end
+
   protected
   def logged_in(boolean)
@@ -0,0 +1,20 @@
+<h1><%= _('Require auth to comment Settings')%></h1>
+
+<%= form_for(:settings) do |f| %>
+
+  <div class="require-type">
+    <strong>
+      <div class="hide-button">
+        <%= radio_button(:settings, :require_type, 'hide_button') %> <%= _('Hide button') %>
+      </div>
+      <div class="display-login-popup">
+        <%= radio_button(:settings, :require_type, 'display_login_popup') %> <%= _('Display login popup') %>
+      </div>
+    </strong>
+  </div>
+
+  <% button_bar do %>
+    <%= submit_button(:save, _('Save'), :cancel => {:controller => 'plugins', :action => 'index'}) %>
+  <% end %>
+
+<% end %>
 .vote-actions {
-  position: absolute;
   top: 40px;
   right: 0px;
 }
@@ -5,7 +5,7 @@ reload_url = url_for(:controller =&gt; &#39;vote_plugin_profile&#39;, :profile =&gt; profile.i
 <span id="vote_<%= model %>_<%= target.id %>_<%= vote %>" data-reload_url=<%= reload_url %> class="vote-action action <%= action %>-action">
-  <%= link_to_remote content_tag(:span, count, :class=>'like-action-counter') + content_tag(:span, '', :class=>"action-icon #{action}"), :url => url, :html => {:class => "#{active ? 'like-action-active':''} #{user ? '':'disabled'}"} %>
+  <%= 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? %>
     <span class="vote-detail">
@@ -27,6 +27,7 @@
 *= require manage-products.js
 *= require catalog.js
 *= require autogrow.js
+*= require require_login.js
 */
 // scope for noosfero stuff
@@ -0,0 +1,25 @@
+(function($) {
+  $(window).bind('userDataLoaded', function(event, data) {
+    $(".require-login-popup").live('click', function(){
+      clicked = $(this);
+      url = clicked.attr("href");
+      if(url!=undefined && url!='' && url!='#') {
+        if(!data.login) {
+          url = $.param.querystring(url, "require_login_popup=true");
+        }
+        loading_for_button(this);
+        $.post(url, function(data){
+          if(data.require_login_popup) {
+            $('#link_login').click(); //TODO see a better way to show login popup
+          }
+        }).complete(function() {
+          clicked.css("cursor","");
+          $(".small-loading").remove();
+        });
+      } else {
+        $('#link_login').click();
+      }
+      return false;
+    });
+  });
+})(jQuery);
1	-<div class='join-leave-button'>	1	+<div class='join-leave-button require-login-popup'>
2	<% if logged_in? %>	2	<% if logged_in? %>
3	<% if profile.members.include?(user) %>	3	<% if profile.members.include?(user) %>
4	<%= button(:delete, content_tag('span', _('Leave community')), profile.leave_url,	4	<%= button(:delete, content_tag('span', _('Leave community')), profile.leave_url,
@@ -0,0 +1,14 @@		@@ -0,0 +1,14 @@
	1	+class RequireAuthToCommentPluginAdminController < AdminController
	2	+
	3	+ def index
	4	+ settings = params[:settings]
	5	+ settings \|\|= {}
	6	+ @settings = Noosfero::Plugin::Settings.new(environment, RequireAuthToCommentPlugin, settings)
	7	+ if request.post?
	8	+ @settings.save!
	9	+ session[:notice] = 'Settings succefully saved.'
	10	+ redirect_to :action => 'index'
	11	+ end
	12	+ end
	13	+
	14	+end
@@ -0,0 +1,8 @@		@@ -0,0 +1,8 @@
	1	+(function($) {
	2	+ $(window).bind('userDataLoaded', function(event, data) {
	3	+ if (!data.login && $('meta[name="profile.allow_unauthenticated_comments"]').length <= 0) {
	4	+ $('.display-comment-form').unbind();
	5	+ $('.display-comment-form').addClass('require-login-popup');
	6	+ }
	7	+ });
	8	+})(jQuery);
	@@ -5,9 +5,10 @@ class RequireAuthToCommentPluginTest < ActiveSupport::TestCase		@@ -5,9 +5,10 @@ class RequireAuthToCommentPluginTest < ActiveSupport::TestCase
5	def setup	5	def setup
6	@plugin = RequireAuthToCommentPlugin.new	6	@plugin = RequireAuthToCommentPlugin.new
7	@comment = Comment.new	7	@comment = Comment.new
		8	+ @environment = fast_create(Environment)
8	end	9	end
9		10
10	- attr_reader :plugin, :comment	11	+ attr_reader :plugin, :comment, :environment
11		12
12	should 'reject comments for unauthenticated users' do	13	should 'reject comments for unauthenticated users' do
13	plugin.context = logged_in(false)	14	plugin.context = logged_in(false)
	@@ -29,6 +30,35 @@ class RequireAuthToCommentPluginTest < ActiveSupport::TestCase		@@ -29,6 +30,35 @@ class RequireAuthToCommentPluginTest < ActiveSupport::TestCase
29	assert !comment.rejected?	30	assert !comment.rejected?
30	end	31	end
31		32
		33	+ should 'the default require type setting be hide_button' do
		34	+ assert_equal 'hide_button', plugin.class.require_type_default_setting
		35	+ end
		36	+
		37	+ should 'display_login_popup? be false by default' do
		38	+ context = mock();
		39	+ context.expects(:environment).returns(environment)
		40	+ plugin.expects(:context).returns(context)
		41	+ assert !plugin.display_login_popup?
		42	+ end
		43	+
		44	+ should 'display_login_popup? be true if require_type is defined as display_login_popup' do
		45	+ context = mock();
		46	+ context.expects(:environment).returns(environment)
		47	+ environment[:settings] = {:require_auth_to_comment_plugin => {:require_type => "display_login_popup"}}
		48	+ plugin.expects(:context).returns(context)
		49	+ assert plugin.display_login_popup?
		50	+ end
		51	+
		52	+ should 'not display stylesheet if login popup is active' do
		53	+ plugin.expects(:display_login_popup?).returns(true)
		54	+ assert !plugin.stylesheet?
		55	+ end
		56	+
		57	+ should 'display stylesheet if login popup is inactive' do
		58	+ plugin.expects(:display_login_popup?).returns(false)
		59	+ assert plugin.stylesheet?
		60	+ end
		61	+
32	protected	62	protected
33		63
34	def logged_in(boolean)	64	def logged_in(boolean)
@@ -0,0 +1,20 @@		@@ -0,0 +1,20 @@
	1	+<h1><%= _('Require auth to comment Settings')%></h1>
	2	+
	3	+<%= form_for(:settings) do \|f\| %>
	4	+
	5	+ <div class="require-type">
	6	+ <strong>
	7	+ <div class="hide-button">
	8	+ <%= radio_button(:settings, :require_type, 'hide_button') %> <%= _('Hide button') %>
	9	+ </div>
	10	+ <div class="display-login-popup">
	11	+ <%= radio_button(:settings, :require_type, 'display_login_popup') %> <%= _('Display login popup') %>
	12	+ </div>
	13	+ </strong>
	14	+ </div>
	15	+
	16	+ <% button_bar do %>
	17	+ <%= submit_button(:save, _('Save'), :cancel => {:controller => 'plugins', :action => 'index'}) %>
	18	+ <% end %>
	19	+
	20	+<% end %>
1	.vote-actions {	1	.vote-actions {
2	- position: absolute;
3	top: 40px;	2	top: 40px;
4	right: 0px;	3	right: 0px;
5	}	4	}
	@@ -5,7 +5,7 @@ reload_url = url_for(:controller => 'vote_plugin_profile', :profile => profile.i		@@ -5,7 +5,7 @@ reload_url = url_for(:controller => 'vote_plugin_profile', :profile => profile.i
5		5
6	<span id="vote_<%= model %>_<%= target.id %>_<%= vote %>" data-reload_url=<%= reload_url %> class="vote-action action <%= action %>-action">	6	<span id="vote_<%= model %>_<%= target.id %>_<%= vote %>" data-reload_url=<%= reload_url %> class="vote-action action <%= action %>-action">
7		7
8	- <%= link_to_remote content_tag(:span, count, :class=>'like-action-counter') + content_tag(:span, '', :class=>"action-icon #{action}"), :url => url, :html => {:class => "#{active ? 'like-action-active':''} #{user ? '':'disabled'}"} %>	8	+ <%= 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" %>
9		9
10	<% if !voters.blank? %>	10	<% if !voters.blank? %>
11	<span class="vote-detail">	11	<span class="vote-detail">
	@@ -27,6 +27,7 @@		@@ -27,6 +27,7 @@
27	*= require manage-products.js	27	*= require manage-products.js
28	*= require catalog.js	28	*= require catalog.js
29	*= require autogrow.js	29	*= require autogrow.js
		30	+*= require require_login.js
30	*/	31	*/
31		32
32	// scope for noosfero stuff	33	// scope for noosfero stuff
@@ -0,0 +1,25 @@		@@ -0,0 +1,25 @@
	1	+(function($) {
	2	+ $(window).bind('userDataLoaded', function(event, data) {
	3	+ $(".require-login-popup").live('click', function(){
	4	+ clicked = $(this);
	5	+ url = clicked.attr("href");
	6	+ if(url!=undefined && url!='' && url!='#') {
	7	+ if(!data.login) {
	8	+ url = $.param.querystring(url, "require_login_popup=true");
	9	+ }
	10	+ loading_for_button(this);
	11	+ $.post(url, function(data){
	12	+ if(data.require_login_popup) {
	13	+ $('#link_login').click(); //TODO see a better way to show login popup
	14	+ }
	15	+ }).complete(function() {
	16	+ clicked.css("cursor","");
	17	+ $(".small-loading").remove();
	18	+ });
	19	+ } else {
	20	+ $('#link_login').click();
	21	+ }
	22	+ return false;
	23	+ });
	24	+ });
	25	+})(jQuery);