Index: trunk/kernel/admin_templates/visits/visits_list.tpl
===================================================================
diff -u -N -r2403 -r2406
--- trunk/kernel/admin_templates/visits/visits_list.tpl	(.../visits_list.tpl)	(revision 2403)
+++ trunk/kernel/admin_templates/visits/visits_list.tpl	(.../visits_list.tpl)	(revision 2406)
@@ -57,35 +57,40 @@
 <script type="text/javascript" src="incs/calendar.js"></script>
 <inp2:m_block name="search_calendar_td" />
 	
+			<tr class="<inp2:m_odd_even odd="table_color1" even="table_color2"/>">
+				<inp2:m_inc param="tab_index" by="1"/>
+				<td class="text"><inp2:m_phrase label="la_date_from"/>:</td>
+				
+				<td>
+					<input type="text" name="<inp2:$prefix_InputName field="{$field}_rangefrom"/>" id="<inp2:$prefix_InputName field="{$field}_rangefrom"/>" value="<inp2:m_get name="{$prefix}_{$field}_rangefrom"/>" tabindex="<inp2:m_get param="tab_index"/>" size="<inp2:$prefix_Format field="{$field}_date" edit_size="edit_size"/>" class="<inp2:m_param name="class"/>" datepickerIcon="<inp2:m_ProjectBase/>admin/images/ddarrow.gif">
+						<span class="small">(<inp2:$prefix_Format field="{$field}_date" human="true"/>)</span>
+					<script type="text/javascript">
+						initCalendar("<inp2:$prefix_InputName field="{$field}_rangefrom"/>", "<inp2:$prefix_Format field="{$field}_date"/>");
+					</script>
+					
+				</td>
+				<td class="error"><inp2:m_get name="{$prefix}_{$field}_rangefrom_error"/>&nbsp;</td>
 		
-		<td>
-		<inp2:m_ParseBlock name="inp_edit_field_caption" prefix="$PrefixSpecial" field="$field" title_phrase="$title_phrase" title="$title" is_last="$is_last"/>
-			<input type="text" name="<inp2:$PrefixSpecial_InputName field="{$field}_rangefrom"/>" id="<inp2:$PrefixSpecial_InputName field="{$field}_rangefrom"/>" value="<inp2:m_get name="{$PrefixSpecial}.{$field}_rangefrom"/>" tabindex="<inp2:m_get param="tab_index"/>" size="<inp2:$PrefixSpecial_Format field="{$field}_rangefrom" edit_size="edit_size"/>" class="<inp2:m_param name="class"/>" datepickerIcon="<inp2:m_ProjectBase/>admin/images/ddarrow.gif">
-				<span class="small">(<inp2:$PrefixSpecial_Format field="{$field}_rangefrom" human="true"/>)</span>
-			<script type="text/javascript">
-				initCalendar("<inp2:$PrefixSpecial_InputName field="{$field}_rangefrom"/>", "<inp2:$PrefixSpecial_Format field="{$field}_rangefrom"/>");
-			</script>
-			
-		</td>
-		
-		<td>
-		<inp2:m_ParseBlock name="inp_edit_field_caption" prefix="$PrefixSpecial" field="$field" title_phrase="$title_phrase" title="$title" is_last="$is_last"/>		
-			<input type="text" name="<inp2:$PrefixSpecial_InputName field="{$field}_rangeto"/>" id="<inp2:$PrefixSpecial_InputName field="{$field}_rangeto"/>" value="<inp2:$PrefixSpecial_Field field="{$PrefixSpecial}.{$field}_rangeto"/>" tabindex="<inp2:m_get param="tab_index"/>" size="<inp2:$PrefixSpecial_Format field="{$field}_rangefrom" edit_size="edit_size"/>" class="<inp2:m_param name="class"/>" datepickerIcon="<inp2:m_ProjectBase/>admin/images/ddarrow.gif">
-				<span class="small">(<inp2:$PrefixSpecial_Format field="{$field}_rangeto" human="true"/>)</span>
-			<script type="text/javascript">
-				initCalendar("<inp2:$PrefixSpecial_InputName field="{$field}_rangeto"/>", "<inp2:$PrefixSpecial_Format field="{$field}_rangeto"/>");
-			</script>
-			
-		</td>
-
+				<inp2:m_inc param="tab_index" by="1"/>
+				<td class="text"><inp2:m_phrase label="la_date_to"/>:</td>	
+				
+				<td>
+					<input type="text" name="<inp2:$prefix_InputName field="{$field}_rangeto"/>" id="<inp2:$prefix_InputName field="{$field}_rangeto"/>" value="<inp2:m_get name="{$prefix}_{$field}_rangeto"/>" tabindex="<inp2:m_get param="tab_index"/>" size="<inp2:$prefix_Format field="{$field}_date" edit_size="edit_size"/>" class="<inp2:m_param name="class"/>" datepickerIcon="<inp2:m_ProjectBase/>admin/images/ddarrow.gif">
+						<span class="small">(<inp2:$prefix_Format field="{$field}_date" human="true"/>)</span>
+					<script type="text/javascript">
+						initCalendar("<inp2:$prefix_InputName field="{$field}_rangeto"/>", "<inp2:$prefix_Format field="{$field}_date"/>");
+					</script>
+					
+				</td>
+				<td class="error"><inp2:m_get name="{$prefix}_{$field}_rangeto_error"/>&nbsp;</td>
+			</tr>
+	
 <inp2:m_blockend />
 
 
