From 79cc947ed80a9809086df0552bf89581c31f7ec2 Mon Sep 17 00:00:00 2001
From: Saophalkun Ponlu <phalkunz@gmail.com>
Date: Fri, 12 Oct 2012 16:04:56 +1300
Subject: [PATCH] Batch actions UI enhancement (#7878)

---
 .../CMSPagesController_ContentToolActions.ss  |  3 +--
 .../CMSPagesController_ContentToolbar.ss      | 20 +++++--------------
 2 files changed, 6 insertions(+), 17 deletions(-)

diff --git a/templates/Includes/CMSPagesController_ContentToolActions.ss b/templates/Includes/CMSPagesController_ContentToolActions.ss
index b87c7ddf..4299e08a 100644
--- a/templates/Includes/CMSPagesController_ContentToolActions.ss
+++ b/templates/Includes/CMSPagesController_ContentToolActions.ss
@@ -1,4 +1,3 @@
 <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>
-</div>
-
+</div>
\ No newline at end of file
diff --git a/templates/Includes/CMSPagesController_ContentToolbar.ss b/templates/Includes/CMSPagesController_ContentToolbar.ss
index da77ca81..24dace8e 100644
--- a/templates/Includes/CMSPagesController_ContentToolbar.ss
+++ b/templates/Includes/CMSPagesController_ContentToolbar.ss
@@ -1,18 +1,8 @@
 <div class="cms-content-batchactions">
+	<div class="view-mode-batchactions-wrapper">
+		<input id="view-mode-batchactions" name="view-mode-batchactions" type="checkbox" />
+		<label for="view-mode-batchactions"><% _t("CMSPagesController_ContentToolbar.ss.MULTISELECT","Multi-selection") %></label>
+	</div>
+
 	$BatchActionsForm
 </div>
-
-<div class="cms-tree-view-modes">
-	<span><% _t("TreeTools.DisplayLabel","Display:") %></span>
-	<% if CanOrganiseSitetree %> 
-	<div class="checkboxAboveTree">
-		<input type="radio" name="view-mode" class="view-mode" value="draggable" id="view-mode-draggable" checked="checked" />
-		<label for="view-mode-draggable"><% _t("CMSPagesController_ContentToolbar.ss.ENABLEDRAGGING","Drag'n'drop") %></label>
-	</div>
-	<% end_if %>
-	<div>
-		<input type="radio" name="view-mode" class="view-mode" value="multiselect" id="view-mode-multiselect" />
-		<label for="view-mode-multiselect"><% _t("CMSPagesController_ContentToolbar.ss.MULTISELECT","Multi-selection") %></label>
-	</div>
-</div>
-