Index: branches/5.2.x/admin_templates/products/products_relations.tpl
===================================================================
--- branches/5.2.x/admin_templates/products/products_relations.tpl	(revision 16604)
+++ branches/5.2.x/admin_templates/products/products_relations.tpl	(revision 16605)
@@ -1,105 +1,105 @@
 <inp2:adm_SetPopupSize width="1000" height="680"/>
 
 <inp2:m_include t="incs/header"/>
 <inp2:m_RenderElement name="combined_header" prefix="p" section="in-portal:browse" pagination="1" pagination_prefix="rel" title_preset="relations" tab_preset="Default"/>
 
 <!-- ToolBar -->
 <table class="toolbar" height="30" cellspacing="0" cellpadding="0" width="100%" border="0">
 <tbody>
 	<tr>
   	<td>
   		<script type="text/javascript">
 				a_toolbar = new ToolBar();
 				a_toolbar.AddButton( new ToolBarButton('select', '<inp2:m_phrase label="la_ToolTip_Save" escape="1"/>', function() {
 							submit_event('p','<inp2:p_SaveEvent/>');
 						}
 					) );
 				a_toolbar.AddButton( new ToolBarButton('cancel', '<inp2:m_phrase label="la_ToolTip_Cancel" escape="1"/>', function() {
 							submit_event('p','OnCancelEdit');
 						}
 				 ) );
 
 				a_toolbar.AddButton( new ToolBarSeparator('sep1') );
 
 				a_toolbar.AddButton( new ToolBarButton('prev', '<inp2:m_phrase label="la_ToolTip_Prev" escape="1"/>', function() {
 							go_to_id('p', '<inp2:p_PrevId/>');
 						}
 				 ) );
 				a_toolbar.AddButton( new ToolBarButton('next', '<inp2:m_phrase label="la_ToolTip_Next" escape="1"/>', function() {
 							go_to_id('p', '<inp2:p_NextId/>');
 						}
 				 ) );
 
 				a_toolbar.AddButton( new ToolBarSeparator('sep2') );
 
 				//Relations related:
 				a_toolbar.AddButton( new ToolBarButton('new_item', '<inp2:m_phrase label="la_ToolTip_New_Relation" escape="1"/>::<inp2:m_phrase label="la_ToolTip_Add" escape="1"/>',
 						function() {
 							openSelector('rel', '<inp2:adm_SelectorLink prefix="rel" selection_mode="single" tab_prefixes="all" no_amp="1" js_escape="1"/>', 'TargetId', '950x600');
 						} ) );
 
 				function edit()
 	  			{
 	  				std_edit_temp_item('rel', 'in-commerce/products/relations_edit');
 	  			}
 
 				a_toolbar.AddButton( new ToolBarButton('edit', '<inp2:m_phrase label="la_ToolTip_Edit" escape="1"/>', edit) );
 				a_toolbar.AddButton( new ToolBarButton('delete', '<inp2:m_phrase label="la_ToolTip_Delete" escape="1"/>',
 						function() {
 							std_delete_items('rel')
 						} ) );
 
 
 				a_toolbar.AddButton( new ToolBarSeparator('sep3') );
 
 				a_toolbar.AddButton( new ToolBarButton('approve', '<inp2:m_phrase label="la_ToolTip_Approve" escape="1"/>', function() {
 							submit_event('rel','OnMassApprove');
 						}
 				 ) );
 
 				a_toolbar.AddButton( new ToolBarButton('decline', '<inp2:m_phrase label="la_ToolTip_Decline" escape="1"/>', function() {
 							submit_event('rel','OnMassDecline');
 						}
 				 ) );
 
 				a_toolbar.AddButton( new ToolBarSeparator('sep4') );
 
 				a_toolbar.AddButton( new ToolBarButton('view', '<inp2:m_phrase label="la_ToolTip_View" escape="1"/>', function() {
 							show_viewmenu(a_toolbar,'view');
 						}
 				) );
 
 				a_toolbar.Render();
 
 				<inp2:m_if check="p_IsSingle" >
 					a_toolbar.HideButton('prev');
 					a_toolbar.HideButton('next');
 					a_toolbar.HideButton('sep1');
 					//a_toolbar.HideButton('sep2');
 				<inp2:m_else/>
 					<inp2:m_if check="p_IsLast" >
 						a_toolbar.DisableButton('next');
 					</inp2:m_if>
 					<inp2:m_if check="p_IsFirst" >
 						a_toolbar.DisableButton('prev');
 					</inp2:m_if>
 				</inp2:m_if>
 			</script>
 		</td>
 
 		<inp2:m_RenderElement name="search_main_toolbar" prefix="rel" grid="Default"/>
 	</tr>
 </tbody>
 </table>
 
 <inp2:m_RenderElement name="grid" PrefixSpecial="rel" IdField="RelationshipId" grid="Default"/>
 <script type="text/javascript">
 	Grids['rel'].SetDependantToolbarButtons( new Array('edit','delete','approve','decline') );
 </script>
 <input type="hidden" name="TargetId" id="TargetId" value="<inp2:m_get name="TargetId"/>">
 <input type="hidden" name="TargetType" id="TargetType" value="<inp2:m_get name="TargetType"/>">
 <inp2:m_include t="incs/footer"/>
 
 <script type="text/javascript">
