Make sure the update button in "At a Glance" dashboard widget does not overlap with long strings.

props SergeyBiryukov, afercia, tyxla.
fixes #30766.
Built from https://develop.svn.wordpress.org/trunk@31928


git-svn-id: http://core.svn.wordpress.org/trunk@31907 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Sergey Biryukov 2015-03-30 12:50:29 +00:00
parent a1dbd97adb
commit 43a99e0f1b
6 changed files with 9 additions and 7 deletions

View File

@ -352,10 +352,10 @@ body #dashboard-widgets .postbox form .submit {
}
#dashboard_right_now #wp-version-message .button {
clear: left;
float: left;
position: relative;
top: -5px;
margin-right: 5px;
}
.mu-storage {

View File

@ -352,10 +352,10 @@ body #dashboard-widgets .postbox form .submit {
}
#dashboard_right_now #wp-version-message .button {
clear: right;
float: right;
position: relative;
top: -5px;
margin-left: 5px;
}
.mu-storage {

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View File

@ -221,15 +221,17 @@ function update_right_now_message() {
$theme_name = sprintf( '<a href="themes.php">%1$s</a>', $theme_name );
}
$msg = sprintf( __( 'WordPress %1$s running %2$s theme.' ), get_bloginfo( 'version', 'display' ), $theme_name );
$msg = '';
if ( current_user_can('update_core') ) {
$cur = get_preferred_from_update_core();
if ( isset( $cur->response ) && $cur->response == 'upgrade' )
$msg .= " <a href='" . network_admin_url( 'update-core.php' ) . "' class='button'>" . sprintf( __('Update to %s'), $cur->current ? $cur->current : __( 'Latest' ) ) . '</a>';
$msg .= '<a href="' . network_admin_url( 'update-core.php' ) . '" class="button" aria-describedby="wp-version">' . sprintf( __( 'Update to %s' ), $cur->current ? $cur->current : __( 'Latest' ) ) . '</a> ';
}
$msg .= sprintf( '<span id="wp-version">' . __( 'WordPress %1$s running %2$s theme.' ) . '</span>', get_bloginfo( 'version', 'display' ), $theme_name );
echo "<p id='wp-version-message'>$msg</p>";
}

View File

@ -4,7 +4,7 @@
*
* @global string $wp_version
*/
$wp_version = '4.2-beta3-31927';
$wp_version = '4.2-beta3-31928';
/**
* Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.