rules_engine 0.2.0 → 0.3.0

data/{rails_generators/templates/app → app}/views/re_plan_workflow_rules/new.html.erb

@@ -1,7 +1,7 @@
 <% set_re_breadcrumbs link_to("All Plans", re_plans_path, :class => "re-bc-plan-list"), 
 											link_to("Edit Plan", change_re_plan_path(@re_plan), :class => "re-bc-plan-change"),
 											link_to("Edit Workflow", change_re_plan_workflow_path(@re_plan, @re_workflow), :class => "re-bc-workflow-change"), 
-											'<span class="re-bc-rule-new">New Rule</span>' %>
+											'<span class="re-bc-rule-new">New Rule</span>'.html_safe %>
 
 <div class="prepend-1 span-20 append-1">      
 	<div class="re-infobox">

data/{rails_generators/templates/app → app}/views/re_plan_workflows/change.html.erb

@@ -1,7 +1,7 @@
 <% set_re_javascript_include 'rules_engine/re_workflow_change' %>
 <% set_re_breadcrumbs link_to("All Plans", re_plans_path, :class => "re-bc-plan-list"), 
 											link_to("View Plan", re_plan_path(@re_plan), :class => "re-bc-plan-show"),
-											'<span class="re-bc-workflow-change">Edit Workflow</span>' %>
+											'<span class="re-bc-workflow-change">Edit Workflow</span>'.html_safe %>
 
 <div class="span-17 border">      
 	<div class="span-1">
@@ -51,16 +51,17 @@
 <div class="span-7 last">      
 	<div class="clear top-5"></div>
 
-	<h4>
+<h4>
 		<%= link_to("View Plan", re_plan_path(@re_plan), :class => "re-menu-plan-show") %>
 	</h4>
 	<div class="clear top-5"></div>
 
 	<h4>
-		<%= link_to("Edit Plan", change_re_plan_path(@re_plan), :class => "re-menu-plan-change") %>
+		<%= link_to("Edit/Publish Plan", change_re_plan_path(@re_plan), :class => "re-menu-plan-change") %>
 	</h4>
 	<div class="clear top-5"></div>
 
+	
 	<h4>
 		<%= link_to("View Workflow", re_plan_workflow_path(@re_plan, @re_workflow), :class => "re-menu-workflow-show") %>
 	</h4>

data/{rails_generators/templates/app → app}/views/re_plan_workflows/copy.html.erb

@@ -1,7 +1,7 @@
 <% set_re_breadcrumbs link_to("All Plans", re_plans_path, :class => "re-bc-plan-list"), 
 											link_to("Edit Plan", change_re_plan_path(@re_plan), :class => "re-bc-plan-change"),
 											link_to("Edit Workflow", change_re_plan_workflow_path(@re_plan, @re_workflow), :class => "re-bc-workflow-change"), 
-											'<span class="re-bc-workflow-copy">copy Details</span>' %>
+											'<span class="re-bc-workflow-copy">copy Details</span>'.html_safe %>
 
 <div class="prepend-1 span-22 append-1">      
   <div class="re-infobox">

data/{rails_generators/templates/app → app}/views/re_plan_workflows/edit.html.erb

@@ -1,7 +1,7 @@
 <% set_re_breadcrumbs link_to("All Plans", re_plans_path, :class => "re-bc-plan-list"), 
 											link_to("Edit Plan", change_re_plan_path(@re_plan), :class => "re-bc-plan-change"),
 											link_to("Edit Workflow", change_re_plan_workflow_path(@re_plan, @re_workflow), :class => "re-bc-workflow-change"), 
-											'<span class="re-bc-workflow-edit">Edit Details</span>' %>
+											'<span class="re-bc-workflow-edit">Edit Details</span>'.html_safe %>
 
 <div class="prepend-1 span-22 append-1">      
   <div class="re-infobox">

data/{rails_generators/templates/app → app}/views/re_plan_workflows/new.html.erb

