Index: functions.php =================================================================== --- functions.php (revision 13615) +++ functions.php (working copy) @@ -257,3 +257,10 @@ } endif; add_action( 'init', 'twentyten_widgets_init' ); + +function is_root_page() { + return (is_front_page() || (is_front_page() && is_home())); +} +function the_header_title_element() { + echo (is_root_page() ? 'h1' : 'div'); +} \ No newline at end of file Index: onecolumn-page.php =================================================================== --- onecolumn-page.php (revision 13615) +++ onecolumn-page.php (working copy) @@ -12,7 +12,9 @@
> +

+
' . __( 'Pages:', 'twentyten' ) . '&after=
'); ?> Index: page.php =================================================================== --- page.php (revision 13615) +++ page.php (working copy) @@ -6,7 +6,9 @@
> +

+
' . __( 'Pages:', 'twentyten' ) . '&after=
'); ?> Index: header.php =================================================================== --- header.php (revision 13615) +++ header.php (working copy) @@ -3,10 +3,10 @@ <?php - if ( is_single() ) { + if ( is_single() ) { single_post_title(); echo ' | '; bloginfo('name'); - } elseif ( is_home() || is_front_page() ) { - bloginfo('name'); echo ' | '; bloginfo('description'); twentyten_the_page_number(); + } elseif ( is_root_page() ) { + bloginfo('name'); echo ' | '; bloginfo('description'); twentyten_the_page_number(); } elseif ( is_page() ) { single_post_title(''); echo ' | '; bloginfo('name'); } elseif ( is_search() ) { @@ -25,12 +25,13 @@ <?php wp_head(); ?> </head> + <body <?php body_class(); ?>> <div id="wrapper" class="hfeed"> <div id="header"> <div id="masthead"> <div id="branding"> - <div id="site-title"><span><a href="<?php echo home_url('/'); ?>" title="<?php echo esc_attr( get_bloginfo( 'name', 'display' ) ); ?>" rel="home"><?php bloginfo( 'name' ); ?></a></span></div> + <<?php the_header_title_element(); ?> id="site-title"><span><a href="<?php echo home_url('/'); ?>" title="<?php echo esc_attr( get_bloginfo( 'name', 'display' ) ); ?>" rel="home"><?php bloginfo( 'name' ); ?></a></span></<?php the_header_title_element(); ?>> <div id="site-description"><?php bloginfo( 'description' ); ?></div> <?php @@ -49,3 +50,6 @@ </div><!-- #header --> <div id="main"> + +<?php +