From c82471529a60be3170c6b5daf1ec7d572ba4d0d8 Mon Sep 17 00:00:00 2001
From: Matt Mullenweg <matt@git.wordpress.org>
Date: Tue, 6 May 2003 08:48:48 +0000
Subject: [PATCH] Fixed semantics. Cleaned up HTML in general.

git-svn-id: https://develop.svn.wordpress.org/trunk@16 602fd350-edb4-49c9-b593-d223f7449a82
---
 b2comments.php  | 78 +++++++++++++++++++++----------------------------
 b2trackback.php | 45 +++++++++-------------------
 index.php       |  2 +-
 3 files changed, 49 insertions(+), 76 deletions(-)

diff --git a/b2comments.php b/b2comments.php
index 669a24f034..bd31ee0750 100644
--- a/b2comments.php
+++ b/b2comments.php
@@ -14,77 +14,67 @@
 
 <!-- you can start editing here -->
 
-<a name="comments"></a>
-<p>&nbsp;</p>
-<div><strong><span style="color: #0099CC">::</span> comments</strong></div>
-<p>&nbsp;</p>
-
+<h2 id="comment">Comments</h2>
+<ol id="comments">
 	<?php /* this line is b2's motor, do not delete it */ $wxcvbn_c=0; while($rowc = mysql_fetch_object($resultc)) { $wxcvbn_c++; $commentdata = get_commentdata($rowc->comment_ID); ?>
-
-<a name="c<?php comment_ID() ?>"></a>
 	
 <!-- comment -->
-<p>
-<b><?php comment_author() ?> <?php comment_author_email_link("email", " - ", "") ?><?php comment_author_url_link("url", " - ", "") ?></b>
-<br />
+<li id="comment-<?php comment_ID() ?>">
 <?php comment_text() ?>
-<br />
-<?php comment_date() ?> @ <?php comment_time() ?>
-</p>
-<p>&nbsp;</p>
+<p><cite>By <?php if ($commentdata["comment_author_url"] && $commentdata["comment_author_url"] != 'http://url') {
+	echo <<<QQQ
+<a href="{$commentdata["comment_author_url"]}">{$commentdata["comment_author"]}</a>
+QQQ;
+} else {
+	echo $commentdata["comment_author"];
+} ?> <?php comment_date() ?> @ <?php comment_time() ?></cite></p>
+</li>
 <!-- /comment -->
-
-
 	<?php /* end of the loop, don't delete */ } if (!$wxcvbn_c) { ?>
 
-<!-- this is displayed if there are no pingbacks so far -->
-<p>No Comment on this post so far.</p>
+<!-- this is displayed if there are no comments so far -->
+	<li>No comments yet.</li>
 
 	<?php /* if you delete this the sky will fall on your head */ } ?>
-
-<div><strong><span style="color: #0099CC">::</span> leave a comment</strong></div>
-<p>&nbsp;</p>
-
+</ol>
+<h2>Leave a Comment</h2>
+<p>Line and paragraph breaks automatic, website trumps email, basic <acronym title="Hypertext Markup Language">HTML</acronym> allowed.</p>
 
 <!-- form to add a comment -->
 
-<form action="<?php echo $siteurl; ?>/b2comments.post.php" method="post">
+<form action="<?php echo $siteurl; ?>/b2comments.post.php" method="post" id="commentform">
+	<p>
+	  <input type="text" name="author" id="author" class="textarea" value="<?php echo $comment_author; ?>" size="28" tabindex="1" />
+	   <label for="author">name</label>
 	<input type="hidden" name="comment_post_ID" value="<?php echo $id; ?>" />
-	<input type="hidden" name="redirect_to" value="<?php echo htmlspecialchars($HTTP_SERVER_VARS["REQUEST_URI"]); ?>" />
-
-	<p class="commentfield">
-	name<br />
-	<input type="text" name="author" class="textarea" value="<?php echo $comment_author ?>" size="20" tabindex="1" />
+	<input type="hidden" name="redirect_to" value="<?php echo htmlspecialchars($_SERVER["REQUEST_URI"]); ?>" />
 	</p>
 
-	<p class="commentfield">
-	email<br />
-	<input type="text" name="email" class="textarea" value="<?php echo $comment_author_email ?>" size="20" tabindex="2" />
+	<p>
+	  <input type="text" name="email" id="email" value="<?php echo $comment_author_email; ?>" size="28" tabindex="2" />
+	   <label for="email">email</label>
 	</p>
 
