#180897 by sun and dvessel: fix various XHTML validity issues in Drupal by closing unclosed tags, avoiding empty table containers, and so on

5 files changed, 12 insertions, 58 deletions

diff --git a/themes/garland/node.tpl.php b/themes/garland/node.tpl.php
index 5dbdd1463..b227d86c7 100644
--- a/themes/garland/node.tpl.php
+++ b/themes/garland/node.tpl.php
@@ -13,11 +13,11 @@
     <span class="submitted"><?php print $submitted; ?></span>
   <?php endif; ?>
 
-  <div class="content">
+  <div class="content clear-block">
     <?php print $content ?>
   </div>
 
-  <div class="clear-block clear">
+  <div class="clear-block">
     <div class="meta">
     <?php if ($taxonomy): ?>
       <div class="terms"><?php print $terms ?></div>
diff --git a/themes/garland/page.tpl.php b/themes/garland/page.tpl.php
index d28f77efe..f7e27fb52 100644
--- a/themes/garland/page.tpl.php
+++ b/themes/garland/page.tpl.php
@@ -62,19 +62,17 @@
       <?php endif; ?>
 
       <div id="center"><div id="squeeze"><div class="right-corner"><div class="left-corner">
-          <?php if ($breadcrumb): print $breadcrumb; endif; ?>
+          <?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 $tabs .'</div>'; endif; ?>
-
-          <?php if (isset($tabs2)): print $tabs2; endif; ?>
-
-          <?php if ($help): print $help; 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 print $help; ?>
           <?php if ($show_messages && $messages): print $messages; endif; ?>
-          <?php print $content ?>
-          <div class="clear"></div>
+          <div class="clear-block">
+            <?php print $content ?>
+          </div>
           <?php print $feed_icons ?>
           <div id="footer"><?php print $footer_message . $footer ?></div>
       </div></div></div></div> <!-- /.left-corner, /.right-corner, /#squeeze, /#center -->
diff --git a/themes/garland/style-rtl.css b/themes/garland/style-rtl.css
index 4e3ded367..c59302519 100644
--- a/themes/garland/style-rtl.css
+++ b/themes/garland/style-rtl.css
@@ -5,32 +5,6 @@ html {
 }
 
 /**
- * Markup free clearing
- * Details: http://www.positioniseverything.net/easyclearing.html
- */
-.clear-block:after {
-  content: ".";
-  display: block;
-  height: 0;
-  clear: both;
-  visibility: hidden;
-}
-
-.clear-block {
-  display: inline-block;
-}
-
-/* Hides from IE-mac \*/
-* html .clear-block {
-  height: 1%;
-}
-
-.clear-block {
-  display: block;
-}
-/* End hide from IE-mac */
-
-/**
  * Generic elements
  */
 body {
diff --git a/themes/garland/style.css b/themes/garland/style.css
index df375fdb5..308d9342e 100644
--- a/themes/garland/style.css
+++ b/themes/garland/style.css
@@ -971,14 +971,6 @@ tr.selected td a:link, tr.selected td a:visited, tr.selected td a:active {
 /**
  * CSS support
  */
-div.clear {
-  display: block;
-  clear: both;
-  height: 1px;
-  line-height: 0px;
-  font-size: 0px;
-  margin-bottom: -1px;
-}
 
 /*******************************************************************
  * Color Module: Don't touch                                       *
diff --git a/themes/garland/template.php b/themes/garland/template.php
index f40bebc11..0d06bb44e 100644
--- a/themes/garland/template.php
+++ b/themes/garland/template.php
@@ -53,11 +53,7 @@ function phptemplate_comment_wrapper($content, $node) {
  * Override or insert PHPTemplate variables into the templates.
  */
 function phptemplate_preprocess_page(&$vars) {
-  if ($secondary = menu_secondary_local_tasks()) {
-    $output = '<span class="clear"></span>';
-    $output .= "<ul class=\"tabs secondary\">\n". $secondary ."</ul>\n";
-    $vars['tabs2'] = $output;
-  }
+  $vars['tabs2'] = menu_secondary_local_tasks();
 
   // Hook into color.module
   if (module_exists('color')) {
@@ -67,18 +63,12 @@ function phptemplate_preprocess_page(&$vars) {
 
 /**
  * Returns the rendered local tasks. The default implementation renders
- * them as tabs.
+ * them as tabs. Overridden to split the secondary tasks.
  *
  * @ingroup themeable
  */
 function phptemplate_menu_local_tasks() {
-  $output = '';
-
-  if ($primary = menu_primary_local_tasks()) {
-    $output .= "<ul class=\"tabs primary\">\n". $primary ."</ul>\n";
-  }
-
-  return $output;
+  return menu_primary_local_tasks();
 }
 
 function phptemplate_comment_submitted($comment) {