diff --git a/wp-admin/css/customize-controls-rtl.css b/wp-admin/css/customize-controls-rtl.css index 1852fd91a4..296f535cd8 100644 --- a/wp-admin/css/customize-controls-rtl.css +++ b/wp-admin/css/customize-controls-rtl.css @@ -10,7 +10,7 @@ float: left; } -#customize-header-actions img { +#customize-header-actions .spinner { float: left; margin-right: 0; margin-left: 4px; diff --git a/wp-admin/css/customize-controls.css b/wp-admin/css/customize-controls.css index 68429914ef..6317d9e78d 100644 --- a/wp-admin/css/customize-controls.css +++ b/wp-admin/css/customize-controls.css @@ -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; } diff --git a/wp-admin/css/wp-admin-rtl.css b/wp-admin/css/wp-admin-rtl.css index 578a521c46..ae5fe21968 100644 --- a/wp-admin/css/wp-admin-rtl.css +++ b/wp-admin/css/wp-admin-rtl.css @@ -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; } diff --git a/wp-admin/css/wp-admin.css b/wp-admin/css/wp-admin.css index 6f38e708d7..7c6c2fe404 100644 --- a/wp-admin/css/wp-admin.css +++ b/wp-admin/css/wp-admin.css @@ -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; +} \ No newline at end of file diff --git a/wp-admin/customize.php b/wp-admin/customize.php index 09c5b6789b..1ac1989196 100644 --- a/wp-admin/customize.php +++ b/wp-admin/customize.php @@ -72,7 +72,7 @@ do_action( 'customize_controls_print_scripts' ); $save_text = $wp_customize->is_theme_active() ? __( 'Save & Publish' ) : __( 'Save & Activate' ); submit_button( $save_text, 'primary', 'save', false ); ?> - + diff --git a/wp-admin/images/wpspin_light-2x.gif b/wp-admin/images/wpspin_light-2x.gif new file mode 100644 index 0000000000..fe2d5c0fcb Binary files /dev/null and b/wp-admin/images/wpspin_light-2x.gif differ diff --git a/wp-admin/includes/class-wp-plugin-install-list-table.php b/wp-admin/includes/class-wp-plugin-install-list-table.php index 3de77c1d80..da324ee701 100644 --- a/wp-admin/includes/class-wp-plugin-install-list-table.php +++ b/wp-admin/includes/class-wp-plugin-install-list-table.php @@ -115,13 +115,11 @@ class WP_Plugin_Install_List_Table extends WP_List_Table { pagination( $which ); ?> -
pagination( $which ); ?> -
- + 's' ) ); } ?> diff --git a/wp-admin/includes/class-wp-terms-list-table.php b/wp-admin/includes/class-wp-terms-list-table.php index 67ac22b56a..85010105cd 100644 --- a/wp-admin/includes/class-wp-terms-list-table.php +++ b/wp-admin/includes/class-wp-terms-list-table.php @@ -364,7 +364,7 @@ class WP_Terms_List_Table extends WP_List_Table { labels->update_item; ?> - + diff --git a/wp-admin/includes/class-wp-theme-install-list-table.php b/wp-admin/includes/class-wp-theme-install-list-table.php index 46d3262d23..319a9989f1 100644 --- a/wp-admin/includes/class-wp-theme-install-list-table.php +++ b/wp-admin/includes/class-wp-theme-install-list-table.php @@ -134,7 +134,6 @@ class WP_Theme_Install_List_Table extends WP_Themes_List_Table { pagination( 'top' ); ?> -
diff --git a/wp-admin/includes/class-wp-themes-list-table.php b/wp-admin/includes/class-wp-themes-list-table.php index 7a89fc889b..7bf9114c5a 100644 --- a/wp-admin/includes/class-wp-themes-list-table.php +++ b/wp-admin/includes/class-wp-themes-list-table.php @@ -91,8 +91,8 @@ class WP_Themes_List_Table extends WP_List_Table { ?>
pagination( $which ); ?> - -
+ +
in_loop = true; - printf( '

' . $this->upgrader->strings['skin_before_update_header'] . '

', $title, $this->upgrader->update_current, $this->upgrader->update_count); - echo ''; + printf( '

' . $this->upgrader->strings['skin_before_update_header'] . '

', $title, $this->upgrader->update_current, $this->upgrader->update_count); + echo ''; echo '

'; $this->flush_output(); } diff --git a/wp-admin/includes/dashboard.php b/wp-admin/includes/dashboard.php index 18738421f0..2aab210ab8 100644 --- a/wp-admin/includes/dashboard.php +++ b/wp-admin/includes/dashboard.php @@ -535,7 +535,7 @@ function wp_dashboard_quick_press() { - +

diff --git a/wp-admin/includes/media.php b/wp-admin/includes/media.php index f92d5a1c19..b5aa42b221 100644 --- a/wp-admin/includes/media.php +++ b/wp-admin/includes/media.php @@ -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 = " "; + $image_edit_button = " "; } $attachment_url = get_permalink( $attachment_id ); @@ -1580,7 +1580,7 @@ var addExtImage = { return false; } - document.getElementById('status_img').innerHTML = ''; + document.getElementById('status_img').innerHTML = ''; 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 = " "; + $image_edit_button = " "; } ?> diff --git a/wp-admin/includes/meta-boxes.php b/wp-admin/includes/meta-boxes.php index e7fd828815..175c4497ba 100644 --- a/wp-admin/includes/meta-boxes.php +++ b/wp-admin/includes/meta-boxes.php @@ -32,7 +32,7 @@ function post_submit_meta_box($post) { post_status && $can_publish ) { ?> - +
public ) : ?>
@@ -200,7 +200,7 @@ if ( current_user_can( "delete_post", $post->ID ) ) {
- + post_status, array('publish', 'future', 'private') ) || 0 == $post->ID ) { if ( $can_publish ) : @@ -283,7 +283,7 @@ function attachment_submit_meta_box( $post ) {
- +
@@ -589,7 +589,7 @@ function post_comment_meta_box( $post ) { } ?> -

+

- - + +

- - class="button-secondary submit-add-to-menu" value="" name="add-custom-menu-item" id="submit-customlinkdiv" /> + class="button-secondary submit-add-to-menu right" value="" name="add-custom-menu-item" id="submit-customlinkdiv" /> +

@@ -692,7 +692,7 @@ function wp_nav_menu_item_post_type_meta_box( $object, $post_type ) { ?>

- + 'submit-quick-search-posttype-' . $post_type_name ) ); ?>

@@ -779,8 +779,8 @@ function wp_nav_menu_item_post_type_meta_box( $object, $post_type ) { - - class="button-secondary submit-add-to-menu" value="" name="add-post-type-menu-item" id="submit-posttype-" /> + class="button-secondary submit-add-to-menu right" value="" name="add-post-type-menu-item" id="submit-posttype-" /> +

@@ -923,7 +923,7 @@ function wp_nav_menu_item_taxonomy_meta_box( $object, $taxonomy ) { ?>

- + 'submit-quick-search-taxonomy-' . $taxonomy_name ) ); ?>

@@ -955,8 +955,8 @@ function wp_nav_menu_item_taxonomy_meta_box( $object, $taxonomy ) { - - class="button-secondary submit-add-to-menu" value="" name="add-taxonomy-menu-item" id="submit-taxonomy-" /> + class="button-secondary submit-add-to-menu right" value="" name="add-taxonomy-menu-item" id="submit-taxonomy-" /> +

diff --git a/wp-admin/includes/template.php b/wp-admin/includes/template.php index 92bfc2deb1..2e32a6ffa1 100644 --- a/wp-admin/includes/template.php +++ b/wp-admin/includes/template.php @@ -360,7 +360,7 @@ function wp_comment_reply($position = '1', $checkbox = false, $mode = 'single', - +

diff --git a/wp-admin/includes/widgets.php b/wp-admin/includes/widgets.php index 22ead6f76e..e0c58a7277 100644 --- a/wp-admin/includes/widgets.php +++ b/wp-admin/includes/widgets.php @@ -211,8 +211,8 @@ function wp_widget_control( $sidebar_args ) {
- - 'widget-' . esc_attr( $id_format ) . '-savewidget' ) ); ?> + 'widget-' . esc_attr( $id_format ) . '-savewidget' ) ); ?> +

diff --git a/wp-admin/js/dashboard.js b/wp-admin/js/dashboard.js index 32084469ad..6c80c7e147 100644 --- a/wp-admin/js/dashboard.js +++ b/wp-admin/js/dashboard.js @@ -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() { diff --git a/wp-admin/js/edit-comments.js b/wp-admin/js/edit-comments.js index b353377867..350390afba 100644 --- a/wp-admin/js/edit-comments.js +++ b/wp-admin/js/edit-comments.js @@ -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, '' ); diff --git a/wp-admin/js/image-edit.js b/wp-admin/js/image-edit.js index e4dfbda1ce..f0aed6c8c3 100644 --- a/wp-admin/js/image-edit.js +++ b/wp-admin/js/image-edit.js @@ -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(); }); }); }, diff --git a/wp-admin/js/inline-edit-post.js b/wp-admin/js/inline-edit-post.js index 4b0eb2eeb3..65ba24d6da 100644 --- a/wp-admin/js/inline-edit-post.js +++ b/wp-admin/js/inline-edit-post.js @@ -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('

' + navMenuL10n.noResultsFound + '

' ); - $('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) { diff --git a/wp-admin/js/post.js b/wp-admin/js/post.js index 7f1cebe4da..274c5903a7 100644 --- a/wp-admin/js/post.js +++ b/wp-admin/js/post.js @@ -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 ); diff --git a/wp-admin/js/theme.js b/wp-admin/js/theme.js index ae779c6803..079c73b5e4 100644 --- a/wp-admin/js/theme.js +++ b/wp-admin/js/theme.js @@ -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 ); }); diff --git a/wp-admin/js/widgets.js b/wp-admin/js/widgets.js index 1092e235f5..87be4ddfd5 100644 --- a/wp-admin/js/widgets.js +++ b/wp-admin/js/widgets.js @@ -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); diff --git a/wp-admin/js/wp-fullscreen.js b/wp-admin/js/wp-fullscreen.js index af96124157..df6791d606 100644 --- a/wp-admin/js/wp-fullscreen.js +++ b/wp-admin/js/wp-fullscreen.js @@ -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(); diff --git a/wp-admin/options-general.php b/wp-admin/options-general.php index 125d8f2edc..3fc77ddaf8 100644 --- a/wp-admin/options-general.php +++ b/wp-admin/options-general.php @@ -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 ' ' . date_i18n( get_option('date_format') ) . " \n"; + echo '/> ' . __('Custom:') . ' ' . date_i18n( get_option('date_format') ) . " \n"; echo "\t

