From 415b23c88ba8c3fb1108dc309ee35d39f36ebdee Mon Sep 17 00:00:00 2001
From: matt <matt@1a063a9b-81f0-0310-95a4-ce76da25c4cd>
Date: Mon, 7 Nov 2005 09:31:05 +0000
Subject: [PATCH] Some tweaks to the default theme, fixes #1847 and the custom
 header validation error.

git-svn-id: http://svn.automattic.com/wordpress/trunk@3006 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-content/themes/default/archive.php   | 4 ++--
 wp-content/themes/default/functions.php | 6 +++---
 wp-content/themes/default/header.php    | 6 +-----
 wp-content/themes/default/index.php     | 2 +-
 wp-content/themes/default/search.php    | 8 ++------
 5 files changed, 9 insertions(+), 17 deletions(-)
diff --git a/wp-content/themes/default/archive.php b/wp-content/themes/default/archive.php
index f6281db4a..104c8b271 100644
--- a/wp-content/themes/default/archive.php
+++ b/wp-content/themes/default/archive.php
@@ -40,10 +40,10 @@
 				<small><?php the_time('l, F jS, Y') ?></small>
 				
 				<div class="entry">
-					<?php the_excerpt() ?>
+					<?php the_content() ?>
 				</div>
 		
-				<p class="postmetadata">Posted in <?php the_category(', ') ?> <strong>|</strong> <?php edit_post_link('Edit','','<strong>|</strong>'); ?>  <?php comments_popup_link('No Comments &#187;', '1 Comment &#187;', '% Comments &#187;'); ?></p> 
+				<p class="postmetadata">Posted in <?php the_category(', ') ?> | <?php edit_post_link('Edit', '', ' | '); ?>  <?php comments_popup_link('No Comments &#187;', '1 Comment &#187;', '% Comments &#187;'); ?></p> 
 
 			</div>
 	
diff --git a/wp-content/themes/default/functions.php b/wp-content/themes/default/functions.php
index f94f4af6d..90a28466e 100644
--- a/wp-content/themes/default/functions.php
+++ b/wp-content/themes/default/functions.php
@@ -1,10 +1,10 @@
 <?php
 
 function kubrick_head() {
-	$head = "<style type=\"text/css\">\n";
+	$head = "<style type='text/css'>\n<!--";
 	$output = '';
 	if ( kubrick_header_image() ) {
-		$url = kubrick_header_image_url();
+		$url =  kubrick_header_image_url() ;
 		$output .= "#header { background: url('$url') no-repeat bottom center; }\n";
 	}
 	if ( false !== ( $color = kubrick_header_color() ) ) {
@@ -13,7 +13,7 @@ function kubrick_head() {
 	if ( false !== ( $display = kubrick_header_display() ) ) {
 		$output .= "#headerimg { display: $display }\n";
 	}
-	$foot = "</style>\n";
+	$foot = "--></style>\n";
 	if ( '' != $output )
 		echo $head . $output . $foot;
 }
diff --git a/wp-content/themes/default/header.php b/wp-content/themes/default/header.php
index c7dcbb0e9..977daf003 100644
--- a/wp-content/themes/default/header.php
+++ b/wp-content/themes/default/header.php
@@ -9,9 +9,7 @@
 <meta name="generator" content="WordPress <?php bloginfo('version'); ?>" /> <!-- leave this for stats -->
 
 <link rel="stylesheet" href="<?php bloginfo('stylesheet_url'); ?>" type="text/css" media="screen" />
-<link rel="alternate" type="application/rss+xml" title="RSS 2.0" href="<?php bloginfo('rss2_url'); ?>" />
-<link rel="alternate" type="text/xml" title="RSS .92" href="<?php bloginfo('rss_url'); ?>" />
-<link rel="alternate" type="application/atom+xml" title="Atom 0.3" href="<?php bloginfo('atom_url'); ?>" />
+<link rel="alternate" type="application/rss+xml" title="<?php bloginfo('name'); ?> RSS Feed" href="<?php bloginfo('rss2_url'); ?>" />
 <link rel="pingback" href="<?php bloginfo('pingback_url'); ?>" />
 
 <style type="text/css" media="screen">
@@ -43,8 +41,6 @@
 	*/
 </style>
 
-<?php wp_get_archives('type=monthly&format=link'); ?>
-
 <?php wp_head(); ?>
 </head>
 <body>
diff --git a/wp-content/themes/default/index.php b/wp-content/themes/default/index.php
index 0e7668783..32a432ee1 100644
--- a/wp-content/themes/default/index.php
+++ b/wp-content/themes/default/index.php
@@ -14,7 +14,7 @@
 					<?php the_content('Read the rest of this entry &raquo;'); ?>
 				</div>
 		
-				<p class="postmetadata">Posted in <?php the_category(', ') ?> <strong>|</strong> <?php edit_post_link('Edit','','<strong>|</strong>'); ?>  <?php comments_popup_link('No Comments &#187;', '1 Comment &#187;', '% Comments &#187;'); ?></p>
+				<p class="postmetadata">Posted in <?php the_category(', ') ?> | <?php edit_post_link('Edit', '', ' | '); ?>  <?php comments_popup_link('No Comments &#187;', '1 Comment &#187;', '% Comments &#187;'); ?></p>
 			</div>
 	
 		<?php endwhile; ?>
diff --git a/wp-content/themes/default/search.php b/wp-content/themes/default/search.php
index 602a19dd3..4c6875fa7 100644
--- a/wp-content/themes/default/search.php
+++ b/wp-content/themes/default/search.php
@@ -17,12 +17,8 @@
 			<div class="post">
 				<h3 id="post-<?php the_ID(); ?>"><a href="<?php the_permalink() ?>" rel="bookmark" title="Permanent Link to <?php the_title(); ?>"><?php the_title(); ?></a></h3>
 				<small><?php the_time('l, F jS, Y') ?></small>
-				
-				<div class="entry">
-					<?php the_excerpt() ?>
-				</div>
 		
-				<p class="postmetadata">Posted in <?php the_category(', ') ?> <strong>|</strong> <?php edit_post_link('Edit','','<strong>|</strong>'); ?>  <?php comments_popup_link('No Comments &#187;', '1 Comment &#187;', '% Comments &#187;'); ?></p>
+				<p class="postmetadata">Posted in <?php the_category(', ') ?> | <?php edit_post_link('Edit', '', ' | '); ?>  <?php comments_popup_link('No Comments &#187;', '1 Comment &#187;', '% Comments &#187;'); ?></p>
 			</div>
 	
 		<?php endwhile; ?>
@@ -34,7 +30,7 @@
 	
 	<?php else : ?>
 
-		<h2 class="center">Not Found</h2>
+		<h2 class="center">No posts found. Try a different search?</h2>
 		<?php include (TEMPLATEPATH . '/searchform.php'); ?>
 
 	<?php endif; ?>
