Index: admin_menu.inc =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/admin_menu/admin_menu.inc,v retrieving revision 1.11.2.6 diff -u -p -r1.11.2.6 admin_menu.inc --- admin_menu.inc 26 Jun 2008 20:08:37 -0000 1.11.2.6 +++ admin_menu.inc 14 Jul 2008 21:10:19 -0000 @@ -332,7 +332,7 @@ function admin_menu_theme_settings() { '#type' => 'checkbox', '#title' => t('Apply margin-top to page body'), '#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, 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 the administration menu.'), ); $form['tweaks'] = array( '#type' => 'fieldset', @@ -400,7 +400,7 @@ function admin_menu_toggle_modules() { /** * Helper function for admin_menu_form_devel_admin_settings_alter(). * - * Extends Devel module with Administration Menu developer settings. + * Extends Devel module with admin_menu developer settings. */ function _admin_menu_devel_settings_form_alter(&$form, $form_state) { // Shift system_settings_form buttons. @@ -409,7 +409,7 @@ function _admin_menu_devel_settings_form $form['admin_menu'] = array( '#type' => 'fieldset', - '#title' => t('Administration Menu settings'), + '#title' => t('Drupal Administration Menu settings'), '#collapsible' => TRUE, '#collapsed' => TRUE, ); @@ -417,7 +417,7 @@ function _admin_menu_devel_settings_form $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 extra information for menu items'), '#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.'), Index: admin_menu.module =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/admin_menu/admin_menu.module,v retrieving revision 1.43.2.4 diff -u -p -r1.43.2.4 admin_menu.module --- admin_menu.module 26 Jun 2008 20:08:37 -0000 1.43.2.4 +++ admin_menu.module 14 Jul 2008 21:16:35 -0000 @@ -13,24 +13,19 @@ 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 will appear at the top of the page for users who have been given the "access administration menu" permission. Customize the appearance of the dropdown menu here.'); + case 'admin/help#admin_menu': - return t(<<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.

-

The menu also can display the number of anonymous and authenticated users, -Devel module links, and items generated by -other modules.

-

The settings page 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.

-

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.

-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' => 'User management')); + $output = '

'; + $output .= t("Drupal Administration Menu renders most 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."); + $output .= '

'; + $output .= t('The menu also can display the number of anonymous and authenticated users, Devel module links, and items generated by other modules.'); + $output .= '

'; + $output .= t('The settings page 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.', array('!settings' => url('admin/settings/admin_menu'), '%margin-setting' => t('Apply margin-top to page body')); + $output .= '

'; + $output .= t('Please bear in mind that the displayed menu items in the 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.', array('@permission-access' => 'administer access control', '@permission-users' => 'administer users', '@user-management' => 'User management')); + $output .= '

'; + return $output; } } @@ -61,8 +56,8 @@ function admin_menu_theme() { function admin_menu_menu() { $items = array(); $items['admin/settings/admin_menu'] = array( - 'title' => 'Administration Menu', - 'description' => t('Adjust settings for the dropdown Administration Menu.'), + 'title' => 'Administration menu', + 'description' => t('Adjust settings for the dropdown administration menu.'), 'page callback' => 'drupal_get_form', 'page arguments' => array('admin_menu_theme_settings'), 'access arguments' => array('administer site configuration'), @@ -188,7 +183,7 @@ function theme_admin_menu_item($link, $h /** * Implementation of hook_form_[form_id]_alter(). * - * Extends Devel module with Administration Menu developer settings. + * Extends Devel module with admin_menu developer settings. */ function admin_menu_form_devel_admin_settings_alter(&$form, $form_state) { module_load_include('inc', 'admin_menu'); @@ -270,7 +265,7 @@ function admin_menu_translated_menu_link } /** - * Render an icon to display in the Administration Menu. + * Render an icon to display in the administration menu. * * @ingroup themeable */