Index: branches/5.2.x/admin_templates/user_item_tab.tpl
===================================================================
--- branches/5.2.x/admin_templates/user_item_tab.tpl	(revision 16611)
+++ branches/5.2.x/admin_templates/user_item_tab.tpl	(revision 16612)
@@ -1,43 +1,43 @@
 <inp2:m_RequireLogin permissions="in-portal:user_list.view" system="1"/>
 <inp2:m_DefaultParam title_property=""/>
 <inp2:m_DefineElement name="catalog_tab">
 	<inp2:m_if check="m_ParamEquals" name="tab_init" value="" inverse="inverse">
 		<inp2:m_if check="m_ParamEquals" name="tab_init" value="1">
 			<div id="products_div" prefix="<inp2:m_param name="prefix"/>" view_template="in-commerce/user_item_tab" edit_template="in-commerce/products/products_edit" dep_buttons="new_product" category_id="-1" class="catalog-tab"><!-- IE minimal height problem fix --></div>
 			<script type="text/javascript">$Catalog.registerTab('products');</script>
 		</inp2:m_if>
 		<inp2:m_if check="m_ParamEquals" name="tab_init" value="2">
 			<inp2:adm_CatalogTab render_as="item_tab" prefix="$prefix" title_property="$title_property"/>
 		</inp2:m_if>
 	<inp2:m_else/>
 		<inp2:m_include t="incs/blocks"/>
 		<inp2:m_include t="incs/in-portal"/>
 		<inp2:m_include t="categories/ci_blocks"/>
 		<inp2:$prefix_InitList grid="$grid_name"/>
 
 		$Catalog.setItemCount('<inp2:m_param name="prefix"/>', '<inp2:{$prefix}_CatalogItemCount/>');
-		$Catalog.setCurrentCategory('<inp2:m_param name="prefix"/>', <inp2:m_get name="m_cat_id" no_html_escape="1" js_escape="1"/>);
+		$Catalog.setCurrentCategory('<inp2:m_param name="prefix"/>', <inp2:m_get name="m_cat_id" js_escape="1"/>);
 		$Catalog.saveSearch('<inp2:m_Param name="prefix"/>', '<inp2:$prefix_SearchKeyword js_escape="1"/>', '<inp2:m_Param name="grid_name"/>');
 
 		<inp2:m_DefineElement name="qty_td">
 			<inp2:Field field="QtyInStock" grid="$grid"/>/<inp2:Field field="QtyReserved" grid="$grid"/>
 		</inp2:m_DefineElement>
 
 		<inp2:m_RenderElement name="grid_js" PrefixSpecial="$prefix" IdField="ProductId" grid="$grid_name" menu_filters="yes"/>
 
 		Grids['<inp2:m_param name="prefix"/>'].SetDependantToolbarButtons( new Array('edit','delete'));
 		$Catalog.setViewMenu('<inp2:m_param name="prefix"/>');
 		#separator#
 		<!-- products tab: begin -->
 		<inp2:m_RenderElement name="kernel_form" form_name="products_form"/>
 			<inp2:m_RenderElement name="grid" ajax="1" PrefixSpecial="$prefix" IdField="ProductId" grid="$grid_name" menu_filters="yes"/>
 		<inp2:m_RenderElement name="kernel_form_end"/>
 		<!-- products tab: end -->
 	</inp2:m_if>
 </inp2:m_DefineElement>
 
 <!--## <inp2:p_InitCatalogTab render_as="catalog_tab" default_grid="Default" radio_grid="Radio"/> ##-->
 
 <inp2:m_if check="m_Param" name="tab_init">
 	<inp2:m_include template="in-commerce/user_order_item_tab" tab_init="$tab_init" title_property="$title_property"/>
 </inp2:m_if>