@@ -1,7 +1,7 @@
 <% set_re_breadcrumbs link_to("All Plans", re_plans_path, :class => "re-bc-plan-list"), 
 											link_to("View Plan", re_plan_path(@re_plan), :class => "re-bc-plan-show"),
 											link_to("Edit Plan", change_re_plan_path(@re_plan), :class => "re-bc-plan-change"),
-											'<span class="re-bc-workflow-new">New Workflow</span>' %>
+											'<span class="re-bc-workflow-new">New Workflow</span>'.html_safe %>
 
 <div class="prepend-1 span-22 append-1">      
   <div class="re-infobox">

data/{rails_generators/templates/app → app}/views/re_plan_workflows/show.html.erb

@@ -1,7 +1,7 @@
 <% set_re_javascript_include ['rules_engine/re_workflow_show', 'rules_engine/re_plan_preview', 'rules_engine/re_workflow_plan'] %>
 <% set_re_breadcrumbs link_to("All Plans", re_plans_path, :class => "re-bc-plan-list"), 
 											link_to("View Plan", re_plan_path(@re_plan), :class => "re-bc-plan-show"),
-											'<span class="re-bc-workflow-show">View Workflow</span>' %>
+											'<span class="re-bc-workflow-show">View Workflow</span>'.html_safe %>
 
 
 <div class="span-17 border">      

data/{rails_generators/templates/app → app}/views/re_plans/_change.html.erb

@@ -27,13 +27,13 @@
 </div>  
 
 <div style="display:none">
-  <% re_form_for(@re_plan, :url => publish_re_plan_path(@re_plan), :html => {:method => :put, :id => "re_plan_publish_form"}) do |f| %>
+  <%= re_form_for(@re_plan, :url => publish_re_plan_path(@re_plan), :html => {:method => :put, :id => "re_plan_publish_form"}) do |f| %>
 		<%= hidden_field_tag(:tag) %>
   <% end %>  
 
-  <% re_form_for(@re_plan, :url => revert_re_plan_path(@re_plan), :html => {:method => :put, :id => "re_plan_revert_form"}) do |f| %>
+  <%= re_form_for(@re_plan, :url => revert_re_plan_path(@re_plan), :html => {:method => :put, :id => "re_plan_revert_form"}) do |f| %>
   <% end %>  
 
-  <% re_form_for(@re_plan, :url => re_plan_path(@re_plan), :html => {:method => :delete, :id => "re_plan_delete_form"}) do |f| %>
+  <%= re_form_for(@re_plan, :url => re_plan_path(@re_plan), :html => {:method => :delete, :id => "re_plan_delete_form"}) do |f| %>
   <% end %>  
 </div>

data/{rails_generators/templates/app → app}/views/re_plans/_copy.html.erb

@@ -2,9 +2,9 @@
   <h3 class="re-hdr-plan-copy"> Copy Plan : <%=h @re_plan.title %></h3>
   <div class="clear top-10"></div>
   
-  <% re_form_for(@re_plan_copy, :url => duplicate_re_plan_path(@re_plan), :method => :post, :span => "3x13", :html => {:id => "re_plan_copy_form"}) do |f| %>
-    <%= f.error_messages :message => "Unable To Duplicated Plan" %>
-    <% re_whitebox do %>    
+  <%= re_form_for(@re_plan_copy, :url => duplicate_re_plan_path(@re_plan), :method => :post, :span => "3x13", :html => {:id => "re_plan_copy_form"}) do |f| %>
+    <%= f.re_error_on "Unable To Duplicated Plan" %>
+    <%= re_whitebox do %>    
       <%= f.text_field(:code, :required => true, :hint => "must be unique") %>
       <%= f.text_field(:title, :required => true) %>
       <%= f.text_area(:description) %>

data/{rails_generators/templates/app → app}/views/re_plans/_edit.html.erb

@@ -2,10 +2,10 @@
   <h3 class="re-hdr-plan-edit">Edit Details</h3>
   <div class="clear top-10"></div>
   
