Screen icons for site admin pages. Using temp icon until new ones are done. see #11644

git-svn-id: http://svn.automattic.com/wordpress/trunk@12781 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
ryan 2010-01-20 22:35:21 +00:00
parent f05930b979
commit 4ef834c4b1
7 changed files with 22 additions and 12 deletions

View File

@ -3747,7 +3747,12 @@ function screen_icon($screen = '') {
$name = $screen->parent_base; $name = $screen->parent_base;
else else
$name = $screen->base; $name = $screen->base;
// @todo Remove this once we have a site admin icon
if ( 'ms-admin' == $screen->parent_base )
$name = 'tools';
} }
?> ?>
<div id="icon-<?php echo $name; ?>" class="icon32"><br /></div> <div id="icon-<?php echo $name; ?>" class="icon32"><br /></div>
<?php <?php

View File

@ -29,6 +29,7 @@ $title = __( 'Site Admin' );
?> ?>
<div class="wrap"> <div class="wrap">
<?php screen_icon(); ?>
<h2><?php echo esc_html( $title ); ?></h2> <h2><?php echo esc_html( $title ); ?></h2>
<ul class="subsubsub"> <ul class="subsubsub">

View File

@ -20,6 +20,7 @@ if (isset($_GET['updated'])) {
?> ?>
<div class="wrap"> <div class="wrap">
<?php screen_icon(); ?>
<h2><?php _e('Site Options') ?></h2> <h2><?php _e('Site Options') ?></h2>
<form method="post" action="ms-edit.php?action=siteoptions"> <form method="post" action="ms-edit.php?action=siteoptions">
<?php wp_nonce_field( "siteoptions" ); ?> <?php wp_nonce_field( "siteoptions" ); ?>

View File

@ -79,6 +79,7 @@ switch ( $_GET['action'] ) {
$editblog_roles = get_blog_option( $id, "{$blog_prefix}user_roles" ); $editblog_roles = get_blog_option( $id, "{$blog_prefix}user_roles" );
?> ?>
<div class="wrap"> <div class="wrap">
<?php screen_icon(); ?>
<h2><?php _e('Edit Blog'); ?> - <a href='http://<?php echo $details['domain'].$details['path']; ?>'>http://<?php echo $details['domain'].$details['path']; ?></a></h2> <h2><?php _e('Edit Blog'); ?> - <a href='http://<?php echo $details['domain'].$details['path']; ?>'>http://<?php echo $details['domain'].$details['path']; ?></a></h2>
<form method="post" action="ms-edit.php?action=updateblog"> <form method="post" action="ms-edit.php?action=updateblog">
<?php wp_nonce_field('editblog'); ?> <?php wp_nonce_field('editblog'); ?>
@ -369,6 +370,7 @@ switch ( $_GET['action'] ) {
?> ?>
<div class="wrap" style="position:relative;"> <div class="wrap" style="position:relative;">
<?php screen_icon(); ?>
<h2><?php _e('Blogs') ?></h2> <h2><?php _e('Blogs') ?></h2>
<form action="ms-sites.php" method="get" id="ms-search"> <form action="ms-sites.php" method="get" id="ms-search">
@ -579,6 +581,7 @@ switch ( $_GET['action'] ) {
<div class="wrap"> <div class="wrap">
<a name="form-add-blog"></a> <a name="form-add-blog"></a>
<?php screen_icon(); ?>
<h2><?php _e('Add Blog') ?></h2> <h2><?php _e('Add Blog') ?></h2>
<form method="post" action="ms-edit.php?action=addblog"> <form method="post" action="ms-edit.php?action=addblog">
<?php wp_nonce_field('add-blog') ?> <?php wp_nonce_field('add-blog') ?>

View File

@ -20,6 +20,7 @@ $allowed_themes = get_site_allowed_themes();
?> ?>
<div class="wrap"> <div class="wrap">
<form action='ms-edit.php?action=updatethemes' method='post'> <form action='ms-edit.php?action=updatethemes' method='post'>
<?php screen_icon(); ?>
<h2><?php _e('Site Themes') ?></h2> <h2><?php _e('Site Themes') ?></h2>
<p><?php _e('Disable themes site-wide. You can enable themes on a site by site basis.') ?></p> <p><?php _e('Disable themes site-wide. You can enable themes on a site by site basis.') ?></p>
<table class="widefat"> <table class="widefat">

View File

@ -14,6 +14,7 @@ if ( !is_super_admin() )
wp_die( __('You do not have permission to access this page.') ); wp_die( __('You do not have permission to access this page.') );
echo '<div class="wrap">'; echo '<div class="wrap">';
screen_icon();
echo '<h2>'.__('Upgrade Site').'</h2>'; echo '<h2>'.__('Upgrade Site').'</h2>';
switch( $_GET['action'] ) { switch( $_GET['action'] ) {
case "upgrade": case "upgrade":

View File

@ -54,29 +54,26 @@ if ( $_GET['updated'] == 'true' ) {
$query .= " WHERE user_login LIKE '$search' OR user_email LIKE '$search'"; $query .= " WHERE user_login LIKE '$search' OR user_email LIKE '$search'";
} }
if ( !isset($_GET['sortby']) ) { if ( !isset($_GET['sortby']) )
$_GET['sortby'] = 'id'; $_GET['sortby'] = 'id';
}
if ( $_GET['sortby'] == 'email' ) { if ( $_GET['sortby'] == 'email' )
$query .= ' ORDER BY user_email '; $query .= ' ORDER BY user_email ';
} elseif ( $_GET['sortby'] == 'id' ) { elseif ( $_GET['sortby'] == 'id' )
$query .= ' ORDER BY ID '; $query .= ' ORDER BY ID ';
} elseif ( $_GET['sortby'] == 'login' ) { elseif ( $_GET['sortby'] == 'login' )
$query .= ' ORDER BY user_login '; $query .= ' ORDER BY user_login ';
} elseif ( $_GET['sortby'] == 'name' ) { elseif ( $_GET['sortby'] == 'name' )
$query .= ' ORDER BY display_name '; $query .= ' ORDER BY display_name ';
} elseif ( $_GET['sortby'] == 'registered' ) { elseif ( $_GET['sortby'] == 'registered' )
$query .= ' ORDER BY user_registered '; $query .= ' ORDER BY user_registered ';
}
$query .= ( $_GET['order'] == 'DESC' ) ? 'DESC' : 'ASC'; $query .= ( $_GET['order'] == 'DESC' ) ? 'DESC' : 'ASC';
if ( !empty( $s )) { if ( !empty( $s ) )
$total = $wpdb->get_var( str_replace('SELECT *', 'SELECT COUNT(ID)', $query) ); $total = $wpdb->get_var( str_replace('SELECT *', 'SELECT COUNT(ID)', $query) );
} else { else
$total = $wpdb->get_var( "SELECT COUNT(ID) FROM {$wpdb->users}"); $total = $wpdb->get_var( "SELECT COUNT(ID) FROM {$wpdb->users}");
}
$query .= " LIMIT " . intval( ( $apage - 1 ) * $num) . ", " . intval( $num ); $query .= " LIMIT " . intval( ( $apage - 1 ) * $num) . ", " . intval( $num );
@ -101,7 +98,8 @@ if ( $_GET['updated'] == 'true' ) {
?> ?>
<div class="wrap"> <div class="wrap">
<h2><?php _e( $current_site->site_name ); ?> <?php _e("Users"); ?></h2> <?php screen_icon(); ?>
<h2><?php esc_html_e("Users"); ?></h2>
<form action="ms-users.php" method="get" class="search-form"> <form action="ms-users.php" method="get" class="search-form">
<p class="search-box"> <p class="search-box">
<input type="text" name="s" value="<?php if ( isset($_GET['s']) ) esc_attr( stripslashes( $s ) ); ?>" class="search-input" id="user-search-input" /> <input type="text" name="s" value="<?php if ( isset($_GET['s']) ) esc_attr( stripslashes( $s ) ); ?>" class="search-input" id="user-search-input" />