Index: branches/5.2.x/admin_templates/links/links_relations.tpl
===================================================================
--- branches/5.2.x/admin_templates/links/links_relations.tpl	(revision 16605)
+++ branches/5.2.x/admin_templates/links/links_relations.tpl	(revision 16606)
@@ -1,105 +1,105 @@
 <inp2:adm_SetPopupSize width="880" height="680"/>
 
 <inp2:m_include t="incs/header"/>
 <inp2:m_RenderElement name="combined_header" prefix="l" section="in-portal:browse" title_preset="links_relations" tab_preset="Default" pagination="1" pagination_prefix="l-rel"/>
 
 <!-- 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('l','<inp2:l_SaveEvent/>');
 						}
 					) );
 				a_toolbar.AddButton( new ToolBarButton('cancel', '<inp2:m_phrase label="la_ToolTip_Cancel" escape="1"/>', function() {
 							submit_event('l','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('l', '<inp2:l_PrevId/>');
 						}
 				 ) );
 				a_toolbar.AddButton( new ToolBarButton('next', '<inp2:m_phrase label="la_ToolTip_Next" escape="1"/>', function() {
 							go_to_id('l', '<inp2:l_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('l-rel', '<inp2:adm_SelectorLink prefix="l-rel" selection_mode="single" tab_prefixes="all" no_amp="1" js_escape="1"/>', 'TargetId', '950x600');
 						} ) );
 
 				function edit()
 	  			{
 	  				std_edit_temp_item('l-rel', 'in-link/links/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('l-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('l-rel','OnMassApprove');
 						}
 				 ) );
 
 				a_toolbar.AddButton( new ToolBarButton('decline', '<inp2:m_phrase label="la_ToolTip_Decline" escape="1"/>', function() {
 							submit_event('l-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="l_IsSingle" >
 					a_toolbar.HideButton('prev');
 					a_toolbar.HideButton('next');
 					a_toolbar.HideButton('sep1');
 					//a_toolbar.HideButton('sep2');
 				<inp2:m_else/>
 					<inp2:m_if check="l_IsLast" >
 						a_toolbar.DisableButton('next');
 					</inp2:m_if>
 					<inp2:m_if check="l_IsFirst" >
 						a_toolbar.DisableButton('prev');
 					</inp2:m_if>
 				</inp2:m_if>
 			</script>
 		</td>
 
 		<inp2:m_RenderElement name="search_main_toolbar" prefix="l-rel" grid="Default"/>
 	</tr>
 </tbody>
 </table>
 
 <inp2:m_RenderElement name="grid" PrefixSpecial="l-rel" IdField="RelationshipId" grid="Default"/>
 <script type="text/javascript">
 	Grids['l-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/duplicate_checker.tpl
===================================================================
--- branches/5.2.x/admin_templates/duplicate_checker.tpl	(revision 16605)
+++ branches/5.2.x/admin_templates/duplicate_checker.tpl	(revision 16606)
@@ -1,73 +1,73 @@
 <inp2:m_include t="incs/header"/>
 
 <inp2:m_RenderElement name="combined_header" prefix="l.duplicates" section="in-link:duplicate_checker" grid="Duplicates" title_preset="duplicate_links" pagination="1"/>
 
 <!-- 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();
 
 				function edit()
 				{
 					open_popup('l.duplicates', 'OnStoreSelected', 'in-link/duplicate_checker/duplicate_link_view');
 				}
 
 				a_toolbar.AddButton( new ToolBarButton('edit', '<inp2:m_phrase label="la_ToolTip_Edit" escape="1"/>::<inp2:m_phrase label="la_ToolTip_Edit" escape="1"/>', edit) );
 
 				a_toolbar.AddButton( new ToolBarSeparator('sep1') );
 
 			  	a_toolbar.AddButton( new ToolBarButton('view', '<inp2:m_phrase label="la_ToolTip_View" escape="1"/>', function() {
 							show_viewmenu(a_toolbar,'view');
 						}
 				) );
 
 				a_toolbar.Render();
 
 				function set_grouping($prefix_special, $dupe_fields)
 				{
 					set_hidden_field($prefix_special + '_dupe_fields', $dupe_fields);
 					submit_event($prefix_special, 'OnSetGrouping');
 
 				}
 
 				Application.setHook(
 					'l.duplicates:OnCreateViewMenu',
 					function() {
 						// create grouping menu
 						$Menus['l.duplicates_grouping_menu'] = menuMgr.createMenu(rs('l.duplicates.grouping.menu'));
 						$Menus['l.duplicates_grouping_menu'].applyBorder(false, false, false, false);
 						$Menus['l.duplicates_grouping_menu'].dropShadow("none");
 						$Menus['l.duplicates_grouping_menu'].showIcon = true;
 						<inp2:m_Get name="m_lang" no_html_escape="1" result_to_var="language"/>
-						$Menus['l.duplicates_grouping_menu'].addItem(rs('l.duplicates.group.name'), 'Name', 'javascript:set_grouping("l.duplicates", "|l<inp2:m_Param name="language"/>_Name|");' <inp2:m_if check="m_RecallEquals" name="l.duplicates_dupe_fields" value="|l{$language}_Name|">,['img/check_on.gif']</inp2:m_if>);
+						$Menus['l.duplicates_grouping_menu'].addItem(rs('l.duplicates.group.name'), 'Name', 'javascript:set_grouping("l.duplicates", "|l<inp2:m_Param name="language" js_escape="1"/>_Name|");' <inp2:m_if check="m_RecallEquals" name="l.duplicates_dupe_fields" value="|l{$language}_Name|">,['img/check_on.gif']</inp2:m_if>);
 						$Menus['l.duplicates_grouping_menu'].addItem(rs('l.duplicates.group.url'), 'Url',  'javascript:set_grouping("l.duplicates", "|Url|");' <inp2:m_if check="m_RecallEquals" name="l.duplicates_dupe_fields" value="|Url|">,['img/check_on.gif']</inp2:m_if>);
-						$Menus['l.duplicates_grouping_menu'].addItem(rs('l.duplicates.group.name.url'), 'Name <inp2:m_phrase name="la_and"/> Url', 'javascript:set_grouping("l.duplicates", "|l<inp2:m_Param name="language"/>_Name|Url|");' <inp2:m_if check="m_RecallEquals" name="l.duplicates_dupe_fields" value="|l{$language}_Name|Url|">,['img/check_on.gif']</inp2:m_if>);
+						$Menus['l.duplicates_grouping_menu'].addItem(rs('l.duplicates.group.name.url'), 'Name <inp2:m_phrase name="la_and"/> Url', 'javascript:set_grouping("l.duplicates", "|l<inp2:m_Param name="language" js_escape="1"/>_Name|Url|");' <inp2:m_if check="m_RecallEquals" name="l.duplicates_dupe_fields" value="|l{$language}_Name|Url|">,['img/check_on.gif']</inp2:m_if>);
 
 						// add grouping menu to view menu
 						$Menus['l.duplicates_view_menu'].addItem(
 							rs('l.duplicates.grouping.menu.item'),
 							'<inp2:m_phrase name="la_menu_Grouping"/>',
 							'javascript:void()',
 							null, true, null,
 							rs('l.duplicates.grouping.menu'),
 							'<inp2:m_phrase name="la_menu_Grouping"/>'
 						);
 					}
 				);
 			</script>
 		</td>
 
 		<inp2:m_RenderElement name="search_main_toolbar" prefix="l.duplicates" grid="Duplicates"/>
 	</tr>
 </tbody>
 </table>
 
 <inp2:m_RenderElement name="grid" PrefixSpecial="l.duplicates" IdField="LinkId" grid="Duplicates"/>
 <script type="text/javascript">
 	Grids['l.duplicates'].SetDependantToolbarButtons( new Array('edit') );
 </script>
 
 <inp2:m_include t="incs/footer"/>