-  <% re_form_for(@re_plan, :url => re_plan_path(@re_plan), :method => :post, :span => "3x13", :html => {:id => "re_plan_edit_form"}) do |f| %>
-    <%= f.error_messages :message => "Unable To Update Plan" %>
-    <% re_whitebox do %>    
-      <%= re_form_text("Code", @re_plan.code, :span => "3x13", :hint => "<strong>NOTE :</strong> the plan code cannot be changed") %>
+  <%= re_form_for(@re_plan, :url => re_plan_path(@re_plan), :method => :post, :span => "3x13", :html => {:id => "re_plan_edit_form"}) do |f| %>
+    <%= f.re_error_on "Unable To Update Plan" %>
+    <%= re_whitebox do %>    
+      <%= re_form_text("Code", @re_plan.code, :span => "3x13", :hint => "<strong>NOTE :</strong> the plan code cannot be changed".html_safe) %>
       <div class="clear top-5"></div>
       
       <%= f.text_field(:title, :required => true) %>

data/{rails_generators/templates/app → app}/views/re_plans/_menu.html.erb

@@ -1,6 +1,6 @@
 <% plan_status = @re_plan.plan_status %>
 
-<% if plan_status == RePlan::PLAN_STATUS_DRAFT || plan_status == RePlan::PLAN_STATUS_CHANGED %>
+<%# if plan_status == RePlan::PLAN_STATUS_DRAFT || plan_status == RePlan::PLAN_STATUS_CHANGED %>
   <h4>
 		<% if @re_plan.plan_error %>
     	<%= link_to("Publish Plan", "##{@re_plan.id}", :id => "re_plan_publish_with_errors", :class => "re-menu-plan-publish") %>
@@ -9,7 +9,7 @@
 		<% end %>
   </h4>    
 	<div class="clear top-5"></div>
-<% end %>  
+<%# end %>  
 
 <% if plan_status == RePlan::PLAN_STATUS_CHANGED %>
   <h4>

data/{rails_generators/templates/app → app}/views/re_plans/_new.html.erb

@@ -2,9 +2,9 @@
   <h3 class="re-hdr-plan-new"> New Plan</h3>
   <div class="clear top-10"></div>
   
-  <% re_form_for(@re_plan, :url => re_plans_path, :method => :post, :span => "3x13", :html => {:id => "re_plan_new_form"}) do |f| %>
-    <%= f.error_messages :message => "Unable To Create Plan" %>
-    <% re_whitebox do %>    
+  <%= re_form_for(@re_plan, :url => re_plans_path, :method => :post, :span => "3x13", :html => {:id => "re_plan_new_form"}) do |f| %>
+		<%= re_error_on(@re_plan, "Unable To Create Plan") %>    
+    <%= re_whitebox do %>    
       <%= f.text_field(:code, :required => true, :hint => "must be unique") %>
       <%= f.text_field(:title, :required => true) %>
       <%= f.text_area(:description) %>
@@ -12,7 +12,7 @@
       <div class="clear"></div>
   	  <%= re_button_submit_green('Insert', :id => "re_plan_new_insert") %>
   	  <%= re_button_link_orange('Cancel', re_plans_path, :id => "re_plan_new_cancel") %>
-    <% end %>
-  <% end %>
+    <% end =%>
+  <% end =%>
 </div>  
 <div class="clear"></div>

data/{rails_generators/templates/app → app}/views/re_plans/_workflow_change.html.erb

@@ -12,9 +12,9 @@
 		</h4>
     <div class="float-right">
 			<!-- NO ACTIONS ON THE RULE	 -->
-			<%= link_to("<span>Default</span>", "##{@re_plan.id}|#{re_workflow.id}", :class => "#{default_workflow ? 're-list-workflow-make-default-off' : 're-list-workflow-make-default'}") %>
-      <%= link_to("<span>Edit</span>", change_re_plan_workflow_path(@re_plan, re_workflow), :class => "re-list-workflow-change") %>
-      <%= link_to("<span>Remove</span>", "##{@re_plan.id}|#{re_workflow.id}", :class => "re-list-workflow-remove") %>
+			<%= link_to("<span>Default</span>".html_safe, "##{@re_plan.id}|#{re_workflow.id}", :class => "#{default_workflow ? 're-list-workflow-make-default-off' : 're-list-workflow-make-default'}") %>
+      <%= link_to("<span>Edit</span>".html_safe, change_re_plan_workflow_path(@re_plan, re_workflow), :class => "re-list-workflow-change") %>
+      <%= link_to("<span>Remove</span>".html_safe, "##{@re_plan.id}|#{re_workflow.id}", :class => "re-list-workflow-remove") %>
     </div>
     <div class="clear top-2"></div>    
 		<hr/>
