#580868 by anarcat and Dave Reid: Make 'Modules' its own top-level admin link.

3 files changed, 16 insertions, 16 deletions

diff --git a/modules/update/update.compare.inc b/modules/update/update.compare.inc
index 18c6c7dc6..9a7c732f1 100644
--- a/modules/update/update.compare.inc
+++ b/modules/update/update.compare.inc
@@ -741,7 +741,7 @@ function update_project_cache($cid) {
   // On certain paths, we should clear the cache and recompute the projects or
   // update status of the site to avoid presenting stale information.
   $q = $_GET['q'];
-  $paths = array('admin/config/modules', 'admin/appearance', 'admin/reports', 'admin/reports/updates', 'admin/reports/status', 'admin/reports/updates/check');
+  $paths = array('admin/modules', 'admin/appearance', 'admin/reports', 'admin/reports/updates', 'admin/reports/status', 'admin/reports/updates/check');
   if (in_array($q, $paths)) {
     _update_cache_clear($cid);
   }
diff --git a/modules/update/update.module b/modules/update/update.module
index 9611a45c4..347f66e59 100644
--- a/modules/update/update.module
+++ b/modules/update/update.module
@@ -80,7 +80,7 @@ function update_help($path, $arg) {
       return '<p>' . t('Here you can find information about available updates for your installed modules and themes. Note that each module or theme is part of a "project", which may or may not have the same name, and might include multiple modules or themes within it.') . '</p>';
 
     case 'admin/appearance':
-    case 'admin/config/modules':
+    case 'admin/modules':
       module_load_install('update');
       $status = update_requirements('runtime');
       foreach (array('core', 'contrib') as $report_type) {
@@ -97,8 +97,8 @@ function update_help($path, $arg) {
 
     case 'admin/appearance/update':
     case 'admin/appearance/install':
-    case 'admin/config/modules/update':
-    case 'admin/config/modules/install':
+    case 'admin/modules/update':
+    case 'admin/modules/install':
     case 'admin/reports/updates/update':
     case 'admin/reports/updates/install':
     case 'admin/reports/updates/settings':
@@ -110,7 +110,7 @@ function update_help($path, $arg) {
     case 'admin/help#update':
       $output = '';
       $output .= '<h3>' . t('About') . '</h3>';
-      $output .= '<p>' . t("The Update manager module periodically checks for new versions of your site's software (including contributed modules and themes), and alerts administrators to available updates. In order to provide update information, anonymous usage statistics are sent to Drupal.org. If desired, you may disable the Update manager module from the <a href='@modules'>Module administration page</a>. For more information, see the online handbook entry for <a href='@update'>Update manager module</a>.", array('@update' => 'http://drupal.org/handbook/modules/update', '@modules' => url('admin/config/modules'))) . '</p>';
+      $output .= '<p>' . t("The Update manager module periodically checks for new versions of your site's software (including contributed modules and themes), and alerts administrators to available updates. In order to provide update information, anonymous usage statistics are sent to Drupal.org. If desired, you may disable the Update manager module from the <a href='@modules'>Module administration page</a>. For more information, see the online handbook entry for <a href='@update'>Update manager module</a>.", array('@update' => 'http://drupal.org/handbook/modules/update', '@modules' => url('admin/modules'))) . '</p>';
       // Only explain the Update manager if it has not been disabled.
       if (update_manager_access()) {
         $output .= '<p>' . t('The Update manager also allows administrators to update and install modules and themes through the administration interface.') . '</p>';
@@ -122,9 +122,9 @@ function update_help($path, $arg) {
       // Only explain the Update manager if it has not been disabled.
       if (update_manager_access()) {
         $output .= '<dt>' . t('Performing updates through the user interface') . '</dt>';
-        $output .= '<dd>' . t('The Update manager module allows administrators to perform updates directly through the administration interface. At the top of the <a href="@modules_page">modules</a> and <a href="@themes_page">themes</a> pages you will see a link to update to new releases. This will direct you to the <a href="@update-page">update page</a> where you see a listing of all the missing updates and confirm which ones you want to upgrade. From there, you are prompted for your FTP/SSH password, which then transfers the files into your Drupal installation, overwriting your old files. More detailed instructions can be found in the <a href="@update">online handbook</a>.', array('@modules_page' => url('admin/config/modules'), '@themes_page' => url('admin/appearance'),  '@update-page' => url('admin/reports/updates/update'), '@update' => 'http://drupal.org/handbook/modules/update')) . '</dd>';
+        $output .= '<dd>' . t('The Update manager module allows administrators to perform updates directly through the administration interface. At the top of the <a href="@modules_page">modules</a> and <a href="@themes_page">themes</a> pages you will see a link to update to new releases. This will direct you to the <a href="@update-page">update page</a> where you see a listing of all the missing updates and confirm which ones you want to upgrade. From there, you are prompted for your FTP/SSH password, which then transfers the files into your Drupal installation, overwriting your old files. More detailed instructions can be found in the <a href="@update">online handbook</a>.', array('@modules_page' => url('admin/modules'), '@themes_page' => url('admin/appearance'),  '@update-page' => url('admin/reports/updates/update'), '@update' => 'http://drupal.org/handbook/modules/update')) . '</dd>';
         $output .= '<dt>' . t('Installing new modules and themes through the user interface') . '</dt>';
-        $output .= '<dd>' . t('You can also install new modules and themes in the same fashion, through the <a href="@install">install page</a>, or by clicking the <em>Install new module/theme</em> link at the top of the <a href="@modules_page">modules</a> and <a href="@themes_page">themes</a> pages. In this case, you are prompted to provide either the URL to the download, or to upload a packaged release file from your local computer.', array('@modules_page' => url('admin/config/modules'), '@themes_page' => url('admin/appearance'), '@install' => url('admin/reports/updates/install'))) . '</dd>';
+        $output .= '<dd>' . t('You can also install new modules and themes in the same fashion, through the <a href="@install">install page</a>, or by clicking the <em>Install new module/theme</em> link at the top of the <a href="@modules_page">modules</a> and <a href="@themes_page">themes</a> pages. In this case, you are prompted to provide either the URL to the download, or to upload a packaged release file from your local computer.', array('@modules_page' => url('admin/modules'), '@themes_page' => url('admin/appearance'), '@install' => url('admin/reports/updates/install'))) . '</dd>';
       }
       $output .= '</dl>';
       return $output;
@@ -192,7 +192,7 @@ function update_menu() {
   // customize the appearance as needed.
   $paths = array(
     'report' => 'admin/reports/updates',
-    'module' => 'admin/config/modules',
+    'module' => 'admin/modules',
     'theme' => 'admin/appearance',
   );
   foreach ($paths as $context => $path) {
@@ -218,8 +218,8 @@ function update_menu() {
   // Customize the titles of the action links depending on where they appear.
   $items['admin/reports/updates/install']['title'] = 'Install new module or theme';
   $items['admin/reports/updates/update']['title'] = 'Update existing modules and themes';
-  $items['admin/config/modules/install']['title'] = 'Install new module';
-  $items['admin/config/modules/update']['title'] = 'Update existing modules';
+  $items['admin/modules/install']['title'] = 'Install new module';
+  $items['admin/modules/update']['title'] = 'Update existing modules';
   $items['admin/appearance/install']['title'] = 'Install new theme';
   $items['admin/appearance/update']['title'] = 'Update existing themes';
 
diff --git a/modules/update/update.test b/modules/update/update.test
index 4eda46e76..83f76d93f 100644
--- a/modules/update/update.test
+++ b/modules/update/update.test
@@ -133,7 +133,7 @@ class UpdateCoreTestCase extends UpdateTestHelper {
   }
 
   /**
-   * Check the messages at admin/config/modules when the site is up to date.
+   * Check the messages at admin/modules when the site is up to date.
    */
   function testModulePageUpToDate() {
     $this->setSystemInfo7_0();
@@ -141,7 +141,7 @@ class UpdateCoreTestCase extends UpdateTestHelper {
     variable_set('update_fetch_url', url('update-test', array('absolute' => TRUE)));
     variable_set('update_test_xml_map', array('drupal' => '0'));
 
-    $this->drupalGet('admin/config/modules');
+    $this->drupalGet('admin/modules');
     $this->assertText(t('No update information available.'));
     $this->clickLink(t('check manually'));
     $this->assertText(t('Checked available update data for one project.'));
@@ -150,7 +150,7 @@ class UpdateCoreTestCase extends UpdateTestHelper {
   }
 
   /**
-   * Check the messages at admin/config/modules when missing an update.
+   * Check the messages at admin/modules when missing an update.
    */
   function testModulePageRegularUpdate() {
     $this->setSystemInfo7_0();
@@ -158,7 +158,7 @@ class UpdateCoreTestCase extends UpdateTestHelper {
     variable_set('update_fetch_url', url('update-test', array('absolute' => TRUE)));
     variable_set('update_test_xml_map', array('drupal' => '1'));
 
-    $this->drupalGet('admin/config/modules');
+    $this->drupalGet('admin/modules');
     $this->assertText(t('No update information available.'));
     $this->clickLink(t('check manually'));
     $this->assertText(t('Checked available update data for one project.'));
@@ -167,7 +167,7 @@ class UpdateCoreTestCase extends UpdateTestHelper {
   }
 
   /**
-   * Check the messages at admin/config/modules when missing a security update.
+   * Check the messages at admin/modules when missing a security update.
    */
   function testModulePageSecurityUpdate() {
     $this->setSystemInfo7_0();
@@ -175,7 +175,7 @@ class UpdateCoreTestCase extends UpdateTestHelper {
     variable_set('update_fetch_url', url('update-test', array('absolute' => TRUE)));
     variable_set('update_test_xml_map', array('drupal' => '2-sec'));
 
-    $this->drupalGet('admin/config/modules');
+    $this->drupalGet('admin/modules');
     $this->assertText(t('No update information available.'));
     $this->clickLink(t('check manually'));
     $this->assertText(t('Checked available update data for one project.'));