Index: branches/5.2.x/admin_templates/catalog_tab.tpl
===================================================================
--- branches/5.2.x/admin_templates/catalog_tab.tpl	(revision 16611)
+++ branches/5.2.x/admin_templates/catalog_tab.tpl	(revision 16612)
@@ -1,102 +1,102 @@
 <inp2:m_RequireLogin permissions="in-portal:browse.view" system="1"/>
 <inp2:m_DefineElement name="catalog_tab">
 	<inp2:m_if check="m_ParamEquals" name="tab_init" value="" inverse="inverse">
 		<inp2:m_if check="m_ParamEquals" name="tab_init" value="1">
 			function createProductMenu() {
 				prod_menu = menuMgr.createMenu(rs('new_prod_menu'));
 				prod_menu.applyBorder(false, false, false, false);
 				prod_menu.dropShadow("none");
 				prod_menu.showIcon = true;
 
 				<inp2:m_DefineElement name="product_type_elem">
 					prod_menu.addItem(rs('product.type.<inp2:m_param name="key"/>'),'<inp2:m_phrase name="$option" escape="1"/>','javascript:new_product(<inp2:m_param name="key"/>);');
 				</inp2:m_DefineElement>
 				<inp2:{$prefix}_PredefinedOptions selected="selected" field="Type" block="product_type_elem" skip_autoload="true"/>
 			}
 
 			a_toolbar.AddButton(
 				new ToolBarButton(
 					'in-commerce:new_product',
 					'<inp2:m_phrase label="la_ToolTip_NewProduct" escape="1"/>::<inp2:m_phrase label="la_ToolTip_NewProduct" escape="1"/>',
 					function() {
 						renderMenus();
 						nls_showMenu(rs('new_prod_menu'), a_toolbar.GetButtonImage('new_product'));
 					},
 					true
 		 		)
 		 	);
 
 			function new_product($type) {
 				$form_name = $Catalog.queryTabRegistry('prefix', $Catalog.ActivePrefix, 'tab_id') + '_form';
 				set_hidden_field('<inp2:m_param name="prefix"/>_new_type', $type);
 
 				<inp2:m_if check="m_Get" name="t" equals_to="catalog/catalog">
 					std_precreate_item($Catalog.ActivePrefix, $Catalog.queryTabRegistry('prefix', $Catalog.ActivePrefix, 'edit_template'));
 				<inp2:m_else/>
 					var $kf = document.getElementById($form_name);
 
 					var $prev_action = $kf.action;
 					$kf.action = '<inp2:m_t pass="all" no_pass_through="1"/>';
 
 					set_hidden_field('remove_specials[' + $Catalog.ActivePrefix + ']', 1);
 					std_precreate_item(
 						$Catalog.ActivePrefix, $Catalog.queryTabRegistry('prefix', $Catalog.ActivePrefix, 'edit_template'),
 						function() {
 							$kf.action = $prev_action;
 						}
 					);
 				</inp2:m_if>
 			}
 
 			createProductMenu();
 		</inp2:m_if>
 
 		<inp2:m_if check="m_ParamEquals" name="tab_init" value="2">
 			<div id="products_div" prefix="<inp2:m_param name="prefix"/>" view_template="in-commerce/catalog_tab" edit_template="in-commerce/products/products_edit" category_id="-1" dep_buttons="new_product" class="catalog-tab"><!-- IE minimal height problem fix --></div>
 			<script type="text/javascript">$Catalog.registerTab('products');</script>
 		</inp2:m_if>
 
 		<inp2:m_if check="m_ParamEquals" name="tab_init" value="3">
 			$Catalog.setItemCount('<inp2:m_Param name="prefix"/>', '<inp2:{$prefix}_CatalogItemCount grid="$grid_name"/>');
 		</inp2:m_if>
 	<inp2:m_else/>
 		<inp2:lang.current_SetContentType content_type="text/plain"/>
 		<inp2:m_include t="incs/blocks"/>
 		<inp2:m_include t="incs/in-portal"/>
 		<inp2:m_include t="categories/ci_blocks"/>
 		<inp2:$prefix_InitList grid="$grid_name"/>
 
 		$Catalog.setItemCount('<inp2:m_param name="prefix"/>', '<inp2:{$prefix}_CatalogItemCount/>');
