Index: modules/aggregator/aggregator.info =================================================================== RCS file: /cvs/drupal/drupal/modules/aggregator/aggregator.info,v retrieving revision 1.1 diff -u -F^f -r1.1 aggregator.info --- modules/aggregator/aggregator.info 31 Aug 2006 20:22:34 -0000 1.1 +++ modules/aggregator/aggregator.info 1 Sep 2006 08:56:32 -0000 @@ -1,3 +1,4 @@ ; $Id: aggregator.info,v 1.1 2006/08/31 20:22:34 dries Exp $ name = Aggregator description = "Aggregates syndicated content (RSS, RDF, and Atom feeds)." +package = Drupal core modules Index: modules/block/block.info =================================================================== RCS file: /cvs/drupal/drupal/modules/block/block.info,v retrieving revision 1.1 diff -u -F^f -r1.1 block.info --- modules/block/block.info 31 Aug 2006 20:22:34 -0000 1.1 +++ modules/block/block.info 1 Sep 2006 08:56:32 -0000 @@ -1,4 +1,4 @@ ; $Id: block.info,v 1.1 2006/08/31 20:22:34 dries Exp $ name = Block description = Controls the boxes that are displayed around the main content. - +package = Required modules Index: modules/blog/blog.info =================================================================== RCS file: /cvs/drupal/drupal/modules/blog/blog.info,v retrieving revision 1.1 diff -u -F^f -r1.1 blog.info --- modules/blog/blog.info 31 Aug 2006 20:22:34 -0000 1.1 +++ modules/blog/blog.info 1 Sep 2006 08:56:32 -0000 @@ -1,4 +1,4 @@ ; $Id: blog.info,v 1.1 2006/08/31 20:22:34 dries Exp $ name = Blog description = Enables keeping an easily and regularly updated web page or a blog. - +package = Drupal core modules Index: modules/blogapi/blogapi.info =================================================================== RCS file: /cvs/drupal/drupal/modules/blogapi/blogapi.info,v retrieving revision 1.1 diff -u -F^f -r1.1 blogapi.info --- modules/blogapi/blogapi.info 31 Aug 2006 20:22:34 -0000 1.1 +++ modules/blogapi/blogapi.info 1 Sep 2006 08:56:32 -0000 @@ -1,4 +1,4 @@ ; $Id: blogapi.info,v 1.1 2006/08/31 20:22:34 dries Exp $ name = Blog API description = Allows users to post content using applications that support XML-RPC blog APIs. - +package = Drupal core modules Index: modules/book/book.info =================================================================== RCS file: /cvs/drupal/drupal/modules/book/book.info,v retrieving revision 1.1 diff -u -F^f -r1.1 book.info --- modules/book/book.info 31 Aug 2006 20:22:34 -0000 1.1 +++ modules/book/book.info 1 Sep 2006 08:56:32 -0000 @@ -1,4 +1,4 @@ ; $Id: book.info,v 1.1 2006/08/31 20:22:34 dries Exp $ name = Book description = Allows users to collaboratively author a book. - +package = Drupal core modules Index: modules/comment/comment.info =================================================================== RCS file: /cvs/drupal/drupal/modules/comment/comment.info,v retrieving revision 1.1 diff -u -F^f -r1.1 comment.info --- modules/comment/comment.info 31 Aug 2006 20:22:35 -0000 1.1 +++ modules/comment/comment.info 1 Sep 2006 08:56:32 -0000 @@ -1,4 +1,4 @@ ; $Id: comment.info,v 1.1 2006/08/31 20:22:35 dries Exp $ name = Comment description = Allows users to comment on and discuss published content. - +package = Drupal core modules Index: modules/contact/contact.info =================================================================== RCS file: /cvs/drupal/drupal/modules/contact/contact.info,v retrieving revision 1.1 diff -u -F^f -r1.1 contact.info --- modules/contact/contact.info 31 Aug 2006 20:22:35 -0000 1.1 +++ modules/contact/contact.info 1 Sep 2006 08:56:32 -0000 @@ -1,4 +1,4 @@ ; $Id: contact.info,v 1.1 2006/08/31 20:22:35 dries Exp $ name = Contact description = Enables the use of both personal and site-wide contact forms. - +package = Drupal core modules Index: modules/drupal/drupal.info =================================================================== RCS file: /cvs/drupal/drupal/modules/drupal/drupal.info,v retrieving revision 1.1 diff -u -F^f -r1.1 drupal.info --- modules/drupal/drupal.info 31 Aug 2006 20:22:35 -0000 1.1 +++ modules/drupal/drupal.info 1 Sep 2006 08:56:32 -0000 @@ -1,4 +1,4 @@ ; $Id: drupal.info,v 1.1 2006/08/31 20:22:35 dries Exp $ name = Drupal description = Lets you register your site with a central server and improve ranking of Drupal projects by posting information on your installed modules and themes; also enables users to log in using a Drupal ID. - +package = Drupal core modules Index: modules/filter/filter.info =================================================================== RCS file: /cvs/drupal/drupal/modules/filter/filter.info,v retrieving revision 1.1 diff -u -F^f -r1.1 filter.info --- modules/filter/filter.info 31 Aug 2006 20:22:35 -0000 1.1 +++ modules/filter/filter.info 1 Sep 2006 08:56:32 -0000 @@ -1,4 +1,4 @@ ; $Id: filter.info,v 1.1 2006/08/31 20:22:35 dries Exp $ name = Filter description = Handles the filtering of content in preparation for display. - +package = Required modules Index: modules/forum/forum.info =================================================================== RCS file: /cvs/drupal/drupal/modules/forum/forum.info,v retrieving revision 1.1 diff -u -F^f -r1.1 forum.info --- modules/forum/forum.info 31 Aug 2006 20:22:35 -0000 1.1 +++ modules/forum/forum.info 1 Sep 2006 08:56:32 -0000 @@ -1,4 +1,5 @@ ; $Id: forum.info,v 1.1 2006/08/31 20:22:35 dries Exp $ name = Forum description = Enables threaded discussions about general topics. - +package = Drupal core modules +dependencies = taxonomy comment Index: modules/help/help.info =================================================================== RCS file: /cvs/drupal/drupal/modules/help/help.info,v retrieving revision 1.1 diff -u -F^f -r1.1 help.info --- modules/help/help.info 31 Aug 2006 20:22:35 -0000 1.1 +++ modules/help/help.info 1 Sep 2006 08:56:32 -0000 @@ -1,3 +1,4 @@ ; $Id: help.info,v 1.1 2006/08/31 20:22:35 dries Exp $ name = Help description = Manages the display of online help. +package = Drupal core modules Index: modules/legacy/legacy.info =================================================================== RCS file: /cvs/drupal/drupal/modules/legacy/legacy.info,v retrieving revision 1.1 diff -u -F^f -r1.1 legacy.info --- modules/legacy/legacy.info 31 Aug 2006 20:22:35 -0000 1.1 +++ modules/legacy/legacy.info 1 Sep 2006 08:56:32 -0000 @@ -1,4 +1,4 @@ ; $Id: legacy.info,v 1.1 2006/08/31 20:22:35 dries Exp $ name = Legacy description = Provides legacy handlers for upgrades from older Drupal installations. - +package = Drupal core modules Index: modules/locale/locale.info =================================================================== RCS file: /cvs/drupal/drupal/modules/locale/locale.info,v retrieving revision 1.1 diff -u -F^f -r1.1 locale.info --- modules/locale/locale.info 31 Aug 2006 20:22:35 -0000 1.1 +++ modules/locale/locale.info 1 Sep 2006 08:56:32 -0000 @@ -1,4 +1,4 @@ ; $Id: locale.info,v 1.1 2006/08/31 20:22:35 dries Exp $ name = Locale description = Enables the translation of the user interface to languages other than English. - +package = Drupal core modules Index: modules/menu/menu.info =================================================================== RCS file: /cvs/drupal/drupal/modules/menu/menu.info,v retrieving revision 1.1 diff -u -F^f -r1.1 menu.info --- modules/menu/menu.info 31 Aug 2006 20:22:35 -0000 1.1 +++ modules/menu/menu.info 1 Sep 2006 08:56:32 -0000 @@ -1,4 +1,4 @@ ; $Id: menu.info,v 1.1 2006/08/31 20:22:35 dries Exp $ name = Menu description = Allows administrators to customize the site navigation menu. - +package = Drupal core modules Index: modules/node/node.info =================================================================== RCS file: /cvs/drupal/drupal/modules/node/node.info,v retrieving revision 1.1 diff -u -F^f -r1.1 node.info --- modules/node/node.info 31 Aug 2006 20:22:35 -0000 1.1 +++ modules/node/node.info 1 Sep 2006 08:56:32 -0000 @@ -1,4 +1,5 @@ ; $Id: node.info,v 1.1 2006/08/31 20:22:35 dries Exp $ name = Node description = Allows content to be submitted to the site and displayed on pages. +package = Required modules Index: modules/path/path.info =================================================================== RCS file: /cvs/drupal/drupal/modules/path/path.info,v retrieving revision 1.1 diff -u -F^f -r1.1 path.info --- modules/path/path.info 31 Aug 2006 20:22:35 -0000 1.1 +++ modules/path/path.info 1 Sep 2006 08:56:32 -0000 @@ -1,4 +1,4 @@ ; $Id: path.info,v 1.1 2006/08/31 20:22:35 dries Exp $ name = Path description = Allows users to rename URLs. - +package = Drupal core modules Index: modules/ping/ping.info =================================================================== RCS file: /cvs/drupal/drupal/modules/ping/ping.info,v retrieving revision 1.1 diff -u -F^f -r1.1 ping.info --- modules/ping/ping.info 31 Aug 2006 20:22:36 -0000 1.1 +++ modules/ping/ping.info 1 Sep 2006 08:56:32 -0000 @@ -1,4 +1,4 @@ ; $Id: ping.info,v 1.1 2006/08/31 20:22:36 dries Exp $ name = Ping description = Alerts other sites when your site has been updated. - +package = Drupal core modules Index: modules/poll/poll.info =================================================================== RCS file: /cvs/drupal/drupal/modules/poll/poll.info,v retrieving revision 1.1 diff -u -F^f -r1.1 poll.info --- modules/poll/poll.info 31 Aug 2006 20:22:36 -0000 1.1 +++ modules/poll/poll.info 1 Sep 2006 08:56:32 -0000 @@ -1,4 +1,4 @@ ; $Id: poll.info,v 1.1 2006/08/31 20:22:36 dries Exp $ name = Poll description = Allows your site to capture votes on different topics in the form of multiple choice questions. - +package = Drupal core modules Index: modules/profile/profile.info =================================================================== RCS file: /cvs/drupal/drupal/modules/profile/profile.info,v retrieving revision 1.1 diff -u -F^f -r1.1 profile.info --- modules/profile/profile.info 31 Aug 2006 20:22:36 -0000 1.1 +++ modules/profile/profile.info 1 Sep 2006 08:56:32 -0000 @@ -1,4 +1,4 @@ ; $Id: profile.info,v 1.1 2006/08/31 20:22:36 dries Exp $ name = Profile description = Supports configurable user profiles. - +package = Drupal core modules Index: modules/search/search.info =================================================================== RCS file: /cvs/drupal/drupal/modules/search/search.info,v retrieving revision 1.1 diff -u -F^f -r1.1 search.info --- modules/search/search.info 31 Aug 2006 20:22:36 -0000 1.1 +++ modules/search/search.info 1 Sep 2006 08:56:32 -0000 @@ -1,4 +1,4 @@ ; $Id: search.info,v 1.1 2006/08/31 20:22:36 dries Exp $ name = Search description = Enables site-wide keyword searching. - +package = Drupal core modules Index: modules/statistics/statistics.info =================================================================== RCS file: /cvs/drupal/drupal/modules/statistics/statistics.info,v retrieving revision 1.1 diff -u -F^f -r1.1 statistics.info --- modules/statistics/statistics.info 31 Aug 2006 20:22:36 -0000 1.1 +++ modules/statistics/statistics.info 1 Sep 2006 08:56:32 -0000 @@ -1,4 +1,4 @@ ; $Id: statistics.info,v 1.1 2006/08/31 20:22:36 dries Exp $ name = Statistics description = Logs access statistics for your site. - +package = Drupal core modules Index: modules/system/admin.css =================================================================== RCS file: /cvs/drupal/drupal/modules/system/admin.css,v retrieving revision 1.5 diff -u -F^f -r1.5 admin.css --- modules/system/admin.css 1 Sep 2006 08:44:53 -0000 1.5 +++ modules/system/admin.css 1 Sep 2006 08:56:32 -0000 @@ -37,6 +37,15 @@ padding-right: 4px; } +div.admin-missing, div.admin-required { + font-size: 1.1em; + color: #444; +} + +td.package { + font-weight: bold; +} + /** * Formatting for status report */ Index: modules/system/system.info =================================================================== RCS file: /cvs/drupal/drupal/modules/system/system.info,v retrieving revision 1.1 diff -u -F^f -r1.1 system.info --- modules/system/system.info 31 Aug 2006 20:22:36 -0000 1.1 +++ modules/system/system.info 1 Sep 2006 08:56:32 -0000 @@ -1,4 +1,4 @@ ; $Id: system.info,v 1.1 2006/08/31 20:22:36 dries Exp $ name = System description = Handles general site configuration for administrators. - +package = Required modules Index: modules/system/system.module =================================================================== RCS file: /cvs/drupal/drupal/modules/system/system.module,v retrieving revision 1.361 diff -u -F^f -r1.361 system.module --- modules/system/system.module 1 Sep 2006 08:44:53 -0000 1.361 +++ modules/system/system.module 1 Sep 2006 08:56:33 -0000 @@ -1214,25 +1214,94 @@ function system_themes_submit($form_id, * Menu callback; displays a listing of all modules. */ function system_modules() { - // Get current list of modules + // Get current list of modules. $files = module_rebuild_cache(); + // First Pass. Group packages and store module information. foreach ($files as $filename => $file) { $info = $file->info; - $form['name'][$file->name] = array('#value' => $info['name']); - $form['description'][$file->name] = array('#value' => t($info['description'])); - $options[$file->name] = ''; - if ($file->status) { - $status[] = $file->name; - } - if ($file->throttle) { - $throttle[] = $file->name; + // Store status and throttle so we can pull it out later. + $file->info['enabled'] = $file->status; + $file->info['throttle'] = $file->throttle; + if (!isset($file->info['package'])) { + $file->info['package'] = t('uncategorized'); + } + $packages[$file->info['package']][$file->name] = $file->info; + $modules[$file->name] = $file->info; + } + // Store modules list for validation hook. + $form['modules'] = array('#type' => 'value', '#value' => $modules); + + // Reorder packages. + $core_packages = array(); + // Re-order packages to force core modules to the top. + foreach (array(t('Required modules'), t('Drupal core modules')) as $key) { + if (is_array($packages[$key])) { + $core_packages[$key] = $packages[$key]; + unset($packages[$key]); + } + } + ksort($packages); + $packages = array_merge($core_packages, $packages); + + // Second pass. Form building and dependency checking. + $form['reverse_deps'] = array('#type' => 'value', '#value' => array()); + foreach ($packages as $package => $package_modules) { + $form['packages'][$package] = array('#value' => $package); + $form['packages'][$package]['modules'] = array('#type' => 'value', '#value' => array()); + foreach ($package_modules as $filename => $info) { + $missing_deps = array(); + $form['packages'][$package]['modules']['#value'][] = $filename; + $form['name'][$filename] = array('#value' => $info['name']); + $form['description'][$filename] = array('#value' => $info['description']); + $options[$filename] = ''; + if ($info['enabled']) { + $status[$filename] = $filename; + } + if ($info['throttle']) { + $throttle[] = $filename; + } + + // Check missing dependencies. + if (isset($info['dependencies'])) { + foreach (explode(' ', $info['dependencies']) as $dependency) { + if (!isset($modules[$dependency]) || !$modules[$dependency]['enabled']) { + // Store the fact we need to disable so the theme function can handle it. + $form['disabled'][$filename] = array('#type' => 'value', '#value' => 1); + $missing_deps[] = isset($modules[$dependency]) ? $modules[$dependency]['name'] : $dependency; + } + else if ($info['enabled']) { + // Store the fact we need to disable so the theme function can handle it. + $form['disabled'][$dependency] = array('#type' => 'value', '#value' => 1); + $form['reverse_deps']['#value'][$dependency][] = $info['name']; + } + } + + // Add text for missing dependencies. + if (!empty($missing_deps)) { + $form['description'][$filename]['missing_deps'] = array( + '#value' => t('Missing dependencies: %missing_deps', array('%missing_deps' => implode(', ', $missing_deps))), + '#prefix' => '