Upstream/WordPress
1
0
Fork 0
mirror of https://github.com/WordPress/WordPress.git synced 2025-01-09 18:08:09 +01:00
Code Issues Projects Releases Wiki Activity

Change CSS classes to avoid collisions with ui.tabs, fixes #9740

Browse Source 
git-svn-id: http://svn.automattic.com/wordpress/trunk@11224 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
azaozz 2009-05-06 21:31:07 +00:00
parent cf2499b616
commit 0ba921274d
13 changed files with 60 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
wp-admin/css/colors-classic.css
View File

@ -102,11 +102,12 @@ div.dashboard-widget-submit {
border-top-color: #ccc; border-top-color: #ccc;
} }
div.ui-tabs-panel { div.tabs-panel,
border-color: #f1f1f1; ul#category-tabs li.tabs {
border-color: #dfdfdf;
} }
ul#category-tabs li.ui-tabs-selected { ul#category-tabs li.tabs {
background-color: #f1f1f1; background-color: #f1f1f1;
} }
@ -367,7 +368,7 @@ div.dashboard-widget-submit input:hover,
color: #eaf2fa !important; color: #eaf2fa !important;
} }
#side-sortables #category-tabs .ui-tabs-selected a { #side-sortables #category-tabs .tabs a {
color: #333; color: #333;
} }
@ -473,8 +474,8 @@ a,
} }
/* Because we don't want visited on these links */ /* Because we don't want visited on these links */
body.press-this .ui-tabs-selected a, body.press-this .tabs a,
body.press-this .ui-tabs-selected a:hover { body.press-this .tabs a:hover {
background-color: #fff; background-color: #fff;
border-color: #c6d9e9; border-color: #c6d9e9;
border-bottom-color: #fff; border-bottom-color: #fff;
@ -1428,7 +1429,7 @@ fieldset.inline-edit-col-right .inline-edit-col {
background-color: #f5f5f5; background-color: #f5f5f5;
} }
#post-body ul#category-tabs li.ui-tabs-selected a { #post-body ul#category-tabs li.tabs a {
color: #333; color: #333;
} }

15
wp-admin/css/colors-fresh.css
View File

@ -102,11 +102,12 @@ div.dashboard-widget-submit {
border-top-color: #ccc; border-top-color: #ccc;
} }
div.ui-tabs-panel { div.tabs-panel,
border-color: #f1f1f1; ul#category-tabs li.tabs {
border-color: #dfdfdf;
} }
ul#category-tabs li.ui-tabs-selected { ul#category-tabs li.tabs {
background-color: #f1f1f1; background-color: #f1f1f1;
} }
@ -359,7 +360,7 @@ div.dashboard-widget-submit input:hover,
color: #EAF2FA !important; color: #EAF2FA !important;
} }
#side-sortables #category-tabs .ui-tabs-selected a { #side-sortables #category-tabs .tabs a {
color: #333; color: #333;
} }
@ -460,8 +461,8 @@ h3.dashboard-widget-title small a:hover {
} }
/* Because we don't want visited on these links */ /* Because we don't want visited on these links */
body.press-this .ui-tabs-selected a, body.press-this .tabs a,
body.press-this .ui-tabs-selected a:hover { body.press-this .tabs a:hover {
background-color: #fff; background-color: #fff;
border-color: #c6d9e9; border-color: #c6d9e9;
border-bottom-color: #fff; border-bottom-color: #fff;
@ -1409,7 +1410,7 @@ fieldset.inline-edit-col-right .inline-edit-col {
background-color: #f5f5f5; background-color: #f5f5f5;
} }
#post-body ul#category-tabs li.ui-tabs-selected a { #post-body ul#category-tabs li.tabs a {
color: #333; color: #333;
} }

2
wp-admin/css/press-this.css
View File

@ -345,7 +345,7 @@ h3.tb {
margin-left: 18px; margin-left: 18px;
} }
#categorydiv div.ui-tabs-panel { #categorydiv div.tabs-panel {
height: 150px; height: 150px;
overflow: auto; overflow: auto;
} }

6
wp-admin/edit-form-advanced.php
View File

