- Patch #251758 by Stefan, dvessel, quicksketch et al: clean up Garland's page.tpl.php.

author: Dries Buytaert <dries@buytaert.net> 2008-04-28 09:25:27 +0000
committer: Dries Buytaert <dries@buytaert.net> 2008-04-28 09:25:27 +0000
commit: ab6c47cd3d464e6e6226b5f9d401bf0e94fba4b4 (patch)
tree: 6f5575ba0714657846abc85e1c536ea909849aba /themes
parent: c14ac959c422e0cda9e1231707dc78853e276894 (diff)
download: brdo-ab6c47cd3d464e6e6226b5f9d401bf0e94fba4b4.tar.gz
brdo-ab6c47cd3d464e6e6226b5f9d401bf0e94fba4b4.tar.bz2
6 files changed, 67 insertions, 91 deletions
diff --git a/themes/garland/maintenance-page.tpl.php b/themes/garland/maintenance-page.tpl.php
index e299fc92e..54f66320b 100644
--- a/themes/garland/maintenance-page.tpl.php
+++ b/themes/garland/maintenance-page.tpl.php
@@ -20,10 +20,10 @@
     <?php print $styles ?>
     <?php print $scripts ?>
     <!--[if lt IE 7]>
-      <?php print phptemplate_get_ie_styles(); ?>
+      <?php print garland_get_ie_styles(); ?>
     <![endif]-->
   </head>
-  <body<?php print phptemplate_body_class($left, $right); ?>>
+  <body class="<?php print $body_classes ?>">
 
 <!-- Layout -->
   <div id="header-region" class="clear-block"><?php print $header; ?></div>
@@ -68,9 +68,9 @@
       <?php endif; ?>
 
       <div id="center"><div id="squeeze"><div class="right-corner"><div class="left-corner">
-          <?php if ($title): print '<h2' . ($tabs ? ' class="with-tabs"' : '') . '>' . $title . '</h2>'; endif; ?>
-          <?php print $help; ?>
+          <?php if ($title): ?><h2><?php print $title ?></h2><?php endif; ?>
           <?php print $messages; ?>
+          <?php print $help; ?>
           <div class="clear-block">
             <?php print $content ?>
           </div>
diff --git a/themes/garland/minnelli/minnelli.css b/themes/garland/minnelli/minnelli.css
index 85360e486..e55942cb2 100644
--- a/themes/garland/minnelli/minnelli.css
+++ b/themes/garland/minnelli/minnelli.css
@@ -4,7 +4,7 @@ body #wrapper #container {
   width: 560px;
 }
 
-body.sidebars #wrapper #container {
+body.two-sidebars #wrapper #container {
   width: 980px;
 }
 
diff --git a/themes/garland/page.tpl.php b/themes/garland/page.tpl.php
index 5aed7ccc9..1c73bc8fa 100644
--- a/themes/garland/page.tpl.php
+++ b/themes/garland/page.tpl.php
@@ -9,52 +9,31 @@
     <?php print $styles ?>
     <?php print $scripts ?>
     <!--[if lt IE 7]>
-      <?php print phptemplate_get_ie_styles(); ?>
+      <?php print $ie_styles ?>
     <![endif]-->
   </head>
-  <body<?php print phptemplate_body_class($left, $right); ?>>
+  <body class="<?php print $body_classes ?>">
 
-<!-- Layout -->
-  <div id="header-region" class="clear-block"><?php print $header; ?></div>
+  <div id="header-region" class="clear-block"><?php print $header ?></div>
 
-    <div id="wrapper">
+  <div id="wrapper">
     <div id="container" class="clear-block">
 
       <div id="header">
         <div id="logo-floater">
