Index: page.tpl.php
===================================================================
RCS file: /cvs/drupal/contributions/themes/lightfantastic/page.tpl.php,v
retrieving revision 1.17
diff -u -p -r1.17 page.tpl.php
--- page.tpl.php	3 Jun 2008 00:18:36 -0000	1.17
+++ page.tpl.php	19 Sep 2008 02:37:02 -0000
@@ -88,9 +88,9 @@
             <?php if ($tabs): ?><div id="tabs-wrapper"><?php endif; ?>
             <?php if ($title): print '<h1'. ($tabs ? ' class="title with-tabs"' : ' class="title"') .'>'. $title .'</h1>'; endif; ?>
             <?php if ($tabs): ?><?php print $tabs ?></div><!-- /tabs-wrapper --><?php endif; ?>
-            <?php if (!empty($tabs2)): print '<span class="clear"></span><ul class="tabs secondary">' . $tabs2 . '</ul><span class="clear"></span>'; endif; ?>
+            <?php if (!empty($tabs2)): print '<span class="clear"></span><ul class="tabs secondary clear-block">' . $tabs2 . '</ul><span class="clear"></span>'; endif; ?>
             <?php if ($help): print $help; endif; ?>
-            <?php if ($show_messages && $messages): print $messages; endif; ?>
+            <?php if ($messages): print $messages; endif; ?>
             <?php print $content ?>
           </div><!-- /main -->
           <?php if ($sidebar_right || $navigation_right || ($secondary_links && ($secondary_nav == "right"))) { ?>
Index: style.css
===================================================================
RCS file: /cvs/drupal/contributions/themes/lightfantastic/style.css,v
retrieving revision 1.4
diff -u -p -r1.4 style.css
--- style.css	3 Jun 2008 00:18:36 -0000	1.4
+++ style.css	19 Sep 2008 02:37:03 -0000
@@ -64,6 +64,10 @@ h6 {
   font-weight: bold;
 }
 
+fieldset {
+  border: 1px solid #727D59;
+}
+
 code,kbd {
   font-size: 120%;
 }
@@ -396,6 +400,10 @@ div#main ul,div#main ol {
   margin-left: 20px;
 }
 
+div#autocomplete ul, div#autocomplete li {
+  margin: 0;
+}
+
 div#main dl dt {
   margin-top: 1em;
   font-family: Georgia, "Times New Roman", Times, serif;
@@ -595,7 +603,7 @@ div.sidebar_right h2 {
 }
 
 div.sidebar_right ul {
-  margin: 10;
+  margin: 10px;
   padding: 0;
   list-style: none;
 }
@@ -1021,6 +1029,10 @@ div#additionalThree-box {
   background: url(./assets/images/additional_bk.png) repeat-x left top;
 }
 
+#additional a, #additional a:link {
+  color: #FFFFCC;
+}
+
 div.chunk-unknown {
   padding: 20px;
 }
@@ -1152,10 +1164,6 @@ div.messages a {
   color: #133C40;
 }
 
-div.messages a:hover {
-  color: #FC0;
-}
-
 div.messages ul,div.messages ul li {
   margin: 0;
 }
Index: template.php
===================================================================
RCS file: /cvs/drupal/contributions/themes/lightfantastic/template.php,v
retrieving revision 1.13
diff -u -p -r1.13 template.php
--- template.php	1 Jun 2008 04:13:46 -0000	1.13
+++ template.php	19 Sep 2008 02:37:03 -0000
@@ -3,23 +3,49 @@
 
 /**
  * @file
- * template.php for the Light Fantastic theme for Drupal 6.
+ * template.php for the Light Fantastic theme for Drupal 5.
  *
  * This file provides overrides and theme-specific functions for the Light
- * Fantastic theme for Drupal 6 and higher.
+ * Fantastic theme for Drupal 5 and higher.
  */
 
