From 5ca70d0b8325af50ee82b2404a7831331214dc69 Mon Sep 17 00:00:00 2001 From: Andrew Nacin Date: Sat, 18 Dec 2010 18:02:11 +0000 Subject: [PATCH] Merge the help strings across the network/site- pages. see #15880. git-svn-id: https://develop.svn.wordpress.org/trunk@17044 602fd350-edb4-49c9-b593-d223f7449a82 --- wp-admin/network/site-info.php | 6 ++++-- wp-admin/network/site-settings.php | 4 +++- wp-admin/network/site-themes.php | 8 +++++--- wp-admin/network/site-users.php | 4 +++- 4 files changed, 15 insertions(+), 7 deletions(-) diff --git a/wp-admin/network/site-info.php b/wp-admin/network/site-info.php index b4db1694b6..a21cc8bded 100644 --- a/wp-admin/network/site-info.php +++ b/wp-admin/network/site-info.php @@ -18,8 +18,10 @@ if ( ! current_user_can( 'manage_sites' ) ) add_contextual_help($current_screen, '

' . __('The menu is for editing information specific to individual sites, particularly if the admin area of a site is unavailable.') . '

' . - '

' . __('Info - The domain and path are rarely edited as this can cause the site to not work properly. The Registered date and Last Updated date are displayed. Network admins can mark a site as Archived, Spammed, Deleted and Mature, to remove from public listings or disable.') . '

' . - '

' . __('See the contextual help on the next tab.') . '

' . + '

' . __('Info - The domain and path are rarely edited as this can cause the site to not work properly. The Registered date and Last Updated date are displayed. Network admins can mark a site as archived, spam, deleted and mature, to remove from public listings or disable.') . '

' . + '

' . __('Users - This displays the users associated with this site. You can also change their role, reset their password, or remove them from the site. Removing the user from the site does not remove the user from the network.') . '

' . + '

' . sprintf( __('Themes - This area shows themes that are not already enabled across the network. Enabling a theme in this menu makes it accessible to this site. It does not activate the theme, but allows it to show in the site’s Appearance menu. To enable a theme for the entire network, see the Network Themes screen.' ), network_admin_url( 'themes.php' ) ) . '

' . + '

' . __('Settings - This page shows a list of all settings associated with this site. Some are created by WordPress and others are created by plugins you activate. Note that some fields are grayed out and say Serialized Data. You cannot modify these values due to the way the setting is stored in the database.') . '

' . '

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

' . '

' . __('Documentation on Network Settings') . '

' . '

' . __('Support Forums') . '

' diff --git a/wp-admin/network/site-settings.php b/wp-admin/network/site-settings.php index 2008049c0f..c3bb89e62f 100644 --- a/wp-admin/network/site-settings.php +++ b/wp-admin/network/site-settings.php @@ -18,8 +18,10 @@ if ( ! current_user_can( 'manage_sites' ) ) add_contextual_help($current_screen, '

' . __('The menu is for editing information specific to individual sites, particularly if the admin area of a site is unavailable.') . '

' . + '

' . __('Info - The domain and path are rarely edited as this can cause the site to not work properly. The Registered date and Last Updated date are displayed. Network admins can mark a site as archived, spam, deleted and mature, to remove from public listings or disable.') . '

' . + '

' . __('Users - This displays the users associated with this site. You can also change their role, reset their password, or remove them from the site. Removing the user from the site does not remove the user from the network.') . '

' . + '

' . sprintf( __('Themes - This area shows themes that are not already enabled across the network. Enabling a theme in this menu makes it accessible to this site. It does not activate the theme, but allows it to show in the site’s Appearance menu. To enable a theme for the entire network, see the Network Themes screen.' ), network_admin_url( 'themes.php' ) ) . '

' . '

' . __('Settings - This page shows a list of all settings associated with this site. Some are created by WordPress and others are created by plugins you activate. Note that some fields are grayed out and say Serialized Data. You cannot modify these values due to the way the setting is stored in the database.') . '

