? 569568_rootcandy_top_navigation.patch
? rootcandy_sub_navigation.patch
? icons/i24/admin/.directory
? icons/i32/admin/.directory
? images/tooltip
? rootcandy_dark/images/tabs/.directory
Index: page.tpl.php
===================================================================
RCS file: /cvs/drupal-contrib/contributions/themes/rootcandy/page.tpl.php,v
retrieving revision 1.23.2.18
diff -u -p -r1.23.2.18 page.tpl.php
--- page.tpl.php	27 Mar 2010 15:53:20 -0000	1.23.2.18
+++ page.tpl.php	23 Apr 2010 19:21:48 -0000
@@ -46,7 +46,7 @@
     <div id="page-wrapper"><div id="page-wrapper-content">
       <?php print $header ?>
       <div id="navigation" <?php if (!$hide_header) print 'class="header-on"' ?>>
-        <?php print _rootcandy_admin_navigation() ?>
+        <?php print $rootcandy_navigation ?>
 
       <?php
       if ($logo) {
Index: template.php
===================================================================
RCS file: /cvs/drupal-contrib/contributions/themes/rootcandy/template.php,v
retrieving revision 1.36.2.44
diff -u -p -r1.36.2.44 template.php
--- template.php	23 Apr 2010 18:44:57 -0000	1.36.2.44
+++ template.php	23 Apr 2010 19:21:49 -0000
@@ -1,5 +1,5 @@
 <?php
-// $Id: template.php,v 1.36.2.44 2010/04/23 18:44:57 sign Exp $
+// $Id: template.php,v 1.36.2.43 2010/03/27 15:53:20 sign Exp $
 
 /**
  * @file
@@ -129,7 +129,18 @@ function _rootcandy_admin_navigation() {
       $items[] = $item;
 
     }
-    return theme('admin_navigation', $items, $list_class);
+
+    $level = 1;
+    if ($rootcandy_navigation == '_rootcandy_default_navigation') {
+      $rootcandy_navigation = 'navigation';
+      $level = 2;
+    }
+
+    return array(
+      'navigation' => theme('admin_navigation', $items, $list_class),
+      'menu' => $rootcandy_navigation,
+      'level' => $level,
+    );
   }
 }
 
@@ -232,9 +243,12 @@ function rootcandy_preprocess_page(&$var
   $vars['panel_navigation'] = '<a id="open" class="open" href="#"><span class="panel-open">'. t('Open Panel') .'</span></a>';
   $vars['panel_navigation'] .= '<a id="close" style="display: none;" class="close" href="#"><span class="panel-close">'. t('Close Panel') .'</span></a>';
 
+  $rootcandy_nav = _rootcandy_admin_navigation();
+  $vars['rootcandy_navigation'] = $rootcandy_nav['navigation'];
+
   // get admin links into the region
   if (arg(0) == 'admin' AND arg(2)) {
-    $menu = menu_navigation_links('navigation', 2);
+    $menu = menu_navigation_links($rootcandy_nav['menu'], $rootcandy_nav['level']);
     $menu_links = _rootcandy_links($menu, array('id' => 'rootcandy-menu'));
     if ($language->direction) {
       $vars['admin_right'] = $menu_links . $vars['admin_right'];