+function lightfantastic_regions() {
+  return array(
+    'navigation_left' => 'Left navigation',
+    'navigation_right' => 'Right navigation',
+    'sidebar_left' => 'Left sidebar',
+    'sidebar_right' => 'Right sidebar',
+    'top' => 'Top',
+    'header' => 'Header',
+    'banner' => 'Banner',
+    'pre_content' => 'Before content',
+    'content' => 'Content',
+    'additional' => 'Additional',
+    'bottom' => 'Bottom',
+  );
+}
+
+function _phptemplate_variables($hook, $vars) {
+  $func = "lightfantastic_preprocess_$hook";
+  if (function_exists($func)) {
+    $func($vars);
+  }
+  return $vars;
+}
+
 /**
  * Override or insert variables into the page template.
  */
 function lightfantastic_preprocess_page(&$vars) {
-  
+  global $language;
+  $vars['language'] = $language;
+
   $vars['site_title'] = !empty($vars['site_name']) ? check_plain($vars['site_name']) : '';
   $vars['ie6_styles'] = '<link type="text/css" rel="stylesheet" media="all" href="' . base_path() . path_to_theme() . '/assets/style/ie6.css" />'. "\n";
   $vars['ie7_styles'] = '<link type="text/css" rel="stylesheet" media="all" href="' . base_path() . path_to_theme() . '/assets/style/ie7.css" />'. "\n";
   $vars['primary_nav'] = isset($vars['primary_links']) ? theme('links', $vars['primary_links'], array('id' => 'main-menu')) : FALSE;
   $vars['tabs2'] = menu_secondary_local_tasks();
-  
+
   /**
    * Set width for the site and two sidebars:
    * This theme allows the site to have a fluid or fixed width layout.
@@ -28,32 +54,34 @@ function lightfantastic_preprocess_page(
    * For any layout, Left and Right column widths could be set.
    * If fixed width, maximum and minimum widths would be ignored.
    */
-  
-  $site_fixed_width    = '960px'; // Width if fixed-width layout. Leave blank ('') for fluid layout.
-  $site_min_width      = '760px'; // Minimum width if fluid layout.
-  $site_max_width      = '960px'; // Maximum width if fluid layout.
+
+  $site_fixed_width    = ''; // Width if fixed-width layout. Leave blank ('') for fluid layout.
+  $site_min_width      = '860px'; // Minimum width if fluid layout.
+  $site_max_width      = '1200px'; // Maximum width if fluid layout.
   $left_sidebar_width  = '240px'; // Width of left column.
   $right_sidebar_width = '240px'; // Width of right column.
   $secondary_nav       = "left";
-  
+
   // Set page width.
   if ($site_fixed_width == "") {
     $site_fixed_width = (($site_max_width - $site_min_width) < 0 ) ? "960px" : "" ;
   }
   $site_width = ($site_fixed_width != "") ? "width: $site_fixed_width;" : "max-width: $site_max_width; min-width: $site_min_width;" ;
-  
+
   if ($site_fixed_width == "") {
     $site_fixed_width = (($site_max_width - $site_min_width) < 0 ) ? "1" : "" ;
   }
   $is_fixed_width = ($site_fixed_width != "") ? "0" : "1" ;
-  
+
+  $vars['front_page'] = base_path();
+
   // Secondary navigation position.
   $vars['secondary_nav'] = $secondary_nav == 'right' ? 'right' : 'left';
-  
+
   $style = "";
   $style .= '<style type="text/css">';
   $style .= "div#container { $site_width }";
-  
+
   if ($vars['sidebar_left'] || $vars['navigation_left'] || ($vars['secondary_links'] && $vars['secondary_nav'] == 'left')) {
     $style .= "div#content-wrap div#content-inter-wrap { margin-left: -$left_sidebar_width; }";
     $style .= "div#content-wrap div#sidebar-left { width: $left_sidebar_width; }";
@@ -61,20 +89,20 @@ function lightfantastic_preprocess_page(
     $style .= "div#content-outer-wrap { background-position: -". $background ."px top; }";
     $style .= "div#content-wrap div#content { margin-left: $left_sidebar_width; }";
   }
-  
+
   if (($vars['sidebar_left'] || $vars['navigation_left']  || ($vars['secondary_links'] && $vars['secondary_nav'] == 'left'))
     && ($vars['sidebar_right'] || $vars['navigation_right'] || ($vars['secondary_links'] && $vars['secondary_nav'] == 'right'))) {
     $style .= "div#content-wrap div#content { margin-left: $left_sidebar_width; }";
   }
-  
+
   if ($vars['sidebar_right'] || $vars['navigation_right'] || ($vars['secondary_links'] && $vars['secondary_nav'] == 'right')) {
     $style .= "div#container div#main-content { margin-left: -$right_sidebar_width; }";
     $style .= "div#container div#main { margin-left: $right_sidebar_width; }";
     $style .= "div#container div#sidebar-right { width: $right_sidebar_width; }";
   }
-  
+
   $style .= '</style>';
-  
+
   if ($is_fixed_width) {
     // IE6 min-width, max-width expression.
     $style .= '
@@ -84,7 +112,7 @@ function lightfantastic_preprocess_page(
     		</style>
     	<![endif]-->';
   }
-  
+
   $vars['layout_style'] = $style;
 
   // Sets the body-tag class attribute.
@@ -123,7 +151,7 @@ function lightfantastic_preprocess_page(
     default:
       $vars['additional_chunk'] = "chunk-unknown";
   }
-  
+
   // Get published block in 'banner' region and set 'banner_chunk' variable.
   switch (count(block_list('banner'))) {
     case 0:
@@ -162,8 +190,8 @@ function lightfantastic_breadcrumb($brea
 /**
  * Allow themable wrapping of all comments.
  */
-function lightfantastic_comment_wrapper($content, $node) {
-  if (!$content || $node->type == 'forum') {
+function lightfantastic_comment_wrapper($content, $type = NULL) {
+  if (!$content || $type == 'forum') {
     return '<div id="comments">'. $content .'</div>';
   }
   else {
@@ -202,4 +230,3 @@ function lightfantastic_node_submitted($
       '!datetime' => format_date($node->created),
     ));
 }
-