-		$Catalog.setCurrentCategory('<inp2:m_param name="prefix"/>', <inp2:m_get name="m_cat_id" no_html_escape="1" js_escape="1"/>);
+		$Catalog.setCurrentCategory('<inp2:m_param name="prefix"/>', <inp2:m_get name="m_cat_id" js_escape="1"/>);
 		$Catalog.saveSearch('<inp2:m_Param name="prefix"/>', '<inp2:$prefix_SearchKeyword js_escape="1"/>', '<inp2:m_Param name="grid_name"/>');
 
 		<inp2:m_DefineElement name="qty_td">
 			<inp2:Field field="QtyInStock" grid="$grid"/>/<inp2:Field field="QtyReserved" grid="$grid"/>
 		</inp2:m_DefineElement>
 
 		<inp2:m_include template="in-auction/inc/grid_blocks" is_silent="1"/>
 
 		<inp2:m_RenderElement name="grid_js" PrefixSpecial="$prefix" IdField="ProductId" grid="$grid_name" menu_filters="yes"/>
 		<inp2:m_RenderElement name="grid_search_buttons" PrefixSpecial="$prefix" grid="$grid_name" ajax="1"/>
 
 		<inp2:m_if check="m_ParamEquals" name="tab_dependant" value="yes">
 			Grids['<inp2:m_param name="prefix"/>'].AddAlternativeGrid('<inp2:m_param name="cat_prefix"/>', true);
 		</inp2:m_if>
 		Grids['<inp2:m_param name="prefix"/>'].SetDependantToolbarButtons( new Array('edit','delete','approve','decline','sep3','cut','copy','move_up','move_down','sep6'));
 		<inp2:m_RenderElement name="reflect_catalog_buttons"/>
 
 		$Catalog.setViewMenu('<inp2:m_param name="prefix"/>');
 		<inp2:m_if check="m_ParamEquals" name="tab_mode" value="single">
 			Grids['<inp2:m_param name="prefix"/>'].DblClick = function() {return false};
 		</inp2:m_if>
 		#separator#
 		<!-- products tab: begin -->
 		<inp2:m_RenderElement name="kernel_form" form_name="products_form"/>
 			<input type="hidden" name="<inp2:m_param name="prefix"/>_new_type" id="<inp2:m_param name="prefix"/>_new_type" value="">
 			<inp2:m_RenderElement name="grid" ajax="1" PrefixSpecial="$prefix" IdField="ProductId" grid="$grid_name" menu_filters="yes"/>
 		<inp2:m_RenderElement name="kernel_form_end"/>
 		<!-- products tab: end -->
 	</inp2:m_if>
 </inp2:m_DefineElement>
 
 <inp2:p_InitCatalogTab render_as="catalog_tab" default_grid="Default" radio_grid="Radio"/>