" . __('Documentation on date and time formatting.') . "

\n"; ?> @@ -282,7 +282,7 @@ if ( empty($tzstring) ) { // Create a UTC+- zone if no timezone string exists echo ' ' . date_i18n( get_option('time_format') ) . " \n"; + echo '/> ' . __('Custom:') . ' ' . date_i18n( get_option('time_format') ) . " \n"; ; ?> diff --git a/wp-admin/press-this.php b/wp-admin/press-this.php index cd6d02fb2b..e3660be25f 100644 --- a/wp-admin/press-this.php +++ b/wp-admin/press-this.php @@ -427,7 +427,7 @@ var photostorage = false; show('photo'); 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 '

'; submit_button( __( 'Submit for Review' ), 'primary', 'review', false ); } ?> - +

- + diff --git a/wp-admin/widgets.php b/wp-admin/widgets.php index 952c4388f7..014b09e08f 100644 --- a/wp-admin/widgets.php +++ b/wp-admin/widgets.php @@ -345,7 +345,7 @@ foreach ( $wp_registered_sidebars as $sidebar => $registered_sidebar ) {

- +

@@ -380,7 +380,7 @@ foreach ( $wp_registered_sidebars as $sidebar => $registered_sidebar ) {

-

+
- post_status == 'publish' ) _e('Updated.'); else _e('Saved.'); ?> - - + + + post_status == 'publish' ) _e('Updated.'); else _e('Saved.'); ?>
@@ -822,22 +822,22 @@ final class _WP_Editors { diff --git a/wp-includes/css/editor.css b/wp-includes/css/editor.css index 0e100228de..5b5400fe1b 100644 --- a/wp-includes/css/editor.css +++ b/wp-includes/css/editor.css @@ -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; } diff --git a/wp-includes/js/autosave.js b/wp-includes/js/autosave.js index e08207b51c..bc2a6dacec 100644 --- a/wp-includes/js/autosave.js +++ b/wp-includes/js/autosave.js @@ -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); } diff --git a/wp-includes/js/wplink.js b/wp-includes/js/wplink.js index d437d58a67..c52d2a1976 100644 --- a/wp-includes/js/wplink.js +++ b/wp-includes/js/wplink.js @@ -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(); });