From 19617039689872ccca1b1fc32680cc159f1ebcf6 Mon Sep 17 00:00:00 2001 From: wpmuguru Date: Thu, 4 Feb 2010 19:03:08 +0000 Subject: [PATCH] move ms css to ms.css, fixes #11790 git-svn-id: http://svn.automattic.com/wordpress/trunk@12949 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- wp-admin/css/ms.css | 2 +- wp-admin/ms-sites.php | 8 +++----- wp-admin/ms-users.php | 11 ++++------- 3 files changed, 8 insertions(+), 13 deletions(-) diff --git a/wp-admin/css/ms.css b/wp-admin/css/ms.css index 5ddac168a..805a43e2b 100644 --- a/wp-admin/css/ms.css +++ b/wp-admin/css/ms.css @@ -1 +1 @@ -#all-my-blogs-tab a.current{position:relative;padding-bottom:10px;}#all-my-blogs{position:absolute;top:30px;left:0;right:0;_width:100%;margin:4px 7px;padding:6px 10px;font-size:12px;}#all-my-blogs *{margin:0;}form#all-my-blogs p,form#all-my-blogs p *{vertical-align:middle;}#all-my-blogs a{font-size:10px;text-decoration:underline;margin:0 14px;}#all-my-blogs a:hover,#all-my-blogs a:active{text-decoration:none;}form#wpmu-search{position:absolute;right:0;top:0;}#adminmenu #menu-site div.wp-menu-image{background:transparent url("../images/site-admin.png") no-repeat scroll 0 -33px;}#adminmenu #menu-site:hover div.wp-menu-image{background:transparent url("../images/site-admin.png") no-repeat scroll 0 -1px;}#dashboard_right_now p.musub{margin-top:12px;border-top:1px solid #ececec;}#dashboard_right_now td.b a.musublink{font-size:16px;} \ No newline at end of file +#all-my-blogs-tab a.current{position:relative;padding-bottom:10px;}#all-my-blogs{position:absolute;top:30px;left:0;right:0;_width:100%;margin:4px 7px;padding:6px 10px;font-size:12px;}#all-my-blogs *{margin:0;}form#all-my-blogs p,form#all-my-blogs p *{vertical-align:middle;}#all-my-blogs a{font-size:10px;text-decoration:underline;margin:0 14px;}#all-my-blogs a:hover,#all-my-blogs a:active{text-decoration:none;}form#wpmu-search{position:absolute;right:0;top:0;}#adminmenu #menu-site div.wp-menu-image{background:transparent url("../images/site-admin.png") no-repeat scroll 0 -33px;}#adminmenu #menu-site:hover div.wp-menu-image{background:transparent url("../images/site-admin.png") no-repeat scroll 0 -1px;}#dashboard_right_now p.musub{margin-top:12px;border-top:1px solid #ececec;}#dashboard_right_now td.b a.musublink{font-size:16px;}tr.site-deleted{background:#f55;}tr.site-spammed{background:#faa;}tr.site-archived{background:#fee;} diff --git a/wp-admin/ms-sites.php b/wp-admin/ms-sites.php index f7a2e0651..dd0caba3d 100644 --- a/wp-admin/ms-sites.php +++ b/wp-admin/ms-sites.php @@ -445,17 +445,15 @@ switch ( $action ) { array( '#fee', __('Archived') ), 'spam' => array( '#faa', __('Spam') ), 'deleted' => array( '#f55', __('Deleted') ) ); + $status_list = array( 'archived' => array( 'site-archived', __('Archived') ), 'spam' => array( 'site-spammed', __('Spam') ), 'deleted' => array( 'site-deleted', __('Deleted') ) ); foreach ( $blog_list as $blog ) { $class = ('alternate' == $class) ? '' : 'alternate'; reset( $status_list ); - $bgcolour = ''; $blog_states = array(); foreach ( $status_list as $status => $col ) { if ( get_blog_status( $blog['blog_id'], $status ) == 1 ) { - $bgcolour = "style='background: {$col[0]}'"; + $class = $col[0]; $blog_states[] = $col[1]; } } @@ -470,7 +468,7 @@ switch ( $action ) { $blog_state .= "$state$sep"; } } - echo ""; + echo ""; $blogname = ( is_subdomain_install() ) ? str_replace('.'.$current_site->domain, '', $blog['domain']) : $blog['path']; foreach ( $posts_columns as $column_name=>$column_display_name ) { diff --git a/wp-admin/ms-users.php b/wp-admin/ms-users.php index b6cc84632..6aeac062e 100644 --- a/wp-admin/ms-users.php +++ b/wp-admin/ms-users.php @@ -156,23 +156,20 @@ if ( isset($_GET['updated']) && $_GET['updated'] == 'true' ) { "#faa", "deleted" => "#f55" ); + $status_list = array( "spam" => "site-spammed", "deleted" => "site-deleted" ); - $bgcolour = ""; foreach ( $status_list as $status => $col ) { - if ( $user[$status] ) { - $bgcolour = "style='background: $col'"; - } + if ( $user[$status] ) + $class = $col; } ?> - class=""> + $column_display_name) : switch($column_name) {