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'. --- modules/system/system.admin.inc | 4 ++-- modules/system/system.install | 2 +- modules/system/system.module | 8 ++++---- 3 files changed, 7 insertions(+), 7 deletions(-) (limited to 'modules') 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( -- cgit v1.2.3