will_filter 3.0.5 → 3.1.1

data/app/views/will_filter/filter/.tmp_calendar.html.erb.52766~

@@ -0,0 +1,66 @@
+<% form_tag(:action => :calendar) do %>
+<%=hidden_field_tag :mf_selected_date, @date %>
+<center>
+	  &nbsp; 				
+  	<%=link_to_function("&laquo;", "goToDate('#{@prev_month}', #{(@show_time==true)})", :style=>"font-size:16px;")%>	
+	  &nbsp;&nbsp;&nbsp; 				
+ 		<%= select_tag("month", options_for_select(@month_options, @month), {:id => "mf_cal_month", :onChange=>"goToDate('', #{(@show_time==true)})"}) %>
+ 		<%= select_tag("year", options_for_select(@year_options, @year), {:id => "mf_cal_year",:onChange=>"goToDate('', #{(@show_time==true)})"}) %>
+	  &nbsp;&nbsp;&nbsp; 				
+  	<%=link_to_function("&raquo", "goToDate('#{@next_month}', #{(@show_time==true)})", :style=>"font-size:16px;")%>	
+	  &nbsp; 				
+</center>
+<br>
+<table class="calendar_cells">
+	<tr>
+		<% @days.each_with_index do |day, index| %>
+			<td style="text-align:center;color:grey;font-size:10px;">
+					<b><%= day %></b>
+			</td>				
+		<% end %>
+	</tr>
+	<tr>
+		<% index = 0 %>
+		<% while @start_date <= @end_date do %>	
+			<% if @start_date.wday == 0 %>
+				</tr><tr>
+			<% end %>
+			
+			<% 0.upto(6) do |i| %>
+				<td valign="top" style="width:100px;border:1px solid #ccc;">
+					<% if @start_date.wday == i and @start_date <= @end_date %>
+						<% today = (@start_date==Date.today) ? "today" : "" %>
+						<% selected = (@start_date == @date and params[:skip_date].blank?) ? "selected" : "" %>
+						<% set_date = @show_time ? "" : "setDate();" %>
+						<table cellpadding="0px" cellspacing="0px" style="width:100%; background-color:white;">
+							<tr>
+								<td id="mf_cal_cell_<%=index%>" class="date_cell <%=today%> <%=selected%>" onClick="selectDateValue('<%=index%>', '<%=@start_date%>'); <%=set_date%>">
+								 <%=@start_date.day %>
+								</td>
+							</tr>
+						</table>
+						<% @start_date = @start_date + 1.day %>
+						<% index += 1 %>
+					<% end %>	
+				</td>
+			<% end %>
+		<% end %>		
+	</tr>
+</table>
+
+<% if @show_time %>
+	<center>
+	<br>
+	Time: &nbsp; 
+	<%= select_tag("mf_cal_hour", options_for_select(@hour_options, @hour)) %>
+	:
+	<%= select_tag("mf_cal_minute", options_for_select(@minute_options, @minute)) %>
+	:
+	<%= select_tag("mf_cal_second", options_for_select(@second_options, @second)) %>
+	<br><br>
+	<%=link_to_function "SET", "setDateTime();", :style => "font-size:14px;" %>
+	<br>
+	</center>
+<% end %>
+
+<% end %>

data/app/views/will_filter/filter/.tmp_calendar.html.erb.83182~

