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

Use a class for update-nag, as especially in MS we're sometimes hooking in more than one per page. 

git-svn-id: http://svn.automattic.com/wordpress/trunk@14319 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
nacin 2010-04-30 15:37:46 +00:00
parent bb3f1f5f45
commit 0cfdd41300
9 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
wp-admin/css/colors-classic.css
View File

File diff suppressed because one or more lines are too long

2
wp-admin/css/colors-classic.dev.css
View File

@ -695,7 +695,7 @@ table.widefat span.spam a,
background: url(../images/xit.gif) no-repeat -10px 0; background: url(../images/xit.gif) no-repeat -10px 0;
} }
#update-nag { #update-nag, .update-nag {
background-color: #FFFBCC; background-color: #FFFBCC;
border-color: #E6DB55; border-color: #E6DB55;
color: #555; color: #555;

2
wp-admin/css/colors-fresh.css
View File

File diff suppressed because one or more lines are too long

2
wp-admin/css/colors-fresh.dev.css
View File

@ -694,7 +694,7 @@ table.widefat span.spam a,
background: url(../images/xit.gif) no-repeat -10px 0; background: url(../images/xit.gif) no-repeat -10px 0;
} }
#update-nag { #update-nag, .update-nag {
background-color: #FFFBCC; background-color: #FFFBCC;
border-color: #E6DB55; border-color: #E6DB55;
color: #555; color: #555;

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

File diff suppressed because one or more lines are too long

2
wp-admin/css/wp-admin.dev.css
View File

@ -807,7 +807,7 @@ td.media-icon img {
max-height: 60px; max-height: 60px;
} }
#update-nag { #update-nag, .update-nag {
line-height: 19px; line-height: 19px;
padding: 5px 0; padding: 5px 0;
font-size: 12px; font-size: 12px;

12
wp-admin/includes/ms.php
View File

@ -366,7 +366,7 @@ add_action( 'personal_options_update', 'send_confirmation_on_profile_email' );
function new_user_email_admin_notice() { function new_user_email_admin_notice() {
global $current_user; global $current_user;
if ( strpos( $_SERVER['PHP_SELF'], 'profile.php' ) && isset( $_GET['updated'] ) && $email = get_option( $current_user->ID . '_new_email' ) ) if ( strpos( $_SERVER['PHP_SELF'], 'profile.php' ) && isset( $_GET['updated'] ) && $email = get_option( $current_user->ID . '_new_email' ) )
echo "<div id='update-nag'>" . sprintf( __( "Your email address has not been updated yet. Please check your inbox at %s for a confirmation email." ), $email['newemail'] ) . "</div>"; echo "<div class='update-nag'>" . sprintf( __( "Your email address has not been updated yet. Please check your inbox at %s for a confirmation email." ), $email['newemail'] ) . "</div>";
} }
add_action( 'admin_notices', 'new_user_email_admin_notice' ); add_action( 'admin_notices', 'new_user_email_admin_notice' );
@ -671,7 +671,7 @@ function secret_salt_warning() {
$msg .= '<br/>' . __( "Before the line <code>/* That's all, stop editing! Happy blogging. */</code> please add this code:" ); $msg .= '<br/>' . __( "Before the line <code>/* That's all, stop editing! Happy blogging. */</code> please add this code:" );
$msg .= "<br/><br/><code>$out</code>"; $msg .= "<br/><br/><code>$out</code>";
echo "<div id='update-nag'>$msg</div>"; echo "<div class='update-nag'>$msg</div>";
} }
} }
add_action( 'admin_notices', 'secret_salt_warning' ); add_action( 'admin_notices', 'secret_salt_warning' );
@ -702,7 +702,7 @@ function admin_notice_feed() {
$msg .= "<p>" . $content . "<a href='$link'>" . __( 'Read More' ) . "</a> <a href='index.php?feed_dismiss=" . md5( $title ) . "'>" . __( 'Dismiss' ) . "</a></p>"; $msg .= "<p>" . $content . "<a href='$link'>" . __( 'Read More' ) . "</a> <a href='index.php?feed_dismiss=" . md5( $title ) . "'>" . __( 'Dismiss' ) . "</a></p>";
echo "<div class='updated'>$msg</div>"; echo "<div class='updated'>$msg</div>";
} elseif ( is_super_admin() ) { } elseif ( is_super_admin() ) {
printf( '<div id="update-nag">' . __( 'Your feed at %s is empty.' ) . '</div>', esc_html( $url ) ); printf( '<div class="update-nag">' . __( 'Your feed at %s is empty.' ) . '</div>', esc_html( $url ) );
} }
} }
add_action( 'admin_notices', 'admin_notice_feed' ); add_action( 'admin_notices', 'admin_notice_feed' );
@ -712,7 +712,7 @@ function site_admin_notice() {
if ( !is_super_admin() ) if ( !is_super_admin() )
return false; return false;
if ( get_site_option( 'wpmu_upgrade_site' ) != $wp_db_version ) if ( get_site_option( 'wpmu_upgrade_site' ) != $wp_db_version )
echo "<div id='update-nag'>" . sprintf( __( 'Thank you for Updating! Please visit the <a href="%s">Update Network</a> page to update all your sites.' ), esc_url( admin_url( 'ms-upgrade-network.php' ) ) ) . "</div>"; echo "<div class='update-nag'>" . sprintf( __( 'Thank you for Updating! Please visit the <a href="%s">Update Network</a> page to update all your sites.' ), esc_url( admin_url( 'ms-upgrade-network.php' ) ) ) . "</div>";
} }
add_action( 'admin_notices', 'site_admin_notice' ); add_action( 'admin_notices', 'site_admin_notice' );
@ -785,7 +785,7 @@ function show_post_thumbnail_warning() {
return; return;
$mu_media_buttons = get_site_option( 'mu_media_buttons', array() ); $mu_media_buttons = get_site_option( 'mu_media_buttons', array() );
if ( empty($mu_media_buttons['image']) && current_theme_supports( 'post-thumbnails' ) ) { if ( empty($mu_media_buttons['image']) && current_theme_supports( 'post-thumbnails' ) ) {
echo "<div id='update-nag'>" . sprintf( __( "Warning! The current theme supports Featured Images. You must enable image uploads on <a href='%s'>the options page</a> for it to work." ), esc_url( admin_url( 'ms-options.php' ) ) ) . "</div>"; echo "<div class='update-nag'>" . sprintf( __( "Warning! The current theme supports Featured Images. You must enable image uploads on <a href='%s'>the options page</a> for it to work." ), esc_url( admin_url( 'ms-options.php' ) ) ) . "</div>";
} }
} }
add_action( 'admin_notices', 'show_post_thumbnail_warning' ); add_action( 'admin_notices', 'show_post_thumbnail_warning' );
@ -795,7 +795,7 @@ function ms_deprecated_blogs_file() {
return; return;
if ( ! file_exists( WP_CONTENT_DIR . '/blogs.php' ) ) if ( ! file_exists( WP_CONTENT_DIR . '/blogs.php' ) )
return; return;
echo '<div id="update-nag">' . sprintf( __( 'The <code>%1$s</code> file is deprecated. Please remove it and update your server rewrite rules to use <code>%2$s</code> instead.' ), 'wp-content/blogs.php', 'wp-includes/ms-files.php' ) . '</div>'; echo '<div class="update-nag">' . sprintf( __( 'The <code>%1$s</code> file is deprecated. Please remove it and update your server rewrite rules to use <code>%2$s</code> instead.' ), 'wp-content/blogs.php', 'wp-includes/ms-files.php' ) . '</div>';
} }
add_action( 'admin_notices', 'ms_deprecated_blogs_file' ); add_action( 'admin_notices', 'ms_deprecated_blogs_file' );

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

