? 272920.patch
Index: README.txt
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/admin_menu/README.txt,v
retrieving revision 1.25
diff -u -p -r1.25 README.txt
--- README.txt	24 Oct 2008 07:37:18 -0000	1.25
+++ README.txt	7 Nov 2008 20:09:20 -0000
@@ -2,16 +2,15 @@
 
 -- SUMMARY --
 
-Drupal Administration Menu displays the whole menu tree below /admin including
-most local tasks in a drop-down menu. So administrators need less time
-to access pages which are only visible after one or two clicks normally.
+The Drupal administration menu module displays the entire administrative
+menu tree (and most local tasks) in a drop-down menu, providing administrators
+one- or two-click access to most pages. Other modules may also add menu
+links to administration menu using hook_admin_menu().
 
-Admin menu also provides hook_admin_menu() that allows other modules to add
-menu links.
-
-For a full description visit the project page:
+For a full description of the module, visit the project page:
   http://drupal.org/project/admin_menu
-Bug reports, feature suggestions and latest developments:
+
+To submit bug reports and feature suggestions, or to track changes:
   http://drupal.org/project/issues/admin_menu
 
 
@@ -28,110 +27,112 @@ None.
 -- CONFIGURATION --
 
 * Configure user permissions in Administer >> User management >> Permissions
-  >> admin_menu module:
 
-  - access administration menu: Displays Drupal Administration Menu.
+  admin_menu module:
+
+  - access administration menu
 
-  - display drupal links: Displays additional links to Drupal.org and issue
-    queues of all enabled contrib modules in the Drupal Administration Menu icon.
+    Users in roles with the "access administration menu" permission will see
+    the administration menu at the top of each page.
 
-  Please bear in mind that the displayed menu items in Drupal Administration Menu
-  depend on the actual permissions of a user.  For example, if a user does not
-  have the permission 'administer access control' and 'administer users', the
-  whole 'User management' menu item will not be displayed.
+  - display drupal links
 
-* Customize module settings in Administer >> Site configuration >> Administration
-  Menu.
+    Users in roles with the "display drupal links" permission will receive
+    links to Drupal.org issue queues for all enabled contributed modules. The
+    issue queue links appear under the administration menu icon.)
 
-* Most probably you want to either hide the regular 'Navigation' menu block, or
-  move the 'Administer' menu item into a new/separate menu, so administrative
-  menu items are not displayed twice on all pages.
+  Note that the menu items displayed in the administration Menu depend on the
+  actual permissions of the viewing user. For example, the "User management" menu
+  item is not displayed to a user who is not a member of a role with the "administer
+  access control" and "administer users" permissions.
+
+* Customize the menu settings in Administer >> Site configuration >> Administration
+  menu.
+
+* To prevent administrative menu items from appearing twice, you may hide the
+  "Navigation" menu block, or move the "Administer" menu items into a separate menu.
 
 
 -- CUSTOMIZATION --
 
-* You have two options to override the admin menu icon:
+* To override the default administration menu icon, you may:
 
   1) Disable it via CSS in your theme:
-<code>
-body #admin-menu-icon { display: none; }
-</code>
+
+     body #admin-menu-icon { display: none; }
 
   2) Alter the image by overriding the theme function:
 
-     Copy the whole function theme_admin_menu_icon() into your template.php,
-     rename it to f.e. phptemplate_admin_menu_icon() and customize the output
-     according to your needs.
-
-  Please bear in mind that admin_menu's output is cached. You need to clear your
-  site's cache (via administration menu's link to flush caches,
-  admin/settings/performance, or by using Devel module) to see any changes of
-  your theme override function.
-
-* You can override the font size by adding a line to your stylesheet in your
-  theme like the following:
-<code>
-body #admin-menu { font-size: 10px; }
-</code>
+     Copy the entire theme_admin_menu_icon() function into your template.php,
+     rename it to phptemplate_admin_menu_icon() or THEMENAME_admin_menu_icon(),
+     and customize the output according to your needs.
+
+  Remember that the output of the administration menu is cached. To see changes
+  from your theme override function, you must clear your site cache (via
+  the "Flush all caches" link on the menu).
+
+* To override the font size, add the following line to your theme's stylesheet:
+
+  body #admin-menu { font-size: 10px; }
 
 
 -- TROUBLESHOOTING --
 
-* If the administration menu is not displayed, check the following steps:
+* If the menu does not display, check the following:
 
