From 846cdf43c9433c3997f43548c31b7258a2f3e2b6 Mon Sep 17 00:00:00 2001 From: Andrew Ozz Date: Tue, 19 May 2009 01:27:34 +0000 Subject: [PATCH] Some more styling for the plugins screen git-svn-id: https://develop.svn.wordpress.org/trunk@11391 602fd350-edb4-49c9-b593-d223f7449a82 --- wp-admin/css/colors-classic.css | 19 ++++++++++--- wp-admin/css/colors-fresh.css | 19 ++++++++++--- wp-admin/includes/update.php | 4 +-- wp-admin/plugins.php | 26 +++++++++++------- wp-admin/wp-admin.css | 47 ++++++++++++++++++++++++++++----- wp-includes/script-loader.php | 4 +-- 6 files changed, 91 insertions(+), 28 deletions(-) diff --git a/wp-admin/css/colors-classic.css b/wp-admin/css/colors-classic.css index a66c69944e..ce5ede44fa 100644 --- a/wp-admin/css/colors-classic.css +++ b/wp-admin/css/colors-classic.css @@ -382,7 +382,9 @@ div.dashboard-widget-submit input:hover, color: #ccc; } -.submitbox .submitdelete, a.delete { +.plugins a.delete:hover, +.submitbox .submitdelete, +a.delete { color: #f00; border-bottom-color: #f00; } @@ -418,7 +420,8 @@ div.dashboard-widget-submit input:hover, .updated, .login #login_error, -.login .message { +.login .message, +.update-message { background-color: #ffffe0; border-color: #e6db55; } @@ -465,7 +468,8 @@ a, #the-comment-list p.comment-author strong a, #media-upload a.del-link, #media-upload a.delete, -.ui-tabs-nav a { +.ui-tabs-nav a, +.plugins a.delete { color: #1c6280; } @@ -574,10 +578,17 @@ input.readonly, textarea.readonly { background-color: #fff; } +#all-plugins-table .inactive, +#all-plugins-table .inactive th, +#all-plugins-table .inactive td { + color: #777; +} + .plugins .active, .plugins .active th, .plugins .active td { - background-color: #e7f7d3; + color: #000; + background-color: #f5f5f5; } #the-comment-list .unapproved, diff --git a/wp-admin/css/colors-fresh.css b/wp-admin/css/colors-fresh.css index b80276f073..203201ae59 100644 --- a/wp-admin/css/colors-fresh.css +++ b/wp-admin/css/colors-fresh.css @@ -378,7 +378,9 @@ div.dashboard-widget-submit input:hover, color: #ccc; } -.submitbox .submitdelete, a.delete { +.plugins a.delete:hover, +.submitbox .submitdelete, +a.delete { color: #f00; border-bottom-color: #f00; } @@ -414,7 +416,8 @@ div.dashboard-widget-submit input:hover, .updated, .login #login_error, -.login .message { +.login .message, +.update-message { background-color: #ffffe0; border-color: #e6db55; } @@ -461,7 +464,8 @@ a, #the-comment-list p.comment-author strong a, #media-upload a.del-link, #media-upload a.delete, -.ui-tabs-nav a { +.ui-tabs-nav a, +.plugins a.delete { color: #21759b; } @@ -569,10 +573,17 @@ input.readonly, textarea.readonly { background-color: #fff; } +#all-plugins-table .inactive, +#all-plugins-table .inactive th, +#all-plugins-table .inactive td { + color: #777; +} + .plugins .active, .plugins .active th, .plugins .active td { - background-color: #e7f7d3; + color: #000; + background-color: #f5f5f5; } #the-comment-list .unapproved, diff --git a/wp-admin/includes/update.php b/wp-admin/includes/update.php index afd74584b4..94259b6078 100644 --- a/wp-admin/includes/update.php +++ b/wp-admin/includes/update.php @@ -157,7 +157,7 @@ function wp_plugin_update_row( $file, $plugin_data ) { $details_url = admin_url('plugin-install.php?tab=plugin-information&plugin=' . $r->slug . '&TB_iframe=true&width=600&height=800'); - echo ''; + echo '
'; if ( ! current_user_can('update_plugins') ) printf( __('There is a new version of %1$s available. View version %4$s Details.'), $plugin_name, esc_url($details_url), esc_attr($plugin_name), $r->new_version ); else if ( empty($r->package) ) @@ -167,7 +167,7 @@ function wp_plugin_update_row( $file, $plugin_data ) { do_action( "in_plugin_update_message-$file", $plugin_data, $r ); - echo ''; + echo '
'; } add_action( 'after_plugin_row', 'wp_plugin_update_row', 10, 2 ); diff --git a/wp-admin/plugins.php b/wp-admin/plugins.php index 7ee88ee2a8..44049f2709 100644 --- a/wp-admin/plugins.php +++ b/wp-admin/plugins.php @@ -354,7 +354,7 @@ function print_plugins_table($plugins, $context = '') { if ( empty($plugins) ) { echo ' - ' . __('No plugins to show') . ' + ' . __('No plugins to show') . ' '; } foreach ( (array)$plugins as $plugin_file => $plugin_data) { @@ -379,7 +379,17 @@ function print_plugins_table($plugins, $context = '') { echo " - {$plugin_data['Name']}"; + {$plugin_data['Name']} +

