diff options
| -rw-r--r-- | modules/search/search.admin.inc | 6 | ||||
| -rw-r--r-- | modules/search/search.api.php | 5 | ||||
| -rw-r--r-- | modules/search/search.module | 8 | ||||
| -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 |
6 files changed, 40 insertions, 31 deletions
diff --git a/modules/search/search.admin.inc b/modules/search/search.admin.inc index 4e8cece46..5e5ec4056 100644 --- a/modules/search/search.admin.inc +++ b/modules/search/search.admin.inc @@ -11,7 +11,7 @@ */ function search_reindex_confirm() { return confirm_form(array(), t('Are you sure you want to re-index the site?'), - 'admin/settings/search', t(' The search index is not cleared but systematically updated to reflect the new settings. Searching will continue to work but new content won\'t be indexed until all existing content has been re-indexed. This action cannot be undone.'), t('Re-index site'), t('Cancel')); + 'admin/config/search/settings', t(' The search index is not cleared but systematically updated to reflect the new settings. Searching will continue to work but new content won\'t be indexed until all existing content has been re-indexed. This action cannot be undone.'), t('Re-index site'), t('Cancel')); } /** @@ -21,7 +21,7 @@ function search_reindex_confirm_submit(&$form, &$form_state) { if ($form['confirm']) { search_reindex(); drupal_set_message(t('The index will be rebuilt.')); - $form_state['redirect'] = 'admin/settings/search'; + $form_state['redirect'] = 'admin/config/search/settings'; return; } } @@ -112,5 +112,5 @@ function search_admin_settings_submit($form, &$form_state) { */ function search_admin_reindex_submit($form, &$form_state) { // send the user to the confirmation page - $form_state['redirect'] = 'admin/settings/search/reindex'; + $form_state['redirect'] = 'admin/config/search/settings/reindex'; }
\ No newline at end of file diff --git a/modules/search/search.api.php b/modules/search/search.api.php index 03a0016d3..1e88f4884 100644 --- a/modules/search/search.api.php +++ b/modules/search/search.api.php @@ -35,7 +35,8 @@ * @param $op * A string defining which operation to perform: * - 'admin': The hook should return a form array containing any fieldsets the - * module wants to add to the Search settings page at admin/settings/search. + * module wants to add to the Search settings page at + * admin/config/search/settings. * - 'name': The hook should return a translated name defining the type of * items that are searched for with this module ('content', 'users', ...). * - 'reset': The search index is going to be rebuilt. Modules which use @@ -51,7 +52,7 @@ * @return * This varies depending on the operation. * - 'admin': The form array for the Search settings page at - * admin/settings/search. + * admin/config/search/settings. * - 'name': The translated string of 'Content'. * - 'reset': None. * - 'search': An array of search results. To use the default search result diff --git a/modules/search/search.module b/modules/search/search.module index 2038765f5..da30e3d55 100644 --- a/modules/search/search.module +++ b/modules/search/search.module @@ -97,10 +97,10 @@ function search_help($path, $arg) { switch ($path) { case 'admin/help#search': $output = '<p>' . t('The search module adds the ability to search for content by keywords. Search is often the only practical way to find content on a large site, and is useful for finding both users and posts.') . '</p>'; - $output .= '<p>' . t('To provide keyword searching, the search engine maintains an index of words found in your site\'s content. To build and maintain this index, a correctly configured <a href="@cron">cron maintenance task</a> is required. Indexing behavior can be adjusted using the <a href="@searchsettings">search settings page</a>; for example, the <em>Number of items to index per cron run</em> sets the maximum number of items indexed in each pass of a <a href="@cron">cron maintenance task</a>. If necessary, reduce this number to prevent timeouts and memory errors when indexing.', array('@cron' => url('admin/reports/status'), '@searchsettings' => url('admin/settings/search'))) . '</p>'; + $output .= '<p>' . t('To provide keyword searching, the search engine maintains an index of words found in your site\'s content. To build and maintain this index, a correctly configured <a href="@cron">cron maintenance task</a> is required. Indexing behavior can be adjusted using the <a href="@searchsettings">search settings page</a>; for example, the <em>Number of items to index per cron run</em> sets the maximum number of items indexed in each pass of a <a href="@cron">cron maintenance task</a>. If necessary, reduce this number to prevent timeouts and memory errors when indexing.', array('@cron' => url('admin/reports/status'), '@searchsettings' => url('admin/config/search/settings'))) . '</p>'; $output .= '<p>' . t('For more information, see the online handbook entry for <a href="@search">Search module</a>.', array('@search' => 'http://drupal.org/handbook/modules/search/')) . '</p>'; return $output; - case 'admin/settings/search': + case 'admin/config/search/settings': return '<p>' . t('The search engine maintains an index of words found in your site\'s content. To build and maintain this index, a correctly configured <a href="@cron">cron maintenance task</a> is required. Indexing behavior can be adjusted using the settings below.', array('@cron' => url('admin/reports/status'))) . '</p>'; case 'search#noresults': return t('<ul> @@ -192,7 +192,7 @@ function search_menu() { 'type' => MENU_SUGGESTED_ITEM, 'file' => 'search.pages.inc', ); - $items['admin/settings/search'] = array( + $items['admin/config/search/settings'] = array( 'title' => 'Search settings', 'description' => 'Configure relevance settings for search and other indexing options', 'page callback' => 'drupal_get_form', @@ -201,7 +201,7 @@ function search_menu() { 'type' => MENU_NORMAL_ITEM, 'file' => 'search.admin.inc', ); - $items['admin/settings/search/reindex'] = array( + $items['admin/config/search/settings/reindex'] = array( 'title' => 'Clear index', 'page callback' => 'drupal_get_form', 'page arguments' => array('search_reindex_confirm'), 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( |