+
 <table width="100%" border="0" cellspacing="0" cellpadding="4" class="tableborder" style="border-bottom: 0px;">
-<inp2:m_ParseBlock name="subsection" title="!la_section_SearchFilter!"/>
-<tr class="<inp2:m_odd_even odd="table_color1" even="table_color2"/>">
-	<inp2:m_ParseBlock name="search_calendar_td" PrefixSpecial="visits" field="VisitDate" title="!la_fld_FromDateTime!"/>
-</tr>
+	<inp2:m_ParseBlock name="search_calendar_td" prefix="visits" field="VisitDate"/>
 </table>
 
 <inp2:m_block name="grid_userlink_td" />
Index: trunk/core/units/visits/visits_config.php
===================================================================
diff -u -N -r2401 -r2406
--- trunk/core/units/visits/visits_config.php	(.../visits_config.php)	(revision 2401)
+++ trunk/core/units/visits/visits_config.php	(.../visits_config.php)	(revision 2406)
@@ -51,7 +51,7 @@
 					
 					'Fields' => Array(
 										'VisitId' => Array(),
-										'VisitDate' => Array('type' => 'int', 'formatter'=>'kDateFormatter', 'not_null' => '1','default' => '0'),
+										'VisitDate' => Array('type' => 'int', 'formatter'=>'kDateFormatter', 'filter_type'=>'range', 'not_null' => '1','default' => '0'),
 										'Referer' => Array('type' => 'string','not_null' => '1','default' => ''),
             							'IPAddress' => Array('type' => 'string','not_null' => '1','default' => ''),
 										'AffiliateId' => Array('type'=>'int','formatter'=>'kLEFTFormatter','options'=>Array(0=>'lu_none'),'left_sql'=>'SELECT %s FROM '.TABLE_PREFIX.'Affiliates af LEFT JOIN '.TABLE_PREFIX.'PortalUser pu ON pu.PortalUserId = af.PortalUserId WHERE `%s` = \'%s\'','left_key_field'=>'AffiliateId','left_title_field'=>'Login','not_null'=>1,'default'=>0),
Index: trunk/core/kernel/event_handler.php
===================================================================
diff -u -N -r2041 -r2406
--- trunk/core/kernel/event_handler.php	(.../event_handler.php)	(revision 2041)
+++ trunk/core/kernel/event_handler.php	(.../event_handler.php)	(revision 2406)
@@ -100,6 +100,16 @@
 		}
 		
 		/**
+		 * Returns to previous template in opener stack
+		 *
+		 * @param kEvent $event
+		 */
+		function OnGoBack(&$event)
+		{
+			$event->SetRedirectParam('opener', 'u');
+		}
+		
+		/**
 		 * Apply some special processing to
 		 * object beeing recalled before using
 		 * it in other events that call prepareObject
Index: trunk/kernel/units/visits/visits_config.php
===================================================================
diff -u -N -r2401 -r2406
--- trunk/kernel/units/visits/visits_config.php	(.../visits_config.php)	(revision 2401)
+++ trunk/kernel/units/visits/visits_config.php	(.../visits_config.php)	(revision 2406)
@@ -51,7 +51,7 @@
 					
 					'Fields' => Array(
 										'VisitId' => Array(),
-										'VisitDate' => Array('type' => 'int', 'formatter'=>'kDateFormatter', 'not_null' => '1','default' => '0'),
+										'VisitDate' => Array('type' => 'int', 'formatter'=>'kDateFormatter', 'filter_type'=>'range', 'not_null' => '1','default' => '0'),
 										'Referer' => Array('type' => 'string','not_null' => '1','default' => ''),
             							'IPAddress' => Array('type' => 'string','not_null' => '1','default' => ''),
 										'AffiliateId' => Array('type'=>'int','formatter'=>'kLEFTFormatter','options'=>Array(0=>'lu_none'),'left_sql'=>'SELECT %s FROM '.TABLE_PREFIX.'Affiliates af LEFT JOIN '.TABLE_PREFIX.'PortalUser pu ON pu.PortalUserId = af.PortalUserId WHERE `%s` = \'%s\'','left_key_field'=>'AffiliateId','left_title_field'=>'Login','not_null'=>1,'default'=>0),
Index: trunk/core/kernel/utility/formatters.php
===================================================================
diff -u -N -r2357 -r2406
--- trunk/core/kernel/utility/formatters.php	(.../formatters.php)	(revision 2357)
+++ trunk/core/kernel/utility/formatters.php	(.../formatters.php)	(revision 2406)
@@ -254,6 +254,14 @@
 		$opts['format'] = $time_format;
 		$add_fields[$field_name.'_time'] = $opts;
 		
+		$filter_type = getArrayValue($field_options, 'filter_type');
+		if($filter_type == 'range')
+		{
+			$opts['format'] = $field_options['format'];
+			$add_fields[$field_name.'_rangefrom'] = $opts;
+			$add_fields[$field_name.'_rangeto'] = $opts;
+		}
+		
 		if ( !isset($object->VirtualFields[$field_name]) ) {
 			// adding caluclated field to format date directly in the query
 			if ( !isset($object->CalculatedFields)  || !is_array($object->CalculatedFields) ) {
Index: trunk/core/admin_templates/logs/visits/visits_list.tpl
===================================================================
diff -u -N -r2403 -r2406
--- trunk/core/admin_templates/logs/visits/visits_list.tpl	(.../visits_list.tpl)	(revision 2403)
+++ trunk/core/admin_templates/logs/visits/visits_list.tpl	(.../visits_list.tpl)	(revision 2406)
@@ -57,35 +57,40 @@
 <script type="text/javascript" src="incs/calendar.js"></script>
 <inp2:m_block name="search_calendar_td" />
 	
+			<tr class="<inp2:m_odd_even odd="table_color1" even="table_color2"/>">
+				<inp2:m_inc param="tab_index" by="1"/>
+				<td class="text"><inp2:m_phrase label="la_date_from"/>:</td>
+				
+				<td>
+					<input type="text" name="<inp2:$prefix_InputName field="{$field}_rangefrom"/>" id="<inp2:$prefix_InputName field="{$field}_rangefrom"/>" value="<inp2:m_get name="{$prefix}_{$field}_rangefrom"/>" tabindex="<inp2:m_get param="tab_index"/>" size="<inp2:$prefix_Format field="{$field}_date" edit_size="edit_size"/>" class="<inp2:m_param name="class"/>" datepickerIcon="<inp2:m_ProjectBase/>admin/images/ddarrow.gif">
+						<span class="small">(<inp2:$prefix_Format field="{$field}_date" human="true"/>)</span>
+					<script type="text/javascript">
+						initCalendar("<inp2:$prefix_InputName field="{$field}_rangefrom"/>", "<inp2:$prefix_Format field="{$field}_date"/>");
+					</script>
+					
+				</td>
+				<td class="error"><inp2:m_get name="{$prefix}_{$field}_rangefrom_error"/>&nbsp;</td>
 		
-		<td>
-		<inp2:m_ParseBlock name="inp_edit_field_caption" prefix="$PrefixSpecial" field="$field" title_phrase="$title_phrase" title="$title" is_last="$is_last"/>
-			<input type="text" name="<inp2:$PrefixSpecial_InputName field="{$field}_rangefrom"/>" id="<inp2:$PrefixSpecial_InputName field="{$field}_rangefrom"/>" value="<inp2:m_get name="{$PrefixSpecial}.{$field}_rangefrom"/>" tabindex="<inp2:m_get param="tab_index"/>" size="<inp2:$PrefixSpecial_Format field="{$field}_rangefrom" edit_size="edit_size"/>" class="<inp2:m_param name="class"/>" datepickerIcon="<inp2:m_ProjectBase/>admin/images/ddarrow.gif">
-				<span class="small">(<inp2:$PrefixSpecial_Format field="{$field}_rangefrom" human="true"/>)</span>
-			<script type="text/javascript">
-				initCalendar("<inp2:$PrefixSpecial_InputName field="{$field}_rangefrom"/>", "<inp2:$PrefixSpecial_Format field="{$field}_rangefrom"/>");
-			</script>
-			
-		</td>
-		
-		<td>
-		<inp2:m_ParseBlock name="inp_edit_field_caption" prefix="$PrefixSpecial" field="$field" title_phrase="$title_phrase" title="$title" is_last="$is_last"/>		
-			<input type="text" name="<inp2:$PrefixSpecial_InputName field="{$field}_rangeto"/>" id="<inp2:$PrefixSpecial_InputName field="{$field}_rangeto"/>" value="<inp2:$PrefixSpecial_Field field="{$PrefixSpecial}.{$field}_rangeto"/>" tabindex="<inp2:m_get param="tab_index"/>" size="<inp2:$PrefixSpecial_Format field="{$field}_rangefrom" edit_size="edit_size"/>" class="<inp2:m_param name="class"/>" datepickerIcon="<inp2:m_ProjectBase/>admin/images/ddarrow.gif">
-				<span class="small">(<inp2:$PrefixSpecial_Format field="{$field}_rangeto" human="true"/>)</span>
-			<script type="text/javascript">
-				initCalendar("<inp2:$PrefixSpecial_InputName field="{$field}_rangeto"/>", "<inp2:$PrefixSpecial_Format field="{$field}_rangeto"/>");
-			</script>
-			
-		</td>
-
+				<inp2:m_inc param="tab_index" by="1"/>
+				<td class="text"><inp2:m_phrase label="la_date_to"/>:</td>	
+				
+				<td>
+					<input type="text" name="<inp2:$prefix_InputName field="{$field}_rangeto"/>" id="<inp2:$prefix_InputName field="{$field}_rangeto"/>" value="<inp2:m_get name="{$prefix}_{$field}_rangeto"/>" tabindex="<inp2:m_get param="tab_index"/>" size="<inp2:$prefix_Format field="{$field}_date" edit_size="edit_size"/>" class="<inp2:m_param name="class"/>" datepickerIcon="<inp2:m_ProjectBase/>admin/images/ddarrow.gif">
+						<span class="small">(<inp2:$prefix_Format field="{$field}_date" human="true"/>)</span>
+					<script type="text/javascript">
+						initCalendar("<inp2:$prefix_InputName field="{$field}_rangeto"/>", "<inp2:$prefix_Format field="{$field}_date"/>");
+					</script>
+					
+				</td>
+				<td class="error"><inp2:m_get name="{$prefix}_{$field}_rangeto_error"/>&nbsp;</td>
+			</tr>
+	
 <inp2:m_blockend />
 
 
+
 <table width="100%" border="0" cellspacing="0" cellpadding="4" class="tableborder" style="border-bottom: 0px;">
-<inp2:m_ParseBlock name="subsection" title="!la_section_SearchFilter!"/>
-<tr class="<inp2:m_odd_even odd="table_color1" even="table_color2"/>">
-	<inp2:m_ParseBlock name="search_calendar_td" PrefixSpecial="visits" field="VisitDate" title="!la_fld_FromDateTime!"/>
-</tr>
+	<inp2:m_ParseBlock name="search_calendar_td" prefix="visits" field="VisitDate"/>
 </table>
 
 <inp2:m_block name="grid_userlink_td" />