From e191104e4a290a3783c79b07b3fbc152c957b9c7 Mon Sep 17 00:00:00 2001 From: azaozz Date: Thu, 7 May 2009 02:41:36 +0000 Subject: [PATCH] Show Plugin Information thickbox title only when installing plugins, restore access to links on install plugins screens, some colors-fresh.css cleanup, fixes #9742 git-svn-id: http://svn.automattic.com/wordpress/trunk@11225 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- wp-admin/css/colors-classic.css | 17 ++--- wp-admin/css/colors-fresh.css | 105 ++++++++++++++++-------------- wp-admin/css/plugin-install.css | 5 +- wp-admin/js/plugin-install.dev.js | 9 +-- wp-admin/js/plugin-install.js | 2 +- wp-includes/script-loader.php | 2 +- 6 files changed, 65 insertions(+), 75 deletions(-) diff --git a/wp-admin/css/colors-classic.css b/wp-admin/css/colors-classic.css index fd08347b45..06c788fae9 100644 --- a/wp-admin/css/colors-classic.css +++ b/wp-admin/css/colors-classic.css @@ -433,11 +433,7 @@ a.page-numbers { .widefat td, .widefat th { - border-bottom-color: #dfdfdf; -} - -.widefat tfoot th { - border-bottom:0; + border-color: #dfdfdf; } .widefat th { @@ -519,16 +515,12 @@ body.press-this .tabs a:hover { color: #fff; } -div#media-upload-header { +div#media-upload-header, +div#plugin-information-header { background-color: #f9f9f9; border-bottom-color: #dfdfdf; } -div#plugin-information-header { - background-color: #e4f2fd; - border-bottom-color: #c6d9e9; -} - #currenttheme img { border-color: #666; } @@ -577,8 +569,7 @@ input.readonly, textarea.readonly { .checkbox, .side-info, .plugins tr, -.metabox-holder .postbox, -#poststuff .postbox , +.postbox, #your-profile #rich_editing { background-color: #fff; } diff --git a/wp-admin/css/colors-fresh.css b/wp-admin/css/colors-fresh.css index fceea1926a..825f7af312 100644 --- a/wp-admin/css/colors-fresh.css +++ b/wp-admin/css/colors-fresh.css @@ -149,7 +149,8 @@ strong .post-com-count span { background-color: #ccf3fa; } -.ac_match, .subsubsub a.current { +.ac_match, +.subsubsub a.current { color: #000; } @@ -170,7 +171,8 @@ strong .post-com-count span { color: #101010; } -.alternate, .alt { +.alternate, +.alt { background-color: #f9f9f9; } @@ -187,11 +189,13 @@ strong .post-com-count span { #media-upload { background: #fff; } + #media-upload .slidetoggle { border-top-color: #dfdfdf; } -.error, #login #login_error { +.error, +#login #login_error { background-color: #ffebe8; border-color: #c00; } @@ -340,11 +344,11 @@ a:hover, #adminmenu ul.wp-submenu a:hover, #the-comment-list .comment a:hover, #rightnow a:hover, +#login form .submit input:hover, +#media-upload a.del-link:hover, +div.dashboard-widget-submit input:hover, .subsubsub a:hover, .subsubsub a.current:hover, -#login form .submit input:hover, -div.dashboard-widget-submit input:hover, -#media-upload a.del-link:hover, .ui-tabs-nav a:hover { color: #d54e21; } @@ -450,13 +454,14 @@ h3.dashboard-widget-title small a:hover { color: #fff; } +a, #adminmenu a, #poststuff #edButtonPreview, #poststuff #edButtonHTML, #the-comment-list p.comment-author strong a, #media-upload a.del-link, #media-upload a.delete, -.ui-tabs-nav a, a { +.ui-tabs-nav a { color: #21759b; } @@ -492,10 +497,10 @@ body.press-this .tabs a:hover { background-color: #ddd; color: #000; text-shadow: none; - -moz-box-shadow: rgba(0,0,0,0.2) 0px -1px 0px; - -khtml-box-shadow: rgba(0,0,0,0.2) 0px -1px 0px; - -webkit-box-shadow: rgba(0,0,0,0.2) 0px -1px 0px; - box-shadow: rgba(0,0,0,0.2) 0px -1px 0px; + -moz-box-shadow: rgba(0,0,0,0.2) 0 -1px 0; + -khtml-box-shadow: rgba(0,0,0,0.2) 0 -1px 0; + -webkit-box-shadow: rgba(0,0,0,0.2) 0 -1px 0; + box-shadow: rgba(0,0,0,0.2) 0 -1px 0; } #adminmenu li.current a:hover #awaiting-mod, @@ -506,16 +511,12 @@ body.press-this .tabs a:hover { color: #fff; } -div#media-upload-header { +div#media-upload-header, +div#plugin-information-header { background-color: #f9f9f9; border-bottom-color: #dfdfdf; } -div#plugin-information-header { - background-color: #e4f2fd; - border-bottom-color: #c6d9e9; -} - #currenttheme img { border-color: #666; } @@ -561,33 +562,9 @@ input.readonly, textarea.readonly { border-color: #dfdfdf; } -#pass-strength-result { - background-color: #eee; - border-color: #ddd !important; -} - -#pass-strength-result.bad { - background-color: #ffb78c; - border-color: #ff853c !important; -} - -#pass-strength-result.good { - background-color: #ffec8b; - border-color: #fc0 !important; -} - -#pass-strength-result.short { - background-color: #ffa0a0; - border-color: #f04040 !important; -} - -#pass-strength-result.strong { - background-color: #c3ff88; - border-color: #8dff1c !important; -} - .checkbox, .side-info, +.plugins tr, #your-profile #rich_editing { background-color: #fff; } @@ -616,10 +593,6 @@ input.readonly, textarea.readonly { color: #bc0b0b; } -.plugins tr { - background-color: #fff; -} - .widget, #widget-list .widget-top, .postbox, @@ -699,17 +672,22 @@ body.login { color: #999; } -#user_info a:link, #user_info a:visited, #footer a:link, #footer a:visited { +#user_info a:link, +#user_info a:visited, +#footer a:link, +#footer a:visited { color: #ccc; text-decoration: none; } -#user_info a:hover, #footer a:hover { +#user_info a:hover, +#footer a:hover { color: #fff; text-decoration: underline !important; } -#user_info a:active, #footer a:active { +#user_info a:active, +#footer a:active { color: #ccc !important; } @@ -725,6 +703,31 @@ abbr.required, color: #888; } +#pass-strength-result { + background-color: #eee; + border-color: #ddd !important; +} + +#pass-strength-result.bad { + background-color: #ffb78c; + border-color: #ff853c !important; +} + +#pass-strength-result.good { + background-color: #ffec8b; + border-color: #fc0 !important; +} + +#pass-strength-result.short { + background-color: #ffa0a0; + border-color: #f04040 !important; +} + +#pass-strength-result.strong { + background-color: #c3ff88; + border-color: #8dff1c !important; +} + /* editors */ #quicktags { border-color: #dfdfdf; @@ -1197,12 +1200,15 @@ abbr.required, table.diff .diff-deletedline { background-color: #ffdddd; } + table.diff .diff-deletedline del { background-color: #ff9999; } + table.diff .diff-addedline { background-color: #ddffdd; } + table.diff .diff-addedline ins { background-color: #99ff99; } @@ -1224,7 +1230,6 @@ table.diff .diff-addedline ins { color: #D54E21; } - #screen-options-wrap, #contextual-help-wrap { background-color: #f1f1f1; diff --git a/wp-admin/css/plugin-install.css b/wp-admin/css/plugin-install.css index 2441840bbb..645972bff7 100644 --- a/wp-admin/css/plugin-install.css +++ b/wp-admin/css/plugin-install.css @@ -85,8 +85,7 @@ div.star img { } #plugin-information .fyi { - margin-left: 10px; - margin-bottom: 50px; + margin: 0 10px 50px; width: 210px; } @@ -146,4 +145,4 @@ div.star img { #plugin-information pre { padding: 7px; -} \ No newline at end of file +} diff --git a/wp-admin/js/plugin-install.dev.js b/wp-admin/js/plugin-install.dev.js index 98bf8b9168..6037ca4df7 100644 --- a/wp-admin/js/plugin-install.dev.js +++ b/wp-admin/js/plugin-install.dev.js @@ -11,7 +11,7 @@ jQuery(document).ready(function($) { tbWindow.css({'top':'20px','margin-top':'0'}); }; - return $('a.thickbox').each( function() { + return $('#dashboard_plugins a.thickbox, #install-plugins a.thickbox').each( function() { var href = $(this).attr('href'); if ( ! href ) return; @@ -28,11 +28,6 @@ jQuery(document).ready(function($) { }); /* Plugin install related JS*/ - $('#install-plugins tbody.plugins tr').click( function() { - $(this).find('.action-links a.onclick').click(); - return false; - }); - $('#plugin-information #sidemenu a').click( function() { var tab = $(this).attr('name'); //Flip the tab @@ -43,4 +38,4 @@ jQuery(document).ready(function($) { $('#section-' + tab).show(); return false; }); -}); \ No newline at end of file +}); diff --git a/wp-admin/js/plugin-install.js b/wp-admin/js/plugin-install.js index 14e28cfe19..ca4a55380e 100644 --- a/wp-admin/js/plugin-install.js +++ b/wp-admin/js/plugin-install.js @@ -1 +1 @@ -jQuery(document).ready(function(b){var a=function(){var f=b("#TB_window"),e=b(window).width(),d=b(window).height(),c=(720"+plugininstallL10n.plugin_information+" "+b(this).attr("title"));return false});b("#install-plugins tbody.plugins tr").click(function(){b(this).find(".action-links a.onclick").click();return false});b("#plugin-information #sidemenu a").click(function(){var c=b(this).attr("name");b("#plugin-information-header a.current").removeClass("current");b(this).addClass("current");b("#section-holder div.section").hide();b("#section-"+c).show();return false})}); \ No newline at end of file +jQuery(document).ready(function(b){var a=function(){var f=b("#TB_window"),e=b(window).width(),d=b(window).height(),c=(720"+plugininstallL10n.plugin_information+" "+b(this).attr("title"));return false});b("#plugin-information #sidemenu a").click(function(){var c=b(this).attr("name");b("#plugin-information-header a.current").removeClass("current");b(this).addClass("current");b("#section-holder div.section").hide();b("#section-"+c).show();return false})}); \ No newline at end of file diff --git a/wp-includes/script-loader.php b/wp-includes/script-loader.php index 4a93af18da..dad7aa2786 100644 --- a/wp-includes/script-loader.php +++ b/wp-includes/script-loader.php @@ -366,7 +366,7 @@ function wp_default_scripts( &$scripts ) { 'l10n_print_after' => 'try{convertEntities(inlineEditL10n);}catch(e){};' ) ); - $scripts->add( 'plugin-install', "/wp-admin/js/plugin-install$suffix.js", array( 'thickbox', 'jquery' ), '20090102' ); + $scripts->add( 'plugin-install', "/wp-admin/js/plugin-install$suffix.js", array( 'thickbox', 'jquery' ), '20090506' ); $scripts->add_data( 'plugin-install', 'group', 1 ); $scripts->localize( 'plugin-install', 'plugininstallL10n', array( 'plugin_information' => __('Plugin Information:'),