diff options
Diffstat (limited to 'modules/system')
| -rw-r--r-- | modules/system/system.admin.inc | 4 | ||||
| -rw-r--r-- | modules/system/system.js | 6 | ||||
| -rw-r--r-- | modules/system/system.module | 42 |
3 files changed, 30 insertions, 22 deletions
diff --git a/modules/system/system.admin.inc b/modules/system/system.admin.inc index 16e567b77..749d3bf1d 100644 --- a/modules/system/system.admin.inc +++ b/modules/system/system.admin.inc @@ -1839,7 +1839,7 @@ function system_clean_url_settings() { $available = TRUE; } else { - $request = drupal_http_request($base_url . '/admin/settings/clean-urls/check'); + $request = drupal_http_request($base_url . '/admin/config/search/clean-urls/check'); if (isset($request->code) && $request->code == 200) { $available = TRUE; } @@ -1859,7 +1859,7 @@ function system_clean_url_settings() { else { drupal_add_js(drupal_get_path('module', 'system') . '/system.js'); - $form['#redirect'] = $base_url . '/admin/settings/clean-urls'; + $form['#redirect'] = $base_url . '/admin/config/search/clean-urls'; $form['clean_url_description'] = array( '#type' => 'markup', '#markup' => '<p>' . t('Use URLs like <code>example.com/user</code> instead of <code>example.com/?q=user</code>.') . ' ' . t('If you are directed to a <em>Page not found (404)</em> error after testing for clean URLs, see the <a href="@handbook">online handbook</a>.', array('@handbook' => 'http://drupal.org/node/15365')) . '</p>', diff --git a/modules/system/system.js b/modules/system/system.js index e9c505de4..11aa8b4b8 100644 --- a/modules/system/system.js +++ b/modules/system/system.js @@ -35,13 +35,13 @@ Drupal.behaviors.cleanURLsSettingsCheck = { if (!($('#edit-clean-url').size()) || $('.clean-url-processed, #edit-clean-url.install').size()) { return; } - var url = settings.basePath + 'admin/settings/clean-urls/check'; + var url = settings.basePath + 'admin/config/search/clean-urls/check'; $.ajax({ url: location.protocol + '//' + location.host + url, dataType: 'json', success: function () { // Check was successful. Redirect using a "clean URL". This will force the form that allows enabling clean URLs. - location = settings.basePath +"admin/settings/clean-urls"; + location = settings.basePath +"admin/config/search/clean-urls"; } }); $('#clean-url').addClass('clean-url-processed'); @@ -56,7 +56,7 @@ Drupal.behaviors.cleanURLsSettingsCheck = { * are currently enabled. */ Drupal.cleanURLsInstallCheck = function () { - var url = location.protocol + '//' + location.host + Drupal.settings.basePath + 'admin/settings/clean-urls/check'; + var url = location.protocol + '//' + location.host + Drupal.settings.basePath + 'admin/config/search/clean-urls/check'; // Submit a synchronous request to avoid database errors associated with // concurrent requests during install. $.ajax({ diff --git a/modules/system/system.module b/modules/system/system.module index e2c4c1bb2..a6c3ae344 100644 --- a/modules/system/system.module +++ b/modules/system/system.module @@ -101,7 +101,7 @@ function system_help($path, $arg) { $output .= '<li>' . t('support for enabling and disabling <a href="@themes">themes</a>, which determine the design and presentation of your site. Drupal comes packaged with several core themes and additional contributed themes are available at the <a href="@drupal-themes">Drupal.org theme page</a>.', array('@themes' => url('admin/appearance'), '@drupal-themes' => 'http://drupal.org/project/themes')) . '</li>'; $output .= '<li>' . t('a robust <a href="@cache-settings">caching system</a> 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/config/development/performance'))) . '</li>'; $output .= '<li>' . t('a set of routine administrative operations that rely on a correctly-configured <a href="@cron">cron maintenance task</a> to run automatically. A number of other modules, including the feed aggregator, and search also rely on <a href="@cron">cron maintenance tasks</a>. For more information, see the online handbook entry for <a href="@handbook">configuring cron jobs</a>.', array('@cron' => url('admin/reports/status'), '@handbook' => 'http://drupal.org/cron')) . '</li>'; - $output .= '<li>' . t('basic configuration options for your site, including <a href="@regional-settings">date and time settings</a>, <a href="@file-system">file system settings</a>, <a href="@clean-url">clean URL support</a>, <a href="@site-info">site name and other information</a>, and a <a href="@maintenance-mode">maintenance mode</a> for taking your site temporarily offline.', array('@regional-settings' => url('admin/config/regional/settings'), '@file-system' => url('admin/config/media/file-system'), '@clean-url' => url('admin/settings/clean-urls'), '@site-info' => url('admin/settings/site-information'), '@maintenance-mode' => url('admin/config/development/maintenance'))) . '</li></ul>'; + $output .= '<li>' . t('basic configuration options for your site, including <a href="@regional-settings">date and time settings</a>, <a href="@file-system">file system settings</a>, <a href="@clean-url">clean URL support</a>, <a href="@site-info">site name and other information</a>, and a <a href="@maintenance-mode">maintenance mode</a> for taking your site temporarily offline.', array('@regional-settings' => url('admin/config/regional/settings'), '@file-system' => url('admin/config/media/file-system'), '@clean-url' => url('admin/config/search/clean-urls'), '@site-info' => url('admin/settings/site-information'), '@maintenance-mode' => url('admin/config/development/maintenance'))) . '</li></ul>'; $output .= '<p>' . t('For more information, see the online handbook entry for <a href="@system">System module</a>.', array('@system' => 'http://drupal.org/handbook/modules/system/')) . '</p>'; return $output; case 'admin/by-module': @@ -841,6 +841,30 @@ function system_menu() { 'access arguments' => array('administer site configuration'), 'file' => 'system.admin.inc', ); + $items['admin/config/search'] = array( + 'title' => 'Search and metadata', + 'description' => 'Local site search, metadata and SEO.', + 'page callback' => 'system_admin_menu_block_page', + 'access callback' => 'system_admin_menu_block_access', + 'access arguments' => array('admin/config/search', 'access administration pages'), + 'file' => 'system.admin.inc', + ); + $items['admin/config/search/clean-urls'] = array( + 'title' => 'Clean URLs', + 'description' => 'Enable or disable clean URLs for your site.', + 'page callback' => 'drupal_get_form', + 'page arguments' => array('system_clean_url_settings'), + 'access arguments' => array('administer site configuration'), + 'file' => 'system.admin.inc', + ); + $items['admin/config/search/clean-urls/check'] = array( + 'title' => 'Clean URL check', + 'page callback' => 'drupal_json', + 'page arguments' => array(array('status' => TRUE)), + 'access callback' => TRUE, + 'type' => MENU_CALLBACK, + 'file' => 'system.admin.inc', + ); // Settings. $items['admin/settings/site-information'] = array( @@ -859,22 +883,6 @@ function system_menu() { 'access arguments' => array('administer site configuration'), 'file' => 'system.admin.inc', ); - $items['admin/settings/clean-urls'] = array( - 'title' => 'Clean URLs', - 'description' => 'Enable or disable clean URLs for your site.', - 'page callback' => 'drupal_get_form', - 'page arguments' => array('system_clean_url_settings'), - 'access arguments' => array('administer site configuration'), - 'file' => 'system.admin.inc', - ); - $items['admin/settings/clean-urls/check'] = array( - 'title' => 'Clean URL check', - 'page callback' => 'drupal_json', - 'page arguments' => array(array('status' => TRUE)), - 'access callback' => TRUE, - 'type' => MENU_CALLBACK, - 'file' => 'system.admin.inc', - ); // Reports. $items['admin/reports'] = array( |