@@ -36,9 +36,9 @@
 <% end %>
 
 <div style="display:none">
-  <% re_form_for(re_workflow, :url => remove_re_plan_workflow_path(@re_plan, re_workflow), :html => {:method => :put, :id => "re_workflow_remove_form_#{re_workflow.id}"}) do |f| %>
+  <%= re_form_for(re_workflow, :url => remove_re_plan_workflow_path(@re_plan, re_workflow), :html => {:method => :put, :id => "re_workflow_remove_form_#{re_workflow.id}"}) do |f| %>
   <% end %>  
   
-  <% re_form_for(re_workflow, :url => default_re_plan_workflow_path(@re_plan, re_workflow), :html => {:method => :put, :id => "re_workflow_default_form_#{re_workflow.id}"}) do |f| %>
+  <%= re_form_for(re_workflow, :url => default_re_plan_workflow_path(@re_plan, re_workflow), :html => {:method => :put, :id => "re_workflow_default_form_#{re_workflow.id}"}) do |f| %>
   <% end %>  
 </div>  

data/{rails_generators/templates/app → app}/views/re_plans/_workflow_show.html.erb

@@ -11,7 +11,7 @@
 	<div class="float-right">
 		<!-- NO ACTIONS ON THE RULE	 -->
 		<div class="float-right re-list-workflow-is-default<%= default_workflow ? '' : '-off' %>"><span>Default</span></div>
-			<%= link_to("<span>Show</span>", re_plan_workflow_path(re_plan, re_workflow), :class => "re-list-workflow-show") %>
+			<%= link_to("<span>Show</span>".html_safe, re_plan_workflow_path(re_plan, re_workflow), :class => "re-list-workflow-show") %>
   		</div>
   	<div class="clear top-2"></div>    
 	<hr/>

data/{rails_generators/templates/app → app}/views/re_plans/change.html.erb

@@ -1,7 +1,7 @@
 <% set_re_javascript_include ['rules_engine/re_workflow_add', 'rules_engine/re_workflow_preview', 'rules_engine/re_plan_change'] %>
 <% set_re_breadcrumbs link_to("All Plans", re_plans_path, :class => "re-bc-plan-list"), 
 											link_to("View Plan", re_plan_path(@re_plan), :class => "re-bc-plan-show"),
-											'<span class="re-bc-plan-change">Edit Plan</span>' %>
+											'<span class="re-bc-plan-change">Edit Plan</span>'.html_safe %>
 
 <div class="span-17 border">      
 	<div class="span-1">
@@ -64,7 +64,7 @@
 <div style="display:none">
   <div id="re_plan_action_confirm">
     <div class="span-14 last">
-      <% re_whitebox do %>    
+      <%= re_whitebox do %>    
         <h3 class="re-hdr-plan-alert"><span class="red">Confirm :</span> <span  id="re_plan_action_title"></span></h3>
         <div class="clear top-5"></div>
         <hr/>
@@ -86,7 +86,7 @@
 
   <div id="re_plan_publish_confirm">
     <div class="span-14 last">
-      <% re_whitebox do %>    
+      <%= re_whitebox do %>    
         <h3 class="re-hdr-plan-alert"><span class="red">Confirm :</span> Publish Plan</h3>
         <div class="clear top-5"></div>
 				<div class="red prepend-1" id="re_plan_publish_warning"></div>
@@ -110,7 +110,7 @@
   
   <div id="re_workflow_remove_confirm">
     <div class="span-11 last">
