From 941863aa868a3ee67e833cbb0a234f10ddfe261c Mon Sep 17 00:00:00 2001
From: Ingo Schommer <ingo@silverstripe.com>
Date: Wed, 6 Apr 2011 08:32:26 +1200
Subject: [PATCH] MINOR Removed tree key, to be replaced with bezels alongside
 the tree nodes MINOR Removed unnecessary #sitetree_holder classes from
 LeftAndMain templates

---
 templates/Includes/CMSMain_left.ss     | 24 ++++++------------------
 templates/Includes/ReportAdmin_left.ss | 10 ++++------
 2 files changed, 10 insertions(+), 24 deletions(-)

diff --git a/templates/Includes/CMSMain_left.ss b/templates/Includes/CMSMain_left.ss
index bf4555f1..f528aaa9 100755
--- a/templates/Includes/CMSMain_left.ss
+++ b/templates/Includes/CMSMain_left.ss
@@ -2,24 +2,12 @@
 		<h3>
 			<a href="#"><% _t('SITECONTENT TITLE','Page Tree',PR_HIGH) %></a>
 		</h3>
-		<div id="sitetree_holder">
-			<div id="sitetree_and_tools">
-				<div id="TreeTools">
-					 <% include CMSMain_TreeTools %>
-				</div>
-				<div id="sitetree" data-url-tree="$Link(getsubtree)" data-url-savetreenode="$Link(savetreenode)" class="jstree jstree-apple">
-					$SiteTreeAsUL
-				</div>
-			</div>
-			
-			<div id="publication_key">
-				<% _t('KEY','Key:') %>
-				<ins style="cursor: help" title="<% _t('ADDEDNOTPUB','Added to the draft site and not published yet') %>"><% _t('NEW','new') %></ins>
-				<del style="cursor: help" title="<% _t('DELETEDSTILLLIVE','Deleted from the draft site but still on the live site') %>"><% _t('DEL','deleted') %></del>
-				<span style="cursor: help" title="<% _t('EDITEDNOTPUB','Edited on the draft site and not published yet') %>" class="modified"><% _t('CHANGED','changed') %></span>
-				<span style="cursor: help" title="<% _t('NOTINMENU','Excluded from navigation menus') %>" class="notinmenu"><% _t('HIDDEN','hidden') %></span>
-			</div>
-		</div>	
+
+		<% include CMSMain_TreeTools %>
+		
+		<div id="sitetree" data-url-tree="$Link(getsubtree)" data-url-savetreenode="$Link(savetreenode)" class="jstree jstree-apple">
+			$SiteTreeAsUL
+		</div>
 
 		<h3>
 			<a href="#"><% _t('PAGEVERSIONH','Page Version History') %></a>
diff --git a/templates/Includes/ReportAdmin_left.ss b/templates/Includes/ReportAdmin_left.ss
index 33b43af9..ec9a3d38 100755
--- a/templates/Includes/ReportAdmin_left.ss
+++ b/templates/Includes/ReportAdmin_left.ss
@@ -8,11 +8,9 @@
 	<h3>
 		<a href="#"><% _t('REPORTS','Reports') %></a>
 	</h3>
-	<div id="sitetree_holder">
-		<div id="sitetree_and_tools">
-			<div id="sitetree" data-url-tree="$Link(getsubtree)" data-url-savetreenode="$Link(savetreenode)" class="jstree jstree-apple">
-				<% include ReportAdmin_SiteTree %>
-			</div>
-		</div>
+
+	<div id="sitetree" data-url-tree="$Link(getsubtree)" data-url-savetreenode="$Link(savetreenode)" class="jstree jstree-apple">
+		<% include ReportAdmin_SiteTree %>
 	</div>
+
 </div>