Index: minnelli/minnelli.css =================================================================== RCS file: /cvs/drupal/drupal/themes/garland/minnelli/minnelli.css,v retrieving revision 1.5 diff -u -r1.5 minnelli.css --- minnelli/minnelli.css 13 Mar 2008 20:02:18 -0000 1.5 +++ minnelli/minnelli.css 27 Apr 2008 21:23:45 -0000 @@ -4,7 +4,7 @@ width: 560px; } -body.sidebars #wrapper #container { +body.two-sidebars #wrapper #container { width: 980px; } Index: print.css =================================================================== RCS file: /cvs/drupal/drupal/themes/garland/print.css,v retrieving revision 1.5 diff -u -r1.5 print.css --- print.css 13 Mar 2008 20:02:18 -0000 1.5 +++ print.css 27 Apr 2008 21:23:45 -0000 @@ -12,12 +12,12 @@ display: none; } -body.sidebars, body.sidebar-left, body.sidebar-right, body { +body.two-sidebars, body.sidebar-left, body.sidebar-right, body { width: 640px; } -body.sidebar-left #center, body.sidebar-right #center, body.sidebars #center, -body.sidebar-left #squeeze, body.sidebar-right #squeeze, body.sidebars #squeeze { +body.sidebar-left #center, body.sidebar-right #center, body.two-sidebars #center, +body.sidebar-left #squeeze, body.sidebar-right #squeeze, body.two-sidebars #squeeze { margin: 0; } Index: style.css =================================================================== RCS file: /cvs/drupal/drupal/themes/garland/style.css,v retrieving revision 1.43 diff -u -r1.43 style.css --- style.css 10 Apr 2008 10:28:23 -0000 1.43 +++ style.css 27 Apr 2008 21:23:45 -0000 @@ -384,7 +384,7 @@ } /* With 3 columns, require a minimum width of 1000px to ensure there is enough horizontal space. */ -body.sidebars { +body.two-sidebars { min-width: 980px; } /* With 2 columns, require a minimum width of 800px. */ @@ -405,7 +405,7 @@ body.sidebar-right #center { margin-right: -210px; } -body.sidebars #center { +body.two-sidebars #center { margin: 0 -210px; } @@ -416,7 +416,7 @@ body.sidebar-right #squeeze { margin-right: 210px; } -body.sidebars #squeeze { +body.two-sidebars #squeeze { margin: 0 210px; } @@ -505,7 +505,7 @@ margin-right: -210px; } -body.sidebars #footer { +body.two-sidebars #footer { margin: 0 -210px; } Index: page.tpl.php =================================================================== RCS file: /cvs/drupal/drupal/themes/garland/page.tpl.php,v retrieving revision 1.19 diff -u -r1.19 page.tpl.php --- page.tpl.php 14 Apr 2008 17:48:46 -0000 1.19 +++ page.tpl.php 27 Apr 2008 21:23:45 -0000 @@ -9,52 +9,31 @@ - > + - -
+
-
+
-
+ + +
+
Index: template.php =================================================================== RCS file: /cvs/drupal/drupal/themes/garland/template.php,v retrieving revision 1.17 diff -u -r1.17 template.php --- template.php 14 Apr 2008 17:48:46 -0000 1.17 +++ template.php 27 Apr 2008 21:23:45 -0000 @@ -2,36 +2,13 @@ // $Id: template.php,v 1.17 2008/04/14 17:48:46 dries Exp $ /** - * Sets the body-tag class attribute. - * - * Adds 'sidebar-left', 'sidebar-right' or 'sidebars' classes as needed. - */ -function phptemplate_body_class($left, $right) { - if ($left != '' && $right != '') { - $class = 'sidebars'; - } - else { - if ($left != '') { - $class = 'sidebar-left'; - } - if ($right != '') { - $class = 'sidebar-right'; - } - } - - if (isset($class)) { - print ' class="' . $class . '"'; - } -} - -/** * Return a themed breadcrumb trail. * * @param $breadcrumb * An array containing the breadcrumb links. * @return a string containing the breadcrumb output. */ -function phptemplate_breadcrumb($breadcrumb) { +function garland_breadcrumb($breadcrumb) { if (!empty($breadcrumb)) { return '
' . implode(' › ', $breadcrumb) . '
'; } @@ -40,7 +17,7 @@ /** * Allow themable wrapping of all comments. */ -function phptemplate_comment_wrapper($content, $node) { +function garland_comment_wrapper($content, $node) { if (!$content || $node->type == 'forum') { return '
' . $content . '
'; } @@ -50,10 +27,27 @@ } /** - * Override or insert PHPTemplate variables into the templates. + * Override or insert variables into the page template. */ -function phptemplate_preprocess_page(&$vars) { +function garland_preprocess_page(&$vars) { $vars['tabs2'] = menu_secondary_local_tasks(); + $vars['primary_nav'] = isset($vars['primary_links']) ? theme('links', $vars['primary_links'], array('class' => 'links primary-links')) : FALSE; + $vars['secondary_nav'] = isset($vars['secondary_links']) ? theme('links', $vars['secondary_links'], array('class' => 'links secondary-links')) : FALSE; + $vars['ie_styles'] = garland_get_ie_styles(); + + // Prepare header + $site_fields = array(); + if (!empty($vars['site_name'])) { + $site_fields[] = check_plain($vars['site_name']); + } + if (!empty($vars['site_slogan'])) { + $site_fields[] = check_plain($vars['site_name']); + } + $vars['site_title'] = implode(' ', $site_fields); + if (!empty($site_fields)) { + $site_fields[0] = ''. $site_fields[0] .''; + } + $vars['site_html'] = implode(' ', $site_fields); // Hook into color.module if (module_exists('color')) { @@ -64,13 +58,14 @@ /** * Returns the rendered local tasks. The default implementation renders * them as tabs. Overridden to split the secondary tasks. - * - * @ingroup themeable */ -function phptemplate_menu_local_tasks() { +function garland_menu_local_tasks() { return menu_primary_local_tasks(); } +/** + * Format the "Submitted by username on date/time" for each comment. + */ function phptemplate_comment_submitted($comment) { return t('!datetime — !username', array( @@ -79,7 +74,10 @@ )); } -function phptemplate_node_submitted($node) { +/** + * Format the "Submitted by username on date/time" for each node. + */ +function garland_node_submitted($node) { return t('!datetime — !username', array( '!username' => theme('username', $node), @@ -90,13 +88,13 @@ /** * Generates IE CSS links for LTR and RTL languages. */ -function phptemplate_get_ie_styles() { +function garland_get_ie_styles() { global $language; - $iecss = ''; + $ie_styles = ''. "\n"; if (defined('LANGUAGE_RTL') && $language->direction == LANGUAGE_RTL) { - $iecss .= ''; + $ie_styles .= ' '. "\n"; } - return $iecss; + return $ie_styles; }