@@ -0,0 +1,66 @@
+<% form_tag(:action => :calendar) do %>
+<%=hidden_field_tag :mf_selected_date, @date %>
+<center>
+	  &nbsp; 				
+  	<%=link_to_function("&laquo;", "goToDate('#{@prev_month}', #{(@show_time==true)})", :style=>"font-size:16px;")%>	
+	  &nbsp;&nbsp;&nbsp; 				
+ 		<%= select_tag("month", options_for_select(@month_options, @month), {:id => "mf_cal_month", :onChange=>"goToDate('', #{(@show_time==true)})"}) %>
+ 		<%= select_tag("year", options_for_select(@year_options, @year), {:id => "mf_cal_year",:onChange=>"goToDate('', #{(@show_time==true)})"}) %>
+	  &nbsp;&nbsp;&nbsp; 				
+  	<%=link_to_function("&raquo", "goToDate('#{@next_month}', #{(@show_time==true)})", :style=>"font-size:16px;")%>	
+	  &nbsp; 				
+</center>
+<br>
+<table class="calendar_cells">
+	<tr>
+		<% @days.each_with_index do |day, index| %>
+			<td style="text-align:center;color:grey;font-size:10px;">
+					<b><%= day %></b>
+			</td>				
+		<% end %>
+	</tr>
+	<tr>
+		<% index = 0 %>
+		<% while @start_date <= @end_date do %>	
+			<% if @start_date.wday == 0 %>
+				</tr><tr>
+			<% end %>
+			
+			<% 0.upto(6) do |i| %>
+				<td valign="top" style="width:100px;border:1px solid #ccc;">
+					<% if @start_date.wday == i and @start_date <= @end_date %>
+						<% today = (@start_date==Date.today) ? "today" : "" %>
+						<% selected = (@start_date == @date and params[:skip_date].blank?) ? "selected" : "" %>
+						<% set_date = @show_time ? "" : "setDate();" %>
+						<table cellpadding="0px" cellspacing="0px" style="width:100%; background-color:white;">
+							<tr>
+								<td id="mf_cal_cell_<%=index%>" class="date_cell <%=today%> <%=selected%>" onClick="selectDateValue('<%=index%>', '<%=@start_date%>'); <%=set_date%>">
+								 <%=@start_date.day %>
+								</td>
+							</tr>
+						</table>
+						<% @start_date = @start_date + 1.day %>
+						<% index += 1 %>
+					<% end %>	
+				</td>
+			<% end %>
+		<% end %>		
+	</tr>
+</table>
+
+<% if @show_time %>
+	<center>
+	<br>
+	Time: &nbsp; 
+	<%= select_tag("mf_cal_hour", options_for_select(@hour_options, @hour)) %>
+	:
+	<%= select_tag("mf_cal_minute", options_for_select(@minute_options, @minute)) %>
+	:
+	<%= select_tag("mf_cal_second", options_for_select(@second_options, @second)) %>
+	<br><br>
+	<%=link_to_function "SET", "setDateTime();", :style => "font-size:14px;" %>
+	<br>
+	</center>
+<% end %>
+
+<% end %>

data/app/views/will_filter/filter/.tmp_export_data.html.erb.50322~

@@ -0,0 +1,44 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<html>
+	<head>
+		<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
+		<title>Export Data Table</title>
+		<style>
+			body {
+				font-family:Verdana, Geneva, Arial, Helvetica, sans-serif;
+				font-size:10px;
+			}
+			table {
+				border: 1px solid #ccc;
+			}
+			th {
+				text-align:left;
+				vertical-align:top;
+				border: 1px solid #ccc;
+			}
+			td {
+				text-align:left;
+				vertical-align:top;
+				border: 1px solid #ccc;
+			}
+		</style>
+	</head>
+	<body>
+		<table cellspacing="1px" cellpadding="1px">
+			<tr>
+				<% @model_filter.fields.each do |field| %>
+				<th><%=field%></th>
+				<% end %>
+			</tr>
+	
+			<% @objects.each do |obj| %>
+			<tr>
+				<% @model_filter.fields.each do |field| %>
+				<td><%=obj.send(field).to_s %></td>
+	      <% end %>
+			</tr>
+      <% end %>  
+		</table>	
+		
+	</body>
+</html>

data/app/views/will_filter/filter/.tmp_index.html.erb.40957~

@@ -0,0 +1,4 @@
+<div style="margin:5px;">
+	<%= will_filter(@filters) %>
+	<%= will_filter_table_tag(@filters) %>
+</div>

data/app/views/will_filter/filter/_condition.html.erb

@@ -3,7 +3,7 @@
     <td colspan="2">
     </td> 
     <td>
-      <div class="wf_condition_error">
+      <div class="error">
         <%= wf_filter.errors[index] %>  
       </div>
     </td>
@@ -13,16 +13,16 @@
 <% end %>
 
 <tr>
-  <td class="wf_condition" style="padding:2px;">
+  <td class="condition" style="padding:2px;">
     <%= select_tag "wf_c#{index}", options_for_select(wf_filter.condition_options, condition.key.to_s), {:class=>"wf_input", :style=>"width:100%;", :onChange=>"wfFilter.updateConditionAt('#{index}')"} %>
   </td>
-  <td class="wf_operator" style="padding:2px;">
+  <td class="operator" style="padding:2px;">
     <%= select_tag "wf_o#{index}", options_for_select(wf_filter.operator_options_for(condition.key), condition.operator.to_s), {:class=>"wf_input", :style=>"width:100%;", :onChange=>"wfFilter.updateConditionAt('#{index}')"} %>
   </td>