-      <% re_whitebox do %>    
+      <%= re_whitebox do %>    
         <h3 class="re-hdr-workflow-alert"><span class="red">Confirm :</span> Remove Workflow</h3>
         <div class="clear top-5"></div>
         <hr/>

data/{rails_generators/templates/app → app}/views/re_plans/copy.html.erb

@@ -1,6 +1,6 @@
 <% set_re_breadcrumbs link_to("All Plans", re_plans_path, :class => "re-bc-plan-list"), 
 											link_to("Edit Plan", change_re_plan_path(@re_plan), :class => "re-bc-plan-change"), 
-											'<span class="re-bc-plan-copy">Copy Plan</span>' %>
+											'<span class="re-bc-plan-copy">Copy Plan</span>'.html_safe %>
 
 <div class="prepend-1 span-22 append-1">      
   <div class="re-infobox">

data/{rails_generators/templates/app → app}/views/re_plans/edit.html.erb

@@ -1,6 +1,6 @@
 <% set_re_breadcrumbs link_to("All Plans", re_plans_path, :class => "re-bc-plan-list"), 
 											link_to("Edit Plan", change_re_plan_path(@re_plan), :class => "re-bc-plan-change"), 
-											'<span class="re-bc-plan-edit">Edit Details</span>' %>
+											'<span class="re-bc-plan-edit">Edit Details</span>'.html_safe %>
 
 <div class="prepend-1 span-22 append-1">      
   <div class="re-infobox">

data/{rails_generators/templates/app → app}/views/re_plans/history.html.erb

@@ -1,7 +1,7 @@
 <% set_re_javascript_include ['rules_engine/re_history_index'] %>
 <% set_re_breadcrumbs link_to("All Plans", re_plans_path, :class => "re-bc-plan-list"), 
 										  link_to("Show Plan", re_plan_path(@re_plan), :class => "re-bc-plan-show"), 
-											'<span class="re-bc-history-list">Process History</span>' %>
+											'<span class="re-bc-history-list">Process History</span>'.html_safe %>
 
 <div class="prepend-1 span-22 append-1">      
   <div class="re-infobox">

data/{rails_generators/templates/app → app}/views/re_plans/index.html.erb

@@ -1,6 +1,6 @@
 <% set_re_javascript_include ['rules_engine/re_plan_preview', 'rules_engine/re_plan_new', 'rules_engine/re_history_index', 'rules_engine/re_history_show'] %>
 <% set_re_breadcrumbs_right link_to("All Plans", re_plans_path, :class => "re-bc-plan-list"), 
-														link_to("<em>All Workflows</em>", re_workflows_path, :class => "re-bc-workflow-list blue")%>
+														link_to("<em>All Workflows</em>".html_safe, re_workflows_path, :class => "re-bc-workflow-list blue")%>
 
 <div class="span-1">
 	<div class="re-xtra-plan-title-plural"><span>plans</span></div>

data/{rails_generators/templates/app → app}/views/re_plans/new.html.erb

@@ -1,4 +1,5 @@
-<% set_re_breadcrumbs link_to("All Plans", re_plans_path, :class => "re-bc-plan-list"), '<span class="re-bc-plan-new">New Plan</span>' %>
+<% set_re_breadcrumbs link_to("All Plans", re_plans_path, :class => "re-bc-plan-list"), 
+															'<span class="re-bc-plan-new">New Plan</span>'.html_safe %>
 
 <div class="prepend-1 span-22 append-1">      
   <div class="re-infobox">

data/{rails_generators/templates/app → app}/views/re_plans/preview.html.erb

@@ -1,4 +1,5 @@
-<% set_re_breadcrumbs link_to("All Plans", re_plans_path, :class => "re-bc-plan-list"), '<span class="re-bc-plan-show">Preview Plan</span>' %>
+<% set_re_breadcrumbs link_to("All Plans", re_plans_path, :class => "re-bc-plan-list"), 
+															'<span class="re-bc-plan-show">Preview Plan</span>'.html_safe %>
 
 <div class="prepend-1 span-22 append-1">      
 	<%= render '/re_plans/preview' %>