@ -134,7 +134,7 @@ function update_nag() {
else else
$msg = sprintf( __('<a href="http://codex.wordpress.org/Version_%1$s">WordPress %1$s</a> is available! Please notify the site administrator.'), $cur->current ); $msg = sprintf( __('<a href="http://codex.wordpress.org/Version_%1$s">WordPress %1$s</a> is available! Please notify the site administrator.'), $cur->current );
echo "<div id='update-nag'>$msg</div>"; echo "<div class='update-nag'>$msg</div>";
} }
add_action( 'admin_notices', 'update_nag', 3 ); add_action( 'admin_notices', 'update_nag', 3 );
@ -260,7 +260,7 @@ function maintenance_nag() {
else else
$msg = __('An automated WordPress update has failed to complete! Please notify the site administrator.'); $msg = __('An automated WordPress update has failed to complete! Please notify the site administrator.');
echo "<div id='update-nag'>$msg</div>"; echo "<div class='update-nag'>$msg</div>";
} }
add_action( 'admin_notices', 'maintenance_nag' ); add_action( 'admin_notices', 'maintenance_nag' );

2
wp-includes/script-loader.php
View File

@ -448,7 +448,7 @@ function wp_default_styles( &$styles ) {
$styles->add_data( 'ie', 'conditional', 'lte IE 7' ); $styles->add_data( 'ie', 'conditional', 'lte IE 7' );
// all colors stylesheets need to have the same query strings (cache manifest compat) // all colors stylesheets need to have the same query strings (cache manifest compat)
$colors_version = '20100426'; $colors_version = '20100430';
// Register "meta" stylesheet for admin colors. All colors-* style sheets should have the same version string. // Register "meta" stylesheet for admin colors. All colors-* style sheets should have the same version string.
$styles->add( 'colors', true, array(), $colors_version ); $styles->add( 'colors', true, array(), $colors_version );