From 8847506322dc4e47a3c218f51a49d66dddde8069 Mon Sep 17 00:00:00 2001
From: Ingo Schommer <ingo@silverstripe.com>
Date: Sun, 3 Jun 2012 19:54:14 +0200
Subject: [PATCH] BUGFIX Selecting correct parent when adding a new page (fixes
 #7188)

---
 javascript/CMSMain.AddForm.js                          | 10 +++++++++-
 .../Includes/CMSPagesController_ContentToolActions.ss  |  2 +-
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/javascript/CMSMain.AddForm.js b/javascript/CMSMain.AddForm.js
index 4a6b9985..c9e2fb33 100644
--- a/javascript/CMSMain.AddForm.js
+++ b/javascript/CMSMain.AddForm.js
@@ -111,8 +111,16 @@
 	
 		$(".cms-page-add-button").entwine({
 			onclick: function(e) {
-				$('.cms-page-add-form-dialog').dialog('open');
+				var selected = $('.cms-tree').jstree('get_selected'),
+					parentId = selected ? $(selected[0]).data('id') : null,
+					data = {selector: this.data('targetPanel'),pjax: this.data('pjax')},
+					url = parentId ? ss.i18n.sprintf(this.data('urlAddpage'), parentId) : this.attr('href');
+
+				$('.cms-container').loadPanel(url, null, data);
 				e.preventDefault();
+
+				// $('.cms-page-add-form-dialog').dialog('open');
+				// e.preventDefault();
 			}
 		});
 	});
diff --git a/templates/Includes/CMSPagesController_ContentToolActions.ss b/templates/Includes/CMSPagesController_ContentToolActions.ss
index ecbd0c00..62052846 100644
--- a/templates/Includes/CMSPagesController_ContentToolActions.ss
+++ b/templates/Includes/CMSPagesController_ContentToolActions.ss
@@ -1,5 +1,5 @@
 <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="$LinkPageAdd"><% _t('CMSMain.AddNewButton', 'Add new') %></a>
+	<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">