? files ? user-permission-help-2.patch ? user-permission-help.patch ? modules/devel Index: misc/drupal.css =================================================================== RCS file: /cvs/drupal/drupal/misc/drupal.css,v retrieving revision 1.120 diff -u -F^function -r1.120 drupal.css --- misc/drupal.css 7 Sep 2005 20:56:00 -0000 1.120 +++ misc/drupal.css 6 Oct 2005 01:01:49 -0000 @@ -366,6 +366,9 @@ #permissions td.permission, #blocks td.block, #taxonomy td.term, #taxonomy td.message { padding-left: 1.5em; } +#permissions .description { + font-size: 0.85em; +} #access-rules .access-type, #access-rules .rule-type { margin-right: 1em; Index: modules/node.module =================================================================== RCS file: /cvs/drupal/drupal/modules/node.module,v retrieving revision 1.531 diff -u -F^function -r1.531 node.module --- modules/node.module 27 Sep 2005 15:09:28 -0000 1.531 +++ modules/node.module 6 Oct 2005 01:01:51 -0000 @@ -587,7 +587,8 @@ function node_show($node, $cid) { * Implementation of hook_perm(). */ function node_perm() { - return array('administer nodes', 'access content'); + return array('administer nodes' => t('Allows the user to edit or delete arbitrary nodes.'), + 'access content' => t('Allows the user to view a given node.')); } /** Index: modules/page.module =================================================================== RCS file: /cvs/drupal/drupal/modules/page.module,v retrieving revision 1.137 diff -u -F^function -r1.137 page.module --- modules/page.module 23 Sep 2005 08:47:13 -0000 1.137 +++ modules/page.module 6 Oct 2005 01:01:51 -0000 @@ -22,7 +22,7 @@ function page_help($section) { * Implementation of hook_perm(). */ function page_perm() { - return array('create pages', 'edit own pages'); + return array('create pages' => t('Allows users to create new page nodes.'), 'edit own pages'); } /** Index: modules/user.module =================================================================== RCS file: /cvs/drupal/drupal/modules/user.module,v retrieving revision 1.513 diff -u -F^function -r1.513 user.module --- modules/user.module 1 Oct 2005 13:42:00 -0000 1.513 +++ modules/user.module 6 Oct 2005 01:01:53 -0000 @@ -1603,11 +1603,25 @@ function user_admin_perm() { foreach (module_list() as $module) { if ($permissions = module_invoke($module, 'perm')) { $rows[] = array(array('data' => t('%module module', array('%module' => $module)), 'class' => 'module', 'colspan' => count($role_names) + 1)); - asort($permissions); - foreach ($permissions as $perm) { - $row[] = array('data' => t($perm), 'class' => 'permission'); + + foreach ($permissions as $key => $permission) { + if (!is_string($key)) { + unset($permissions[$key]); + $permissions[$permission] = ''; + } + } + + ksort($permissions); + + foreach ($permissions as $title => $description) { + if (!empty($description)) { + $row[] = array('data' => t($title) .'