Changeset 12781

Timestamp:

01/20/2010 10:35:21 PM (15 years ago)

Author:

ryan

Message:

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

Location:

trunk/wp-admin

Files:

• includes/template.php (modified) (1 diff)
• ms-admin.php (modified) (1 diff)
• ms-options.php (modified) (1 diff)
• ms-sites.php (modified) (3 diffs)
• ms-themes.php (modified) (1 diff)
• ms-upgrade-site.php (modified) (1 diff)
• ms-users.php (modified) (2 diffs)

trunk/wp-admin/includes/template.php

@@ -3748 +3748 @@
         else
             $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>

trunk/wp-admin/ms-admin.php

@@ -30 +30 @@
 
 <div class="wrap">
+    <?php screen_icon(); ?>
     <h2><?php echo esc_html( $title ); ?></h2>
 

trunk/wp-admin/ms-options.php

@@ -21 +21 @@
 
 <div class="wrap">
+    <?php screen_icon(); ?>
     <h2><?php _e('Site Options') ?></h2>
     <form method="post" action="ms-edit.php?action=siteoptions">

trunk/wp-admin/ms-sites.php

@@ -80 +80 @@
         ?>
         <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>
         <form method="post" action="ms-edit.php?action=updateblog">
@@ -370 +371 @@
 
         <div class="wrap" style="position:relative;">
+        <?php screen_icon(); ?>
         <h2><?php _e('Blogs') ?></h2>
 
@@ -580 +582 @@
         <div class="wrap">
             <a name="form-add-blog"></a>
+            <?php screen_icon(); ?>
             <h2><?php _e('Add Blog') ?></h2>
             <form method="post" action="ms-edit.php?action=addblog">

trunk/wp-admin/ms-themes.php

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

trunk/wp-admin/ms-upgrade-site.php

@@ -15 +15 @@
 
 echo '<div class="wrap">';
+screen_icon();
 echo '<h2>'.__('Upgrade Site').'</h2>';
 switch( $_GET['action'] ) {

trunk/wp-admin/ms-users.php

@@ -55 +55 @@
     }
 
-    if ( !isset($_GET['sortby']) ) {
+    if ( !isset($_GET['sortby']) )
         $_GET['sortby'] = 'id';
-    }
-
-    if ( $_GET['sortby'] == 'email' ) {
+
+    if ( $_GET['sortby'] == 'email' )
         $query .= ' ORDER BY user_email ';
-    } elseif ( $_GET['sortby'] == 'id' ) {
+    elseif ( $_GET['sortby'] == 'id' )
         $query .= ' ORDER BY ID ';
-    } elseif ( $_GET['sortby'] == 'login' ) {
+    elseif ( $_GET['sortby'] == 'login' )
         $query .= ' ORDER BY user_login ';
-    } elseif ( $_GET['sortby'] == 'name' ) {
+    elseif ( $_GET['sortby'] == 'name' )
         $query .= ' ORDER BY display_name ';
-    } elseif ( $_GET['sortby'] == 'registered' ) {
+    elseif ( $_GET['sortby'] == 'registered' )
         $query .= ' ORDER BY user_registered ';
-    }
 
     $query .= ( $_GET['order'] == 'DESC' ) ? 'DESC' : 'ASC';
 
-    if ( !empty( $s )) {
+    if ( !empty( $s ) )
         $total = $wpdb->get_var( str_replace('SELECT *', 'SELECT COUNT(ID)', $query) );
-    } else {
+    else
         $total = $wpdb->get_var( "SELECT COUNT(ID) FROM {$wpdb->users}");
-    }
 
     $query .= " LIMIT " . intval( ( $apage - 1 ) * $num) . ", " . intval( $num );
@@ -102 +99 @@
     ?>
     <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">
         <p class="search-box">