Index: contributions/themes/fusion/fusion_core/template.php
===================================================================
RCS file: /cvs/drupal-contrib/contributions/themes/fusion/fusion_core/template.php,v
retrieving revision 1.6
diff -u -r1.6 template.php
--- contributions/themes/fusion/fusion_core/template.php	2 Dec 2009 01:20:16 -0000	1.6
+++ contributions/themes/fusion/fusion_core/template.php	19 Dec 2009 00:49:21 -0000
@@ -1,499 +1,499 @@
-<?php
-// $Id: template.php,v 1.6 2009/12/02 01:20:16 sociotech Exp $
-
-require_once('theme-settings.php');
-
-
-/**
- * Initialize theme settings
- */
-global $theme_key;
-fusion_core_initialize_theme_settings($theme_key);
-
-
-/**
- * Maintenance page preprocessing
- */
-function fusion_core_preprocess_maintenance_page(&$vars) {
-  fusion_core_preprocess_page($vars);
-}
-
-
-/**
- * Page preprocessing
- */
-function fusion_core_preprocess_page(&$vars) {
-  global $language, $theme_key, $theme_info, $user;
-
-  // Remove sidebars if disabled e.g., for Panels
-  if (!$vars['show_blocks']) {
-    $vars['sidebar_first'] = '';
-    $vars['sidebar_last'] = '';
-  }
-  // Set grid info & row widths
-  $grid_name = substr(theme_get_setting('theme_grid'), 0, 7);
-  $grid_type = substr(theme_get_setting('theme_grid'), 7);
-  $grid_width = (int)substr($grid_name, 4, 2);
-  $vars['grid_width'] = $grid_name . $grid_width;
-  $sidebar_first_width = ($vars['sidebar_first']) ? theme_get_setting('sidebar_first_width') : 0;
-  $sidebar_last_width = ($vars['sidebar_last']) ? theme_get_setting('sidebar_last_width') : 0;
-  $vars['sidebar_first_width'] = $grid_name . $sidebar_first_width;
-  $vars['main_group_width'] = $grid_name . ($grid_width - $sidebar_first_width);
-  // For nested elements in a fluid grid calculate % widths & add inline
-  if ($grid_type == 'fluid') {
-    $sidebar_last_width = round(($sidebar_last_width/($grid_width - $sidebar_first_width)) * 100, 2);
-    $vars['content_group_width'] = '" style="width:' . (100 - $sidebar_last_width) . '%';
-    $vars['sidebar_last_width'] = '" style="width:' . $sidebar_last_width . '%';
-  }
-  else {
-    $vars['content_group_width'] = $grid_name . ($grid_width - ($sidebar_first_width + $sidebar_last_width));
-    $vars['sidebar_last_width'] = $grid_name . $sidebar_last_width;
-  }
-
-  // Add to array of helpful body classes
-  $body_classes = explode(' ', $vars['body_classes']);                                               // Default classes
-  if (isset($vars['node'])) {
-    $body_classes[] = ($vars['node']) ? 'full-node' : '';                                            // Full node
-    $body_classes[] = (($vars['node']->type == 'forum') || (arg(0) == 'forum')) ? 'forum' : '';      // Forum page
-  }
-  else {
-    $body_classes[] = (arg(0) == 'forum') ? 'forum' : '';                                            // Forum page
-  }
-  if (module_exists('panels') && function_exists('panels_get_current_page_display')) {               // Panels page
-    $body_classes[] = (panels_get_current_page_display()) ? 'panels' : '';
-  }
-  $body_classes[] = 'layout-'. (($vars['sidebar_first']) ? 'first-main' : 'main') . (($vars['sidebar_last']) ? '-last' : '');  // Sidebars active
-  $body_classes[] = theme_get_setting('sidebar_layout');                                             // Sidebar layout
-  $body_classes[] = (theme_get_setting('theme_font') != 'none') ? theme_get_setting('theme_font') : '';                        // Font family
-  $body_classes[] = theme_get_setting('theme_font_size');                                            // Font size
-  $body_classes[] = (user_access('administer blocks', $user) && theme_get_setting('grid_mask')) ? 'grid-mask-enabled' : '';    // Grid mask overlay
-  $body_classes[] = 'grid-type-' . $grid_type;                                                       // Fixed width or fluid
-  $body_classes[] = 'grid-width-' . $grid_width;                                                     // Grid width in units
-  $body_classes[] = ($grid_type == 'fluid') ? theme_get_setting('fluid_grid_width') : '';            // Fluid grid width in %
-  $body_classes = array_filter($body_classes);                                                       // Remove empty elements
-  $vars['body_classes'] = implode(' ', $body_classes);                                               // Create class list separated by spaces
-  $vars['body_id'] = 'pid-' . strtolower(preg_replace('/[^a-zA-Z0-9-]+/', '-', drupal_get_path_alias($_GET['q'])));            // Add a unique page id
-
-  // Generate menu tree from primary links, add Superfish class
-  $vars['primary_links_tree'] = '';
-  if ($vars['primary_links']) {
-    $primary_tree = menu_tree(variable_get('menu_primary_links_source', 'primary-links'));
-    $vars['primary_links_tree'] = preg_replace('/^<ul class="menu/i', '<ul class="menu sf-menu', $primary_tree, 1);
-  }
-
-  // Remove breadcrumbs if disabled
-  if (theme_get_setting('breadcrumb_display') == 0) {
-    $vars['breadcrumb'] = '';
-  }
-
-  // Add grid, color, ie6, ie7, ie8 & local stylesheets, including inherited & rtl versions
-  $grid_style = '/css/' . theme_get_setting('theme_grid');
-  $color_style = '/css/' . theme_get_setting('theme_color');
-  $themes = fusion_core_theme_paths($theme_key);
-  $vars['setting_styles'] = $vars['ie6_styles'] = $vars['ie7_styles'] = $vars['ie8_styles'] = $vars['local_styles'] = '';
-  foreach ($themes as $name => $path) {
-    $link = '<link type="text/css" rel="stylesheet" media="all" href="' . base_path() . $path;
-    $vars['setting_styles'] .= (file_exists($path . $grid_style . '.css')) ? $link . $grid_style . '.css" />' . "\n" : '';
-    $vars['setting_styles'] .= (file_exists($path . $color_style . '.css')) ? $link . $color_style . '.css" />' . "\n" : '';
-    $vars['ie6_styles'] .= (file_exists($path . '/css/ie6-fixes.css')) ? $link . '/css/ie6-fixes.css" />' . "\n" : '';
-    $vars['ie7_styles'] .= (file_exists($path . '/css/ie7-fixes.css')) ? $link . '/css/ie7-fixes.css" />' . "\n" : '';
-    $vars['ie8_styles'] .= (file_exists($path . '/css/ie8-fixes.css')) ? $link . '/css/ie8-fixes.css" />' . "\n" : '';
-    $vars['local_styles'] .= (file_exists($path . '/css/local.css')) ? $link . '/css/local.css" />' . "\n" : '';
-    if (defined('LANGUAGE_RTL') && $language->direction == LANGUAGE_RTL) {
-      $vars['setting_styles'] .= (file_exists($path . $grid_style . '-rtl.css')) ? $link . $grid_style . '-rtl.css" />' . "\n" : '';
-      $vars['setting_styles'] .= (file_exists($path . $color_style . '-rtl.css')) ? $link . $color_style . '-rtl.css" />' . "\n" : '';
-      $vars['ie6_styles'] .= (file_exists($path . '/css/ie6-fixes-rtl.css')) ? $link . '/css/ie6-fixes-rtl.css" />' . "\n" : '';
-      $vars['ie7_styles'] .= (file_exists($path . '/css/ie7-fixes-rtl.css')) ? $link . '/css/ie7-fixes-rtl.css" />' . "\n" : '';
-      $vars['ie8_styles'] .= (file_exists($path . '/css/ie8-fixes-rtl.css')) ? $link . '/css/ie8-fixes-rtl.css" />' . "\n" : '';
-      $vars['local_styles'] .= (file_exists($path . '/css/local-rtl.css')) ? $link . '/css/local-rtl.css" />' . "\n" : '';
-    }
-  }
-
-  // Use grouped import setting to avoid 30 stylesheet limit in IE
-  if (theme_get_setting('fix_css_limit') && !variable_get('preprocess_css', FALSE)) {
-    $css = drupal_add_css();
-    $style_count = substr_count($vars['setting_styles'] . $vars['ie6_styles'] . $vars['ie7_styles'] . $vars['ie8_styles'] . $vars['local_styles'], '<link');
-    if (fusion_core_css_count($css) > (30 - $style_count)) {
-      $styles = '';
-      $suffix = "\n".'</style>'."\n";
-      foreach ($css as $media => $types) {
-        $prefix = '<style type="text/css" media="'. $media .'">'."\n";
-        $imports = array();
-        foreach ($types as $files) {
-          foreach ($files as $file => $preprocess) {
-            $imports[] = '@import "'. base_path() . $file .'";';
-            if (count($imports) == 30) {
-              $styles .= $prefix . implode("\n", $imports) . $suffix;
-              $imports = array();
-            }
-          }
-        }
-        $styles .= (count($imports) > 0) ? ($prefix . implode("\n", $imports) . $suffix) : '';
-      }
-      $vars['styles'] = $styles;
-    }
-  }
-}
-
-
-/**
- * Node preprocessing
- */
-function fusion_core_preprocess_node(&$vars) {
-  // Build array of handy node classes
-  $node_classes = array();
-  $node_classes[] = $vars['zebra'];                                      // Node is odd or even
-  $node_classes[] = (!$vars['node']->status) ? 'node-unpublished' : '';  // Node is unpublished
-  $node_classes[] = ($vars['sticky']) ? 'sticky' : '';                   // Node is sticky
-  $node_classes[] = (isset($vars['node']->teaser)) ? 'teaser' : 'full-node';    // Node is teaser or full-node
-  $node_classes[] = 'node-type-'. $vars['node']->type;                   // Node is type-x, e.g., node-type-page
-  $node_classes[] = (isset($vars['skinr'])) ? $vars['skinr'] : '';       // Add Skinr classes if present
-  $node_classes = array_filter($node_classes);                           // Remove empty elements
-  $vars['node_classes'] = implode(' ', $node_classes);                   // Implode class list with spaces
-
-  // Add node_top and node_bottom region content
-  $vars['node_top'] = theme('blocks', 'node_top');
-  $vars['node_bottom'] = theme('blocks', 'node_bottom');
-
-  // Render Ubercart fields into separate variables for node-product.tpl.php
-  if (module_exists('uc_product') && uc_product_is_product($vars) && $vars['template_files'][0] == 'node-product') {
-    $node = node_build_content(node_load($vars['nid']));
-    $vars['fusion_uc_image'] = drupal_render($node->content['image']);
-    $vars['fusion_uc_body'] = drupal_render($node->content['body']);
-    $vars['fusion_uc_display_price'] = drupal_render($node->content['display_price']);
-    $vars['fusion_uc_add_to_cart'] = drupal_render($node->content['add_to_cart']);
-    $vars['fusion_uc_weight'] = drupal_render($node->content['weight']);
-    $vars['fusion_uc_dimensions'] = drupal_render($node->content['dimensions']);
-    $vars['fusion_uc_model'] = drupal_render($node->content['model']);
-    $vars['fusion_uc_list_price'] = drupal_render($node->content['list_price']);
-    $vars['fusion_uc_sell_price'] = drupal_render($node->content['sell_price']);
-    $vars['fusion_uc_cost'] = drupal_render($node->content['cost']);
-    $vars['fusion_uc_additional'] = drupal_render($node->content);
-  }
-}
-
-
-/**
- * Comment preprocessing
- */
-function fusion_core_preprocess_comment(&$vars) {
-  global $user;
-  static $comment_odd = TRUE;                                                                             // Comment is odd or even
-
-  // Build array of handy comment classes
-  $comment_classes = array();
-  $comment_classes[] = $comment_odd ? 'odd' : 'even';
-  $comment_odd = !$comment_odd;
-  $comment_classes[] = ($vars['comment']->status == COMMENT_NOT_PUBLISHED) ? 'comment-unpublished' : '';  // Comment is unpublished
-  $comment_classes[] = ($vars['comment']->new) ? 'comment-new' : '';                                      // Comment is new
-  $comment_classes[] = ($vars['comment']->uid == 0) ? 'comment-by-anon' : '';                             // Comment is by anonymous user
-  $comment_classes[] = ($user->uid && $vars['comment']->uid == $user->uid) ? 'comment-mine' : '';         // Comment is by current user
-  $node = node_load($vars['comment']->nid);                                                               // Comment is by node author
-  $vars['author_comment'] = ($vars['comment']->uid == $node->uid) ? TRUE : FALSE;
-  $comment_classes[] = ($vars['author_comment']) ? 'comment-by-author' : '';
-  $comment_classes = array_filter($comment_classes);                                                      // Remove empty elements
-  $vars['comment_classes'] = implode(' ', $comment_classes);                                              // Create class list separated by spaces
-
-  // Date & author
-  $submitted_by = t('by ') .'<span class="comment-name">'.  theme('username', $vars['comment']) .'</span>';
-  $submitted_by .= t(' - ') .'<span class="comment-date">'.  format_date($vars['comment']->timestamp, 'small') .'</span>';     // Format date as small, medium, or large
-  $vars['submitted'] = $submitted_by;
-}
-
-
-/**
- * Comment wrapper preprocessing
- * Defaults for comments display
- */
-function fusion_core_preprocess_comment_wrapper(&$vars) {
-  $vars['display_mode'] = COMMENT_MODE_FLAT_EXPANDED;
-  $vars['display_order'] = COMMENT_ORDER_OLDEST_FIRST;
-  $vars['comment_controls_state'] = COMMENT_CONTROLS_HIDDEN;
-}
-
-
-/**
- * Block preprocessing
- */
-function fusion_core_preprocess_block(&$vars) {
-  global $theme_info, $user;
-  static $regions, $sidebar_first_width, $sidebar_last_width, $grid_name, $grid_width, $grid_fixed;
-
-  // Initialize block region grid info once per page
-  if (!isset($regions)) {
-    $grid_name = substr(theme_get_setting('theme_grid'), 0, 7);
-    $grid_width = (int)substr($grid_name, 4, 2);
-    $grid_fixed = (substr(theme_get_setting('theme_grid'), 7) != 'fluid') ? 1 : 0;
-    $sidebar_first_width = (block_list('sidebar_first')) ? theme_get_setting('sidebar_first_width') : 0;
-    $sidebar_last_width = (block_list('sidebar_last')) ? theme_get_setting('sidebar_last_width') : 0;
-    $regions = fusion_core_set_regions($grid_width, $sidebar_first_width, $sidebar_last_width);
-  }
-
-  // Increment block count for current block's region, add first/last position class
-  $regions[$vars['block']->region]['count'] ++;
-  $region_count = $regions[$vars['block']->region]['count'];
-  $total_blocks = $regions[$vars['block']->region]['total'];
-  $vars['position'] = ($region_count == 1) ? 'first' : '';
-  $vars['position'] .= ($region_count == $total_blocks) ? ' last' : '';
-
-  // Set a default block width if not already set by Skinr
-  if (!isset($vars['skinr']) || (strpos($vars['skinr'], $grid_name) === false)) {
-    // Stack blocks vertically in sidebars by setting to full sidebar width
-    if ($vars['block']->region == 'sidebar_first') {
-      $width = $sidebar_first_width;
-    }
-    elseif ($vars['block']->region == 'sidebar_last') {
-      $width = $sidebar_last_width;
-    }
-    else {
-      // Default block width = region width divided by total blocks, adding any extra width to last block
-      $region_width = ($grid_fixed) ? $regions[$vars['block']->region]['width'] : $grid_width;  // fluid grid regions = 100%
-      $width_adjust = (($region_count == $total_blocks) && ($region_width % $total_blocks)) ? $region_width % $total_blocks : 0;
-      $width = ($total_blocks) ? floor($region_width / $total_blocks) + $width_adjust : 0;
-    }
-    $vars['skinr'] = (isset($vars['skinr'])) ? $vars['skinr'] . ' ' . $grid_name . $width : $grid_name . $width;
-  }
-
-  if (isset($vars['skinr']) && (strpos($vars['skinr'], 'superfish') !== false) &&
-     ($vars['block']->module == 'menu' || ($vars['block']->module == 'user' && $vars['block']->delta == 1))) {
-    $superfish = ' sf-menu';
-    $superfish .= (strpos($vars['skinr'], 'superfish-vertical')) ? ' sf-vertical' : '';
-    $vars['block']->content = preg_replace('/^<ul class="menu/i', '<ul class="menu' . $superfish, $vars['block']->content, 1);
-  }
-
-  // Add block edit links for admins
-  if (user_access('administer blocks', $user) && theme_get_setting('block_config_link')) {
-    $vars['edit_links'] = '<div class="fusion-edit">'. implode(' ', fusion_core_edit_links($vars['block'])) .'</div>';
-  }
-}
-
-
-/**
- * Views preprocessing
- * Add view type class (e.g., node, teaser, list, table)
- */
-function fusion_core_preprocess_views_view(&$vars) {
-  $vars['css_name'] = $vars['css_name'] .' view-style-'. views_css_safe(strtolower($vars['view']->type));
-}
-
-
-/**
- * Search result preprocessing
- */
-function fusion_core_preprocess_search_result(&$vars) {
-  static $search_zebra = 'even';
-
-  $search_zebra = ($search_zebra == 'even') ? 'odd' : 'even';
-  $vars['search_zebra'] = $search_zebra;
-  $result = $vars['result'];
-  $vars['url'] = check_url($result['link']);
-  $vars['title'] = check_plain($result['title']);
-
-  // Check for snippet existence. User search does not include snippets.
-  $vars['snippet'] = '';
-  if (isset($result['snippet']) && theme_get_setting('search_snippet')) {
-    $vars['snippet'] = $result['snippet'];
-  }
-
-  $info = array();
-  if (!empty($result['type']) && theme_get_setting('search_info_type')) {
-    $info['type'] = check_plain($result['type']);
-  }
-  if (!empty($result['user']) && theme_get_setting('search_info_user')) {
-    $info['user'] = $result['user'];
-  }
-  if (!empty($result['date']) && theme_get_setting('search_info_date')) {
-    $info['date'] = format_date($result['date'], 'small');
-  }
-  if (isset($result['extra']) && is_array($result['extra'])) {
-    // $info = array_merge($info, $result['extra']);  Drupal bug?  [extra] array not keyed with 'comment' & 'upload'
-    if (!empty($result['extra'][0]) && theme_get_setting('search_info_comment')) {
-      $info['comment'] = $result['extra'][0];
-    }
-    if (!empty($result['extra'][1]) && theme_get_setting('search_info_upload')) {
-      $info['upload'] = $result['extra'][1];
-    }
-  }
-
-  // Provide separated and grouped meta information.
-  $vars['info_split'] = $info;
-  $vars['info'] = implode(' - ', $info);
-
-  // Provide alternate search result template.
-  $vars['template_files'][] = 'search-result-'. $vars['type'];
-}
-
-
-/**
- * Username override
- * Hides or shows username '(not verified)' text
- */
-function fusion_core_username($object) {
-  if ((!$object->uid) && $object->name) {
-    $output = (!empty($object->homepage)) ? l($object->name, $object->homepage, array('attributes' => array('rel' => 'nofollow'))) : check_plain($object->name);
-    $output .= (theme_get_setting('user_notverified_display') == 1) ? t(' (not verified)') : '';
-  }
-  else {
-    $output = theme_username($object);
-  }
-  return $output;
-}
-
-
-/**
- * File element override
- * Sets form file input max width
- */
-function fusion_core_file($element) {
-  $element['#size'] = ($element['#size'] > 40) ? 40 : $element['#size'];
-  return theme_file($element);
-}
-
-
-/**
- * Custom theme functions
- */
-function fusion_core_theme() {
-  return array(
-    'grid_row' => array(
-      'arguments' => array('element' => NULL, 'name' => NULL, 'class' => NULL, 'width' => NULL),
-    ),
-    'grid_block' => array(
-      'arguments' => array('element' => NULL, 'name' => NULL),
-    ),
-  );
-}
-
-
-/**
- * Row & block theme functions
- * Adds divs to elements in page.tpl.php
- */
-function fusion_core_grid_row($element, $name, $class='', $width='') {
-  $output = '';
-  if ($element) {
-    if ($class == 'full-width') {
-      $output .= '<div id="' . $name . '-wrapper" class="' . $name . '-wrapper full-width">' . "\n";
-      $output .= '<div id="' . $name . '" class="' . $name . ' row ' . $width . '">' . "\n";
-    }
-    else {
-      $output .= '<div id="' . $name . '" class="' . $name . ' row ' . $class . ' ' . $width . '">' . "\n";
-    }
-    $output .= '<div id="' . $name . '-inner" class="' . $name . '-inner inner">' . "\n";
-    $output .= $element;
-    $output .= '</div><!-- /' . $name . '-inner -->' . "\n";
-    $output .= '</div><!-- /' . $name . ' -->' . "\n";
-    $output .= ($class == 'full-width') ? '</div><!-- /' . $name . '-wrapper -->' . "\n" : '';
-  }
-  return $output;
-}
-
-
-function fusion_core_grid_block($element, $name) {
-  $output = '';
-  if ($element) {
-    $output .= '<div id="' . $name . '" class="' . $name . ' block">' . "\n";
-    $output .= '<div id="' . $name . '-inner" class="' . $name . '-inner inner">' . "\n";
-    $output .= $element;
-    $output .= '</div><!-- /' . $name . '-inner -->' . "\n";
-    $output .= '</div><!-- /' . $name . ' -->' . "\n";
-  }
-  return $output;
-}
-
-
-/**
- * Block region grid info function
- * Defaults match grid_row widths set in preprocess_page()
- */
-function fusion_core_set_regions($grid_width, $sidebar_first_width, $sidebar_last_width) {
-  $sidebar_total = $sidebar_first_width + $sidebar_last_width;
-  $regions = array(
-    'header_top' => array('width' => $grid_width, 'total' => count(block_list('header_top')), 'count' => 0),
-    'header' => array('width' => $grid_width, 'total' => count(block_list('header')), 'count' => 0),
-    'preface_top' => array('width' => $grid_width, 'total' => count(block_list('preface_top')), 'count' => 0),
-    'preface_bottom' => array('width' => $grid_width - $sidebar_first_width, 'total' => count(block_list('preface_bottom')), 'count' => 0),
-    'sidebar_first' => array('width' => $sidebar_first_width, 'total' => count(block_list('sidebar_first')), 'count' => 0),
-    'content_top' => array('width' => $grid_width - $sidebar_total, 'total' => count(block_list('content_top')), 'count' => 0),
-    'content' => array('width' => $grid_width - $sidebar_total, 'total' => count(block_list('content')), 'count' => 0),
-    'node_top' => array('width' => $grid_width - $sidebar_total, 'total' => count(block_list('node_top')), 'count' => 0),
-    'node_bottom' => array('width' => $grid_width - $sidebar_total, 'total' => count(block_list('node_bottom')), 'count' => 0),
-    'content_bottom' => array('width' => $grid_width - $sidebar_total, 'total' => count(block_list('content_bottom')), 'count' => 0),
-    'sidebar_last' => array('width' => $sidebar_last_width, 'total' => count(block_list('sidebar_last')), 'count' => 0),
-    'postscript_top' => array('width' => $grid_width - $sidebar_first_width, 'total' => count(block_list('postscript_top')), 'count' => 0),
-    'postscript_bottom' => array('width' => $grid_width, 'total' => count(block_list('postscript_bottom')), 'count' => 0),
-    'footer' => array('width' => $grid_width, 'total' => count(block_list('footer')), 'count' => 0)
-  );
-  return $regions;
-}
-
-
-/**
- * Block edit links function
- * Create block edit links for admins
- */
-function fusion_core_edit_links($block) {
-  $path = 'admin/build/block/configure/' . $block->module . '/' . $block->delta;
-  $return = drupal_get_destination();
-  // Use 'edit' for custom blocks, 'configure' for others
-  if ($block->module == 'block') {
-    $text = t('edit block');
-    $block_info = array('@region' => str_replace('_', ' ', $block->region));
-    $attributes = array('title' => t('edit the content of this Custom block (in @region)', $block_info), 'class' => 'fusion-block-edit');
-  }
-  else {
-    $text = t('configure block');
-    $block_info = array('@type' => ucwords($block->module), '@region' => str_replace('_', ' ', $block->region));
-    $attributes = array('title' => t('configure this @type block (in @region)', $block_info), 'class' => 'fusion-block-config');
-  }
-  $edit_links[] = l($text, $path, array('attributes' => $attributes, 'query' => $return));
-  // Add extra 'edit menu' for menu blocks
-  if (user_access('administer menu') && ($block->module == 'menu' || ($block->module == 'user' && $block->delta == 1))) {
-    $text = t('edit menu');
-    $path = 'admin/build/menu-customize/' . (($block->module == 'user') ? 'navigation' : $block->delta);
-    $attributes = array('title' => t('edit the menu of this @type block (in @region)', $block_info), 'class' => 'fusion-edit-menu');
-    $edit_links[] = l($text, $path, array('attributes' => $attributes, 'query' => $return));
-  }
-  return $edit_links;
-}
-
-
-/**
- * CSS count function
- * Counts the total number of CSS files in $vars['css']
- */
-function fusion_core_css_count($array) {
-  $count = 0;
-  foreach ($array as $item) {
-    $count = (is_array($item)) ? $count + fusion_core_css_count($item) : $count + 1;
-  }
-  return $count;
-}
-
-
-/**
- * Theme paths function
- * Retrieves current theme path and its parent
- * theme paths, in parent-to-child order.
- */
-function fusion_core_theme_paths($theme) {
-  $all_parents = array();
-  $themes = list_themes();
-  $all_parents[$theme] = drupal_get_path('theme', $theme);
-  $base_theme = $themes[$theme]->info['base theme'];
-  while ($base_theme) {
-    $all_parents[$base_theme] = drupal_get_path('theme', $base_theme);
-    $base_theme = (isset($themes[$base_theme]->info['base theme'])) ? $themes[$base_theme]->info['base theme'] : '';
-  }
-  return array_reverse($all_parents);
-}
-
-
-/**
- * Theme settings link function
- * Creates link with prefix and suffix text
- * ($options info: http://api.drupal.org/api/function/l)
- */
-function fusion_core_themesettings_link($prefix, $suffix, $text, $path, $options) {
-  return $prefix . (($text) ? l($text, $path, $options) : '') . $suffix;
-}
+<?php
+// $Id: template.php,v 1.6 2009/12/02 01:20:16 sociotech Exp $
+
+require_once('theme-settings.php');
+
+
+/**
+ * Initialize theme settings
+ */
+global $theme_key;
+fusion_core_initialize_theme_settings($theme_key);
+
+
+/**
+ * Maintenance page preprocessing
+ */
+function fusion_core_preprocess_maintenance_page(&$vars) {
+  fusion_core_preprocess_page($vars);
+}
+
+
+/**
+ * Page preprocessing
+ */
+function fusion_core_preprocess_page(&$vars) {
+  global $language, $theme_key, $theme_info, $user;
+
+  // Remove sidebars if disabled e.g., for Panels
+  if (!$vars['show_blocks']) {
+    $vars['sidebar_first'] = '';
+    $vars['sidebar_last'] = '';
+  }
+  // Set grid info & row widths
+  $grid_name = substr(theme_get_setting('theme_grid'), 0, 7);
+  $grid_type = substr(theme_get_setting('theme_grid'), 7);
+  $grid_width = (int)substr($grid_name, 4, 2);
+  $vars['grid_width'] = $grid_name . $grid_width;
+  $sidebar_first_width = ($vars['sidebar_first']) ? theme_get_setting('sidebar_first_width') : 0;
+  $sidebar_last_width = ($vars['sidebar_last']) ? theme_get_setting('sidebar_last_width') : 0;
+  $vars['sidebar_first_width'] = $grid_name . $sidebar_first_width;
+  $vars['main_group_width'] = $grid_name . ($grid_width - $sidebar_first_width);
+  // For nested elements in a fluid grid calculate % widths & add inline
+  if ($grid_type == 'fluid') {
+    $sidebar_last_width = round(($sidebar_last_width/($grid_width - $sidebar_first_width)) * 100, 2);
+    $vars['content_group_width'] = '" style="width:' . (100 - $sidebar_last_width) . '%';
+    $vars['sidebar_last_width'] = '" style="width:' . $sidebar_last_width . '%';
+  }
+  else {
+    $vars['content_group_width'] = $grid_name . ($grid_width - ($sidebar_first_width + $sidebar_last_width));
+    $vars['sidebar_last_width'] = $grid_name . $sidebar_last_width;
+  }
+
+  // Add to array of helpful body classes
+  $body_classes = explode(' ', $vars['body_classes']);                                               // Default classes
+  if (isset($vars['node'])) {
+    $body_classes[] = ($vars['node']) ? 'full-node' : '';                                            // Full node
+    $body_classes[] = (($vars['node']->type == 'forum') || (arg(0) == 'forum')) ? 'forum' : '';      // Forum page
+  }
+  else {
+    $body_classes[] = (arg(0) == 'forum') ? 'forum' : '';                                            // Forum page
+  }
+  if (module_exists('panels') && function_exists('panels_get_current_page_display')) {               // Panels page
+    $body_classes[] = (panels_get_current_page_display()) ? 'panels' : '';
+  }
+  $body_classes[] = 'layout-'. (($vars['sidebar_first']) ? 'first-main' : 'main') . (($vars['sidebar_last']) ? '-last' : '');  // Sidebars active
+  $body_classes[] = theme_get_setting('sidebar_layout');                                             // Sidebar layout
+  $body_classes[] = (theme_get_setting('theme_font') != 'none') ? theme_get_setting('theme_font') : '';                        // Font family
+  $body_classes[] = theme_get_setting('theme_font_size');                                            // Font size
+  $body_classes[] = (user_access('administer blocks', $user) && theme_get_setting('grid_mask')) ? 'grid-mask-enabled' : '';    // Grid mask overlay
+  $body_classes[] = 'grid-type-' . $grid_type;                                                       // Fixed width or fluid
+  $body_classes[] = 'grid-width-' . $grid_width;                                                     // Grid width in units
+  $body_classes[] = ($grid_type == 'fluid') ? theme_get_setting('fluid_grid_width') : '';            // Fluid grid width in %
+  $body_classes = array_filter($body_classes);                                                       // Remove empty elements
+  $vars['body_classes'] = implode(' ', $body_classes);                                               // Create class list separated by spaces
+  $vars['body_id'] = 'pid-' . strtolower(preg_replace('/[^a-zA-Z0-9-]+/', '-', drupal_get_path_alias($_GET['q'])));            // Add a unique page id
+
+  // Generate menu tree from primary links, add Superfish class
+  $vars['primary_links_tree'] = '';
+  if ($vars['primary_links']) {
+    $primary_tree = menu_tree(variable_get('menu_primary_links_source', 'primary-links'));
+    $vars['primary_links_tree'] = preg_replace('/^<ul class="menu/i', '<ul class="menu sf-menu', $primary_tree, 1);
+  }
+
+  // Remove breadcrumbs if disabled
+  if (theme_get_setting('breadcrumb_display') == 0) {
+    $vars['breadcrumb'] = '';
+  }
+
+  // Add grid, color, ie6, ie7, ie8 & local stylesheets, including inherited & rtl versions
+  $grid_style = '/css/' . theme_get_setting('theme_grid');
+  $color_style = '/css/' . theme_get_setting('theme_color');
+  $themes = fusion_core_theme_paths($theme_key);
+  $vars['setting_styles'] = $vars['ie6_styles'] = $vars['ie7_styles'] = $vars['ie8_styles'] = $vars['local_styles'] = '';
+  foreach ($themes as $name => $path) {
+    $link = '<link type="text/css" rel="stylesheet" media="all" href="' . base_path() . $path;
+    $vars['setting_styles'] .= (file_exists($path . $grid_style . '.css')) ? $link . $grid_style . '.css" />' . "\n" : '';
+    $vars['setting_styles'] .= (file_exists($path . $color_style . '.css')) ? $link . $color_style . '.css" />' . "\n" : '';
+    $vars['ie6_styles'] .= (file_exists($path . '/css/ie6-fixes.css')) ? $link . '/css/ie6-fixes.css" />' . "\n" : '';
+    $vars['ie7_styles'] .= (file_exists($path . '/css/ie7-fixes.css')) ? $link . '/css/ie7-fixes.css" />' . "\n" : '';
+    $vars['ie8_styles'] .= (file_exists($path . '/css/ie8-fixes.css')) ? $link . '/css/ie8-fixes.css" />' . "\n" : '';
+    $vars['local_styles'] .= (file_exists($path . '/css/local.css')) ? $link . '/css/local.css" />' . "\n" : '';
+    if (defined('LANGUAGE_RTL') && $language->direction == LANGUAGE_RTL) {
+      $vars['setting_styles'] .= (file_exists($path . $grid_style . '-rtl.css')) ? $link . $grid_style . '-rtl.css" />' . "\n" : '';
+      $vars['setting_styles'] .= (file_exists($path . $color_style . '-rtl.css')) ? $link . $color_style . '-rtl.css" />' . "\n" : '';
+      $vars['ie6_styles'] .= (file_exists($path . '/css/ie6-fixes-rtl.css')) ? $link . '/css/ie6-fixes-rtl.css" />' . "\n" : '';
+      $vars['ie7_styles'] .= (file_exists($path . '/css/ie7-fixes-rtl.css')) ? $link . '/css/ie7-fixes-rtl.css" />' . "\n" : '';
+      $vars['ie8_styles'] .= (file_exists($path . '/css/ie8-fixes-rtl.css')) ? $link . '/css/ie8-fixes-rtl.css" />' . "\n" : '';
+      $vars['local_styles'] .= (file_exists($path . '/css/local-rtl.css')) ? $link . '/css/local-rtl.css" />' . "\n" : '';
+    }
+  }
+
+  // Use grouped import setting to avoid 30 stylesheet limit in IE
+  if (theme_get_setting('fix_css_limit') && !variable_get('preprocess_css', FALSE)) {
+    $css = drupal_add_css();
+    $style_count = substr_count($vars['setting_styles'] . $vars['ie6_styles'] . $vars['ie7_styles'] . $vars['ie8_styles'] . $vars['local_styles'], '<link');
+    if (fusion_core_css_count($css) > (30 - $style_count)) {
+      $styles = '';
+      $suffix = "\n".'</style>'."\n";
+      foreach ($css as $media => $types) {
+        $prefix = '<style type="text/css" media="'. $media .'">'."\n";
+        $imports = array();
+        foreach ($types as $files) {
+          foreach ($files as $file => $preprocess) {
+            $imports[] = '@import "'. base_path() . $file .'";';
+            if (count($imports) == 30) {
+              $styles .= $prefix . implode("\n", $imports) . $suffix;
+              $imports = array();
+            }
+          }
+        }
+        $styles .= (count($imports) > 0) ? ($prefix . implode("\n", $imports) . $suffix) : '';
+      }
+      $vars['styles'] = $styles;
+    }
+  }
+}
+
+
+/**
+ * Node preprocessing
+ */
+function fusion_core_preprocess_node(&$vars) {
+  // Build array of handy node classes
+  $node_classes = array();
+  $node_classes[] = $vars['zebra'];                                      // Node is odd or even
+  $node_classes[] = (!$vars['node']->status) ? 'node-unpublished' : '';  // Node is unpublished
+  $node_classes[] = ($vars['sticky']) ? 'sticky' : '';                   // Node is sticky
+  $node_classes[] = (isset($vars['node']->teaser)) ? 'teaser' : 'full-node';    // Node is teaser or full-node
+  $node_classes[] = 'node-type-'. $vars['node']->type;                   // Node is type-x, e.g., node-type-page
+  $node_classes[] = (isset($vars['skinr'])) ? $vars['skinr'] : '';       // Add Skinr classes if present
+  $node_classes = array_filter($node_classes);                           // Remove empty elements
+  $vars['node_classes'] = implode(' ', $node_classes);                   // Implode class list with spaces
+
+  // Add node_top and node_bottom region content
+  $vars['node_top'] = theme('blocks', 'node_top');
+  $vars['node_bottom'] = theme('blocks', 'node_bottom');
+
+  // Render Ubercart fields into separate variables for node-product.tpl.php
+  if (module_exists('uc_product') && uc_product_is_product($vars) && $vars['template_files'][0] == 'node-product') {
+    $node = node_build_content(node_load($vars['nid']));
+    $vars['fusion_uc_image'] = drupal_render($node->content['image']);
+    $vars['fusion_uc_body'] = drupal_render($node->content['body']);
+    $vars['fusion_uc_display_price'] = drupal_render($node->content['display_price']);
+    $vars['fusion_uc_add_to_cart'] = drupal_render($node->content['add_to_cart']);
+    $vars['fusion_uc_weight'] = drupal_render($node->content['weight']);
+    $vars['fusion_uc_dimensions'] = drupal_render($node->content['dimensions']);
+    $vars['fusion_uc_model'] = drupal_render($node->content['model']);
+    $vars['fusion_uc_list_price'] = drupal_render($node->content['list_price']);
+    $vars['fusion_uc_sell_price'] = drupal_render($node->content['sell_price']);
+    $vars['fusion_uc_cost'] = drupal_render($node->content['cost']);
+    $vars['fusion_uc_additional'] = drupal_render($node->content);
+  }
+}
+
+
+/**
+ * Comment preprocessing
+ */
+function fusion_core_preprocess_comment(&$vars) {
+  global $user;
+  static $comment_odd = TRUE;                                                                             // Comment is odd or even
+
+  // Build array of handy comment classes
+  $comment_classes = array();
+  $comment_classes[] = $comment_odd ? 'odd' : 'even';
+  $comment_odd = !$comment_odd;
+  $comment_classes[] = ($vars['comment']->status == COMMENT_NOT_PUBLISHED) ? 'comment-unpublished' : '';  // Comment is unpublished
+  $comment_classes[] = ($vars['comment']->new) ? 'comment-new' : '';                                      // Comment is new
+  $comment_classes[] = ($vars['comment']->uid == 0) ? 'comment-by-anon' : '';                             // Comment is by anonymous user
+  $comment_classes[] = ($user->uid && $vars['comment']->uid == $user->uid) ? 'comment-mine' : '';         // Comment is by current user
+  $node = node_load($vars['comment']->nid);                                                               // Comment is by node author
+  $vars['author_comment'] = ($vars['comment']->uid == $node->uid) ? TRUE : FALSE;
+  $comment_classes[] = ($vars['author_comment']) ? 'comment-by-author' : '';
+  $comment_classes = array_filter($comment_classes);                                                      // Remove empty elements
+  $vars['comment_classes'] = implode(' ', $comment_classes);                                              // Create class list separated by spaces
+
+  // Date & author
+  $submitted_by = t('by ') .'<span class="comment-name">'.  theme('username', $vars['comment']) .'</span>';
+  $submitted_by .= t(' - ') .'<span class="comment-date">'.  format_date($vars['comment']->timestamp, 'small') .'</span>';     // Format date as small, medium, or large
+  $vars['submitted'] = $submitted_by;
+}
+
+
+/**
+ * Comment wrapper preprocessing
+ * Defaults for comments display
+ */
+function fusion_core_preprocess_comment_wrapper(&$vars) {
+  $vars['display_mode'] = COMMENT_MODE_FLAT_EXPANDED;
+  $vars['display_order'] = COMMENT_ORDER_OLDEST_FIRST;
+  $vars['comment_controls_state'] = COMMENT_CONTROLS_HIDDEN;
+}
+
+
+/**
+ * Block preprocessing
+ */
+function fusion_core_preprocess_block(&$vars) {
+  global $theme_info, $user;
+  static $regions, $sidebar_first_width, $sidebar_last_width, $grid_name, $grid_width, $grid_fixed;
+
+  // Initialize block region grid info once per page
+  if (!isset($regions)) {
+    $grid_name = substr(theme_get_setting('theme_grid'), 0, 7);
+    $grid_width = (int)substr($grid_name, 4, 2);
+    $grid_fixed = (substr(theme_get_setting('theme_grid'), 7) != 'fluid') ? 1 : 0;
+    $sidebar_first_width = (block_list('sidebar_first')) ? theme_get_setting('sidebar_first_width') : 0;
+    $sidebar_last_width = (block_list('sidebar_last')) ? theme_get_setting('sidebar_last_width') : 0;
+    $regions = fusion_core_set_regions($grid_width, $sidebar_first_width, $sidebar_last_width);
+  }
+
+  // Increment block count for current block's region, add first/last position class
+  $regions[$vars['block']->region]['count'] ++;
+  $region_count = $regions[$vars['block']->region]['count'];
+  $total_blocks = $regions[$vars['block']->region]['total'];
+  $vars['position'] = ($region_count == 1) ? 'first' : '';
+  $vars['position'] .= ($region_count == $total_blocks) ? ' last' : '';
+
+  // Set a default block width if not already set by Skinr
+  if (!isset($vars['skinr']) || (strpos($vars['skinr'], $grid_name) === false)) {
+    // Stack blocks vertically in sidebars by setting to full sidebar width
+    if ($vars['block']->region == 'sidebar_first') {
+      $width = $sidebar_first_width;
+    }
+    elseif ($vars['block']->region == 'sidebar_last') {
+      $width = $sidebar_last_width;
+    }
+    else {
+      // Default block width = region width divided by total blocks, adding any extra width to last block
+      $region_width = ($grid_fixed) ? $regions[$vars['block']->region]['width'] : $grid_width;  // fluid grid regions = 100%
+      $width_adjust = (($region_count == $total_blocks) && ($region_width % $total_blocks)) ? $region_width % $total_blocks : 0;
+      $width = ($total_blocks) ? floor($region_width / $total_blocks) + $width_adjust : 0;
+    }
+    $vars['skinr'] = (isset($vars['skinr'])) ? $vars['skinr'] . ' ' . $grid_name . $width : $grid_name . $width;
+  }
+
+  if (isset($vars['skinr']) && (strpos($vars['skinr'], 'superfish') !== false) &&
+     ($vars['block']->module == 'menu' || ($vars['block']->module == 'user' && $vars['block']->delta == 1))) {
+    $superfish = ' sf-menu';
+    $superfish .= (strpos($vars['skinr'], 'superfish-vertical')) ? ' sf-vertical' : '';
+    $vars['block']->content = preg_replace('/^<ul class="menu/i', '<ul class="menu' . $superfish, $vars['block']->content, 1);
+  }
+
+  // Add block edit links for admins
+  if (user_access('administer blocks', $user) && theme_get_setting('block_config_link')) {
+    $vars['edit_links'] = '<div class="fusion-edit">'. implode(' ', fusion_core_edit_links($vars['block'])) .'</div>';
+  }
+}
+
+
+/**
+ * Views preprocessing
+ * Add view type class (e.g., node, teaser, list, table)
+ */
+function fusion_core_preprocess_views_view(&$vars) {
+  $vars['css_name'] = $vars['css_name'] .' view-style-'. views_css_safe(strtolower($vars['view']->type));
+}
+
+
+/**
+ * Search result preprocessing
+ */
+function fusion_core_preprocess_search_result(&$vars) {
+  static $search_zebra = 'even';
+
+  $search_zebra = ($search_zebra == 'even') ? 'odd' : 'even';
+  $vars['search_zebra'] = $search_zebra;
+  $result = $vars['result'];
+  $vars['url'] = check_url($result['link']);
+  $vars['title'] = check_plain($result['title']);
+
+  // Check for snippet existence. User search does not include snippets.
+  $vars['snippet'] = '';
+  if (isset($result['snippet']) && theme_get_setting('search_snippet')) {
+    $vars['snippet'] = $result['snippet'];
+  }
+
+  $info = array();
+  if (!empty($result['type']) && theme_get_setting('search_info_type')) {
+    $info['type'] = check_plain($result['type']);
+  }
+  if (!empty($result['user']) && theme_get_setting('search_info_user')) {
+    $info['user'] = $result['user'];
+  }
+  if (!empty($result['date']) && theme_get_setting('search_info_date')) {
+    $info['date'] = format_date($result['date'], 'small');
+  }
+  if (isset($result['extra']) && is_array($result['extra'])) {
+    // $info = array_merge($info, $result['extra']);  Drupal bug?  [extra] array not keyed with 'comment' & 'upload'
+    if (!empty($result['extra'][0]) && theme_get_setting('search_info_comment')) {
+      $info['comment'] = $result['extra'][0];
+    }
+    if (!empty($result['extra'][1]) && theme_get_setting('search_info_upload')) {
+      $info['upload'] = $result['extra'][1];
+    }
+  }
+
+  // Provide separated and grouped meta information.
+  $vars['info_split'] = $info;
+  $vars['info'] = implode(' - ', $info);
+
+  // Provide alternate search result template.
+  $vars['template_files'][] = 'search-result-'. $vars['type'];
+}
+
+
+/**
+ * Username override
+ * Hides or shows username '(not verified)' text
+ */
+function fusion_core_username($object) {
+  if ((!$object->uid) && $object->name) {
+    $output = (!empty($object->homepage)) ? l($object->name, $object->homepage, array('attributes' => array('rel' => 'nofollow'))) : check_plain($object->name);
+    $output .= (theme_get_setting('user_notverified_display') == 1) ? t(' (not verified)') : '';
+  }
+  else {
+    $output = theme_username($object);
+  }
+  return $output;
+}
+
+
+/**
+ * File element override
+ * Sets form file input max width
+ */
+function fusion_core_file($element) {
+  $element['#size'] = ($element['#size'] > 40) ? 40 : $element['#size'];
+  return theme_file($element);
+}
+
+
+/**
+ * Custom theme functions
+ */
+function fusion_core_theme() {
+  return array(
+    'grid_row' => array(
+      'arguments' => array('element' => NULL, 'name' => NULL, 'class' => NULL, 'width' => NULL),
+    ),
+    'grid_block' => array(
+      'arguments' => array('element' => NULL, 'name' => NULL),
+    ),
+  );
+}
+
+
+/**
+ * Row & block theme functions
+ * Adds divs to elements in page.tpl.php
+ */
+function fusion_core_grid_row($element, $name, $class='', $width='') {
+  $output = '';
+  if ($element) {
+    if ($class == 'full-width') {
+      $output .= '<div id="' . $name . '-wrapper" class="' . $name . '-wrapper full-width">' . "\n";
+      $output .= '<div id="' . $name . '" class="' . $name . ' row ' . $width . '">' . "\n";
+    }
+    else {
+      $output .= '<div id="' . $name . '" class="' . $name . ' row ' . $class . ' ' . $width . '">' . "\n";
+    }
+    $output .= '<div id="' . $name . '-inner" class="' . $name . '-inner inner clearfix">' . "\n";
+    $output .= $element;
+    $output .= '</div><!-- /' . $name . '-inner -->' . "\n";
+    $output .= '</div><!-- /' . $name . ' -->' . "\n";
+    $output .= ($class == 'full-width') ? '</div><!-- /' . $name . '-wrapper -->' . "\n" : '';
+  }
+  return $output;
+}
+
+
+function fusion_core_grid_block($element, $name) {
+  $output = '';
+  if ($element) {
+    $output .= '<div id="' . $name . '" class="' . $name . ' block">' . "\n";
+    $output .= '<div id="' . $name . '-inner" class="' . $name . '-inner inner">' . "\n";
+    $output .= $element;
+    $output .= '</div><!-- /' . $name . '-inner -->' . "\n";
+    $output .= '</div><!-- /' . $name . ' -->' . "\n";
+  }
+  return $output;
+}
+
+
+/**
+ * Block region grid info function
+ * Defaults match grid_row widths set in preprocess_page()
+ */
+function fusion_core_set_regions($grid_width, $sidebar_first_width, $sidebar_last_width) {
+  $sidebar_total = $sidebar_first_width + $sidebar_last_width;
+  $regions = array(
+    'header_top' => array('width' => $grid_width, 'total' => count(block_list('header_top')), 'count' => 0),
+    'header' => array('width' => $grid_width, 'total' => count(block_list('header')), 'count' => 0),
+    'preface_top' => array('width' => $grid_width, 'total' => count(block_list('preface_top')), 'count' => 0),
+    'preface_bottom' => array('width' => $grid_width - $sidebar_first_width, 'total' => count(block_list('preface_bottom')), 'count' => 0),
+    'sidebar_first' => array('width' => $sidebar_first_width, 'total' => count(block_list('sidebar_first')), 'count' => 0),
+    'content_top' => array('width' => $grid_width - $sidebar_total, 'total' => count(block_list('content_top')), 'count' => 0),
+    'content' => array('width' => $grid_width - $sidebar_total, 'total' => count(block_list('content')), 'count' => 0),
+    'node_top' => array('width' => $grid_width - $sidebar_total, 'total' => count(block_list('node_top')), 'count' => 0),
+    'node_bottom' => array('width' => $grid_width - $sidebar_total, 'total' => count(block_list('node_bottom')), 'count' => 0),
+    'content_bottom' => array('width' => $grid_width - $sidebar_total, 'total' => count(block_list('content_bottom')), 'count' => 0),
+    'sidebar_last' => array('width' => $sidebar_last_width, 'total' => count(block_list('sidebar_last')), 'count' => 0),
+    'postscript_top' => array('width' => $grid_width - $sidebar_first_width, 'total' => count(block_list('postscript_top')), 'count' => 0),
+    'postscript_bottom' => array('width' => $grid_width, 'total' => count(block_list('postscript_bottom')), 'count' => 0),
+    'footer' => array('width' => $grid_width, 'total' => count(block_list('footer')), 'count' => 0)
+  );
+  return $regions;
+}
+
+
+/**
+ * Block edit links function
+ * Create block edit links for admins
+ */
+function fusion_core_edit_links($block) {
+  $path = 'admin/build/block/configure/' . $block->module . '/' . $block->delta;
+  $return = drupal_get_destination();
+  // Use 'edit' for custom blocks, 'configure' for others
+  if ($block->module == 'block') {
+    $text = t('edit block');
+    $block_info = array('@region' => str_replace('_', ' ', $block->region));
+    $attributes = array('title' => t('edit the content of this Custom block (in @region)', $block_info), 'class' => 'fusion-block-edit');
+  }
+  else {
+    $text = t('configure block');
+    $block_info = array('@type' => ucwords($block->module), '@region' => str_replace('_', ' ', $block->region));
+    $attributes = array('title' => t('configure this @type block (in @region)', $block_info), 'class' => 'fusion-block-config');
+  }
+  $edit_links[] = l($text, $path, array('attributes' => $attributes, 'query' => $return));
+  // Add extra 'edit menu' for menu blocks
+  if (user_access('administer menu') && ($block->module == 'menu' || ($block->module == 'user' && $block->delta == 1))) {
+    $text = t('edit menu');
+    $path = 'admin/build/menu-customize/' . (($block->module == 'user') ? 'navigation' : $block->delta);
+    $attributes = array('title' => t('edit the menu of this @type block (in @region)', $block_info), 'class' => 'fusion-edit-menu');
+    $edit_links[] = l($text, $path, array('attributes' => $attributes, 'query' => $return));
+  }
+  return $edit_links;
+}
+
+
+/**
+ * CSS count function
+ * Counts the total number of CSS files in $vars['css']
+ */
+function fusion_core_css_count($array) {
+  $count = 0;
+  foreach ($array as $item) {
+    $count = (is_array($item)) ? $count + fusion_core_css_count($item) : $count + 1;
+  }
+  return $count;
+}
+
+
+/**
+ * Theme paths function
+ * Retrieves current theme path and its parent
+ * theme paths, in parent-to-child order.
+ */
+function fusion_core_theme_paths($theme) {
+  $all_parents = array();
+  $themes = list_themes();
+  $all_parents[$theme] = drupal_get_path('theme', $theme);
+  $base_theme = $themes[$theme]->info['base theme'];
+  while ($base_theme) {
+    $all_parents[$base_theme] = drupal_get_path('theme', $base_theme);
+    $base_theme = (isset($themes[$base_theme]->info['base theme'])) ? $themes[$base_theme]->info['base theme'] : '';
+  }
+  return array_reverse($all_parents);
+}
+
+
+/**
+ * Theme settings link function
+ * Creates link with prefix and suffix text
+ * ($options info: http://api.drupal.org/api/function/l)
+ */
+function fusion_core_themesettings_link($prefix, $suffix, $text, $path, $options) {
+  return $prefix . (($text) ? l($text, $path, $options) : '') . $suffix;
+}
Index: contributions/themes/fusion/fusion_core/page.tpl.php
===================================================================
RCS file: /cvs/drupal-contrib/contributions/themes/fusion/fusion_core/page.tpl.php,v
retrieving revision 1.4
diff -u -r1.4 page.tpl.php
--- contributions/themes/fusion/fusion_core/page.tpl.php	2 Dec 2009 01:20:16 -0000	1.4
+++ contributions/themes/fusion/fusion_core/page.tpl.php	19 Dec 2009 00:49:21 -0000
@@ -1,152 +1,152 @@
-<?php
-// $Id: page.tpl.php,v 1.4 2009/12/02 01:20:16 sociotech Exp $
-?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" lang="<?php print $language->language; ?>" xml:lang="<?php print $language->language; ?>">
-
-<head>
-  <title><?php print $head_title; ?></title>
-  <?php print $head; ?>
-  <?php print $styles; ?>
-  <?php print $setting_styles; ?>
-  <!--[if IE 8]>
-  <?php print $ie8_styles; ?>
-  <![endif]-->
-  <!--[if IE 7]>
-  <?php print $ie7_styles; ?>
-  <![endif]-->
-  <!--[if lte IE 6]>
-  <?php print $ie6_styles; ?>
-  <![endif]-->
-  <?php if ($local_styles): ?>
-  <?php print $local_styles; ?>
-  <?php endif; ?>
-  <?php print $scripts; ?>
-</head>
-
-<body id="<?php print $body_id; ?>" class="<?php print $body_classes; ?>">
-  <div id="page" class="page">
-    <div id="page-inner" class="page-inner">
-      <div id="skip">
-        <a href="#main-content-area"><?php print t('Skip to Main Content Area'); ?></a>
-      </div>
-
-      <!-- header-top row: width = grid_width -->
-      <?php print theme('grid_row', $header_top, 'header-top', 'full-width', $grid_width); ?>
-
-      <!-- header-group row: width = grid_width -->
-      <div id="header-group-wrapper" class="header-group-wrapper full-width">
-        <div id="header-group" class="header-group row <?php print $grid_width; ?>">
-          <div id="header-group-inner" class="header-group-inner inner">
-            <?php print theme('grid_block', theme('links', $secondary_links), 'secondary-menu'); ?>
-            <?php print theme('grid_block', $search_box, 'search-box'); ?>
-
-            <?php if ($logo || $site_name || $site_slogan): ?>
-            <div id="header-site-info" class="header-site-info block">
-              <div id="header-site-info-inner" class="header-site-info-inner inner">
-                <?php if ($logo): ?>
-                <div id="logo">
-                  <a href="<?php print check_url($front_page); ?>" title="<?php print t('Home'); ?>"><img src="<?php print $logo; ?>" alt="<?php print t('Home'); ?>" /></a>
-                </div>
-                <?php endif; ?>
-                <?php if ($site_name): ?>
-                <span id="site-name"><a href="<?php print check_url($front_page); ?>" title="<?php print t('Home'); ?>"><?php print $site_name; ?></a></span>
-                <?php endif; ?>
-                <?php if ($site_slogan): ?>
-                <span id="slogan"><?php print $site_slogan; ?></span>
-                <?php endif; ?>
-              </div><!-- /header-site-info-inner -->
-            </div><!-- /header-site-info -->
-            <?php endif; ?>
-
-            <?php print $header; ?>
-            <?php print theme('grid_block', $primary_links_tree, 'primary-menu'); ?>
-          </div><!-- /header-group-inner -->
-        </div><!-- /header-group -->
-      </div><!-- /header-group-wrapper -->
-
-      <!-- preface-top row: width = grid_width -->
-      <?php print theme('grid_row', $preface_top, 'preface-top', 'full-width', $grid_width); ?>
-
-      <!-- main row: width = grid_width -->
-      <div id="main-wrapper" class="main-wrapper full-width">
-        <div id="main" class="main row <?php print $grid_width; ?>">
-          <div id="main-inner" class="main-inner inner">
-            <?php print theme('grid_row', $sidebar_first, 'sidebar-first', 'nested', $sidebar_first_width); ?>
-
-            <!-- main group: width = grid_width - sidebar_first_width -->
-            <div id="main-group" class="main-group row nested <?php print $main_group_width; ?>">
-              <div id="main-group-inner" class="main-group-inner inner">
-                <?php print theme('grid_row', $preface_bottom, 'preface-bottom', 'nested'); ?>
-
-                <div id="main-content" class="main-content row nested">
-                  <div id="main-content-inner" class="main-content-inner inner">
-                    <!-- content group: width = grid_width - (sidebar_first_width + sidebar_last_width) -->
-                    <div id="content-group" class="content-group row nested <?php print $content_group_width; ?>">
-                      <div id="content-group-inner" class="content-group-inner inner">
-                        <?php print theme('grid_block', $breadcrumb, 'breadcrumbs'); ?>
-
-                        <?php if ($content_top || $help || $messages): ?>
-                        <div id="content-top" class="content-top row nested">
-                          <div id="content-top-inner" class="content-top-inner inner">
-                            <?php print theme('grid_block', $help, 'content-help'); ?>
-                            <?php print theme('grid_block', $messages, 'content-messages'); ?>
-                            <?php print $content_top; ?>
-                          </div><!-- /content-top-inner -->
-                        </div><!-- /content-top -->
-                        <?php endif; ?>
-
-                        <div id="content-region" class="content-region row nested">
-                          <div id="content-region-inner" class="content-region-inner inner">
-                            <a name="main-content-area" id="main-content-area"></a>
-                            <?php print theme('grid_block', $tabs, 'content-tabs'); ?>
-                            <div id="content-inner" class="content-inner block">
-                              <div id="content-inner-inner" class="content-inner-inner inner">
-                                <?php if ($title): ?>
-                                <h1 class="title"><?php print $title; ?></h1>
-                                <?php endif; ?>
-                                <?php if ($content): ?>
-                                <div id="content-content" class="content-content">
-                                  <?php print $content; ?>
-                                  <?php print $feed_icons; ?>
-                                </div><!-- /content-content -->
-                                <?php endif; ?>
-                              </div><!-- /content-inner-inner -->
-                            </div><!-- /content-inner -->
-                          </div><!-- /content-region-inner -->
-                        </div><!-- /content-region -->
-
-                        <?php print theme('grid_row', $content_bottom, 'content-bottom', 'nested'); ?>
-                      </div><!-- /content-group-inner -->
-                    </div><!-- /content-group -->
-
-                    <?php print theme('grid_row', $sidebar_last, 'sidebar-last', 'nested', $sidebar_last_width); ?>
-                  </div><!-- /main-content-inner -->
-                </div><!-- /main-content -->
-
-                <?php print theme('grid_row', $postscript_top, 'postscript-top', 'nested'); ?>
-              </div><!-- /main-group-inner -->
-            </div><!-- /main-group -->
-          </div><!-- /main-inner -->
-        </div><!-- /main -->
-      </div><!-- /main-wrapper -->
-
-      <!-- postscript-bottom row: width = grid_width -->
-      <?php print theme('grid_row', $postscript_bottom, 'postscript-bottom', 'full-width', $grid_width); ?>
-
-      <!-- footer row: width = grid_width -->
-      <?php print theme('grid_row', $footer, 'footer', 'full-width', $grid_width); ?>
-
-      <!-- footer-message row: width = grid_width -->
-      <div id="footer-message-wrapper" class="footer-message-wrapper full-width">
-        <div id="footer-message" class="footer-message row <?php print $grid_width; ?>">
-          <div id="footer-message-inner" class="footer-message-inner inner">
-            <?php print theme('grid_block', $footer_message, 'footer-message-text'); ?>
-          </div><!-- /footer-message-inner -->
-        </div><!-- /footer-message -->
-      </div><!-- /footer-message-wrapper -->
-
-    </div><!-- /page-inner -->
-  </div><!-- /page -->
-  <?php print $closure; ?>
-</body>
-</html>
+<?php
+// $Id: page.tpl.php,v 1.4 2009/12/02 01:20:16 sociotech Exp $
+?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" lang="<?php print $language->language; ?>" xml:lang="<?php print $language->language; ?>">
+
+<head>
+  <title><?php print $head_title; ?></title>
+  <?php print $head; ?>
+  <?php print $styles; ?>
+  <?php print $setting_styles; ?>
+  <!--[if IE 8]>
+  <?php print $ie8_styles; ?>
+  <![endif]-->
+  <!--[if IE 7]>
+  <?php print $ie7_styles; ?>
+  <![endif]-->
+  <!--[if lte IE 6]>
+  <?php print $ie6_styles; ?>
+  <![endif]-->
+  <?php if ($local_styles): ?>
+  <?php print $local_styles; ?>
+  <?php endif; ?>
+  <?php print $scripts; ?>
+</head>
+
+<body id="<?php print $body_id; ?>" class="<?php print $body_classes; ?>">
+  <div id="page" class="page">
+    <div id="page-inner" class="page-inner">
+      <div id="skip">
+        <a href="#main-content-area"><?php print t('Skip to Main Content Area'); ?></a>
+      </div>
+
+      <!-- header-top row: width = grid_width -->
+      <?php print theme('grid_row', $header_top, 'header-top', 'full-width', $grid_width); ?>
+
+      <!-- header-group row: width = grid_width -->
+      <div id="header-group-wrapper" class="header-group-wrapper full-width">
+        <div id="header-group" class="header-group row <?php print $grid_width; ?> clearfix">
+          <div id="header-group-inner" class="header-group-inner inner">
+            <?php print theme('grid_block', theme('links', $secondary_links), 'secondary-menu'); ?>
+            <?php print theme('grid_block', $search_box, 'search-box'); ?>
+
+            <?php if ($logo || $site_name || $site_slogan): ?>
+            <div id="header-site-info" class="header-site-info block">
+              <div id="header-site-info-inner" class="header-site-info-inner inner">
+                <?php if ($logo): ?>
+                <div id="logo">
+                  <a href="<?php print check_url($front_page); ?>" title="<?php print t('Home'); ?>"><img src="<?php print $logo; ?>" alt="<?php print t('Home'); ?>" /></a>
+                </div>
+                <?php endif; ?>
+                <?php if ($site_name): ?>
+                <span id="site-name"><a href="<?php print check_url($front_page); ?>" title="<?php print t('Home'); ?>"><?php print $site_name; ?></a></span>
+                <?php endif; ?>
+                <?php if ($site_slogan): ?>
+                <span id="slogan"><?php print $site_slogan; ?></span>
+                <?php endif; ?>
+              </div><!-- /header-site-info-inner -->
+            </div><!-- /header-site-info -->
+            <?php endif; ?>
+
+            <?php print $header; ?>
+            <?php print theme('grid_block', $primary_links_tree, 'primary-menu'); ?>
+          </div><!-- /header-group-inner -->
+        </div><!-- /header-group -->
+      </div><!-- /header-group-wrapper -->
+
+      <!-- preface-top row: width = grid_width -->
+      <?php print theme('grid_row', $preface_top, 'preface-top', 'full-width', $grid_width); ?>
+
+      <!-- main row: width = grid_width -->
+      <div id="main-wrapper" class="main-wrapper full-width">
+        <div id="main" class="main row <?php print $grid_width; ?>">
+          <div id="main-inner" class="main-inner inner">
+            <?php print theme('grid_row', $sidebar_first, 'sidebar-first', 'nested', $sidebar_first_width); ?>
+
+            <!-- main group: width = grid_width - sidebar_first_width -->
+            <div id="main-group" class="main-group row nested <?php print $main_group_width; ?>">
+              <div id="main-group-inner" class="main-group-inner inner">
+                <?php print theme('grid_row', $preface_bottom, 'preface-bottom', 'nested'); ?>
+
+                <div id="main-content" class="main-content row nested">
+                  <div id="main-content-inner" class="main-content-inner inner">
+                    <!-- content group: width = grid_width - (sidebar_first_width + sidebar_last_width) -->
+                    <div id="content-group" class="content-group row nested <?php print $content_group_width; ?>">
+                      <div id="content-group-inner" class="content-group-inner inner">
+                        <?php print theme('grid_block', $breadcrumb, 'breadcrumbs'); ?>
+
+                        <?php if ($content_top || $help || $messages): ?>
+                        <div id="content-top" class="content-top row nested">
+                          <div id="content-top-inner" class="content-top-inner inner">
+                            <?php print theme('grid_block', $help, 'content-help'); ?>
+                            <?php print theme('grid_block', $messages, 'content-messages'); ?>
+                            <?php print $content_top; ?>
+                          </div><!-- /content-top-inner -->
+                        </div><!-- /content-top -->
+                        <?php endif; ?>
+
+                        <div id="content-region" class="content-region row nested">
+                          <div id="content-region-inner" class="content-region-inner inner">
+                            <a name="main-content-area" id="main-content-area"></a>
+                            <?php print theme('grid_block', $tabs, 'content-tabs'); ?>
+                            <div id="content-inner" class="content-inner block">
+                              <div id="content-inner-inner" class="content-inner-inner inner">
+                                <?php if ($title): ?>
+                                <h1 class="title"><?php print $title; ?></h1>
+                                <?php endif; ?>
+                                <?php if ($content): ?>
+                                <div id="content-content" class="content-content">
+                                  <?php print $content; ?>
+                                  <?php print $feed_icons; ?>
+                                </div><!-- /content-content -->
+                                <?php endif; ?>
+                              </div><!-- /content-inner-inner -->
+                            </div><!-- /content-inner -->
+                          </div><!-- /content-region-inner -->
+                        </div><!-- /content-region -->
+
+                        <?php print theme('grid_row', $content_bottom, 'content-bottom', 'nested'); ?>
+                      </div><!-- /content-group-inner -->
+                    </div><!-- /content-group -->
+
+                    <?php print theme('grid_row', $sidebar_last, 'sidebar-last', 'nested', $sidebar_last_width); ?>
+                  </div><!-- /main-content-inner -->
+                </div><!-- /main-content -->
+
+                <?php print theme('grid_row', $postscript_top, 'postscript-top', 'nested'); ?>
+              </div><!-- /main-group-inner -->
+            </div><!-- /main-group -->
+          </div><!-- /main-inner -->
+        </div><!-- /main -->
+      </div><!-- /main-wrapper -->
+
+      <!-- postscript-bottom row: width = grid_width -->
+      <?php print theme('grid_row', $postscript_bottom, 'postscript-bottom', 'full-width', $grid_width); ?>
+
+      <!-- footer row: width = grid_width -->
+      <?php print theme('grid_row', $footer, 'footer', 'full-width', $grid_width); ?>
+
+      <!-- footer-message row: width = grid_width -->
+      <div id="footer-message-wrapper" class="footer-message-wrapper full-width">
+        <div id="footer-message" class="footer-message row <?php print $grid_width; ?>">
+          <div id="footer-message-inner" class="footer-message-inner inner">
+            <?php print theme('grid_block', $footer_message, 'footer-message-text'); ?>
+          </div><!-- /footer-message-inner -->
+        </div><!-- /footer-message -->
+      </div><!-- /footer-message-wrapper -->
+
+    </div><!-- /page-inner -->
+  </div><!-- /page -->
+  <?php print $closure; ?>
+</body>
+</html>