Index: page.tpl.php =================================================================== RCS file: /cvs/drupal-contrib/contributions/themes/lightfantastic/page.tpl.php,v retrieving revision 1.11 diff -u -r1.11 page.tpl.php --- page.tpl.php 25 May 2008 18:04:35 -0000 1.11 +++ page.tpl.php 26 May 2008 20:13:12 -0000 @@ -1,177 +1,154 @@ - - - <?php print $head_title; ?> - - - - - - - - - - - - + + + <?php print $head_title ?> + - - + + - -> -
-
- +
+ + + Index: template.php =================================================================== RCS file: /cvs/drupal-contrib/contributions/themes/lightfantastic/template.php,v retrieving revision 1.8 diff -u -r1.8 template.php --- template.php 25 May 2008 17:43:26 -0000 1.8 +++ template.php 26 May 2008 20:13:12 -0000 @@ -5,82 +5,79 @@ * Override or insert PHPTemplate variables into the templates. */ function phptemplate_preprocess_page(&$vars) { -/** - * Set width for the site and two sidebars: - * This theme allows the site to have a fluid or fixed width layout. - * Setting a value for the fixed width will force the layout to be fixed. - * For fluid layouts, maximum and minimum widths could be set. - * 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 -$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" ; - -// Secondary navigation position -$vars['secondary_nav'] = $secondary_nav == 'right' ? 'right' : 'left'; - -$style = ""; -$style .= ''; -if($is_fixed_width) { -// IE6 min-width, max-width expression -$style .= ' - '; -} - -$vars['layout_style'] = $style; + /** + * Set width for the site and two sidebars: + * This theme allows the site to have a fluid or fixed width layout. + * Setting a value for the fixed width will force the layout to be fixed. + * For fluid layouts, maximum and minimum widths could be set. + * 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. + $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" ; + + // Secondary navigation position. + $vars['secondary_nav'] = $secondary_nav == 'right' ? 'right' : 'left'; + + $style = ""; + $style .= ''; + + if ($is_fixed_width) { + // IE6 min-width, max-width expression + $style .= ' + '; + } + + $vars['layout_style'] = $style; // Sets the body-tag class attribute. // Adds 'sidebar-left', 'sidebar-right' or 'sidebars' classes as needed. $vars['body_class'] = isset($vars['body_class']) ? $vars['body_class'] : ''; 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')))) { + && ($vars['sidebar_right'] || $vars['navigation_right'] || ($vars['secondary_links'] && ($vars['secondary_nav'] == 'right')))) { $body_class = 'sidebars'; } else { @@ -90,52 +87,44 @@ if ($vars['sidebar_right'] || $vars['navigation_right'] || ($vars['secondary_links'] && ($vars['secondary_nav'] == 'right'))) { $body_class = 'sidebar-right'; } - } + } if (isset($body_class)) { - $vars['body_class'] = ' class="'. $body_class .'"'; + $vars['body_class'] = ' class="'. $body_class .'"'; } -// Get published block in 'additional' region and set 'additional_chunk' variable + // Get published block in 'additional' region and set 'additional_chunk' variable. switch (count(block_list('additional'))) { - case 0: + case 0: $vars['additional_chunk'] = ""; break; - case 1: $vars['additional_chunk'] = "chunk-one"; break; - case 2: $vars['additional_chunk'] = "chunk-two"; break; - case 3: $vars['additional_chunk'] = "chunk-three"; break; - - default: + default: $vars['additional_chunk'] = "chunk-unknown"; } -// Get published block in 'banner' region and set 'banner_chunk' variable + // Get published block in 'banner' region and set 'banner_chunk' variable. switch (count(block_list('banner'))) { case 0: $vars['banner_chunk'] = ""; break; - case 1: $vars['banner_chunk'] = "chunk-one"; break; - case 2: $vars['banner_chunk'] = "chunk-two"; break; - case 3: $vars['banner_chunk'] = "chunk-three"; break; - - default: + default: $vars['banner_chunk'] = "chunk-unknown"; } @@ -202,4 +191,4 @@ '!username' => theme('username', $node), '!datetime' => format_date($node->created), )); -} \ No newline at end of file +}