Index: branches/5.2.x/admin_templates/products/products_pricing_grid.tpl
===================================================================
--- branches/5.2.x/admin_templates/products/products_pricing_grid.tpl	(revision 16611)
+++ branches/5.2.x/admin_templates/products/products_pricing_grid.tpl	(revision 16612)
@@ -1,110 +1,110 @@
 <inp2:m_RequireLogin permissions="in-portal:browse.view" system="1"/>
 <inp2:m_if check="m_ParamEquals" name="tab_init" value="1">
 	<div id="<inp2:m_param name="item_prefix"/>_div" prefix="<inp2:m_param name="item_prefix"/>" group_id="-1"></div>
 	<script type="text/javascript">$BracketManager.registerTab('<inp2:m_param name="item_prefix"/>');</script>
 <inp2:m_else/>
 	<inp2:lang.current_SetContentType content_type="text/plain"/>
 	if ($request_visible) {
-		document.getElementById('<inp2:m_get name="item_prefix" no_html_escape="1" js_escape="1"/>_div').setAttribute('group_id', <inp2:m_get name="group_id" no_html_escape="1" js_escape="1"/>);
-		maximizeElement( jq('#<inp2:m_get name="item_prefix" no_html_escape="1" js_escape="1"/>_div') );
+		document.getElementById('<inp2:m_get name="item_prefix" js_escape="1"/>_div').setAttribute('group_id', <inp2:m_get name="group_id" js_escape="1"/>);
+		maximizeElement( jq('#<inp2:m_get name="item_prefix" js_escape="1"/>_div') );
 	}
 	<inp2:m_if check="c_SaveWarning">
 		document.getElementById('save_warning').style.display = 'block';
 		$edit_mode = true;
 	</inp2:m_if>
 	#separator#
 	<inp2:m_DefineElement name="pr_edit_box" >
 	<td>
 		<input type="text" size="<inp2:m_param name="size"/>" name="pr.tang[<inp2:m_param name="id"/>][<inp2:m_param name="field"/>]"
 					id="pr.tang[<inp2:m_param name="id"/>][<inp2:m_param name="field"/>]"
 					tabindex="<inp2:m_get param="tab_index"/>"
 					value="<inp2:m_param name="$field"/>"
 				>
 	</inp2:m_DefineElement>
 
 	<inp2:m_DefineElement name="pr_edit_checkbox" >
 	<td>
 		<input type="hidden" name="pr.tang[<inp2:m_param name="id"/>][<inp2:m_param name="field"/>]" id="pr.tang[<inp2:m_param name="id"/>][<inp2:m_param name="field"/>]" tabindex="<inp2:m_get param="tab_index"/>" value="<inp2:m_param name="$field"/>">
 				<input tabindex="<inp2:m_get param="tab_index"/>" type="checkbox" id="_cb_<inp2:m_param name="field"/>" name="_cb_<inp2:m_param name="field"/>"
 					<inp2:m_if check="m_paramequals" param="$field" value="1" >
 						checked
 					</inp2:m_if> class="<inp2:m_param name="field_class"/>" onclick="update_checkbox(this, document.getElementById('pr.tang[<inp2:m_param name="id"/>][<inp2:m_param name="field"/>]'))">
 	</td>
 	</inp2:m_DefineElement>
 
 	<inp2:m_DefineElement name="pr_edit_max" >
 	<td>
 				<input type="text" size="10" name="pr.tang[<inp2:m_param name="id"/>][<inp2:m_param name="field"/>]"
 					id="pr.tang[<inp2:m_param name="id"/>][<inp2:m_param name="field"/>]"
 					tabindex="<inp2:m_get param="tab_index"/>"
 					value="<inp2:m_param name="max"/>"
 					<inp2:m_if check="m_paramequals" param="next_min_id" value=""  >
 					<inp2:m_else />
 					onchange="set_start(<inp2:m_param name="id"/>, <inp2:m_param name="next_min_id"/>)"
 					</inp2:m_if>
 
 				>
 	</td>
 	</inp2:m_DefineElement>
 
 	<inp2:m_DefineElement name="pr_edit_min" >
 	<td>
 				<input type="hidden" name="pr.tang[<inp2:m_param name="id"/>][PriceId]" id="pr.tang[<inp2:m_param name="id"/>][PriceId]" value="<inp2:m_param name="id"/>">
 				<input type="text" size="10"
 					<inp2:m_if check="m_paramequals" param="first" value="1" >
 						<inp2:m_inc param="tab_index" by="1"/>
 						tabindex="<inp2:m_get param="tab_index"/>"
 					<inp2:m_else/>
 						readonly
 					</inp2:m_if>
 					name="pr.tang[<inp2:m_param name="id"/>][<inp2:m_param name="field"/>]"
 					id="pr.tang[<inp2:m_param name="id"/>][<inp2:m_param name="field"/>]"
 					value="<inp2:m_param name="min"/>"
 					<inp2:m_if check="m_paramequals" param="first" value="1" ><inp2:m_else/>disabled</inp2:m_if>
 				>
 	</td>
 	</inp2:m_DefineElement>
 
 	<inp2:m_DefineElement name="prbracket">
 		<tr class="<inp2:m_odd_even odd="table-color1" even="table-color2"/>">
 
 			<inp2:m_RenderElement name="pr_edit_min" IdField="$IdField" PrefixSpecial="pr.tang" field="MinQty" title="la_fld_Title" size="40" pass_params="true"/>
 
 			<inp2:m_RenderElement name="pr_edit_max" IdField="$IdField" PrefixSpecial="pr.tang" field="MaxQty" title="la_fld_Title" size="40" pass_params="true"/>
 
 			<inp2:m_RenderElement name="pr_edit_box" IdField="$IdField" PrefixSpecial="pr.tang" field="Cost" title="la_fld_Title" size="4" pass_params="true"/>
 
 			<inp2:m_RenderElement name="pr_edit_box" IdField="$IdField" PrefixSpecial="pr.tang" field="Price" title="la_fld_Title" size="4" pass_params="true"/>
 		<!--##
 			<inp2:m_RenderElement name="pr_edit_box" IdField="$IdField" PrefixSpecial="pr.tang" field="Points" title="la_fld_Title" size="4" pass_params="true"/>
 		##-->
 			<inp2:m_RenderElement name="pr_edit_checkbox" IdField="$IdField" PrefixSpecial="pr.tang" field="Negotiated" title="la_fld_Title" pass_params="true"/>
 
 		</tr>
 	</inp2:m_DefineElement>
 	<inp2:m_DefineElement name="pr_grid_th" width="">
 		<td class="columntitle_small"<inp2:m_if check="m_Param" name="width"> style="width: <inp2:m_Param name='width'/>"</inp2:m_if>><inp2:m_phrase label="$phrase" /></td>
 	</inp2:m_DefineElement>
 
 	<table width="100%" border="0" cellspacing="0" cellpadding="4" class="tableborder">
 		<tr nowrap="nowrap" class="grid-header-row-0">
 			<inp2:m_RenderElement name="pr_grid_th" phrase="column:la_fld_MinQty" width="15%"/>
 			<inp2:m_RenderElement name="pr_grid_th" phrase="column:la_fld_MaxQty" width="15%"/>
 			<inp2:m_RenderElement name="pr_grid_th" phrase="column:la_fld_Cost" width="10%"/>
 			<inp2:m_RenderElement name="pr_grid_th" phrase="column:la_fld_Price" width="10%"/>
 		<!--##
 			<inp2:m_RenderElement name="pr_grid_th" phrase="column:la_fld_Points" width="10%"/>
 		##-->
 			<inp2:m_RenderElement name="pr_grid_th" phrase="column:la_fld_Negotiated"/>
 		</tr>
 		<inp2:pr.tang_ShowPricingForm block="prbracket" IdField="PriceId"/>
 
 		<script type="text/javascript">
 			<inp2:m_if check="m_Get" name="pr_tang">
 				a_toolbar.EnableButton('delete');
 			<inp2:m_else/>
 				a_toolbar.DisableButton('delete');
 			</inp2:m_if>
 		</script>
 	</table>
 </inp2:m_if>
