Index: branches/5.1.x/core/admin_templates/incs/grid_blocks.tpl
===================================================================
diff -u -N -r12127 -r12657
--- branches/5.1.x/core/admin_templates/incs/grid_blocks.tpl	(.../grid_blocks.tpl)	(revision 12127)
+++ branches/5.1.x/core/admin_templates/incs/grid_blocks.tpl	(.../grid_blocks.tpl)	(revision 12657)
@@ -52,19 +52,19 @@
 </inp2:m_DefineElement>
 
 <inp2:m_DefineElement name="search_main_toolbar">
-	<td style="white-space: nowrap; text-align: right; width: 300px;" align="right">
+	<td style="white-space: nowrap; text-align: right; width: 260px;" align="right">
 		<div style="float: right">
 			<table cellpadding="0" cellspacing="0">
 				<tr>
 					<td>
 						<input 	type="text"
-							id="<inp2:m_param name="prefix"/>_search_keyword"
-							name="<inp2:m_param name="prefix"/>_search_keyword"
-							value="<inp2:m_recall var="{$prefix}_search_keyword" no_null="no_null" special="1"/>"
-							PrefixSpecial="<inp2:m_param name="prefix"/>"
-							Grid="<inp2:m_param name="grid"/>"
-							ajax="0"
-							style="border: 1px solid grey;"/>
+							id="<inp2:m_param name='prefix'/>_search_keyword"
+							class="filter <inp2:m_ifnot check='m_Recall' var='{$prefix}_search_keyword' equals_to=''>filter-active</inp2:m_ifnot>"
+							name="<inp2:m_param name='prefix'/>_search_keyword"
+							value="<inp2:m_recall var='{$prefix}_search_keyword' no_null='no_null' special='1'/>"
+							PrefixSpecial="<inp2:m_param name='prefix'/>"
+							Grid="<inp2:m_param name='grid'/>"
+							ajax="0" style="width:160px"/>
 					</td>
 					<td style="white-space: nowrap;">
 						<script type="text/javascript">
@@ -91,19 +91,19 @@
 
 <inp2:m_DefineElement name="grid_search" ajax="0">
 				<td align="right" class="search-cell">
-					<img src="img/spacer.gif" width="300" height="1" alt=""/><br />
+					<img src="img/spacer.gif" width="250" height="1" alt=""/><br />
 					<table cellspacing="0" cellpadding="0">
 						<tr>
 							<td><inp2:m_phrase name="la_Search"/>:&nbsp;</td>
 							<td>
 								<input 	type="text"
-										id="<inp2:m_param name="PrefixSpecial"/>_search_keyword"
-										name="<inp2:m_param name="PrefixSpecial"/>_search_keyword"
-										value="<inp2:m_recall var="{$PrefixSpecial}_search_keyword" no_null="no_null" special="1"/>"
-										PrefixSpecial="<inp2:m_param name="PrefixSpecial"/>"
-										Grid="<inp2:m_param name="grid"/>"
-										ajax="<inp2:m_param name="ajax"/>"
-										style="border: 1px solid grey;"/>
+										id="<inp2:m_param name='PrefixSpecial'/>_search_keyword"
+										class="filter <inp2:m_ifnot check='m_Recall' var='{$PrefixSpecial}_search_keyword' equals_to=''>filter-active</inp2:m_ifnot>"
+										name="<inp2:m_param name='PrefixSpecial'/>_search_keyword"
+										value="<inp2:m_recall var='{$PrefixSpecial}_search_keyword' no_null='no_null' special='1'/>"
+										PrefixSpecial="<inp2:m_param name='PrefixSpecial'/>"
+										Grid="<inp2:m_param name='grid'/>"
+										ajax="<inp2:m_param name='ajax'/>"/>
 								<input type="text" style="display: none;"/>
 							</td>
 							<td style="white-space: nowrap;" id="search_buttons[<inp2:m_param name="PrefixSpecial"/>]">
@@ -256,14 +256,14 @@
 
 	<inp2:m_if check="FieldEquals" field="$ElementTypeField" value="textarea">
 		<inp2:m_if check="Field" name="MultiLingual" equals_to="1" db="db">
