Index: trunk/kernel/admin_templates/incs/tree.js
===================================================================
diff -u -r4478 -r4684
--- trunk/kernel/admin_templates/incs/tree.js	(.../tree.js)	(revision 4478)
+++ trunk/kernel/admin_templates/incs/tree.js	(.../tree.js)	(revision 4684)
@@ -86,7 +86,6 @@
 				res = true;
 				if (isset(this.treeItem.Onclick)) {
 					res = eval(this.treeItem.Onclick);
-					alert('res: '+res);
 				}
 				if (!res) { // if we need to cancel onclick action
 					if (is.ie) {
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
Index: trunk/admin/tree/ftv2pnode.gif
===================================================================
diff -u -r13 -r4684
Binary files differ
Index: trunk/admin/tree/ftv2link.gif
===================================================================
diff -u -r13 -r4684
Binary files differ
Fisheye: Tag 4684 refers to a dead (removed) revision in file `trunk/admin/tree/ftiens4.js'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: trunk/admin/tree/ftv2blank.gif
===================================================================
diff -u -r13 -r4684
Binary files differ
Fisheye: Tag 4684 refers to a dead (removed) revision in file `trunk/admin/tree/ua.js'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: trunk/admin/tree/ftv2node.gif
===================================================================
diff -u -r13 -r4684
Binary files differ
Index: trunk/admin/tree/ftv2mnode.gif
===================================================================
diff -u -r13 -r4684
Binary files differ
Fisheye: Tag 4684 refers to a dead (removed) revision in file `trunk/admin/tree/tree.php'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: trunk/admin/tree/ftv2lastnode.gif
===================================================================
diff -u -r13 -r4684
Binary files differ
Index: trunk/admin/tree/ftv2mlastnode.gif
===================================================================
diff -u -r13 -r4684
Binary files differ
Index: trunk/admin/tree/ftv2vertline.gif
===================================================================
diff -u -r13 -r4684
Binary files differ
Index: trunk/admin/tree/ftv2folderopen.gif
===================================================================
diff -u -r13 -r4684
Binary files differ
Index: trunk/admin/tree/ftv2folderclosed.gif
===================================================================
diff -u -r13 -r4684
Binary files differ
Index: trunk/admin/tree/ftv2doc.gif
===================================================================
diff -u -r13 -r4684
Binary files differ
Index: trunk/admin/tree/ftv2plastnode.gif
===================================================================
diff -u -r13 -r4684
Binary files differ
Index: trunk/kernel/units/admin/admin_tag_processor.php
===================================================================
diff -u -r4674 -r4684
--- trunk/kernel/units/admin/admin_tag_processor.php	(.../admin_tag_processor.php)	(revision 4674)
+++ trunk/kernel/units/admin/admin_tag_processor.php	(.../admin_tag_processor.php)	(revision 4684)
@@ -267,6 +267,17 @@
 		{
 			return date($params['format']);
 		}
+		
+		function TreeEditWarrning($params)
+		{
+			$ret = $this->Application->Phrase($params['label']);
+			$ret = str_replace(Array('&lt;', '&gt;', 'br/', 'br /', "\n", "\r"), Array('<', '>', 'br', 'br', '', ''), $ret);
+			if (getArrayValue($params, 'escape')) {
+				$ret = addslashes($ret);
+			}
+			$ret = str_replace('<br>', '\n', $ret);
+			return $ret;
+		}
 	}
 
 ?>
\ No newline at end of file
Index: trunk/core/units/admin/admin_tag_processor.php
===================================================================
diff -u -r4674 -r4684
--- trunk/core/units/admin/admin_tag_processor.php	(.../admin_tag_processor.php)	(revision 4674)
+++ trunk/core/units/admin/admin_tag_processor.php	(.../admin_tag_processor.php)	(revision 4684)
@@ -267,6 +267,17 @@
 		{
 			return date($params['format']);
 		}
+		
+		function TreeEditWarrning($params)
+		{
+			$ret = $this->Application->Phrase($params['label']);
+			$ret = str_replace(Array('&lt;', '&gt;', 'br/', 'br /', "\n", "\r"), Array('<', '>', 'br', 'br', '', ''), $ret);
+			if (getArrayValue($params, 'escape')) {
+				$ret = addslashes($ret);
+			}
+			$ret = str_replace('<br>', '\n', $ret);
+			return $ret;
+		}
 	}
 
 ?>
\ No newline at end of file