From abba77af517ca892d1ac7d3025b5b19409a81889 Mon Sep 17 00:00:00 2001
From: Ingo Schommer <ingo@silverstripe.com>
Date: Tue, 6 Nov 2012 15:01:34 +0100
Subject: [PATCH] Fixes required for jQuery UI 1.9

---
 css/screen.css                                   | 2 +-
 scss/_AssetAdmin.scss                            | 3 +--
 templates/Includes/CMSMain_Content.ss            | 6 +++---
 templates/Includes/CMSPagesController_Content.ss | 4 ++--
 4 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/css/screen.css b/css/screen.css
index 677cb1a0..8f690c35 100644
--- a/css/screen.css
+++ b/css/screen.css
@@ -33,7 +33,7 @@
 .cms .AssetAdmin .cms-content-fields .cms-edit-form.AssetAdmin { overflow-y: auto; }
 .cms .AssetAdmin .cms-content-fields .cms-content-tools .cms-panel-content { overflow: hidden; }
 .cms .AssetAdmin .cms-content-fields .cms-content-tools .cms-panel-content .cms-search-form { height: 100%; }
-.cms .AssetAdmin .cms-content-header-tabs .ui-tabs-nav li a { font-weight: bold; line-height: 16px; padding: 12px 20px 12px; text-indent: -9999em; background: url(../images/content-header-tabs-sprite.png) no-repeat; }
+.cms .AssetAdmin .cms-content-header-tabs .ui-tabs-nav li a { font-weight: bold; padding: 0 20px 0; text-indent: -9999em; background: url(../images/content-header-tabs-sprite.png) no-repeat; }
 .cms .AssetAdmin .cms-content-header-tabs .ui-tabs-nav li.content-treeview a { background-position: 2px 0px; }
 .cms .AssetAdmin .cms-content-header-tabs .ui-tabs-nav li.content-galleryview a { background-position: -160px 0px; }
 .cms .AssetAdmin .cms-content-header-tabs .ui-tabs-nav li.content-listview a { background-position: -39px 0px; }
diff --git a/scss/_AssetAdmin.scss b/scss/_AssetAdmin.scss
index f1f8eee6..b4b25bae 100644
--- 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
index cb1f22a1..c13fed7b 100644
--- 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
index 24035b3b..7dd0d431 100644
--- 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>
 				<!--