WordPress-C
/
WordPress
mirror of https://github.com/WordPress/WordPress.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

New HiDPI spinner. Uses clean <span class="spinner"></span> markup. 

Be on the lookout for weirdness.
props lessbloat. see #21456.



git-svn-id: http://core.svn.wordpress.org/trunk@22019 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Andrew Nacin 2012-09-26 19:57:44 +00:00
parent 51ad055a68
commit 1acd8b556f
35 changed files with 192 additions and 127 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
wp-admin/css/customize-controls-rtl.css
View File

@ -10,7 +10,7 @@
float: left;
}
#customize-header-actions img {
#customize-header-actions .spinner {
float: left;
margin-right: 0;
margin-left: 4px;

8
wp-admin/css/customize-controls.css
View File

@ -160,14 +160,12 @@ body {
margin-top: 10px;
}
#customize-header-actions img {
display: none;
float: right;
margin-top: 13px;
#customize-header-actions .spinner {
margin-top: 16px;
margin-right: 4px;
}
.saving #customize-header-actions img {
.saving #customize-header-actions .spinner {
display: block;
}

14
wp-admin/css/wp-admin-rtl.css
View File

@ -840,7 +840,7 @@ th.sorted a span {
font-style: normal;
}
#commentsdiv img.waiting {
#commentsdiv .spinner {
padding-left: 0;
padding-right: 5px;
}
@ -1084,8 +1084,8 @@ form.upgrade .hint {
/* reply to comments */
#replysubmit img.waiting,
.inline-edit-save img.waiting {
#replysubmit .spinner,
.inline-edit-save .spinner {
float: left;
}
@ -1503,12 +1503,6 @@ table .column-rating {
* html #template div {margin-left: 0;}
.list-ajax-loading {
float: left;
margin-right: 0;
margin-left: 9px;
}
/* - Used - but could/should be deprecated with a CSS reset
------------------------------------------------------------------------------*/
/* No RTL for now, this space intentionally left blank */
@ -1853,7 +1847,7 @@ a.rsswidget,
float: left;
}
#dashboard-widgets #dashboard_quick_press form p.submit img.waiting {
#dashboard-widgets #dashboard_quick_press form p.submit .spinner {
margin: 4px 0 0 6px;
}

115
wp-admin/css/wp-admin.css
View File

@ -968,6 +968,10 @@ ul#add-to-blog-users {
line-height: 23px;
}
#publishing-action .spinner {
float: left;
}
#misc-publishing-actions {
padding: 6px 0 0;
}
@ -1099,7 +1103,6 @@ form.upgrade .hint {
}
.ajax-feedback {
visibility: hidden;
vertical-align: bottom;
}
@ -2398,7 +2401,7 @@ table.fixed {
border-bottom: 0 none;
}
#commentsdiv img.waiting {
#commentsdiv .spinner {
padding-left: 5px;
}
@ -2838,6 +2841,16 @@ table .inline-edit-row fieldset ul.cat-hover {
11.0 - Write/Edit Post Screen
------------------------------------------------------------------------------*/
#show-comments {
overflow: hidden;
}
#save-action .spinner,
#show-comments a,
#show-comments .spinner {
float: left;
}
#titlediv {
position: relative;
margin-bottom: 10px;
@ -2872,6 +2885,12 @@ table .inline-edit-row fieldset ul.cat-hover {
padding: 8px 10px;
}
#wp-fullscreen-save .fs-saved {
color: #999;
float: right;
margin-top: 4px;
}
#wp-fullscreen-title-prompt-text {
padding: 11px;
}
@ -2922,10 +2941,6 @@ input#link_url {
vertical-align: middle;
}
#wpcontent .ajax-loading {
visibility: hidden;
}
.submitbox .submit {
text-align: left;
padding: 12px 10px 10px;
@ -3267,7 +3282,7 @@ td.plugin-title p {
width: auto;
}
#postcustomstuff #newmetaleft a {
#postcustomstuff #newmetaleft a {
display: inline-block;
margin: 0 8px 8px;
text-decoration: none;
@ -3999,7 +4014,8 @@ td.imgedit-settings input {
.imgedit-wait {
position: absolute;
top: 0;
background: #FFFFFF url(../images/wpspin_light.gif) no-repeat scroll 22px 10px;
background: #fff url(../images/wpspin_light.gif) no-repeat scroll 22px 10px;
background-size: 16px 16px;
opacity: 0.7;
filter: alpha(opacity=70);
width: 100%;
@ -4007,15 +4023,47 @@ td.imgedit-settings input {
display: none;
}
.spinner {
background: url(../images/wpspin_light.gif) no-repeat;
background-size: 16px 16px;
display: none;
float: right;
opacity: 0.7;
filter: alpha(opacity=70);
width: 16px;
height: 16px;
margin: 5px 5px 0;
}
@media only screen and (-webkit-min-device-pixel-ratio: 1.5) {
.spinner,
.imgedit-wait,
.customize-loading #customize-container {
background-image: url(../images/wpspin_light-2x.gif);
}
}
.no-float {
float: none;
}
.media-disabled,
.imgedit-settings .disabled {
color: grey;
}
.imgedit-wait-spin {
.wp_attachment_image, .A1B1 {
overflow: hidden;
}
.wp_attachment_image .button, .A1B1 .button {
float: left;
}
.wp_attachment_image .spinner, .A1B1 .spinner {
float: left;
padding: 0 4px 4px;
vertical-align: bottom;
visibility: hidden;
}
.imgedit-menu {
@ -4301,8 +4349,8 @@ span.imgedit-scale-warn {
text-align: center;
}
#replysubmit img.waiting,
.inline-edit-save img.waiting {
#replysubmit .spinner,
.inline-edit-save .spinner {
padding: 4px 10px 0;
vertical-align: top;
float: right;
@ -4927,6 +4975,10 @@ h2 .nav-tab {
vertical-align: middle;
}
.options-general-php .spinner {
float: none;
margin: -3px 3px;
}
/*------------------------------------------------------------------------------
21.0 - Admin Footer
@ -5481,6 +5533,7 @@ body.full-overlay-active {
.customize-loading #customize-container {
background: #fff url("../images/wpspin_light.gif") no-repeat fixed center center;
background-size: 16px 16px;
}
#customize-container iframe,
@ -5785,12 +5838,6 @@ td.media-icon img {
max-height: 60px;
}
.list-ajax-loading {
float: right;
margin-right: 9px;
margin-top: -1px;
}
.tablenav .list-ajax-loading {
margin-top: 7px;
}
@ -6006,7 +6053,7 @@ h3:hover .edit-box {
color: red;
}
#dashboard_right_now .waiting {
#dashboard_right_now .spinner {
color: #e66f00;
}
@ -6164,7 +6211,7 @@ h3:hover .edit-box {
float: right;
}
#dashboard-widgets #dashboard_quick_press form p.submit img.waiting {
#dashboard-widgets #dashboard_quick_press form p.submit .spinner {
vertical-align: middle;
visibility: hidden;
margin: 4px 6px 0 0;
@ -6725,6 +6772,10 @@ a.rsswidget {
margin-top: 5px;
}
.button.right, .button-secondary.right, .button-primary.right {
float: right;
}
/* Button Secondary Actions */
.list-controls {
float: left;
@ -6735,7 +6786,7 @@ a.rsswidget {
float: right;
}
.postbox img.waiting {
.postbox .spinner {
display: none;
vertical-align: middle;
}
@ -7495,6 +7546,16 @@ h3.tb {
#waiting {
margin-top: 10px;
overflow: hidden;
}
#waiting span {
float: right;
margin: 0 0 0 5px;
}
#waiting .spinner {
display: block;
}
#extra-fields .postbox {
@ -7569,7 +7630,7 @@ h3.tb {
}
/* Submit */
#saving {
.press-this #publishing-actions .spinner {
display: inline;
vertical-align: middle;
}
@ -8014,6 +8075,11 @@ a.widget-control-edit {
padding-top: 2px;
}
.sidebar-name .spinner {
float: none;
margin: 0 3px -3px;
}
.sidebar-name-arrow {
float: right;
height: 29px;
@ -8203,3 +8269,8 @@ a.widget-control-edit {
.locale-lt-lt .inline-edit-row fieldset label span.input-text-wrap {
margin-left: 8em;
}
.update-php .spinner {
float: none;
margin: -4px 0;
}

2
wp-admin/customize.php
View File

@ -72,7 +72,7 @@ do_action( 'customize_controls_print_scripts' );
$save_text = $wp_customize->is_theme_active() ? __( 'Save &amp; Publish' ) : __( 'Save &amp; Activate' );
submit_button( $save_text, 'primary', 'save', false );
?>
<img src="<?php echo esc_url( admin_url( 'images/wpspin_light.gif' ) ); ?>" />
<span class="spinner"></span>
<a class="back button" href="<?php echo esc_url( $return ? $return : admin_url( 'themes.php' ) ); ?>">
<?php _e( 'Cancel' ); ?>
</a>

BIN
wp-admin/images/wpspin_light-2x.gif Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 8.9 KiB

2
wp-admin/includes/class-wp-plugin-install-list-table.php
View File

@ -115,13 +115,11 @@ class WP_Plugin_Install_List_Table extends WP_List_Table {
<?php do_action( 'install_plugins_table_header' ); ?>
</div>
<?php $this->pagination( $which ); ?>
<img src="<?php echo esc_url( admin_url( 'images/wpspin_light.gif' ) ); ?>" class="ajax-loading list-ajax-loading" alt="" />
<br class="clear" />
</div>
<?php } else { ?>
<div class="tablenav bottom">
<?php $this->pagination( $which ); ?>
<img src="<?php echo esc_url( admin_url( 'images/wpspin_light.gif' ) ); ?>" class="ajax-loading list-ajax-loading" alt="" />
<br class="clear" />
</div>
<?php

2
wp-admin/includes/class-wp-posts-list-table.php
View File

@ -1041,7 +1041,7 @@ class WP_Posts_List_Table extends WP_List_Table {
$update_text = __( 'Update' );
?>
<a accesskey="s" href="#inline-edit" title="<?php esc_attr_e( 'Update' ); ?>" class="button-primary save alignright"><?php echo esc_attr( $update_text ); ?></a>
<img class="waiting" style="display:none;" src="<?php echo esc_url( admin_url( 'images/wpspin_light.gif' ) ); ?>" alt="" />
<span class="spinner"></span>
<?php } else {
submit_button( __( 'Update' ), 'button-primary alignright', 'bulk_edit', false, array( 'accesskey' => 's' ) );
} ?>

2
wp-admin/includes/class-wp-terms-list-table.php
View File

@ -364,7 +364,7 @@ class WP_Terms_List_Table extends WP_List_Table {
<a accesskey="c" href="#inline-edit" title="<?php esc_attr_e( 'Cancel' ); ?>" class="cancel button-secondary alignleft"><?php _e( 'Cancel' ); ?></a>
<?php $update_text = $tax->labels->update_item; ?>
<a accesskey="s" href="#inline-edit" title="<?php echo esc_attr( $update_text ); ?>" class="save button-primary alignright"><?php echo $update_text; ?></a>
<img class="waiting" style="display:none;" src="<?php echo esc_url( admin_url( 'images/wpspin_light.gif' ) ); ?>" alt="" />
<span class="spinner"></span>
<span class="error" style="display:none;"></span>
<?php wp_nonce_field( 'taxinlineeditnonce', '_inline_edit', false ); ?>
<input type="hidden" name="taxonomy" value="<?php echo esc_attr( $this->screen->taxonomy ); ?>" />

1
wp-admin/includes/class-wp-theme-install-list-table.php
View File

@ -134,7 +134,6 @@ class WP_Theme_Install_List_Table extends WP_Themes_List_Table {
<?php do_action( 'install_themes_table_header' ); ?>
</div>
<?php $this->pagination( 'top' ); ?>
<img src="<?php echo esc_url( admin_url( 'images/wpspin_light.gif' ) ); ?>" class="ajax-loading list-ajax-loading" alt="" />
<br class="clear" />
</div>

4
wp-admin/includes/class-wp-themes-list-table.php
View File

@ -91,8 +91,8 @@ class WP_Themes_List_Table extends WP_List_Table {
?>
<div class="tablenav themes <?php echo $which; ?>">
<?php $this->pagination( $which ); ?>
<img src="<?php echo esc_url( admin_url( 'images/wpspin_light.gif' ) ); ?>" class="ajax-loading list-ajax-loading" alt="" />
<br class="clear" />
<span class="ajax-loading list-ajax-loading spinner"></span>
<br class="clear" />
</div>
<?php
}

4
wp-admin/includes/class-wp-upgrader.php
View File

@ -1288,8 +1288,8 @@ class Bulk_Upgrader_Skin extends WP_Upgrader_Skin {
function before($title = '') {
$this->in_loop = true;
printf( '<h4>' . $this->upgrader->strings['skin_before_update_header'] . ' <img alt="" src="' . admin_url( 'images/wpspin_light.gif' ) . '" class="hidden waiting-' . $this->upgrader->update_current . '" style="vertical-align:middle;" /></h4>', $title, $this->upgrader->update_current, $this->upgrader->update_count);
echo '<script type="text/javascript">jQuery(\'.waiting-' . esc_js($this->upgrader->update_current) . '\').show();</script>';
printf( '<h4>' . $this->upgrader->strings['skin_before_update_header'] . ' <span class="spinner waiting-' . $this->upgrader->update_current . '"></span></h4>', $title, $this->upgrader->update_current, $this->upgrader->update_count);
echo '<script type="text/javascript">jQuery(\'.waiting-' . esc_js($this->upgrader->update_current) . '\').css("display", "inline-block");</script>';
echo '<div class="update-messages hide-if-js" id="progress-' . esc_attr($this->upgrader->update_current) . '"><p>';
$this->flush_output();
}

2
wp-admin/includes/dashboard.php
View File

@ -535,7 +535,7 @@ function wp_dashboard_quick_press() {
<input type="reset" value="<?php esc_attr_e( 'Reset' ); ?>" class="button" />
<span id="publishing-action">
<input type="submit" name="publish" id="publish" accesskey="p" class="button-primary" value="<?php current_user_can('publish_posts') ? esc_attr_e('Publish') : esc_attr_e('Submit for Review'); ?>" />
<img class="waiting" src="<?php echo esc_url( admin_url( 'images/wpspin_light.gif' ) ); ?>" alt="" />
<span class="spinner"></span>
</span>
<br class="clear" />
</p>

6
wp-admin/includes/media.php
View File

@ -1112,7 +1112,7 @@ function get_media_item( $attachment_id, $args = null ) {
$image_edit_button = '';
if ( gd_edit_image_support( $post->post_mime_type ) ) {
$nonce = wp_create_nonce( "image_editor-$post->ID" );
$image_edit_button = "<input type='button' id='imgedit-open-btn-$post->ID' onclick='imageEdit.open( $post->ID, \"$nonce\" )' class='button' value='" . esc_attr__( 'Edit Image' ) . "' /> <img src='" . esc_url( admin_url( 'images/wpspin_light.gif' ) ) . "' class='imgedit-wait-spin' alt='' />";
$image_edit_button = "<input type='button' id='imgedit-open-btn-$post->ID' onclick='imageEdit.open( $post->ID, \"$nonce\" )' class='button' value='" . esc_attr__( 'Edit Image' ) . "' /> <span class='spinner'></span>";
}
$attachment_url = get_permalink( $attachment_id );
@ -1580,7 +1580,7 @@ var addExtImage = {
return false;
}
document.getElementById('status_img').innerHTML = '<img src="<?php echo esc_url( admin_url( 'images/wpspin_light.gif' ) ); ?>" alt="" />';
document.getElementById('status_img').innerHTML = '<img src="<?php echo esc_url( admin_url( 'images/wpspin_light.gif' ) ); ?>" alt="" width="16" />';
t.preloadImg = new Image();
t.preloadImg.onload = t.updateImageData;
t.preloadImg.onerror = t.resetImageData;
@ -2126,7 +2126,7 @@ function edit_form_image_editor() {
$image_edit_button = '';
if ( gd_edit_image_support( $post->post_mime_type ) ) {
$nonce = wp_create_nonce( "image_editor-$post->ID" );
$image_edit_button = "<input type='button' id='imgedit-open-btn-$post->ID' onclick='imageEdit.open( $post->ID, \"$nonce\" )' class='button' value='" . esc_attr__( 'Edit Image' ) . "' /> <img src='" . esc_url( admin_url( 'images/wpspin_light.gif' ) ) . "' class='imgedit-wait-spin' alt='' />";
$image_edit_button = "<input type='button' id='imgedit-open-btn-$post->ID' onclick='imageEdit.open( $post->ID, \"$nonce\" )' class='button' value='" . esc_attr__( 'Edit Image' ) . "' /> <span class='spinner'></span>";
}
?>

8
wp-admin/includes/meta-boxes.php
View File

@ -32,7 +32,7 @@ function post_submit_meta_box($post) {
<?php } elseif ( 'pending' == $post->post_status && $can_publish ) { ?>
<input type="submit" name="save" id="save-post" value="<?php esc_attr_e('Save as Pending'); ?>" class="button" />
<?php } ?>
<img src="<?php echo esc_url( admin_url( 'images/wpspin_light.gif' ) ); ?>" class="ajax-loading" id="draft-ajax-loading" alt="" />
<span class="spinner"></span>
</div>
<?php if ( $post_type_object->public ) : ?>
<div id="preview-action">
@ -200,7 +200,7 @@ if ( current_user_can( "delete_post", $post->ID ) ) {
</div>
<div id="publishing-action">
<img src="<?php echo esc_url( admin_url( 'images/wpspin_light.gif' ) ); ?>" class="ajax-loading" id="ajax-loading" alt="" />
<span class="spinner"></span>
<?php
if ( !in_array( $post->post_status, array('publish', 'future', 'private') ) || 0 == $post->ID ) {
if ( $can_publish ) :
@ -283,7 +283,7 @@ function attachment_submit_meta_box( $post ) {
</div>
<div id="publishing-action">
<img src="<?php echo esc_url( admin_url( 'images/wpspin_light.gif' ) ); ?>" class="ajax-loading" id="ajax-loading" alt="" />
<span class="spinner"></span>
<input name="original_publish" type="hidden" id="original_publish" value="<?php esc_attr_e('Update') ?>" />
<input name="save" type="submit" class="button-primary button-large" id="publish" accesskey="p" value="<?php esc_attr_e('Update') ?>" />
</div>
@ -589,7 +589,7 @@ function post_comment_meta_box( $post ) {
}
?>
<p class="hide-if-no-js" id="show-comments"><a href="#commentstatusdiv" onclick="commentsBox.get(<?php echo $total; ?>);return false;"><?php _e('Show comments'); ?></a> <img class="waiting" style="display:none;" src="<?php echo esc_url( admin_url( 'images/wpspin_light.gif' ) ); ?>" alt="" /></p>
<p class="hide-if-no-js" id="show-comments"><a href="#commentstatusdiv" onclick="commentsBox.get(<?php echo $total; ?>);return false;"><?php _e('Show comments'); ?></a> <span class="spinner"></span></p>
<?php
}

20
wp-admin/includes/nav-menu.php
View File

@ -511,8 +511,8 @@ function wp_nav_menu_locations_meta_box() {
}
?>
<p class="button-controls">
<img class="waiting" src="<?php echo esc_url( admin_url( 'images/wpspin_light.gif' ) ); ?>" alt="" />
<?php submit_button( __( 'Save' ), 'primary', 'nav-menu-locations', false, disabled( $nav_menu_selected_id, 0, false ) ); ?>
<?php submit_button( __( 'Save' ), 'primary right', 'nav-menu-locations', false, disabled( $nav_menu_selected_id, 0, false ) ); ?>
<span class="spinner"></span>
</p>
<?php
}
@ -560,8 +560,8 @@ function wp_nav_menu_item_link_meta_box() {
<p class="button-controls">
<span class="add-to-menu">
<img class="waiting" src="<?php echo esc_url( admin_url( 'images/wpspin_light.gif' ) ); ?>" alt="" />
<input type="submit"<?php disabled( $nav_menu_selected_id, 0 ); ?> class="button-secondary submit-add-to-menu" value="<?php esc_attr_e('Add to Menu'); ?>" name="add-custom-menu-item" id="submit-customlinkdiv" />
<input type="submit"<?php disabled( $nav_menu_selected_id, 0 ); ?> class="button-secondary submit-add-to-menu right" value="<?php esc_attr_e('Add to Menu'); ?>" name="add-custom-menu-item" id="submit-customlinkdiv" />
<span class="spinner"></span>
</span>
</p>
@ -692,7 +692,7 @@ function wp_nav_menu_item_post_type_meta_box( $object, $post_type ) {
?>
<p class="quick-search-wrap">
<input type="search" class="quick-search input-with-default-title" title="<?php esc_attr_e('Search'); ?>" value="<?php echo $searched; ?>" name="quick-search-posttype-<?php echo $post_type_name; ?>" />
<img class="waiting" src="<?php echo esc_url( admin_url( 'images/wpspin_light.gif' ) ); ?>" alt="" />
<span class="spinner"></span>
<?php submit_button( __( 'Search' ), 'button-small quick-search-submit button-secondary hide-if-js', 'submit', false, array( 'id' => 'submit-quick-search-posttype-' . $post_type_name ) ); ?>
</p>
@ -779,8 +779,8 @@ function wp_nav_menu_item_post_type_meta_box( $object, $post_type ) {
</span>
<span class="add-to-menu">
<img class="waiting" src="<?php echo esc_url( admin_url( 'images/wpspin_light.gif' ) ); ?>" alt="" />
<input type="submit"<?php disabled( $nav_menu_selected_id, 0 ); ?> class="button-secondary submit-add-to-menu" value="<?php esc_attr_e('Add to Menu'); ?>" name="add-post-type-menu-item" id="submit-posttype-<?php echo $post_type_name; ?>" />
<input type="submit"<?php disabled( $nav_menu_selected_id, 0 ); ?> class="button-secondary submit-add-to-menu right" value="<?php esc_attr_e('Add to Menu'); ?>" name="add-post-type-menu-item" id="submit-posttype-<?php echo $post_type_name; ?>" />
<span class="spinner"></span>
</span>
</p>
@ -923,7 +923,7 @@ function wp_nav_menu_item_taxonomy_meta_box( $object, $taxonomy ) {
?>
<p class="quick-search-wrap">
<input type="search" class="quick-search input-with-default-title" title="<?php esc_attr_e('Search'); ?>" value="<?php echo $searched; ?>" name="quick-search-taxonomy-<?php echo $taxonomy_name; ?>" />
<img class="waiting" src="<?php echo esc_url( admin_url( 'images/wpspin_light.gif' ) ); ?>" alt="" />
<span class="spinner"></span>
<?php submit_button( __( 'Search' ), 'button-small quick-search-submit button-secondary hide-if-js', 'submit', false, array( 'id' => 'submit-quick-search-taxonomy-' . $taxonomy_name ) ); ?>
</p>
@ -955,8 +955,8 @@ function wp_nav_menu_item_taxonomy_meta_box( $object, $taxonomy ) {
</span>
<span class="add-to-menu">
<img class="waiting" src="<?php echo esc_url( admin_url( 'images/wpspin_light.gif' ) ); ?>" alt="" />
<input type="submit"<?php disabled( $nav_menu_selected_id, 0 ); ?> class="button-secondary submit-add-to-menu" value="<?php esc_attr_e('Add to Menu'); ?>" name="add-taxonomy-menu-item" id="submit-taxonomy-<?php echo $taxonomy_name; ?>" />
<input type="submit"<?php disabled( $nav_menu_selected_id, 0 ); ?> class="button-secondary submit-add-to-menu right" value="<?php esc_attr_e('Add to Menu'); ?>" name="add-taxonomy-menu-item" id="submit-taxonomy-<?php echo $taxonomy_name; ?>" />
<span class="spinner"></span>
</span>
</p>

2
wp-admin/includes/template.php
View File

@ -360,7 +360,7 @@ function wp_comment_reply($position = '1', $checkbox = false, $mode = 'single',
<span id="savebtn" style="display:none;"><?php _e('Update Comment'); ?></span>
<span id="replybtn" style="display:none;"><?php _e('Submit Reply'); ?></span></a>
<a href="#comments-form" class="cancel button-secondary alignleft"><?php _e('Cancel'); ?></a>
<img class="waiting" style="display:none;" src="<?php echo esc_url( admin_url( 'images/wpspin_light.gif' ) ); ?>" alt="" />
<span class="waiting spinner"></span>
<span class="error" style="display:none;"></span>
<br class="clear" />
</p>

4
wp-admin/includes/widgets.php
View File

@ -211,8 +211,8 @@ function wp_widget_control( $sidebar_args ) {
<a class="widget-control-close" href="#close"><?php _e('Close'); ?></a>
</div>
<div class="alignright<?php if ( 'noform' === $has_form ) echo ' widget-control-noform'; ?>">
<img src="<?php echo esc_url( admin_url( 'images/wpspin_light.gif' ) ); ?>" class="ajax-feedback" title="" alt="" />
<?php submit_button( __( 'Save' ), 'button button-primary widget-control-save', 'savewidget', false, array( 'id' => 'widget-' . esc_attr( $id_format ) . '-savewidget' ) ); ?>
<?php submit_button( __( 'Save' ), 'button-primary widget-control-save right', 'savewidget', false, array( 'id' => 'widget-' . esc_attr( $id_format ) . '-savewidget' ) ); ?>
<span class="spinner"></span>
</div>
<br class="clear" />
</div>

4
wp-admin/js/dashboard.js
View File

@ -66,7 +66,7 @@ jQuery(document).ready( function($) {
quickPressLoad = function() {
var act = $('#quickpost-action'), t;
t = $('#quick-press').submit( function() {
$('#dashboard_quick_press #publishing-action img.waiting').css('visibility', 'visible');
$('#dashboard_quick_press #publishing-action .spinner').show();
$('#quick-press .submit input[type="submit"], #quick-press .submit input[type="reset"]').prop('disabled', true);
if ( 'post' == act.val() ) {
@ -74,7 +74,7 @@ jQuery(document).ready( function($) {
}
$('#dashboard_quick_press div.inside').load( t.attr( 'action' ), t.serializeArray(), function() {
$('#dashboard_quick_press #publishing-action img.waiting').css('visibility', 'hidden');
$('#dashboard_quick_press #publishing-action .spinner').hide();
$('#quick-press .submit input[type="submit"], #quick-press .submit input[type="reset"]').prop('disabled', false);
$('#dashboard_quick_press ul').next('p').remove();
$('#dashboard_quick_press ul').find('li').each( function() {

6
wp-admin/js/edit-comments.js
View File

@ -368,7 +368,7 @@ commentReply = {
$('#replycontent').css('height', '').val('');
$('#edithead input').val('');
$('.error', replyrow).html('').hide();
$('.waiting', replyrow).hide();
$('.spinner', replyrow).hide();
this.cid = '';
},
@ -451,7 +451,7 @@ commentReply = {
var post = {};
$('#replysubmit .error').hide();
$('#replysubmit .waiting').show();
$('#replysubmit .spinner').show();
$('#replyrow input').not(':button').each(function() {
var t = $(this);
@ -533,7 +533,7 @@ commentReply = {
error : function(r) {
var er = r.statusText;
$('#replysubmit .waiting').hide();
$('#replysubmit .spinner').hide();
if ( r.responseText )
er = r.responseText.replace( /<.[^<>]*?>/g, '' );

6
wp-admin/js/image-edit.js
View File

@ -272,10 +272,10 @@ imageEdit = {
open : function(postid, nonce) {
var data, elem = $('#image-editor-' + postid), head = $('#media-head-' + postid),
btn = $('#imgedit-open-btn-' + postid), spin = btn.siblings('img');
btn = $('#imgedit-open-btn-' + postid), spin = btn.siblings('.spinner');
btn.prop('disabled', true);
spin.css('visibility', 'visible');
spin.show();
data = {
'action': 'image-editor',
@ -288,7 +288,7 @@ imageEdit = {
elem.fadeIn('fast');
head.fadeOut('fast', function(){
btn.removeAttr('disabled');
spin.css('visibility', 'hidden');
spin.hide();
});
});
},

6
wp-admin/js/inline-edit-post.js
View File

@ -237,7 +237,7 @@ inlineEditPost = {
if ( typeof(id) == 'object' )
id = this.getId(id);
$('table.widefat .inline-edit-save .waiting').show();
$('table.widefat .spinner').show();
params = {
action: 'inline-save',
@ -253,7 +253,7 @@ inlineEditPost = {
// make ajax request
$.post( ajaxurl, params,
function(r) {
$('table.widefat .inline-edit-save .waiting').hide();
$('table.widefat .spinner').hide();
if (r) {
if ( -1 != r.indexOf('<tr') ) {
@ -276,7 +276,7 @@ inlineEditPost = {
var id = $('table.widefat tr.inline-editor').attr('id');
if ( id ) {
$('table.widefat .inline-edit-save .waiting').hide();
$('table.widefat .spinner').hide();
if ( 'bulk-edit' == id ) {
$('table.widefat #bulk-edit').removeClass('inline-editor').hide();

6
wp-admin/js/inline-edit-tax.js
View File

@ -60,7 +60,7 @@ inlineEditTax = {
if( typeof(id) == 'object' )
id = this.getId(id);
$('table.widefat .inline-edit-save .waiting').show();
$('table.widefat .spinner').show();
params = {
action: 'inline-save-tax',
@ -76,7 +76,7 @@ inlineEditTax = {
$.post( ajaxurl, params,
function(r) {
var row, new_id;
$('table.widefat .inline-edit-save .waiting').hide();
$('table.widefat .spinner').hide();
if (r) {
if ( -1 != r.indexOf('<tr') ) {
@ -99,7 +99,7 @@ inlineEditTax = {
var id = $('table.widefat tr.inline-editor').attr('id');
if ( id ) {
$('table.widefat .inline-edit-save .waiting').hide();
$('table.widefat .spinner').hide();
$('#'+id).remove();
id = id.substr( id.lastIndexOf('-') + 1 );
$(this.what+id).show();

18
wp-admin/js/nav-menu.js
View File

@ -130,7 +130,7 @@ var wpNavMenu;
return false;
// Show the ajax spinner
t.find('img.waiting').show();
t.find('.spinner').show();
// Retrieve menu item data
$(checkboxes).each(function(){
@ -146,7 +146,7 @@ var wpNavMenu;
api.addItemToMenu(menuItems, processMethod, function(){
// Deselect the items and hide the ajax spinner
checkboxes.removeAttr('checked');
t.find('img.waiting').hide();
t.find('.spinner').hide();
});
});
},
@ -471,9 +471,9 @@ var wpNavMenu;
loc.find('select').each(function() {
params[this.name] = $(this).val();
});
loc.find('.waiting').show();
loc.find('.spinner').show();
$.post( ajaxurl, params, function(r) {
loc.find('.waiting').hide();
loc.find('.spinner').hide();
});
return false;
});
@ -515,7 +515,7 @@ var wpNavMenu;
'type': input.attr('name')
};
$('img.waiting', panel).show();
$('.spinner', panel).show();
$.post( ajaxurl, params, function(menuMarkup) {
api.processQuickSearchQueryResponse(menuMarkup, params, panel);
@ -532,10 +532,10 @@ var wpNavMenu;
return false;
// Show the ajax spinner
$('.customlinkdiv img.waiting').show();
$('.customlinkdiv .spinner').show();
this.addLinkToMenu( url, label, processMethod, function() {
// Remove the ajax spinner
$('.customlinkdiv img.waiting').hide();
$('.customlinkdiv .spinner').hide();
// Set custom link form back to defaults
$('#custom-menu-item-name').val('').blur();
$('#custom-menu-item-url').val('http://');
@ -905,7 +905,7 @@ var wpNavMenu;
if( ! $items.length ) {
$('.categorychecklist', panel).html( '<li><p>' + navMenuL10n.noResultsFound + '</p></li>' );
$('img.waiting', panel).hide();
$('.spinner', panel).hide();
return;
}
@ -932,7 +932,7 @@ var wpNavMenu;
});
$('.categorychecklist', panel).html( $items );
$('img.waiting', panel).hide();
$('.spinner', panel).hide();
},
removeMenuItem : function(el) {

4
wp-admin/js/post.js
View File

@ -185,7 +185,7 @@ commentsBox = {
this.st += num;
this.total = total;
$('#commentsdiv img.waiting').show();
$('#commentsdiv .spinner').show();
data = {
'action' : 'get-comments',
@ -200,7 +200,7 @@ commentsBox = {
function(r) {
r = wpAjax.parseAjaxResponse(r);
$('#commentsdiv .widefat').show();
$('#commentsdiv img.waiting').hide();
$('#commentsdiv .spinner').hide();
if ( 'object' == typeof r && r.responses[0] ) {
$('#the-comment-list').append( r.responses[0].data );

8
wp-admin/js/theme.js
View File

@ -156,7 +156,7 @@ var ThemeScroller;
// Cache jQuery selectors
this.$outList = $('#availablethemes');
this.$spinner = $('div.tablenav.bottom').children( 'img.ajax-loading' );
this.$spinner = $('div.tablenav.bottom').children( '.spinner' );
this.$window = $(window);
this.$document = $(document);
@ -231,16 +231,16 @@ var ThemeScroller;
'list_args': list_args
};
this.$spinner.css( 'visibility', 'visible' );
this.$spinner.show();
$.getJSON( ajaxurl, query )
.done( function( response ) {
self.nextPage++;
self.process( response );
self.$spinner.css( 'visibility', 'hidden' );
self.$spinner.hide();
self.querying = false;
})
.fail( function() {
self.$spinner.css( 'visibility', 'hidden' );
self.$spinner.hide();
self.querying = false;
setTimeout( function() { self.ajax(); }, self.failedRetryDelay );
});

8
wp-admin/js/widgets.js
View File

@ -176,7 +176,7 @@ wpWidgets = {
saveOrder : function(sb) {
if ( sb )
$('#' + sb).closest('div.widgets-holder-wrap').find('img.ajax-feedback').css('visibility', 'visible');
$('#' + sb).closest('div.widgets-holder-wrap').find('.spinner').css('display', 'inline-block');
var a = {
action: 'widgets-order',
@ -190,7 +190,7 @@ wpWidgets = {
});
$.post( ajaxurl, a, function() {
$('img.ajax-feedback').css('visibility', 'hidden');
$('.spinner').hide();
});
this.resize();
@ -199,7 +199,7 @@ wpWidgets = {
save : function(widget, del, animate, order) {
var sb = widget.closest('div.widgets-sortables').attr('id'), data = widget.find('form').serialize(), a;
widget = $(widget);
$('.ajax-feedback', widget).css('visibility', 'visible');
$('.spinner', widget).show();
a = {
action: 'save-widget',
@ -235,7 +235,7 @@ wpWidgets = {
wpWidgets.resize();
}
} else {
$('.ajax-feedback').css('visibility', 'hidden');
$('.spinner').hide();
if ( r && r.length > 2 ) {
$('div.widget-content', widget).html(r);
wpWidgets.appendTitle(widget);

2
wp-admin/js/wp-fullscreen.js
View File

@ -205,7 +205,7 @@ PubSub.prototype.publish = function( topic, args ) {
*/
api.save = function() {
var hidden = $('#hiddenaction'), old = hidden.val(), spinner = $('#wp-fullscreen-save img'),
var hidden = $('#hiddenaction'), old = hidden.val(), spinner = $('#wp-fullscreen-save .spinner'),
message = $('#wp-fullscreen-save span');
spinner.show();

8
wp-admin/options-general.php
View File

@ -44,11 +44,11 @@ function options_general_add_js() {
});
$("input[name='date_format_custom'], input[name='time_format_custom']").change( function() {
var format = $(this);
format.siblings('img').css('visibility','visible');
format.siblings('.spinner').css('display', 'inline-block'); // show(); can't be used here
$.post(ajaxurl, {
action: 'date_format_custom' == format.attr('name') ? 'date_format' : 'time_format',
date : format.val()
}, function(d) { format.siblings('img').css('visibility','hidden'); format.siblings('.example').text(d); } );
}, function(d) { format.siblings('.spinner').hide(); format.siblings('.example').text(d); } );
});
});
//]]>
@ -250,7 +250,7 @@ if ( empty($tzstring) ) { // Create a UTC+- zone if no timezone string exists
echo ' <label><input type="radio" name="date_format" id="date_format_custom_radio" value="\c\u\s\t\o\m"';
checked( $custom );
echo '/> ' . __('Custom:') . ' </label><input type="text" name="date_format_custom" value="' . esc_attr( get_option('date_format') ) . '" class="small-text" /> <span class="example"> ' . date_i18n( get_option('date_format') ) . "</span> <img class='ajax-loading' src='" . esc_url( admin_url( 'images/wpspin_light.gif' ) ) . "' />\n";
echo '/> ' . __('Custom:') . ' </label><input type="text" name="date_format_custom" value="' . esc_attr( get_option('date_format') ) . '" class="small-text" /> <span class="example"> ' . date_i18n( get_option('date_format') ) . "</span> <span class='spinner'></span>\n";
echo "\t<p>" . __('<a href="http://codex.wordpress.org/Formatting_Date_and_Time">Documentation on date and time formatting</a>.') . "</p>\n";
?>
@ -282,7 +282,7 @@ if ( empty($tzstring) ) { // Create a UTC+- zone if no timezone string exists
echo ' <label><input type="radio" name="time_format" id="time_format_custom_radio" value="\c\u\s\t\o\m"';
checked( $custom );
echo '/> ' . __('Custom:') . ' </label><input type="text" name="time_format_custom" value="' . esc_attr( get_option('time_format') ) . '" class="small-text" /> <span class="example"> ' . date_i18n( get_option('time_format') ) . "</span> <img class='ajax-loading' src='" . esc_url( admin_url( 'images/wpspin_light.gif' ) ) . "' />\n";
echo '/> ' . __('Custom:') . ' </label><input type="text" name="time_format_custom" value="' . esc_attr( get_option('time_format') ) . '" class="small-text" /> <span class="example"> ' . date_i18n( get_option('time_format') ) . "</span> <span class='spinner'></span>\n";
;
?>
</fieldset>

6
wp-admin/press-this.php
View File

@ -427,7 +427,7 @@ var photostorage = false;
show('photo');
<?php } ?>
jQuery('#title').unbind();
jQuery('#publish, #save').click(function() { jQuery('#saving').css('display', 'inline'); });
jQuery('#publish, #save').click(function() { jQuery('.press-this #publishing-actions .spinner').css('display', 'inline-block'); });
$('#tagsdiv-post_tag, #categorydiv').children('h3, .handlediv').click(function(){
$(this).siblings('.inside').toggle();
@ -467,7 +467,7 @@ $admin_body_class .= ' locale-' . sanitize_html_class( strtolower( str_replace(
echo '<br /><br />';
submit_button( __( 'Submit for Review' ), 'primary', 'review', false );
} ?>
<img src="<?php echo esc_url( admin_url( 'images/wpspin_light.gif' ) ); ?>" alt="" id="saving" style="display:none;" />
<span class="spinner" style="display: none;"></span>
</p>
<?php if ( current_theme_supports( 'post-formats' ) && post_type_supports( 'post', 'post-formats' ) ) :
$post_formats = get_theme_support( 'post-formats' );
@ -586,7 +586,7 @@ $admin_body_class .= ' locale-' . sanitize_html_class( strtolower( str_replace(
</div>
</div>
<div id="waiting" style="display: none"><img src="<?php echo esc_url( admin_url( 'images/wpspin_light.gif' ) ); ?>" alt="" /> <?php esc_html_e( 'Loading...' ); ?></div>
<div id="waiting" style="display: none"><span class="spinner"></span> <span><?php esc_html_e( 'Loading...' ); ?></span></div>
<div id="extra-fields" style="display: none"></div>

4
wp-admin/widgets.php
View File

@ -345,7 +345,7 @@ foreach ( $wp_registered_sidebars as $sidebar => $registered_sidebar ) {
<div class="sidebar-name">
<div class="sidebar-name-arrow"><br /></div>
<h3><?php echo esc_html( $registered_sidebar['name'] ); ?>
<span><img src="<?php echo esc_url( admin_url( 'images/wpspin_light.gif' ) ); ?>" class="ajax-feedback" title="" alt="" /></span>
<span class="spinner"></span>
</h3>
</div>
<div class="widget-holder inactive">
@ -380,7 +380,7 @@ foreach ( $wp_registered_sidebars as $sidebar => $registered_sidebar ) {
<div class="sidebar-name">
<div class="sidebar-name-arrow"><br /></div>
<h3><?php echo esc_html( $registered_sidebar['name'] ); ?>
<span><img src="<?php echo esc_url( admin_url( 'images/wpspin_light.gif' ) ); ?>" class="ajax-feedback" title="" alt="" /></span></h3></div>
<span class="spinner"></span></h3></div>
<?php wp_list_widget_controls( $sidebar ); // Show the control forms for each of the widgets in this sidebar ?>
</div>
<?php

14
wp-includes/class-wp-editor.php
View File

@ -707,9 +707,9 @@ final class _WP_Editors {
</div></div>
<div id="wp-fullscreen-save">
<span><?php if ( $post->post_status == 'publish' ) _e('Updated.'); else _e('Saved.'); ?></span>
<img src="<?php echo admin_url('images/wpspin_light.gif'); ?>" alt="" />
<input type="button" class="button-primary" value="<?php echo $save; ?>" onclick="fullscreen.save();" />
<input type="button" class="button-primary right" value="<?php echo $save; ?>" onclick="fullscreen.save();" />
<span class="spinner"></span>
<span class="fs-saved"><?php if ( $post->post_status == 'publish' ) _e('Updated.'); else _e('Saved.'); ?></span>
</div>
</div>
@ -822,22 +822,22 @@ final class _WP_Editors {
<div id="search-panel"<?php if ( ! $show_internal ) echo ' style="display:none"'; ?>>
<div class="link-search-wrapper">
<label>
<span><?php _e( 'Search' ); ?></span>
<span class="search-label"><?php _e( 'Search' ); ?></span>
<input type="search" id="search-field" class="link-search-field" autocomplete="off" />
<img class="waiting" src="<?php echo esc_url( admin_url( 'images/wpspin_light.gif' ) ); ?>" alt="" />
<span class="spinner"></span>
</label>
</div>
<div id="search-results" class="query-results">
<ul></ul>
<div class="river-waiting">
<img class="waiting" src="<?php echo esc_url( admin_url( 'images/wpspin_light.gif' ) ); ?>" alt="" />
<span class="spinner"></span>
</div>
</div>
<div id="most-recent-results" class="query-results">
<div class="query-notice"><em><?php _e( 'No search term specified. Showing recent items.' ); ?></em></div>
<ul></ul>
<div class="river-waiting">
<img class="waiting" src="<?php echo esc_url( admin_url( 'images/wpspin_light.gif' ) ); ?>" alt="" />
<span class="spinner"></span>
</div>
</div>
</div>

13
wp-includes/css/editor.css
View File

@ -1296,13 +1296,18 @@ html[dir="rtl"] .wp-switch-editor {
margin-top: 5px;
}
#wp-link label span {
#wp-link label span.search-label {
display: inline-block;
width: 80px;
text-align: right;
padding-right: 5px;
}
#wp-link .link-search-field {
float: left;
margin-right: 5px;
}
#wp-link .link-search-wrapper {
margin: 5px 6px 9px;
display: block;
@ -1319,8 +1324,8 @@ html[dir="rtl"] .wp-switch-editor {
width: 220px;
}
#wp-link .link-search-wrapper img.waiting {
margin: 0;
#wp-link .link-search-wrapper .spinner {
margin: 4px 2px 0 0;
display: none;
vertical-align: text-bottom;
}
@ -1405,7 +1410,7 @@ html[dir="rtl"] .wp-switch-editor {
padding: 10px 0;
}
#wp-link .river-waiting img.waiting {
#wp-link .river-waiting .spinner {
margin: 0 auto;
display: block;
}

6
wp-includes/js/autosave.js
View File

@ -22,9 +22,9 @@ jQuery(document).ready( function($) {
t.addClass('button-disabled');
});
if ( $(this).attr('id') == 'publish' )
$('#ajax-loading').css('visibility', 'visible');
$('#major-publishing-actions .spinner').show();
else
$('#draft-ajax-loading').css('visibility', 'visible');
$('#minor-publishing .spinner').show();
});
window.onbeforeunload = function(){
@ -230,7 +230,7 @@ function autosave_enable_buttons() {
// delay that a bit to avoid some rare collisions while the DOM is being updated.
setTimeout(function(){
jQuery(':button, :submit', '#submitpost').removeAttr('disabled');
jQuery('.ajax-loading').css('visibility', 'hidden');
jQuery('.spinner').hide();
}, 500);
}

2
wp-includes/js/wplink.js
View File

@ -303,7 +303,7 @@ var wpLink;
return;
wpLink.lastSearch = search;
waiting = t.parent().find('img.waiting').show();
waiting = t.parent().find('.spinner').show();
rivers.search.change( search );
rivers.search.ajax( function(){ waiting.hide(); });