? wordpress/wp-content/themes/kubrick/comments.php.lock
Index: wordpress/wp-content/themes/kubrick/comments.php
===================================================================
RCS file: /cvsroot/cafelog/wordpress/wp-content/themes/kubrick/comments.php,v
retrieving revision 1.2
diff -u -r1.2 comments.php
--- wordpress/wp-content/themes/kubrick/comments.php	30 Dec 2004 11:25:15 -0000	1.2
+++ wordpress/wp-content/themes/kubrick/comments.php	2 Jan 2005 20:43:42 -0000
@@ -20,14 +20,14 @@
 <!-- You can start editing here. -->
 
 <?php if ($comments) : ?>
-	<a name="comments"></a><h3><?php comments_number('No Responses','One Response','% Responses' );?> to '<?php the_title(); ?>'</h3> 
+	<h3 id="comments"><?php comments_number('No Responses','One Response','% Responses' );?> to '<?php the_title(); ?>'</h3> 
 
 	<ol class="commentlist">
 
 	<?php foreach ($comments as $comment) : ?>
 
-		<li class="<?php echo $oddcomment; ?>">
-			<a name="comment-<?php comment_ID() ?>"></a><cite><?php comment_author_link() ?></cite> Says:<br />
+		<li class="<?php echo $oddcomment; ?>" id="comment-<?php comment_ID() ?>">
+			<cite><?php comment_author_link() ?></cite> Says:<br />
 			<!--<small class="commentmetadata"><a href="#comment-<?php comment_ID() ?>" title="<?php comment_date('l, F jS, Y') ?> at <?php comment_time() ?>"><?php /* $entry_datetime = abs(strtotime($post->post_date)); $comment_datetime = abs(strtotime($comment->comment_date)); echo time_since($entry_datetime, $comment_datetime) */ ?></a> after publication. <?php edit_comment_link('e','',''); ?></small>-->
 			<small class="commentmetadata"><a href="#comment-<?php comment_ID() ?>" title=""><?php comment_date('F jS, Y') ?> at <?php comment_time() ?></a> <?php edit_comment_link('e','',''); ?></small>
 			
@@ -59,26 +59,70 @@
 
 <?php if ('open' == $post-> comment_status) : ?>
 
-<a name="respond"></a><h3>Leave a Comment</h3>
+<h3 id="respond">Leave a Reply</h3>
 <form action="<?php echo get_settings('siteurl'); ?>/wp-comments-post.php" method="post" id="commentform">
 
-<p><input type="text" name="author" id="author" class="styled" value="<?php echo $comment_author; ?>" size="22" tabindex="1" />
-<input type="hidden" name="comment_post_ID" value="<?php echo $id; ?>" />
-<label for="author"><small>Name</small></label></p>
+<script type="text/javascript">
+<!--
+function ShowInfo() {
+	document.getElementById("authorinfo").style.display = "";
+	document.getElementById("showinfo").style.display = "none";
+	document.getElementById("hideinfo").style.display = "";
+}
+
+function HideInfo() {
+	document.getElementById("authorinfo").style.display = "none";
+	document.getElementById("showinfo").style.display = "";
+	document.getElementById("hideinfo").style.display = "none";
+}
+-->
+</script>
+
+
+<?php if ($comment_author != "") { ?>
+	
+	<p><small>Welcome back <strong><?php echo $comment_author; ?></strong>
+		<span id="showinfo">(<a href="javascript: ShowInfo();">Change</a>)</span>
+		<span id="hideinfo" style="display:none;">(<a href="javascript: HideInfo();">Close</a>)</span>
+	</small></p>
+	
+	<div id="authorinfo" style="display: none;">
+
+<?php } else { ?>
+
+	<div id="authorinfo">
+
+<?php } ?>
+
+	<p><input type="text" name="author" id="author" class="styled" value="<?php echo $comment_author; ?>" size="22" tabindex="1" />
+	<input type="hidden" name="comment_post_ID" value="<?php echo $id; ?>" />
+	<label for="author"><small>Name</small></label></p>
+	
+	<p><input type="text" name="email" id="email" value="<?php echo $comment_author_email; ?>" size="22" tabindex="2" />
+	<label for="email"><small>Mail (will not be published)</small></label></p>
+	
+	<p><input type="text" name="url" id="url" value="<?php echo $comment_author_url; ?>" size="22" tabindex="3" />
+	<label for="url"><small>Website</small></label></p>
+
+</div>
+
+<?php if ($comment_author == "") { ?>
+	<p class="center"><small><strong>XHTML:</strong> <?php echo allowed_tags(); ?></small></p>
+<?php } ?>
 
