Index: page.tpl.php =================================================================== RCS file: /cvs/drupal-contrib/contributions/themes/rootcandy/page.tpl.php,v retrieving revision 1.24 diff -u -r1.24 page.tpl.php --- page.tpl.php 5 Oct 2008 13:44:41 -0000 1.24 +++ page.tpl.php 10 Nov 2009 20:53:08 -0000 @@ -4,12 +4,7 @@ ?> - - <?php print $head_title ?> - - - - + 'rootcandy-menu')); // } ?> -
'; endif; ?> -
'; endif; ?> - +
'; endif; ?> +
'; endif; ?> + - + '; endif; ?> '; endif; ?>

Index: rootcandy.info =================================================================== RCS file: /cvs/drupal-contrib/contributions/themes/rootcandy/rootcandy.info,v retrieving revision 1.9 diff -u -r1.9 rootcandy.info --- rootcandy.info 5 Oct 2008 09:08:44 -0000 1.9 +++ rootcandy.info 10 Nov 2009 20:56:02 -0000 @@ -7,15 +7,16 @@ stylesheets[print][] = print.css stylesheets[screen][] = icons.css +regions[help] = Help regions[admin_left] = Left sidebar regions[admin_right] = Right sidebar regions[content] = Content regions[header] = Header regions[footer] = Footer -core = 6.x +core = 7.x ; Settings settings[rootcandy_navigation_icons] = 0 settings[rootcandy_navigation_icons_size] = 24 -settings[rootcandy_header_display] = 0 \ No newline at end of file +settings[rootcandy_header_display] = 0 Index: template.php =================================================================== RCS file: /cvs/drupal-contrib/contributions/themes/rootcandy/template.php,v retrieving revision 1.37 diff -u -r1.37 template.php --- template.php 5 Oct 2008 13:44:41 -0000 1.37 +++ template.php 10 Nov 2009 21:03:27 -0000 @@ -26,7 +26,7 @@ // Add classes describing the menu trail of the page. $class = rootcandy_get_page_classes(); - +dsm($class); if (isset($class)) { print ' class="'. $class .'"'; } @@ -134,7 +134,7 @@ if ($subdir) { $subdir = $subdir .'/'; } - $icon = $path .'/icons/i'. $size .'/'. $subdir . $name .'.png'; + $icon = array('icon' => $path .'/icons/i'. $size .'/'. $subdir . $name .'.png'); return theme('image', $icon); } @@ -197,8 +197,9 @@ return $classes; } -function rootcandy_breadcrumb($breadcrumb) { +function rootcandy_breadcrumb($variables) { global $language; + $breadcrumb = $variables['breadcrumb']; if (!empty($breadcrumb)) { if ($language->direction) { return '
'. implode(' « ', array_reverse($breadcrumb)) .'
'; Index: theme-settings.php =================================================================== RCS file: /cvs/drupal-contrib/contributions/themes/rootcandy/theme-settings.php,v retrieving revision 1.6 diff -u -r1.6 theme-settings.php --- theme-settings.php 3 Oct 2008 21:23:48 -0000 1.6 +++ theme-settings.php 10 Nov 2009 20:40:21 -0000 @@ -2,25 +2,14 @@ // $Id: theme-settings.php,v 1.6 2008/10/03 21:23:48 sign Exp $ /** - * Implementation of THEMEHOOK_settings() function. + * Implementation of THEMEHOOK_form_FORM_ID_alter() function. * - * @param $saved_settings - * array An array of saved settings for this theme. - * @return - * array A form array. + * @param $form + * Nested array of form elements that comprise the form. + * @param $form_state + * A keyed array containing the current state of the form. */ -function rootcandy_settings($saved_settings, $subtheme_defaults = array()) { - - // Get the default values from the .info file. - $themes = list_themes(); - $defaults = $themes['rootcandy']->info['settings']; - - // Allow a subtheme to override the default values. - $defaults = array_merge($defaults, $subtheme_defaults); - - // Merge the saved variables and their default values. - $settings = array_merge($defaults, $saved_settings); - +function rootcandy_form_system_theme_settings_alter(&$form, $form_state) { $form['header'] = array( '#type' => 'fieldset', '#title' => t('Header'), @@ -32,7 +21,7 @@ $form['header']['rootcandy_header_display'] = array( '#type' => 'checkbox', '#title' => t('Disable header'), - '#default_value' => $settings['rootcandy_header_display'], + '#default_value' => theme_get_setting('rootcandy_header_display'), ); $form['navigation'] = array( @@ -46,7 +35,7 @@ $form['navigation']['rootcandy_navigation_icons'] = array( '#type' => 'checkbox', '#title' => t('Disable icons for main navigation'), - '#default_value' => $settings['rootcandy_navigation_icons'], + '#default_value' => theme_get_setting('rootcandy_navigation_icons'), ); @@ -54,7 +43,7 @@ '#type' => 'select', '#options' => array(16 => 16, 24 => 24, 32 => 32), '#title' => t('Set icons size for main navigation'), - '#default_value' => $settings['rootcandy_navigation_icons_size'], + '#default_value' => theme_get_setting('rootcandy_navigation_icons_size'), ); $form['navigation']['nav-by-role'] = array( @@ -72,13 +61,10 @@ $form['navigation']['nav-by-role']['rootcandy_navigation_source_'. $rid] = array( '#type' => 'select', '#title' => t($role .' navigation'), - '#default_value' => $settings['rootcandy_navigation_source_'. $rid], + '#default_value' => theme_get_setting('rootcandy_navigation_source_'. $rid), '#options' => $primary_options, '#tree' => FALSE, '#description' => t('Select what should be displayed as the navigation menu for role '. $role .'.'), ); } - - // Return the additional form widgets - return $form; -} \ No newline at end of file +}