-  <td class="wf_values" style="padding:2px;">
+  <td class="values" style="padding:2px;">
 	  <%= render :partial => "/will_filter/filter/containers/#{condition.container.template_name}", :locals => {:container => condition.container, :index => index} %>
   </td>
-  <td class="wf_condition_actions" style="padding:0px;">
+  <td class="actions" style="padding:0px;">
     <%=link_to_function("<span>-</span>".html_safe, "wfFilter.removeConditionAt('#{index}')", :class => "wf_grey_button wf_pcb") %>
     <%=link_to_function("<span>+</span>".html_safe, "wfFilter.addConditionAfter('#{index}')", :class => "wf_grey_button wf_pcb") %>
   </td>

data/app/views/will_filter/filter/_conditions.html.erb

@@ -3,14 +3,11 @@
 <%= hidden_field_tag(:wf_dirty, "false") %>
 <%= hidden_field_tag(:wf_submitted, "false") %>
 <%= hidden_field_tag(:wf_name, wf_filter.name) %>
+<%= hidden_field_tag(:wf_model, wf_filter.model_class_name) %>
 <%= hidden_field_tag(:wf_export_format, "") %>
 <%= hidden_field_tag(:wf_export_fields, "") %>
-
-<% unless WillFilter::Config.require_filter_extensions? %>
-	<%= hidden_field_tag(:wf_model, wf_filter.model_class_name) %>
-<% end %>
 	
-<div class="wf_header">
+<div class="header">
   <% if wf_filter.show_save_options? %>
 		<div style="float:right;">
 	    <%=link_to_function("<span>Save As New...</span>".html_safe, "wfFilter.saveFilter()", :class => "wf_grey_button wf_pcb") %>
@@ -28,7 +25,7 @@
 	</div>
 </div>
 
-<div class="wf_container_panel">
+<div class="body">
   <% if wf_filter.errors[:filter] %>
     <div class="wf_filter_error">
       <%= wf_filter.errors[:filter] %>
@@ -47,7 +44,7 @@
 	    a predefined filter from a drop-down list above.
 		</div> 
 	<% else %>
-		<table class="wf_conditions_table" cellpadding="0" cellspacing="0">
+		<table class="table" cellpadding="0" cellspacing="0">
 			<% 
 					0.upto(wf_filter.size-1) do |index| 
 			  	 	condition = wf_filter.condition_at(index) 

data/app/views/will_filter/filter/_container.html.erb

@@ -1,4 +1,4 @@
-<%=will_filter_scripts_tag %>
+<%= will_filter_scripts_tag %>
 
 <%= form_tag({}, {:method => :get, :name=>'wf_form', :id => 'wf_form', :class => 'wf_form' }) do %>
 <div class="wf_container">
@@ -6,8 +6,8 @@
         <%= render :partial=> "/will_filter/filter/conditions", :locals => {:wf_filter => wf_filter} %>
     </div>
     
-    <div class="wf_footer">
-      <div style="float:right">
+    <div class="footer">
+      <div class="actions">
         <%=link_to_function("Toggle Conditions", "wfFilter.toggleDebugger()", :style=>"font-size:9px") %>
         &nbsp;&nbsp;
         Order: 
@@ -20,11 +20,11 @@
       <div>
         <%=link_to_function("<span>+ Add</span>".html_safe, "wfFilter.addCondition()", :class => "wf_grey_button wf_pcb") %>
         <%=link_to_function("<span>- Clear</span>".html_safe, "wfFilter.removeAllConditions()", :class => "wf_grey_button wf_pcb") %>
-        &nbsp;&nbsp;<span id="wf_loader" class="spinner" style="display:none;"><%=image_tag "/will_filter/images/spinner.gif", {:style=>"vertical-align:middle"} %> Loading...</span>
+        &nbsp;&nbsp;<span id="wf_loader" class="spinner" style="display:none;"><%=image_tag "will_filter/spinner.gif", {:style=>"vertical-align:middle"} %> Loading...</span>
       </div>
     </div>
 
-    <div id="wf_debugger" class="wf_debugger" style="display:none;">
+    <div id="wf_debugger" class="debugger" style="display:none;">
         <%= wf_filter.debug_sql_conditions %>
     </div>
 </div>

data/app/views/will_filter/filter/containers/_boolean.html.erb

