From 4fab9b8248819dc9008d5b94b5437cd833de31ac Mon Sep 17 00:00:00 2001
From: Naomi Guyer <naomi@silverstripe.com>
Date: Mon, 12 Nov 2012 18:11:38 +1300
Subject: [PATCH] BUG Incorrect html nesting of breadcrumbs

Removed h2 from outside breadcrumbs, and put it within the breadcrumbs
div

Relies on sapphire commit 72b4fbf
---
 templates/Includes/AssetAdmin_Content.ss            | 4 ++--
 templates/Includes/CMSMain_Content.ss               | 6 ++----
 templates/Includes/CMSPagesController_Content.ss    | 6 ++----
 templates/Includes/CMSSettingsController_Content.ss | 6 ++----
 templates/Includes/ReportAdmin_Content.ss           | 6 ++----
 5 files changed, 10 insertions(+), 18 deletions(-)

diff --git a/templates/Includes/AssetAdmin_Content.ss b/templates/Includes/AssetAdmin_Content.ss
index 11232eea..a34d7473 100644
--- a/templates/Includes/AssetAdmin_Content.ss
+++ b/templates/Includes/AssetAdmin_Content.ss
@@ -5,11 +5,11 @@
 		<div class="cms-content-header-info">
 			<% include BackLink_Button %>
 
-			<h2 id="page-title-heading">
+			
 			<% with Controller %>
 				<% include CMSBreadcrumbs %>
 			<% end_with %>
-			</h2>
+			
 		</div>
 		<% if Fields.hasTabset %>
 			<% with Fields.fieldByName('Root') %>
diff --git a/templates/Includes/CMSMain_Content.ss b/templates/Includes/CMSMain_Content.ss
index 20c991f2..26ac2fc6 100644
--- a/templates/Includes/CMSMain_Content.ss
+++ b/templates/Includes/CMSMain_Content.ss
@@ -1,10 +1,8 @@
 <div id="pages-controller-cms-content" class="cms-content center cms-tabset $BaseCSSClasses" data-layout-type="border" data-pjax-fragment="Content" data-ignore-tab-state="true">
 
 	<div class="cms-content-header north">
-		<div class="cms-content-header-info">
-			<h2>
-				<% include CMSBreadcrumbs %>
-			</h2>
+		<div class="cms-content-header-info">			
+			<% include CMSBreadcrumbs %>			
 		</div>
 	
 		<div class="cms-content-header-tabs">
diff --git a/templates/Includes/CMSPagesController_Content.ss b/templates/Includes/CMSPagesController_Content.ss
index 37e1a39b..967ecd8d 100644
--- a/templates/Includes/CMSPagesController_Content.ss
+++ b/templates/Includes/CMSPagesController_Content.ss
@@ -1,10 +1,8 @@
 <div id="pages-controller-cms-content" class="cms-content center cms-tabset $BaseCSSClasses" data-layout-type="border" data-pjax-fragment="Content">
 
 	<div class="cms-content-header north">
-		<div class="cms-content-header-info">
-			<h2>
-				<% include CMSBreadcrumbs %>
-			</h2>
+		<div class="cms-content-header-info">			
+			<% include CMSBreadcrumbs %>			
 		</div>
 	
 		<div class="cms-content-header-tabs">
diff --git a/templates/Includes/CMSSettingsController_Content.ss b/templates/Includes/CMSSettingsController_Content.ss
index 9acc9296..1def543a 100644
--- a/templates/Includes/CMSSettingsController_Content.ss
+++ b/templates/Includes/CMSSettingsController_Content.ss
@@ -2,12 +2,10 @@
 
 	<div class="cms-content-header north">
 		<% with EditForm %>
-			<div class="cms-content-header-info">
-				<h2>
+			<div class="cms-content-header-info">				
 				<% with Controller %>
 					<% include CMSBreadcrumbs %>
-				<% end_with %>
-				</h2>
+				<% end_with %>				
 			</div>
 			<% if Fields.hasTabset %>
 				<% with Fields.fieldByName('Root') %>
diff --git a/templates/Includes/ReportAdmin_Content.ss b/templates/Includes/ReportAdmin_Content.ss
index de90688b..ff6c2419 100644
--- a/templates/Includes/ReportAdmin_Content.ss
+++ b/templates/Includes/ReportAdmin_Content.ss
@@ -3,12 +3,10 @@
 	<div class="cms-content-header north">
 		<% with EditForm %>
 			<div class="cms-content-header-info">
-				<% include BackLink_Button %>
-				<h2 id="page-title-heading">
+				<% include BackLink_Button %>				
 				<% with Controller %>
 					<% include CMSBreadcrumbs %>
-				<% end_with %>
-				</h2>
+				<% end_with %>				
 			</div>
 		<% end_with %>
 	</div>