BUG Incorrect html nesting of breadcrumbs

Removed h2 from outside breadcrumbs, and put it within the breadcrumbs div Relies on sapphire commit 72b4fbf
silverstripe · Nov 21, 2012 · 4fab9b8 · 4fab9b8
1 parent 4c73f23
commit 4fab9b8
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 18 deletions.
diff --git 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
@@ -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">
+		<div class="cms-content-header-info">			
-			<h2>
+			<% include CMSBreadcrumbs %>			
-				<% include CMSBreadcrumbs %>
-			</h2>
 		</div>
 
 		<div class="cms-content-header-tabs">

diff --git 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">
+		<div class="cms-content-header-info">			
-			<h2>
+			<% include CMSBreadcrumbs %>			
-				<% include CMSBreadcrumbs %>
-			</h2>
 		</div>
 
 		<div class="cms-content-header-tabs">

diff --git 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">
+			<div class="cms-content-header-info">				
-				<h2>
 				<% with Controller %>
 					<% include CMSBreadcrumbs %>
-				<% end_with %>
+				<% end_with %>				
-				</h2>
 			</div>
 			<% if Fields.hasTabset %>
 				<% with Fields.fieldByName('Root') %>

diff --git 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 %>
+				<% include BackLink_Button %>				
-				<h2 id="page-title-heading">
 				<% with Controller %>
 					<% include CMSBreadcrumbs %>
-				<% end_with %>
+				<% end_with %>				
-				</h2>
 			</div>
 		<% end_with %>
 	</div>