Index: README.txt =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/admin_menu/README.txt,v retrieving revision 1.12.2.9 diff -u -p -r1.12.2.9 README.txt --- README.txt 26 Apr 2008 17:02:56 -0000 1.12.2.9 +++ README.txt 15 Jun 2008 01:16:47 -0000 @@ -3,7 +3,7 @@ -- SUMMARY -- Drupal Administration Menu displays the whole menu tree below /admin including -all invisible local tasks in a drop-down menu. So administrators need less time +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. Admin menu also provides hook_admin_menu() that allows other modules to add or @@ -28,7 +28,7 @@ None. -- CONFIGURATION -- * Configure user permissions in administer >> User management >> Access control - >> Drupal Administration Menu: + >> admin_menu module: - access administration menu: Displays Drupal Administration Menu. @@ -47,7 +47,7 @@ None. -- CUSTOMIZATION -- * You have two options to override the admin menu icon: - + 1) Disable it via CSS in your theme: body #admin-menu-icon { display: none; } Index: admin_menu.css =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/admin_menu/admin_menu.css,v retrieving revision 1.15.2.10 diff -u -p -r1.15.2.10 admin_menu.css --- admin_menu.css 2 Mar 2008 22:10:35 -0000 1.15.2.10 +++ admin_menu.css 15 Jun 2008 00:57:43 -0000 @@ -1,7 +1,7 @@ /* $Id: admin_menu.css,v 1.15.2.10 2008/03/02 22:10:35 sun Exp $ */ /** * Administration Menu. - * + * * Implementation of Sons of Suckerfish Dropdowns. * @see www.htmldog.com/articles/suckerfish **/ Index: admin_menu.install =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/admin_menu/admin_menu.install,v retrieving revision 1.3.2.3 diff -u -p -r1.3.2.3 admin_menu.install --- admin_menu.install 24 Feb 2008 17:32:56 -0000 1.3.2.3 +++ admin_menu.install 15 Jun 2008 01:19:14 -0000 @@ -2,6 +2,17 @@ // $Id: admin_menu.install,v 1.3.2.3 2008/02/24 17:32:56 sun Exp $ /** + * Implementation of hook_uninstall(). + */ +function admin_menu_uninstall() { + // Delete variables. + variable_del('admin_menu_devel_modules_enabled'); + variable_del('admin_menu_margin_top'); + variable_del('admin_menu_tweak_menu'); + variable_del('admin_menu_tweak_modules'); +} + +/** * #224605: Rebuild cached menu for users. */ function admin_menu_update_5202() { @@ -16,3 +27,4 @@ function admin_menu_update_5202() { return $ret; } + Index: admin_menu.js =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/admin_menu/admin_menu.js,v retrieving revision 1.2.2.6 diff -u -p -r1.2.2.6 admin_menu.js --- admin_menu.js 8 Jun 2008 14:09:11 -0000 1.2.2.6 +++ admin_menu.js 15 Jun 2008 01:04:34 -0000 @@ -30,7 +30,7 @@ $(document).ready(function() { $(this).removeClass('iehover'); }); } - + // Delayed mouseout. $('#admin-menu li').hover(function() { // Stop the timer. Index: admin_menu.module =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/admin_menu/admin_menu.module,v retrieving revision 1.26.2.23 diff -u -p -r1.26.2.23 admin_menu.module --- admin_menu.module 8 Jun 2008 14:16:14 -0000 1.26.2.23 +++ admin_menu.module 15 Jun 2008 01:09:10 -0000 @@ -22,14 +22,14 @@ function admin_menu_help($section) { 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.'); 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 +

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, +

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 +

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 @@ -467,20 +467,27 @@ function admin_menu_panels_cache() { * on larger Drupal sites this is actually a 10% performance increase. */ function admin_menu_toggle_modules() { - $current_state = variable_get('admin_menu_devel_modules_enabled', NULL); - if (isset($current_state)) { + $saved_state = variable_get('admin_menu_devel_modules_enabled', NULL); + if (isset($saved_state)) { // Re-enable modules that were enabled before. - module_enable($current_state); + 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)))); } else { // Allow site admins to override this variable via settings.php. $devel_modules = variable_get('admin_menu_devel_modules', array('cache_disable', 'coder', 'debug', 'delete_all', 'demo', 'devel', 'devel_node_access', 'macro', 'form_controller', 'imagecache_ui', 'journal', 'trace', 'util', 'views_ui', 'views_theme_wizard')); // Store currently enabled modules in a variable. $devel_modules = array_intersect(module_list(FALSE, FALSE), $devel_modules); - variable_set('admin_menu_devel_modules_enabled', $devel_modules); - // Disable developer modules. - module_disable($devel_modules); + if (!empty($devel_modules)) { + variable_set('admin_menu_devel_modules_enabled', $devel_modules); + // Disable developer modules. + module_disable($devel_modules); + drupal_set_message(t('Disabled these modules: !module-list.', array('!module-list' => implode(', ', $devel_modules)))); + } + else { + drupal_set_message(t('No developer modules are enabled.')); + } } drupal_goto(referer_uri()); }