Permalink
Browse files

MINOR Changed CMS breadcrumbs markup to fit new inline-block CSS (fix…

…es #6882)
  • Loading branch information...
1 parent 1bb6026 commit 098d3b6b8aa487519c54d139cc7609f4c2bd8c78 @chillu chillu committed Jun 6, 2012
@@ -1,30 +1,28 @@
<div class="cms-content center cms-tabset $BaseCSSClasses" data-layout-type="border" data-pjax-fragment="Content">
<div class="cms-content-header north">
- <div>
- <% with EditForm %>
+ <% with EditForm %>
+ <div class="cms-content-header-info">
<% include BackLink_Button %>
<h2 id="page-title-heading">
<% with Controller %>
- <% include CMSSectionIcon %>
<% include CMSBreadcrumbs %>
<% end_with %>
</h2>
- <% if Fields.hasTabset %>
- <% with Fields.fieldByName('Root') %>
- <div class="cms-content-header-tabs">
- <ul>
- <% loop Tabs %>
- <li<% if extraClass %> class="$extraClass"<% end_if %>><a href="#$id">$Title</a></li>
- <% end_loop %>
- </ul>
- </div>
- <% end_with %>
- <% end_if %>
- <% end_with %>
-
- </div>
+ </div>
+ <% if Fields.hasTabset %>
+ <% with Fields.fieldByName('Root') %>
+ <div class="cms-content-header-tabs">
+ <ul>
+ <% loop Tabs %>
+ <li<% if extraClass %> class="$extraClass"<% end_if %>><a href="#$id">$Title</a></li>
+ <% end_loop %>
+ </ul>
+ </div>
+ <% end_with %>
+ <% end_if %>
+ <% end_with %>
</div>
<div class="cms-content-fields center ui-widget-content" data-layout-type="border">
@@ -1,18 +1,18 @@
<div class="cms-content center cms-tabset $BaseCSSClasses" data-layout-type="border" data-pjax-fragment="Content">
<div class="cms-content-header north">
- <div>
+ <div class="cms-content-header-info">
<h2><% _t('AssetAdmin.ADDFILES', 'Add Files') %></h2>
- <div class="cms-content-header-tabs">
- <ul>
- <li>
- <a href="#cms-content-fromyourcomputer"><% _t('AssetAdmin.FROMYOURCOMPUTER', 'From your computer') %></a>
- </li>
- <li>
- <a href="#cms-content-fromtheinternet"><% _t('AssetAdmin.FROMTHEINTERNET', 'From the internet') %></a>
- </li>
- </ul>
- </div>
+ </div>
+ <div class="cms-content-header-tabs">
+ <ul>
+ <li>
+ <a href="#cms-content-fromyourcomputer"><% _t('AssetAdmin.FROMYOURCOMPUTER', 'From your computer') %></a>
+ </li>
+ <li>
+ <a href="#cms-content-fromtheinternet"><% _t('AssetAdmin.FROMTHEINTERNET', 'From the internet') %></a>
+ </li>
+ </ul>
</div>
</div>
@@ -1,31 +1,30 @@
<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>
+ <div class="cms-content-header-info">
<h2>
- <% include CMSSectionIcon %>
<% include CMSBreadcrumbs %>
</h2>
-
- <div class="cms-content-header-tabs">
- <ul>
- <li class="content-treeview<% if class == 'CMSPageEditController' %> ui-tabs-selected<% end_if %>">
- <a href="#dummy" class="cms-panel-link" title="Form_EditForm" data-href="$LinkPageEdit">
- <% _t('CMSMain.TabContent', 'Content') %>
- </a>
- </li>
- <li class="content-listview<% if class == 'CMSPageSettingsController' %> ui-tabs-selected<% end_if %>">
- <a href="#dummy" class="cms-panel-link" title="Form_EditForm" data-href="$LinkPageSettings">
- <% _t('CMSMain.TabSettings', 'Settings') %>
- </a>
- </li>
- <li class="content-listview<% if class == 'CMSPageHistoryController' %> ui-tabs-selected<% end_if %>">
- <a href="#dummy" class="cms-panel-link" title="Form_EditForm" data-href="$LinkPageHistory">
- <% _t('CMSMain.TabHistory', 'History') %>
- </a>
- </li>
- </ul>
- </div>
+ </div>
+
+ <div class="cms-content-header-tabs">
+ <ul>
+ <li class="content-treeview<% if class == 'CMSPageEditController' %> ui-tabs-selected<% end_if %>">
+ <a href="#dummy" class="cms-panel-link" title="Form_EditForm" data-href="$LinkPageEdit">
+ <% _t('CMSMain.TabContent', 'Content') %>
+ </a>
+ </li>
+ <li class="content-listview<% if class == 'CMSPageSettingsController' %> ui-tabs-selected<% end_if %>">
+ <a href="#dummy" class="cms-panel-link" title="Form_EditForm" data-href="$LinkPageSettings">
+ <% _t('CMSMain.TabSettings', 'Settings') %>
+ </a>
+ </li>
+ <li class="content-listview<% if class == 'CMSPageHistoryController' %> ui-tabs-selected<% end_if %>">
+ <a href="#dummy" class="cms-panel-link" title="Form_EditForm" data-href="$LinkPageHistory">
+ <% _t('CMSMain.TabHistory', 'History') %>
+ </a>
+ </li>
+ </ul>
</div>
</div>
@@ -2,7 +2,7 @@
<form $FormAttributes data-layout-type="border">
<div class="cms-content-header north">
- <div>
+ <div class="cms-content-header-info">
<h2><% _t('CMSAddPageController.Title','Add page') %></h2>
</div>
</div>
@@ -1,27 +1,26 @@
<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>
+ <div class="cms-content-header-info">
<h2>
- <% include CMSSectionIcon %>
<% include CMSBreadcrumbs %>
</h2>
-
- <div class="cms-content-header-tabs">
- <ul>
- <li class="content-treeview<% if ViewState == tree %> ui-tabs-selected<% end_if %>">
- <a href="#cms-content-treeview" class="cms-panel-link" data-href="$LinkTreeView"><% _t('CMSPagesController.TreeView', 'Tree View') %></a>
- </li>
- <li class="content-listview<% if ViewState == list %> ui-tabs-selected<% end_if %>">
- <a href="#cms-content-listview" class="cms-panel-link" data-href="$LinkListView"><% _t('CMSPagesController.ListView', 'List View') %></a>
- </li>
- <!--
- <li class="content-galleryview">
- <a href="#cms-content-galleryview"><% _t('CMSPagesController.GalleryView', 'Gallery View') %></a>
- </li>
- -->
- </ul>
- </div>
+ </div>
+
+ <div class="cms-content-header-tabs">
+ <ul>
+ <li class="content-treeview<% if ViewState == tree %> ui-tabs-selected<% end_if %>">
+ <a href="#cms-content-treeview" class="cms-panel-link" data-href="$LinkTreeView"><% _t('CMSPagesController.TreeView', 'Tree View') %></a>
+ </li>
+ <li class="content-listview<% if ViewState == list %> ui-tabs-selected<% end_if %>">
+ <a href="#cms-content-listview" class="cms-panel-link" data-href="$LinkListView"><% _t('CMSPagesController.ListView', 'List View') %></a>
+ </li>
+ <!--
+ <li class="content-galleryview">
+ <a href="#cms-content-galleryview"><% _t('CMSPagesController.GalleryView', 'Gallery View') %></a>
+ </li>
+ -->
+ </ul>
</div>
</div>
@@ -1,27 +1,26 @@
<div class="cms-content center cms-tabset $BaseCSSClasses" data-layout-type="border" data-pjax-fragment="Content">
<div class="cms-content-header north">
- <div>
- <% with EditForm %>
+ <% with EditForm %>
+ <div class="cms-content-header-info">
<h2>
<% with Controller %>
- <% include CMSSectionIcon %>
<% include CMSBreadcrumbs %>
<% end_with %>
</h2>
- <% if Fields.hasTabset %>
- <% with Fields.fieldByName('Root') %>
- <div class="cms-content-header-tabs">
- <ul>
- <% loop Tabs %>
- <li<% if extraClass %> class="$extraClass"<% end_if %>><a href="#$id">$Title</a></li>
- <% end_loop %>
- </ul>
- </div>
- <% end_with %>
- <% end_if %>
- <% end_with %>
- </div>
+ </div>
+ <% if Fields.hasTabset %>
+ <% with Fields.fieldByName('Root') %>
+ <div class="cms-content-header-tabs">
+ <ul>
+ <% loop Tabs %>
+ <li<% if extraClass %> class="$extraClass"<% end_if %>><a href="#$id">$Title</a></li>
+ <% end_loop %>
+ </ul>
+ </div>
+ <% end_with %>
+ <% end_if %>
+ <% end_with %>
</div>
<div class="cms-content-fields center ui-widget-content" data-layout-type="border">
@@ -1,19 +1,16 @@
<div class="cms-content center cms-tabset $BaseCSSClasses" data-layout-type="border" data-pjax-fragment="Content">
<div class="cms-content-header north">
- <div>
- <% with EditForm %>
+ <% with EditForm %>
+ <div class="cms-content-header-info">
<% include BackLink_Button %>
-
<h2 id="page-title-heading">
<% with Controller %>
- <% include CMSSectionIcon %>
<% include CMSBreadcrumbs %>
<% end_with %>
</h2>
- <% end_with %>
-
- </div>
+ </div>
+ <% end_with %>
</div>
<div class="cms-content-fields center ui-widget-content" data-layout-type="border">

0 comments on commit 098d3b6

Please sign in to comment.