Index: branches/RC/core/units/visits/visits_config.php
===================================================================
diff -u -r8929 -r10998
--- branches/RC/core/units/visits/visits_config.php	(.../visits_config.php)	(revision 8929)
+++ branches/RC/core/units/visits/visits_config.php	(.../visits_config.php)	(revision 10998)
@@ -118,22 +118,22 @@
 								'Default'		=>	Array(
 																	'Icons' => Array('default'=>'icon16_custom.gif'),	// icons for each StatusField values, if no matches or no statusfield selected, then "default" icon is used
 																	'Fields' => Array(
-																			'VisitDate'		=>	Array( 'title'=>'la_col_VisitDate', 'data_block' => 'grid_checkbox_td' ),
-																			'IPAddress'		=>	Array( 'title'=>'la_col_IPAddress' ),
-																			'Referer' 		=>	Array( 'title'=>'la_col_Referer', 'data_block' => 'grid_referer_td' ),
-																			'UserName'		=>	Array('title' => 'la_col_Username', 'data_block' => 'grid_userlink_td', 'user_field' => 'PortalUserId'),
+																			'VisitDate'		=>	Array( 'title'=>'la_col_VisitDate', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_date_range_filter'),
+																			'IPAddress'		=>	Array( 'title'=>'la_col_IPAddress', 'filter_block' => 'grid_like_filter' ),
+																			'Referer' 		=>	Array( 'title'=>'la_col_Referer', 'data_block' => 'grid_referer_td', 'filter_block' => 'grid_like_filter' ),
+																			'UserName'		=>	Array('title' => 'la_col_Username', 'data_block' => 'grid_userlink_td', 'user_field' => 'PortalUserId', 'filter_block' => 'grid_like_filter'),
 																		),
 														),
 								'visitsincommerce'		=>	Array(
 																	'Icons' => Array('default'=>'icon16_custom.gif'),	// icons for each StatusField values, if no matches or no statusfield selected, then "default" icon is used
 																	'Fields' => Array(
-																			'VisitDate'		=>	Array( 'title'=>'la_col_VisitDate', 'data_block' => 'grid_checkbox_td' ),
-																			'IPAddress'		=>	Array( 'title'=>'la_col_IPAddress' ),
-																			'Referer' 		=>	Array( 'title'=>'la_col_Referer', 'data_block' => 'grid_referer_td' ),
-																			'UserName'		=>	Array('title' => 'la_col_Username', 'data_block' => 'grid_userlink_td', 'user_field' => 'PortalUserId'),
-																			'AffiliateUser'	=>	Array( 'title' => 'la_col_AffiliateUser', 'data_block' => 'grid_userlink_td', 'user_field' => 'AffiliatePortalUserId'),
-																			'OrderTotalAmountSum'	=>	Array( 'title' => 'la_col_OrderTotal'),
-																			'OrderAffiliateCommissionSum'	=>	Array( 'title' => 'la_col_Commission'),
+																			'VisitDate'		=>	Array( 'title'=>'la_col_VisitDate', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_date_range_filter' ),
+																			'IPAddress'		=>	Array( 'title'=>'la_col_IPAddress', 'filter_block' => 'grid_like_filter' ),
+																			'Referer' 		=>	Array( 'title'=>'la_col_Referer', 'data_block' => 'grid_referer_td', 'filter_block' => 'grid_like_filter' ),
+																			'UserName'		=>	Array('title' => 'la_col_Username', 'data_block' => 'grid_userlink_td', 'user_field' => 'PortalUserId', 'filter_block' => 'grid_like_filter'),
+																			'AffiliateUser'	=>	Array( 'title' => 'la_col_AffiliateUser', 'data_block' => 'grid_userlink_td', 'user_field' => 'AffiliatePortalUserId', 'filter_block' => 'grid_like_filter'),
+																			'OrderTotalAmountSum'	=>	Array( 'title' => 'la_col_OrderTotal', 'filter_block' => 'grid_range_filter'),
+																			'OrderAffiliateCommissionSum'	=>	Array( 'title' => 'la_col_Commission', 'filter_block' => 'grid_range_filter'),
 																		),
 														),
 								),
Index: branches/RC/core/admin_templates/logs/visits/visits_list.tpl
===================================================================
diff -u -r8929 -r10998
--- branches/RC/core/admin_templates/logs/visits/visits_list.tpl	(.../visits_list.tpl)	(revision 8929)
+++ branches/RC/core/admin_templates/logs/visits/visits_list.tpl	(.../visits_list.tpl)	(revision 10998)
@@ -1,12 +1,7 @@
-<inp2:m_RequireLogin permissions="in-portal:visits.view" system="1"/>
-<inp2:m_include t="incs/header" nobody="yes"/>
+<inp2:m_include t="incs/header"/>
 
-<body topmargin="0" leftmargin="8" marginheight="0" marginwidth="8" bgcolor="#FFFFFF">
+<inp2:m_RenderElement name="combined_header" prefix="visits" section="in-portal:visits" title_preset="visits_list" />
 
-<inp2:m_RenderElement name="section_header" module="in-portal" prefix="visits" icon="icon46_visits" title="!la_title_Visits!"/>
-
-<inp2:m_RenderElement name="blue_bar" prefix="visits" title_preset="visits_list" module="in-portal" icon="icon46_visits"/>
-
 <!-- ToolBar --->
 <table class="toolbar" height="30" cellspacing="0" cellpadding="0" width="100%" border="0">
 <tbody>
@@ -53,44 +48,12 @@
 			</script>
 
 		</td>
+
+		<inp2:m_RenderElement name="search_main_toolbar" prefix="visits" grid="Default"/>
 	</tr>
 </tbody>
 </table>
-<script type="text/javascript" src="js/calendar.js"></script>
 
-<inp2:m_DefineElement name="search_calendar_td" class="">
-	<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_from_date"/>:</td>
-
-		<td>
-			<input type="text" name="<inp2:SearchInputName field="$field" type="datefrom"/>" id="<inp2:SearchInputName field="$field" type="datefrom"/>" value="<inp2:SearchField field="$field" format="_regional_InputDateFormat" type="datefrom"/>" size="<inp2:SearchFormat field="{$field}_date" input_format="1" edit_size="1"/>" datepickerIcon="<inp2:m_ProjectBase/>admin/images/ddarrow.gif">
-				<span class="small">(<inp2:SearchFormat field="{$field}_date" input_format="1" human="true"/>)</span>
-			<script type="text/javascript">
-				initCalendar("<inp2:SearchInputName field="$field" type="datefrom"/>", "<inp2:SearchFormat field="{$field}_date" input_format="1"/>");
-			</script>
-
-		</td>
-		<td class="error"><inp2:SearchError field="$field" type="datefrom"/>&nbsp;</td>
-
-		<td class="text"><inp2:m_phrase label="la_to_date"/>:</td>
-
-		<td>
-			<input type="text" name="<inp2:SearchInputName field="$field" type="dateto"/>" id="<inp2:SearchInputName field="$field" type="dateto"/>" value="<inp2:SearchField field="$field" format="_regional_InputDateFormat" type="dateto"/>" size="<inp2:SearchFormat field="{$field}_date" input_format="1" edit_size="1"/>" datepickerIcon="<inp2:m_ProjectBase/>admin/images/ddarrow.gif">
-				<span class="small">(<inp2:SearchFormat field="{$field}_date" input_format="1" human="true"/>)</span>
-			<script type="text/javascript">
-				initCalendar("<inp2:SearchInputName field="$field" type="dateto"/>", "<inp2:SearchFormat field="{$field}_date" input_format="1"/>");
-			</script>
-
-		</td>
-		<td class="error"><inp2:SearchError field="$field" type="dateto"/>&nbsp;</td>
-	</tr>
-</inp2:m_DefineElement>
-
-<table width="100%" border="0" cellspacing="0" cellpadding="4" class="tableborder" style="border-bottom: 0px;">
-	<inp2:m_RenderElement name="search_calendar_td" prefix="visits" field="VisitDate"/>
-</table>
-
 <inp2:m_DefineElement name="grid_userlink_td" >
 	<td valign="top" class="text">
 		<inp2:m_if check="UserFound" user_field="$user_field">
@@ -115,7 +78,7 @@
 
 <inp2:adm_SaveReturnScript/>
 
-<inp2:m_RenderElement name="grid" PrefixSpecial="visits" IdField="VisitId" grid="Default" header_block="grid_column_title" data_block="grid_data_td" search="on" no_toolbar="no_toolbar"/>
+<inp2:m_RenderElement name="grid" PrefixSpecial="visits" IdField="VisitId" grid="Default" header_block="grid_column_title" data_block="grid_data_td" search="on" grid_filters="1"/>
 <script type="text/javascript">
 	Grids['visits'].SetDependantToolbarButtons( new Array('reset') );
 </script>
Index: branches/RC/kernel/units/visits/visits_config.php
===================================================================
diff -u -r8929 -r10998
--- branches/RC/kernel/units/visits/visits_config.php	(.../visits_config.php)	(revision 8929)
+++ branches/RC/kernel/units/visits/visits_config.php	(.../visits_config.php)	(revision 10998)
@@ -118,22 +118,22 @@
 								'Default'		=>	Array(
 																	'Icons' => Array('default'=>'icon16_custom.gif'),	// icons for each StatusField values, if no matches or no statusfield selected, then "default" icon is used
 																	'Fields' => Array(
-																			'VisitDate'		=>	Array( 'title'=>'la_col_VisitDate', 'data_block' => 'grid_checkbox_td' ),
-																			'IPAddress'		=>	Array( 'title'=>'la_col_IPAddress' ),
-																			'Referer' 		=>	Array( 'title'=>'la_col_Referer', 'data_block' => 'grid_referer_td' ),
-																			'UserName'		=>	Array('title' => 'la_col_Username', 'data_block' => 'grid_userlink_td', 'user_field' => 'PortalUserId'),
+																			'VisitDate'		=>	Array( 'title'=>'la_col_VisitDate', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_date_range_filter'),
+																			'IPAddress'		=>	Array( 'title'=>'la_col_IPAddress', 'filter_block' => 'grid_like_filter' ),
+																			'Referer' 		=>	Array( 'title'=>'la_col_Referer', 'data_block' => 'grid_referer_td', 'filter_block' => 'grid_like_filter' ),
+																			'UserName'		=>	Array('title' => 'la_col_Username', 'data_block' => 'grid_userlink_td', 'user_field' => 'PortalUserId', 'filter_block' => 'grid_like_filter'),
 																		),
 														),
 								'visitsincommerce'		=>	Array(
 																	'Icons' => Array('default'=>'icon16_custom.gif'),	// icons for each StatusField values, if no matches or no statusfield selected, then "default" icon is used
 																	'Fields' => Array(
-																			'VisitDate'		=>	Array( 'title'=>'la_col_VisitDate', 'data_block' => 'grid_checkbox_td' ),
-																			'IPAddress'		=>	Array( 'title'=>'la_col_IPAddress' ),
-																			'Referer' 		=>	Array( 'title'=>'la_col_Referer', 'data_block' => 'grid_referer_td' ),
-																			'UserName'		=>	Array('title' => 'la_col_Username', 'data_block' => 'grid_userlink_td', 'user_field' => 'PortalUserId'),
-																			'AffiliateUser'	=>	Array( 'title' => 'la_col_AffiliateUser', 'data_block' => 'grid_userlink_td', 'user_field' => 'AffiliatePortalUserId'),
-																			'OrderTotalAmountSum'	=>	Array( 'title' => 'la_col_OrderTotal'),
-																			'OrderAffiliateCommissionSum'	=>	Array( 'title' => 'la_col_Commission'),
+																			'VisitDate'		=>	Array( 'title'=>'la_col_VisitDate', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_date_range_filter' ),
+																			'IPAddress'		=>	Array( 'title'=>'la_col_IPAddress', 'filter_block' => 'grid_like_filter' ),
+																			'Referer' 		=>	Array( 'title'=>'la_col_Referer', 'data_block' => 'grid_referer_td', 'filter_block' => 'grid_like_filter' ),
+																			'UserName'		=>	Array('title' => 'la_col_Username', 'data_block' => 'grid_userlink_td', 'user_field' => 'PortalUserId', 'filter_block' => 'grid_like_filter'),
+																			'AffiliateUser'	=>	Array( 'title' => 'la_col_AffiliateUser', 'data_block' => 'grid_userlink_td', 'user_field' => 'AffiliatePortalUserId', 'filter_block' => 'grid_like_filter'),
+																			'OrderTotalAmountSum'	=>	Array( 'title' => 'la_col_OrderTotal', 'filter_block' => 'grid_range_filter'),
+																			'OrderAffiliateCommissionSum'	=>	Array( 'title' => 'la_col_Commission', 'filter_block' => 'grid_range_filter'),
 																		),
 														),
 								),
Index: branches/RC/kernel/admin_templates/visits/visits_list.tpl
===================================================================
diff -u -r8929 -r10998
--- branches/RC/kernel/admin_templates/visits/visits_list.tpl	(.../visits_list.tpl)	(revision 8929)
+++ branches/RC/kernel/admin_templates/visits/visits_list.tpl	(.../visits_list.tpl)	(revision 10998)
@@ -1,12 +1,7 @@
-<inp2:m_RequireLogin permissions="in-portal:visits.view" system="1"/>
-<inp2:m_include t="incs/header" nobody="yes"/>
+<inp2:m_include t="incs/header"/>
 
-<body topmargin="0" leftmargin="8" marginheight="0" marginwidth="8" bgcolor="#FFFFFF">
+<inp2:m_RenderElement name="combined_header" prefix="visits" section="in-portal:visits" title_preset="visits_list" />
 
-<inp2:m_RenderElement name="section_header" module="in-portal" prefix="visits" icon="icon46_visits" title="!la_title_Visits!"/>
-
-<inp2:m_RenderElement name="blue_bar" prefix="visits" title_preset="visits_list" module="in-portal" icon="icon46_visits"/>
-
 <!-- ToolBar --->
 <table class="toolbar" height="30" cellspacing="0" cellpadding="0" width="100%" border="0">
 <tbody>
@@ -53,44 +48,12 @@
 			</script>
 
 		</td>
+
+		<inp2:m_RenderElement name="search_main_toolbar" prefix="visits" grid="Default"/>
 	</tr>
 </tbody>
 </table>
-<script type="text/javascript" src="js/calendar.js"></script>
 
-<inp2:m_DefineElement name="search_calendar_td" class="">
-	<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_from_date"/>:</td>
-
-		<td>
-			<input type="text" name="<inp2:SearchInputName field="$field" type="datefrom"/>" id="<inp2:SearchInputName field="$field" type="datefrom"/>" value="<inp2:SearchField field="$field" format="_regional_InputDateFormat" type="datefrom"/>" size="<inp2:SearchFormat field="{$field}_date" input_format="1" edit_size="1"/>" datepickerIcon="<inp2:m_ProjectBase/>admin/images/ddarrow.gif">
-				<span class="small">(<inp2:SearchFormat field="{$field}_date" input_format="1" human="true"/>)</span>
-			<script type="text/javascript">
-				initCalendar("<inp2:SearchInputName field="$field" type="datefrom"/>", "<inp2:SearchFormat field="{$field}_date" input_format="1"/>");
-			</script>
-
-		</td>
-		<td class="error"><inp2:SearchError field="$field" type="datefrom"/>&nbsp;</td>
-
-		<td class="text"><inp2:m_phrase label="la_to_date"/>:</td>
-
-		<td>
-			<input type="text" name="<inp2:SearchInputName field="$field" type="dateto"/>" id="<inp2:SearchInputName field="$field" type="dateto"/>" value="<inp2:SearchField field="$field" format="_regional_InputDateFormat" type="dateto"/>" size="<inp2:SearchFormat field="{$field}_date" input_format="1" edit_size="1"/>" datepickerIcon="<inp2:m_ProjectBase/>admin/images/ddarrow.gif">
-				<span class="small">(<inp2:SearchFormat field="{$field}_date" input_format="1" human="true"/>)</span>
-			<script type="text/javascript">
-				initCalendar("<inp2:SearchInputName field="$field" type="dateto"/>", "<inp2:SearchFormat field="{$field}_date" input_format="1"/>");
-			</script>
-
-		</td>
-		<td class="error"><inp2:SearchError field="$field" type="dateto"/>&nbsp;</td>
-	</tr>
-</inp2:m_DefineElement>
-
-<table width="100%" border="0" cellspacing="0" cellpadding="4" class="tableborder" style="border-bottom: 0px;">
-	<inp2:m_RenderElement name="search_calendar_td" prefix="visits" field="VisitDate"/>
-</table>
-
 <inp2:m_DefineElement name="grid_userlink_td" >
 	<td valign="top" class="text">
 		<inp2:m_if check="UserFound" user_field="$user_field">
@@ -115,7 +78,7 @@
 
 <inp2:adm_SaveReturnScript/>
 
-<inp2:m_RenderElement name="grid" PrefixSpecial="visits" IdField="VisitId" grid="Default" header_block="grid_column_title" data_block="grid_data_td" search="on" no_toolbar="no_toolbar"/>
+<inp2:m_RenderElement name="grid" PrefixSpecial="visits" IdField="VisitId" grid="Default" header_block="grid_column_title" data_block="grid_data_td" search="on" grid_filters="1"/>
 <script type="text/javascript">
 	Grids['visits'].SetDependantToolbarButtons( new Array('reset') );
 </script>