-	var $env = document.getElementById('sid').value+'-:m<inp2:m_get name="m_cat_id"/>-1-1-1-s';
-</script>
\ No newline at end of file
+	var $env = document.getElementById('sid').value+'-:m<inp2:m_get name="m_cat_id" js_escape="1"/>-1-1-1-s';
+</script>
Index: branches/5.2.x/admin_templates/products/products_packagecontent.tpl
===================================================================
--- branches/5.2.x/admin_templates/products/products_packagecontent.tpl	(revision 16604)
+++ branches/5.2.x/admin_templates/products/products_packagecontent.tpl	(revision 16605)
@@ -1,95 +1,95 @@
 <inp2:adm_SetPopupSize width="1000" height="680"/>
 
 <inp2:m_include t="incs/header"/>
 <inp2:m_RenderElement name="combined_header" prefix="p" section="in-portal:browse" pagination="1" pagination_prefix="p.content" title_preset="content" tab_preset="Default"/>
 
 <!-- ToolBar -->
 <table class="toolbar" height="30" cellspacing="0" cellpadding="0" width="100%" border="0">
 <tbody>
 	<tr>
   	<td>
   		<script type="text/javascript">
 				a_toolbar = new ToolBar();
 				a_toolbar.AddButton( new ToolBarButton('select', '<inp2:m_phrase label="la_ToolTip_Save" escape="1"/>', function() {
 							submit_event('p','<inp2:p_SaveEvent/>');
 						}
 					) );
 				a_toolbar.AddButton( new ToolBarButton('cancel', '<inp2:m_phrase label="la_ToolTip_Cancel" escape="1"/>', function() {
 							submit_event('p','OnCancelEdit');
 						}
 				 ) );
 
 				a_toolbar.AddButton( new ToolBarSeparator('sep1') );
 
 				a_toolbar.AddButton( new ToolBarButton('prev', '<inp2:m_phrase label="la_ToolTip_Prev" escape="1"/>', function() {
 							go_to_id('p', '<inp2:p_PrevId/>');
 						}
 				 ) );
 				a_toolbar.AddButton( new ToolBarButton('next', '<inp2:m_phrase label="la_ToolTip_Next" escape="1"/>', function() {
 							go_to_id('p', '<inp2:p_NextId/>');
 						}
 				 ) );
 
 				a_toolbar.AddButton( new ToolBarSeparator('sep2') );
 
 
 				a_toolbar.AddButton( new ToolBarButton('new_item', '<inp2:m_phrase label="la_ToolTip_Add_Items" escape="1"/>::<inp2:m_phrase label="la_ToolTip_Add" escape="1"/>',
 						function() {
 							openSelector('p', '<inp2:adm_SelectorLink prefix="p" selection_mode="multi" tab_prefixes="p" no_amp="1" js_escape="1"/>', 'PackageContent', null, 'OnSaveItems');
 						} ) );
 
 				a_toolbar.AddButton( new ToolBarButton('delete', '<inp2:m_phrase label="la_ToolTip_Delete" escape="1"/>',
 						function() {
 							submit_event('p.content','OnRemovePackageItem');
 						} ) );
 
 				a_toolbar.AddButton( new ToolBarSeparator('sep3') );
 
 				a_toolbar.AddButton( new ToolBarButton('view', '<inp2:m_phrase label="la_ToolTip_View" escape="1"/>', function() {
 							show_viewmenu(a_toolbar,'view');
 						}
 				) );
 
 				function edit()
 	  			{
 	  				alert();
 	  			}
 
 				a_toolbar.Render();
 
 				<inp2:m_if check="p_IsSingle" >
 					a_toolbar.HideButton('prev');
 					a_toolbar.HideButton('next');
 					a_toolbar.HideButton('sep1');
 					//a_toolbar.HideButton('sep2');
 				<inp2:m_else/>
 					<inp2:m_if check="p_IsLast" >
 						a_toolbar.DisableButton('next');
 					</inp2:m_if>
 					<inp2:m_if check="p_IsFirst" >
 						a_toolbar.DisableButton('prev');
 					</inp2:m_if>
 				</inp2:m_if>
 			</script>
 		</td>
 
 		<inp2:m_RenderElement name="search_main_toolbar" prefix="p.content" grid="Default"/>
 	</tr>
 </tbody>
 </table>
 
 <inp2:m_include t="categories/ci_blocks"/>
 
 <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" PrefixSpecial="p.content" IdField="ProductId" grid="Default" types="content"/>
 <input type="hidden" name="TargetId" id="TargetId" value="<inp2:m_get name="TargetId"/>">
 <input type="hidden" name="TargetType" id="TargetType" value="<inp2:m_get name="TargetType"/>">
 <input type="hidden" name="main_prefix" id="main_prefix" value="p">
 <inp2:m_include t="incs/footer"/>
 
 <script type="text/javascript">
