IntenseWebs/WordPress
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Coding standards cleanup in twentyten, see #9015. Props sivel

Browse Source 
git-svn-id: http://svn.automattic.com/wordpress/trunk@13720 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
iammattthomas 2010-03-16 20:17:22 +00:00
parent b98f319bcf
commit a70633cedc
16 changed files with 153 additions and 117 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
wp-content/themes/twentyten/functions.php
View File

@ -17,14 +17,48 @@ function twentyten_init() {
add_custom_image_header( '', 'twentyten_admin_header_style' ); add_custom_image_header( '', 'twentyten_admin_header_style' );
// and thus ends the changeable header business // and thus ends the changeable header business
register_default_headers( array('berries' => array('url' => '%s/images/headers/berries.jpg', 'thumbnail_url' => '%s/images/headers/berries-thumbnail.jpg', 'description' => __('Berries')), register_default_headers( array (
'cherryblossom' => array( 'url' => '%s/images/headers/cherryblossoms.jpg', 'thumbnail_url' => '%s/images/headers/cherryblossoms-thumbnail.jpg', 'description' => __('Cherry Blossoms')), 'berries' => array (
'concave' => array('url' => '%s/images/headers/concave.jpg', 'thumbnail_url' => '%s/images/headers/concave-thumbnail.jpg', 'description' => __('Concave')), 'url' => '%s/images/headers/berries.jpg',
'fern' => array('url' => '%s/images/headers/fern.jpg', 'thumbnail_url' => '%s/images/headers/fern-thumbnail.jpg', 'description' => __('Fern')), 'thumbnail_url' => '%s/images/headers/berries-thumbnail.jpg',
'forestfloor' => array('url' => '%s/images/headers/forestfloor.jpg', 'thumbnail_url' => '%s/images/headers/forestfloor-thumbnail.jpg', 'description' => __('Forest Floor')), 'description' => __( 'Berries' )
'inkwell' => array('url' => '%s/images/headers/inkwell.jpg', 'thumbnail_url' => '%s/images/headers/inkwell-thumbnail.jpg', 'description' => __('Ink Well')), ),
'path' => array('url' => '%s/images/headers/path.jpg', 'thumbnail_url' => '%s/images/headers/path-thumbnail.jpg', 'description' => __('Path')), 'cherryblossom' => array (
'sunset' => array('url' => '%s/images/headers/sunset.jpg', 'thumbnail_url' => '%s/images/headers/sunset-thumbnail.jpg', 'description' => __('Sunset')) ) ); 'url' => '%s/images/headers/cherryblossoms.jpg',
'thumbnail_url' => '%s/images/headers/cherryblossoms-thumbnail.jpg',
'description' => __( 'Cherry Blossoms' )
),
'concave' => array (
'url' => '%s/images/headers/concave.jpg',
'thumbnail_url' => '%s/images/headers/concave-thumbnail.jpg',
'description' => __( 'Concave' )
),
'fern' => array (
'url' => '%s/images/headers/fern.jpg',
'thumbnail_url' => '%s/images/headers/fern-thumbnail.jpg',
'description' => __( 'Fern' )
),
'forestfloor' => array (
'url' => '%s/images/headers/forestfloor.jpg',
'thumbnail_url' => '%s/images/headers/forestfloor-thumbnail.jpg',
'description' => __( 'Forest Floor' )
),
'inkwell' => array (
'url' => '%s/images/headers/inkwell.jpg',
'thumbnail_url' => '%s/images/headers/inkwell-thumbnail.jpg',
'description' => __( 'Ink Well' )
),
'path' => array (
'url' => '%s/images/headers/path.jpg',
'thumbnail_url' => '%s/images/headers/path-thumbnail.jpg',
'description' => __( 'Path' )
),
'sunset' => array (
'url' => '%s/images/headers/sunset.jpg',
'thumbnail_url' => '%s/images/headers/sunset-thumbnail.jpg',
'description' => __( 'Sunset' )
)
) );
add_custom_background(); add_custom_background();

6
wp-content/themes/twentyten/header.php
View File

@ -34,11 +34,11 @@
<div id="site-description"><?php bloginfo( 'description' ); ?></div> <div id="site-description"><?php bloginfo( 'description' ); ?></div>
<?php <?php
if ( is_singular() && has_post_thumbnail( $post->ID ) ) { if ( is_singular() && has_post_thumbnail( $post->ID ) ) :
echo get_the_post_thumbnail( $post->ID, 'post-thumbnail' ); echo get_the_post_thumbnail( $post->ID, 'post-thumbnail' );
} else { ?> else : ?>
<img src="<?php header_image(); ?>" width="<?php echo HEADER_IMAGE_WIDTH; ?>" height="<?php echo HEADER_IMAGE_HEIGHT; ?>" alt="" /> <img src="<?php header_image(); ?>" width="<?php echo HEADER_IMAGE_WIDTH; ?>" height="<?php echo HEADER_IMAGE_HEIGHT; ?>" alt="" />
<?php } ?> <?php endif; ?>
</div><!-- #branding --> </div><!-- #branding -->
<div id="access"> <div id="access">

6
wp-content/themes/twentyten/sidebar-footer.php
View File

@ -1,8 +1,10 @@
<?php <?php
if ( is_active_sidebar('first-footer-widget-area') || if (
is_active_sidebar( 'first-footer-widget-area' ) ||
is_active_sidebar( 'second-footer-widget-area' ) || is_active_sidebar( 'second-footer-widget-area' ) ||
is_active_sidebar( 'third-footer-widget-area' ) || is_active_sidebar( 'third-footer-widget-area' ) ||
is_active_sidebar('fourth-footer-widget-area') ) : is_active_sidebar( 'fourth-footer-widget-area' )
) :
?> ?>
<div id="footer-widget-area"> <div id="footer-widget-area">
<?php if ( is_active_sidebar( 'first-footer-widget-area' ) ) : ?> <?php if ( is_active_sidebar( 'first-footer-widget-area' ) ) : ?>