diff --git a/wp-admin/about.php b/wp-admin/about.php index be070b84a9..fbcc3634bb 100644 --- a/wp-admin/about.php +++ b/wp-admin/about.php @@ -35,7 +35,7 @@ include( './admin-header.php' );

- +
@@ -56,17 +56,17 @@ include( './admin-header.php' );

- +

- +

- +
@@ -96,11 +96,11 @@ include( './admin-header.php' );

-

+

- +
@@ -121,7 +121,7 @@ include( './admin-header.php' );

Note: if you’ve added new widgets since the switch, you’ll need to rescue them from the Inactive Widgets area.' ); ?>

- +
@@ -156,7 +156,7 @@ include( './admin-header.php' );

- +
diff --git a/wp-admin/css/install.dev.css b/wp-admin/css/install.dev.css index 259ab06006..04ff488b06 100644 --- a/wp-admin/css/install.dev.css +++ b/wp-admin/css/install.dev.css @@ -8,7 +8,7 @@ body { font-family: sans-serif; margin: 2em auto; padding: 1em 2em; - -webkit-border-radius: 3px; + -webkit-border-radius: 3px; border-radius: 3px; border: 1px solid #dfdfdf; max-width: 700px; diff --git a/wp-admin/css/wp-admin.dev.css b/wp-admin/css/wp-admin.dev.css index c36d164f3c..4a3487353b 100644 --- a/wp-admin/css/wp-admin.dev.css +++ b/wp-admin/css/wp-admin.dev.css @@ -4831,7 +4831,7 @@ input.button-highlighted, margin: 25px 40px 0 20px; min-width: 770px; max-width: 1050px; /* readability */ - + font-size: 15px; } .about-wrap div.updated, @@ -4959,7 +4959,7 @@ html.ie8 .about-wrap .feature-section .image-mask { .about-wrap .feature-section.text-features { width: 31%; - + float: left; overflow: visible; } @@ -4969,7 +4969,7 @@ html.ie8 .about-wrap .feature-section .image-mask { .about-wrap .feature-section.screenshot-features { width: 67%; margin-top: 1.33em; - + float: right; clear: none; overflow: visible; @@ -5009,7 +5009,7 @@ html.ie8 .about-wrap .feature-section .image-mask { .about-wrap .feature-section.three-col img { margin: 0.5em 0 0.5em 5px; max-width: 100%; - + float: none; } html.ie8 .about-wrap .feature-section.three-col img { diff --git a/wp-admin/edit-comments.php b/wp-admin/edit-comments.php index bd37f7f887..e232e5deb4 100644 --- a/wp-admin/edit-comments.php +++ b/wp-admin/edit-comments.php @@ -114,13 +114,13 @@ add_screen_option( 'per_page', array('label' => _x( 'Comments', 'comments per pa get_current_screen()->add_help_tab( array( 'id' => 'overview', 'title' => __('Overview'), -'content' => +'content' => '

' . __( 'You can manage comments made on your site similar to the way you manage posts and other content. This screen is customizable in the same ways as other management screens, and you can act on comments using the on-hover action links or the Bulk Actions.' ) . '

' ) ); get_current_screen()->add_help_tab( array( 'id' => 'moderating-comments', 'title' => __('Moderating Comments'), -'content' => +'content' => '' -) ); +) ); get_current_screen()->set_help_sidebar( '

' . __( 'For more information:' ) . '

' . diff --git a/wp-admin/edit-tags.php b/wp-admin/edit-tags.php index 22fdc603ba..fdb64c2479 100644 --- a/wp-admin/edit-tags.php +++ b/wp-admin/edit-tags.php @@ -223,7 +223,7 @@ if ( 'category' == $taxonomy || 'link_category' == $taxonomy || 'post_tag' == $t $help .= '
  • ' . __( 'Description - The description is not prominent by default; however, some themes may display it.' ) . '
    • ' . '' . '

    ' . __( 'You can change the display of this screen using the Screen Options tab to set how many items are displayed per screen and to display/hide columns in the table.' ) . '

    '; - + get_current_screen()->add_help_tab( array( 'id' => 'adding-terms', 'title' => 'category' == $taxonomy ? __( 'Adding Categories' ) : __( 'Adding Tags' ), diff --git a/wp-admin/edit.php b/wp-admin/edit.php index 8171b04f10..b3b6b2e859 100644 --- a/wp-admin/edit.php +++ b/wp-admin/edit.php @@ -152,13 +152,13 @@ if ( 'post' == $post_type ) { get_current_screen()->add_help_tab( array( 'id' => 'overview', 'title' => __('Overview'), - 'content' => + 'content' => '

    ' . __('This screen provides access to all of your posts. You can customize the display of this screen to suit your workflow.') . '

    ' ) ); get_current_screen()->add_help_tab( array( 'id' => 'screen-content', 'title' => __('Screen Content'), - 'content' => + 'content' => '

    ' . __('You can customize the display of this screen’s contents in a number of ways:') . '

    ' . '' ) ); get_current_screen()->add_help_tab( array( 'id' => 'bulk-actions', 'title' => __('Bulk Actions'), - 'content' => + 'content' => '

    ' . __('You can also edit or move multiple posts to the trash at once. Select the posts you want to act on using the checkboxes, then select the action you want to take from the Bulk Actions menu and click Apply.') . '

    ' . '

    ' . __('When using Bulk Edit, you can change the metadata (categories, author, etc.) for all selected posts at once. To remove a post from the grouping, just click the x next to its name in the Bulk Edit area that appears.') . '

    ' ) ); @@ -192,18 +192,18 @@ if ( 'post' == $post_type ) { '

    ' . __('Documentation on Managing Posts') . '

    ' . '

    ' . __('Support Forums') . '

    ' ); - + } elseif ( 'page' == $post_type ) { get_current_screen()->add_help_tab( array( 'id' => 'overview', 'title' => __('Overview'), - 'content' => + 'content' => '

    ' . __('Pages are similar to posts in that they have a title, body text, and associated metadata, but they are different in that they are not part of the chronological blog stream, kind of like permanent posts. Pages are not categorized or tagged, but can have a hierarchy. You can nest pages under other pages by making one the “Parent” of the other, creating a group of pages.') . '

    ' ) ); get_current_screen()->add_help_tab( array( 'id' => 'managing-pages', 'title' => __('Managing Pages'), - 'content' => + 'content' => '

    ' . __('Managing pages is very similar to managing posts, and the screens can be customized in the same way.') . '

    ' . '

    ' . __('You can also perform the same types of actions, including narrowing the list by using the filters, acting on a page using the action links that appear when you hover over a row, or using the Bulk Actions menu to edit the metadata for multiple pages at once.') . '

    ' ) ); diff --git a/wp-admin/includes/class-wp-media-list-table.php b/wp-admin/includes/class-wp-media-list-table.php index 0e29d7f688..9c63ca3267 100644 --- a/wp-admin/includes/class-wp-media-list-table.php +++ b/wp-admin/includes/class-wp-media-list-table.php @@ -303,8 +303,8 @@ foreach ( $columns as $column_name => $column_display_name ) { post_parent ) ) { ?> - , diff --git a/wp-admin/includes/dashboard.php b/wp-admin/includes/dashboard.php index 68d220c948..05b51cee3e 100644 --- a/wp-admin/includes/dashboard.php +++ b/wp-admin/includes/dashboard.php @@ -1342,7 +1342,7 @@ function wp_welcome_panel() {
  • Select a new header image' ), esc_url( admin_url( 'themes.php?page=custom-header' ) ) ); ?>
  • Add some widgets' ), esc_url( admin_url( 'widgets.php' ) ) ); ?>
    • diff --git a/wp-admin/js/common.dev.js b/wp-admin/js/common.dev.js index 0a6f49180c..b8ee100ea1 100644 --- a/wp-admin/js/common.dev.js +++ b/wp-admin/js/common.dev.js @@ -168,7 +168,7 @@ $(document).ready( function() { if ( tab ) node.attr('tabindex', '0').attr('tabindex', tab); }; - + $('#collapse-menu', menu).click(function(){ var body = $(document.body); diff --git a/wp-admin/js/editor.dev.js b/wp-admin/js/editor.dev.js index 35ff489b4a..37c792788f 100644 --- a/wp-admin/js/editor.dev.js +++ b/wp-admin/js/editor.dev.js @@ -3,14 +3,14 @@ var switchEditors = { switchto: function(el) { var aid = el.id, l = aid.length, id = aid.substr(0, l - 5), mode = aid.substr(l - 4); - + this.go(id, mode); }, - + go: function(id, mode) { // mode can be 'html', 'tmce', or 'toggle' id = id || 'content'; mode = mode || 'toggle'; - + var t = this, ed = tinyMCE.get(id), wrap_id, txtarea_el, dom = tinymce.DOM; wrap_id = 'wp-'+id+'-wrap'; @@ -21,7 +21,7 @@ var switchEditors = { mode = 'html'; else mode = 'tmce'; - } + } if ( 'tmce' == mode || 'tinymce' == mode ) { if ( ed && ! ed.isHidden() ) diff --git a/wp-admin/link-manager.php b/wp-admin/link-manager.php index 1afc2a978a..92194f0392 100644 --- a/wp-admin/link-manager.php +++ b/wp-admin/link-manager.php @@ -43,7 +43,7 @@ $this_file = $parent_file = 'link-manager.php'; get_current_screen()->add_help_tab( array( 'id' => 'overview', 'title' => __('Overview'), -'content' => +'content' => '

    ' . sprintf(__('You can add links here to be displayed on your site, usually using Widgets. By default, links to several sites in the WordPress community are included as examples.'), 'widgets.php') . '

    ' . '

    ' . __('Links may be separated into Link Categories; these are different than the categories used on your posts.') . '

    ' . '

    ' . __('You can customize the display of this screen using the Screen Options tab and/or the dropdown filters above the links table.') . '

    ' @@ -51,7 +51,7 @@ get_current_screen()->add_help_tab( array( get_current_screen()->add_help_tab( array( 'id' => 'deleting-links', 'title' => __('Deleting Links'), -'content' => +'content' => '

    ' . __('If you delete a link, it will be removed permanently, as Links do not have a Trash function yet.') . '

    ' ) ); diff --git a/wp-admin/media-upload.php b/wp-admin/media-upload.php index fb1eda5536..666c3f37e2 100644 --- a/wp-admin/media-upload.php +++ b/wp-admin/media-upload.php @@ -70,7 +70,7 @@ if ( isset($_GET['inline']) ) { '
  • ' . __('Select Files will open the multi-file uploader, or you can use the Browser Uploader.') . '
    • ' . '
  • ' . __('Clicking Select Files opens a navigation window showing you files in your operating system. Selecting Open after clicking on the file you want activates a progress bar on the uploader screen.') . '
    • ' . '' . - '

    ' . __('Basic image editing is available after upload is complete. Make sure you click Save before leaving this screen.') . '

    ' + '

    ' . __('Basic image editing is available after upload is complete. Make sure you click Save before leaving this screen.') . '

    ' ) ); get_current_screen()->set_help_sidebar( '

    ' . __('For more information:') . '

    ' . @@ -79,7 +79,7 @@ if ( isset($_GET['inline']) ) { ); require_once('./admin-header.php'); - + $form_class = 'media-upload-form type-form validate'; if ( get_user_setting('uploader') ) diff --git a/wp-admin/menu-header.php b/wp-admin/menu-header.php index fa7673f341..1fd4e5db2e 100644 --- a/wp-admin/menu-header.php +++ b/wp-admin/menu-header.php @@ -59,7 +59,7 @@ function _wp_menu_output( $menu, $submenu, $submenu_as_parent = true ) { } else { $class[] = 'wp-not-current-submenu'; if ( ! empty( $submenu_items ) ) - $aria_attributes .= ' aria-haspopup="true"'; + $aria_attributes .= ' aria-haspopup="true"'; } if ( ! empty( $item[4] ) ) diff --git a/wp-admin/nav-menus.php b/wp-admin/nav-menus.php index ef1eafc5a4..90a1e873a9 100644 --- a/wp-admin/nav-menus.php +++ b/wp-admin/nav-menus.php @@ -456,7 +456,7 @@ get_current_screen()->add_help_tab( array( get_current_screen()->add_help_tab( array( 'id' => 'create-menus', 'title' => __('Create Menus'), -'content' => +'content' => '

    ' . __('To create a new custom menu, click on the + tab, give the menu a name, and click Create Menu. Next, add menu items from the appropriate boxes. You’ll be able to edit the information for each menu item, and can drag and drop to put them in order. You can also drag a menu item a little to the right to make it a submenu, to create menus with hierarchy. Drop the item into its new nested placement when the dotted rectangle target shifts over, also a little to the right. Don’t forget to click Save when you’re finished.') . '

    ' ) ); diff --git a/wp-admin/plugin-editor.php b/wp-admin/plugin-editor.php index 196a7073ff..ef2c641010 100644 --- a/wp-admin/plugin-editor.php +++ b/wp-admin/plugin-editor.php @@ -113,7 +113,7 @@ default: get_current_screen()->add_help_tab( array( 'id' => 'overview', 'title' => __('Overview'), - 'content' => + 'content' => '

    ' . __('You can use the editor to make changes to any of your plugins’ individual PHP files. Be aware that if you make changes, plugins updates will overwrite your customizations.') . '

    ' . '

    ' . __('Choose a plugin to edit from the menu in the upper right and click the Select button. Click once on any file name to load it in the editor, and make your changes. Don’t forget to save your changes (Update File) when you’re finished.') . '

    ' . '

    ' . __('The Documentation menu below the editor lists the PHP functions recognized in the plugin file. Clicking Lookup takes you to a web page about that particular function.') . '

    ' . diff --git a/wp-admin/plugin-install.php b/wp-admin/plugin-install.php index 70905b96e6..87f563b09a 100644 --- a/wp-admin/plugin-install.php +++ b/wp-admin/plugin-install.php @@ -38,13 +38,13 @@ do_action('install_plugins_pre_' . $tab); //Used to override the general interfa get_current_screen()->add_help_tab( array( 'id' => 'overview', 'title' => __('Overview'), -'content' => +'content' => '

    ' . sprintf(__('Plugins hook into WordPress to extend its functionality with custom features. Plugins are developed independently from the core WordPress application by thousands of developers all over the world. All plugins in the official WordPress.org Plugin Directory are compatible with the license WordPress uses. You can find new plugins to install by searching or browsing the Directory right here in your own Plugins section.'), 'http://wordpress.org/extend/plugins/') . '

    ' ) ); get_current_screen()->add_help_tab( array( 'id' => 'adding-plugins', 'title' => __('Adding Plugins'), -'content' => +'content' => '

    ' . __('If you know what you’re looking for, Search is your best bet. The Search screen has options to search the WordPress.org Plugin Directory for a particular Term, Author, or Tag. You can also search the directory by selecting a popular tags. Tags in larger type mean more plugins have been labeled with that tag.') . '

    ' . '

    ' . __('If you just want to get an idea of what’s available, you can browse Featured, Popular, Newest, and Recently Updated plugins by using the links in the upper left of the screen. These sections rotate regularly.') . '

    ' . '

    ' . __('If you want to install a plugin that you’ve downloaded elsewhere, click the Upload in the upper left. You will be prompted to upload the .zip package, and once uploaded, you can activate the new plugin.') . '

    ' diff --git a/wp-admin/plugins.php b/wp-admin/plugins.php index 2cb23baa9e..00b53afe6e 100644 --- a/wp-admin/plugins.php +++ b/wp-admin/plugins.php @@ -321,14 +321,14 @@ add_screen_option( 'per_page', array('label' => _x( 'Plugins', 'plugins per page get_current_screen()->add_help_tab( array( 'id' => 'overview', 'title' => __('Overview'), -'content' => +'content' => '

    ' . __('Plugins extend and expand the functionality of WordPress. Once a plugin is installed, you may activate it or deactivate it here.') . '

    ' . '

    ' . sprintf(__('You can find additional plugins for your site by using the Plugin Browser/Installer functionality or by browsing the WordPress Plugin Directory directly and installing new plugins manually. To manually install a plugin you generally just need to upload the plugin file into your /wp-content/plugins directory. Once a plugin has been installed, you can activate it here.'), 'plugin-install.php', 'http://wordpress.org/extend/plugins/') . '

    ' ) ); get_current_screen()->add_help_tab( array( 'id' => 'compatibility-problems', 'title' => __('Troubleshooting'), -'content' => +'content' => '

    ' . __('Most of the time, plugins play nicely with the core of WordPress and with other plugins. Sometimes, though, a plugin’s code will get in the way of another plugin, causing compatibility issues. If your site starts doing strange things, this may be the problem. Try deactivating all your plugins and re-activating them in various combinations until you isolate which one(s) caused the issue.') . '

    ' . '

    ' . sprintf( __('If something goes wrong with a plugin and you can’t use WordPress, delete or rename that file in the %s directory and it will be automatically deactivated.'), WP_PLUGIN_DIR) . '

    ' ) ); diff --git a/wp-admin/theme-editor.php b/wp-admin/theme-editor.php index a0aaac28b7..7b31745b4d 100644 --- a/wp-admin/theme-editor.php +++ b/wp-admin/theme-editor.php @@ -23,7 +23,7 @@ $parent_file = 'themes.php'; get_current_screen()->add_help_tab( array( 'id' => 'overview', 'title' => __('Overview'), -'content' => +'content' => '

    ' . __('You can use the Theme Editor to edit the individual CSS and PHP files which make up your theme.') . '

    ' . __('Begin by choosing a theme to edit from the dropdown menu and clicking Select. A list then appears of all the template files. Clicking once on any file name causes the file to appear in the large Editor box.') . '

    ' . __('For PHP files, you can use the Documentation dropdown to select from functions recognized in that file. Lookup takes you to a web page with reference material about that particular function.') . '

    diff --git a/wp-admin/update-core.php b/wp-admin/update-core.php index 2f583af786..c8de30815e 100644 --- a/wp-admin/update-core.php +++ b/wp-admin/update-core.php @@ -44,7 +44,7 @@ function list_core_update( $update ) { $submit = __('Re-install Now'); $form_action = 'update-core.php?action=do-core-reinstall'; } else { - $php_compat = version_compare( $php_version, $update->php_version, '>=' ); + $php_compat = version_compare( $php_version, $update->php_version, '>=' ); if ( file_exists( WP_CONTENT_DIR . '/db.php' ) && empty( $wpdb->is_mysql ) ) $mysql_compat = true; else @@ -435,7 +435,7 @@ $parent_file = 'tools.php'; get_current_screen()->add_help_tab( array( 'id' => 'overview', 'title' => __('Overview'), -'content' => +'content' => '

    ' . __('This screen lets you update to the latest version of WordPress as well as update your themes and plugins from the WordPress.org repository. When updates are available, the number of available updates will appear in a bubble on the left hand menu as a notification.') . '

    ' . '

    ' . __('It is very important to keep your WordPress installation up to date for security reasons, so when you see a number appear, make sure you take the time to update, which is an easy process.') . '

    ' ) ); @@ -443,7 +443,7 @@ get_current_screen()->add_help_tab( array( get_current_screen()->add_help_tab( array( 'id' => 'how-to-update', 'title' => __('How to Update'), -'content' => +'content' => '

    ' . __('Updating your WordPress installation is a simple one-click procedure; just click on the Update button when it says a new version is available.') . '

    ' . '

    ' . __('To update themes or plugins from this screen, use the checkboxes to make your selection and click on the appropriate Update button. Check the box at the top of the Themes or Plugins section to select all and update them all at once.') . '

    ' ) ); diff --git a/wp-admin/upload.php b/wp-admin/upload.php index 20d3e30aa2..63771a83aa 100644 --- a/wp-admin/upload.php +++ b/wp-admin/upload.php @@ -148,7 +148,7 @@ add_screen_option( 'per_page', array('label' => _x( 'Media items', 'items per pa get_current_screen()->add_help_tab( array( 'id' => 'overview', 'title' => __('Overview'), -'content' => +'content' => '

    ' . __( 'All the files you’ve uploaded are listed in the Media Library, with the most recent uploads listed first. You can use the Screen Options tab to customize the display of this screen.' ) . '

    ' . '

    ' . __( 'You can narrow the list by file type/status using the text link filters at the top of the screen. You also can refine the list by date using the dropdown menu above the media table.' ) . '

    ' ) ); diff --git a/wp-admin/user-new.php b/wp-admin/user-new.php index 8dd4e7dbdd..43c37033e0 100644 --- a/wp-admin/user-new.php +++ b/wp-admin/user-new.php @@ -151,15 +151,15 @@ if ( is_multisite() ) { $help .= '

    ' . __('Remember to click the Add New User button at the bottom of this screen when you are finished.') . '

    '; -get_current_screen()->add_help_tab( array( - 'id' => 'overview', - 'title' => __('Overview'), +get_current_screen()->add_help_tab( array( + 'id' => 'overview', + 'title' => __('Overview'), 'content' => $help, ) ); -get_current_screen()->add_help_tab( array( -'id' => 'user-roles', -'title' => __('User Roles'), +get_current_screen()->add_help_tab( array( +'id' => 'user-roles', +'title' => __('User Roles'), 'content' => '

    ' . __('Here is a basic overview of the different user roles and the permissions associated with each one:') . '

    ' . '