-<p><input type="text" name="email" id="email" value="<?php echo $comment_author_email; ?>" size="22" tabindex="2" />
-<label for="email"><small>Mail (will not be published)</small></label></p>
+<p><textarea name="comment" id="comment" cols="100%" rows="10" tabindex="4"></textarea></p>
 
-<p><input type="text" name="url" id="url" value="<?php echo $comment_author_url; ?>" size="22" tabindex="3" />
-<label for="url"><small>Website</small></label></p>
 
-<!--<p><small><strong>XHTML:</strong> You can use these tags: <?php echo allowed_tags(); ?></small></p>-->
+<ol class="commentlist" id="preview" style="display: none;">
+	<li class="graybox">
+		<cite><?php echo $comment_author; ?></cite> Says:<br />
+		<div id="livePreview"></div>
+	</li>
+</ol>
 
-<p><textarea name="comment" id="comment" cols="100%" rows="10" tabindex="4"></textarea></p>
 
 <p><input name="submit" type="submit" id="submit" tabindex="5" value="Submit Comment" /></p>
 
-
 </form>
 
 <?php endif; // if you delete this the sky will fall on your head ?>
\ No newline at end of file
Index: wordpress/wp-content/themes/kubrick/header.php
===================================================================
RCS file: /cvsroot/cafelog/wordpress/wp-content/themes/kubrick/header.php,v
retrieving revision 1.3
diff -u -r1.3 header.php
--- wordpress/wp-content/themes/kubrick/header.php	30 Dec 2004 11:40:56 -0000	1.3
+++ wordpress/wp-content/themes/kubrick/header.php	2 Jan 2005 20:43:42 -0000
@@ -7,7 +7,7 @@
 	<meta http-equiv="Content-Type" content="text/html; charset=<?php bloginfo('charset'); ?>" />
 	<meta name="generator" content="WordPress <?php bloginfo('version'); ?>" /> <!-- leave this for stats -->
 
-	<link rel="stylesheet" href="<?php bloginfo('stylesheet_url'); ?>" type="text/css" />
+	<link rel="stylesheet" href="<?php bloginfo('stylesheet_url'); ?>" type="text/css" media="screen" />
 
 	<style type="text/css" media="screen">
 
@@ -26,7 +26,7 @@
 			/*	Because the template is slightly different, size-wise, with images, this needs to be set here
 				If you don't want to use the template's images, you can also delete the following two lines. */
 			
-			#header { padding: 1px; height: 198px; width: 758px; }
+			#header 	{ margin: 0 !important; margin: 0 0 0 1px; padding: 1px; height: 198px; width: 758px; }
 			#headerimg 	{ margin: 7px 9px 0; height: 192px; width: 740px; } 
 		/* END IMAGE CSS */
 		
@@ -56,7 +56,7 @@
 
 <div id="header">
 	<div id="headerimg">
-		<h1><a href="<?php bloginfo('url'); ?>" title="<?php bloginfo('name'); ?>"><?php bloginfo('name'); ?></a></h1>
+		<h1><a href="<?php echo get_settings('siteurl'); ?>" title="<?php bloginfo('name'); ?>"><?php bloginfo('name'); ?></a></h1>
 		<div class="description"><?php bloginfo('description'); ?></div>
 	</div>
 </div>
