From d24d954479320116bc01f332c28a8eaab28c3ccd Mon Sep 17 00:00:00 2001 From: Dries Buytaert Date: Mon, 20 Jul 2009 18:51:36 +0000 Subject: - Patch #521474 by bangpound, JuliaKM et al: rename admin/site-building to admin/structure. --- modules/system/system.admin.inc | 20 ++++++++--------- modules/system/system.css | 4 ++-- modules/system/system.install | 10 ++++----- modules/system/system.module | 48 ++++++++++++++++++++--------------------- modules/system/system.test | 34 ++++++++++++++--------------- 5 files changed, 58 insertions(+), 58 deletions(-) (limited to 'modules/system') diff --git a/modules/system/system.admin.inc b/modules/system/system.admin.inc index 8b99c8d0b..834cea968 100644 --- a/modules/system/system.admin.inc +++ b/modules/system/system.admin.inc @@ -63,7 +63,7 @@ function system_main_admin_page($arg = NULL) { /** * Provide a single block from the administration menu as a page. * This function is often a destination for these blocks. - * For example, 'admin/build/types' needs to have a destination to be valid + * For example, 'admin/structure/types' needs to have a destination to be valid * in the Drupal menu system, but too much information there might be * hidden, so we supply the contents of the block. * @@ -167,7 +167,7 @@ function system_themes_form() { $options[$theme->name] = $theme->info['name']; if (!empty($theme->status) || $theme->name == variable_get('admin_theme', 0)) { - $form[$theme->name]['operations'] = array('#markup' => l(t('configure'), 'admin/build/themes/settings/' . $theme->name) ); + $form[$theme->name]['operations'] = array('#markup' => l(t('configure'), 'admin/structure/themes/settings/' . $theme->name) ); } else { // Dummy element for drupal_render. Cleaner than adding a check in the theme function. @@ -293,7 +293,7 @@ function system_themes_form_submit($form, &$form_state) { menu_rebuild(); drupal_theme_rebuild(); drupal_set_message(t('The configuration options have been saved.')); - $form_state['redirect'] = 'admin/build/themes'; + $form_state['redirect'] = 'admin/structure/themes'; // Notify locale module about new themes being enabled, so translations can // be imported. This might start a batch, and only return to the redirect @@ -652,7 +652,7 @@ function system_modules($form_state = array()) { '#type' => 'submit', '#value' => t('Save configuration'), ); - $form['#action'] = url('admin/build/modules/list/confirm'); + $form['#action'] = url('admin/structure/modules/list/confirm'); return $form; } @@ -774,7 +774,7 @@ function system_modules_confirm_form($modules, $storage) { $form = confirm_form( $form, t('Some required modules must be enabled'), - 'admin/build/modules', + 'admin/structure/modules', t('Would you like to continue with enabling the above?'), t('Continue'), t('Cancel')); @@ -924,7 +924,7 @@ function system_modules_submit($form, &$form_state) { drupal_clear_css_cache(); drupal_clear_js_cache(); - $form_state['redirect'] = 'admin/build/modules'; + $form_state['redirect'] = 'admin/structure/modules'; // Notify locale module about module changes, so translations can be // imported. This might start a batch, and only return to the redirect @@ -990,7 +990,7 @@ function system_modules_uninstall($form_state = NULL) { '#type' => 'submit', '#value' => t('Uninstall'), ); - $form['#action'] = url('admin/build/modules/uninstall/confirm'); + $form['#action'] = url('admin/structure/modules/uninstall/confirm'); } else { $form['modules'] = array(); @@ -1031,7 +1031,7 @@ function system_modules_uninstall_confirm_form($storage) { $form = confirm_form( $form, t('Confirm uninstall'), - 'admin/build/modules/uninstall', + 'admin/structure/modules/uninstall', t('Would you like to continue with uninstalling the above?'), t('Uninstall'), t('Cancel')); @@ -1046,7 +1046,7 @@ function system_modules_uninstall_validate($form, &$form_state) { // Form submitted, but no modules selected. if (!count(array_filter($form_state['values']['uninstall']))) { drupal_set_message(t('No modules selected.'), 'error'); - drupal_goto('admin/build/modules/uninstall'); + drupal_goto('admin/structure/modules/uninstall'); } } @@ -1064,7 +1064,7 @@ function system_modules_uninstall_submit($form, &$form_state) { drupal_set_message(t('The selected modules have been uninstalled.')); unset($form_state['storage']); - $form_state['redirect'] = 'admin/build/modules/uninstall'; + $form_state['redirect'] = 'admin/structure/modules/uninstall'; } else { $form_state['storage'] = $form_state['values']; diff --git a/modules/system/system.css b/modules/system/system.css index 1032618ff..beaf2503b 100644 --- a/modules/system/system.css +++ b/modules/system/system.css @@ -505,14 +505,14 @@ html.js .js-hide { } /* -** Styles for the system modules page (admin/build/modules) +** Styles for the system modules page (admin/structure/modules) */ #system-modules div.incompatible { font-weight: bold; } /* -** Styles for the system themes page (admin/build/themes) +** Styles for the system themes page (admin/structure/themes) */ #system-themes-form div.incompatible { font-weight: bold; diff --git a/modules/system/system.install b/modules/system/system.install index c1ab41c16..748e7a302 100644 --- a/modules/system/system.install +++ b/modules/system/system.install @@ -272,7 +272,7 @@ function system_requirements($phase) { $requirements['update status'] = array( 'value' => $t('Not enabled'), 'severity' => REQUIREMENT_WARNING, - 'description' => $t('Update notifications are not enabled. It is highly recommended that you enable the update status module from the module administration page in order to stay up-to-date on new releases. For more information please read the Update status handbook page.', array('@update' => 'http://drupal.org/handbook/modules/update', '@module' => url('admin/build/modules'))), + 'description' => $t('Update notifications are not enabled. It is highly recommended that you enable the update status module from the module administration page in order to stay up-to-date on new releases. For more information please read the Update status handbook page.', array('@update' => 'http://drupal.org/handbook/modules/update', '@module' => url('admin/structure/modules'))), ); } else { @@ -2024,7 +2024,7 @@ function system_update_7021() { // Add contact help block for themes, which had blocks. $ret[] = update_sql("INSERT INTO {block} (module, delta, theme, status, weight, region, visibility, pages, cache) VALUES ('block', '" . $bid . "', '" . $theme . "', 1, 5, 'help', 1, 'contact', -1)"); } - drupal_set_message('The contact form information setting was migrated to a custom block and set up to only show on the site-wide contact page. The block was set to use the default text format, which might differ from the HTML based format used before. Please check the block and ensure that the output is right.'); + drupal_set_message('The contact form information setting was migrated to a custom block and set up to only show on the site-wide contact page. The block was set to use the default text format, which might differ from the HTML based format used before. Please check the block and ensure that the output is right.'); } // Migrate user help setting. @@ -2034,7 +2034,7 @@ function system_update_7021() { // Add user registration help block for themes, which had blocks. $ret[] = update_sql("INSERT INTO {block} (module, delta, theme, status, weight, region, visibility, pages, cache) VALUES ('block', '" . $bid . "', '" . $theme . "', 1, 5, 'help', 1, 'user/register', -1)"); } - drupal_set_message('The user registration guidelines were migrated to a custom block and set up to only show on the user registration page. The block was set to use the default text format, which might differ from the HTML based format used before. Please check the block and ensure that the output is right.'); + drupal_set_message('The user registration guidelines were migrated to a custom block and set up to only show on the user registration page. The block was set to use the default text format, which might differ from the HTML based format used before. Please check the block and ensure that the output is right.'); } // Migrate site mission setting. @@ -2044,7 +2044,7 @@ function system_update_7021() { // Add mission block for themes, which had blocks. $ret[] = update_sql("INSERT INTO {block} (module, delta, theme, status, weight, region, visibility, pages, cache) VALUES ('block', '" . $bid . "', '" . $theme . "', 1, 0, 'highlight', 1, '', -1)"); } - drupal_set_message('The site mission was migrated to a custom block and set up to only show on the front page in the highlighted content region. The block was set to use the default text format, which might differ from the HTML based format used before. Please check the block and ensure that the output is right. If your theme does not have a highlighted content region, you might need to relocate the block.'); + drupal_set_message('The site mission was migrated to a custom block and set up to only show on the front page in the highlighted content region. The block was set to use the default text format, which might differ from the HTML based format used before. Please check the block and ensure that the output is right. If your theme does not have a highlighted content region, you might need to relocate the block.'); // Migrate mission to RSS site description. variable_set('feed_description', $mission); } @@ -2058,7 +2058,7 @@ function system_update_7021() { // before the other blocks). $ret[] = update_sql("INSERT INTO {block} (module, delta, theme, status, weight, region, pages, cache) VALUES ('block', '" . $bid . "', '" . $theme . "', 1, -10, 'footer', '', -1)"); } - drupal_set_message('The footer message was migrated to a custom block and set up to appear in the footer. The block was set to use the default text format, which might differ from the HTML based format used before. Please check the block and ensure that the output is right. If your theme does not have a footer region, you might need to relocate the block.'); + drupal_set_message('The footer message was migrated to a custom block and set up to appear in the footer. The block was set to use the default text format, which might differ from the HTML based format used before. Please check the block and ensure that the output is right. If your theme does not have a footer region, you might need to relocate the block.'); } // Remove the variables (even if they were saved empty on the admin interface), diff --git a/modules/system/system.module b/modules/system/system.module index 2e392ea3c..1137cc087 100644 --- a/modules/system/system.module +++ b/modules/system/system.module @@ -92,8 +92,8 @@ function system_help($path, $arg) { case 'admin/help#system': $output = '

' . t('The system module is at the foundation of your Drupal website, and provides basic but extensible functionality for use by other modules and themes. Some integral elements of Drupal are contained in and managed by the system module, including caching, enabling or disabling of modules and themes, preparing and displaying the administrative page, and configuring fundamental site settings. A number of key system maintenance operations are also part of the system module.') . '

'; $output .= '

' . t('The system module provides:') . '

'; - $output .= '