-	<p class="commentfield">
-	url<br />
-	<input type="text" name="url" class="textarea" value="<?php echo $comment_author_url ?>" size="20" tabindex="3" />
+	<p>
+	  <input type="text" name="url" id="url" value="<?php echo $comment_author_url; ?>" size="28" tabindex="3" />
+	   <label for="url"><acronym title="Uniform Resource Locator">url</acronym></label>
 	</p>
 
-	<p class="commentfield">
-	your comment<br />
-	<textarea cols="40" rows="4" name="comment" tabindex="4" class="textarea">comment</textarea>
+	<p>
+	  <label for="comment">your comment</label>
+	<br />
+	  <textarea name="comment" id="comment" cols="70" rows="4" tabindex="4"></textarea>
 	</p>
 
-	<p class="commentfield">
-	<input type="checkbox" name="comment_autobr" value="1" <?php
-	if ($autobr)
-	echo " checked=\"checked\"" ?> tabindex="6" /> Auto-BR (line-breaks become &lt;br> tags)<br />
-	<input type="submit" name="submit" class="buttonarea" value="ok" tabindex="5" />
+	<p>
+	  <input name="submit" type="submit" tabindex="5" value="Say it!" />
 	</p>
 
 </form>
 
 <!-- /form -->
 
-<p>&nbsp;</p>
-<div><b><span style="color: #0099CC">::</span> <a href="javascript:history.go(-1)">return to the blog</a></b></div>
+<div><a href="javascript:history.go(-1)">Go back</a>.</div>
 
 <?php // if you delete this the sky will fall on your head
 }
diff --git a/b2trackback.php b/b2trackback.php
index 7e12f2d2a7..22c17d57f0 100644
--- a/b2trackback.php
+++ b/b2trackback.php
@@ -6,45 +6,28 @@
 	$resultc = mysql_query($queryc); if ($resultc) {
 	?>
 
-<a name="trackbacks"></a>
-<div><strong><span style="color: #0099CC">::</span> trackbacks</strong></div>
+<h2 id="trackback">Trackbacks</h2>
 
-<p>
-( The URL to TrackBack this entry is:<br />
-&nbsp;&nbsp;<em><?php trackback_url() ?></em> )
-</p>
+<p>The URL to TrackBack this entry is:</p>
+<p><em><?php trackback_url() ?></em></p>
 
+<ol id="trackbacks">
 	<?php /* this line is b2's motor, do not delete it */ while($rowc = mysql_fetch_object($resultc)) { $commentdata = get_commentdata($rowc->comment_ID); ?>
+	<li id="trackback-<?php comment_ID() ?>">
+	<?php comment_text() ?>
 	
+	<p><cite>Tracked on <a href="<?php comment_author_url(); ?>" title="<?php comment_author() ?>"><?php comment_author() ?></a> on <?php comment_date() ?> @ <?php comment_time() ?></cite></p>
+	</li>
 
-<a name="tb<?php comment_ID() ?>"></a>
-	
-
-<!-- trackback -->
-<p>
-<?php comment_text() ?>
-<br />
-<strong><span style="color: #0099CC">&middot;</span></strong>
-<em>Tracked on <a href="<?php comment_author_url(); ?>" title="<?php comment_author() ?>"><?php comment_author() ?></a> on <?php comment_date() ?> @ <?php comment_time() ?></em>
-</p>
-<p>&nbsp;</p>
-<!-- /trackback -->
-
-
-	<?php /* end of the loop, don't delete */ } ?>
-
-
-<p>&nbsp;</p>
-<div><b><span style="color: #0099CC">::</span> <a href="javascript:history.go(-1)">return to the blog</a></b></div>
+	<?php /* end of the loop, don't delete */ } if (!$wxcvbn_c) { ?>
 
+<!-- this is displayed if there are no trackbacks so far -->
+	<li>No trackbacks yet.</li>
 
 	<?php /* if you delete this the sky will fall on your head */ } ?>
-
-
-</div>
-
-
-
+</ol>
+<div><a href="javascript:history.go(-1)">Go back</a></div>
+	<?php /* if you delete this the sky will fall on your head */ } ?>
 <!-- STOP editing there -->
 
 <?php
diff --git a/index.php b/index.php
index b60300d3b6..cabd967abe 100644
--- a/index.php
+++ b/index.php
@@ -19,7 +19,7 @@
 </head>
 
 <body>
-<h1 id="header"><a href="" title="<?php bloginfo('name'); ?>"><?php bloginfo('name'); ?></a></h1>
+<h1 id="header"><a href="<?php echo $siteurl; ?>" title="<?php bloginfo('name'); ?>"><?php bloginfo('name'); ?></a></h1>
 
 
 <div id="content">