Index: wordpress/wp-content/themes/kubrick/sidebar.php
===================================================================
RCS file: /cvsroot/cafelog/wordpress/wp-content/themes/kubrick/sidebar.php,v
retrieving revision 1.3
diff -u -r1.3 sidebar.php
--- wordpress/wp-content/themes/kubrick/sidebar.php	30 Dec 2004 11:35:04 -0000	1.3
+++ wordpress/wp-content/themes/kubrick/sidebar.php	2 Jan 2005 20:43:42 -0000
@@ -13,27 +13,27 @@
 
 			<li>
 			<?php /* If this is a category archive */ if (is_category()) { ?>				
-			<p>You are currently browsing the <a href="<?php bloginfo('url'); ?>"><?php echo bloginfo('name'); ?></a> weblog archives
+			<p>You are currently browsing the <a href="<?php echo get_settings('siteurl'); ?>"><?php echo bloginfo('name'); ?></a> weblog archives
 			for the '<?php echo single_cat_title(); ?>' category.</p>
 			
 			<?php /* If this is a yearly archive */ } elseif (is_day()) { ?>
-			<p>You are currently browsing the <a href="<?php bloginfo('url'); ?>"><?php echo bloginfo('name'); ?></a> weblog archives
+			<p>You are currently browsing the <a href="<?php echo get_settings('siteurl'); ?>"><?php echo bloginfo('name'); ?></a> weblog archives
 			for the day <?php the_time('l, F jS, Y'); ?>.</p>
 			
 			<?php /* If this is a monthly archive */ } elseif (is_month()) { ?>
-			<p>You are currently browsing the <a href="<?php bloginfo('url'); ?>"><?php echo bloginfo('name'); ?></a> weblog archives
+			<p>You are currently browsing the <a href="<?php echo get_settings('siteurl'); ?>"><?php echo bloginfo('name'); ?></a> weblog archives
 			for <?php the_time('F, Y'); ?>.</p>
 
       <?php /* If this is a yearly archive */ } elseif (is_year()) { ?>
-			<p>You are currently browsing the <a href="<?php bloginfo('url'); ?>"><?php echo bloginfo('name'); ?></a> weblog archives
+			<p>You are currently browsing the <a href="<?php echo get_settings('siteurl'); ?>"><?php echo bloginfo('name'); ?></a> weblog archives
 			for the year <?php the_time('Y'); ?>.</p>
 			
 		 <?php /* If this is a monthly archive */ } elseif (is_search()) { ?>
-			<p>You have searched the <a href="<?php bloginfo('url'); ?>"><?php echo bloginfo('name'); ?></a> weblog archives
-			for <strong>'<?php echo $s; ?>'</strong>. If you are unable to find anything in these search results, you can try one of these links.</p>
+			<p>You have searched the <a href="<?php echo get_settings('siteurl'); ?>"><?php echo bloginfo('name'); ?></a> weblog archives
+			for <strong>'<?php echo wp_specialchars($s); ?>'</strong>. If you are unable to find anything in these search results, you can try one of these links.</p>
 
 			<?php /* If this is a monthly archive */ } elseif (isset($_GET['paged']) && !empty($_GET['paged'])) { ?>
-			<p>You are currently browsing the <a href="<?php bloginfo('url'); ?>"><?php echo bloginfo('name'); ?></a> weblog archives.</p>
+			<p>You are currently browsing the <a href="<?php echo get_settings('siteurl'); ?>"><?php echo bloginfo('name'); ?></a> weblog archives.</p>
 
 			<?php } ?>
 			</li>
@@ -55,7 +55,7 @@
 
 			<li><h2><?php _e('Categories'); ?></h2>
 				<ul>
-				<?php list_cats(0, '', 'name', 'asc', '', 1, 0, 1, 1, 1, 1, 0,'','','','','28') ?>
+				<?php list_cats(0, '', 'name', 'asc', '', 1, 0, 1, 1, 1, 1, 0,'','','','','') ?>
 				</ul>
 			</li>