@ -313,17 +313,17 @@ foreach ( get_object_taxonomies('post') as $tax_name ) {
function post_categories_meta_box($post) { function post_categories_meta_box($post) {
?> ?>
<ul id="category-tabs"> <ul id="category-tabs">
<li class="ui-tabs-selected"><a href="#categories-all" tabindex="3"><?php _e( 'All Categories' ); ?></a></li> <li class="tabs"><a href="#categories-all" tabindex="3"><?php _e( 'All Categories' ); ?></a></li>
<li class="hide-if-no-js"><a href="#categories-pop" tabindex="3"><?php _e( 'Most Used' ); ?></a></li> <li class="hide-if-no-js"><a href="#categories-pop" tabindex="3"><?php _e( 'Most Used' ); ?></a></li>
</ul> </ul>
<div id="categories-pop" class="ui-tabs-panel" style="display: none;"> <div id="categories-pop" class="tabs-panel" style="display: none;">
<ul id="categorychecklist-pop" class="categorychecklist form-no-clear" > <ul id="categorychecklist-pop" class="categorychecklist form-no-clear" >
<?php $popular_ids = wp_popular_terms_checklist('category'); ?> <?php $popular_ids = wp_popular_terms_checklist('category'); ?>
</ul> </ul>
</div> </div>
<div id="categories-all" class="ui-tabs-panel"> <div id="categories-all" class="tabs-panel">
<ul id="categorychecklist" class="list:category categorychecklist form-no-clear"> <ul id="categorychecklist" class="list:category categorychecklist form-no-clear">
<?php wp_category_checklist($post->ID, false, false, $popular_ids) ?> <?php wp_category_checklist($post->ID, false, false, $popular_ids) ?>
</ul> </ul>

6
wp-admin/edit-link-form.php
View File

@ -114,11 +114,11 @@ add_meta_box('linksubmitdiv', __('Save'), 'link_submit_meta_box', 'link', 'side'
*/ */
function link_categories_meta_box($link) { ?> function link_categories_meta_box($link) { ?>
<ul id="category-tabs"> <ul id="category-tabs">
<li class="ui-tabs-selected"><a href="#categories-all"><?php _e( 'All Categories' ); ?></a></li> <li class="tabs"><a href="#categories-all"><?php _e( 'All Categories' ); ?></a></li>
<li class="hide-if-no-js"><a href="#categories-pop"><?php _e( 'Most Used' ); ?></a></li> <li class="hide-if-no-js"><a href="#categories-pop"><?php _e( 'Most Used' ); ?></a></li>
</ul> </ul>
<div id="categories-all" class="ui-tabs-panel"> <div id="categories-all" class="tabs-panel">
<ul id="categorychecklist" class="list:category categorychecklist form-no-clear"> <ul id="categorychecklist" class="list:category categorychecklist form-no-clear">
<?php <?php
if ( isset($link->link_id) ) if ( isset($link->link_id) )
@ -129,7 +129,7 @@ function link_categories_meta_box($link) { ?>
</ul> </ul>
</div> </div>
<div id="categories-pop" class="ui-tabs-panel" style="display: none;"> <div id="categories-pop" class="tabs-panel" style="display: none;">
<ul id="categorychecklist-pop" class="categorychecklist form-no-clear"> <ul id="categorychecklist-pop" class="categorychecklist form-no-clear">
<?php wp_popular_terms_checklist('link_category'); ?> <?php wp_popular_terms_checklist('link_category'); ?>
</ul> </ul>

4
wp-admin/js/link.dev.js
View File

@ -9,8 +9,8 @@ jQuery(document).ready( function($) {
// category tabs // category tabs
$('#category-tabs a').click(function(){ $('#category-tabs a').click(function(){
var t = $(this).attr('href'); var t = $(this).attr('href');
$(this).parent().addClass('ui-tabs-selected').siblings('li').removeClass('ui-tabs-selected'); $(this).parent().addClass('tabs').siblings('li').removeClass('tabs');
$('.ui-tabs-panel').hide(); $('.tabs-panel').hide();
$(t).show(); $(t).show();
if ( '#categories-all' == t ) if ( '#categories-all' == t )
deleteUserSetting('cats'); deleteUserSetting('cats');

2
wp-admin/js/link.js
View File

@ -1 +1 @@
jQuery(document).ready(function(c){var b,a=false,d,e;c("#link_name").focus();postboxes.add_postbox_toggles("link");c("#category-tabs a").click(function(){var f=c(this).attr("href");c(this).parent().addClass("ui-tabs-selected").siblings("li").removeClass("ui-tabs-selected");c(".ui-tabs-panel").hide();c(f).show();if("#categories-all"==f){deleteUserSetting("cats")}else{setUserSetting("cats","pop")}return false});if(getUserSetting("cats")){c('#category-tabs a[href="#categories-pop"]').click()}b=c("#newcat").one("focus",function(){c(this).val("").removeClass("form-input-tip")});c("#category-add-submit").click(function(){b.focus()});d=function(){if(a){return}a=true;var f=c(this),h=f.is(":checked"),g=f.val().toString();c("#in-link-category-"+g+", #in-popular-category-"+g).attr("checked",h);a=false};e=function(g,f){c(f.what+" response_data",g).each(function(){var h=c(c(this).text());h.find("label").each(function(){var j=c(this),l=j.find("input").val(),m=j.find("input")[0].id,i=c.trim(j.text()),k;c("#"+m).change(d);k=c('<option value="'+parseInt(l,10)+'"></option>').text(i)})})};c("#categorychecklist").wpList({alt:"",what:"link-category",response:"category-ajax-response",addAfter:e});c('a[href="#categories-all"]').click(function(){deleteUserSetting("cats")});c('a[href="#categories-pop"]').click(function(){setUserSetting("cats","pop")});if("pop"==getUserSetting("cats")){c('a[href="#categories-pop"]').click()}c("#category-add-toggle").click(function(){c(this).parents("div:first").toggleClass("wp-hidden-children");c('#category-tabs a[href="#categories-all"]').click();return false});c(".categorychecklist :checkbox").change(d).filter(":checked").change()}); jQuery(document).ready(function(c){var b,a=false,d,e;c("#link_name").focus();postboxes.add_postbox_toggles("link");c("#category-tabs a").click(function(){var f=c(this).attr("href");c(this).parent().addClass("tabs").siblings("li").removeClass("tabs");c(".tabs-panel").hide();c(f).show();if("#categories-all"==f){deleteUserSetting("cats")}else{setUserSetting("cats","pop")}return false});if(getUserSetting("cats")){c('#category-tabs a[href="#categories-pop"]').click()}b=c("#newcat").one("focus",function(){c(this).val("").removeClass("form-input-tip")});c("#category-add-submit").click(function(){b.focus()});d=function(){if(a){return}a=true;var f=c(this),h=f.is(":checked"),g=f.val().toString();c("#in-link-category-"+g+", #in-popular-category-"+g).attr("checked",h);a=false};e=function(g,f){c(f.what+" response_data",g).each(function(){var h=c(c(this).text());h.find("label").each(function(){var j=c(this),l=j.find("input").val(),m=j.find("input")[0].id,i=c.trim(j.text()),k;c("#"+m).change(d);k=c('<option value="'+parseInt(l,10)+'"></option>').text(i)})})};c("#categorychecklist").wpList({alt:"",what:"link-category",response:"category-ajax-response",addAfter:e});c('a[href="#categories-all"]').click(function(){deleteUserSetting("cats")});c('a[href="#categories-pop"]').click(function(){setUserSetting("cats","pop")});if("pop"==getUserSetting("cats")){c('a[href="#categories-pop"]').click()}c("#category-add-toggle").click(function(){c(this).parents("div:first").toggleClass("wp-hidden-children");c('#category-tabs a[href="#categories-all"]').click();return false});c(".categorychecklist :checkbox").change(d).filter(":checked").change()});

4
wp-admin/js/post.dev.js
View File

@ -236,8 +236,8 @@ jQuery(document).ready( function($) {
// category tabs // category tabs
$('#category-tabs a').click(function(){ $('#category-tabs a').click(function(){
var t = $(this).attr('href'); var t = $(this).attr('href');
$(this).parent().addClass('ui-tabs-selected').siblings('li').removeClass('ui-tabs-selected'); $(this).parent().addClass('tabs').siblings('li').removeClass('tabs');
$('.ui-tabs-panel').hide(); $('.tabs-panel').hide();
$(t).show(); $(t).show();
if ( '#categories-all' == t ) if ( '#categories-all' == t )
deleteUserSetting('cats'); deleteUserSetting('cats');

2
wp-admin/js/post.js
View File

File diff suppressed because one or more lines are too long

2
wp-admin/press-this.php
View File

@ -472,7 +472,7 @@ var ajaxurl = '<?php echo admin_url('admin-ajax.php'); ?>';
<h3><?php _e('Categories') ?></h3> <h3><?php _e('Categories') ?></h3>
<div class="inside"> <div class="inside">
<div id="categories-all" class="ui-tabs-panel"> <div id="categories-all" class="tabs-panel">
<ul id="categorychecklist" class="list:category categorychecklist form-no-clear"> <ul id="categorychecklist" class="list:category categorychecklist form-no-clear">
<?php wp_category_checklist($post_ID, false) ?> <?php wp_category_checklist($post_ID, false) ?>
</ul> </ul>

6
wp-admin/rtl.css
View File

@ -292,7 +292,7 @@ td.available-theme {
margin-left: 0; margin-left: 0;
margin-right: 120px; margin-right: 120px;
} }
#post-body ul#category-tabs li.ui-tabs-selected { #post-body ul#category-tabs li.tabs {
-moz-border-radius: 0 3px 3px 0; -moz-border-radius: 0 3px 3px 0;
-webkit-border-top-left-radius: 0; -webkit-border-top-left-radius: 0;
-webkit-border-top-right-radius: 3px; -webkit-border-top-right-radius: 3px;
@ -308,8 +308,8 @@ td.available-theme {
text-align: left; text-align: left;
margin: 0 0 0 -120px; margin: 0 0 0 -120px;
} }
#post-body #categorydiv div.ui-tabs-panel, #post-body #categorydiv div.tabs-panel,
#post-body #linkcategorydiv div.ui-tabs-panel { #post-body #linkcategorydiv div.tabs-panel {
margin: 0 120px 0 5px; margin: 0 120px 0 5px;
} }
/* 1800 - 2000 /* 1800 - 2000

35
wp-admin/wp-admin.css
View File

@ -1916,7 +1916,7 @@ input#link_url {
width: 120px; width: 120px;
text-align: right; text-align: right;
/* Negative margin for the sake of those without JS: all tabs display */ /* Negative margin for the sake of those without JS: all tabs display */
margin: 0 -120px 0 0; margin: 0 -120px 0 5px;
padding: 0; padding: 0;
} }
@ -1924,7 +1924,7 @@ input#link_url {
padding: 8px; padding: 8px;
} }
#post-body ul#category-tabs li.ui-tabs-selected { #post-body ul#category-tabs li.tabs {
-moz-border-radius: 3px 0 0 3px; -moz-border-radius: 3px 0 0 3px;
-webkit-border-top-left-radius: 3px; -webkit-border-top-left-radius: 3px;
-webkit-border-bottom-left-radius: 3px; -webkit-border-bottom-left-radius: 3px;
@ -1934,25 +1934,23 @@ input#link_url {
border-bottom-left-radius: 3px; border-bottom-left-radius: 3px;
} }
#post-body ul#category-tabs li.ui-tabs-selected a { #post-body ul#category-tabs li.tabs a {
font-weight: bold; font-weight: bold;
text-decoration: none; text-decoration: none;
} }
#categorydiv div.ui-tabs-panel, #categorydiv div.tabs-panel,
#linkcategorydiv div.ui-tabs-panel { #linkcategorydiv div.tabs-panel {
height: 150px; height: 150px;
overflow: auto; overflow: auto;
padding: 0.5em 0.9em; padding: 0.5em 0.9em;
border-style: solid;
border-width: 1px;
} }
#post-body #categorydiv div.ui-tabs-panel, #post-body #categorydiv div.tabs-panel,
#post-body #linkcategorydiv div.ui-tabs-panel { #post-body #linkcategorydiv div.tabs-panel {
margin: 0 5px 0 120px; margin: 0 5px 0 125px;
height: 10em;
overflow: auto;
border-width: 4px;
border-style: solid;
} }
#side-sortables #category-tabs li { #side-sortables #category-tabs li {
@ -1991,7 +1989,7 @@ ul.categorychecklist li {
margin-bottom: 0px; margin-bottom: 0px;
} }
#categorydiv .ui-tabs-panel { #categorydiv .tabs-panel {
border-width: 3px; border-width: 3px;
border-style: solid; border-style: solid;
} }
@ -2000,6 +1998,17 @@ ul#category-tabs {
margin-top: 12px; margin-top: 12px;
} }
ul#category-tabs li.tabs {
border-style: solid solid none;
border-width: 1px 1px 0;
}
#post-body #category-tabs li.tabs {
border-style: solid none solid solid;
border-width: 1px 0 1px 1px;
margin-right: -1px;
}
ul#category-tabs li { ul#category-tabs li {
padding: 5px 8px; padding: 5px 8px;
-moz-border-radius: 3px 3px 0 0; -moz-border-radius: 3px 3px 0 0;

