Merge remote-tracking branch 'origin/3.0'

Conflicts: code/model/SiteTree.php
silverstripe · Nov 6, 2012 · bd86cf2 · bd86cf2
2 parents 79e6304 + abba77a
commit bd86cf2
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 8 deletions.
diff --git a/css/screen.css b/css/screen.css
diff --git a/scss/_AssetAdmin.scss b/scss/_AssetAdmin.scss
@@ -16,8 +16,7 @@
 			li {
 				a {
 					font-weight: bold;
-					line-height: 16px;
-					padding: 12px 20px 12px;
+					padding: 0 20px 0;
 					text-indent:-9999em;
 					background: url(../images/content-header-tabs-sprite.png) no-repeat;
 				}

diff --git a/templates/Includes/CMSMain_Content.ss b/templates/Includes/CMSMain_Content.ss
@@ -9,17 +9,17 @@
 
 		<div class="cms-content-header-tabs">
 			<ul>
-				<li class="content-treeview<% if class == 'CMSPageEditController' %> ui-tabs-selected<% end_if %>">
+				<li class="content-treeview<% if class == 'CMSPageEditController' %> ui-tabs-active<% end_if %>">
 					<a href="$LinkPageEdit" 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 %>">
+				<li class="content-listview<% if class == 'CMSPageSettingsController' %> ui-tabs-active<% end_if %>">
 					<a href="$LinkPageSettings" 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 %>">
+				<li class="content-listview<% if class == 'CMSPageHistoryController' %> ui-tabs-active<% end_if %>">
 					<a href="$LinkPageHistory" class="cms-panel-link" title="Form_EditForm" data-href="$LinkPageHistory">
 						<% _t('CMSMain.TabHistory', 'History') %>
 					</a>

diff --git a/templates/Includes/CMSPagesController_Content.ss b/templates/Includes/CMSPagesController_Content.ss
@@ -9,10 +9,10 @@
 
 		<div class="cms-content-header-tabs">
 			<ul>
-				<li class="content-treeview<% if ViewState == tree %> ui-tabs-selected<% end_if %>">
+				<li class="content-treeview<% if ViewState == tree %> ui-tabs-active<% 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 %>">
+				<li class="content-listview<% if ViewState == list %> ui-tabs-active<% end_if %>">
 					<a href="#cms-content-listview" class="cms-panel-link" data-href="$LinkListView"><% _t('CMSPagesController.ListView', 'List View') %></a>
 				</li>
 				<!--