diff --git a/wp-admin/css/ms.css b/wp-admin/css/ms.css index 4815259873..e365bbc224 100644 --- a/wp-admin/css/ms.css +++ b/wp-admin/css/ms.css @@ -1 +1 @@ -#dashboard_right_now p.musub{margin-top:12px;border-top:1px solid #ececec;padding-left:16px;position:static;}#dashboard_right_now td.b a.musublink{font-size:16px;}#dashboard_right_now div.musubtable{border-top:none;}#dashboard_right_now div.musubtable .t{white-space:normal;}.ms-sites-php .postbox h3{cursor:auto;}.ms-sites-php .postbox .description{margin:10px 0 0;padding:0 10px 10px;border-bottom:1px solid #DFDFDF;}tr.site-deleted{background:#ff8573;}tr.site-spammed{background:#faa;}tr.site-archived{background:#ffebe8;}tr.site-mature{background:#fecac2;} \ No newline at end of file +#dashboard_right_now p.musub{margin-top:12px;border-top:1px solid #ececec;padding-left:16px;position:static;}#dashboard_right_now td.b a.musublink{font-size:16px;}#dashboard_right_now div.musubtable{border-top:none;}#dashboard_right_now div.musubtable .t{white-space:normal;}.ms-sites-php .postbox h3{cursor:auto;}.ms-sites-php .postbox .description{margin:10px 0 0;padding:0 10px 10px;border-bottom:1px solid #DFDFDF;}tr.site-deleted,a.site-deleted{background:#ff8573;}tr.site-spammed,a.site-spammed{background:#faa;}tr.site-archived,a.site-archived{background:#ffebe8;}tr.site-mature,a.site-mature{background:#fecac2;} \ No newline at end of file diff --git a/wp-admin/css/ms.dev.css b/wp-admin/css/ms.dev.css index 738c834c22..39d667dbc4 100644 --- a/wp-admin/css/ms.dev.css +++ b/wp-admin/css/ms.dev.css @@ -30,15 +30,16 @@ } /* Background Color for Site Status */ -tr.site-deleted { +tr.site-deleted, a.site-deleted { background: #ff8573; } -tr.site-spammed { +tr.site-spammed, a.site-spammed { background: #faa; } -tr.site-archived { +tr.site-archived, a.site-archived { background:#ffebe8; } -tr.site-mature { +tr.site-mature, a.site-mature { background: #fecac2; } + diff --git a/wp-admin/includes/class-wp-ms-users-list-table.php b/wp-admin/includes/class-wp-ms-users-list-table.php index a60a6a70c4..3d0734e083 100644 --- a/wp-admin/includes/class-wp-ms-users-list-table.php +++ b/wp-admin/includes/class-wp-ms-users-list-table.php @@ -217,20 +217,36 @@ class WP_MS_Users_List_Table extends WP_List_Table { echo ""; if ( is_array( $blogs ) ) { foreach ( (array) $blogs as $key => $val ) { - $path = ( $val->path == '/' ) ? '' : $val->path; + if ( $current_site->id != $val->site_id ) continue; + + $path = ( $val->path == '/' ) ? '' : $val->path; echo '' . str_replace( '.' . $current_site->domain, '', $val->domain . $path ) . ''; echo ' '; - - // Edit - echo '' . __( 'Edit' ) . ' | '; - - // View - echo '' . __( 'Edit' ) . ''; + + $class = ''; if ( get_blog_status( $val->userblog_id, 'spam' ) == 1 ) - echo 'style="background-color: #faa" '; - echo 'href="' . esc_url( get_home_url( $val->userblog_id ) ) . '">' . __( 'View' ) . ''; - - echo '
'; + $class .= 'site-spammed '; + if ( get_blog_status( $val->userblog_id, 'mature' ) == 1 ) + $class .= 'site-mature '; + if ( get_blog_status( $val->userblog_id, 'deleted' ) == 1 ) + $class .= 'site-deleted '; + if ( get_blog_status( $val->userblog_id, 'archived' ) == 1 ) + $class .= 'site-archived '; + + $actions['view'] = '' . __( 'View' ) . ''; + + $actions = apply_filters('ms_user_list_site_actions', $actions, $val->userblog_id); + + $i=0; + $action_count = count( $actions ); + foreach ( $actions as $action => $link ) { + ++$i; + ( $i == $action_count ) ? $sep = '' : $sep = ' | '; + echo "$link$sep"; + } + echo '
'; } } ?> diff --git a/wp-includes/script-loader.php b/wp-includes/script-loader.php index 5641eebbdc..545bb13614 100644 --- a/wp-includes/script-loader.php +++ b/wp-includes/script-loader.php @@ -500,7 +500,7 @@ function wp_default_styles( &$styles ) { $styles->add( 'colors-fresh', "/wp-admin/css/colors-fresh$suffix.css", array(), $colors_version ); $styles->add( 'colors-classic', "/wp-admin/css/colors-classic$suffix.css", array(), $colors_version ); - $styles->add( 'ms', "/wp-admin/css/ms$suffix.css", array(), '20100528' ); + $styles->add( 'ms', "/wp-admin/css/ms$suffix.css", array(), '20101129' ); $styles->add( 'global', "/wp-admin/css/global$suffix.css", array(), '20101105' ); $styles->add( 'media', "/wp-admin/css/media$suffix.css", array(), '20101020' ); $styles->add( 'widgets', "/wp-admin/css/widgets$suffix.css", array(), '20100610' );