Index: admin_menu.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/admin_menu/admin_menu.module,v
retrieving revision 1.112
diff -u -p -r1.112 admin_menu.module
--- admin_menu.module	20 Feb 2010 02:17:55 -0000	1.112
+++ admin_menu.module	15 Mar 2010 23:27:08 -0000
@@ -472,7 +472,7 @@ function theme_admin_menu_links($variabl
       '#options' => array(),
     );
     // Render children to determine whether this link is expandable.
-    if (isset($elements[$path]['#type']) || isset($elements[$path]['#theme'])) {
+    if (isset($elements[$path]['#type']) || isset($elements[$path]['#theme']) || isset($elements[$path]['#pre_render'])) {
       $elements[$path]['#admin_menu_depth'] = $depth_child;
       $elements[$path]['#children'] = drupal_render($elements[$path]);
     }
Index: admin_menu_toolbar/admin_menu_toolbar.css
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/admin_menu/admin_menu_toolbar/admin_menu_toolbar.css,v
retrieving revision 1.5
diff -u -p -r1.5 admin_menu_toolbar.css
--- admin_menu_toolbar/admin_menu_toolbar.css	20 Feb 2010 02:17:55 -0000	1.5
+++ admin_menu_toolbar/admin_menu_toolbar.css	16 Mar 2010 00:02:15 -0000
@@ -84,7 +84,7 @@ body div#toolbar {
   float: right;
 }
 #admin-menu li.admin-menu-shortcuts span.toggle {
-  background: url(toolbar.png) 0 -20px no-repeat;
+  background: url(toolbar.png) -25px -20px no-repeat;
   cursor: pointer;
   display: block;
   height: 25px;
@@ -93,25 +93,28 @@ body div#toolbar {
   width: 25px;
 }
 #admin-menu li.admin-menu-shortcuts-active span.toggle {
-  background-position: -25px -60px;
+  background-position: 0 -20px;
 }
 
 /**
  * Shortcuts widget.
  */
-#admin-menu li.admin-menu-shortcuts-active ul {
+#admin-menu li.admin-menu-shortcuts-active > ul {
+  clear: both;
   display: block !important;
+  float: none;
   left: 0 !important;
   width: 100%;
 }
-#admin-menu li.admin-menu-shortcuts ul {
+#admin-menu li.admin-menu-shortcuts > ul {
   background-color: #666;
-  padding: 5px 10px;
 }
-#admin-menu li.admin-menu-shortcuts ul li {
+#admin-menu li.admin-menu-shortcuts > ul > li {
   background: transparent none;
+  display: block;
+  float: none;
   opacity: 1;
-  width: auto;
+  width: 100%;
 }
 #admin-menu li.admin-menu-shortcuts ul li a {
   border-radius: 5px;
@@ -128,3 +131,22 @@ body div#toolbar {
 #admin-menu li.admin-menu-shortcuts ul li a.active {
   background: url(toolbar.png) 0 -20px repeat-x;
 }
+#admin-menu .admin-menu-shortcuts #shortcut-toolbar ul {
+  display: block !important;
+  float: none;
+  left: 0 !important;
+  padding: 0 20px;
+  position: static;
+  width: auto;
+}
+#admin-menu .admin-menu-shortcuts #shortcut-toolbar ul li {
+  background: transparent none;
+  float: left;
+  width: auto;
+}
+#admin-menu .admin-menu-shortcuts ul li #shortcuts-edit {
+  float: right;
+  padding: 5px 10px 5px 5px;
+  line-height: 24px;
+  color: #bbb;
+}
Index: admin_menu_toolbar/admin_menu_toolbar.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/admin_menu/admin_menu_toolbar/admin_menu_toolbar.module,v
retrieving revision 1.4
diff -u -p -r1.4 admin_menu_toolbar.module
--- admin_menu_toolbar/admin_menu_toolbar.module	19 Feb 2010 23:19:00 -0000	1.4
+++ admin_menu_toolbar/admin_menu_toolbar.module	16 Mar 2010 00:03:36 -0000
@@ -57,29 +57,23 @@ function admin_menu_toolbar_admin_menu_o
   $content['user']['account']['#title'] = t('Hello <strong>@username</strong>', array('@username' => $content['user']['account']['#title']));
   $content['user']['account']['#options']['html'] = TRUE;
 
-  // Add shortcuts menu.
-  $content['shortcuts'] = array(
-    '#theme' => 'admin_menu_links',
-    '#weight' => -200,
-  );
-  $content['shortcuts']['shortcuts'] = array(
-    '#title' => t('Show shortcuts'),
-    // @todo How do we want to trigger/store state?
-    '#attributes' => array('class' => array('admin-menu-shortcuts')),
-    //'#attributes' => array('class' => array('admin-menu-shortcuts', 'admin-menu-shortcuts-active')),
-    '#options' => array(
-      'attributes' => array('class' => 'toggle'),
-    ),
-  );
-  // @todo *Move* this from $content['menu'] instead.
-  $content['shortcuts']['shortcuts']['node-add'] = array(
-    '#title' => t('Add content'),
-    '#href' => 'node/add',
-  );
-  $content['shortcuts']['shortcuts']['admin-content-node'] = array(
-    '#title' => t('Find content'),
-    '#href' => 'admin/content/node',
-    '#access' => user_access('administer nodes'),
-  );
+  if (module_exists('shortcut')) {
+    // Add shortcuts menu.
+    $content['shortcuts'] = array(
+      '#theme' => 'admin_menu_links',
+      '#weight' => -200,
+    );
+    $content['shortcuts']['shortcuts'] = array(
+      '#title' => t('Show shortcuts'),
+      // @todo How do we want to trigger/store state?
+      '#attributes' => array('class' => array('admin-menu-shortcuts')),
+      '#attributes' => array('class' => array('admin-menu-shortcuts', 'admin-menu-shortcuts-active')),
+      '#options' => array(
+        'attributes' => array('class' => 'toggle'),
+      ),
+    );
+    $content['shortcuts']['shortcuts']['shortcuts'] = array(
+      '#pre_render' => array('shortcut_toolbar_pre_render'),
+    );
+  }
 }
-