' . - '

' . __('See the contextual help on the next tab.') . '

' . '

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

' . '

' . __('Documentation on Network Settings') . '

' . '

' . __('Support Forums') . '

' diff --git a/wp-admin/network/site-themes.php b/wp-admin/network/site-themes.php index 0052ce0819..037cb30c4b 100644 --- a/wp-admin/network/site-themes.php +++ b/wp-admin/network/site-themes.php @@ -23,9 +23,11 @@ if ( ! current_user_can( 'manage_sites' ) ) add_contextual_help($current_screen, '

' . __('The menu is for editing information specific to individual sites, particularly if the admin area of a site is unavailable.') . '

' . - '

' . __('Themes - This area shows themes that are not already enabled across the network. Enabling a theme in this menu makes it accessible to this site. It does not activate the theme, but allows it to show in the site’s Appearance menu.') . '

' . - '

' . sprintf( __( 'To enable a theme for the entire network, see the Network Themes screen.' ), network_admin_url( 'themes.php' ) ) . '

' . - '

' . __('See the contextual help on the next tab.') . '

' . + '

' . __('Info - The domain and path are rarely edited as this can cause the site to not work properly. The Registered date and Last Updated date are displayed. Network admins can mark a site as archived, spam, deleted and mature, to remove from public listings or disable.') . '

' . + '

' . __('Users - This displays the users associated with this site. You can also change their role, reset their password, or remove them from the site. Removing the user from the site does not remove the user from the network.') . '

' . + '

' . sprintf( __('Themes - This area shows themes that are not already enabled across the network. Enabling a theme in this menu makes it accessible to this site. It does not activate the theme, but allows it to show in the site’s Appearance menu. To enable a theme for the entire network, see the Network Themes screen.' ), network_admin_url( 'themes.php' ) ) . '

' . + '

' . __('Settings - This page shows a list of all settings associated with this site. Some are created by WordPress and others are created by plugins you activate. Note that some fields are grayed out and say Serialized Data. You cannot modify these values due to the way the setting is stored in the database.') . '

' . + '

' . __('See the contextual help on the other tabs.') . '

' . '

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

' . '

' . __('Network Options Documentation') . '

' . '

' . __('Support Forums') . '

' diff --git a/wp-admin/network/site-users.php b/wp-admin/network/site-users.php index 2bb9f83d46..e85562f7de 100644 --- a/wp-admin/network/site-users.php +++ b/wp-admin/network/site-users.php @@ -23,8 +23,10 @@ $action = $wp_list_table->current_action(); add_contextual_help($current_screen, '

' . __('The menu is for editing information specific to individual sites, particularly if the admin area of a site is unavailable.') . '

' . + '

' . __('Info - The domain and path are rarely edited as this can cause the site to not work properly. The Registered date and Last Updated date are displayed. Network admins can mark a site as archived, spam, deleted and mature, to remove from public listings or disable.') . '

' . '

' . __('Users - This displays the users associated with this site. You can also change their role, reset their password, or remove them from the site. Removing the user from the site does not remove the user from the network.') . '

' . - '

' . __('See the contextual help on the next tab.') . '

' . + '

' . sprintf( __('Themes - This area shows themes that are not already enabled across the network. Enabling a theme in this menu makes it accessible to this site. It does not activate the theme, but allows it to show in the site’s Appearance menu. To enable a theme for the entire network, see the Network Themes screen.' ), network_admin_url( 'themes.php' ) ) . '

' . + '

' . __('Settings - This page shows a list of all settings associated with this site. Some are created by WordPress and others are created by plugins you activate. Note that some fields are grayed out and say Serialized Data. You cannot modify these values due to the way the setting is stored in the database.') . '

' . '

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

' . '

' . __('Documentation on Network Settings') . '

' . '

' . __('Support Forums') . '

'