From dc01b741529b31c7ac480d0a4efa473f822530cc Mon Sep 17 00:00:00 2001
From: Normann Lou <normannlou@gmail.com>
Date: Tue, 10 Apr 2012 15:49:32 +1200
Subject: [PATCH] FEATURE SS-124 duplicate "Add New" and "Batch Action" into
 page list view

---
 templates/Includes/CMSPagesController_Content.ss         | 4 ++++
 .../Includes/CMSPagesController_ContentToolActions.ss    | 7 +++++++
 templates/Includes/CMSPagesController_ContentToolbar.ss  | 9 +--------
 3 files changed, 12 insertions(+), 8 deletions(-)
 create mode 100644 templates/Includes/CMSPagesController_ContentToolActions.ss

diff --git a/templates/Includes/CMSPagesController_Content.ss b/templates/Includes/CMSPagesController_Content.ss
index f4dbe2ee..e5ada14e 100644
--- a/templates/Includes/CMSPagesController_Content.ss
+++ b/templates/Includes/CMSPagesController_Content.ss
@@ -45,6 +45,10 @@
 		</div>
 	
 		<div id="cms-content-listview">
+			<div class="cms-content-toolbar">
+				<% include CMSPagesController_ContentToolActions %>
+			</div>
+			
 			<div class="cms-list" data-url-list="$Link(getListViewHTML)">
 				$ListView
 			</div>
diff --git a/templates/Includes/CMSPagesController_ContentToolActions.ss b/templates/Includes/CMSPagesController_ContentToolActions.ss
new file mode 100644
index 00000000..04b46c8e
--- /dev/null
+++ b/templates/Includes/CMSPagesController_ContentToolActions.ss
@@ -0,0 +1,7 @@
+<div class="cms-actions-row">
+	<a class="cms-page-add-button ss-ui-button ss-ui-action-constructive cms-panel-link" data-icon="add" href="$AddLink"><% _t('CMSMain.AddNewButton', 'Add new') %></a>
+</div>
+
+<div class="cms-content-batchactions">
+	$BatchActionsForm
+</div>
\ No newline at end of file
diff --git a/templates/Includes/CMSPagesController_ContentToolbar.ss b/templates/Includes/CMSPagesController_ContentToolbar.ss
index f5271236..6df85ccd 100644
--- a/templates/Includes/CMSPagesController_ContentToolbar.ss
+++ b/templates/Includes/CMSPagesController_ContentToolbar.ss
@@ -11,11 +11,4 @@
 		<label for="view-mode-multiselect"><% _t("MULTISELECT","Multi-selection") %></label>
 	</div>
 </div>
-
-<div class="cms-actions-row">
-	<a class="ss-ui-button ss-ui-action-constructive cms-panel-link" data-icon="add" href="$AddLink"><% _t('CMSMain.AddNewButton', 'Add new') %></a>
-</div>
-
-<div class="cms-content-batchactions">
-	$BatchActionsForm
-</div>
\ No newline at end of file
+<% include CMSPagesController_ContentToolActions %>