Pink the whites.

git-svn-id: http://svn.automattic.com/wordpress/trunk@17435 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
ryan 2011-02-09 17:35:36 +00:00
parent 3e569036a5
commit f63ccddadb
14 changed files with 38 additions and 38 deletions

View File

@ -3575,9 +3575,9 @@ span.imgedit-scale-warn {
16.0 - Themes 16.0 - Themes
------------------------------------------------------------------------------*/ ------------------------------------------------------------------------------*/
.theme-install-php .tablenav { .theme-install-php .tablenav {
height:auto; height:auto;
} }
table#availablethemes { table#availablethemes {
border-spacing: 0; border-spacing: 0;
@ -3587,10 +3587,10 @@ table#availablethemes {
width: 100%; width: 100%;
} }
table#availablethemes .no-items td{ table#availablethemes .no-items td{
border-width:0; border-width:0;
padding:5px; padding:5px;
} }
td.available-theme { td.available-theme {
vertical-align: top; vertical-align: top;

View File

@ -154,7 +154,7 @@ if ( ! empty($_REQUEST['_wp_http_referer']) ) {
if ( ! empty( $_REQUEST['paged'] ) ) if ( ! empty( $_REQUEST['paged'] ) )
$location = add_query_arg( 'paged', (int) $_REQUEST['paged'] ); $location = add_query_arg( 'paged', (int) $_REQUEST['paged'] );
wp_redirect( $location ); wp_redirect( $location );
exit; exit;
} }

View File

@ -198,7 +198,7 @@ class WP_List_Table {
if ( ! empty( $_REQUEST['orderby'] ) ) if ( ! empty( $_REQUEST['orderby'] ) )
echo '<input type="hidden" name="orderby" value="' . esc_attr( $_REQUEST['orderby'] ) . '" />'; echo '<input type="hidden" name="orderby" value="' . esc_attr( $_REQUEST['orderby'] ) . '" />';
if ( ! empty( $_REQUEST['order'] ) ) if ( ! empty( $_REQUEST['order'] ) )
echo '<input type="hidden" name="order" value="' . esc_attr( $_REQUEST['order'] ) . '" />'; echo '<input type="hidden" name="order" value="' . esc_attr( $_REQUEST['order'] ) . '" />';
?> ?>
<p class="search-box"> <p class="search-box">
@ -482,7 +482,7 @@ class WP_List_Table {
$current = $this->get_pagenum(); $current = $this->get_pagenum();
$current_url = ( is_ssl() ? 'https://' : 'http://' ) . $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI']; $current_url = ( is_ssl() ? 'https://' : 'http://' ) . $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI'];
$current_url = remove_query_arg( array( 'hotkeys_highlight_last', 'hotkeys_highlight_first' ), $current_url ); $current_url = remove_query_arg( array( 'hotkeys_highlight_last', 'hotkeys_highlight_first' ), $current_url );
$page_links = array(); $page_links = array();

View File

@ -152,7 +152,7 @@ class WP_Plugin_Install_List_Table extends WP_List_Table {
'code' => array(), 'pre' => array(), 'em' => array(),'strong' => array(), 'code' => array(), 'pre' => array(), 'em' => array(),'strong' => array(),
'ul' => array(), 'ol' => array(), 'li' => array(), 'p' => array(), 'br' => array() 'ul' => array(), 'ol' => array(), 'li' => array(), 'p' => array(), 'br' => array()
); );
list( $columns, $hidden ) = $this->get_column_info(); list( $columns, $hidden ) = $this->get_column_info();
$style = array(); $style = array();

View File

@ -66,7 +66,7 @@ class WP_Themes_List_Table extends WP_List_Table {
_e( 'No items found.' ); _e( 'No items found.' );
return; return;
} }
if ( is_multisite() ) { if ( is_multisite() ) {
if ( current_user_can( 'install_themes' ) && current_user_can( 'manage_network_themes' ) ) { if ( current_user_can( 'install_themes' ) && current_user_can( 'manage_network_themes' ) ) {
printf( __( 'You only have one theme enabled for this site right now. Visit the Network Admin to <a href="%1$s">enable</a> or <a href="%2$s">install</a> more themes.' ), network_admin_url( 'site-themes.php?id=' . $GLOBALS['blog_id'] ), network_admin_url( 'theme-install.php' ) ); printf( __( 'You only have one theme enabled for this site right now. Visit the Network Admin to <a href="%1$s">enable</a> or <a href="%2$s">install</a> more themes.' ), network_admin_url( 'site-themes.php?id=' . $GLOBALS['blog_id'] ), network_admin_url( 'theme-install.php' ) );
@ -88,23 +88,23 @@ class WP_Themes_List_Table extends WP_List_Table {
// Fallthrough. // Fallthrough.
printf( __( 'Only the current theme is available to you. Contact the %s administrator for information about accessing additional themes.' ), get_site_option( 'site_name' ) ); printf( __( 'Only the current theme is available to you. Contact the %s administrator for information about accessing additional themes.' ), get_site_option( 'site_name' ) );
} }
function tablenav( $which = 'top' ) { function tablenav( $which = 'top' ) {
if ( $this->get_pagination_arg( 'total_pages' ) <= 1 ) if ( $this->get_pagination_arg( 'total_pages' ) <= 1 )
return; return;
?> ?>
<div class="tablenav <?php echo $which; ?>"> <div class="tablenav <?php echo $which; ?>">
<?php $this->pagination( $which ); ?> <?php $this->pagination( $which ); ?>
<img src="<?php echo esc_url( admin_url( 'images/wpspin_light.gif' ) ); ?>" class="ajax-loading list-ajax-loading" alt="" /> <img src="<?php echo esc_url( admin_url( 'images/wpspin_light.gif' ) ); ?>" class="ajax-loading list-ajax-loading" alt="" />
<br class="clear" /> <br class="clear" />
</div> </div>
<?php <?php
} }
function display() { function display() {
// wp_nonce_field( "fetch-list-" . get_class( $this ), '_ajax_fetch_list_nonce' ); // wp_nonce_field( "fetch-list-" . get_class( $this ), '_ajax_fetch_list_nonce' );
?> ?>
<?php $this->tablenav( 'top' ); ?> <?php $this->tablenav( 'top' ); ?>
<table id="availablethemes" cellspacing="0" cellpadding="0"> <table id="availablethemes" cellspacing="0" cellpadding="0">
<tbody id="the-list" class="list:themes"> <tbody id="the-list" class="list:themes">
@ -112,7 +112,7 @@ class WP_Themes_List_Table extends WP_List_Table {
</tbody> </tbody>
</table> </table>
<?php $this->tablenav( 'bottom' ); ?> <?php $this->tablenav( 'bottom' ); ?>
<?php <?php
} }

View File

@ -218,10 +218,10 @@ setCommentsList = function() {
var refillTheExtraList = function(ev) { var refillTheExtraList = function(ev) {
// var args = $.query.get(), total_pages = listTable.get_total_pages(), per_page = $('input[name=_per_page]', '#comments-form').val(), r; // var args = $.query.get(), total_pages = listTable.get_total_pages(), per_page = $('input[name=_per_page]', '#comments-form').val(), r;
var args = $.query.get(), total_pages = $('.total-pages').text(), per_page = $('input[name=_per_page]', '#comments-form').val(), r; var args = $.query.get(), total_pages = $('.total-pages').text(), per_page = $('input[name=_per_page]', '#comments-form').val(), r;
if (! args.paged) if (! args.paged)
args.paged = 1; args.paged = 1;
if (args.paged > total_pages) { if (args.paged > total_pages) {
return; return;
} }

View File

@ -29,12 +29,12 @@ window.listTable = {
$('select', context).each( function(){ $('select', context).each( function(){
var options = $('option', this), var options = $('option', this),
anySelected = false; anySelected = false;
options.each( function(){ options.each( function(){
this.selected = this.defaultSelected; this.selected = this.defaultSelected;
anySelected = anySelected || this.defaultSelected; anySelected = anySelected || this.defaultSelected;
}); });
// If no options are selected within a single-select dropdown, // If no options are selected within a single-select dropdown,
// select the first element by default. // select the first element by default.
if ( ! this.multiple && ! anySelected ) if ( ! this.multiple && ! anySelected )

View File

@ -145,9 +145,9 @@ function wp_admin_bar_shortlink_menu() {
if ( empty( $short ) ) if ( empty( $short ) )
return; return;
$html = '<input class="shortlink-input" type="text" readonly="readonly" value="' . esc_attr( $short ) . '" />'; $html = '<input class="shortlink-input" type="text" readonly="readonly" value="' . esc_attr( $short ) . '" />';
$wp_admin_bar->add_menu( array( $wp_admin_bar->add_menu( array(
'id' => $id, 'id' => $id,
'title' => __( 'Shortlink' ), 'title' => __( 'Shortlink' ),

View File

@ -12,7 +12,7 @@
* *
* Licensed under the GNU GPL. For full terms see the file COPYING. * Licensed under the GNU GPL. For full terms see the file COPYING.
* @license http://opensource.org/licenses/gpl-license.php GNU General Public License * @license http://opensource.org/licenses/gpl-license.php GNU General Public License
* *
* pop3 class * pop3 class
* *
* $Id$ * $Id$

View File

@ -115,7 +115,7 @@ class WP_Admin_Bar {
function recursive_render( $id, &$menu_item ) { ?> function recursive_render( $id, &$menu_item ) { ?>
<?php <?php
$is_parent = ! empty( $menu_item['children'] ); $is_parent = ! empty( $menu_item['children'] );
$menuclass = $is_parent ? 'menupop' : ''; $menuclass = $is_parent ? 'menupop' : '';
if ( ! empty( $menu_item['meta']['class'] ) ) if ( ! empty( $menu_item['meta']['class'] ) )
$menuclass .= ' ' . $menu_item['meta']['class']; $menuclass .= ' ' . $menu_item['meta']['class'];

View File

@ -3072,7 +3072,7 @@ function wp_list_filter( $list, $args = array(), $operator = 'AND' ) {
foreach ( $list as $key => $obj ) { foreach ( $list as $key => $obj ) {
$matched = count( array_intersect_assoc( (array) $obj, $args ) ); $matched = count( array_intersect_assoc( (array) $obj, $args ) );
if ( ( 'AND' == $operator && $matched == $count ) if ( ( 'AND' == $operator && $matched == $count )
|| ( 'OR' == $operator && $matched <= $count ) || ( 'OR' == $operator && $matched <= $count )
|| ( 'NOT' == $operator && 0 == $matched ) ) { || ( 'NOT' == $operator && 0 == $matched ) ) {
$filtered[$key] = $obj; $filtered[$key] = $obj;

View File

@ -53,11 +53,11 @@
/* remove the hover class for any objects not in the immediate element's ancestry */ /* remove the hover class for any objects not in the immediate element's ancestry */
i = q.length; i = q.length;
while ( i-- ) { while ( i-- ) {
inA = false; inA = false;
ancestorLength = ancestors.length; ancestorLength = ancestors.length;
while( ancestorLength-- ) { while( ancestorLength-- ) {
if ( ancestors[ ancestorLength ] == q[i][1] ) if ( ancestors[ ancestorLength ] == q[i][1] )
inA = true; inA = true;
} }
if ( ! inA ) if ( ! inA )

View File

@ -1719,7 +1719,7 @@ class WP_Query {
'taxonomy' => 'category', 'taxonomy' => 'category',
'terms' => $q['category__not_in'], 'terms' => $q['category__not_in'],
'operator' => 'NOT IN', 'operator' => 'NOT IN',
'include_children' => false 'include_children' => false
); );
} }

View File

@ -542,13 +542,13 @@ class WP_User_Query {
*/ */
function query() { function query() {
global $wpdb; global $wpdb;
if ( is_array( $this->query_vars['fields'] ) || 'all' == $this->query_vars['fields'] ) { if ( is_array( $this->query_vars['fields'] ) || 'all' == $this->query_vars['fields'] ) {
$this->results = $wpdb->get_results("SELECT $this->query_fields $this->query_from $this->query_where $this->query_orderby $this->query_limit"); $this->results = $wpdb->get_results("SELECT $this->query_fields $this->query_from $this->query_where $this->query_orderby $this->query_limit");
} else { } else {
$this->results = $wpdb->get_col("SELECT $this->query_fields $this->query_from $this->query_where $this->query_orderby $this->query_limit"); $this->results = $wpdb->get_col("SELECT $this->query_fields $this->query_from $this->query_where $this->query_orderby $this->query_limit");
} }
if ( $this->query_vars['count_total'] ) if ( $this->query_vars['count_total'] )
$this->total_users = $wpdb->get_var("SELECT COUNT(*) $this->query_from $this->query_where"); $this->total_users = $wpdb->get_var("SELECT COUNT(*) $this->query_from $this->query_where");