-  - Is admin_menu's "access administration menu" permission enabled?
+  - Are the "access administration menu" and "access administration pages"
+    permissions enabled for the appropriate roles?
 
-  - Is system's "access administration pages" permission enabled?
+  - Does your theme output the $closure variable?
 
-  - Does your theme output $closure? (See FAQ below for more info)
+* If the menu is rendered behind a Flash movie object, add this property to your
+  Flash object(s):
+
+  <param name="wmode" value="transparent" />
 
-* If admin menu is rendered behind a flash movie object, you need to add the
-  following property to your flash object(s):
-<code>
-<param name="wmode" value="transparent" />
-</code>
   See http://drupal.org/node/195386 for further information.
 
 
 -- FAQ --
 
-Q: When admin_menu is enabled, plenty of blank space is added to the bottom of
-   my theme. Why?
+Q: When the administration menu module is enabled, blank space is added to the
+   bottom of my theme. Why?
 
 A: This is caused by a long list of links to module issue queues at Drupal.org.
-   Just go to Administer >> User management >> Permissions >> admin_menu and
-   disable the permission "display drupal links" for your or all roles.
-   Since uid 1 always has all permissions, this link list cannot be disabled
-   for uid 1.
-
-Q: After upgrading to 6.x-1.x, admin_menu disappeared. Why?
-
-A: This should not happen. If it did, visit
-   http://<yoursitename>/admin/build/modules to re-generate your menu.
-
-Q: Can I configure admin_menu to display another (or the Navigation) menu just
-   like the administration menu?
-
-A: No. As the name implies, Drupal Administration Menu is for the administrative
-   menu only. However, if you know CSS, you can simply copy'n'paste the contents
-   of admin_menu.css into your theme's stylesheet and alter #admin-menu to any
-   other menu block id, for example #block-menu-1 or the like.
-
-Q: Sometimes the user counter displays a lot of anonymous users, but when
-   comparing the site's statistics (f.e. in Google Analytics) there is no such
-   huge amount of users and/or requests reported.
-
-A: If your site was concurrently spidered by search-engine robots, it's commonly
-   known to have a giant amount of anonymous users for a short time-frame.
-   Most web statistics systems like Google Analytics filter such requests
-   already.
-
-Q: I enabled "Aggregate and compress CSS files", but I found admin_menu.css is
-   still there, is it normal?
-
-A: Yes, this is the intended behavior. Since admin_menu is only visible for
-   logged-on administrative users, it would not make sense to load its
-   stylesheet for all, including anonymous users.
+   Use Administer >> User management >> Permissions to disable the "display
+   drupal links" permission for all appropriate roles. Note that since UID 1
+   automatically receives all permissions, the list of issue queue links cannot
+   be disabled for UID 1.
+
+
+Q: After upgrading to 6.x-1.x, the menu disappeared. Why?
+
+A: You may need to regenerate your menu. Visit http://example.com/admin/build/modules
+   to regenerate your menu (substitute your site name for example.com).
+
+
+Q: Can I configure the administration menu module to display another menu (like the
+   Navigation menu, for instance)?
+
+A: No. As the name implies, administration menu module is for administrative menu links
+   only. However, you can copy and paste the contents of admin_menu.css into your
+   theme's stylesheet and alter #admin-menu to any other menu block id (#block-menu-1,
+   for example).
+
+
+Q: Sometimes, the user counter displays a lot of anonymous users, but no spike of
+   users or requests appear in Google Analytics or other tracking tools.
+
+A: If your site was concurrently spidered by search-engine robots, it may have
+   a significant number of anonymous users for a short time. Most web tracking
+   tools like Google Analytics automatically filter out these requests.
+
+
+Q: I enabled "Aggregate and compress CSS files", but admin_menu.css is still there.
+   Is this normal?
+
+A: Yes, this is the intended behavior. the administration menu module only loads its
+   stylesheet as needed (i.e., on page requests by logged-on, administrative users).
 
 
 -- CONTACT --
@@ -148,4 +149,3 @@ This project has been sponsored by:
   Specialized in consulting and planning of Drupal powered sites, UNLEASHED
   MIND offers installation, development, theming, customization, and hosting
   to get you started. Visit http://www.unleashedmind.com for more information.
