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

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

Goes alon the cms commit 4fab9b8248819dc9008d5b94b5437cd833de31ac
---
 admin/templates/CMSBreadcrumbs.ss             | 31 ++++++++++---------
 .../templates/CMSProfileController_Content.ss |  6 ++--
 .../Includes/LeftAndMain_EditForm.ss          |  6 ++--
 3 files changed, 20 insertions(+), 23 deletions(-)

diff --git a/admin/templates/CMSBreadcrumbs.ss b/admin/templates/CMSBreadcrumbs.ss
index e5ddd23bd..9ef793482 100644
--- a/admin/templates/CMSBreadcrumbs.ss
+++ b/admin/templates/CMSBreadcrumbs.ss
@@ -1,19 +1,20 @@
 <div class="breadcrumbs-wrapper" data-pjax-fragment="Breadcrumbs">
-
-	<% if ToplevelController %>
-		<span class="section-icon icon icon-16 icon-{$ToplevelController.MenuCurrentItem.Code.LowerCase}"></span>
-	<% else_if Controller %>
-		<span class="section-icon icon icon-16 icon-{$Controller.MenuCurrentItem.Code.LowerCase}"></span>
-	<% else %>
-		<span class="section-icon icon icon-16 icon-{$MenuCurrentItem.Code.LowerCase}"></span>
-	<% end_if %>
-
-	<% loop Breadcrumbs %>
-		<% if Last %>
-			<span class="cms-panel-link crumb last">$Title.XML</span>
+	<h2 id="page-title-heading">
+		<% if ToplevelController %>
+			<span class="section-icon icon icon-16 icon-{$ToplevelController.MenuCurrentItem.Code.LowerCase}"></span>
+		<% else_if Controller %>
+			<span class="section-icon icon icon-16 icon-{$Controller.MenuCurrentItem.Code.LowerCase}"></span>
 		<% else %>
-			<a class="cms-panel-link crumb" href="$Link">$Title.XML</a>
-			<span class="sep">/</span>
+			<span class="section-icon icon icon-16 icon-{$MenuCurrentItem.Code.LowerCase}"></span>
 		<% end_if %>
-	<% end_loop %>
+
+		<% loop Breadcrumbs %>
+			<% if Last %>
+				<span class="cms-panel-link crumb last">$Title.XML</span>
+			<% else %>
+				<a class="cms-panel-link crumb" href="$Link">$Title.XML</a>
+				<span class="sep">/</span>
+			<% end_if %>
+		<% end_loop %>
+	</h2>
 </div>
diff --git a/admin/templates/CMSProfileController_Content.ss b/admin/templates/CMSProfileController_Content.ss
index 9acc92966..1def543a3 100644
--- a/admin/templates/CMSProfileController_Content.ss
+++ b/admin/templates/CMSProfileController_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/admin/templates/Includes/LeftAndMain_EditForm.ss b/admin/templates/Includes/LeftAndMain_EditForm.ss
index 198003bbe..74112661c 100644
--- a/admin/templates/Includes/LeftAndMain_EditForm.ss
+++ b/admin/templates/Includes/LeftAndMain_EditForm.ss
@@ -3,12 +3,10 @@
 <% end_if %>
 	<div class="cms-content-header north">
 		<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>
 		<% if Fields.hasTabset %>
 			<% with Fields.fieldByName('Root') %>