From 2f9af75438c58b1aab3e66a8eee81d0168488ed6 Mon Sep 17 00:00:00 2001 From: Dries Buytaert Date: Sun, 19 Apr 2009 19:10:08 +0000 Subject: - Patch #430342 by kkaefer et al: usability improvement: changed 'site maintenance' to 'maintenance mode'. --- UPGRADE.txt | 4 ++-- includes/bootstrap.inc | 2 +- includes/menu.inc | 6 +++--- includes/theme.maintenance.inc | 2 +- modules/system/system.admin.inc | 4 ++-- modules/system/system.install | 2 +- modules/system/system.module | 8 ++++---- sites/default/default.settings.php | 2 +- update.php | 6 +++--- 9 files changed, 18 insertions(+), 18 deletions(-) diff --git a/UPGRADE.txt b/UPGRADE.txt index 9bf9bd707..38a1748db 100644 --- a/UPGRADE.txt +++ b/UPGRADE.txt @@ -43,7 +43,7 @@ Let's begin! 3. Place the site in "Offline" mode, to let the database updates run without interruption and avoid displaying errors to end users of the site. This - option is at http://www.example.com/?q=admin/settings/site-maintenance + option is at http://www.example.com/?q=admin/settings/maintenance-mode (replace www.example.com with your installation's domain name and path). 4. If using a custom or contributed theme, switch @@ -103,7 +103,7 @@ Let's begin! 14. Finally, return your site to "Online" mode so your visitors may resume browsing. As in step #3, this option is available in your administration - screens at http://www.example.com/?q=admin/settings/site-maintenance + screens at http://www.example.com/?q=admin/settings/maintenance-mode (replace www.example.com with your installation's domain name and path). For more information on upgrading visit diff --git a/includes/bootstrap.inc b/includes/bootstrap.inc index a77343adf..19231cb7e 100644 --- a/includes/bootstrap.inc +++ b/includes/bootstrap.inc @@ -1246,7 +1246,7 @@ function _drupal_bootstrap($phase) { * Enables use of the theme system without requiring database access. * * Loads and initializes the theme system for site installs, updates and when - * the site is in offline mode. This also applies when the database fails. + * the site is in maintenance mode. This also applies when the database fails. * * @see _drupal_maintenance_theme() */ diff --git a/includes/menu.inc b/includes/menu.inc index d045ca186..a935003bf 100644 --- a/includes/menu.inc +++ b/includes/menu.inc @@ -2719,15 +2719,15 @@ function menu_path_is_external($path) { * TRUE for anonymous users not on the login page if the site is offline. */ function _menu_site_is_offline() { - // Check if site is set to offline mode. + // Check if site is set to maintenance mode. if (variable_get('site_offline', 0)) { // Check if the user has administration privileges. if (user_access('administer site configuration')) { // Ensure that the offline message is displayed only once [allowing for // page redirects], and specifically suppress its display on the site // maintenance page. - if (drupal_get_normal_path($_GET['q']) != 'admin/settings/site-maintenance') { - drupal_set_message(t('Operating in offline mode. Go online.', array('@url' => url('admin/settings/site-maintenance'))), 'status', FALSE); + if (drupal_get_normal_path($_GET['q']) != 'admin/settings/maintenance-mode') { + drupal_set_message(t('Operating in maintenance mode. Go online.', array('@url' => url('admin/settings/maintenance-mode'))), 'status', FALSE); } } else { diff --git a/includes/theme.maintenance.inc b/includes/theme.maintenance.inc index 02e4f492b..f2278d670 100644 --- a/includes/theme.maintenance.inc +++ b/includes/theme.maintenance.inc @@ -8,7 +8,7 @@ /** * Sets up the theming system for site installs, updates and when the site is - * in offline mode. It also applies when the database is unavailable. + * in maintenance mode. It also applies when the database is unavailable. * * Minnelli is always used for the initial install and update operations. In * other cases, "settings.php" must have a "maintenance_theme" key set for the diff --git a/modules/system/system.admin.inc b/modules/system/system.admin.inc index a53ece88d..eb15ce009 100644 --- a/modules/system/system.admin.inc +++ b/modules/system/system.admin.inc @@ -1724,7 +1724,7 @@ function system_date_time_lookup() { * @ingroup forms * @see system_settings_form() */ -function system_site_maintenance_settings() { +function system_site_maintenance_mode() { $form['site_offline'] = array( '#type' => 'radios', @@ -1738,7 +1738,7 @@ function system_site_maintenance_settings() { '#type' => 'textarea', '#title' => t('Site offline message'), '#default_value' => t('@site is currently under maintenance. We should be back shortly. Thank you for your patience.', array('@site' => variable_get('site_name', 'Drupal'))), - '#description' => t('Message to show visitors when the site is in offline mode.') + '#description' => t('Message to show visitors when the site is in maintenance mode.') ); return system_settings_form($form, TRUE); diff --git a/modules/system/system.install b/modules/system/system.install index 1acbe72a4..3981cfdda 100644 --- a/modules/system/system.install +++ b/modules/system/system.install @@ -2812,7 +2812,7 @@ function system_update_7003() { } } if (isset($invalid_host)) { - drupal_set_message('Drupal no longer supports wildcard IP address blocking. Visitors whose IP addresses match ranges you have previously set using access rules will no longer be blocked from your site when you take it out of maintenance mode. See the IP address and referrer blocking Handbook page for alternative methods.', 'warning'); + drupal_set_message('Drupal no longer supports wildcard IP address blocking. Visitors whose IP addresses match ranges you have previously set using access rules will no longer be blocked from your site when you put the site online. See the IP address and referrer blocking Handbook page for alternative methods.', 'warning'); $ret[] = array('success' => TRUE, 'query' => ''); } // Make sure not to block any IP addresses that were specifically allowed by access rules. diff --git a/modules/system/system.module b/modules/system/system.module index 7783c240a..d40d4934c 100644 --- a/modules/system/system.module +++ b/modules/system/system.module @@ -70,7 +70,7 @@ function system_help($path, $arg) { $output .= '
  • ' . t('support for enabling and disabling themes, which determine the design and presentation of your site. Drupal comes packaged with several core themes and additional contributed themes are available at the Drupal.org theme page.', array('@themes' => url('admin/build/themes'), '@drupal-themes' => 'http://drupal.org/project/themes')) . '
    • '; $output .= '
  • ' . t('a robust caching system that allows the efficient re-use of previously-constructed web pages and web page components. Drupal stores the pages requested by anonymous users in a compressed format; depending on your site configuration and the amount of your web traffic tied to anonymous visitors, Drupal\'s caching system may significantly increase the speed of your site.', array('@cache-settings' => url('admin/settings/performance'))) . '
    • '; $output .= '
  • ' . t('a set of routine administrative operations that rely on a correctly-configured cron maintenance task to run automatically. A number of other modules, including the feed aggregator, and search also rely on cron maintenance tasks. For more information, see the online handbook entry for configuring cron jobs.', array('@cron' => url('admin/reports/status'), '@handbook' => 'http://drupal.org/cron')) . '
    • '; - $output .= '
  • ' . t('basic configuration options for your site, including date and time settings, file system settings, clean URL support, site name and other information, and a site maintenance function for taking your site temporarily offline.', array('@regional-settings' => url('admin/settings/regional-settings'), '@file-system' => url('admin/settings/file-system'), '@clean-url' => url('admin/settings/clean-urls'), '@site-info' => url('admin/settings/site-information'), '@site-maintenance' => url('admin/settings/site-maintenance'))) . '
    • '; + $output .= '
  • ' . t('basic configuration options for your site, including date and time settings, file system settings, clean URL support, site name and other information, and a maintenance mode for taking your site temporarily offline.', array('@regional-settings' => url('admin/settings/regional-settings'), '@file-system' => url('admin/settings/file-system'), '@clean-url' => url('admin/settings/clean-urls'), '@site-info' => url('admin/settings/site-information'), '@maintenance-mode' => url('admin/settings/maintenance-mode'))) . '
    • '; $output .= '

    ' . t('For more information, see the online handbook entry for System module.', array('@system' => 'http://drupal.org/handbook/modules/system/')) . '

    '; return $output; case 'admin/by-module': @@ -699,11 +699,11 @@ function system_menu() { 'page callback' => 'system_date_time_lookup', 'access arguments' => array('administer site configuration'), ); - $items['admin/settings/site-maintenance'] = array( - 'title' => 'Site maintenance', + $items['admin/settings/maintenance-mode'] = array( + 'title' => 'Maintenance mode', 'description' => 'Take the site offline for maintenance or bring it back online.', 'page callback' => 'drupal_get_form', - 'page arguments' => array('system_site_maintenance_settings'), + 'page arguments' => array('system_site_maintenance_mode'), 'access arguments' => array('administer site configuration'), ); $items['admin/settings/clean-urls'] = array( diff --git a/sites/default/default.settings.php b/sites/default/default.settings.php index a08bb0849..a5e0299c9 100644 --- a/sites/default/default.settings.php +++ b/sites/default/default.settings.php @@ -238,7 +238,7 @@ $conf = array( # 'anonymous' => 'Visitor', /** * A custom theme can be set for the offline page. This applies when the site - * is explicitly set to offline mode through the administration page or when + * is explicitly set to maintenance mode through the administration page or when * the database is inactive due to an error. It can be set through the * 'maintenance_theme' key. The template file should also be copied into the * theme. It is located inside 'modules/system/maintenance-page.tpl.php'. diff --git a/update.php b/update.php index 939949e23..e47d11507 100644 --- a/update.php +++ b/update.php @@ -290,7 +290,7 @@ function update_script_selection_form() { function update_batch() { global $base_url; - // During the update, toggle site maintenance so that schema changes do not + // During the update, bring the site offline so that schema changes do not // affect visiting users. drupal_set_session('site_offline', variable_get('site_offline', FALSE)); if ($_SESSION['site_offline'] == FALSE) { @@ -330,7 +330,7 @@ function update_finished($success, $results, $operations) { drupal_set_session('update_success', $success); drupal_set_session('updates_remaining', $operations); - // Now that the update is done, we can disable site maintenance if it was + // Now that the update is done, we can put the site back online if it was // previously turned off. if (isset($_SESSION['site_offline']) && $_SESSION['site_offline'] == FALSE) { variable_set('site_offline', FALSE); @@ -424,7 +424,7 @@ function update_info_page() { $output .= "
      \n"; $output .= "
    1. Back up your database. This process will change your database values and in case of emergency you may need to revert to a backup.
      2. \n"; $output .= "
    2. Back up your code. Hint: when backing up module code, do not leave that backup in the 'modules' or 'sites/*/modules' directories as this may confuse Drupal's auto-discovery mechanism.
      3. \n"; - $output .= '
    3. Put your site into maintenance mode.
      4. ' . "\n"; + $output .= '
    4. Put your site into maintenance mode.
      5. ' . "\n"; $output .= "
    5. Install your new files in the appropriate location, as described in the handbook.
      6. \n"; $output .= "
    \n"; $output .= "

    When you have performed the steps above, you may proceed.

    \n"; -- cgit v1.2.3