From 06e184a97f361719d312dbf35dfc4d0ceea0e0d7 Mon Sep 17 00:00:00 2001
From: Naomi Guyer <naomi@silverstripe.com>
Date: Mon, 15 Oct 2012 14:59:04 +1300
Subject: [PATCH] BUG: Add "add new" button to Pages list view (fixes 7649)

Rearranged the templates around CMSPagesController_ContentToolbar and
uncommented the toolbar from the pages list view so the add new button
would be included with including actions that aren't applicable to the
gridfield.

Linked to https://github.com/silverstripe/sapphire/pull/684/commits
---
 templates/Includes/CMSMain_ListView.ss                      | 2 +-
 templates/Includes/CMSMain_TreeView.ss                      | 1 +
 templates/Includes/CMSPagesController_ContentToolActions.ss | 3 ---
 templates/Includes/CMSPagesController_ContentToolbar.ss     | 6 +++++-
 4 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/templates/Includes/CMSMain_ListView.ss b/templates/Includes/CMSMain_ListView.ss
index 2ca34245..0cf247d2 100644
--- a/templates/Includes/CMSMain_ListView.ss
+++ b/templates/Includes/CMSMain_ListView.ss
@@ -1,5 +1,5 @@
 <div class="cms-content-toolbar">
-	<%--<% include CMSPagesController_ContentToolActions %>--%>
+	<% include CMSPagesController_ContentToolActions %>
 </div>
 
 <div class="ss-dialog cms-page-add-form-dialog cms-dialog-content" id="cms-page-add-form" title="<% _t('CMSMain.AddNew', 'Add new page') %>">
diff --git a/templates/Includes/CMSMain_TreeView.ss b/templates/Includes/CMSMain_TreeView.ss
index 9c54d888..ae9f1d08 100644
--- a/templates/Includes/CMSMain_TreeView.ss
+++ b/templates/Includes/CMSMain_TreeView.ss
@@ -1,4 +1,5 @@
 <div class="cms-content-toolbar">
+	<% include CMSPagesController_ContentToolActions %>
 	<% include CMSPagesController_ContentToolbar %>
 </div>
 
diff --git a/templates/Includes/CMSPagesController_ContentToolActions.ss b/templates/Includes/CMSPagesController_ContentToolActions.ss
index 62052846..b0298842 100644
--- a/templates/Includes/CMSPagesController_ContentToolActions.ss
+++ b/templates/Includes/CMSPagesController_ContentToolActions.ss
@@ -2,6 +2,3 @@
 	<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 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 6717ce38..79118538 100644
--- a/templates/Includes/CMSPagesController_ContentToolbar.ss
+++ b/templates/Includes/CMSPagesController_ContentToolbar.ss
@@ -1,3 +1,7 @@
+<div class="cms-content-batchactions">
+	$BatchActionsForm
+</div>
+
 <div class="cms-tree-view-modes">
 	<span><% _t("TreeTools.DisplayLabel","Display:") %></span>
 	<% if CanOrganiseSitetree %> 
@@ -11,4 +15,4 @@
 		<label for="view-mode-multiselect"><% _t("MULTISELECT","Multi-selection") %></label>
 	</div>
 </div>
-<% include CMSPagesController_ContentToolActions %>
+