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
This commit is contained in:
azaozz 2009-05-07 02:41:36 +00:00
parent 0ba921274d
commit e191104e4a
6 changed files with 65 additions and 75 deletions

View File

@ -433,11 +433,7 @@ a.page-numbers {
.widefat td, .widefat td,
.widefat th { .widefat th {
border-bottom-color: #dfdfdf; border-color: #dfdfdf;
}
.widefat tfoot th {
border-bottom:0;
} }
.widefat th { .widefat th {
@ -519,16 +515,12 @@ body.press-this .tabs a:hover {
color: #fff; color: #fff;
} }
div#media-upload-header { div#media-upload-header,
div#plugin-information-header {
background-color: #f9f9f9; background-color: #f9f9f9;
border-bottom-color: #dfdfdf; border-bottom-color: #dfdfdf;
} }
div#plugin-information-header {
background-color: #e4f2fd;
border-bottom-color: #c6d9e9;
}
#currenttheme img { #currenttheme img {
border-color: #666; border-color: #666;
} }
@ -577,8 +569,7 @@ input.readonly, textarea.readonly {
.checkbox, .checkbox,
.side-info, .side-info,
.plugins tr, .plugins tr,
.metabox-holder .postbox, .postbox,
#poststuff .postbox ,
#your-profile #rich_editing { #your-profile #rich_editing {
background-color: #fff; background-color: #fff;
} }

View File

@ -149,7 +149,8 @@ strong .post-com-count span {
background-color: #ccf3fa; background-color: #ccf3fa;
} }
.ac_match, .subsubsub a.current { .ac_match,
.subsubsub a.current {
color: #000; color: #000;
} }
@ -170,7 +171,8 @@ strong .post-com-count span {
color: #101010; color: #101010;
} }
.alternate, .alt { .alternate,
.alt {
background-color: #f9f9f9; background-color: #f9f9f9;
} }
@ -187,11 +189,13 @@ strong .post-com-count span {
#media-upload { #media-upload {
background: #fff; background: #fff;
} }
#media-upload .slidetoggle { #media-upload .slidetoggle {
border-top-color: #dfdfdf; border-top-color: #dfdfdf;
} }
.error, #login #login_error { .error,
#login #login_error {
background-color: #ffebe8; background-color: #ffebe8;
border-color: #c00; border-color: #c00;
} }
@ -340,11 +344,11 @@ a:hover,
#adminmenu ul.wp-submenu a:hover, #adminmenu ul.wp-submenu a:hover,
#the-comment-list .comment a:hover, #the-comment-list .comment a:hover,
#rightnow 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:hover,
.subsubsub a.current: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 { .ui-tabs-nav a:hover {
color: #d54e21; color: #d54e21;
} }
@ -450,13 +454,14 @@ h3.dashboard-widget-title small a:hover {
color: #fff; color: #fff;
} }
a,
#adminmenu a, #adminmenu a,
#poststuff #edButtonPreview, #poststuff #edButtonPreview,
#poststuff #edButtonHTML, #poststuff #edButtonHTML,
#the-comment-list p.comment-author strong a, #the-comment-list p.comment-author strong a,
#media-upload a.del-link, #media-upload a.del-link,
#media-upload a.delete, #media-upload a.delete,
.ui-tabs-nav a, a { .ui-tabs-nav a {
color: #21759b; color: #21759b;
} }
@ -492,10 +497,10 @@ body.press-this .tabs a:hover {
background-color: #ddd; background-color: #ddd;
color: #000; color: #000;
text-shadow: none; text-shadow: none;
-moz-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) 0px -1px 0px; -khtml-box-shadow: rgba(0,0,0,0.2) 0 -1px 0;
-webkit-box-shadow: rgba(0,0,0,0.2) 0px -1px 0px; -webkit-box-shadow: rgba(0,0,0,0.2) 0 -1px 0;
box-shadow: rgba(0,0,0,0.2) 0px -1px 0px; box-shadow: rgba(0,0,0,0.2) 0 -1px 0;
} }
#adminmenu li.current a:hover #awaiting-mod, #adminmenu li.current a:hover #awaiting-mod,
@ -506,16 +511,12 @@ body.press-this .tabs a:hover {
color: #fff; color: #fff;
} }
div#media-upload-header { div#media-upload-header,
div#plugin-information-header {
background-color: #f9f9f9; background-color: #f9f9f9;
border-bottom-color: #dfdfdf; border-bottom-color: #dfdfdf;
} }
div#plugin-information-header {
background-color: #e4f2fd;
border-bottom-color: #c6d9e9;
}
#currenttheme img { #currenttheme img {
border-color: #666; border-color: #666;
} }
@ -561,33 +562,9 @@ input.readonly, textarea.readonly {
border-color: #dfdfdf; 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, .checkbox,
.side-info, .side-info,
.plugins tr,
#your-profile #rich_editing { #your-profile #rich_editing {
background-color: #fff; background-color: #fff;
} }
@ -616,10 +593,6 @@ input.readonly, textarea.readonly {
color: #bc0b0b; color: #bc0b0b;
} }
.plugins tr {
background-color: #fff;
}
.widget, .widget,
#widget-list .widget-top, #widget-list .widget-top,
.postbox, .postbox,
@ -699,17 +672,22 @@ body.login {
color: #999; 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; color: #ccc;
text-decoration: none; text-decoration: none;
} }
#user_info a:hover, #footer a:hover { #user_info a:hover,
#footer a:hover {
color: #fff; color: #fff;
text-decoration: underline !important; text-decoration: underline !important;
} }
#user_info a:active, #footer a:active { #user_info a:active,
#footer a:active {
color: #ccc !important; color: #ccc !important;
} }
@ -725,6 +703,31 @@ abbr.required,
color: #888; 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 */ /* editors */
#quicktags { #quicktags {
border-color: #dfdfdf; border-color: #dfdfdf;
@ -1197,12 +1200,15 @@ abbr.required,
table.diff .diff-deletedline { table.diff .diff-deletedline {
background-color: #ffdddd; background-color: #ffdddd;
} }
table.diff .diff-deletedline del { table.diff .diff-deletedline del {
background-color: #ff9999; background-color: #ff9999;
} }
table.diff .diff-addedline { table.diff .diff-addedline {
background-color: #ddffdd; background-color: #ddffdd;
} }
table.diff .diff-addedline ins { table.diff .diff-addedline ins {
background-color: #99ff99; background-color: #99ff99;
} }
@ -1224,7 +1230,6 @@ table.diff .diff-addedline ins {
color: #D54E21; color: #D54E21;
} }
#screen-options-wrap, #screen-options-wrap,
#contextual-help-wrap { #contextual-help-wrap {
background-color: #f1f1f1; background-color: #f1f1f1;

