Index: trunk/kernel/admin_templates/tree.tpl
===================================================================
diff -u -r4614 -r4684
--- trunk/kernel/admin_templates/tree.tpl	(.../tree.tpl)	(revision 4614)
+++ trunk/kernel/admin_templates/tree.tpl	(.../tree.tpl)	(revision 4684)
@@ -74,11 +74,11 @@
 			
 			<inp2:m_DefineElement name="xml_node">
 				<inp2:m_if check="m_ParamEquals" param="children_count" value="0">
-					<item href="<inp2:m_param name="section_url"/>" icon="<inp2:$SectionPrefix_ModulePath/>img/icons/icon24_<inp2:m_param name="icon"/>.gif">
+					<item href="<inp2:m_param name="section_url"/>" onclick="checkEditMode()" icon="<inp2:$SectionPrefix_ModulePath/>img/icons/icon24_<inp2:m_param name="icon"/>.gif">
 						<inp2:m_phrase name="$label" escape="1"/>
 					</item>
 				<inp2:m_else/>
-					<folder href="<inp2:m_param name="section_url"/>" name="<inp2:m_phrase name="$label" escape="1"/>" icon="<inp2:$SectionPrefix_ModulePath/>img/icons/icon24_<inp2:m_param name="icon"/>.gif" load_url="<inp2:m_param name="late_load"/>">
+					<folder href="<inp2:m_param name="section_url"/>" onclick="checkEditMode()" name="<inp2:m_phrase name="$label" escape="1"/>" icon="<inp2:$SectionPrefix_ModulePath/>img/icons/icon24_<inp2:m_param name="icon"/>.gif" load_url="<inp2:m_param name="late_load"/>">
 						<inp2:adm_PrintSections render_as="xml_node" section_name="$section_name"/>
 					</folder>
 				</inp2:m_if>
@@ -104,7 +104,17 @@
 <inp2:m_include t="incs/footer"/>
 
 <script type="text/javascript">
+	// when changing language submit is made to frameset, not the current frame
 	var $kf = document.getElementById($form_name);
 	$kf.target = 'main_frame';
-	$kf.action = '<inp2:m_t pass="" index_file="index.php" escape="1"/>';
+	
+	function checkEditMode()
+	{
+		var $phrase = "<inp2:adm_TreeEditWarrning label="la_EditingInProgress" escape="1"/>";
+		if (window.parent.getFrame('main').$edit_mode) {
+			return confirm($phrase) ? true : false;
+		}
+		
+		return true;
+	}
 </script>
\ No newline at end of file