{$plugin_data['Description']}

+ \n"; + + do_action( 'after_plugin_row', $plugin_file, $plugin_data, $context ); + do_action( "after_plugin_row_$plugin_file", $plugin_file, $plugin_data, $context ); + + echo " + + + "; $i = 0; echo '
'; foreach ( $actions as $action => $link ) { @@ -387,9 +397,8 @@ function print_plugins_table($plugins, $context = '') { ( $i == $action_count ) ? $sep = '' : $sep = ' | '; echo "$link$sep"; } - echo '
'; - echo " -

{$plugin_data['Description']}

"; + echo " + "; $plugin_meta = array(); if ( !empty($plugin_data['Version']) ) $plugin_meta[] = sprintf(__('Version %s'), $plugin_data['Version']); @@ -404,11 +413,8 @@ function print_plugins_table($plugins, $context = '') { } $plugin_meta = apply_filters('plugin_row_meta', $plugin_meta, $plugin_file, $plugin_data, $context); echo implode(' | ', $plugin_meta); - echo "

"; - echo ' - '; - do_action( 'after_plugin_row', $plugin_file, $plugin_data, $context ); - do_action( "after_plugin_row_$plugin_file", $plugin_file, $plugin_data, $context ); + echo "

+ \n"; } ?> diff --git a/wp-admin/wp-admin.css b/wp-admin/wp-admin.css index 267fd11043..d304533e97 100644 --- a/wp-admin/wp-admin.css +++ b/wp-admin/wp-admin.css @@ -43,7 +43,7 @@ select option { } .plugins .desc p { - margin: 0 0 10px; + margin: 0 0 8px; } .plugins td.desc { @@ -63,6 +63,27 @@ select option { white-space: nowrap; } +.plugins .row-actions-visible { + padding: 0; +} + +.widefat tbody.plugins th.check-column { + padding: 7px 0; +} + +.plugins td, +.plugins th { + border-bottom: 0 none; + padding: 4px 7px 0; +} + +.plugins .second td, +.plugins .second th { + border-bottom-style: solid; + border-bottom-width: 1px; + padding: 0 7px 4px; +} + .import-system { font-size: 16px; } @@ -750,8 +771,7 @@ td.media-icon img { max-height: 60px; } -#update-nag, -.plugin-update { +#update-nag { line-height: 29px; font-size: 12px; text-align: center; @@ -762,9 +782,23 @@ td.media-icon img { border-style: solid none; } -.plugin-update { - border-width: 0 0 1px; - border-style: none none solid; +.plugins .plugin-update { + text-align: center; + padding: 0; +} + +.plugin-update .update-message { + padding: 3px 7px; + margin: 2px 20px 10px; +} + +.update-message { + border-width: 1px; + border-style: solid; + -moz-border-radius: 3px; + -khtml-border-radius: 3px; + -webkit-border-radius: 3px; + border-radius: 3px; } #update-nag a, @@ -794,6 +828,7 @@ div.comment-item:hover .row-actions { .row-actions-visible { padding: 2px 0 0; + cursor: pointer; } /* Admin Header */ diff --git a/wp-includes/script-loader.php b/wp-includes/script-loader.php index 714daacfdd..407a92fce1 100644 --- a/wp-includes/script-loader.php +++ b/wp-includes/script-loader.php @@ -414,14 +414,14 @@ function wp_default_styles( &$styles ) { $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(), '20090514' ); + $styles->add( 'wp-admin', '/wp-admin/wp-admin.css', array(), '20090518' ); $styles->add_data( 'wp-admin', 'rtl', '/wp-admin/rtl.css' ); $styles->add( 'ie', '/wp-admin/css/ie.css', array(), '20090514' ); $styles->add_data( 'ie', 'conditional', 'lte IE 7' ); // Register "meta" stylesheet for admin colors. All colors-* style sheets should have the same version string. - $styles->add( 'colors', true, array(), '20090514' ); + $styles->add( 'colors', true, array(), '20090518' ); $styles->add( 'colors-fresh', '/wp-admin/css/colors-fresh.css', array(), '20090514'); // for login.php. Is there a better way? $styles->add_data( 'colors-fresh', 'rtl', true ); $styles->add( 'colors-classic', '/wp-admin/css/colors-classic.css', array(), '20090514');