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

Improvements to [30333]: 

* Move `.hide-if-no-js` class to table row
* Add a wrapper class
* Add missing translators comment

see #30264.
Built from https://develop.svn.wordpress.org/trunk@30334


git-svn-id: http://core.svn.wordpress.org/trunk@30333 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Dominik Schilling 2014-11-13 15:54:20 +00:00
parent c02845330e
commit 4a1cb796fc
3 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
wp-admin/js/user-profile.js
View File

@ -124,7 +124,7 @@
});
});
$('#destroy-sessions').on('click',function(e){
$( '#destroy-sessions' ).on( 'click', function( e ) {
var $this = $(this);
var data = {
@ -146,7 +146,6 @@
}, 'json' );
e.preventDefault();
});
})(jQuery);

17
wp-admin/user-edit.php
View File

@ -488,22 +488,25 @@ if ( $show_password_fields ) :
<?php endif; ?>
<?php if ( IS_PROFILE_PAGE && ( count( $sessions->get_all() ) > 1 ) ) { ?>
<tr>
<tr class="user-sessions-wrap hide-if-no-js">
<th>&nbsp;</th>
<td>
<p><button class="button button-secondary hide-if-no-js" id="destroy-sessions" data-token="<?php echo esc_attr( wp_get_session_token() ); ?>"><?php _e( 'Log Out of All Other Sessions' ); ?></button></p>
<p class="description hide-if-no-js">
<p><button class="button button-secondary" id="destroy-sessions" data-token="<?php echo esc_attr( wp_get_session_token() ); ?>"><?php _e( 'Log Out of All Other Sessions' ); ?></button></p>
<p class="description">
<?php _e( 'Left your account logged in at a public computer? Lost your phone? This will log you out everywhere except your current browser.' ); ?>
</p>
</td>
</tr>
<?php } else if ( ! IS_PROFILE_PAGE && ( count( $sessions->get_all() ) > 0 ) ) { ?>
<tr>
<tr class="user-sessions-wrap hide-if-no-js">
<th>&nbsp;</th>
<td>
<p><button class="button button-secondary hide-if-no-js" id="destroy-sessions"><?php _e( 'Log Out of All Sessions' ); ?></button></p>
<p class="description hide-if-no-js">
<?php printf( __( 'Log %s out of all sessions' ), $profileuser->display_name ); ?>
<p><button class="button button-secondary" id="destroy-sessions"><?php _e( 'Log Out of All Sessions' ); ?></button></p>
<p class="description">
<?php
/* translators: 1: User's display name. */
printf( __( 'Log %s out of all sessions' ), $profileuser->display_name );
?>
</p>
</td>
</tr>

2
wp-includes/version.php
View File

@ -4,7 +4,7 @@
*
* @global string $wp_version
*/
$wp_version = '4.1-alpha-30333';
$wp_version = '4.1-alpha-30334';
/**
* Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.