data/{rails_generators/templates/app → app}/views/re_plans/show.html.erb

@@ -1,5 +1,5 @@
 <% set_re_javascript_include ['rules_engine/re_workflow_preview', 'rules_engine/re_publication_show', 'rules_engine/re_history_index', 'rules_engine/re_history_show'] %>
-<% set_re_breadcrumbs link_to("All Plans", re_plans_path, :class => "re-bc-plan-list"), '<span class="re-bc-plan-show">View Plan</span>' %>
+<% set_re_breadcrumbs link_to("All Plans", re_plans_path, :class => "re-bc-plan-list"), '<span class="re-bc-plan-show">View Plan</span>'.html_safe %>
 
 <div class="span-17 border">      
 	<div class="span-1">

data/{rails_generators/templates/app → app}/views/re_plans/template.html.erb

@@ -8,7 +8,7 @@
   <p>Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, </p> 
   <p>Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, </p> 
 
-  <% %w(warning boldblack black white grey red dkgreen blue lightblue green brown).each do |type| %>
+  <% %w(warning boldblack black white grey red dkreg blue lightblue green dkgreen brown).each do |type| %>
     <p class="<%= type %>"><%= type %></p> 
   <% end %>  
 </div>  
@@ -25,7 +25,7 @@
 <h1>Boxes</h1>   
   <div class="span-12">
     <h3>Whitebox</h3>   
-    <% re_whitebox do %>
+    <%= re_whitebox do %>
       <div class="span-11 last">
         <p>Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, </p> 
       </div>  
@@ -34,7 +34,7 @@
   
   <div class="span-12 last">
     <h3>Shadowbox</h3>   
-    <% re_shadowbox do %>
+    <%= re_shadowbox do %>
       <p>Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, </p> 
     <% end %>  
   </div>
@@ -154,11 +154,11 @@
 
 <div class="span-23 prepend-1 last showgrid">  
   <h1>re_form_for</h1>   
-  <% re_form_for(:demo_form) do |f| %>
+  <%= re_form_for(:demo_form) do |f| %>
     <%= f.text_field("default_4x8")%>
   <% end %>
 
-  <% re_form_for(:demo_form, :span => "6x8") do |f| %>
+  <%= re_form_for(:demo_form, :span => "6x8") do |f| %>
     <%= f.text_field("default_6x8")%>
     <%= f.text_field("override_5x9", :span => "5x9")%>
   <% end %>

data/{rails_generators/templates/app → app}/views/re_publications/show.html.erb

@@ -1,6 +1,6 @@
 <% set_re_javascript_include ['rules_engine/re_publication_show'] %>
 <% set_re_breadcrumbs link_to("All Plans", re_workflows_path, :class => "re-bc-workflow-list"), 
-											'<span class="re-bc-publication-show">Show Publications</span>' %>
+											'<span class="re-bc-publication-show">Show Publications</span>'.html_safe %>
 
 <div class="prepend-1 span-22 append-1">      
   <div class="re-infobox">

data/{rails_generators/templates/app → app}/views/re_workflow_rules/_edit.html.erb

@@ -5,9 +5,9 @@
   <h3 class="re-hdr-rule-edit"> Edit <%= @re_rule.rule.options[:display_name] %></h3>
   <div class="clear top-10"></div>
 
-  <% re_form_for(@re_rule, :url => update_path, :method => :post, :span => "3x13", :html => {:id => "re_rule_edit_form"}) do |f| %>
-    <%= f.error_messages :message => "Unable To Update Rule : #{@re_rule.rule.options[:display_name]}" %>
-    <% re_whitebox do %>    
+  <%= re_form_for(@re_rule, :url => update_path, :method => :post, :span => "3x13", :html => {:id => "re_rule_edit_form"}) do |f| %>
+    <%= f.re_error_on "Unable To Update Rule : #{@re_rule.rule.options[:display_name]}" %>
+    <%= re_whitebox do %>    
       <%= render(@re_rule.rule.options[:edit_partial], :f => f) %>
       
       <div class="clear"></div>