-        <?php
-          // Prepare header
-          $site_fields = array();
-          if ($site_name) {
-            $site_fields[] = check_plain($site_name);
-          }
-          if ($site_slogan) {
-            $site_fields[] = check_plain($site_slogan);
-          }
-          $site_title = implode(' ', $site_fields);
-          if ($site_fields) {
-            $site_fields[0] = '<span>' . $site_fields[0] . '</span>';
-          }
-          $site_html = implode(' ', $site_fields);
-
-          if ($logo || $site_title) {
-            print '<h1><a href="' . check_url($front_page) . '" title="' . $site_title . '">';
-            if ($logo) {
-              print '<img src="' . check_url($logo) . '" alt="' . $site_title . '" id="logo" />';
-            }
-            print $site_html . '</a></h1>';
-          }
-        ?>
-        </div>
-
-        <?php if (isset($primary_links)) : ?>
-          <?php print theme('links', $primary_links, array('class' => 'links primary-links')) ?>
-        <?php endif; ?>
-        <?php if (isset($secondary_links)) : ?>
-          <?php print theme('links', $secondary_links, array('class' => 'links secondary-links')) ?>
+        <?php if ($logo || $site_title): ?>
+          <h1><a href=" <?php print $front_page ?>" title="<?php print $site_title ?>">
+          <?php if ($logo): ?>
+            <img src="<?php print $logo ?>" alt="<?php print $site_title ?>" id="logo" />
+          <?php endif; ?>
+          <?php print $site_html ?>
+          </a></h1>
         <?php endif; ?>
+        </div>
 
-      </div> <!-- /header -->
+        <?php if ($primary_nav): print $primary_nav; endif; ?>
+        <?php if ($secondary_nav): print $secondary_nav; endif; ?>
+      </div> <!-- /#header -->
 
       <?php if ($left): ?>
         <div id="sidebar-left" class="sidebar">
@@ -65,11 +44,11 @@
 
       <div id="center"><div id="squeeze"><div class="right-corner"><div class="left-corner">
           <?php print $breadcrumb; ?>
-          <?php if ($mission): print '<div id="mission">' . $mission . '</div>'; endif; ?>
-          <?php if ($tabs): print '<div id="tabs-wrapper" class="clear-block">'; endif; ?>
-          <?php if ($title): print '<h2' . ($tabs ? ' class="with-tabs"' : '') . '>' . $title . '</h2>'; endif; ?>
-          <?php if ($tabs): print '<ul class="tabs primary">' . $tabs . '</ul></div>'; endif; ?>
-          <?php if ($tabs2): print '<ul class="tabs secondary">' . $tabs2 . '</ul>'; endif; ?>
+          <?php if ($mission): ?><div id="mission"><?php print $mission ?></div><?php endif; ?>
+          <?php if ($tabs): ?><div id="tabs-wrapper" class="clear-block"><?php endif; ?>
+          <?php if ($title): ?><h2<?php print $tabs ? ' class="with-tabs"' : '' ?>><?php print $title ?></h2><?php endif; ?>
+          <?php if ($tabs): ?><ul class="tabs primary"><?php print $tabs ?></ul></div><?php endif; ?>
+          <?php if ($tabs2): ?><ul class="tabs secondary"><?php print $tabs2 ?></ul><?php endif; ?>
           <?php if ($show_messages && $messages): print $messages; endif; ?>
           <?php print $help; ?>
           <div class="clear-block">
@@ -86,9 +65,8 @@
         </div>
       <?php endif; ?>
 
-    </div> <!-- /container -->
-  </div>
-<!-- /layout -->
+    </div> <!-- /#container -->
+  </div> <!-- /#wrapper -->
 
   <?php print $closure ?>
   </body>
diff --git a/themes/garland/print.css b/themes/garland/print.css
index 58154aa60..bdd895818 100644
--- a/themes/garland/print.css
+++ b/themes/garland/print.css
@@ -12,12 +12,12 @@ ul.primary-links, ul.secondary-links,
   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;
 }
 
