5 files changed, 50 insertions, 22 deletions
diff --git a/modules/filter/filter.module b/modules/filter/filter.module
index 1eb786551..545ec0885 100644
--- a/modules/filter/filter.module
+++ b/modules/filter/filter.module
@@ -1095,7 +1095,7 @@ function _filter_url($text, $format) {
 
   // Match absolute URLs.
   $text = preg_replace_callback("!(<p>|<li>|<br\s*/?>|[ \n\r\t\(])((http://|https://|ftp://|mailto:|smb://|afp://|file://|gopher://|news://|ssl://|sslv2://|sslv3://|tls://|tcp://|udp://)([a-zA-Z0-9@:%_+*~#?&=.,/;-]*[a-zA-Z0-9@:%_+*~#&=/;-]))([.,?]?)(?=(</p>|</li>|<br\s*/?>|[ \n\r\t\)]))!i", '_filter_url_parse_full_links', $text);
-  
+
   // Match e-mail addresses.
   $text = preg_replace("!(<p>|<li>|<br\s*/?>|[ \n\r\t\(])([A-Za-z0-9._-]+@[A-Za-z0-9._+-]+\.[A-Za-z]{2,4})([.,?]?)(?=(</p>|</li>|<br\s*/?>|[ \n\r\t\)]))!i", '\1<a href="mailto:\2">\2</a>\3', $text);
 
@@ -1107,7 +1107,7 @@ function _filter_url($text, $format) {
 }
 
 /**
- * Make links out of absolute URLs. 
+ * Make links out of absolute URLs.
  */
 function _filter_url_parse_full_links($match) {
   $match[2] = decode_entities($match[2]);
diff --git a/themes/engines/phptemplate/block.tpl.php b/themes/engines/phptemplate/block.tpl.php
index ca670dbbd..3df046fca 100644
--- a/themes/engines/phptemplate/block.tpl.php
+++ b/themes/engines/phptemplate/block.tpl.php
@@ -1,4 +1,8 @@
-<div class="<?php print "block block-$block->module" ?>" id="<?php print "block-$block->module-$block->delta"; ?>">
+<div id="block-<?php print $block->module-$block->delta; ?>" class="block block-<?php print $block->module ?>">
+
+<?php if ($block->subject): ?>
   <h2><?php print $block->subject ?></h2>
+<?php endif;?>
+
   <div class="content"><?php print $block->content ?></div>
 </div>
diff --git a/themes/engines/phptemplate/box.tpl.php b/themes/engines/phptemplate/box.tpl.php
index 56667e767..84d810cf0 100644
--- a/themes/engines/phptemplate/box.tpl.php
+++ b/themes/engines/phptemplate/box.tpl.php
@@ -1,6 +1,8 @@
 <div class="box">
-  <?php if ($title): ?>
-  <h2 class="title"><?php print $title ?></h2>
-  <?php endif; ?>
+
+<?php if ($title): ?>
+  <h2><?php print $title ?></h2>
+<?php endif; ?>
+
   <div class="content"><?php print $content ?></div>
 </div>
diff --git a/themes/engines/phptemplate/comment.tpl.php b/themes/engines/phptemplate/comment.tpl.php
index d9dc3fd36..c7211b9bf 100644
--- a/themes/engines/phptemplate/comment.tpl.php
+++ b/themes/engines/phptemplate/comment.tpl.php
@@ -1,12 +1,20 @@
 <div class="comment<?php print ($comment->new) ? ' comment-new' : ''; print ($comment->status == COMMENT_NOT_PUBLISHED) ? ' comment-unpublished' : ''; ?> clear-block">
-  <?php if ($comment->new) : ?>
+  <?php print $picture ?>
+
+<?php if ($comment->new) : ?>
   <a id="new"></a>
   <span class="new"><?php print $new ?></span>
-  <?php endif; ?>
+<?php endif; ?>
 
-  <div class="title"><?php print $title ?></div>
-  <?php print $picture ?>
-  <div class="author"><?php print $submitted ?></div>
-  <div class="content"><?php print $content ?></div>
-  <div class="links"><?php print $links ?></div>
+  <h3><?php print $title ?></h3>
+
+  <div class="submitted">
+    <?php print $submitted ?>
+  </div>
+
+  <div class="content">
+    <?php print $content ?>
+  </div>
+
+  <?php print $links ?>
 </div>
diff --git a/themes/engines/phptemplate/node.tpl.php b/themes/engines/phptemplate/node.tpl.php
index 6da685329..872ea0c29 100644
--- a/themes/engines/phptemplate/node.tpl.php
+++ b/themes/engines/phptemplate/node.tpl.php
@@ -1,15 +1,29 @@
-<div class="node<?php if ($sticky) { print " sticky"; } ?><?php if (!$status) { print " node-unpublished"; } ?> clear-block">
-  <?php if ($page == 0): ?>
-    <h2><a href="<?php print $node_url ?>" title="<?php print $title ?>"><?php print $title ?></a></h2>
+<div id="node-<?php print $node->nid; ?>" class="node<?php if ($sticky) { print ' sticky'; } ?><?php if (!$status) { print ' node-unpublished'; } ?> clear-block">
+
+<?php print $picture ?>
+
+<?php if ($page == 0): ?>
+  <h2><a href="<?php print $node_url ?>" title="<?php print $title ?>"><?php print $title ?></a></h2>
+<?php endif; ?>
+
+  <div class="meta">
+  <?php if ($submitted): ?>
+    <span class="submitted"><?php print $submitted ?></span>
   <?php endif; ?>
-  <?php print $picture ?>
 
-  <div class="info"><?php print $submitted ?><span class="terms"><?php print $terms ?></span></div>
+  <?php if ($terms): ?>
+    <span class="terms"><?php print $terms ?></span>
+  <?php endif;?>
+  </div>
+
   <div class="content">
     <?php print $content ?>
   </div>
 
-  <?php if ($links): ?>
-  <div class="links"><?php print $links ?></div>
-  <?php endif; ?>
-</div>
+<?php
+  if ($links) {
+    print $links;
+  }
+?>
+
+</div>
+\ No newline at end of file