From 58d316e98524e53e12e437e71abbf72c7ec67fb4 Mon Sep 17 00:00:00 2001
From: Ingo Schommer <ingo@silverstripe.com>
Date: Mon, 17 Dec 2012 12:46:03 +0100
Subject: [PATCH] Moving "edit tree" button next to "add new" (fixes #8119)

---
 css/screen.css                                              | 2 +-
 scss/_CMSMain.scss                                          | 3 ++-
 templates/Includes/CMSMain_TreeView.ss                      | 4 ----
 templates/Includes/CMSPagesController_ContentToolActions.ss | 3 +++
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/css/screen.css b/css/screen.css
index 0f1ecad1..de64d675 100644
--- a/css/screen.css
+++ b/css/screen.css
@@ -15,7 +15,7 @@
 
 .cms-content-tools #cms-content-treeview .cms-content-toolbar { border-bottom: none; box-shadow: none; margin-bottom: 8px; }
 .cms-content-tools #cms-content-treeview .cms-tree-view-modes, .cms-content-tools #cms-content-treeview .cms-content-batchactions { display: none; }
-.cms-content-tools #cms-content-treeview .cms-tree-expand-trigger { display: inline-block; margin: 0 0 2px 0; }
+.cms-content-tools #cms-content-treeview .cms-tree-expand-trigger { display: block; float: left; margin: 0 0 2px 0; }
 .cms-content-tools #cms-content-treeview .cms-tree-expand-trigger span.ui-button-text { padding-right: 8px; }
 .cms-content-tools #cms-content-treeview .cms-tree .badge, .cms-content-tools #cms-content-treeview .cms-tree a > .jstree-icon { display: none; }
 .cms-content-tools #cms-content-treeview .cms-tree a:hover > .text > .badge, .cms-content-tools #cms-content-treeview .cms-tree .jstree-clicked > .text > .badge { display: inline-block; }
diff --git a/scss/_CMSMain.scss b/scss/_CMSMain.scss
index 3ee1b5db..22a1c639 100644
--- a/scss/_CMSMain.scss
+++ b/scss/_CMSMain.scss
@@ -66,7 +66,8 @@
 			display: none;
 		}
 		.cms-tree-expand-trigger {
-			display: inline-block;
+			display: block;
+			float: left;
 			margin:0 0 2px 0;
 			span.ui-button-text{
 					padding-right:8px;
diff --git a/templates/Includes/CMSMain_TreeView.ss b/templates/Includes/CMSMain_TreeView.ss
index dfb54060..081caafa 100644
--- a/templates/Includes/CMSMain_TreeView.ss
+++ b/templates/Includes/CMSMain_TreeView.ss
@@ -7,10 +7,6 @@
 	$AddForm
 </div>
 
-<button href="$LinkPagesWithSearch" class="cms-tree-expand-trigger cms-panel-link ss-button" data-icon="pencil">
-	<% _t('CMSMain.EditTree', 'Edit Tree') %>
-</button>
-
 $ExtraTreeTools
 
 <div class="center">
diff --git a/templates/Includes/CMSPagesController_ContentToolActions.ss b/templates/Includes/CMSPagesController_ContentToolActions.ss
index 4299e08a..5c44a42b 100644
--- a/templates/Includes/CMSPagesController_ContentToolActions.ss
+++ b/templates/Includes/CMSPagesController_ContentToolActions.ss
@@ -1,3 +1,6 @@
 <div class="cms-actions-row">
 	<a class="cms-page-add-button ss-ui-button ss-ui-action-constructive" data-icon="add" href="$LinkPageAdd" data-url-addpage="{$LinkPageAdd('?ParentID=%s')}"><% _t('CMSMain.AddNewButton', 'Add new') %></a>
+	<button href="$LinkPagesWithSearch" class="cms-tree-expand-trigger cms-panel-link ss-button" data-icon="pencil">
+		<% _t('CMSMain.EditTree', 'Edit Tree') %>
+	</button>
 </div>
\ No newline at end of file