diff options
| author | donncha <donncha@7be80a69-a1ef-0310-a953-fb0f7c49ff36> | 2005-11-07 12:10:41 +0000 |
|---|---|---|
| committer | donncha <donncha@7be80a69-a1ef-0310-a953-fb0f7c49ff36> | 2005-11-07 12:10:41 +0000 |
| commit | e50d9b7b54e990125b73843c74984989163011b3 (patch) | |
| tree | 829f7e4cf91fa428583b41ac28d058d972c02da1 /wp-inst/wp-content/themes | |
| parent | aeea30bfc3b2d1441d142e7e3a1530f67e764747 (diff) | |
| download | wordpress-mu-e50d9b7b54e990125b73843c74984989163011b3.tar.gz wordpress-mu-e50d9b7b54e990125b73843c74984989163011b3.tar.xz wordpress-mu-e50d9b7b54e990125b73843c74984989163011b3.zip | |
WP Merge
git-svn-id: http://svn.automattic.com/wordpress-mu/trunk@422 7be80a69-a1ef-0310-a953-fb0f7c49ff36
Diffstat (limited to 'wp-inst/wp-content/themes')
| -rw-r--r-- | wp-inst/wp-content/themes/default/archive.php | 4 | ||||
| -rw-r--r-- | wp-inst/wp-content/themes/default/functions.php | 6 | ||||
| -rw-r--r-- | wp-inst/wp-content/themes/default/header.php | 6 | ||||
| -rw-r--r-- | wp-inst/wp-content/themes/default/index.php | 2 | ||||
| -rw-r--r-- | wp-inst/wp-content/themes/default/search.php | 10 |
5 files changed, 10 insertions, 18 deletions
diff --git a/wp-inst/wp-content/themes/default/archive.php b/wp-inst/wp-content/themes/default/archive.php index b9f346e..0aadc8f 100644 --- a/wp-inst/wp-content/themes/default/archive.php +++ b/wp-inst/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 »', '1 Comment »', '% Comments »'); ?></p> + <p class="postmetadata">Posted in <?php the_category(', ') ?> | <?php edit_post_link('Edit', '', ' | '); ?> <?php comments_popup_link('No Comments »', '1 Comment »', '% Comments »'); ?></p> </div> diff --git a/wp-inst/wp-content/themes/default/functions.php b/wp-inst/wp-content/themes/default/functions.php index f94f4af..90a2846 100644 --- a/wp-inst/wp-content/themes/default/functions.php +++ b/wp-inst/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-inst/wp-content/themes/default/header.php b/wp-inst/wp-content/themes/default/header.php index c7dcbb0..977daf0 100644 --- a/wp-inst/wp-content/themes/default/header.php +++ b/wp-inst/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-inst/wp-content/themes/default/index.php b/wp-inst/wp-content/themes/default/index.php index 0e76687..32a432e 100644 --- a/wp-inst/wp-content/themes/default/index.php +++ b/wp-inst/wp-content/themes/default/index.php @@ -14,7 +14,7 @@ <?php the_content('Read the rest of this entry »'); ?> </div> - <p class="postmetadata">Posted in <?php the_category(', ') ?> <strong>|</strong> <?php edit_post_link('Edit','','<strong>|</strong>'); ?> <?php comments_popup_link('No Comments »', '1 Comment »', '% Comments »'); ?></p> + <p class="postmetadata">Posted in <?php the_category(', ') ?> | <?php edit_post_link('Edit', '', ' | '); ?> <?php comments_popup_link('No Comments »', '1 Comment »', '% Comments »'); ?></p> </div> <?php endwhile; ?> diff --git a/wp-inst/wp-content/themes/default/search.php b/wp-inst/wp-content/themes/default/search.php index 602a19d..d747870 100644 --- a/wp-inst/wp-content/themes/default/search.php +++ b/wp-inst/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 »', '1 Comment »', '% Comments »'); ?></p> + <p class="postmetadata">Posted in <?php the_category(', ') ?> | <?php edit_post_link('Edit', '', ' | '); ?> <?php comments_popup_link('No Comments »', '1 Comment »', '% Comments »'); ?></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; ?> @@ -43,4 +39,4 @@ <?php get_sidebar(); ?> -<?php get_footer(); ?>
\ No newline at end of file +<?php get_footer(); ?> |