@@ -1,5 +1,5 @@
 <div style='vertical-align:middle; text-align:left; padding-top:4px;'>
-  <input type='radio' style='width:20px' name='wf_v<%=index%>_0' id='wf_v<%=index%>_0' onChange='wfFilter.fieldChanged(this)' value='1' <%='checked' if container.value == '1' %>> True
+	<%=radio_button_tag("wf_v#{index}_0", '1', (container.value == '1'), :style => 'width:20px', :onChange => 'wfFilter.fieldChanged(this)')%>	True
   &nbsp;&nbsp;
-	<input type='radio' style='width:20px' name='wf_v<%=index%>_0' id='wf_v<%=index%>_0' onChange='wfFilter.fieldChanged(this)' value='0' <%='checked' if container.value == '0' %>> False
+	<%=radio_button_tag("wf_v#{index}_0", '0', (container.value == '0'), :style => 'width:20px', :onChange => 'wfFilter.fieldChanged(this)')%>	False
 </div>

data/app/views/will_filter/filter/containers/_date.html.erb

@@ -1,12 +1,10 @@
-<table class='wf_values_table' cellspacing='0px' cellpadding='0px'>
+<table class='values' cellspacing='0px' cellpadding='0px'>
 	<tr>
     <td width='99%'>
-    	<input type='text' style='width:99%;' class='wf_input' name='wf_v<%=index%>_0' id='wf_v<%=index%>_0' onChange='wfFilter.fieldChanged(this)' value='<%=container.sanitized_value%>'>
+			<%=text_field_tag("wf_v#{index}_0", container.sanitized_value, :style => 'width:99%', :onChange => 'wfFilter.fieldChanged(this)')%>	
     </td>
 		<td width='1%'>
-	    <a href="#" onclick="wfCalendar.selectDate('wf_v<%=index%>_0', this); return false;">
-	       <img align="top" title="select date" border="0" class="wf_calendar_trigger" src="/will_filter/images/calendar.png" />
-	    </a>
+			<%=link_to_function(image_tag("will_filter/calendar.png", :title => "Select date", :class => "wf_calendar_trigger"), "wfCalendar.selectDate('wf_v#{index}_0', this)")%>	
     </td>
 	</tr>
 </table>

data/app/views/will_filter/filter/containers/_date_range.html.erb

@@ -1,20 +1,16 @@
-<table class='wf_values_table' cellspacing='0px' cellpadding='0px'>
+<table class='values' cellspacing='0px' cellpadding='0px'>
 	<tr>
     <td width='49%'>
-    	<input type='text' style='width:99%;' class='wf_input' name='wf_v<%=index%>_0' id='wf_v<%=index%>_0' onChange='wfFilter.fieldChanged(this)' value='<%=container.sanitized_value(0)%>'>
+			<%=text_field_tag("wf_v#{index}_0", container.sanitized_value(0), :style => 'width:98%', :onChange => 'wfFilter.fieldChanged(this)')%>	
     </td>
 		<td width='1%'>
-	    <a href="#" onclick="wfCalendar.selectDate('wf_v<%=index%>_0', this); return false;">
-	       <img align="top" title="select date" border="0" class="wf_calendar_trigger" src="/will_filter/images/calendar.png" />
-	    </a>
+			<%=link_to_function(image_tag("will_filter/calendar.png", :title => "Select start date", :class => "wf_calendar_trigger"), "wfCalendar.selectDate('wf_v#{index}_0', this)")%>	
     </td>
     <td width='49%'>
-      <input type='text' style='width:99%;' class='wf_input' name='wf_v<%=index%>_1' id='wf_v<%=index%>_1' onChange='wfFilter.fieldChanged(this)' value='<%=container.sanitized_value(1)%>'>
+			<%=text_field_tag("wf_v#{index}_1", container.sanitized_value(1), :style => 'width:98%', :onChange => 'wfFilter.fieldChanged(this)')%>	
     </td>
     <td width='1%'>
-      <a href="#" onclick="wfCalendar.selectDate('wf_v<%=index%>_1', this); return false;">
-         <img align="top" title="select date" border="0" class="wf_calendar_trigger" src="/will_filter/images/calendar.png" />
-      </a>
+			<%=link_to_function(image_tag("will_filter/calendar.png", :title => "Select end date", :class => "wf_calendar_trigger"), "wfCalendar.selectDate('wf_v#{index}_1', this)")%>	
     </td>
 	</tr>
 </table>