Index: branches/5.2.x/admin_templates/user_order_item_tab.tpl
===================================================================
--- branches/5.2.x/admin_templates/user_order_item_tab.tpl	(revision 16611)
+++ branches/5.2.x/admin_templates/user_order_item_tab.tpl	(revision 16612)
@@ -1,36 +1,36 @@
 <inp2:m_RequireLogin permissions="in-portal:user_list.view" system="1"/>
 <inp2:m_DefineElement name="order_catalog_tab">
 	<inp2:m_if check="m_ParamEquals" name="tab_init" value="" inverse="inverse">
 		<inp2:m_if check="m_ParamEquals" name="tab_init" value="1">
 			<div id="orders_div" prefix="<inp2:m_param name="prefix"/>" view_template="in-commerce/user_order_item_tab" edit_template="in-commerce/orders/orders_edit" dep_buttons="new_order" category_id="-1" class="catalog-tab"><!-- IE minimal height problem fix --></div>
 			<script type="text/javascript">$Catalog.registerTab('orders');</script>
 		</inp2:m_if>
 		<inp2:m_if check="m_ParamEquals" name="tab_init" value="2">
 			<inp2:adm_CatalogTab render_as="item_tab" prefix="$prefix" title_property="$title_property"/>
 		</inp2:m_if>
 	<inp2:m_else/>
 		<inp2:m_include t="incs/blocks"/>
 		<inp2:m_include t="incs/in-portal"/>
 		<inp2:m_include t="categories/ci_blocks"/>
 		<inp2:m_include template="in-commerce/orders/order_blocks"/>
 
 		<inp2:$prefix_InitList grid="$grid_name"/>
 
 		$Catalog.setItemCount('<inp2:m_param name="prefix"/>', '<inp2:{$prefix}_TotalRecords/>');
-		$Catalog.setCurrentCategory('<inp2:m_param name="prefix"/>', <inp2:m_get name="m_cat_id" no_html_escape="1" js_escape="1"/>);
+		$Catalog.setCurrentCategory('<inp2:m_param name="prefix"/>', <inp2:m_get name="m_cat_id" js_escape="1"/>);
 		$Catalog.saveSearch('<inp2:m_Param name="prefix"/>', '<inp2:$prefix_SearchKeyword js_escape="1"/>', '<inp2:m_Param name="grid_name"/>');
 
 		<inp2:m_RenderElement name="grid_js" PrefixSpecial="$prefix" IdField="OrderId" grid="$grid_name"/>
 
 		Grids['<inp2:m_param name="prefix"/>'].SetDependantToolbarButtons( new Array('edit','delete'));
 		$Catalog.setViewMenu('<inp2:m_param name="prefix"/>');
 		#separator#
 		<!-- orders tab: begin -->
 		<inp2:m_RenderElement name="kernel_form" form_name="orders_form"/>
 			<inp2:m_RenderElement name="grid" ajax="1" PrefixSpecial="$prefix" IdField="OrderId" grid="$grid_name" menu_filters="yes"/>
 		<inp2:m_RenderElement name="kernel_form_end"/>
 		<!-- orders tab: end -->
 	</inp2:m_if>
 </inp2:m_DefineElement>
 
 <inp2:ord_InitCatalogTab render_as="order_catalog_tab" default_grid="Search" radio_grid="Radio"/>