-
Index: admin_menu.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/admin_menu/admin_menu.inc,v
retrieving revision 1.29
diff -u -p -r1.29 admin_menu.inc
--- admin_menu.inc	2 Nov 2008 22:22:32 -0000	1.29
+++ admin_menu.inc	7 Nov 2008 20:09:20 -0000
@@ -5,7 +5,7 @@
  * The key function that builds the menu links whenever there is a menu rebuild.
  */
 function _admin_menu_rebuild_links() {
-  // Get the newly rebuilt menu
+  // Get the newly rebuilt menu.
   $menu = menu_router_build();
   // Add normal and suggested items as links.
   $menu_links = array();
@@ -258,7 +258,7 @@ function admin_menu_admin_menu(&$deleted
   // Add developer modules toggle link.
   $saved_state = variable_get('admin_menu_devel_modules_enabled', NULL);
   $links[] = array(
-    'title' => isset($saved_state) ? t('Re-enable developer modules') : t('Disable developer modules'),
+    'title' => isset($saved_state) ? t('Enable developer modules') : t('Disable developer modules'),
     'path' => 'admin_menu/toggle-modules',
     'weight' => 88,
     'parent_path' => $icon_path,
@@ -343,39 +343,39 @@ function admin_menu_adjust_items(&$menu_
 function admin_menu_theme_settings() {
   $form['admin_menu_margin_top'] = array(
     '#type' => 'checkbox',
-    '#title' => t('Apply margin-top to page body'),
+    '#title' => t('Adjust top margin'),
     '#default_value' => variable_get('admin_menu_margin_top', 1),
-    '#description' => t('If enabled, the output of this site will be shifted for approx. 20 pixels from the top of the viewport to make room for the Administration Menu. If this setting is disabled, some absolute or fixed positioned page elements at the top of the viewport may be covered by Administration Menu.'),
+    '#description' => t('If enabled, site output is shifted down approximately 20 pixels from the top of the viewport to display the administration menu. If disabled, absolute- or fixed-position page elements may sometimes display over the administration menu.'),
   );
   $form['admin_menu_position_fixed'] = array(
     '#type' => 'checkbox',
-    '#title' => t('Use fixed instead of absolute positioning'),
+    '#title' => t('Keep menu at top of page'),
     '#default_value' => variable_get('admin_menu_position_fixed', 0),
-    '#description' => t('If enabled, the administration menu will always stay at the top of the browser viewport, even if you scroll down the page.') .'<br />'. t('<strong>Note:</strong> In some browsers this setting might cause malformed page contents, a disappearing cursor and not editable select lists in forms. If such effects occur, this setting should be disabled.'),
+    '#description' => t('If enabled, the administration menu is always displayed at the top of the browser viewport (even after the page is scrolled). <strong>Note: In some browsers, this setting results in a malformed page, an invisible cursor, non-selectable elements in forms, or other issues. Disable this option if these issues occur.</strong>'),
   );
   $form['tweaks'] = array(
     '#type' => 'fieldset',
-    '#title' => t('Drupal Administration Tweaks'),
+    '#title' => t('Advanced settings'),
   );
   $form['tweaks']['admin_menu_tweak_modules'] = array(
     '#type' => 'checkbox',
     '#title' => t('Collapse fieldsets on modules page'),
     '#default_value' => variable_get('admin_menu_tweak_modules', 0),
-    '#description' => t('If enabled, fieldsets on the <a href="!modules-url">Site building &raquo; Modules</a> page will be initially collapsed.', array('!modules-url' => url('admin/build/modules'))),
+    '#description' => t('If enabled, fieldsets on the <a href="!modules-url">modules</a> page are automatically collapsed when loading the page.', array('!modules-url' => url('admin/build/modules'))),
   );
   if (module_exists('util')) {
-    $form['tweaks']['admin_menu_tweak_modules']['#description'] .= '<br /><strong>'. t('If you installed Utility module for this purpose, you can safely uninstall it now!') .'</strong>';
+    $form['tweaks']['admin_menu_tweak_modules']['#description'] .= '<br /><strong>'. t('If the utility module was installed for this purpose, it can be safely disabled and uninstalled.') .'</strong>';
   }
   $form['tweaks']['admin_menu_tweak_tabs'] = array(
     '#type' => 'checkbox',
-    '#title' => t('Move page tabs into administration menu'),
+    '#title' => t('Move local tasks into menu'),
     '#default_value' => variable_get('admin_menu_tweak_tabs', 0),
-    '#description' => t('If enabled, tabs of the current page (usually displayed next or below the page title) will be moved into the administration menu. This feature requires that the theme is using the CSS classes <code>tabs primary</code> and <code>tabs secondary</code> for tabs (like Garland).'),
+    '#description' => t('If enabled, the tabs on the current page are moved into the administration menu. This feature is only available in themes that use the CSS classes <code>tabs primary</code> and <code>tabs secondary</code> for tabs.'),
   );
   $form = system_settings_form($form);
   $form['wipe description'] = array(
     '#type' => 'item',
-    '#value' => t('If you are seeing a duplicated menu or other problems, you may use this button to delete everything in the menu and rebuild it.'),
+    '#value' => t('If the administration menu displays duplicate menu items, you may need to rebuild your menu items using the <em>Wipe and rebuild</em> button.'),
   );
   $form['wipe'] = array(
     '#type' => 'submit',
@@ -409,24 +409,24 @@ function _admin_menu_devel_settings_form
 
   $form['admin_menu'] = array(
     '#type' => 'fieldset',
-    '#title' => t('Administration Menu settings'),
+    '#title' => t('Administration menu settings'),
     '#collapsible' => TRUE,
     '#collapsed' => TRUE,
   );
   $display_options = array('mid', 'weight', 'pid');
-  $display_options = array(0 => t('None'), 'mlid' => t('Menu link id'), 'weight' => t('Weight'), 'plid' => t('Parent link id'));
+  $display_options = array(0 => t('None'), 'mlid' => t('Menu link ID'), 'weight' => t('Weight'), 'plid' => t('Parent link ID'));
   $form['admin_menu']['admin_menu_display'] = array(
     '#type' => 'radios',
-    '#title' => t('Display extra information for menu items in Drupal Administration Menu'),
+    '#title' => t('Display additional data for each menu item'),
     '#default_value' => variable_get('admin_menu_display', 0),
     '#options' => $display_options,
-    '#description' => t('If enabled, the chosen information will appear next to each menu item link.'),
+    '#description' => t('Display the selected items next to each menu item link.'),
   );
   $form['admin_menu']['admin_menu_show_all'] = array(
     '#type' => 'checkbox',
     '#title' => t('Display all menu items'),
     '#default_value' => variable_get('admin_menu_show_all', 0),
-    '#description' => t('Enable this option to disable user access checks for menu items, i.e. every menu item in the visible menu tree will be displayed to every user regardless of access permissions.'),
+    '#description' => t('If enabled, all menu items are displayed regardless of your site permissions. <em>Note: Do not enable on a production site.</em>'),
   );
 }
 
@@ -443,7 +443,7 @@ function admin_menu_toggle_modules() {
     // Re-enable modules that were enabled before.
     module_enable($saved_state);
     variable_del('admin_menu_devel_modules_enabled');
-    drupal_set_message(t('Re-enabled these modules: !module-list.', array('!module-list' => implode(', ', $saved_state))));
+    drupal_set_message(t('Enabled these modules: !module-list.', array('!module-list' => implode(', ', $saved_state))));
     $rebuild = TRUE;
   }
   else {
Index: admin_menu.info
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/admin_menu/admin_menu.info,v
retrieving revision 1.8
diff -u -p -r1.8 admin_menu.info
--- admin_menu.info	18 Oct 2008 17:34:23 -0000	1.8
+++ admin_menu.info	7 Nov 2008 20:09:20 -0000
@@ -1,6 +1,6 @@
 ; $Id: admin_menu.info,v 1.8 2008/10/18 17:34:23 sun Exp $
-name = "Administration Menu"
-description = "Renders a menu tree for administrative purposes as dropdown menu at the top of the window."
+name = "Administration menu"
+description = "Provides a dropdown menu to most administrative tasks and other common destinations (to users with the proper permissions)."
 package = "Administration"
 core = 7.x
 files[] = admin_menu.module
Index: admin_menu.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/admin_menu/admin_menu.module,v
retrieving revision 1.58
diff -u -p -r1.58 admin_menu.module
--- admin_menu.module	2 Nov 2008 22:22:32 -0000	1.58
+++ admin_menu.module	7 Nov 2008 20:09:20 -0000
@@ -3,7 +3,7 @@
 
 /**
  * @file
- * Renders a menu tree for administrative purposes as dropdown menu at the top
+ * Renders a menu tree for administrative purposes as a dropdown menu at the top
  * of the window.
  */
 
@@ -13,25 +13,13 @@
 function admin_menu_help($path, $arg) {
   switch ($path) {
     case 'admin/settings/admin_menu':
-      return t('The Administration Menu will appear at the top of the page for users who have been given the "access administration menu" permission.  Customize appearance of the dropdown menu here.');
-
+      return t('The administration menu module provides a dropdown menu arranged for one- or two-click access to most administrative tasks and other common destinations (to users with the proper permissions). Use the settings below to customize the appearance of the menu.');
     case 'admin/help#admin_menu':
-      return t(<<<EOT
-<p>Drupal Administration Menu renders all administrative menu items below 'administer'
-in a clean, attractive and purely CSS-based menu at the top of your website.  It contains
-not only regular menu items - local tasks are also included, giving you extremely fast
-access to any administrative resource and function your Drupal installation provides.</p>
-<p>The menu also can display the number of anonymous and authenticated users,
-<a href="http://drupal.org/project/devel">Devel module</a> links, and items generated by
-other modules.</p>
-<p>The <a href="!settings">settings page</a> is where administrators can choose
-whether or not to allow the module to shift the page contents down to accommodate
-the menu.  Depending on the design/layout of your theme, this may cause problems with
-the appearance of the page.  Changing the '%margin-setting' setting may fix this
-issue.</p>
-<p>Please bear in mind that the displayed menu items in Drupal Administration Menu depend on the actual permissions of a user.  For example, if a user does not have the permission "@permission-access" and "@permission-users", the whole "@user-management" menu item will not be displayed.</p>
-EOT
-, array('!settings' => url('admin/settings/admin_menu'), '%margin-setting' => t('Apply margin-top to page body'), '@permission-access' => 'administer access control', '@permission-users' => 'administer users', '@user-management' => t('User management')));
+      $output = '';
+      $output .= '<p>' . t('The administration menu module provides a dropdown menu arranged for one- or two-click access to most administrative tasks and other common destinations (to users with the proper permissions). Administration menu also displays the number of anonymous and authenticated users, and allows modules to add their own custom menu items. Integration with the menu varies from module to module; the contributed module <a href="@drupal">Devel</a>, for instance, make strong use of the administration menu module to provide quick access to development tools.', array('@drupal' => 'http://drupal.org/project/devel')) . '</p>';
+      $output .= '<p>' . t('The administration menu <a href="@settings">settings page</a> allows you to modify some elements of the menu\'s behavior and appearance. Since the appearance of the menu is dependent on your site theme, substantial customizations require modifications to your site\'s theme and CSS files. See the advanced menu module README.txt file for more information on theme and CSS customizations.', array('@settings' => url('admin/settings/admin_menu'))) . '</p>';
+      $output .= '<p>' . t('The menu items displayed in the administration menu depend upon the actual permissions of the viewer. First, the administration menu is only displayed to users in roles with the <em>Access administration menu</em> (admin_menu module) permission. Second, a user must be a member of a role with the <em>Access administration pages</em> (system module) permission to view administrative links. And, third, only currently permitted links are displayed; for example, if a user is not a member of a role with the permissions <em>Administer permissions</em> (user module) and <em>Administer users</em> (user module), the <em>User management</em> menu item is not displayed.') . '</p>';
+      return $output;
   }
 }
 
@@ -42,11 +30,11 @@ function admin_menu_perm() {
   return array(
     'access administration menu' => array(
       'title' => t('Access administration menu'),
-      'description' => t('Access the administration menu, which appears at the top of the page.'),
+      'description' => t('Display the administration menu at the top of each page.'),
     ),
     'display drupal links' => array(
       'title' => t('Display drupal links'),
-      'description' => t('View links to drupal.org in the administration menu.'),
+      'description' => t('Provide Drupal.org links in the administration menu.'),
     )
   );
 }
@@ -71,8 +59,8 @@ function admin_menu_theme() {
 function admin_menu_menu() {
   $items = array();
   $items['admin/settings/admin_menu'] = array(
-    'title' => 'Administration Menu',
-    'description' => 'Adjust settings for the dropdown Administration Menu.',
+    'title' => 'Administration menu',
+    'description' => 'Adjust administration menu settings.',
     'page callback' => 'drupal_get_form',
     'page arguments' => array('admin_menu_theme_settings'),
     'access arguments' => array('administer site configuration'),