data/app/views/will_filter/filter/containers/_date_time.html.erb

@@ -1,12 +1,10 @@
-<table class='wf_values_table' cellspacing='0px' cellpadding='0px'>
+<table class='values' cellspacing='0px' cellpadding='0px'>
 	<tr>
     <td width='99%'>
-    	<input type='text' style='width:99%;' class='wf_input' name='wf_v<%=index%>_0' id='wf_v<%=index%>_0' onChange='wfFilter.fieldChanged(this)' value='<%=container.sanitized_value%>'>
+			<%=text_field_tag("wf_v#{index}_0", container.sanitized_value, :style => 'width:99%', :onChange => 'wfFilter.fieldChanged(this)')%>	
     </td>
 		<td width='1%'>
-	    <a href="#" onclick="wfCalendar.selectDateTime('wf_v<%=index%>_0', this); return false;">
-	       <img align="top" title="select date & time" border="0" class="wf_calendar_trigger" src="/will_filter/images/clock.png" />
-	    </a>
+			<%=link_to_function(image_tag("will_filter/clock.png", :title => "Select date and time", :class => "wf_calendar_trigger"), "wfCalendar.selectDateTime('wf_v#{index}_0', this)")%>	
     </td>
 	</tr>
 </table>

data/app/views/will_filter/filter/containers/_date_time_range.html.erb

@@ -1,20 +1,16 @@
-<table class='wf_values_table' cellspacing='0px' cellpadding='0px'>
+<table class='values' cellspacing='0px' cellpadding='0px'>
 	<tr>
     <td width='49%'>
-    	<input type='text' style='width:99%;' class='wf_input' name='wf_v<%=index%>_0' id='wf_v<%=index%>_0' onChange='wfFilter.fieldChanged(this)' value='<%=container.sanitized_value(0)%>'>
+			<%=text_field_tag("wf_v#{index}_0", container.sanitized_value(0), :style => 'width:98%', :onChange => 'wfFilter.fieldChanged(this)')%>	
     </td>
 		<td width='1%'>
-	    <a href="#" onclick="wfCalendar.selectDateTime('wf_v<%=index%>_0', this); return false;">
-	       <img align="top" title="select start date & time" border="0" class="wf_calendar_trigger" src="/will_filter/images/clock.png" />
-	    </a>
+			<%=link_to_function(image_tag("will_filter/clock.png", :title => "Select start date and time", :class => "wf_calendar_trigger"), "wfCalendar.selectDateTime('wf_v#{index}_0', this)")%>	
     </td>
     <td width='49%'>
-      <input type='text' style='width:99%;' class='wf_input' name='wf_v<%=index%>_1' id='wf_v<%=index%>_1' onChange='wfFilter.fieldChanged(this)' value='<%=container.sanitized_value(1)%>'>
+			<%=text_field_tag("wf_v#{index}_1", container.sanitized_value(1), :style => 'width:98%', :onChange => 'wfFilter.fieldChanged(this)')%>	
     </td>
     <td width='1%'>
-      <a href="#" onclick="wfCalendar.selectDateTime('wf_v<%=index%>_1', this); return false;">
-         <img align="top" title="select end date & time" border="0" class="wf_calendar_trigger" src="/will_filter/images/clock.png" />
-      </a>
+			<%=link_to_function(image_tag("will_filter/clock.png", :title => "Select end date and time", :class => "wf_calendar_trigger"), "wfCalendar.selectDateTime('wf_v#{index}_1', this)")%>	
     </td>
 	</tr>
 </table>

data/app/views/will_filter/filter/containers/_list.html.erb

@@ -1,4 +1,4 @@
-<select style='width:100%' class='wf_input' name='wf_v<%=index%>_0' id='wf_v<%=index%>_0' onChange='wfFilter.fieldChanged(this)'>
+<select style='width:100%' name='wf_v<%=index%>_0' id='wf_v<%=index%>_0' onChange='wfFilter.fieldChanged(this)'>
 	 <% container.options.each do |option| %>
       <option <%= "selected" if option.last == container.value %> value="<%=option.last%>">
         <%=option.first%>

data/app/views/will_filter/filter/containers/_numeric_range.html.erb

@@ -1,13 +1,13 @@
-<table class='wf_values_table' cellspacing='0px' cellpadding='0px'>
+<table class='values' cellspacing='0px' cellpadding='0px'>
 	<tr>
     <td width='49%'>
