Merge pull request #965 from silverstripe-droptables/incorrect-bc-nesting

BUG Incorrect html nesting of breadcrumbs
This commit is contained in:
Ingo Schommer 2012-11-22 15:28:54 -08:00
commit 33039958c2
3 changed files with 20 additions and 23 deletions

View File

@ -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>

View File

@ -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') %>

View File

@ -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') %>