10
wp-includes/script-loader.php
View File

@ -262,7 +262,7 @@ function wp_default_scripts( &$scripts ) {
'l10n_print_after' => 'try{convertEntities(slugL10n);}catch(e){};' 'l10n_print_after' => 'try{convertEntities(slugL10n);}catch(e){};'
) ); ) );
$scripts->add( 'post', "/wp-admin/js/post$suffix.js", array('suggest', 'wp-lists', 'postbox', 'slug'), '20090325' ); $scripts->add( 'post', "/wp-admin/js/post$suffix.js", array('suggest', 'wp-lists', 'postbox', 'slug'), '20090506' );
$scripts->add_data( 'post', 'group', 1 ); $scripts->add_data( 'post', 'group', 1 );
$scripts->localize( 'post', 'postL10n', array( $scripts->localize( 'post', 'postL10n', array(
'tagsUsed' => __('Tags used on this post:'), 'tagsUsed' => __('Tags used on this post:'),
@ -313,7 +313,7 @@ function wp_default_scripts( &$scripts ) {
'l10n_print_after' => 'try{convertEntities(postL10n);}catch(e){};' 'l10n_print_after' => 'try{convertEntities(postL10n);}catch(e){};'
) ); ) );
$scripts->add( 'link', "/wp-admin/js/link$suffix.js", array('wp-lists', 'postbox'), '20090325' ); $scripts->add( 'link', "/wp-admin/js/link$suffix.js", array('wp-lists', 'postbox'), '20090506' );
$scripts->add_data( 'link', 'group', 1 ); $scripts->add_data( 'link', 'group', 1 );
$scripts->add( 'comment', "/wp-admin/js/comment$suffix.js", array('jquery'), '20090102' ); $scripts->add( 'comment', "/wp-admin/js/comment$suffix.js", array('jquery'), '20090102' );
@ -418,13 +418,13 @@ function wp_default_styles( &$styles ) {
$rtl_styles = array( 'global', 'colors', 'dashboard', 'ie', 'install', 'login', 'media', 'theme-editor', 'upload', 'widgets', 'press-this', 'plugin-install', 'farbtastic' ); $rtl_styles = array( 'global', 'colors', 'dashboard', 'ie', 'install', 'login', 'media', 'theme-editor', 'upload', 'widgets', 'press-this', 'plugin-install', 'farbtastic' );
$styles->add( 'wp-admin', '/wp-admin/wp-admin.css', array(), '20090428' ); $styles->add( 'wp-admin', '/wp-admin/wp-admin.css', array(), '20090506' );
$styles->add_data( 'wp-admin', 'rtl', '/wp-admin/rtl.css' ); $styles->add_data( 'wp-admin', 'rtl', '/wp-admin/rtl.css' );
$styles->add( 'ie', '/wp-admin/css/ie.css', array(), '20090415' ); $styles->add( 'ie', '/wp-admin/css/ie.css', array(), '20090415' );
$styles->add_data( 'ie', 'conditional', 'lte IE 7' ); $styles->add_data( 'ie', 'conditional', 'lte IE 7' );
$styles->add( 'colors', true, array(), '20090503' ); // Register "meta" stylesheet for admin colors $styles->add( 'colors', true, array(), '20090506' ); // Register "meta" stylesheet for admin colors
$styles->add( 'colors-fresh', '/wp-admin/css/colors-fresh.css', array(), '20081210'); // for login.php. Is there a better way? $styles->add( 'colors-fresh', '/wp-admin/css/colors-fresh.css', array(), '20081210'); // for login.php. Is there a better way?
$styles->add_data( 'colors-fresh', 'rtl', true ); $styles->add_data( 'colors-fresh', 'rtl', true );
$styles->add( 'colors-classic', '/wp-admin/css/colors-classic.css', array(), '20081210'); $styles->add( 'colors-classic', '/wp-admin/css/colors-classic.css', array(), '20081210');
@ -436,7 +436,7 @@ function wp_default_styles( &$styles ) {
$styles->add( 'dashboard', '/wp-admin/css/dashboard.css', array(), '20090305' ); $styles->add( 'dashboard', '/wp-admin/css/dashboard.css', array(), '20090305' );
$styles->add( 'install', '/wp-admin/css/install.css', array(), '20081210' ); $styles->add( 'install', '/wp-admin/css/install.css', array(), '20081210' );
$styles->add( 'theme-editor', '/wp-admin/css/theme-editor.css', array(), '20081210' ); $styles->add( 'theme-editor', '/wp-admin/css/theme-editor.css', array(), '20081210' );
$styles->add( 'press-this', '/wp-admin/css/press-this.css', array(), '20081210' ); $styles->add( 'press-this', '/wp-admin/css/press-this.css', array(), '20090506' );
$styles->add( 'thickbox', '/wp-includes/js/thickbox/thickbox.css', array(), '20081210' ); $styles->add( 'thickbox', '/wp-includes/js/thickbox/thickbox.css', array(), '20081210' );
$styles->add( 'login', '/wp-admin/css/login.css', array(), '20081210' ); $styles->add( 'login', '/wp-admin/css/login.css', array(), '20081210' );
$styles->add( 'plugin-install', '/wp-admin/css/plugin-install.css', array(), '20081210' ); $styles->add( 'plugin-install', '/wp-admin/css/plugin-install.css', array(), '20081210' );