Index: branches/RC/core/admin_templates/incs/footer.tpl
===================================================================
diff -u -N -r11482 -r11661
--- branches/RC/core/admin_templates/incs/footer.tpl	(.../footer.tpl)	(revision 11482)
+++ branches/RC/core/admin_templates/incs/footer.tpl	(.../footer.tpl)	(revision 11661)
@@ -1,14 +1,14 @@
-<inp2:m_if check="adm_UsePopups">
-	<script type="text/javascript">
+<script type="text/javascript">
+	var _Simultanious_Edit_Message = '<inp2:m_Get var="_simultanious_edit_message" js_escape="1"/>';
+
+	<inp2:m_if check="adm_UsePopups">
 		var o = '';
 		var el = document.getElementById('scroll_container');
 		if (el) {
 			document.body.style.height = '100%';
 			document.body.style.overflow = 'hidden';
 			document.body.scroll = 'no'
 
-			var _Simultanious_Edit_Message = '<inp2:m_Get var="_simultanious_edit_message" js_escape="1"/>';
-
 			addLoadEvent(
 				function() {
 					Form.Init('scroll_container');
@@ -25,30 +25,32 @@
 		</inp2:m_ifnot>
 
 		Application.footerInit();
-	</script>
-<inp2:m_else/>
-	<script type="text/javascript">
+	<inp2:m_else/>
 		addLoadEvent(
 			function() {
 				IterateUploaders('moveOutside');
+
 				if (typeof UploadsManager != 'undefined') {
 					UploadsManager.setScrollEvents();
 				}
 			}
 		);
 
 		InitEditors();
-	</script>
-	<inp2:m_if check="adm_TemplateMatches" templates="head,tree" inverse="inverse">
-	<br /><br />
 	</inp2:m_if>
-</inp2:m_if>
+</script>
 
+<inp2:m_ifnot check="adm_UsePopups">
+	<inp2:m_ifnot check="m_Get" name="template" equals_to="head|tree">
+		<br /><br />
+	</inp2:m_ifnot>
+</inp2:m_ifnot>
+
 <inp2:adm_AfterScript/>
 
-<inp2:m_if check="m_ParamEquals" name="noform" value="yes" inverse="inverse">
+<inp2:m_ifnot check="m_Param" name="noform" equals_to="yes">
 	<inp2:m_RenderElement name="kernel_form_end"/>
-</inp2:m_if>
+</inp2:m_ifnot>
 
 <div id="nlsMenuPlace"></div>
 </body>