Merge branch 'site_tour' into stable

Conflicts: plugins/site_tour/views/box_organizer/site_tour_plugin/_tour_block.html.erb plugins/site_tour/views/tour_actions.html.erb

Merge branch 'site_tour' into stable
Conflicts: plugins/site_tour/views/box_organizer/site_tour_plugin/_tour_block.html.erb plugins/site_tour/views/tour_actions.html.erb
Victor Costa
2 parents 377edbac 0056aa48
Showing 8 changed files with 134 additions and 48 deletions Show diff stats
plugins/site_tour/public/edit_tour_block.css
plugins/site_tour/public/edit_tour_block.js
plugins/site_tour/test/functional/site_tour_plugin_admin_controller_test.rb
plugins/site_tour/test/unit/site_tour_plugin_test.rb
plugins/site_tour/views/box_organizer/site_tour_plugin/_tour_block.html.erb
plugins/site_tour/views/box_organizer/site_tour_plugin/_tour_block_group_item.html.erb
plugins/site_tour/views/box_organizer/site_tour_plugin/_tour_block_item.html.erb
plugins/site_tour/views/tour_actions.html.erb
+#edit-tour-block .list-items {
+  margin-bottom: 25px;
+}
-#edit-tour-block #droppable-tour-actions {
-  padding-left: 23px;
+#edit-tour-block .droppable-items {
+  padding-left: 0;
   margin-top: -12px;
 }
-#edit-tour-block #droppable-tour-actions li {
+#edit-tour-block .droppable-items li {
   list-style-type: none;
 }
-#edit-tour-block .action-row {
+#edit-tour-block .item-row {
   line-height: 25px;
   margin-bottom: 5px;
-  padding: 10px 1px 10px 10px;
+  padding: 0;
   cursor: pointer;
   width: 97%;
 }
-#edit-tour-block .action-row:hover {
-  background: #ddd url(../images/drag-and-drop.png) no-repeat;
+#edit-tour-block .item-row:hover {
+  background: #ddd url(/images/drag-and-drop.png) no-repeat;
   background-position: 98% 15px;
 }
-#edit-tour-block .action-row li {
+#edit-tour-block .item-row li {
   list-style-type: none;
   display: inline;
   margin-left: 5px;
@@ -30,7 +33,6 @@
 #edit-tour-block {
   width: 620px;
   position: relative;
-  left: -24px;
 }
 #edit-tour-block #new-template {
@@ -39,8 +41,7 @@
 #edit-tour-block .list-header {
   width: 98%;
-  height: 25px;
-  padding: 10px 1px 10px 10px;
+  padding: 0 1px 10px 10px;
   margin-bottom: 5px;
   cursor: pointer;
 }
@@ -49,16 +50,16 @@
   list-style-type: none;
   display: inline;
   font-weight: bold;
-  font-size: 14px;
+  font-size: 12px;
   text-align: center;
 }
 #edit-tour-block .list-header .list-name {
-  margin-left: 50px;
+  margin-left: 20px;
 }
 #edit-tour-block .list-header .list-selector {
   margin-left: 63px;
 }
-#edit-tour-block .list-header .list-description {
+#edit-tour-block .list-header .list-description, #edit-tour-block .list-header .list-event {
   margin-left: 68px;
 }