View File

@ -85,8 +85,7 @@ div.star img {
} }
#plugin-information .fyi { #plugin-information .fyi {
margin-left: 10px; margin: 0 10px 50px;
margin-bottom: 50px;
width: 210px; width: 210px;
} }

View File

@ -11,7 +11,7 @@ jQuery(document).ready(function($) {
tbWindow.css({'top':'20px','margin-top':'0'}); 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'); var href = $(this).attr('href');
if ( ! href ) if ( ! href )
return; return;
@ -28,11 +28,6 @@ jQuery(document).ready(function($) {
}); });
/* Plugin install related JS*/ /* 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() { $('#plugin-information #sidemenu a').click( function() {
var tab = $(this).attr('name'); var tab = $(this).attr('name');
//Flip the tab //Flip the tab

View File

@ -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<e)?720:e;if(f.size()){f.width(c-50).height(d-45);b("#TB_iframeContent").width(c-50).height(d-75);f.css({"margin-left":"-"+parseInt(((c-50)/2),10)+"px"});if(!(b.browser.msie&&b.browser.version.substr(0,1)<7)){f.css({top:"20px","margin-top":"0"})}}return b("a.thickbox").each(function(){var g=b(this).attr("href");if(!g){return}g=g.replace(/&width=[0-9]+/g,"");g=g.replace(/&height=[0-9]+/g,"");b(this).attr("href",g+"&width="+(c-80)+"&height="+(d-85))})};a().click(function(){b("#TB_title").css({"background-color":"#222",color:"#cfcfcf"});b("#TB_ajaxWindowTitle").html("<strong>"+plugininstallL10n.plugin_information+"</strong>&nbsp;"+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})}); jQuery(document).ready(function(b){var a=function(){var f=b("#TB_window"),e=b(window).width(),d=b(window).height(),c=(720<e)?720:e;if(f.size()){f.width(c-50).height(d-45);b("#TB_iframeContent").width(c-50).height(d-75);f.css({"margin-left":"-"+parseInt(((c-50)/2),10)+"px"});if(!(b.browser.msie&&b.browser.version.substr(0,1)<7)){f.css({top:"20px","margin-top":"0"})}}return b("#dashboard_plugins a.thickbox, #install-plugins a.thickbox").each(function(){var g=b(this).attr("href");if(!g){return}g=g.replace(/&width=[0-9]+/g,"");g=g.replace(/&height=[0-9]+/g,"");b(this).attr("href",g+"&width="+(c-80)+"&height="+(d-85))})};a().click(function(){b("#TB_title").css({"background-color":"#222",color:"#cfcfcf"});b("#TB_ajaxWindowTitle").html("<strong>"+plugininstallL10n.plugin_information+"</strong>&nbsp;"+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})});

View File

@ -366,7 +366,7 @@ function wp_default_scripts( &$scripts ) {
'l10n_print_after' => 'try{convertEntities(inlineEditL10n);}catch(e){};' '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->add_data( 'plugin-install', 'group', 1 );
$scripts->localize( 'plugin-install', 'plugininstallL10n', array( $scripts->localize( 'plugin-install', 'plugininstallL10n', array(
'plugin_information' => __('Plugin Information:'), 'plugin_information' => __('Plugin Information:'),