diff --git a/themes/garland/style.css b/themes/garland/style.css
index d1ca3c870..8c310c7e9 100644
--- a/themes/garland/style.css
+++ b/themes/garland/style.css
@@ -384,7 +384,7 @@ table .form-button, table .form-submit {
 }
 
 /* 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-left #center {
 body.sidebar-right #center {
   margin-right: -210px;
 }
-body.sidebars #center {
+body.two-sidebars #center {
   margin: 0 -210px;
 }
 
@@ -416,7 +416,7 @@ body.sidebar-left #squeeze {
 body.sidebar-right #squeeze {
   margin-right: 210px;
 }
-body.sidebars #squeeze {
+body.two-sidebars #squeeze {
   margin: 0 210px;
 }
 
@@ -505,7 +505,7 @@ body.sidebar-right #footer {
   margin-right: -210px;
 }
 
-body.sidebars #footer {
+body.two-sidebars #footer {
   margin: 0 -210px;
 }
 
diff --git a/themes/garland/template.php b/themes/garland/template.php
index a38ba1519..36c45c21f 100644
--- a/themes/garland/template.php
+++ b/themes/garland/template.php
@@ -2,36 +2,13 @@
 // $Id$
 
 /**
- * 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 '<div class="breadcrumb">' . implode(' › ', $breadcrumb) . '</div>';
   }
@@ -40,7 +17,7 @@ function phptemplate_breadcrumb($breadcrumb) {
 /**
  * Allow themable wrapping of all comments.
  */
-function phptemplate_comment_wrapper($content, $node) {
+function garland_comment_wrapper($content, $node) {
   if (!$content || $node->type == 'forum') {
     return '<div id="comments">' . $content . '</div>';
   }
@@ -50,10 +27,27 @@ function phptemplate_comment_wrapper($content, $node) {
 }
 
 /**
- * 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_slogan']);
+  }
+  $vars['site_title'] = implode(' ', $site_fields);
+  if (!empty($site_fields)) {
+    $site_fields[0] = '<span>'. $site_fields[0] .'</span>';
+  }
+  $vars['site_html'] = implode(' ', $site_fields);
 
   // Hook into color.module
   if (module_exists('color')) {
@@ -64,13 +58,14 @@ function phptemplate_preprocess_page(&$vars) {
 /**
  * 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_comment_submitted($comment) {
     ));
 }
 
-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 @@ function phptemplate_node_submitted($node) {
 /**
  * Generates IE CSS links for LTR and RTL languages.
  */
-function phptemplate_get_ie_styles() {
+function garland_get_ie_styles() {
   global $language;
 
-  $iecss = '<link type="text/css" rel="stylesheet" media="all" href="' . base_path() . path_to_theme() . '/fix-ie.css" />';
+  $ie_styles = '<link type="text/css" rel="stylesheet" media="all" href="' . base_path() . path_to_theme() . '/fix-ie.css" />'. "\n";
   if (defined('LANGUAGE_RTL') && $language->direction == LANGUAGE_RTL) {
-    $iecss .= '<style type="text/css" media="all">@import "' . base_path() . path_to_theme() . '/fix-ie-rtl.css";</style>';
+    $ie_styles .= '      <style type="text/css" media="all">@import "' . base_path() . path_to_theme() . '/fix-ie-rtl.css";</style>'. "\n";
   }
 
-  return $iecss;
+  return $ie_styles;
 }
author	Dries Buytaert <dries@buytaert.net>	2008-04-28 09:25:27 +0000
committer	Dries Buytaert <dries@buytaert.net>	2008-04-28 09:25:27 +0000
commit	ab6c47cd3d464e6e6226b5f9d401bf0e94fba4b4 (patch)
tree	6f5575ba0714657846abc85e1c536ea909849aba /themes
parent	c14ac959c422e0cda9e1231707dc78853e276894 (diff)
download	brdo-ab6c47cd3d464e6e6226b5f9d401bf0e94fba4b4.tar.gz brdo-ab6c47cd3d464e6e6226b5f9d401bf0e94fba4b4.tar.bz2