-function add_new_action() {
-  var new_action = jQuery('#edit-tour-block #new-template>li').clone();
-  new_action.show();
-  jQuery('#droppable-tour-actions').append(new_action);
-}
-
 jQuery(document).ready(function(){
-  jQuery('#edit-tour-block').on('click', '.delete-tour-action-row', function() {
+  jQuery('#edit-tour-block').on('click', '.add-item', function() {
+    var container = jQuery(this).closest('.list-items');
+    var new_action = container.find('#new-template>li').clone();
+    new_action.show();
+    container.find('.droppable-items').append(new_action);
+  });
+
+  jQuery('#edit-tour-block').on('click', '.delete-tour-block-item', function() {
     jQuery(this).parent().parent().remove();
     return false;
   });
-  jQuery("#droppable-tour-actions").sortable({
+  jQuery("#edit-tour-block .droppable-items").sortable({
     revert: true,
     axis: "y"
   });
@@ -31,13 +31,29 @@ class SiteTourPluginAdminControllerTest &lt; ActionController::TestCase
     assert_equal nil, @settings.settings[:actions_csv]
   end
+  should 'do not store group_triggers_csv' do
+    group_triggers_csv = "tour_plugin,.tour-button,click"
+    post :index, :settings => {"group_triggers_csv" => group_triggers_csv}
+    @settings = Noosfero::Plugin::Settings.new(environment.reload, SiteTourPlugin)
+    assert_equal nil, @settings.settings[:group_triggers_csv]
+  end
+
   should 'convert actions array to csv to enable user edition' do
     @settings = Noosfero::Plugin::Settings.new(environment.reload, SiteTourPlugin)
     @settings.actions = [{:language => 'en', :group_name => 'tour_plugin', :selector => '.tour-button', :description => 'Click'}]
     @settings.save!
     get :index
-    assert_tag :tag => 'textarea', :content => "\nen,tour_plugin,.tour-button,Click\n"
+    assert_tag :tag => 'textarea', :attributes => {:class => 'actions-csv'}, :content => "\nen,tour_plugin,.tour-button,Click\n"
+  end
+
+  should 'convert group_triggers array to csv to enable user edition' do
+    @settings = Noosfero::Plugin::Settings.new(environment.reload, SiteTourPlugin)
+    @settings.group_triggers = [{:group_name => 'tour_plugin', :selector => '.tour-button', :event => 'click'}]
+    @settings.save!
+
+    get :index
+    assert_tag :tag => 'textarea', :attributes => {:class => 'groups-csv'}, :content => "\ntour_plugin,.tour-button,click\n"
   end
 end
@@ -38,4 +38,36 @@ class SiteTourPluginTest &lt; ActionView::TestCase
     assert_no_tag_in_string instance_exec(&plugin.body_ending), :tag => "script"
   end
+  should 'render javascript tag with tooltip actions and group triggers' do
+    expects(:language).returns('en').at_least_once
+
+    settings = Noosfero::Plugin::Settings.new(Environment.default, SiteTourPlugin)
+    settings.actions = [{:language => 'en', :group_name => 'test', :selector => 'body', :description => 'Test'}]
+    settings.group_triggers = [{:group_name => 'test', :selector => 'body', :event => 'click'}]
+    settings.save!
+
+    expects(:environment).returns(Environment.default)
+    body_ending = instance_exec(&plugin.body_ending)
+    assert_match /siteTourPlugin\.add\('test', 'body', 'Test', 1\);/, body_ending
+    assert_match /siteTourPlugin\.addGroupTrigger\('test', 'body', 'click'\);/, body_ending
+  end
+
+  should 'start each tooltip group with the correct step order' do
+    expects(:language).returns('en').at_least_once
+
+    settings = Noosfero::Plugin::Settings.new(Environment.default, SiteTourPlugin)
+    settings.actions = [
+        {:language => 'en', :group_name => 'test_a', :selector => 'body', :description => 'Test A1'},
+        {:language => 'en', :group_name => 'test_a', :selector => 'body', :description => 'Test A2'},
+        {:language => 'en', :group_name => 'test_b', :selector => 'body', :description => 'Test B1'},
+    ]
+    settings.save!
+
+    expects(:environment).returns(Environment.default)
+    body_ending = instance_exec(&plugin.body_ending)
+    assert_match /siteTourPlugin\.add\('test_a', 'body', 'Test A1', 1\);/, body_ending
+    assert_match /siteTourPlugin\.add\('test_a', 'body', 'Test A2', 2\);/, body_ending
+    assert_match /siteTourPlugin\.add\('test_b', 'body', 'Test B1', 1\);/, body_ending
+  end
+
 end
@@ -3,23 +3,41 @@
 <%= labelled_form_field check_box(:block, :display_button) + _('Display help button'), '' %>
-<strong><%= _('Tooltip Actions') %></strong>
 <div id='edit-tour-block'>
-  <ul class='list-header'>
-    <li class='list-name'><%= _('Group Name') %></li>
-    <li class='list-selector'><%= _('Selector') %></li>
-    <li class='list-description'><%= _('Description') %></li>
-  </ul>
-  <ul id="droppable-tour-actions">
-    <% for action in @block.actions do %>
-      <%= render :partial => 'box_organizer/site_tour_plugin/tour_block_item', :locals => {:action => action} %>
-    <% end %>
-  </ul>
+  <div id="tooltip-actions" class="list-items">
+    <h3><%= _('Tooltip Actions') %></h3>
+    <ul class='list-header'>
+      <li class='list-name'><%= _('Group Name') %></li>
+      <li class='list-selector'><%= _('Selector') %></li>
+      <li class='list-description'><%= _('Description') %></li>
+    </ul>
+    <ul id="droppable-tour-actions" class="droppable-items">
+      <% for action in @block.actions do %>
+        <%= render :partial => 'box_organizer/site_tour_plugin/tour_block_item', :locals => {:action => action} %>
+      <% end %>
+    </ul>
+    <div id="new-template">
+      <%= render :partial => 'box_organizer/site_tour_plugin/tour_block_item', :locals => {:action => {} } %>
+    </div>
+    <%= link_to_function(_('New Tooltip'), :class => 'add-item button icon-add with-text') %>
+  </div>
-  <div id="new-template">
-    <% template_action = {} %>
-    <%= render :partial => 'box_organizer/site_tour_plugin/tour_block_item', :locals => {:action => template_action} %>
+  <div id="group-triggers" class="list-items">
+    <h3><%= _('Group Triggers') %></h3>
+    <ul class='list-header'>
+      <li class='list-name'><%= _('Group Name') %></li>
+      <li class='list-selector'><%= _('Selector') %></li>
+      <li class='list-event'><%= _('Event') %></li>
+    </ul>
+    <ul id="droppable-tour-group-triggers" class="droppable-items">
+      <% for group in @block.group_triggers do %>
+        <%= render :partial => 'box_organizer/site_tour_plugin/tour_block_group_item', :locals => {:group => group} %>
+      <% end %>
+    </ul>
+    <div id="new-template">
+      <%= render :partial => 'box_organizer/site_tour_plugin/tour_block_group_item', :locals => {:group => {} } %>
+    </div>
+    <%= link_to_function(_('New Group Trigger'), :class => 'add-item button icon-add with-text') %>
   </div>
-</div>
-<%= link_to_function(_('New'), 'add_new_action();', :class => 'button icon-add with-text') %>
+</div>
@@ -0,0 +1,17 @@
+<li>
+  <ul class="item-row">
+    <li>
+      <%= text_field_tag 'block[group_triggers][][group_name]', group[:group_name], :class => 'group-name', :maxlength => 20 %>
+    </li>
+    <li>
+      <%= text_field_tag 'block[group_triggers][][selector]', group[:selector], :class => 'selector' %>
+    </li>
+    <li>
+      <%= text_field_tag 'block[group_triggers][][event]', group[:event], :class => 'description' %>
+    </li>
+    <li>
+      <%= button_without_text(:delete, _('Delete'), "#" , :class=>"delete-tour-block-item") %>
+    </li>
+  </ul>
+</li>
+
 <li>
-  <ul class="action-row">
+  <ul class="item-row">
     <li>
       <%= text_field_tag 'block[actions][][group_name]', action[:group_name], :class => 'group-name', :maxlength => 20 %>
     </li>
@@ -10,7 +10,7 @@
       <%= text_field_tag 'block[actions][][description]', action[:description], :class => 'description' %>
     </li>
     <li>
-      <%= button_without_text(:delete, _('Delete'), "#" , :class=>"delete-tour-action-row") %>
+      <%= button_without_text(:delete, _('Delete'), "#" , :class=>"delete-tour-block-item") %>
     </li>
   </ul>
 </li>
@@ -4,14 +4,15 @@
 <% if actions.present? %>
 <script>
   jQuery( document ).ready(function( $ ) {
-  <% actions.each_with_index do |action, index| %>
-    <%= "siteTourPlugin.add('#{j action[:group_name]}', '#{j action[:selector]}', '#{j action[:description]}', #{index + 1});" %>
-  <% end %>
-
-  <% (group_triggers||[]).each_with_index do |group, index| %>
-    <%= "siteTourPlugin.addGroupTrigger('#{j group[:group_name]}', '#{j group[:selector]}', '#{j group[:event]}');" %>
-  <% end %>
+    <% actions.group_by {|h| h[:group_name]}.each do |group, group_actions| %>
+      <% group_actions.each_with_index do |action, index| %>
+        <%= "siteTourPlugin.add('#{j action[:group_name]}', '#{j action[:selector]}', '#{j action[:description]}', #{index + 1});" %>
+      <% end %>
+    <% end %>
+    <% (group_triggers||[]).each_with_index do |group, index| %>
+      <%= "siteTourPlugin.addGroupTrigger('#{j group[:group_name]}', '#{j group[:selector]}', '#{j group[:event]}');" %>
+    <% end %>
   });
 </script>
 <% end %>
	@@ -31,13 +31,29 @@ class SiteTourPluginAdminControllerTest < ActionController::TestCase		@@ -31,13 +31,29 @@ class SiteTourPluginAdminControllerTest < ActionController::TestCase
31	assert_equal nil, @settings.settings[:actions_csv]	31	assert_equal nil, @settings.settings[:actions_csv]
32	end	32	end
33		33
		34	+ should 'do not store group_triggers_csv' do
		35	+ group_triggers_csv = "tour_plugin,.tour-button,click"
		36	+ post :index, :settings => {"group_triggers_csv" => group_triggers_csv}
		37	+ @settings = Noosfero::Plugin::Settings.new(environment.reload, SiteTourPlugin)
		38	+ assert_equal nil, @settings.settings[:group_triggers_csv]
		39	+ end
		40	+
34	should 'convert actions array to csv to enable user edition' do	41	should 'convert actions array to csv to enable user edition' do
35	@settings = Noosfero::Plugin::Settings.new(environment.reload, SiteTourPlugin)	42	@settings = Noosfero::Plugin::Settings.new(environment.reload, SiteTourPlugin)
36	@settings.actions = [{:language => 'en', :group_name => 'tour_plugin', :selector => '.tour-button', :description => 'Click'}]	43	@settings.actions = [{:language => 'en', :group_name => 'tour_plugin', :selector => '.tour-button', :description => 'Click'}]
37	@settings.save!	44	@settings.save!
38		45
39	get :index	46	get :index
40	- assert_tag :tag => 'textarea', :content => "\nen,tour_plugin,.tour-button,Click\n"	47	+ assert_tag :tag => 'textarea', :attributes => {:class => 'actions-csv'}, :content => "\nen,tour_plugin,.tour-button,Click\n"
		48	+ end
		49	+
		50	+ should 'convert group_triggers array to csv to enable user edition' do
		51	+ @settings = Noosfero::Plugin::Settings.new(environment.reload, SiteTourPlugin)
		52	+ @settings.group_triggers = [{:group_name => 'tour_plugin', :selector => '.tour-button', :event => 'click'}]
		53	+ @settings.save!
		54	+
		55	+ get :index
		56	+ assert_tag :tag => 'textarea', :attributes => {:class => 'groups-csv'}, :content => "\ntour_plugin,.tour-button,click\n"
41	end	57	end
42		58
43	end	59	end
	@@ -38,4 +38,36 @@ class SiteTourPluginTest < ActionView::TestCase		@@ -38,4 +38,36 @@ class SiteTourPluginTest < ActionView::TestCase
38	assert_no_tag_in_string instance_exec(&plugin.body_ending), :tag => "script"	38	assert_no_tag_in_string instance_exec(&plugin.body_ending), :tag => "script"
39	end	39	end
40		40
		41	+ should 'render javascript tag with tooltip actions and group triggers' do
		42	+ expects(:language).returns('en').at_least_once
		43	+
		44	+ settings = Noosfero::Plugin::Settings.new(Environment.default, SiteTourPlugin)
		45	+ settings.actions = [{:language => 'en', :group_name => 'test', :selector => 'body', :description => 'Test'}]
		46	+ settings.group_triggers = [{:group_name => 'test', :selector => 'body', :event => 'click'}]
		47	+ settings.save!
		48	+
		49	+ expects(:environment).returns(Environment.default)
		50	+ body_ending = instance_exec(&plugin.body_ending)
		51	+ assert_match /siteTourPlugin\.add\('test', 'body', 'Test', 1\);/, body_ending
		52	+ assert_match /siteTourPlugin\.addGroupTrigger\('test', 'body', 'click'\);/, body_ending
		53	+ end
		54	+
		55	+ should 'start each tooltip group with the correct step order' do
		56	+ expects(:language).returns('en').at_least_once
		57	+
		58	+ settings = Noosfero::Plugin::Settings.new(Environment.default, SiteTourPlugin)
		59	+ settings.actions = [
		60	+ {:language => 'en', :group_name => 'test_a', :selector => 'body', :description => 'Test A1'},
		61	+ {:language => 'en', :group_name => 'test_a', :selector => 'body', :description => 'Test A2'},
		62	+ {:language => 'en', :group_name => 'test_b', :selector => 'body', :description => 'Test B1'},
		63	+ ]
		64	+ settings.save!
		65	+
		66	+ expects(:environment).returns(Environment.default)
		67	+ body_ending = instance_exec(&plugin.body_ending)
		68	+ assert_match /siteTourPlugin\.add\('test_a', 'body', 'Test A1', 1\);/, body_ending
		69	+ assert_match /siteTourPlugin\.add\('test_a', 'body', 'Test A2', 2\);/, body_ending
		70	+ assert_match /siteTourPlugin\.add\('test_b', 'body', 'Test B1', 1\);/, body_ending
		71	+ end
		72	+
41	end	73	end
	@@ -3,23 +3,41 @@		@@ -3,23 +3,41 @@
3		3
4	<%= labelled_form_field check_box(:block, :display_button) + _('Display help button'), '' %>	4	<%= labelled_form_field check_box(:block, :display_button) + _('Display help button'), '' %>
5		5
6	-<strong><%= _('Tooltip Actions') %></strong>
7	<div id='edit-tour-block'>	6	<div id='edit-tour-block'>
8	- <ul class='list-header'>
9	- <li class='list-name'><%= _('Group Name') %></li>
10	- <li class='list-selector'><%= _('Selector') %></li>
11	- <li class='list-description'><%= _('Description') %></li>
12	- </ul>
13	- <ul id="droppable-tour-actions">
14	- <% for action in @block.actions do %>
15	- <%= render :partial => 'box_organizer/site_tour_plugin/tour_block_item', :locals => {:action => action} %>
16	- <% end %>
17	- </ul>	7	+ <div id="tooltip-actions" class="list-items">
		8	+ <h3><%= _('Tooltip Actions') %></h3>
		9	+ <ul class='list-header'>
		10	+ <li class='list-name'><%= _('Group Name') %></li>
		11	+ <li class='list-selector'><%= _('Selector') %></li>
		12	+ <li class='list-description'><%= _('Description') %></li>
		13	+ </ul>
		14	+ <ul id="droppable-tour-actions" class="droppable-items">
		15	+ <% for action in @block.actions do %>
		16	+ <%= render :partial => 'box_organizer/site_tour_plugin/tour_block_item', :locals => {:action => action} %>
		17	+ <% end %>
		18	+ </ul>
		19	+ <div id="new-template">
		20	+ <%= render :partial => 'box_organizer/site_tour_plugin/tour_block_item', :locals => {:action => {} } %>
		21	+ </div>
		22	+ <%= link_to_function(_('New Tooltip'), :class => 'add-item button icon-add with-text') %>
		23	+ </div>
18		24
19	- <div id="new-template">
20	- <% template_action = {} %>
21	- <%= render :partial => 'box_organizer/site_tour_plugin/tour_block_item', :locals => {:action => template_action} %>	25	+ <div id="group-triggers" class="list-items">
		26	+ <h3><%= _('Group Triggers') %></h3>
		27	+ <ul class='list-header'>
		28	+ <li class='list-name'><%= _('Group Name') %></li>
		29	+ <li class='list-selector'><%= _('Selector') %></li>
		30	+ <li class='list-event'><%= _('Event') %></li>
		31	+ </ul>
		32	+ <ul id="droppable-tour-group-triggers" class="droppable-items">
		33	+ <% for group in @block.group_triggers do %>
		34	+ <%= render :partial => 'box_organizer/site_tour_plugin/tour_block_group_item', :locals => {:group => group} %>
		35	+ <% end %>
		36	+ </ul>
		37	+ <div id="new-template">
		38	+ <%= render :partial => 'box_organizer/site_tour_plugin/tour_block_group_item', :locals => {:group => {} } %>
		39	+ </div>
		40	+ <%= link_to_function(_('New Group Trigger'), :class => 'add-item button icon-add with-text') %>
22	</div>	41	</div>
23	-</div>
24		42
25	-<%= link_to_function(_('New'), 'add_new_action();', :class => 'button icon-add with-text') %>	43	+</div>
@@ -0,0 +1,17 @@		@@ -0,0 +1,17 @@
	1	+<li>
	2	+ <ul class="item-row">
	3	+ <li>
	4	+ <%= text_field_tag 'block[group_triggers][][group_name]', group[:group_name], :class => 'group-name', :maxlength => 20 %>
	5	+ </li>
	6	+ <li>
	7	+ <%= text_field_tag 'block[group_triggers][][selector]', group[:selector], :class => 'selector' %>
	8	+ </li>
	9	+ <li>
	10	+ <%= text_field_tag 'block[group_triggers][][event]', group[:event], :class => 'description' %>
	11	+ </li>
	12	+ <li>
	13	+ <%= button_without_text(:delete, _('Delete'), "#" , :class=>"delete-tour-block-item") %>
	14	+ </li>
	15	+ </ul>
	16	+</li>
	17	+
1	<li>	1	<li>
2	- <ul class="action-row">	2	+ <ul class="item-row">
3	<li>	3	<li>
4	<%= text_field_tag 'block[actions][][group_name]', action[:group_name], :class => 'group-name', :maxlength => 20 %>	4	<%= text_field_tag 'block[actions][][group_name]', action[:group_name], :class => 'group-name', :maxlength => 20 %>
5	</li>	5	</li>
	@@ -10,7 +10,7 @@		@@ -10,7 +10,7 @@
10	<%= text_field_tag 'block[actions][][description]', action[:description], :class => 'description' %>	10	<%= text_field_tag 'block[actions][][description]', action[:description], :class => 'description' %>
11	</li>	11	</li>
12	<li>	12	<li>
13	- <%= button_without_text(:delete, _('Delete'), "#" , :class=>"delete-tour-action-row") %>	13	+ <%= button_without_text(:delete, _('Delete'), "#" , :class=>"delete-tour-block-item") %>
14	</li>	14	</li>
15	</ul>	15	</ul>
16	</li>	16	</li>