Index: branches/RC/core/admin_templates/logs/visits/visits_list.tpl
===================================================================
diff -u -N -r10998 -r11538
--- branches/RC/core/admin_templates/logs/visits/visits_list.tpl	(.../visits_list.tpl)	(revision 10998)
+++ branches/RC/core/admin_templates/logs/visits/visits_list.tpl	(.../visits_list.tpl)	(revision 11538)
@@ -1,7 +1,6 @@
 <inp2:m_include t="incs/header"/>
+<inp2:m_RenderElement name="combined_header" prefix="visits" section="in-portal:visits" title_preset="visits_list" pagination="1"/>
 
-<inp2:m_RenderElement name="combined_header" prefix="visits" section="in-portal:visits" title_preset="visits_list" />
-
 <!-- ToolBar --->
 <table class="toolbar" height="30" cellspacing="0" cellpadding="0" width="100%" border="0">
 <tbody>
@@ -15,18 +14,6 @@
 
 	  			}
 
-	  			a_toolbar.AddButton( new ToolBarButton('search', '<inp2:m_phrase label="la_ToolTip_Search" escape="1"/>',
-						function() {
-							set_hidden_field('grid_name', 'Default');
-							submit_event('visits','OnSearch');
-						} ) );
-
-				a_toolbar.AddButton( new ToolBarButton('search_reset', '<inp2:m_phrase label="la_ToolTip_SearchReset" escape="1"/>',
-						function() {
-							set_hidden_field('grid_name', 'Default');
-							submit_event('visits','OnSearchReset');
-						} ) );
-
 				a_toolbar.AddButton( new ToolBarButton('refresh', '<inp2:m_phrase label="la_ToolTip_Refresh" escape="1"/>', function() {
 							window.location.href = window.location.href;
 						}
@@ -54,28 +41,24 @@
 </tbody>
 </table>
 
-<inp2:m_DefineElement name="grid_userlink_td" >
-	<td valign="top" class="text">
-		<inp2:m_if check="UserFound" user_field="$user_field">
-			<a href="<inp2:{$PrefixSpecial}_UserLink user_field="$user_field"/>" title="<inp2:m_phrase name="la_Edit_User"/>"><inp2:{$PrefixSpecial}_field field="$field" grid="$grid"/></a>
+<inp2:m_DefineElement name="grid_userlink_td">
+	<inp2:m_if check="UserFound" user_field="$user_field">
+		<a href="<inp2:UserLink user_field="$user_field"/>" title="<inp2:m_phrase name="la_Edit_User"/>"><inp2:Field field="$field" grid="$grid"/></a>
+	<inp2:m_else/>
+		<inp2:Field field="$field" grid="$grid"/>
+	</inp2:m_if>
+</inp2:m_DefineElement>
+
+<inp2:m_DefineElement name="grid_referer_td">
+	<div style="overflow: hidden">
+		<inp2:m_if check="FieldEquals" field="$field" value="">
+			<span style="white-space: nowrap;"><inp2:m_Phrase label="la_visit_DirectReferer"/></span>
 		<inp2:m_else/>
-			<inp2:{$PrefixSpecial}_field field="$field" grid="$grid"/>
+			<a href="<inp2:Field field="$field" grid="$grid"/>"><inp2:Field field="$field" grid="$grid" /></a>
 		</inp2:m_if>
-	</td>
+	</div>
 </inp2:m_DefineElement>
 
-<inp2:m_DefineElement name="grid_referer_td" >
-	<td valign="top" class="text">
-		<div style="overflow: hidden">
-			<inp2:m_if check="FieldEquals" field="$field" value="">
-				<span style="white-space: nowrap;"><inp2:m_Phrase label="la_visit_DirectReferer"/></span>
-			<inp2:m_else/>
-				<a href="<inp2:Field field="$field" grid="$grid"/>"><inp2:Field field="$field" grid="$grid" /></a>
-			</inp2:m_if>
-		</div>
-	</td>
-</inp2:m_DefineElement>
-
 <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" grid_filters="1"/>