golem
/
twentyGOLEM
9
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Move 'Search Engines Blocked' to 'Right Now' from admin header. see #17324. 

git-svn-id: http://svn.automattic.com/wordpress/trunk@17829 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
koopersmith 2011-05-06 23:42:37 +00:00
parent 2d0f305181
commit 700db493d8
5 changed files with 11 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
wp-admin/admin-header.php
View File

@ -136,9 +136,6 @@ if ( function_exists('mb_strlen') ) {
<a href="<?php echo trailingslashit( get_bloginfo( 'url' ) ); ?>" title="<?php esc_attr_e('Visit Site') ?>">
<span id="site-title"><?php echo $blog_name ?></span>
</a>
<?php if ( !is_network_admin() && !is_user_admin() && current_user_can('manage_options') && '1' != get_option('blog_public') ): ?>
<a id="privacy-on-link" href="options-privacy.php" title="<?php echo esc_attr( apply_filters('privacy_on_link_title', __('Your site is asking search engines not to index its content') ) ); ?>"><?php echo apply_filters('privacy_on_link_text', __('Search Engines Blocked') ); ?></a>
<?php endif; ?>
</h1>
<?php

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

File diff suppressed because one or more lines are too long

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

@ -948,19 +948,10 @@ form.upgrade .hint {
float: left;
}
#wphead #privacy-on-link {
font-size: 65%;
font-style: normal;
line-height: 16px;
padding: 0 6px;
vertical-align: middle;
}
#wphead h1 a:hover {
text-decoration:none;
}
#wphead h1 a:hover #site-title,
#wphead h1 a#privacy-on-link:hover {
#wphead h1 a:hover #site-title {
text-decoration:underline;
}

8
wp-admin/includes/dashboard.php
View File

@ -399,6 +399,14 @@ function wp_dashboard_right_now() {
}
echo '</p>';
// Check if search engines are blocked.
if ( !is_network_admin() && !is_user_admin() && current_user_can('manage_options') && '1' != get_option('blog_public') ) {
$title = apply_filters('privacy_on_link_title', __('Your site is asking search engines not to index its content') );
$content = apply_filters('privacy_on_link_text', __('Search Engines Blocked') );
echo "<p><a href='options-privacy.php' title='$title'>$content</a></p>";
}
update_right_now_message();
echo "\n\t".'<br class="clear" /></div>';

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

@ -485,7 +485,7 @@ function wp_default_styles( &$styles ) {
// Any rtl stylesheets that don't have a .dev version for ltr
$no_suffix = array( 'farbtastic' );
$styles->add( 'wp-admin', "/wp-admin/css/wp-admin$suffix.css", array(), '20110506c' );
$styles->add( 'wp-admin', "/wp-admin/css/wp-admin$suffix.css", array(), '20110506d' );
$styles->add( 'ie', "/wp-admin/css/ie$suffix.css", array(), '20101102' );
$styles->add_data( 'ie', 'conditional', 'lte IE 7' );