-    	<input type='text' style='width:99%;' class='wf_input' name='wf_v<%=index%>_0' id='wf_v<%=index%>_0' onChange='wfFilter.fieldChanged(this)' value='<%=container.sanitized_value(0)%>'>
+			<%=text_field_tag("wf_v#{index}_0", container.sanitized_value(0), :style => 'width:99%', :onChange => 'wfFilter.fieldChanged(this)')%>	
     </td>
 		<td width='2%'>
 			&nbsp;
     </td>
     <td width='49%'>
-      <input type='text' style='width:99%;' class='wf_input' name='wf_v<%=index%>_1' id='wf_v<%=index%>_1' onChange='wfFilter.fieldChanged(this)' value='<%=container.sanitized_value(1)%>'>
+			<%=text_field_tag("wf_v#{index}_1", container.sanitized_value(1), :style => 'width:97%', :onChange => 'wfFilter.fieldChanged(this)')%>	
     </td>
 	</tr>
 </table>

data/app/views/will_filter/filter/containers/_text.html.erb

@@ -1,7 +1,7 @@
-<table class='wf_values_table' cellspacing='0px' cellpadding='0px'>
+<table class='values' cellspacing='0px' cellpadding='0px'>
 	<tr>
     <td width='99%'>
-    	<input type='text' style='width:99%;' class='wf_input' name='wf_v<%=index%>_0' id='wf_v<%=index%>_0' onChange='wfFilter.fieldChanged(this)' value='<%=container.sanitized_value%>'>
+			<%=text_field_tag("wf_v#{index}_0", container.sanitized_value, :style => 'width:98%', :onChange => 'wfFilter.fieldChanged(this)')%>	
     </td>
 	</tr>
 </table>

data/app/views/will_filter/filter/index.html.erb

@@ -1,4 +1,4 @@
 <div style="margin:5px;">
-	<%= will_filter(@filters) %>
+	<%= will_filter_tag(@filters) %>
 	<%= will_filter_table_tag(@filters) %>
 </div>

data/config/routes.rb

@@ -1,21 +1,43 @@
-Rails.application.routes.draw do 
+#--
+# Copyright (c) 2010-2011 Michael Berkovich
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and associated documentation files (the
+# "Software"), to deal in the Software without restriction, including
+# without limitation the rights to use, copy, modify, merge, publish,
+# distribute, sublicense, and/or sell copies of the Software, and to
+# permit persons to whom the Software is furnished to do so, subject to
+# the following conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+#++
 
-  namespace :will_filter do
-    match 'filter/index',                 :to => 'filter#index'
-    match 'filter/add_condition',         :to => 'filter#add_condition'
-    match 'filter/update_condition',      :to => 'filter#update_condition'
-    match 'filter/remove_condition',      :to => 'filter#remove_condition'
-    match 'filter/remove_all_conditions', :to => 'filter#remove_all_conditions'
-    match 'filter/load_filter',           :to => 'filter#load_filter'
-    match 'filter/save_filter',           :to => 'filter#save_filter'
-    match 'filter/update_filter',         :to => 'filter#update_filter'
-    match 'filter/delete_filter',         :to => 'filter#delete_filter'
+WillFilter::Engine.routes.draw do
+  match 'filter/index', :to => 'filter#index'
+  match 'filter/add_condition', :to => 'filter#add_condition'
+  match 'filter/update_condition', :to => 'filter#update_condition'
+  match 'filter/remove_condition', :to => 'filter#remove_condition'
+  match 'filter/remove_all_conditions', :to => 'filter#remove_all_conditions'
+  match 'filter/load_filter', :to => 'filter#load_filter'
+  match 'filter/save_filter', :to => 'filter#save_filter'
+  match 'filter/update_filter', :to => 'filter#update_filter'
+  match 'filter/delete_filter', :to => 'filter#delete_filter'
 
-    match 'calendar',                     :to => 'calendar#index'
-    match 'calendar/index',               :to => 'calendar#index'
+  match 'calendar', :to => 'calendar#index'
+  match 'calendar/index', :to => 'calendar#index'
 
-    match 'exporter',                     :to => 'exporter#index'
-    match 'exporter/index',               :to => 'exporter#index'
-    match 'exporter/export',              :to => 'exporter#export'
-  end
+  match 'exporter', :to => 'exporter#index'
+  match 'exporter/index', :to => 'exporter#index'
+  match 'exporter/export', :to => 'exporter#export'
+
+  root :to => "filter#index"
 end