-			<a href="javascript:PreSaveAndOpenTranslatorCV('<inp2:m_param name="SourcePrefix"/>,<inp2:m_param name="SourcePrefix"/>-cdata', '<inp2:m_param name="SourcePrefix"/>-cdata:cust_<inp2:Field name="CustomFieldId"/>', 'popups/translator', <inp2:$SourcePrefix_Field field="ResourceId"/>, 1);" title="<inp2:m_Phrase label="la_Translate" escape="1"/>"><img src="img/icons/icon24_translate.gif" style="cursor:hand;" width="24" height="24" border="0"></a>
+			<a href="javascript:PreSaveAndOpenTranslatorCV('<inp2:m_param name="SourcePrefix"/>,<inp2:m_param name="SourcePrefix"/>-cdata', '<inp2:m_param name="SourcePrefix"/>-cdata:cust_<inp2:Field name="CustomFieldId"/>', 'popups/translator', <inp2:$SourcePrefix_Field field="ResourceId"/>, 1);" title="<inp2:m_Phrase label="la_Translate" escape="1"/>"><img src="img/icons/icon24_translate.png" style="cursor:hand;" width="24" height="24" border="0"></a>
 		<inp2:m_else/>
 			<inp2:Field name="FieldName" result_to_var="custom_field"/>
 			<a href="javascript:OpenEditor('&section=in-link:editlink_general', 'kernel_form', '<inp2:{$SourcePrefix}_InputName field="cust_{$custom_field}"/>');"><img src="img/icons/icon24_link_editor.gif" style="cursor: hand;" width="24" height="24" border="0"></a>
 		</inp2:m_if>
 	<inp2:m_else/>
 		<inp2:m_if check="Field" name="MultiLingual" equals_to="1" db="db">
-			<a href="javascript:PreSaveAndOpenTranslatorCV('<inp2:m_param name="SourcePrefix"/>,<inp2:m_param name="SourcePrefix"/>-cdata', '<inp2:m_param name="SourcePrefix"/>-cdata:cust_<inp2:Field name="CustomFieldId"/>', 'popups/translator', <inp2:$SourcePrefix_Field field="ResourceId"/>);" title="<inp2:m_Phrase label="la_Translate" escape="1"/>"><img src="img/icons/icon24_translate.gif" style="cursor:hand;" width="24" height="24" border="0"></a>
+			<a href="javascript:PreSaveAndOpenTranslatorCV('<inp2:m_param name="SourcePrefix"/>,<inp2:m_param name="SourcePrefix"/>-cdata', '<inp2:m_param name="SourcePrefix"/>-cdata:cust_<inp2:Field name="CustomFieldId"/>', 'popups/translator', <inp2:$SourcePrefix_Field field="ResourceId"/>);" title="<inp2:m_Phrase label="la_Translate" escape="1"/>"><img src="img/icons/icon24_translate.png" style="cursor:hand;" width="24" height="24" border="0"></a>
 		</inp2:m_if>
 	</inp2:m_if>
 </inp2:m_DefineElement>
@@ -532,14 +532,22 @@
 <inp2:m_DefineElement name="grid_column_title_html" no_special="0">
 	<table style="width: auto" class="layout-only-table"><tr>
 		<td style="vertical-align: middle; padding: 0px">
-			<a href="javascript:resort_grid('<inp2:m_param name="PrefixSpecial"/>','<inp2:m_param name="sort_field"/>', <inp2:m_param name="ajax"/>);"
-				class="columntitle_small"><IMG alt="" src="img/list_arrow_<inp2:{$PrefixSpecial}_order field="$sort_field" no_special='$no_special'/>.gif" width="15" height="15" border="0" align="absmiddle">
+			<a
+				href="javascript:resort_grid('<inp2:m_param name="PrefixSpecial"/>','<inp2:m_param name="sort_field"/>', <inp2:m_param name="ajax"/>);"
+				class="columntitle_small"
+				title="<inp2:m_Phrase name='la_col_SortBy' no_editing='1' html_escape='1'/> <inp2:m_if check='m_Param' name='use_phrases'><inp2:m_Phrase name='$title' no_editing='1' html_escape='1'/><inp2:m_else/><inp2:m_Param name='title'/></inp2:m_if>">
+					<img
+						alt="<inp2:m_Phrase name='la_col_SortBy' no_editing='1' html_escape='1'/> <inp2:m_if check='m_Param' name='use_phrases'><inp2:m_Phrase name='$title' no_editing='1' html_escape='1'/><inp2:m_else/><inp2:m_Param name='title'/></inp2:m_if>"
+						src="img/list_arrow_<inp2:Order field='$sort_field' no_special='$no_special'/>.gif" width="15" height="15" border="0" align="absmiddle"
+					/>
 			</a>
 		</td>
 		<td style="vertical-align: middle; text-align: left; padding: 1px; white-space: normal">
-			<a href="javascript:resort_grid('<inp2:m_param name="PrefixSpecial"/>','<inp2:m_param name="sort_field"/>', <inp2:m_param name="ajax"/>);"
-				class="columntitle_small">
-				<inp2:m_if check="m_ParamEquals" name="use_phrases" value="1"><inp2:m_phrase name="$title"/><inp2:m_else/><inp2:m_param name="title"/></inp2:m_if>
+			<a
+				href="javascript:resort_grid('<inp2:m_param name="PrefixSpecial"/>','<inp2:m_param name="sort_field"/>', <inp2:m_param name="ajax"/>);"
+				class="columntitle_small"
+				title="<inp2:m_Phrase name='la_col_SortBy' no_editing='1' html_escape='1'/> <inp2:m_if check='m_Param' name='use_phrases'><inp2:m_Phrase name='$title' no_editing='1' html_escape='1'/><inp2:m_else/><inp2:m_Param name='title'/></inp2:m_if>">
+				<inp2:m_if check="m_Param" name="use_phrases"><inp2:m_Phrase name="$title"/><inp2:m_else/><inp2:m_Param name="title"/></inp2:m_if>
 			</a>
 		</td>
 	</tr></table>
