site_tour: parse profile fields in tooltip description

Victor Costa
1 parent 01ac8954
Showing 7 changed files with 46 additions and 3 deletions Show diff stats
plugins/site_tour/lib/site_tour_plugin/site_tour_helper.rb
plugins/site_tour/lib/site_tour_plugin/tour_block.rb
plugins/site_tour/public/edit_tour_block.css
plugins/site_tour/test/unit/site_tour_helper_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/tour_actions.html.erb
@@ -0,0 +1,14 @@
+module SiteTourPlugin::SiteTourHelper
+
+  def parse_tour_description(description)
+    p = profile rescue nil
+    if !p.nil? && description.present?
+      description.gsub('{profile.identifier}', p.identifier).
+        gsub('{profile.name}', p.name).
+        gsub('{profile.url}', url_for(p.url))
+    else
+      description
+    end
+  end
+
+end
@@ -8,7 +8,7 @@ class SiteTourPlugin::TourBlock &lt; Block
   before_save do |block|
     block.actions.reject! {|i| i[:group_name].blank? && i[:selector].blank? && i[:description].blank?}
-    block.group_triggers.reject! {|i| i[:group_name].blank? && i[:selector].blank? && i[:event].blank?}
+    block.group_triggers.reject! {|i| i[:group_name].blank? && i[:selector].blank?}
   end
   def self.description
+#edit-tour-block #tooltip-actions h3 {
+  margin-bottom: 5px;
+}
+
+#edit-tour-block .special-attributes {
+  color: rgb(157, 157, 157);
+}
+
 #edit-tour-block .list-items {
   margin-bottom: 25px;
 }
@@ -0,0 +1,17 @@
+require File.dirname(__FILE__) + '/../test_helper'
+
+class SiteTourHelperTest < ActionView::TestCase
+
+  include SiteTourPlugin::SiteTourHelper
+
+  should 'parse tooltip description' do
+    assert_equal 'test', parse_tour_description("test")
+  end
+
+  should 'replace profile attributes in tooltip description' do
+    profile = fast_create(Profile)
+    expects(:profile).returns(profile).at_least_once
+    assert_equal "name #{profile.name}, identifier #{profile.identifier}, url #{url_for profile.url}", parse_tour_description("name {profile.name}, identifier {profile.identifier}, url {profile.url}")
+  end
+
+end
@@ -6,6 +6,7 @@
 <div id='edit-tour-block'>
   <div id="tooltip-actions" class="list-items">
     <h3><%= _('Tooltip Actions') %></h3>
+    <div class="special-attributes"><%= _('Special fields for description: {profile.name}, {profile.identifier}, {profile.url}.') %></div>
     <ul class='list-header'>
       <li class='list-name'><%= _('Group Name') %></li>
       <li class='list-selector'><%= _('Selector') %></li>
@@ -7,7 +7,9 @@
       <%= text_field_tag 'block[group_triggers][][selector]', group[:selector], :class => 'selector' %>
     </li>
     <li>
-      <%= text_field_tag 'block[group_triggers][][event]', group[:event], :class => 'description' %>
+      <%= select_tag 'block[group_triggers][][event]',
+        options_for_select(['mouseenter', 'mouseleave', 'mouseover', 'mouseout', 'click', 'change', 'select', 'keydown', 'keyup', 'keypress', 'focus', 'blur', 'submit', 'drag', 'drop'], group[:event]),
+        :class => 'description' %>
     </li>
     <li>
       <%= button_without_text(:delete, _('Delete'), "#" , :class=>"delete-tour-block-item") %>
+<% extend SiteTourPlugin::SiteTourHelper %>
 <% js_file = defined?(:js_file) ? js_file : nil %>
 <%= javascript_include_tag(js_file) if js_file.present? %>
@@ -6,7 +7,7 @@
   jQuery( document ).ready(function( $ ) {
     <% 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});" %>
+        <%= "siteTourPlugin.add('#{j action[:group_name]}', '#{j action[:selector]}', '#{j parse_tour_description(action[:description])}', #{index + 1});" %>
       <% end %>
     <% end %>
@@ -0,0 +1,14 @@		@@ -0,0 +1,14 @@
	1	+module SiteTourPlugin::SiteTourHelper
	2	+
	3	+ def parse_tour_description(description)
	4	+ p = profile rescue nil
	5	+ if !p.nil? && description.present?
	6	+ description.gsub('{profile.identifier}', p.identifier).
	7	+ gsub('{profile.name}', p.name).
	8	+ gsub('{profile.url}', url_for(p.url))
	9	+ else
	10	+ description
	11	+ end
	12	+ end
	13	+
	14	+end
	@@ -8,7 +8,7 @@ class SiteTourPlugin::TourBlock < Block		@@ -8,7 +8,7 @@ class SiteTourPlugin::TourBlock < Block
8		8
9	before_save do \|block\|	9	before_save do \|block\|
10	block.actions.reject! {\|i\| i[:group_name].blank? && i[:selector].blank? && i[:description].blank?}	10	block.actions.reject! {\|i\| i[:group_name].blank? && i[:selector].blank? && i[:description].blank?}
11	- block.group_triggers.reject! {\|i\| i[:group_name].blank? && i[:selector].blank? && i[:event].blank?}	11	+ block.group_triggers.reject! {\|i\| i[:group_name].blank? && i[:selector].blank?}
12	end	12	end
13		13
14	def self.description	14	def self.description
		1	+#edit-tour-block #tooltip-actions h3 {
		2	+ margin-bottom: 5px;
		3	+}
		4	+
		5	+#edit-tour-block .special-attributes {
		6	+ color: rgb(157, 157, 157);
		7	+}
		8	+
1	#edit-tour-block .list-items {	9	#edit-tour-block .list-items {
2	margin-bottom: 25px;	10	margin-bottom: 25px;
3	}	11	}
@@ -0,0 +1,17 @@		@@ -0,0 +1,17 @@
	1	+require File.dirname(__FILE__) + '/../test_helper'
	2	+
	3	+class SiteTourHelperTest < ActionView::TestCase
	4	+
	5	+ include SiteTourPlugin::SiteTourHelper
	6	+
	7	+ should 'parse tooltip description' do
	8	+ assert_equal 'test', parse_tour_description("test")
	9	+ end
	10	+
	11	+ should 'replace profile attributes in tooltip description' do
	12	+ profile = fast_create(Profile)
	13	+ expects(:profile).returns(profile).at_least_once
	14	+ assert_equal "name #{profile.name}, identifier #{profile.identifier}, url #{url_for profile.url}", parse_tour_description("name {profile.name}, identifier {profile.identifier}, url {profile.url}")
	15	+ end
	16	+
	17	+end