sergiotarxz
/
Wordpress
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Quick/Bulk Edit: Improve the inline error messages styling. 

- uses the core `notice` styles for the Quick Edit form inline error messages
- adds missing periods at the end of a few error messages

Props ocean90, karmatosed, melchoyce, afercia.
Fixes #35496.


git-svn-id: https://develop.svn.wordpress.org/trunk@41684 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
Andrea Fercia 2017-10-02 21:51:09 +00:00
parent 02588452f7
commit e2c4ae805f
12 changed files with 74 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/wp-admin/css/ie.css
View File

@ -285,7 +285,7 @@ table.fixed td {
width: 29%;
}
.inline-edit-row p.submit {
.inline-edit-row .submit {
zoom: 100%;
}

20
src/wp-admin/css/list-tables.css
View File

@ -150,19 +150,12 @@
margin: 0;
padding: 5px 7px 10px;
overflow: hidden;
text-align: center;
}
#replysubmit .button {
margin-right: 5px;
}
#replysubmit .error {
color: red;
line-height: 21px;
text-align: center;
}
#replyrow.inline-edit-row fieldset.comment-reply {
font-size: inherit;
line-height: inherit;
@ -957,16 +950,19 @@ tr.inline-edit-row td,
line-height: 2.5;
}
.inline-edit-row p.submit {
.inline-edit-row .submit {
clear: both;
padding: 0.5em;
margin: 0.5em 0 0;
}
.inline-edit-row span.error {
line-height: 22px;
margin: 0 15px;
padding: 3px 5px;
.inline-edit-row .notice-error {
margin-top: 1em;
}
.inline-edit-row .notice-error .error {
margin: 0.5em 0;
padding: 2px;
}
/* Positioning */

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

@ -1737,7 +1737,7 @@ class WP_Posts_List_Table extends WP_List_Table {
}
?>
<p class="submit inline-edit-save">
<div class="submit inline-edit-save">
<button type="button" class="button cancel alignleft"><?php _e( 'Cancel' ); ?></button>
<?php if ( ! $bulk ) {
wp_nonce_field( 'inlineeditnonce', '_inline_edit', false );
@ -1752,9 +1752,11 @@ class WP_Posts_List_Table extends WP_List_Table {
<?php if ( ! $bulk && ! post_type_supports( $screen->post_type, 'author' ) ) { ?>
<input type="hidden" name="post_author" value="<?php echo esc_attr( $post->post_author ); ?>" />
<?php } ?>
<span class="error" style="display:none"></span>
<br class="clear" />
</p>
<div class="notice notice-error notice-alt inline hidden">
<p class="error"></p>
</div>
</div>
</td></tr>
<?php
$bulk++;

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

@ -616,16 +616,18 @@ class WP_Terms_List_Table extends WP_List_Table {
?>
<p class="inline-edit-save submit">
<div class="inline-edit-save submit">
<button type="button" class="cancel button alignleft"><?php _e( 'Cancel' ); ?></button>
<button type="button" class="save button button-primary alignright"><?php echo $tax->labels->update_item; ?></button>
<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 ); ?>" />
<input type="hidden" name="post_type" value="<?php echo esc_attr( $this->screen->post_type ); ?>" />
<br class="clear" />
</p>
<div class="notice notice-error notice-alt inline hidden">
<p class="error"></p>
</div>
</div>
</td></tr>
</tbody></table></form>
<?php

26
src/wp-admin/includes/template.php
View File

@ -423,15 +423,21 @@ function wp_comment_reply( $position = 1, $checkbox = false, $mode = 'single', $
</div>
</div>
<p id="replysubmit" class="submit">
<a href="#comments-form" class="save button button-primary alignright">
<span id="addbtn" style="display:none;"><?php _e('Add Comment'); ?></span>
<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 alignleft"><?php _e('Cancel'); ?></a>
<span class="waiting spinner"></span>
<span class="error" style="display:none;"></span>
</p>
<div id="replysubmit" class="submit">
<p>
<a href="#comments-form" class="save button button-primary alignright">
<span id="addbtn" style="display: none;"><?php _e( 'Add Comment' ); ?></span>
<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 alignleft"><?php _e( 'Cancel' ); ?></a>
<span class="waiting spinner"></span>
</p>
<br class="clear" />
<div class="notice notice-error notice-alt inline hidden">
<p class="error"></p>
</div>
</div>
<input type="hidden" name="action" id="action" value="" />
<input type="hidden" name="comment_ID" id="comment_ID" value="" />
@ -892,7 +898,7 @@ function wp_import_upload_form( $action ) {
* @param string|array|WP_Screen $screen Optional. The screen or screens on which to show the box
* (such as a post type, 'link', or 'comment'). Accepts a single
* screen ID, WP_Screen object, or array of screen IDs. Default
* is the current screen. If you have used add_menu_page() or
* is the current screen. If you have used add_menu_page() or
* add_submenu_page() to create a new screen (and hence screen_id),
* make sure your menu slug conforms to the limits of sanitize_key()
* otherwise the 'screen' menu may not correctly render on your page.

20
src/wp-admin/js/edit-comments.js
View File

@ -653,7 +653,9 @@ commentReply = {
$('#com-reply').append( replyrow );
$('#replycontent').css('height', '').val('');
$('#edithead input').val('');
$('.error', replyrow).empty().hide();
$( '.notice-error', replyrow )
.addClass( 'hidden' )
.find( '.error' ).empty();
$( '.spinner', replyrow ).removeClass( 'is-active' );
this.cid = '';
@ -754,9 +756,10 @@ commentReply = {
},
send : function() {
var post = {};
var post = {},
$errorNotice = $( '#replysubmit .error-notice' );
$('#replysubmit .error').hide();
$errorNotice.addClass( 'hidden' );
$( '#replysubmit .spinner' ).addClass( 'is-active' );
$('#replyrow input').not(':button').each(function() {
@ -847,16 +850,19 @@ commentReply = {
},
error : function(r) {
var er = r.statusText;
var er = r.statusText,
$errorNotice = $( '#replysubmit .notice-error' ),
$error = $errorNotice.find( '.error' );
$( '#replysubmit .spinner' ).removeClass( 'is-active' );
if ( r.responseText )
er = r.responseText.replace( /<.[^<>]*?>/g, '' );
if ( er )
$('#replysubmit .error').html(er).show();
if ( er ) {
$errorNotice.removeClass( 'hidden' );
$error.html( er );
}
},
addcomment: function(post_id) {

11
src/wp-admin/js/inline-edit-post.js
View File

@ -413,7 +413,8 @@ var inlineEditPost;
// Make ajax request.
$.post( ajaxurl, params,
function(r) {
var $errorSpan = $( '#edit-' + id + ' .inline-edit-save .error' );
var $errorNotice = $( '#edit-' + id + ' .inline-edit-save .notice-error' ),
$error = $errorNotice.find( '.error' );
$( 'table.widefat .spinner' ).removeClass( 'is-active' );
$( '.ac_results' ).hide();
@ -429,11 +430,13 @@ var inlineEditPost;
});
} else {
r = r.replace( /<.[^<>]*?>/g, '' );
$errorSpan.html( r ).show();
wp.a11y.speak( $errorSpan.text() );
$errorNotice.removeClass( 'hidden' );
$error.html( r );
wp.a11y.speak( $error.text() );
}
} else {
$errorSpan.html( inlineEditL10n.error ).show();
$errorNotice.removeClass( 'hidden' );
$error.html( inlineEditL10n.error );
wp.a11y.speak( inlineEditL10n.error );
}
},

11
src/wp-admin/js/inline-edit-tax.js
View File

@ -196,7 +196,8 @@ inlineEditTax = {
*/
function(r) {
var row, new_id, option_value,
$errorSpan = $( '#edit-' + id + ' .inline-edit-save .error' );
$errorNotice = $( '#edit-' + id + ' .inline-edit-save .notice-error' ),
$error = $errorNotice.find( '.error' );
$( 'table.widefat .spinner' ).removeClass( 'is-active' );
@ -225,15 +226,17 @@ inlineEditTax = {
});
} else {
$errorSpan.html( r ).show();
$errorNotice.removeClass( 'hidden' );
$error.html( r );
/*
* Some error strings may contain HTML entities (e.g. `&#8220`), let's use
* the HTML element's text.
*/
wp.a11y.speak( $errorSpan.text() );
wp.a11y.speak( $error.text() );
}
} else {
$errorSpan.html( inlineEditL10n.error ).show();
$errorNotice.removeClass( 'hidden' );
$error.html( inlineEditL10n.error );
wp.a11y.speak( inlineEditL10n.error );
}
}

16
src/wp-includes/taxonomy.php
View File

@ -424,7 +424,7 @@ function unregister_taxonomy( $taxonomy ) {
// Do not allow unregistering internal taxonomies.
if ( $taxonomy_object->_builtin ) {
return new WP_Error( 'invalid_taxonomy', __( 'Unregistering a built-in taxonomy is not allowed' ) );
return new WP_Error( 'invalid_taxonomy', __( 'Unregistering a built-in taxonomy is not allowed.' ) );
}
global $wp_taxonomies;
@ -746,7 +746,7 @@ function get_tax_sql( $tax_query, $primary_table, $primary_id_column ) {
*/
function get_term( $term, $taxonomy = '', $output = OBJECT, $filter = 'raw' ) {
if ( empty( $term ) ) {
return new WP_Error( 'invalid_term', __( 'Empty Term' ) );
return new WP_Error( 'invalid_term', __( 'Empty Term.' ) );
}
if ( $taxonomy && ! taxonomy_exists( $taxonomy ) ) {
@ -2123,7 +2123,7 @@ function wp_insert_term( $term, $taxonomy, $args = array() ) {
$data = apply_filters( 'wp_insert_term_data', $data, $taxonomy, $args );
if ( false === $wpdb->insert( $wpdb->terms, $data ) ) {
return new WP_Error( 'db_insert_error', __( 'Could not insert term into the database' ), $wpdb->last_error );
return new WP_Error( 'db_insert_error', __( 'Could not insert term into the database.' ), $wpdb->last_error );
}
$term_id = (int) $wpdb->insert_id;
@ -2347,7 +2347,7 @@ function wp_set_object_terms( $object_id, $terms, $taxonomy, $append = false ) {
$values[] = $wpdb->prepare( "(%d, %d, %d)", $object_id, $tt_id, ++$term_order);
if ( $values )
if ( false === $wpdb->query( "INSERT INTO $wpdb->term_relationships (object_id, term_taxonomy_id, term_order) VALUES " . join( ',', $values ) . " ON DUPLICATE KEY UPDATE term_order = VALUES(term_order)" ) )
return new WP_Error( 'db_insert_error', __( 'Could not insert term relationship into the database' ), $wpdb->last_error );
return new WP_Error( 'db_insert_error', __( 'Could not insert term relationship into the database.' ), $wpdb->last_error );
}
wp_cache_delete( $object_id, $taxonomy . '_relationships' );
@ -2615,7 +2615,7 @@ function wp_update_term( $term_id, $taxonomy, $args = array() ) {
}
if ( ! $term ) {
return new WP_Error( 'invalid_term', __( 'Empty Term' ) );
return new WP_Error( 'invalid_term', __( 'Empty Term.' ) );
}
$term = (array) $term->data;
@ -2701,7 +2701,7 @@ function wp_update_term( $term_id, $taxonomy, $args = array() ) {
$slug = wp_unique_term_slug($slug, (object) $args);
} else {
/* translators: 1: Taxonomy term slug */
return new WP_Error('duplicate_term_slug', sprintf(__('The slug &#8220;%s&#8221; is already in use by another term'), $slug));
return new WP_Error( 'duplicate_term_slug', sprintf( __( 'The slug &#8220;%s&#8221; is already in use by another term.' ), $slug ) );
}
}
@ -3916,7 +3916,7 @@ function get_term_link( $term, $taxonomy = '' ) {
}
if ( !is_object($term) )
$term = new WP_Error('invalid_term', __('Empty Term'));
$term = new WP_Error( 'invalid_term', __( 'Empty Term.' ) );
if ( is_wp_error( $term ) )
return $term;
@ -4128,7 +4128,7 @@ function get_post_taxonomies( $post = 0 ) {
*/
function is_object_in_term( $object_id, $taxonomy, $terms = null ) {
if ( !$object_id = (int) $object_id )
return new WP_Error( 'invalid_object', __( 'Invalid object ID' ) );
return new WP_Error( 'invalid_object', __( 'Invalid object ID.' ) );
$object_terms = get_object_term_cache( $object_id, $taxonomy );
if ( false === $object_terms ) {

2
tests/phpunit/tests/xmlrpc/wp/deleteTerm.php
View File

@ -51,7 +51,7 @@ class Tests_XMLRPC_wp_deleteTerm extends WP_XMLRPC_UnitTestCase {
$result = $this->myxmlrpcserver->wp_deleteTerm( array( 1, 'editor', 'editor', 'category', '' ) );
$this->assertIXRError( $result );
$this->assertEquals( 500, $result->code );
$this->assertEquals( __('Empty Term'), $result->message );
$this->assertEquals( __('Empty Term.'), $result->message );
}
function test_invalid_term() {

4
tests/phpunit/tests/xmlrpc/wp/editTerm.php
View File

@ -68,7 +68,7 @@ class Tests_XMLRPC_wp_editTerm extends WP_XMLRPC_UnitTestCase {
$result = $this->myxmlrpcserver->wp_editTerm( array( 1, 'editor', 'editor', '', array( 'taxonomy' => 'category' ) ) );
$this->assertIXRError( $result );
$this->assertEquals( 500, $result->code );
$this->assertEquals( __('Empty Term'), $result->message );
$this->assertEquals( __('Empty Term.'), $result->message );
}
function test_empty_term_name() {
@ -133,7 +133,7 @@ class Tests_XMLRPC_wp_editTerm extends WP_XMLRPC_UnitTestCase {
$result = $this->myxmlrpcserver->wp_editTerm( array( 1, 'editor', 'editor', self::$child_term, array( 'taxonomy' => 'category', 'slug' => $parent_term->slug ) ) );
$this->assertIXRError( $result );
$this->assertEquals( 500, $result->code );
$this->assertEquals( htmlspecialchars( sprintf( __('The slug &#8220;%s&#8221; is already in use by another term'), $parent_term->slug ) ), $result->message );
$this->assertEquals( htmlspecialchars( sprintf( __('The slug &#8220;%s&#8221; is already in use by another term.'), $parent_term->slug ) ), $result->message );
}
function test_edit_all_fields() {

2
tests/phpunit/tests/xmlrpc/wp/getTerm.php
View File

@ -53,7 +53,7 @@ class Tests_XMLRPC_wp_getTerm extends WP_XMLRPC_UnitTestCase {
$result = $this->myxmlrpcserver->wp_getTerm( array( 1, 'editor', 'editor', 'category', '' ) );
$this->assertIXRError( $result );
$this->assertEquals( 500, $result->code );
$this->assertEquals( __('Empty Term'), $result->message );
$this->assertEquals( __('Empty Term.'), $result->message );
}
function test_invalid_term() {