@@ -550,7 +558,8 @@
 		<inp2:m_if check="m_Param" name="selector">
 			<input type="<inp2:m_Param name='selector'/>" name="<inp2:InputName field='$IdField' IdField='$IdField'/>" id="<inp2:InputName field='$IdField' IdField='$IdField'/>">
 		</inp2:m_if>
-		<img src="<inp2:ModulePath/>img/itemicons/<inp2:ItemIcon grid='$grid'/>" width="16" height="16" alt=""/>
+		<inp2:ItemIcon name="module" grid="$grid" result_to_var="icon_module"/>
+		<img src="<inp2:ModulePath module='$icon_module'/>img/itemicons/<inp2:ItemIcon grid='$grid'/>" width="16" height="16" alt=""/>
 	</div>
 </inp2:m_DefineElement>
 
@@ -609,14 +618,14 @@
 	<inp2:InitList pass_params="1"/> <!--## this is to avoid recalling prefix as an item in first iterate grid, by col-picker for instance ##-->
 
 	<inp2:{$PrefixSpecial}_SaveWarning name="grid_save_warning" pass_params="1"/>
-	<inp2:m_if check="m_RecallEquals" var="{$PrefixSpecial}_search_keyword" value="" inverse="inverse">
-	<table width="100%" border="0" cellspacing="0" cellpadding="4" class="warning-table">
-  		<tr>
-    		<td valign="top" class="form-warning">
-    			<inp2:m_phrase name="la_Warning_Filter"/>
-    		</td>
-  		</tr>
-	</table>
+	<inp2:m_if check="{$PrefixSpecial}_SearchActive" grid="$grid">
+		<table width="100%" border="0" cellspacing="0" cellpadding="4" class="warning-table">
+	  		<tr>
+	    		<td valign="top" class="form-warning">
+	    			<inp2:m_phrase name="la_Warning_Filter"/>
+	    		</td>
+	  		</tr>
+		</table>
 	</inp2:m_if>
 
 	<div id="grid_<inp2:m_Param name='PrefixSpecial'/>_container"></div>
@@ -651,8 +660,8 @@
 
 <inp2:m_DefineElement name="default_sorting_element" ajax="0">
 	<div style="text-align: center;">
-		<a href="#" onclick="reset_sorting('<inp2:m_Param name="prefix"/>', <inp2:m_param name="ajax"/>); return false;" title="<inp2:m_phrase name="la_Text_Default" html_escape="1"/>">
-			<img src="img/list_arrow_<inp2:m_if check='{$prefix}_OrderChanged'>no<inp2:m_else/>desc</inp2:m_if>_big.gif" width="16" height="16" alt="<inp2:m_phrase name="la_Text_Default" html_escape="1"/>"/>
+		<a href="#" onclick="reset_sorting('<inp2:m_Param name="prefix"/>', <inp2:m_param name="ajax"/>); return false;" title="<inp2:m_phrase name="la_col_ResetToDefaultSorting" html_escape="1"/>">
+			<img src="img/list_arrow_<inp2:m_if check='{$prefix}_OrderChanged'>no<inp2:m_else/>desc</inp2:m_if>_big.gif" width="16" height="16" alt="<inp2:m_phrase name="la_col_ResetToDefaultSorting" html_escape="1"/>"/>
 		</a>
 	</div>
 </inp2:m_DefineElement>
@@ -782,14 +791,14 @@
 	<inp2:GridSelector grid="$grid" default="$selector" result_to_var="selector"/>
 
 	<inp2:{$PrefixSpecial}_SaveWarning name="grid_save_warning" main_prefix="$main_prefix"/>
-	<inp2:m_if check="m_RecallEquals" var="{$PrefixSpecial}_search_keyword" value="" inverse="inverse">
-	<table width="100%" border="0" cellspacing="0" cellpadding="4" class="warning-table" >
-  		<tr>
-    		<td valign="top" class="hint_red">
-    			<inp2:m_phrase name="la_Warning_Filter"/>
-    		</td>
-  		</tr>
-	</table>
+	<inp2:m_if check="{$PrefixSpecial}_SearchActive" grid="$grid">
+		<table width="100%" border="0" cellspacing="0" cellpadding="4" class="warning-table" >
+	  		<tr>
+	    		<td valign="top" class="hint_red">
+	    			<inp2:m_phrase name="la_Warning_Filter"/>
+	    		</td>
+	  		</tr>
+		</table>
 	</inp2:m_if>
 
 	<inp2:m_if check="m_ParamEquals" name="per_page" value="-1" inverse="1">