WordPress 3.7-scripts

[autoinstalls/wordpress.git] / wp-content / themes / default / sidebar.php

diff --git a/wp-content/themes/default/sidebar.php b/wp-content/themes/default/sidebar.php
index 36dea86f62bb0751793a18303ff8bffc9283a344..e38b0be04a2246746920b6c19d480946a7231219 100644 (file)
--- a/wp-content/themes/default/sidebar.php
+++ b/wp-content/themes/default/sidebar.php
@@ -1,9 +1,15 @@
-       <div id="sidebar">
+<?php
+/**
+ * @package WordPress
+ * @subpackage Default_Theme
+ */
+?>
+       <div id="sidebar" role="complementary">
                <ul>
                        <?php   /* Widgetized sidebar, if you have the plugin installed. */
                                        if ( !function_exists('dynamic_sidebar') || !dynamic_sidebar() ) : ?>
                        <li>
-                               <?php include (TEMPLATEPATH . '/searchform.php'); ?>
+                               <?php get_search_form(); ?>
                        </li>
 
                        <!-- Author information is disabled per default. Uncomment and fill in your details if you want to use it.
@@ -20,29 +26,31 @@
                        <?php /* If this is a category archive */ } elseif (is_category()) { ?>
                        <p>You are currently browsing the archives for the <?php 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> blog archives
+                       <?php /* If this is a daily archive */ } elseif (is_day()) { ?>
+                       <p>You are currently browsing the <a href="<?php bloginfo('url'); ?>/"><?php bloginfo('name'); ?></a> blog 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> blog archives
+                       <p>You are currently browsing the <a href="<?php bloginfo('url'); ?>/"><?php bloginfo('name'); ?></a> blog 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> blog archives
+                       <p>You are currently browsing the <a href="<?php bloginfo('url'); ?>/"><?php bloginfo('name'); ?></a> blog 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 echo bloginfo('url'); ?>/"><?php echo bloginfo('name'); ?></a> blog archives
+                       <?php /* If this is a search result */ } elseif (is_search()) { ?>
+                       <p>You have searched the <a href="<?php bloginfo('url'); ?>/"><?php bloginfo('name'); ?></a> blog archives
                        for <strong>'<?php the_search_query(); ?>'</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 echo bloginfo('url'); ?>/"><?php echo bloginfo('name'); ?></a> blog archives.</p>
+                       <?php /* If this set is paginated */ } elseif (isset($_GET['paged']) && !empty($_GET['paged'])) { ?>
+                       <p>You are currently browsing the <a href="<?php bloginfo('url'); ?>/"><?php bloginfo('name'); ?></a> blog archives.</p>
 
                        <?php } ?>
 
-                       </li> <?php }?>
-
+                       </li>
+               <?php }?>
+               </ul>
+               <ul role="navigation">
                        <?php wp_list_pages('title_li=<h2>Pages</h2>' ); ?>
 
                        <li><h2>Archives</h2>
@@ -52,7 +60,8 @@
                        </li>
 
                        <?php wp_list_categories('show_count=1&title_li=<h2>Categories</h2>'); ?>
-
+               </ul>
+               <ul>
                        <?php /* If this is the frontpage */ if ( is_home() || is_page() ) { ?>
                                <?php wp_list_bookmarks(); ?>