Relocate default theme to themes/default. Remove special casing of default theme. Do not look directly in wp-content/ for default theme files. Simplify, simplify.

git-svn-id: https://develop.svn.wordpress.org/trunk@2032 602fd350-edb4-49c9-b593-d223f7449a82
2026-07-01 07:40:07 +00:00 · 2005-01-02 02:47:45 +00:00
parent 824519adfa
commit 4b217b7022
10 changed files with 66 additions and 116 deletions
--- a/wp-includes/functions.php
+++ b/wp-includes/functions.php
@@ -1253,11 +1253,7 @@ function get_template() {
 function get_template_directory() {
 	$template = get_template();

-	if (empty($template) || $template == 'default') {
-		$template = ABSPATH . "wp-content";
-	} else {
-		$template = ABSPATH . "wp-content/themes/$template";
-	}
+	$template = ABSPATH . "wp-content/themes/$template";

 	return $template;
 }
@@ -1330,41 +1326,6 @@ function get_themes() {
 		}
 	}

-	$default_files = array('wp-comments.php', 'wp-comments-popup.php', 'wp-comments-post.php', 'wp-footer.php', 'wp-header.php', 'wp-sidebar.php', 'footer.php', 'header.php', 'sidebar.php');
-
-	// Get the files for the default template.
-	$default_template_files = array();
-	{
-		// Find the index.
-		if (file_exists(ABSPATH  .'wp-content/index.php')) {
-			$default_template_files[] = 'wp-content/index.php';
-		} else {
-			$default_template_files[] = 'index.php';
-		}
-		
-		$dirs = array('', 'wp-content');
-		foreach ($dirs as $dir) {
-			$template_dir = @ dir(ABSPATH . $dir);
-			while(($file = $template_dir->read()) !== false) {
-				if ( !preg_match('|^\.+$|', $file) && in_array($file, $default_files)) 
-					$default_template_files[] = trim("$dir/$file", '/');
-			}
-		}
-	}
-
-	// Get the files for the default stylesheet.
-	$default_stylesheet_files = array();
-	{
-		$stylesheet_dir = @ dir(ABSPATH);
-		while(($file = $stylesheet_dir->read()) !== false) {
-			if ( !preg_match('|^\.+$|', $file) && preg_match('|\.css$|', $file)) 
-				$default_stylesheet_files[] = "$file";
-		}
-	}
-	
-	// The default theme always exists.
-	$themes['Default'] = array('Name' => 'Default', 'Title' => 'WordPress Default', 'Description' => 'The default theme included with WordPress.', 'Author' => 'Dave Shea', 'Version' => '1.3', 'Template' => 'default', 'Stylesheet' => 'default', 'Template Files' => $default_template_files, 'Stylesheet Files' => $default_stylesheet_files, 'Template Dir' => '/', 'Stylesheet Dir' => '/', 'Parent Theme' => '');
-
 	if (!$themes_dir || !$theme_files) {
 		return $themes;
 	}