-	var $env = document.getElementById('sid').value+'-:m<inp2:m_get name="m_cat_id"/>-1-1-1-s';
-</script>
\ No newline at end of file
+	var $env = document.getElementById('sid').value+'-:m<inp2:m_get name="m_cat_id" js_escape="1"/>-1-1-1-s';
+</script>
Index: branches/5.2.x/admin_templates/payment_type/payment_type_gateway.tpl
===================================================================
--- branches/5.2.x/admin_templates/payment_type/payment_type_gateway.tpl	(revision 16604)
+++ branches/5.2.x/admin_templates/payment_type/payment_type_gateway.tpl	(revision 16605)
@@ -1,133 +1,133 @@
 <inp2:adm_SetPopupSize width="790" height="520"/>
 
 <inp2:m_include t="incs/header"/>
 <inp2:m_RenderElement name="combined_header" prefix="pt" section="in-commerce:payment_types" title_preset="gateway" tab_preset="Default"/>
 
 <inp2:m_DefineElement name="GatewayFieldsDiv">
 	<inp2:m_RenderElement name="grid_data_td" />
 </inp2:m_DefineElement>
 
 <inp2:m_DefineElement name="dummy">
 </inp2:m_DefineElement>
 
 <!-- ToolBar -->
 <table class="toolbar" height="30" cellspacing="0" cellpadding="0" width="100%" border="0">
 <tbody>
 	<tr>
   	<td>
   		<script type="text/javascript">
 				a_toolbar = new ToolBar();
 				a_toolbar.AddButton( new ToolBarButton('select', '<inp2:m_phrase label="la_ToolTip_Save" escape="1"/>', function() {
 							submit_event('pt','<inp2:pt_SaveEvent/>');
 						}
 					) );
 				a_toolbar.AddButton( new ToolBarButton('cancel', '<inp2:m_phrase label="la_ToolTip_Cancel" escape="1"/>', function() {
 							submit_event('pt','OnCancelEdit');
 						}
 				 ) );
 
 				a_toolbar.AddButton( new ToolBarSeparator('sep1') );
 
 				a_toolbar.AddButton( new ToolBarButton('prev', '<inp2:m_phrase label="la_ToolTip_Prev" escape="1"/>', function() {
 							go_to_id('pt', '<inp2:pt_PrevId/>');
 						}
 				 ) );
 				a_toolbar.AddButton( new ToolBarButton('next', '<inp2:m_phrase label="la_ToolTip_Next" escape="1"/>', function() {
 							go_to_id('pt', '<inp2:pt_NextId/>');
 						}
 				 ) );
 
 				a_toolbar.Render();
 
 				<inp2:m_if check="pt_IsSingle" >
 					a_toolbar.HideButton('prev');
 					a_toolbar.HideButton('next');
 					a_toolbar.HideButton('sep1');
 				<inp2:m_else/>
 					<inp2:m_if check="pt_IsLast" >
 						a_toolbar.DisableButton('next');
 					</inp2:m_if>
 					<inp2:m_if check="pt_IsFirst" >
 						a_toolbar.DisableButton('prev');
 					</inp2:m_if>
 				</inp2:m_if>
 			</script>
 		</td>
 	</tr>
 </tbody>
 </table>
 
 <script type="text/javascript">
 
 function refresh_fields() {
-	var $dropdown=document.getElementById('pt[<inp2:m_get name="pt_id" />][GatewayId]');
+	var $dropdown=document.getElementById('pt[<inp2:m_get name="pt_id" js_escape="1"/>][GatewayId]');
 	var $table=document.getElementById('gateway_fields');
 	var $display_style='';
 	var $i=0;
 
 
 	if (is.gecko || !is.ie) {
 		on_style = 'table-row';
 	}
 	else {
 		on_style = 'block';
 	}
 
 	while($i<$table.rows.length)
 	{
 		$row=$table.rows[$i];
 		if( isset($row.getAttribute('GatewayId')) )
 		{
 			$display_style=($row.getAttribute('GatewayId') == $dropdown.options[$dropdown.selectedIndex].value) ? on_style : 'none';
 //			alert('current display is '+$row.style.display+' setting it to '+$display_style);
 			$row.style.display = $display_style;
 //			alert('set');
 		}
 		$i++;
 	}
 }
 
 </script>
 
 <inp2:m_DefineElement name="gw_input_text">
 	<input type="text" name="<inp2:gwf_InputName field="Value"/>" id="<inp2:gwf_InputName field="Value"/>" value="<inp2:gwf_gwConfigValue/>" tabindex="<inp2:m_get param="tab_index"/>" style="width:80%">
 </inp2:m_DefineElement>
 
 <inp2:m_DefineElement name="gw_input_select">
 	<select tabindex="<inp2:m_get param="tab_index"/>" name="<inp2:gwf_InputName field="Value"/>" id="<inp2:gwf_InputName field="Value"/>">
 		<inp2:PredefinedOptions field="Value" block="inp_option_phrase" selected="selected"/>
 	</select>
 </inp2:m_DefineElement>
 
 <inp2:m_DefineElement name="gw_input_checkbox">
 	<input type="hidden" id="<inp2:gwf_InputName field="Value"/>" name="<inp2:gwf_InputName field="Value"/>" value="<inp2:gwf_gwConfigValue/>">
 	<input tabindex="<inp2:m_get param="tab_index"/>" type="checkbox" id="_cb_<inp2:gwf_InputName field="Value"/>" name="_cb_<inp2:gwf_InputName field="Value"/>" <inp2:gwf_gwConfigValue checked="checked"/> class="<inp2:m_param name="class"/>" onchange="update_checkbox(this, document.getElementById('<inp2:gwf_InputName field="Value"/>'));">
 </inp2:m_DefineElement>
 
 <inp2:m_DefineElement name="gateway_field">
 	<tr class="<inp2:m_odd_even odd='edit-form-odd' even='edit-form-even'/>" GatewayId="<inp2:m_param name="gateway_id"/>" style="display: <inp2:m_param name="display"/>;">
 		<inp2:m_inc param="tab_index" by="1"/>
 		<td class="label-cell">
 			<inp2:gwf_Field field="FieldName"/>:
 		</td>
 		<td class="control-mid">&nbsp;</td>
 		<td class="control-cell">
 			<inp2:m_RenderElement name="$input_block" pass_params="true"/>
 		</td>
 	</tr>
 </inp2:m_DefineElement>
 
 <inp2:gwf_initGWConfigValues/>
 
 <inp2:pt_SaveWarning name="grid_save_warning"/>
 <inp2:pt_ErrorWarning name="form_error_warning"/>
 
 <div id="scroll_container">
 	<table class="edit-form" id="gateway_fields">
 		<inp2:m_RenderElement name="inp_edit_options" prefix="pt" field="GatewayId" title="la_fld_Gateway" onchange="refresh_fields()"/>
 		<inp2:gwf_PrintList block="gateway_field" input_block_prefix="gw_input_" per_page="-1"/>
 		<inp2:m_RenderElement name="inp_edit_filler"/>
 	</table>
 </div>
 
-<inp2:m_include t="incs/footer"/>
\ No newline at end of file
+<inp2:m_include t="incs/footer"/>