@@ -1397,35 +1358,27 @@ function get_themes() {

 		$template = trim($template);

-		if (($template != 'default') && (! file_exists("$theme_root/$template/index.php"))) {
+		if (! file_exists("$theme_root/$template/index.php")) {
 			$wp_broken_themes[$name] = array('Name' => $name, 'Title' => $title, 'Description' => __('Template is missing.'));
 			continue;
 		}
 		
 		$stylesheet_files = array();
-		if ($stylesheet != 'default') {
-			$stylesheet_dir = @ dir("$theme_root/$stylesheet");
-			if ($stylesheet_dir) {
-				while(($file = $stylesheet_dir->read()) !== false) {
-					if ( !preg_match('|^\.+$|', $file) && preg_match('|\.css$|', $file) ) 
-						$stylesheet_files[] = "$theme_loc/$stylesheet/$file";
-				}
+		$stylesheet_dir = @ dir("$theme_root/$stylesheet");
+		if ($stylesheet_dir) {
+			while(($file = $stylesheet_dir->read()) !== false) {
+				if ( !preg_match('|^\.+$|', $file) && preg_match('|\.css$|', $file) ) 
+					$stylesheet_files[] = "$theme_loc/$stylesheet/$file";
 			}
-		} else {
-			$stylesheet_files = $default_stylesheet_files;
 		}

 		$template_files = array();		
-		if ($template != 'default') {
-			$template_dir = @ dir("$theme_root/$template");
-			if ($template_dir) {
-				while(($file = $template_dir->read()) !== false) {
-					if ( !preg_match('|^\.+$|', $file) && preg_match('|\.php$|', $file) ) 
-						$template_files[] = "$theme_loc/$template/$file";
-				}
+		$template_dir = @ dir("$theme_root/$template");
+		if ($template_dir) {
+			while(($file = $template_dir->read()) !== false) {
+				if ( !preg_match('|^\.+$|', $file) && preg_match('|\.php$|', $file) ) 
+					$template_files[] = "$theme_loc/$template/$file";
 			}
-		} else {
-			$template_files = $default_template_files;
 		}

 		$template_dir = dirname($template_files[0]);
--- a/wp-includes/template-functions-general.php
+++ b/wp-includes/template-functions-general.php
@@ -6,21 +6,21 @@ function get_header() {
 	if ( file_exists( TEMPLATEPATH . '/header.php') )
 		load_template( TEMPLATEPATH . '/header.php');
 	else
-		load_template( ABSPATH . 'wp-includes/wp-header.php');
+		load_template( ABSPATH . 'wp-content/themes/default/header.php');
 }

 function get_footer() {
 	if ( file_exists( TEMPLATEPATH . '/footer.php') )
 		load_template( TEMPLATEPATH . '/footer.php');
 	else
-		load_template( ABSPATH . 'wp-includes/wp-footer.php');
+		load_template( ABSPATH . 'wp-content/themes/default/footer.php');
 }

 function get_sidebar() {
 	if ( file_exists( TEMPLATEPATH . '/sidebar.php') )
 		load_template( TEMPLATEPATH . '/sidebar.php');
 	else
-		load_template( ABSPATH . 'wp-includes/wp-sidebar.php');
+		load_template( ABSPATH . 'wp-content/themes/default/sidebar.php');
 }


@@ -105,28 +105,16 @@ function get_bloginfo($show='') {
 		break;
 	case 'stylesheet_url':
 		$output = get_stylesheet();
-		if (empty($output) || $output == 'default') {
-			$output = get_settings('siteurl') . "/wp-includes/wp-layout.css";
-		} else {
-			$output = get_settings('siteurl') . "/wp-content/themes/$output/style.css";
-		}
+		$output = get_settings('siteurl') . "/wp-content/themes/$output/style.css";
 		break;
 	case 'stylesheet_directory':
 		$output = get_stylesheet();
-		if (empty($output) || $output == 'default') {
-			$output = get_settings('siteurl');
-		} else {
-			$output = get_settings('siteurl') . "/wp-content/themes/$output";
-		}
+		$output = get_settings('siteurl') . "/wp-content/themes/$output";
 		break;
 	case 'template_directory':
 	case 'template_url':
 		$output = get_template();
-		if (empty($output) || $output == 'default') {
-			$output = get_settings('siteurl');
-		} else {
-			$output = get_settings('siteurl') . "/wp-content/themes/$output";
-		}
+		$output = get_settings('siteurl') . "/wp-content/themes/$output";
 		break;
 	case 'admin_email':
 		$output = get_settings('admin_email');
--- a/wp-includes/wp-comments-popup.php
+++ b/wp-includes/wp-comments-popup.php
@@ -1,115 +0,0 @@
-<?php 
-/* Don't remove these lines. */
-$blog = 1;
-require ('../wp-blog-header.php');
-add_filter('comment_text', 'popuplinks');
-foreach ($posts as $post) { start_wp();
-?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-     <title><?php echo get_settings('blogname'); ?> - <?php echo sprintf(__("Comments on %s"), the_title('','',false)); ?></title>
-
-	<meta http-equiv="Content-Type" content="text/html; charset=<?php echo get_settings('blog_charset'); ?>" />
-	<style type="text/css" media="screen">
-		@import url( <?php bloginfo('stylesheet_url'); ?> );
-		body { margin: 3px; }
-	</style>
-
-</head>
-<body id="commentspopup">
-
-<h1 id="header"><a href="" title="<?php echo get_settings('blogname'); ?>"><?php echo get_settings('blogname'); ?></a></h1>
-
-<h2 id="comments"><?php _e("Comments"); ?></h2>
-
-<p><a href="<?php echo get_settings('siteurl'); ?>/wp-commentsrss2.php?p=<?php echo $post->ID; ?>"><?php _e("<abbr title=\"Really Simple Syndication\">RSS</abbr> feed for comments on this post."); ?></a></p>
-
-<?php if ('open' == $post->ping_status) { ?>
-<p><?php _e("The <acronym title=\"Uniform Resource Identifier\">URI</acronym> to TrackBack this entry is:"); ?> <em><?php trackback_url() ?></em></p>
-<?php } ?>
-
-<?php
-// this line is WordPress' motor, do not delete it.
-$comment_author = (isset($_COOKIE['comment_author_' . COOKIEHASH])) ? trim($_COOKIE['comment_author_'. COOKIEHASH]) : '';
-$comment_author_email = (isset($_COOKIE['comment_author_email_'. COOKIEHASH])) ? trim($_COOKIE['comment_author_email_'. COOKIEHASH]) : '';
-$comment_author_url = (isset($_COOKIE['comment_author_url_'. COOKIEHASH])) ? trim($_COOKIE['comment_author_url_'. COOKIEHASH]) : '';
-$comments = $wpdb->get_results("SELECT * FROM $wpdb->comments WHERE comment_post_ID = $id AND comment_approved = '1' ORDER BY comment_date");
-$commentstatus = $wpdb->get_row("SELECT comment_status, post_password FROM $wpdb->posts WHERE ID = $id");
-if (!empty($commentstatus->post_password) && $_COOKIE['wp-postpass_'. COOKIEHASH] != $commentstatus->post_password) {  // and it doesn't match the cookie
-	echo(get_the_password_form());
-} else { ?>
-
-<?php if ($comments) { ?>
-<ol id="commentlist">
-<?php foreach ($comments as $comment) { ?>
-	<li id="comment-<?php comment_ID() ?>">
-	<?php comment_text() ?>
-	<p><cite><?php comment_type(__('Comment'), __('Trackback'), __('Pingback')); ?> <?php _e("by"); ?> <?php comment_author_link() ?> &#8212; <?php comment_date() ?> @ <a href="#comment-<?php comment_ID() ?>"><?php comment_time() ?></a></cite></p>
-	</li>
-
-<?php } // end for each comment ?>
-</ol>
-<?php } else { // this is displayed if there are no comments so far ?>
-	<p><?php _e("No comments yet."); ?></p>
-<?php } ?>
-
-<?php if ('open' == $commentstatus->comment_status) { ?>
-<h2><?php _e("Leave a comment"); ?></h2>
-<p><?php _e("Line and paragraph breaks automatic, e-mail address never displayed, <acronym title=\"Hypertext Markup Language\">HTML</acronym> allowed:"); ?> <code><?php echo allowed_tags(); ?></code></p>
-
-<form action="<?php echo get_settings('siteurl'); ?>/wp-comments-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"><?php _e("Name"); ?></label>
-	<input type="hidden" name="comment_post_ID" value="<?php echo $id; ?>" />
-	<input type="hidden" name="redirect_to" value="<?php echo wp_specialchars($_SERVER["REQUEST_URI"]); ?>" />
-	</p>
-
-	<p>
-	  <input type="text" name="email" id="email" value="<?php echo $comment_author_email; ?>" size="28" tabindex="2" />
-	   <label for="email"><?php _e("E-mail"); ?></label>
-	</p>
-
-	<p>
-	  <input type="text" name="url" id="url" value="<?php echo $comment_author_url; ?>" size="28" tabindex="3" />
-	   <label for="url"><?php _e("<acronym title=\"Uniform Resource Identifier\">URI</acronym>"); ?></label>
-	</p>
-
-	<p>
-	  <label for="comment"><?php _e("Your Comment"); ?></label>
-	<br />
-	  <textarea name="comment" id="comment" cols="70" rows="4" tabindex="4"></textarea>
-	</p>
-
-	<p>
-	  <input name="submit" type="submit" tabindex="5" value="<?php _e("Say It!"); ?>" />
-	</p>
-	<?php do_action('comment_form', $post->ID); ?>
-</form>
-<?php } else { // comments are closed ?>
-<p><?php _e("Sorry, the comment form is closed at this time."); ?></p>
-<?php }
-} // end password check
-?>
-
-<div><strong><a href="javascript:window.close()"><?php _e("Close this window."); ?></a></strong></div>
-
-<?php // if you delete this the sky will fall on your head
-}
-?>
-
-<!-- // this is just the end of the motor - don't touch that line either :) -->
-<?php //} ?> 
-<p class="credit"><?php timer_stop(1); ?> <?php echo sprintf(__("<cite>Powered by <a href=\"http://wordpress.org\" title=\"%s\"><strong>Wordpress</strong></a></cite>"),__("Powered by WordPress, state-of-the-art semantic personal publishing platform.")); ?></p>
-<?php // Seen at http://www.mijnkopthee.nl/log2/archive/2003/05/28/esc(18) ?>
-<script type="text/javascript">
-<!--
-document.onkeypress = function esc(e) {	
-	if(typeof(e) == "undefined") { e=event; }
-	if (e.keyCode == 27) { self.close(); }
-}
-// -->
-</script>
-</body>
-</html>
--- a/wp-includes/wp-comments.php
+++ b/wp-includes/wp-comments.php
@@ -1,71 +0,0 @@
-<?php if ( !empty($post->post_password) && $_COOKIE['wp-postpass_' . COOKIEHASH] != $post->post_password) : ?>
-<p><?php _e('Enter your password to view comments.'); ?></p>
-<?php return; endif; ?>
-
-<h2 id="comments"><?php comments_number(__('No Comments'), __('1 Comment'), __('% Comments')); ?> 
-<?php if ( comments_open() ) : ?>
-	<a href="#postcomment" title="<?php _e("Leave a comment"); ?>">&raquo;</a>
-<?php endif; ?>
-</h2>
-
-<?php if ( $comments ) : ?>
-<ol id="commentlist">
-
-<?php foreach ($comments as $comment) : ?>
-	<li id="comment-<?php comment_ID() ?>">
-	<?php comment_text() ?>
-	<p><cite><?php comment_type(__('Comment'), __('Trackback'), __('Pingback')); ?> <?php _e('by'); ?> <?php comment_author_link() ?> &#8212; <?php comment_date() ?> @ <a href="#comment-<?php comment_ID() ?>"><?php comment_time() ?></a></cite> <?php edit_comment_link(__("Edit This"), ' |'); ?></p>
-	</li>
-
-<?php endforeach; ?>
-
-</ol>
-
-<?php else : // If there are no comments yet ?>
-	<p><?php _e('No comments yet.'); ?></p>
-<?php endif; ?>
-
-<p><?php comments_rss_link(__('<abbr title="Really Simple Syndication">RSS</abbr> feed for comments on this post.')); ?> 
-<?php if ( pings_open() ) : ?>
-	<a href="<?php trackback_url() ?>" rel="trackback"><?php _e('TrackBack <abbr title="Uniform Resource Identifier">URI</abbr>'); ?></a>
-<?php endif; ?>
-</p>
-
-<?php if ( comments_open() ) : ?>
-<h2 id="postcomment"><?php _e('Leave a comment'); ?></h2>
-
-<p><?php _e("Line and paragraph breaks automatic, e-mail address never displayed, <acronym title=\"Hypertext Markup Language\">HTML</acronym> allowed:"); ?> <code><?php echo allowed_tags(); ?></code></p>
-
-<form action="<?php echo get_settings('siteurl'); ?>/wp-comments-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"><?php _e('Name'); ?></label> <?php if ($req) _e('(required)'); ?>
-	<input type="hidden" name="comment_post_ID" value="<?php echo $post->ID; ?>" />
-	<input type="hidden" name="redirect_to" value="<?php echo wp_specialchars($_SERVER['REQUEST_URI']); ?>" />
-	</p>
-
-	<p>
-	  <input type="text" name="email" id="email" value="<?php echo $comment_author_email; ?>" size="28" tabindex="2" />
-	   <label for="email"><?php _e('E-mail'); ?></label> <?php if ($req) _e('(required)'); ?>
-	</p>
-
-	<p>
-	  <input type="text" name="url" id="url" value="<?php echo $comment_author_url; ?>" size="28" tabindex="3" />
-	   <label for="url"><?php _e('<acronym title="Uniform Resource Identifier">URI</acronym>'); ?></label>
-	</p>
-
-	<p>
-	  <label for="comment"><?php _e('Your Comment'); ?></label>
-	<br />
-	  <textarea name="comment" id="comment" cols="60" rows="4" tabindex="4"></textarea>
-	</p>
-
-	<p>
-	  <input name="submit" id="submit" type="submit" tabindex="5" value="<?php _e('Say It!'); ?>" />
-	</p>
-	<?php do_action('comment_form', $post->ID); ?>
-</form>
-
-<?php else : // Comments are closed ?>
-<p><?php _e('Sorry, the comment form is closed at this time.'); ?></p>
-<?php endif; ?>
--- a/wp-includes/wp-footer.php
+++ b/wp-includes/wp-footer.php
@@ -1,12 +0,0 @@
-<!-- begin footer -->
-</div>
-
-<?php get_sidebar(); ?>
-
-<p class="credit"><!--<?php echo $wpdb->num_queries; ?> queries. <?php timer_stop(1); ?> seconds. --> <cite><?php echo sprintf(__("Powered by <a href='http://wordpress.org' title='%s'><strong>WordPress</strong></a>"), __("Powered by WordPress, state-of-the-art semantic personal publishing platform.")); ?></cite></p>
-
-</div>
-
-<?php do_action('wp_footer', ''); ?>
-</body>
-</html>
--- a/wp-includes/wp-header.php
+++ b/wp-includes/wp-header.php
@@ -1,29 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-
-<head profile="http://gmpg.org/xfn/11">
-	<title><?php bloginfo('name'); ?><?php wp_title(); ?></title>
-	
-	<meta http-equiv="Content-Type" content="text/html; charset=<?php bloginfo('charset'); ?>" />
-	<meta name="generator" content="WordPress <?php bloginfo('version'); ?>" /> <!-- leave this for stats please -->
-
-	<style type="text/css" media="screen">
-		@import url( <?php bloginfo('stylesheet_url'); ?> );
-	</style>
-
-	<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="pingback" href="<?php bloginfo('pingback_url'); ?>" />
-    <?php wp_get_archives('type=monthly&format=link'); ?>
-	<?php //comments_popup_script(); // off by default ?>
-	<?php wp_head(); ?>
-</head>
-
-<body>
-<div id="rap">
-<h1 id="header"><a href="<?php bloginfo('url'); ?>"><?php bloginfo('name'); ?></a></h1>
-
-<div id="content">
-<!-- end header -->
--- a/wp-includes/wp-layout.css
+++ b/wp-includes/wp-layout.css
@@ -1,306 +0,0 @@
-/* Default WordPress by Dave Shea || http://mezzoblue.com
-	Modifications by Matthew Mullenweg || http://photomatt.net
-	This is just a basic layout, with only the bare minimum defined.
-	Please tweak this and make it your own. :)
-*/
-
-a {
-	color: #675;
-}
-
-a img {
-	border: none;
-}
-
-a:visited {
-	color: #342;
-}
-
-a:hover {
-	color: #9a8;
-}
-
-acronym, abbr {
-	border-bottom: 1px dashed #333;
-}
-
-acronym, abbr, span.caps {
-	font-size: 90%;
-	letter-spacing: .07em;
-}
-
-acronym, abbr {
-	cursor: help;
-}
-
-blockquote {
-	border-left: 5px solid #ccc;
-	margin-left: 1.5em;
-	padding-left: 5px;
-}
-
-body {
-	background: #fff;
-	border: solid 2px #565;
-	border-bottom: solid 1px #565;
-	border-top: solid 3px #565;
-	color: #000;
-	font-family: 'Lucida Grande', 'Lucida Sans Unicode', Verdana, sans-serif;
-	margin: 0;
-	padding: 0;
-}
-
-cite {
-	font-size: 90%;
-	font-style: normal;
-}
-
-h2 {
-	border-bottom: 1px dotted #ccc;
-	font: 95% "Times New Roman", Times, serif;
-	letter-spacing: 0.2em;
-	margin: 15px 0 2px 0;
-	padding-bottom: 2px;
-}
-
-h3 {
-	border-bottom: dotted 1px #eee;
-	font-family: "Times New Roman", Times, serif;
-	margin-top: 0;
-}
-
-ol#comments li p {
-	font-size: 100%;
-}
-
-p, li, .feedback {
-	font: 90%/175% 'Lucida Grande', 'Lucida Sans Unicode', Verdana, sans-serif;
-	letter-spacing: -1px;
-}
-
-/* classes used by the_meta() */
-ul.post-meta {
-	list-style: none;
-}
-
-ul.post-meta span.post-meta-key {
-	font-weight: bold;
-}
-
-.credit {
-	background: #90a090;
-	border-top: double 3px #aba;
-	color: #fff;
-	font-size: 11px;
-	margin: 10px 0 0 0;
-	padding: 3px;
-	text-align: center;
-}
-
-.credit a:link, .credit a:hover {
-	color: #fff;
-}
-
-.feedback {
-	color: #ccc;
-	text-align: right;
-	clear: both;
-}
-
-.meta {
-	font-size: .75em;
-}
-
-.meta li, ul.post-meta li {
-	display: inline;
-}
-
-.meta ul {
-	display: inline;
-	list-style: none;
-	margin: 0;
-	padding: 0;
-}
-
-.meta, .meta a {
-	color: #808080;
-	font-weight: normal;
-	letter-spacing: 0;
-}
-
-.storytitle {
-	margin: 0;
-}
-
-.storytitle a {
-	text-decoration: none;
-}
-
-#commentform #name, #commentform #email, #commentform #url, #commentform textarea {
-	background: #fff;
-	border: 1px solid #333;
-	padding: .2em;
-}
-
-#commentform textarea {
-	width: 100%;
-}
-
-#commentlist li ul {
-	border-left: 1px solid #ddd;
-	font-size: 110%;
-	list-style-type: none;
-}
-
-#content {
-	margin: 30px 13em 0 3em;
-	padding-right: 60px;
-}
-
-#header {
-	background: #90a090;
-	border-bottom: double 3px #aba;
-	border-left: solid 1px #9a9;
-	border-right: solid 1px #565;
-	border-top: solid 1px #9a9;
-	font: italic normal 230% 'Times New Roman', Times, serif;
-	letter-spacing: 0.2em;
-	margin: 0;
-	padding: 15px 10px 15px 60px;
-}
-
-#header a {
-	color: #fff;
-	text-decoration: none;
-}
-
-#header a:hover {
-	text-decoration: underline;
-}
-
-#menu {
-	background: #fff;
-	border-left: 1px dotted #ccc;
-	border-top: solid 3px #e0e6e0;
-	padding: 20px 0 10px 30px;
-	position: absolute;
-	right: 2px;
-	top: 0;
-	width: 11em;
-}
-
-#menu form {
-	margin: 0 0 0 13px;
-}
-
-#menu input#s {
-	width: 80%;
-	background: #eee;
-	border: 1px solid #999;
-	color: #000;
-}
-
-#menu ul {
-	color: #ccc;
-	font-weight: bold;
-	list-style-type: none;
-	margin: 0;
-	padding-left: 3px;
-	text-transform: lowercase;
-}
-
-#menu ul li {
-	font: italic normal 110% 'Times New Roman', Times, serif;
-	letter-spacing: 0.1em;
-	margin-top: 10px;
-	padding-bottom: 2px; /*border-bottom: dotted 1px #ccc;*/
-}
-
-#menu ul ul {
-	font-variant: normal;
-	font-weight: normal;
-	line-height: 100%;
-	list-style-type: none;
-	margin: 0;
-	padding: 0;
-	text-align: left;
-}
-
-#menu ul ul li {
-	border: 0;
-	font: normal normal 12px/115% 'Lucida Grande', 'Lucida Sans Unicode', Verdana, sans-serif;
-	letter-spacing: 0;
-	margin-top: 0;
-	padding: 0;
-	padding-left: 12px;
-}
-
-#menu ul ul li a {
-	color: #000;
-	text-decoration: none;
-}
-
-#menu ul ul li a:hover {
-	border-bottom: 1px solid #809080;
-}
-
-#menu ul ul ul.children {
-	font-size: 142%;
-	padding-left: 4px;
-}
-
-#wp-calendar {
-	border: 1px solid #ddd;
-	empty-cells: show;
-	font-size: 14px;
-	margin: 0;
-	width: 90%;
-}
-
-#wp-calendar #next a {
-	padding-right: 10px;
-	text-align: right;
-}
-
-#wp-calendar #prev a {
-	padding-left: 10px;
-	text-align: left;
-}
-
-#wp-calendar a {
-	display: block;
-	text-decoration: none;
-}
-
-#wp-calendar a:hover {
-	background: #e0e6e0;
-	color: #333;
-}
-
-#wp-calendar caption {
-	color: #999;
-	font-size: 16px;
-	text-align: left;
-}
-
-#wp-calendar td {
-	color: #ccc;
-	font: normal 12px 'Lucida Grande', 'Lucida Sans Unicode', Verdana, sans-serif;
-	letter-spacing: normal;
-	padding: 2px 0;
-	text-align: center;
-}
-
-#wp-calendar td.pad:hover {
-	background: #fff;
-}
-
-#wp-calendar td:hover, #wp-calendar #today {
-	background: #eee;
-	color: #bbb;
-}
-
-#wp-calendar th {
-	font-style: normal;
-	text-transform: capitalize;
-}
--- a/wp-includes/wp-sidebar.php
+++ b/wp-includes/wp-sidebar.php
@@ -1,43 +0,0 @@
-
-<!-- begin sidebar -->
-<div id="menu">
-
-<ul>
-	<?php wp_list_pages(); ?>
-	<?php get_links_list(); ?>
- <li id="categories"><?php _e('Categories:'); ?>
-	<ul>
-	<?php wp_list_cats(); ?>
-	</ul>
- </li>
- <li id="search">
-   <label for="s"><?php _e('Search:'); ?></label>	
-   <form id="searchform" method="get" action="<?php echo $_SERVER['PHP_SELF']; ?>">
-	<div>
-		<input type="text" name="s" id="s" size="15" /><br />
-		<input type="submit" name="submit" value="<?php _e('Search'); ?>" />
-	</div>
-	</form>
- </li>
- <li id="archives"><?php _e('Archives:'); ?>
- 	<ul>
-	 <?php wp_get_archives('type=monthly'); ?>
- 	</ul>
- </li>
- <li id="meta"><?php _e('Meta:'); ?>
- 	<ul>
-		<li><?php wp_register(); ?></li>
-		<li><?php wp_loginout(); ?></li>
-		<li><a href="<?php bloginfo('rss2_url'); ?>" title="<?php _e('Syndicate this site using RSS'); ?>"><?php _e('<abbr title="Really Simple Syndication">RSS</abbr>'); ?></a></li>
-		<li><a href="<?php bloginfo('comments_rss2_url'); ?>" title="<?php _e('The latest comments to all posts in RSS'); ?>"><?php _e('Comments <abbr title="Really Simple Syndication">RSS</abbr>'); ?></a></li>
-		<li><a href="http://validator.w3.org/check/referer" title="<?php _e('This page validates as XHTML 1.0 Transitional'); ?>"><?php _e('Valid <abbr title="eXtensible HyperText Markup Language">XHTML</abbr>'); ?></a></li>
-		<li><a href="http://gmpg.org/xfn/"><abbr title="XHTML Friends Network">XFN</abbr></a></li>
-		<li><a href="http://wordpress.org/" title="<?php _e('Powered by WordPress, state-of-the-art semantic personal publishing platform.'); ?>"><abbr title="WordPress">WP</abbr></a></li>
-		<?php wp_meta(); ?>
-	</ul>
- </li>
-
-</ul>
-
-</div>
-<!-- end sidebar -->