Upstream/WordPress
1
0
Fork 0
mirror of https://github.com/WordPress/WordPress.git synced 2024-12-22 17:18:32 +01:00
Code Issues Projects Releases Wiki Activity

Trim trailing whitespace

Browse Source 
git-svn-id: http://svn.automattic.com/wordpress/trunk@13025 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
ryan 2010-02-08 18:02:23 +00:00
parent 0ad559106d
commit c9d92fc859
27 changed files with 294 additions and 294 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
wp-admin/edit-tag-form.php
View File

@ -61,7 +61,7 @@ do_action('edit_' . $taxonomy . '_form_pre', $tag, $taxonomy); ?>
<span class="description"><?php _e('The description is not prominent by default, however some themes may show it.'); ?></span></td> <span class="description"><?php _e('The description is not prominent by default, however some themes may show it.'); ?></span></td>
</tr> </tr>
<?php <?php
if ( 'category' == $taxonomy ) if ( 'category' == $taxonomy )
do_action('edit_category_form_fields', $tag); do_action('edit_category_form_fields', $tag);
else else
do_action('edit_tag_form_fields', $tag); do_action('edit_tag_form_fields', $tag);
@ -69,8 +69,8 @@ do_action('edit_' . $taxonomy . '_form_pre', $tag, $taxonomy); ?>
?> ?>
</table> </table>
<p class="submit"><input type="submit" class="button-primary" name="submit" value="<?php esc_attr_e('Update Tag'); ?>" /></p> <p class="submit"><input type="submit" class="button-primary" name="submit" value="<?php esc_attr_e('Update Tag'); ?>" /></p>
<?php <?php
if ( 'category' == $taxonomy ) if ( 'category' == $taxonomy )
do_action('edit_category_form_', $tag); do_action('edit_category_form_', $tag);
else else
do_action('edit_tag_form_', $tag); do_action('edit_tag_form_', $tag);

4
wp-admin/edit-tags.php
View File

@ -328,8 +328,8 @@ else
<p><?php _e('The description is not prominent by default; however, some themes may show it.'); ?></p> <p><?php _e('The description is not prominent by default; however, some themes may show it.'); ?></p>
</div> </div>
<?php <?php
if ( 'category' == $taxonomy ) if ( 'category' == $taxonomy )
do_action('add_category_form_fields'); do_action('add_category_form_fields');
else else
do_action('add_tag_form_fields', $taxonomy); do_action('add_tag_form_fields', $taxonomy);

2
wp-admin/includes/class-wp-filesystem-direct.php
View File

@ -204,7 +204,7 @@ class WP_Filesystem_Direct extends WP_Filesystem_Base {
if ( ! $overwrite && $this->exists($destination) ) if ( ! $overwrite && $this->exists($destination) )
return false; return false;
// try using rename first. if that fails (for example, source is read only) try copy // try using rename first. if that fails (for example, source is read only) try copy
if ( @rename($source, $destination) ) if ( @rename($source, $destination) )
return true; return true;

6
wp-admin/includes/file.php
View File

@ -565,17 +565,17 @@ function _unzip_file_ziparchive($file, $to, $needed_dirs = array() ) {
else else
$needed_dirs[] = $to . untrailingslashit(dirname($info['name'])); $needed_dirs[] = $to . untrailingslashit(dirname($info['name']));
} }
$needed_dirs = array_unique($needed_dirs); $needed_dirs = array_unique($needed_dirs);
asort($needed_dirs); asort($needed_dirs);
// Create those directories if need be: // Create those directories if need be:
foreach ( $needed_dirs as $_dir ) { foreach ( $needed_dirs as $_dir ) {
if ( ! $wp_filesystem->mkdir($_dir, FS_CHMOD_DIR) && ! $wp_filesystem->is_dir($_dir) ) // Only check to see if the Dir exists upon creation failure. Less I/O this way. if ( ! $wp_filesystem->mkdir($_dir, FS_CHMOD_DIR) && ! $wp_filesystem->is_dir($_dir) ) // Only check to see if the Dir exists upon creation failure. Less I/O this way.
return new WP_Error('mkdir_failed', __('Could not create directory.'), $_dir); return new WP_Error('mkdir_failed', __('Could not create directory.'), $_dir);
} }
unset($needed_dirs); unset($needed_dirs);
for ( $i = 0; $i < $z->numFiles; $i++ ) { for ( $i = 0; $i < $z->numFiles; $i++ ) {
if ( ! $info = $z->statIndex($i) ) if ( ! $info = $z->statIndex($i) )
return new WP_Error('stat_failed', __('Could not retrieve file from archive.')); return new WP_Error('stat_failed', __('Could not retrieve file from archive.'));

2
wp-admin/includes/post.php
View File

@ -482,7 +482,7 @@ function wp_write_post() {
foreach ( $draft_ids as $temp => $real ) foreach ( $draft_ids as $temp => $real )
if ( time() + $temp > 86400 ) // 1 day: $temp is equal to -1 * time( then ) if ( time() + $temp > 86400 ) // 1 day: $temp is equal to -1 * time( then )
unset($draft_ids[$temp]); unset($draft_ids[$temp]);
if ( isset($draft_ids[$temp_id]) ) { // Edit, don't write if ( isset($draft_ids[$temp_id]) ) { // Edit, don't write
$_POST['post_ID'] = $draft_ids[$temp_id]; $_POST['post_ID'] = $draft_ids[$temp_id];
unset($_POST['temp_ID']); unset($_POST['temp_ID']);

44
wp-admin/js/post.dev.js
View File

@ -253,15 +253,15 @@ jQuery(document).ready( function($) {
} }
// categories // categories
$('.categorydiv').each(function(){ $('.categorydiv').each(function(){
var this_id = $(this).attr('id'), noSyncChecks = false, syncChecks, catAddAfter, popularCats; var this_id = $(this).attr('id'), noSyncChecks = false, syncChecks, catAddAfter, popularCats;
var taxonomy_parts = this_id.split('-'); var taxonomy_parts = this_id.split('-');
taxonomy_parts.shift(); taxonomy_parts.shift();
var taxonomy = taxonomy_parts.join('-'); var taxonomy = taxonomy_parts.join('-');
var settingName = taxonomy+'_tab'; var settingName = taxonomy+'_tab';
if(taxonomy == 'category') if(taxonomy == 'category')
settingName = 'cats'; settingName = 'cats';
// TODO: move to jQuery 1.3+, support for multiple hierarchical taxonomies, see wp-lists.dev.js // TODO: move to jQuery 1.3+, support for multiple hierarchical taxonomies, see wp-lists.dev.js
$('a', '#'+taxonomy+'-tabs').click(function(){ $('a', '#'+taxonomy+'-tabs').click(function(){
var t = $(this).attr('href'); var t = $(this).attr('href');
@ -274,25 +274,25 @@ jQuery(document).ready( function($) {
setUserSetting(settingName,'pop'); setUserSetting(settingName,'pop');
return false; return false;
}); });
if ( getUserSetting(settingName) ) if ( getUserSetting(settingName) )
$('a[href="#'+taxonomy+'-pop"]', '#'+taxonomy+'-tabs').click(); $('a[href="#'+taxonomy+'-pop"]', '#'+taxonomy+'-tabs').click();
// Ajax Cat // Ajax Cat
$('#new'+taxonomy).one( 'focus', function() { $(this).val( '' ).removeClass( 'form-input-tip' ) } ); $('#new'+taxonomy).one( 'focus', function() { $(this).val( '' ).removeClass( 'form-input-tip' ) } );
$('#'+taxonomy+'-add-submit').click(function(){$('#new'+taxonomy).focus();}); $('#'+taxonomy+'-add-submit').click(function(){$('#new'+taxonomy).focus();});
syncChecks = function() { syncChecks = function() {
if ( noSyncChecks ) if ( noSyncChecks )
return; return;
noSyncChecks = true; noSyncChecks = true;
var th = jQuery(this), c = th.is(':checked'), id = th.val().toString(); var th = jQuery(this), c = th.is(':checked'), id = th.val().toString();
$('#in-'+taxonomy+'-' + id + ', #in-'+taxonomy+'-category-' + id).attr( 'checked', c ); $('#in-'+taxonomy+'-' + id + ', #in-'+taxonomy+'-category-' + id).attr( 'checked', c );
noSyncChecks = false; noSyncChecks = false;
}; };
catAddBefore = function( s ) { catAddBefore = function( s ) {
if ( !$('#new'+taxonomy).val() ) if ( !$('#new'+taxonomy).val() )
return false; return false;

2
wp-admin/network.php
View File

@ -363,7 +363,7 @@ switch( $action ) {
case 'step2': case 'step2':
check_admin_referer( 'install-network-1' ); check_admin_referer( 'install-network-1' );
if ( isset( $_POST[ 'existing_network' ] ) ) { if ( isset( $_POST[ 'existing_network' ] ) ) {
// Install! // Install!
$base = stripslashes( dirname( dirname( $_SERVER['SCRIPT_NAME'] ) ) ); $base = stripslashes( dirname( dirname( $_SERVER['SCRIPT_NAME'] ) ) );
if ( $base != '/' ) if ( $base != '/' )

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

@ -2,7 +2,7 @@
<div id="container"> <div id="container">
<div id="content"> <div id="content">
<div id="post-0" class="post error404 not-found"> <div id="post-0" class="post error404 not-found">
<h1 class="entry-title">Not Found</h1> <h1 class="entry-title">Not Found</h1>
<div class="entry-content"> <div class="entry-content">
@ -11,11 +11,11 @@
</div><!-- .entry-content --> </div><!-- .entry-content -->
</div><!-- #post-0 --> </div><!-- #post-0 -->
</div><!-- #content --> </div><!-- #content -->
</div><!-- #container --> </div><!-- #container -->
<script type="text/javascript"> <script type="text/javascript">
// focus on search field after it has loaded // focus on search field after it has loaded
document.getElementById('s') && document.getElementById('s').focus(); document.getElementById('s') && document.getElementById('s').focus();
</script> </script>
<?php get_footer(); ?> <?php get_footer(); ?>

32
wp-content/themes/twentyten/archive.php
View File

@ -1,10 +1,10 @@
<?php get_header(); ?> <?php get_header(); ?>
<div id="container"> <div id="container">
<div id="content"> <div id="content">
<?php the_post(); ?> <?php the_post(); ?>
<?php if ( is_day() ) : ?> <?php if ( is_day() ) : ?>
<h1 class="page-title"><?php printf( __( 'Daily Archives: <span>%s</span>', 'twentyten' ), get_the_time(get_option('date_format')) ) ?></h1> <h1 class="page-title"><?php printf( __( 'Daily Archives: <span>%s</span>', 'twentyten' ), get_the_time(get_option('date_format')) ) ?></h1>
<?php elseif ( is_month() ) : ?> <?php elseif ( is_month() ) : ?>
@ -16,13 +16,13 @@
<?php endif; ?> <?php endif; ?>
<?php rewind_posts(); ?> <?php rewind_posts(); ?>
<?php global $wp_query; $total_pages = $wp_query->max_num_pages; if ( $total_pages > 1 ) { ?> <?php global $wp_query; $total_pages = $wp_query->max_num_pages; if ( $total_pages > 1 ) { ?>
<div id="nav-above" class="navigation"> <div id="nav-above" class="navigation">
<div class="nav-previous"><?php next_posts_link(__( '<span class="meta-nav">&larr;</span> Older posts', 'twentyten' )) ?></div> <div class="nav-previous"><?php next_posts_link(__( '<span class="meta-nav">&larr;</span> Older posts', 'twentyten' )) ?></div>
<div class="nav-next"><?php previous_posts_link(__( 'Newer posts <span class="meta-nav">&rarr;</span>', 'twentyten' )) ?></div> <div class="nav-next"><?php previous_posts_link(__( 'Newer posts <span class="meta-nav">&rarr;</span>', 'twentyten' )) ?></div>
</div><!-- #nav-above --> </div><!-- #nav-above -->
<?php } ?> <?php } ?>
<?php while ( have_posts() ) : the_post(); ?> <?php while ( have_posts() ) : the_post(); ?>
@ -34,10 +34,10 @@
<a href="<?php <a href="<?php
the_permalink(); ?>" title="<?php the_time('Y-m-d\TH:i:sO') ?>" rel="bookmark"><span class="entry-date"><?php the_time( get_option( 'date_format' ) ); ?></span></a> the_permalink(); ?>" title="<?php the_time('Y-m-d\TH:i:sO') ?>" rel="bookmark"><span class="entry-date"><?php the_time( get_option( 'date_format' ) ); ?></span></a>
<span class="meta-sep"> <?php _e('by ', 'twentyten'); ?> </span> <span class="meta-sep"> <?php _e('by ', 'twentyten'); ?> </span>
<span class="author vcard"><a class="url fn n" href="<?php echo get_author_posts_url( $authordata->ID, $authordata->user_nicename ); ?>" title="<?php printf( __( 'View all posts by %s', 'twentyten' ), $authordata->display_name ); ?>"><?php the_author(); ?></a></span> <span class="author vcard"><a class="url fn n" href="<?php echo get_author_posts_url( $authordata->ID, $authordata->user_nicename ); ?>" title="<?php printf( __( 'View all posts by %s', 'twentyten' ), $authordata->display_name ); ?>"><?php the_author(); ?></a></span>
</div><!-- .entry-meta --> </div><!-- .entry-meta -->
<div class="entry-summary"> <div class="entry-summary">
<?php the_excerpt( __( 'Continue reading <span class="meta-nav">&rarr;</span>', 'twentyten' ) ); ?> <?php the_excerpt( __( 'Continue reading <span class="meta-nav">&rarr;</span>', 'twentyten' ) ); ?>
</div><!-- .entry-summary --> </div><!-- .entry-summary -->
@ -47,20 +47,20 @@
<?php the_tags( '<span class="tag-links"><span class="entry-utility-prep entry-utility-prep-tag-links">' . __('Tagged ', 'twentyten' ) . '</span>', ", ", "</span>\n\t\t\t\t\t\t<span class=\"meta-sep\">|</span>\n" ) ?> <?php the_tags( '<span class="tag-links"><span class="entry-utility-prep entry-utility-prep-tag-links">' . __('Tagged ', 'twentyten' ) . '</span>', ", ", "</span>\n\t\t\t\t\t\t<span class=\"meta-sep\">|</span>\n" ) ?>
<span class="comments-link"><?php comments_popup_link( __( 'Leave a comment', 'twentyten' ), __( '1 Comment', 'twentyten' ), __( '% Comments', 'twentyten' ) ) ?></span> <span class="comments-link"><?php comments_popup_link( __( 'Leave a comment', 'twentyten' ), __( '1 Comment', 'twentyten' ), __( '% Comments', 'twentyten' ) ) ?></span>
<?php edit_post_link( __( 'Edit', 'twentyten' ), "<span class=\"meta-sep\">|</span>\n\t\t\t\t\t\t<span class=\"edit-link\">", "</span>\n\t\t\t\t\t\n" ) ?> <?php edit_post_link( __( 'Edit', 'twentyten' ), "<span class=\"meta-sep\">|</span>\n\t\t\t\t\t\t<span class=\"edit-link\">", "</span>\n\t\t\t\t\t\n" ) ?>
</div><!-- #entry-utility --> </div><!-- #entry-utility -->
</div><!-- #post-<?php the_ID(); ?> --> </div><!-- #post-<?php the_ID(); ?> -->
<?php endwhile; ?> <?php endwhile; ?>
<?php global $wp_query; $total_pages = $wp_query->max_num_pages; if ( $total_pages > 1 ) { ?> <?php global $wp_query; $total_pages = $wp_query->max_num_pages; if ( $total_pages > 1 ) { ?>
<div id="nav-below" class="navigation"> <div id="nav-below" class="navigation">
<div class="nav-previous"><?php next_posts_link(__( '<span class="meta-nav">&larr;</span> Older posts', 'twentyten' )) ?></div> <div class="nav-previous"><?php next_posts_link(__( '<span class="meta-nav">&larr;</span> Older posts', 'twentyten' )) ?></div>
<div class="nav-next"><?php previous_posts_link(__( 'Newer posts <span class="meta-nav">&rarr;</span>', 'twentyten' )) ?></div> <div class="nav-next"><?php previous_posts_link(__( 'Newer posts <span class="meta-nav">&rarr;</span>', 'twentyten' )) ?></div>
</div><!-- #nav-below --> </div><!-- #nav-below -->
<?php } ?> <?php } ?>
</div><!-- #content --> </div><!-- #content -->
</div><!-- #container --> </div><!-- #container -->
<?php get_sidebar(); ?> <?php get_sidebar(); ?>
<?php get_footer(); ?> <?php get_footer(); ?>

28
wp-content/themes/twentyten/attachment.php
View File

@ -1,46 +1,46 @@
<?php get_header(); ?> <?php get_header(); ?>
<div id="container"> <div id="container">
<div id="content"> <div id="content">
<?php the_post(); ?> <?php the_post(); ?>
<p class="page-title"><a href="<?php echo get_permalink($post->post_parent) ?>" title="<?php printf( __( 'Return to %s', 'twentyten' ), wp_specialchars( get_the_title($post->post_parent), 1 ) ) ?>" rel="gallery">&larr; <?php echo get_the_title($post->post_parent) ?></a></p> <p class="page-title"><a href="<?php echo get_permalink($post->post_parent) ?>" title="<?php printf( __( 'Return to %s', 'twentyten' ), wp_specialchars( get_the_title($post->post_parent), 1 ) ) ?>" rel="gallery">&larr; <?php echo get_the_title($post->post_parent) ?></a></p>
<div id="post-<?php the_ID(); ?>" <?php post_class(); ?>> <div id="post-<?php the_ID(); ?>" <?php post_class(); ?>>
<h2 class="entry-title"><?php the_title(); ?></h2> <h2 class="entry-title"><?php the_title(); ?></h2>
<div class="entry-meta"> <div class="entry-meta">
<span class="meta-prep meta-prep-author"><?php _e('By ', 'twentyten'); ?></span> <span class="meta-prep meta-prep-author"><?php _e('By ', 'twentyten'); ?></span>
<span class="author vcard"><a class="url fn n" href="<?php echo get_author_posts_url( $authordata->ID, $authordata->user_nicename ); ?>" title="<?php printf( __( 'View all posts by %s', 'twentyten' ), $authordata->display_name ); ?>"><?php the_author(); ?></a></span> <span class="author vcard"><a class="url fn n" href="<?php echo get_author_posts_url( $authordata->ID, $authordata->user_nicename ); ?>" title="<?php printf( __( 'View all posts by %s', 'twentyten' ), $authordata->display_name ); ?>"><?php the_author(); ?></a></span>
<span class="meta-sep"> | </span> <span class="meta-sep"> | </span>
<span class="meta-prep meta-prep-entry-date"><?php _e('Published ', 'twentyten'); ?></span> <span class="meta-prep meta-prep-entry-date"><?php _e('Published ', 'twentyten'); ?></span>
<span class="entry-date"><abbr class="published" title="<?php the_time('Y-m-d\TH:i:sO') ?>"><?php the_time( get_option( 'date_format' ) ); ?></abbr></span> <span class="entry-date"><abbr class="published" title="<?php the_time('Y-m-d\TH:i:sO') ?>"><?php the_time( get_option( 'date_format' ) ); ?></abbr></span>
<?php edit_post_link( __( 'Edit', 'twentyten' ), "<span class=\"meta-sep\">|</span>\n\t\t\t\t\t\t<span class=\"edit-link\">", "</span>\n\t\t\t\t\t" ) ?> <?php edit_post_link( __( 'Edit', 'twentyten' ), "<span class=\"meta-sep\">|</span>\n\t\t\t\t\t\t<span class=\"edit-link\">", "</span>\n\t\t\t\t\t" ) ?>
</div><!-- .entry-meta --> </div><!-- .entry-meta -->
<div class="entry-content"> <div class="entry-content">
<div class="entry-attachment"> <div class="entry-attachment">
<?php if ( wp_attachment_is_image( $post->id ) ) : $att_image = wp_get_attachment_image_src( $post->id, array(640,640)); ?> <?php if ( wp_attachment_is_image( $post->id ) ) : $att_image = wp_get_attachment_image_src( $post->id, array(640,640)); ?>
<p class="attachment"><a href="<?php echo wp_get_attachment_url($post->id); ?>" title="<?php the_title(); ?>" rel="attachment"><img src="<?php echo $att_image[0];?>" width="<?php echo $att_image[1];?>" height="<?php echo $att_image[2];?>" class="attachment-medium" alt="<?php $post->post_excerpt; ?>" /></a> <p class="attachment"><a href="<?php echo wp_get_attachment_url($post->id); ?>" title="<?php the_title(); ?>" rel="attachment"><img src="<?php echo $att_image[0];?>" width="<?php echo $att_image[1];?>" height="<?php echo $att_image[2];?>" class="attachment-medium" alt="<?php $post->post_excerpt; ?>" /></a>
</p> </p>
<div id="nav-below" class="navigation"> <div id="nav-below" class="navigation">
<div class="nav-previous"><?php previous_image_link( false ); ?></div> <div class="nav-previous"><?php previous_image_link( false ); ?></div>
<div class="nav-next"><?php next_image_link( false ); ?></div> <div class="nav-next"><?php next_image_link( false ); ?></div>
</div><!-- #nav-below --> </div><!-- #nav-below -->
<?php else : ?> <?php else : ?>
<a href="<?php echo wp_get_attachment_url($post->ID) ?>" title="<?php echo wp_specialchars( get_the_title($post->ID), 1 ) ?>" rel="attachment"><?php echo basename($post->guid) ?></a> <a href="<?php echo wp_get_attachment_url($post->ID) ?>" title="<?php echo wp_specialchars( get_the_title($post->ID), 1 ) ?>" rel="attachment"><?php echo basename($post->guid) ?></a>
<?php endif; ?> <?php endif; ?>
</div> </div>
<div class="entry-caption"><?php if ( !empty($post->post_excerpt) ) the_excerpt() ?></div> <div class="entry-caption"><?php if ( !empty($post->post_excerpt) ) the_excerpt() ?></div>
<?php the_content( __( 'Continue reading <span class="meta-nav">&rarr;</span>', 'twentyten' ) ); ?> <?php the_content( __( 'Continue reading <span class="meta-nav">&rarr;</span>', 'twentyten' ) ); ?>
<?php wp_link_pages('before=<div class="page-link">' . __( 'Pages:', 'twentyten' ) . '&after=</div>') ?> <?php wp_link_pages('before=<div class="page-link">' . __( 'Pages:', 'twentyten' ) . '&after=</div>') ?>
</div><!-- .entry-content --> </div><!-- .entry-content -->
<div class="entry-utility"> <div class="entry-utility">
<?php printf( __( 'This entry was posted in %1$s%2$s. Bookmark the <a href="%3$s" title="Permalink to %4$s" rel="bookmark">permalink</a>. Follow any comments here with the <a href="%5$s" title="Comments RSS to %4$s" rel="alternate" type="application/rss+xml">RSS feed for this post</a>.', 'twentyten' ), <?php printf( __( 'This entry was posted in %1$s%2$s. Bookmark the <a href="%3$s" title="Permalink to %4$s" rel="bookmark">permalink</a>. Follow any comments here with the <a href="%5$s" title="Comments RSS to %4$s" rel="alternate" type="application/rss+xml">RSS feed for this post</a>.', 'twentyten' ),
get_the_category_list(', '), get_the_category_list(', '),
@ -67,5 +67,5 @@
</div><!-- #content --> </div><!-- #content -->
</div><!-- #container --> </div><!-- #container -->
<?php get_sidebar(); ?> <?php get_sidebar(); ?>
<?php get_footer(); ?> <?php get_footer(); ?>

38
wp-content/themes/twentyten/author.php
View File

@ -1,32 +1,32 @@
<?php get_header(); ?> <?php get_header(); ?>
<div id="container"> <div id="container">
<div id="content"> <div id="content">
<?php the_post(); ?> <?php the_post(); ?>
<h1 class="page-title author"><?php printf( __( 'Author Archives: <span class="vcard">%s</span>', 'twentyten' ), "<a class='url fn n' href='$authordata->user_url' title='$authordata->display_name' rel='me'>$authordata->display_name</a>" ) ?></h1> <h1 class="page-title author"><?php printf( __( 'Author Archives: <span class="vcard">%s</span>', 'twentyten' ), "<a class='url fn n' href='$authordata->user_url' title='$authordata->display_name' rel='me'>$authordata->display_name</a>" ) ?></h1>
<?php if ( get_the_author_meta('description') ) : // If a user has filled out their decscription show a bio on their entries ?> <?php if ( get_the_author_meta('description') ) : // If a user has filled out their decscription show a bio on their entries ?>
<div id="entry-author-info"> <div id="entry-author-info">
<div id="author-avatar"> <div id="author-avatar">
<?php echo get_avatar( get_the_author_meta('user_email'), apply_filters('twentyten_author_bio_avatar_size', 60) ); ?> <?php echo get_avatar( get_the_author_meta('user_email'), apply_filters('twentyten_author_bio_avatar_size', 60) ); ?>
</div><!-- #author-avatar --> </div><!-- #author-avatar -->
<div id="author-description"> <div id="author-description">
<h2><?php _e('About ', 'twentyten'); ?><?php the_author(); ?></h2> <h2><?php _e('About ', 'twentyten'); ?><?php the_author(); ?></h2>
<?php the_author_meta('description'); ?> <?php the_author_meta('description'); ?>
</div><!-- #author-description --> </div><!-- #author-description -->
</div><!-- .entry-author-info --> </div><!-- .entry-author-info -->
<?php endif; ?> <?php endif; ?>
<?php rewind_posts(); ?> <?php rewind_posts(); ?>
<?php global $wp_query; $total_pages = $wp_query->max_num_pages; if ( $total_pages > 1 ) { ?> <?php global $wp_query; $total_pages = $wp_query->max_num_pages; if ( $total_pages > 1 ) { ?>
<div id="nav-above" class="navigation"> <div id="nav-above" class="navigation">
<div class="nav-previous"><?php next_posts_link(__( '<span class="meta-nav">&larr;</span> Older posts', 'twentyten' )) ?></div> <div class="nav-previous"><?php next_posts_link(__( '<span class="meta-nav">&larr;</span> Older posts', 'twentyten' )) ?></div>
<div class="nav-next"><?php previous_posts_link(__( 'Newer posts <span class="meta-nav">&rarr;</span>', 'twentyten' )) ?></div> <div class="nav-next"><?php previous_posts_link(__( 'Newer posts <span class="meta-nav">&rarr;</span>', 'twentyten' )) ?></div>
</div><!-- #nav-above --> </div><!-- #nav-above -->
<?php } ?> <?php } ?>
<?php while ( have_posts() ) : the_post(); ?> <?php while ( have_posts() ) : the_post(); ?>
@ -38,8 +38,8 @@
<a href="<?php <a href="<?php
the_permalink(); ?>" title="<?php the_time('Y-m-d\TH:i:sO') ?>" rel="bookmark"><span class="entry-date"><?php the_time( get_option( 'date_format' ) ); ?></span></a> the_permalink(); ?>" title="<?php the_time('Y-m-d\TH:i:sO') ?>" rel="bookmark"><span class="entry-date"><?php the_time( get_option( 'date_format' ) ); ?></span></a>
</div><!-- .entry-meta --> </div><!-- .entry-meta -->
<div class="entry-summary"> <div class="entry-summary">
<?php the_excerpt( __( 'Continue reading <span class="meta-nav">&rarr;</span>', 'twentyten' ) ); ?> <?php the_excerpt( __( 'Continue reading <span class="meta-nav">&rarr;</span>', 'twentyten' ) ); ?>
</div><!-- .entry-summary --> </div><!-- .entry-summary -->
@ -49,20 +49,20 @@
<?php the_tags( '<span class="tag-links"><span class="entry-utility-prep entry-utility-prep-tag-links">' . __('Tagged ', 'twentyten' ) . '</span>', ", ", "</span>\n\t\t\t\t\t\t<span class=\"meta-sep\">|</span>\n" ) ?> <?php the_tags( '<span class="tag-links"><span class="entry-utility-prep entry-utility-prep-tag-links">' . __('Tagged ', 'twentyten' ) . '</span>', ", ", "</span>\n\t\t\t\t\t\t<span class=\"meta-sep\">|</span>\n" ) ?>
<span class="comments-link"><?php comments_popup_link( __( 'Leave a comment', 'twentyten' ), __( '1 Comment', 'twentyten' ), __( '% Comments', 'twentyten' ) ) ?></span> <span class="comments-link"><?php comments_popup_link( __( 'Leave a comment', 'twentyten' ), __( '1 Comment', 'twentyten' ), __( '% Comments', 'twentyten' ) ) ?></span>
<?php edit_post_link( __( 'Edit', 'twentyten' ), "<span class=\"meta-sep\">|</span>\n\t\t\t\t\t\t<span class=\"edit-link\">", "</span>\n\t\t\t\t\t\n" ) ?> <?php edit_post_link( __( 'Edit', 'twentyten' ), "<span class=\"meta-sep\">|</span>\n\t\t\t\t\t\t<span class=\"edit-link\">", "</span>\n\t\t\t\t\t\n" ) ?>
</div><!-- #entry-utility --> </div><!-- #entry-utility -->
</div><!-- #post-<?php the_ID(); ?> --> </div><!-- #post-<?php the_ID(); ?> -->
<?php endwhile; ?> <?php endwhile; ?>
<?php global $wp_query; $total_pages = $wp_query->max_num_pages; if ( $total_pages > 1 ) { ?> <?php global $wp_query; $total_pages = $wp_query->max_num_pages; if ( $total_pages > 1 ) { ?>
<div id="nav-below" class="navigation"> <div id="nav-below" class="navigation">
<div class="nav-previous"><?php next_posts_link(__( '<span class="meta-nav">&larr;</span> Older posts', 'twentyten' )) ?></div> <div class="nav-previous"><?php next_posts_link(__( '<span class="meta-nav">&larr;</span> Older posts', 'twentyten' )) ?></div>
<div class="nav-next"><?php previous_posts_link(__( 'Newer posts <span class="meta-nav">&rarr;</span>', 'twentyten' )) ?></div> <div class="nav-next"><?php previous_posts_link(__( 'Newer posts <span class="meta-nav">&rarr;</span>', 'twentyten' )) ?></div>
</div><!-- #nav-below --> </div><!-- #nav-below -->
<?php } ?> <?php } ?>
</div><!-- #content --> </div><!-- #content -->
</div><!-- #container --> </div><!-- #container -->
<?php get_sidebar(); ?> <?php get_sidebar(); ?>
<?php get_footer(); ?> <?php get_footer(); ?>

36
wp-content/themes/twentyten/category.php
View File

@ -1,22 +1,22 @@
<?php get_header(); ?> <?php get_header(); ?>
<div id="container"> <div id="container">
<div id="content"> <div id="content">
<?php the_post(); ?> <?php the_post(); ?>
<h1 class="page-title"><?php _e( 'Category Archives:', 'twentyten' ) ?> <span><?php single_cat_title() ?></span></span></h1> <h1 class="page-title"><?php _e( 'Category Archives:', 'twentyten' ) ?> <span><?php single_cat_title() ?></span></span></h1>
<?php $categorydesc = category_description(); if ( !empty($categorydesc) ) echo apply_filters( 'archive_meta', '<div class="archive-meta">' . $categorydesc . '</div>' ); ?> <?php $categorydesc = category_description(); if ( !empty($categorydesc) ) echo apply_filters( 'archive_meta', '<div class="archive-meta">' . $categorydesc . '</div>' ); ?>
<?php rewind_posts(); ?> <?php rewind_posts(); ?>
<?php global $wp_query; $total_pages = $wp_query->max_num_pages; if ( $total_pages > 1 ) { ?> <?php global $wp_query; $total_pages = $wp_query->max_num_pages; if ( $total_pages > 1 ) { ?>
<div id="nav-above" class="navigation"> <div id="nav-above" class="navigation">
<div class="nav-previous"><?php next_posts_link(__( '<span class="meta-nav">&larr;</span> Older posts', 'twentyten' )) ?></div> <div class="nav-previous"><?php next_posts_link(__( '<span class="meta-nav">&larr;</span> Older posts', 'twentyten' )) ?></div>
<div class="nav-next"><?php previous_posts_link(__( 'Newer posts <span class="meta-nav">&rarr;</span>', 'twentyten' )) ?></div> <div class="nav-next"><?php previous_posts_link(__( 'Newer posts <span class="meta-nav">&rarr;</span>', 'twentyten' )) ?></div>
</div><!-- #nav-above --> </div><!-- #nav-above -->
<?php } ?> <?php } ?>
<?php while ( have_posts() ) : the_post(); ?> <?php while ( have_posts() ) : the_post(); ?>
@ -28,13 +28,13 @@
<a href="<?php <a href="<?php
the_permalink(); ?>" title="<?php the_time('Y-m-d\TH:i:sO') ?>" rel="bookmark"><span class="entry-date"><?php the_time( get_option( 'date_format' ) ); ?></span></a> the_permalink(); ?>" title="<?php the_time('Y-m-d\TH:i:sO') ?>" rel="bookmark"><span class="entry-date"><?php the_time( get_option( 'date_format' ) ); ?></span></a>
<span class="meta-sep"> <?php _e('by ', 'twentyten'); ?> </span> <span class="meta-sep"> <?php _e('by ', 'twentyten'); ?> </span>
<span class="author vcard"><a class="url fn n" href="<?php echo get_author_posts_url( $authordata->ID, $authordata->user_nicename ); ?>" title="<?php printf( __( 'View all posts by %s', 'twentyten' ), $authordata->display_name ); ?>"><?php the_author(); ?></a></span> <span class="author vcard"><a class="url fn n" href="<?php echo get_author_posts_url( $authordata->ID, $authordata->user_nicename ); ?>" title="<?php printf( __( 'View all posts by %s', 'twentyten' ), $authordata->display_name ); ?>"><?php the_author(); ?></a></span>
</div><!-- .entry-meta --> </div><!-- .entry-meta -->
<div class="entry-summary"> <div class="entry-summary">
<?php the_excerpt( __( 'Continue reading <span class="meta-nav">&rarr;</span>', 'twentyten' ) ); ?> <?php the_excerpt( __( 'Continue reading <span class="meta-nav">&rarr;</span>', 'twentyten' ) ); ?>
</div><!-- .entry-summary --> </div><!-- .entry-summary -->
<div class="entry-utility"> <div class="entry-utility">
<?php if ( $cats_meow = cats_meow(', ') ) : // Returns categories other than the one queried ?> <?php if ( $cats_meow = cats_meow(', ') ) : // Returns categories other than the one queried ?>
<span class="cat-links"><?php printf( __( 'Also posted in %s', 'twentyten' ), $cats_meow ) ?></span> <span class="cat-links"><?php printf( __( 'Also posted in %s', 'twentyten' ), $cats_meow ) ?></span>
@ -43,20 +43,20 @@
<?php the_tags( '<span class="tag-links"><span class="entry-utility-prep entry-utility-prep-tag-links">' . __('Tagged ', 'twentyten' ) . '</span>', ", ", "</span>\n\t\t\t\t\t\t<span class=\"meta-sep\">|</span>\n" ) ?> <?php the_tags( '<span class="tag-links"><span class="entry-utility-prep entry-utility-prep-tag-links">' . __('Tagged ', 'twentyten' ) . '</span>', ", ", "</span>\n\t\t\t\t\t\t<span class=\"meta-sep\">|</span>\n" ) ?>
<span class="comments-link"><?php comments_popup_link( __( 'Leave a comment', 'twentyten' ), __( '1 Comment', 'twentyten' ), __( '% Comments', 'twentyten' ) ) ?></span> <span class="comments-link"><?php comments_popup_link( __( 'Leave a comment', 'twentyten' ), __( '1 Comment', 'twentyten' ), __( '% Comments', 'twentyten' ) ) ?></span>
<?php edit_post_link( __( 'Edit', 'twentyten' ), "<span class=\"meta-sep\">|</span>\n\t\t\t\t\t\t<span class=\"edit-link\">", "</span>\n\t\t\t\t\t\n" ) ?> <?php edit_post_link( __( 'Edit', 'twentyten' ), "<span class=\"meta-sep\">|</span>\n\t\t\t\t\t\t<span class=\"edit-link\">", "</span>\n\t\t\t\t\t\n" ) ?>
</div><!-- #entry-utility --> </div><!-- #entry-utility -->
</div><!-- #post-<?php the_ID(); ?> --> </div><!-- #post-<?php the_ID(); ?> -->
<?php endwhile; ?> <?php endwhile; ?>
<?php global $wp_query; $total_pages = $wp_query->max_num_pages; if ( $total_pages > 1 ) { ?> <?php global $wp_query; $total_pages = $wp_query->max_num_pages; if ( $total_pages > 1 ) { ?>
<div id="nav-below" class="navigation"> <div id="nav-below" class="navigation">
<div class="nav-previous"><?php next_posts_link(__( '<span class="meta-nav">&larr;</span> Older posts', 'twentyten' )) ?></div> <div class="nav-previous"><?php next_posts_link(__( '<span class="meta-nav">&larr;</span> Older posts', 'twentyten' )) ?></div>
<div class="nav-next"><?php previous_posts_link(__( 'Newer posts <span class="meta-nav">&rarr;</span>', 'twentyten' )) ?></div> <div class="nav-next"><?php previous_posts_link(__( 'Newer posts <span class="meta-nav">&rarr;</span>', 'twentyten' )) ?></div>
</div><!-- #nav-below --> </div><!-- #nav-below -->
<?php } ?> <?php } ?>
</div><!-- #content --> </div><!-- #content -->
</div><!-- #container --> </div><!-- #container -->
<?php get_sidebar(); ?> <?php get_sidebar(); ?>
<?php get_footer(); ?> <?php get_footer(); ?>

34
wp-content/themes/twentyten/editor-style.css
View File

@ -144,7 +144,7 @@ input,
textarea { textarea {
color: #444; color: #444;
font-size: 16px; font-size: 16px;
line-height: 24px; line-height: 24px;
} }
p, p,
ul, ul,
@ -205,26 +205,26 @@ h5 {
h6 { h6 {
font-size: 0.9em; font-size: 0.9em;
} }
table { table {
border: 1px solid #e7e7e7 !important; border: 1px solid #e7e7e7 !important;
text-align: left; text-align: left;
margin: 0 -1px 24px 0; margin: 0 -1px 24px 0;
width: 100%; width: 100%;
border-collapse: collapse; border-collapse: collapse;
border-spacing: 0; border-spacing: 0;
} }
tr th, tr th,
thead th { thead th {
border: none !important; border: none !important;
color: #888; color: #888;
font-size: 12px; font-size: 12px;
font-weight: bold; font-weight: bold;
line-height: 18px; line-height: 18px;
padding: 9px 24px; padding: 9px 24px;
} }
tr td { tr td {
border: none !important; border: none !important;
border-top: 1px solid #e7e7e7 !important; border-top: 1px solid #e7e7e7 !important;
padding: 6px 24px; padding: 6px 24px;
} }
@ -269,7 +269,7 @@ img.alignleft, img.alignright, img.aligncenter {
-moz-border-radius: 0; -moz-border-radius: 0;
-khtml-border-radius: 0; -khtml-border-radius: 0;
-webkit-border-radius: 0; -webkit-border-radius: 0;
border-radius: 0; border-radius: 0;
} }
.wp-caption img { .wp-caption img {
margin: 5px; margin: 5px;
@ -277,6 +277,6 @@ img.alignleft, img.alignright, img.aligncenter {
.wp-caption p.wp-caption-text { .wp-caption p.wp-caption-text {
margin: 0 0 4px; margin: 0 0 4px;
} }
.wp-smiley { .wp-smiley {
margin:0; margin:0;
} }

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

@ -3,7 +3,7 @@
// Set the content width based on the Theme CSS // Set the content width based on the Theme CSS
$content_width = apply_filters('twentyten_content_width', 640 ); $content_width = apply_filters('twentyten_content_width', 640 );
// Your Changeable header business starts here // Your Changeable header business starts here
// No CSS, just IMG call // No CSS, just IMG call
define( 'HEADER_TEXTCOLOR', ''); define( 'HEADER_TEXTCOLOR', '');
define( 'HEADER_IMAGE', '%s/images/header-1.jpg'); // %s is theme dir uri define( 'HEADER_IMAGE', '%s/images/header-1.jpg'); // %s is theme dir uri
@ -95,7 +95,7 @@ function twentyten_comment($comment, $args, $depth) {
<div class="reply"> <div class="reply">
<?php comment_reply_link(array_merge( $args, array('depth' => $depth, 'max_depth' => $args['max_depth']))) ?> <?php comment_reply_link(array_merge( $args, array('depth' => $depth, 'max_depth' => $args['max_depth']))) ?>
</div> </div>
</div> </div>
<?php } else { ?> <?php } else { ?>
<li class="post pingback"> <li class="post pingback">
@ -178,62 +178,62 @@ function theme_widgets_init() {
'before_title' => '<h3 class="widget-title">', 'before_title' => '<h3 class="widget-title">',
'after_title' => '</h3>', 'after_title' => '</h3>',
) ); ) );
// Area 2 // Area 2
register_sidebar( array ( register_sidebar( array (
'name' => 'Secondary Widget Area', 'name' => 'Secondary Widget Area',
'id' => 'secondary-widget-area', 'id' => 'secondary-widget-area',
'description' => __('The secondary widget area' , 'twentyten'), 'description' => __('The secondary widget area' , 'twentyten'),
'before_widget' => '<li id="%1$s" class="widget-container %2$s">', 'before_widget' => '<li id="%1$s" class="widget-container %2$s">',
'after_widget' => "</li>", 'after_widget' => "</li>",
'before_title' => '<h3 class="widget-title">', 'before_title' => '<h3 class="widget-title">',
'after_title' => '</h3>', 'after_title' => '</h3>',
) ); ) );
// Area 3 // Area 3
register_sidebar( array ( register_sidebar( array (
'name' => 'First Footer Widget Area', 'name' => 'First Footer Widget Area',
'id' => 'first-footer-widget-area', 'id' => 'first-footer-widget-area',
'description' => __('The first footer widget area' , 'twentyten'), 'description' => __('The first footer widget area' , 'twentyten'),
'before_widget' => '<li id="%1$s" class="widget-container %2$s">', 'before_widget' => '<li id="%1$s" class="widget-container %2$s">',
'after_widget' => "</li>", 'after_widget' => "</li>",
'before_title' => '<h3 class="widget-title">', 'before_title' => '<h3 class="widget-title">',
'after_title' => '</h3>', 'after_title' => '</h3>',
) ); ) );
// Area 4 // Area 4
register_sidebar( array ( register_sidebar( array (
'name' => 'Second Footer Widget Area', 'name' => 'Second Footer Widget Area',
'id' => 'second-footer-widget-area', 'id' => 'second-footer-widget-area',
'description' => __('The second footer widget area' , 'twentyten'), 'description' => __('The second footer widget area' , 'twentyten'),
'before_widget' => '<li id="%1$s" class="widget-container %2$s">', 'before_widget' => '<li id="%1$s" class="widget-container %2$s">',
'after_widget' => "</li>", 'after_widget' => "</li>",
'before_title' => '<h3 class="widget-title">', 'before_title' => '<h3 class="widget-title">',
'after_title' => '</h3>', 'after_title' => '</h3>',
) ); ) );
// Area 5 // Area 5
register_sidebar( array ( register_sidebar( array (
'name' => 'Third Footer Widget Area', 'name' => 'Third Footer Widget Area',
'id' => 'third-footer-widget-area', 'id' => 'third-footer-widget-area',
'description' => __('The third footer widget area' , 'twentyten'), 'description' => __('The third footer widget area' , 'twentyten'),
'before_widget' => '<li id="%1$s" class="widget-container %2$s">', 'before_widget' => '<li id="%1$s" class="widget-container %2$s">',
'after_widget' => "</li>", 'after_widget' => "</li>",
'before_title' => '<h3 class="widget-title">', 'before_title' => '<h3 class="widget-title">',
'after_title' => '</h3>', 'after_title' => '</h3>',
) ); ) );
// Area 6 // Area 6
register_sidebar( array ( register_sidebar( array (
'name' => 'Fourth Footer Widget Area', 'name' => 'Fourth Footer Widget Area',
'id' => 'fourth-footer-widget-area', 'id' => 'fourth-footer-widget-area',
'description' => __('The fourth footer widget area' , 'twentyten'), 'description' => __('The fourth footer widget area' , 'twentyten'),
'before_widget' => '<li id="%1$s" class="widget-container %2$s">', 'before_widget' => '<li id="%1$s" class="widget-container %2$s">',
'after_widget' => "</li>", 'after_widget' => "</li>",
'before_title' => '<h3 class="widget-title">', 'before_title' => '<h3 class="widget-title">',
'after_title' => '</h3>', 'after_title' => '</h3>',
) ); ) );
} // end theme_widgets_init } // end theme_widgets_init

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

@ -2,27 +2,27 @@
<html <?php language_attributes(); ?>> <html <?php language_attributes(); ?>>
<head> <head>
<title><?php <title><?php
if ( is_single() ) { single_post_title(); print ' | '; bloginfo('name'); } if ( is_single() ) { single_post_title(); print ' | '; bloginfo('name'); }
elseif ( is_home() || is_front_page() ) { bloginfo('name'); print ' | '; bloginfo('description'); get_page_number(); } elseif ( is_home() || is_front_page() ) { bloginfo('name'); print ' | '; bloginfo('description'); get_page_number(); }
elseif ( is_page() ) { single_post_title(''); print ' | '; bloginfo('name'); } elseif ( is_page() ) { single_post_title(''); print ' | '; bloginfo('name'); }
elseif ( is_search() ) { print 'Search results for ' . wp_specialchars($s); get_page_number(); print ' | '; bloginfo('name'); } elseif ( is_search() ) { print 'Search results for ' . wp_specialchars($s); get_page_number(); print ' | '; bloginfo('name'); }
elseif ( is_404() ) { print 'Not Found | '; bloginfo('name'); } elseif ( is_404() ) { print 'Not Found | '; bloginfo('name'); }
else { bloginfo('name'); wp_title('|'); get_page_number(); } else { bloginfo('name'); wp_title('|'); get_page_number(); }
?></title> ?></title>
<meta http-equiv="content-type" content="<?php bloginfo('html_type'); ?>; charset=<?php bloginfo('charset'); ?>" /> <meta http-equiv="content-type" content="<?php bloginfo('html_type'); ?>; charset=<?php bloginfo('charset'); ?>" />
<link rel="profile" href="http://gmpg.org/xfn/11"> <link rel="profile" href="http://gmpg.org/xfn/11">
<link rel="stylesheet" type="text/css" media="all" href="<?php bloginfo('stylesheet_url'); ?>" /> <link rel="stylesheet" type="text/css" media="all" href="<?php bloginfo('stylesheet_url'); ?>" />
<link rel="stylesheet" type="text/css" media="print" href="<?php bloginfo('stylesheet_directory'); ?>/print.css" /> <link rel="stylesheet" type="text/css" media="print" href="<?php bloginfo('stylesheet_directory'); ?>/print.css" />
<?php if ( is_singular() ) wp_enqueue_script( 'comment-reply' ); ?> <?php if ( is_singular() ) wp_enqueue_script( 'comment-reply' ); ?>
<?php wp_head(); ?> <?php wp_head(); ?>
<link rel="alternate" type="application/rss+xml" href="<?php bloginfo('rss2_url'); ?>" title="<?php printf( __( '%s latest posts', 'twentyten' ), wp_specialchars( get_bloginfo('name'), 1 ) ); ?>" /> <link rel="alternate" type="application/rss+xml" href="<?php bloginfo('rss2_url'); ?>" title="<?php printf( __( '%s latest posts', 'twentyten' ), wp_specialchars( get_bloginfo('name'), 1 ) ); ?>" />
<link rel="alternate" type="application/rss+xml" href="<?php bloginfo('comments_rss2_url') ?>" title="<?php printf( __( '%s latest comments', 'twentyten' ), wp_specialchars( get_bloginfo('name'), 1 ) ); ?>" /> <link rel="alternate" type="application/rss+xml" href="<?php bloginfo('comments_rss2_url') ?>" title="<?php printf( __( '%s latest comments', 'twentyten' ), wp_specialchars( get_bloginfo('name'), 1 ) ); ?>" />
<link rel="pingback" href="<?php bloginfo('pingback_url'); ?>" /> <link rel="pingback" href="<?php bloginfo('pingback_url'); ?>" />
</head> </head>
<body <?php body_class(); ?>> <body <?php body_class(); ?>>
@ -30,11 +30,11 @@
<div id="header"> <div id="header">
<div id="masthead"> <div id="masthead">
<div id="branding"> <div id="branding">
<div id="site-title"><span><a href="<?php bloginfo( 'url' ) ?>/" title="<?php bloginfo( 'name' ) ?>" rel="home"><?php bloginfo( 'name' ) ?></a></span></div> <div id="site-title"><span><a href="<?php bloginfo( 'url' ) ?>/" title="<?php bloginfo( 'name' ) ?>" rel="home"><?php bloginfo( 'name' ) ?></a></span></div>
<div id="site-description"><?php bloginfo( 'description' ) ?></div> <div id="site-description"><?php bloginfo( 'description' ) ?></div>
<?php <?php
global $post; global $post;
if ( is_singular() && has_post_thumbnail( $post->ID ) ) { if ( is_singular() && has_post_thumbnail( $post->ID ) ) {
@ -43,13 +43,13 @@
<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 } ?>
</div><!-- #branding --> </div><!-- #branding -->
<div id="access"> <div id="access">
<div class="skip-link screen-reader-text"><a href="#content" title="<?php _e( 'Skip to content', 'twentyten' ) ?>"><?php _e( 'Skip to content', 'twentyten' ) ?></a></div> <div class="skip-link screen-reader-text"><a href="#content" title="<?php _e( 'Skip to content', 'twentyten' ) ?>"><?php _e( 'Skip to content', 'twentyten' ) ?></a></div>
<?php wp_page_menu( 'sort_column=menu_order' ); ?> <?php wp_page_menu( 'sort_column=menu_order' ); ?>
</div><!-- #access --> </div><!-- #access -->
</div><!-- #masthead --> </div><!-- #masthead -->
</div><!-- #header --> </div><!-- #header -->
<div id="main"> <div id="main">

24
wp-content/themes/twentyten/page.php
View File

@ -1,23 +1,23 @@
<?php get_header(); ?> <?php get_header(); ?>
<div id="container"> <div id="container">
<div id="content"> <div id="content">
<?php the_post(); ?> <?php the_post(); ?>
<div id="post-<?php the_ID(); ?>" <?php post_class(); ?>> <div id="post-<?php the_ID(); ?>" <?php post_class(); ?>>
<h1 class="entry-title"><?php the_title(); ?></h1> <h1 class="entry-title"><?php the_title(); ?></h1>
<div class="entry-content"> <div class="entry-content">
<?php the_content(); ?> <?php the_content(); ?>
<?php wp_link_pages('before=<div class="page-link">' . __( 'Pages:', 'twentyten' ) . '&after=</div>') ?> <?php wp_link_pages('before=<div class="page-link">' . __( 'Pages:', 'twentyten' ) . '&after=</div>') ?>
<?php edit_post_link( __( 'Edit', 'twentyten' ), '<span class="edit-link">', '</span>' ) ?> <?php edit_post_link( __( 'Edit', 'twentyten' ), '<span class="edit-link">', '</span>' ) ?>
</div><!-- .entry-content --> </div><!-- .entry-content -->
</div><!-- #post-<?php the_ID(); ?> --> </div><!-- #post-<?php the_ID(); ?> -->
<?php comments_template(); ?> <?php comments_template(); ?>
</div><!-- #content --> </div><!-- #content -->
</div><!-- #container --> </div><!-- #container -->
<?php get_sidebar(); ?> <?php get_sidebar(); ?>
<?php get_footer(); ?> <?php get_footer(); ?>

2
wp-content/themes/twentyten/print.css
View File

@ -1,4 +1,4 @@
/* /*
This stylesheet reformats the theme for the printed page. This stylesheet reformats the theme for the printed page.
*/ */

38
wp-content/themes/twentyten/rtl.css
View File

@ -1,12 +1,12 @@
/* /*
Theme Name: Twenty Ten Theme Name: Twenty Ten
*/ */
/* -------------------------------------------------------------- /* --------------------------------------------------------------
RTL Basics RTL Basics
-------------------------------------------------------------- */ -------------------------------------------------------------- */
@ -39,8 +39,8 @@ DESCRIPTION: Two-column fixed layout with one sidebar right of content
/* =Fonts /* =Fonts
-------------------------------------------------------------- */ -------------------------------------------------------------- */
body, body,
input, input,
textarea, textarea,
.page-title span { .page-title span {
font-family: Georgia, "Bitstream Charter", serif; font-family: Georgia, "Bitstream Charter", serif;
@ -59,7 +59,7 @@ h3#reply-title,
.comment-body thead th, .comment-body thead th,
.entry-content label, .entry-content label,
.entry-content tr th, .entry-content tr th,
.entry-content thead th, .entry-content thead th,
.entry-meta, .entry-meta,
.entry-title, .entry-title,
.entry-utility, .entry-utility,
@ -139,8 +139,8 @@ blockquote {
} }
#access .menu { #access .menu {
margin-right: 12px; margin-right: 12px;
margin-left: 0; margin-left: 0;
} }
@ -149,21 +149,21 @@ blockquote {
} }
#access ul ul { #access ul ul {
left:auto; left:auto;
right:0; right:0;
float:right; float:right;
} }
#access ul ul ul { #access ul ul ul {
left:auto; left:auto;
right:100%; right:100%;
} }
/* =Content /* =Content
-------------------------------------------------------------- */ -------------------------------------------------------------- */
#content table { #content table {
text-align: right; text-align: right;
margin: 0 0 24px -1px; margin: 0 0 24px -1px;
} }
.entry-title, .entry-title,
.entry-meta { .entry-meta {
@ -199,7 +199,7 @@ blockquote {
margin: 0 104px 0 0; margin: 0 104px 0 0;
} }
/* Gallery listing /* Gallery listing
-------------------------------------------------------------- */ -------------------------------------------------------------- */
.category-gallery .gallery-thumb { .category-gallery .gallery-thumb {
@ -207,14 +207,14 @@ blockquote {
margin-left:20px; margin-left:20px;
margin-right:0; margin-right:0;
} }
#content .gallery .gallery-item { #content .gallery .gallery-item {
float: right; float: right;
} }
/* =Images /* =Images
-------------------------------------------------------------- */ -------------------------------------------------------------- */
#content .gallery .gallery-caption { #content .gallery .gallery-caption {
margin-right: 0; margin-right: 0;
} }

38
wp-content/themes/twentyten/search.php
View File

@ -1,48 +1,48 @@
<?php get_header(); ?> <?php get_header(); ?>
<div id="container"> <div id="container">
<div id="content"> <div id="content">
<?php if ( have_posts() ) : ?> <?php if ( have_posts() ) : ?>
<h1 class="page-title"><?php _e( 'Search Results for: ', 'twentyten' ); ?><span><?php the_search_query(); ?></span></h1> <h1 class="page-title"><?php _e( 'Search Results for: ', 'twentyten' ); ?><span><?php the_search_query(); ?></span></h1>
<?php global $wp_query; $total_pages = $wp_query->max_num_pages; if ( $total_pages > 1 ) { ?> <?php global $wp_query; $total_pages = $wp_query->max_num_pages; if ( $total_pages > 1 ) { ?>
<div id="nav-above" class="navigation"> <div id="nav-above" class="navigation">
<div class="nav-previous"><?php next_posts_link(__( '<span class="meta-nav">&larr;</span> Older posts', 'twentyten' )) ?></div> <div class="nav-previous"><?php next_posts_link(__( '<span class="meta-nav">&larr;</span> Older posts', 'twentyten' )) ?></div>
<div class="nav-next"><?php previous_posts_link(__( 'Newer posts <span class="meta-nav">&rarr;</span>', 'twentyten' )) ?></div> <div class="nav-next"><?php previous_posts_link(__( 'Newer posts <span class="meta-nav">&rarr;</span>', 'twentyten' )) ?></div>
</div><!-- #nav-above --> </div><!-- #nav-above -->
<?php } ?> <?php } ?>
<?php while ( have_posts() ) : the_post() ?> <?php while ( have_posts() ) : the_post() ?>
<div id="post-<?php the_ID(); ?>" <?php post_class(); ?>> <div id="post-<?php the_ID(); ?>" <?php post_class(); ?>>
<h2 class="entry-title"><a href="<?php the_permalink(); ?>" title="<?php printf( __('Permalink to %s', 'twentyten'), the_title_attribute('echo=0') ); ?>" rel="bookmark"><?php the_title(); ?></a></h2> <h2 class="entry-title"><a href="<?php the_permalink(); ?>" title="<?php printf( __('Permalink to %s', 'twentyten'), the_title_attribute('echo=0') ); ?>" rel="bookmark"><?php the_title(); ?></a></h2>
<?php if ( $post->post_type == 'post' ) { ?> <?php if ( $post->post_type == 'post' ) { ?>
<div class="entry-meta"> <div class="entry-meta">
<span class="meta-prep meta-prep-author"><?php _e('Posted on ', 'twentyten'); ?></span> <span class="meta-prep meta-prep-author"><?php _e('Posted on ', 'twentyten'); ?></span>
<a href="<?php <a href="<?php
the_permalink(); ?>" title="<?php the_time('Y-m-d\TH:i:sO') ?>" rel="bookmark"><span class="entry-date"><?php the_time( get_option( 'date_format' ) ); ?></span></a> the_permalink(); ?>" title="<?php the_time('Y-m-d\TH:i:sO') ?>" rel="bookmark"><span class="entry-date"><?php the_time( get_option( 'date_format' ) ); ?></span></a>
<span class="meta-sep"> <?php _e('by ', 'twentyten'); ?> </span> <span class="meta-sep"> <?php _e('by ', 'twentyten'); ?> </span>
<span class="author vcard"><a class="url fn n" href="<?php echo get_author_posts_url( $authordata->ID, $authordata->user_nicename ); ?>" title="<?php printf( __( 'View all posts by %s', 'twentyten' ), $authordata->display_name ); ?>"><?php the_author(); ?></a></span> <span class="author vcard"><a class="url fn n" href="<?php echo get_author_posts_url( $authordata->ID, $authordata->user_nicename ); ?>" title="<?php printf( __( 'View all posts by %s', 'twentyten' ), $authordata->display_name ); ?>"><?php the_author(); ?></a></span>
</div><!-- .entry-meta --> </div><!-- .entry-meta -->
<?php } ?> <?php } ?>
<div class="entry-summary"> <div class="entry-summary">
<?php the_excerpt( __( 'Continue reading <span class="meta-nav">&rarr;</span>', 'twentyten' ) ); ?> <?php the_excerpt( __( 'Continue reading <span class="meta-nav">&rarr;</span>', 'twentyten' ) ); ?>
<?php wp_link_pages('before=<div class="page-link">' . __( 'Pages:', 'twentyten' ) . '&after=</div>') ?> <?php wp_link_pages('before=<div class="page-link">' . __( 'Pages:', 'twentyten' ) . '&after=</div>') ?>
</div><!-- .entry-summary --> </div><!-- .entry-summary -->
<?php if ( $post->post_type == 'post' ) { ?> <?php if ( $post->post_type == 'post' ) { ?>
<div class="entry-utility"> <div class="entry-utility">
<span class="cat-links"><span class="entry-utility-prep entry-utility-prep-cat-links"><?php _e( 'Posted in ', 'twentyten' ); ?></span><?php echo get_the_category_list(', '); ?></span> <span class="cat-links"><span class="entry-utility-prep entry-utility-prep-cat-links"><?php _e( 'Posted in ', 'twentyten' ); ?></span><?php echo get_the_category_list(', '); ?></span>
<span class="meta-sep"> | </span> <span class="meta-sep"> | </span>
<?php the_tags( '<span class="tag-links"><span class="entry-utility-prep entry-utility-prep-tag-links">' . __('Tagged ', 'twentyten' ) . '</span>', ", ", "</span>\n\t\t\t\t\t\t<span class=\"meta-sep\">|</span>\n" ) ?> <?php the_tags( '<span class="tag-links"><span class="entry-utility-prep entry-utility-prep-tag-links">' . __('Tagged ', 'twentyten' ) . '</span>', ", ", "</span>\n\t\t\t\t\t\t<span class=\"meta-sep\">|</span>\n" ) ?>
<span class="comments-link"><?php comments_popup_link( __( 'Leave a comment', 'twentyten' ), __( '1 Comment', 'twentyten' ), __( '% Comments', 'twentyten' ) ) ?></span> <span class="comments-link"><?php comments_popup_link( __( 'Leave a comment', 'twentyten' ), __( '1 Comment', 'twentyten' ), __( '% Comments', 'twentyten' ) ) ?></span>
<?php edit_post_link( __( 'Edit', 'twentyten' ), "<span class=\"meta-sep\">|</span>\n\t\t\t\t\t\t<span class=\"edit-link\">", "</span>\n\t\t\t\t\t\n" ) ?> <?php edit_post_link( __( 'Edit', 'twentyten' ), "<span class=\"meta-sep\">|</span>\n\t\t\t\t\t\t<span class=\"edit-link\">", "</span>\n\t\t\t\t\t\n" ) ?>
</div><!-- #entry-utility --> </div><!-- #entry-utility -->
<?php } ?> <?php } ?>
</div><!-- #post-<?php the_ID(); ?> --> </div><!-- #post-<?php the_ID(); ?> -->
<?php endwhile; ?> <?php endwhile; ?>
@ -52,7 +52,7 @@
<div class="nav-previous"><?php next_posts_link(__( '<span class="meta-nav">&larr;</span> Older posts', 'twentyten' )) ?></div> <div class="nav-previous"><?php next_posts_link(__( '<span class="meta-nav">&larr;</span> Older posts', 'twentyten' )) ?></div>
<div class="nav-next"><?php previous_posts_link(__( 'Newer posts <span class="meta-nav">&rarr;</span>', 'twentyten' )) ?></div> <div class="nav-next"><?php previous_posts_link(__( 'Newer posts <span class="meta-nav">&rarr;</span>', 'twentyten' )) ?></div>
</div><!-- #nav-below --> </div><!-- #nav-below -->
<?php } ?> <?php } ?>
<?php else : ?> <?php else : ?>
@ -60,14 +60,14 @@
<h2 class="entry-title"><?php _e( 'Nothing Found', 'twentyten' ) ?></h2> <h2 class="entry-title"><?php _e( 'Nothing Found', 'twentyten' ) ?></h2>
<div class="entry-content"> <div class="entry-content">
<p><?php _e( 'Sorry, but nothing matched your search criteria. Please try again with some different keywords.', 'twentyten' ); ?></p> <p><?php _e( 'Sorry, but nothing matched your search criteria. Please try again with some different keywords.', 'twentyten' ); ?></p>
<?php get_search_form(); ?> <?php get_search_form(); ?>
</div><!-- .entry-content --> </div><!-- .entry-content -->
</div> </div>
<?php endif; ?> <?php endif; ?>
</div><!-- #content --> </div><!-- #content -->
</div><!-- #container --> </div><!-- #container -->
<?php get_sidebar(); ?> <?php get_sidebar(); ?>
<?php get_footer(); ?> <?php get_footer(); ?>

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

@ -8,7 +8,7 @@
<?php dynamic_sidebar('first-footer-widget-area'); ?> <?php dynamic_sidebar('first-footer-widget-area'); ?>
</ul> </ul>
</div><!-- #first .widget-area --> </div><!-- #first .widget-area -->
<?php endif; ?> <?php endif; ?>
<?php if ( is_active_sidebar('second-footer-widget-area') ) : ?> <?php if ( is_active_sidebar('second-footer-widget-area') ) : ?>
<div id="second" class="widget-area"> <div id="second" class="widget-area">
@ -16,7 +16,7 @@
<?php dynamic_sidebar('second-footer-widget-area'); ?> <?php dynamic_sidebar('second-footer-widget-area'); ?>
</ul> </ul>
</div><!-- #second .widget-area --> </div><!-- #second .widget-area -->
<?php endif; ?> <?php endif; ?>
<?php if ( is_active_sidebar('third-footer-widget-area') ) : ?> <?php if ( is_active_sidebar('third-footer-widget-area') ) : ?>
<div id="third" class="widget-area"> <div id="third" class="widget-area">
@ -24,7 +24,7 @@
<?php dynamic_sidebar('third-footer-widget-area'); ?> <?php dynamic_sidebar('third-footer-widget-area'); ?>
</ul> </ul>
</div><!-- #third .widget-area --> </div><!-- #third .widget-area -->
<?php endif; ?> <?php endif; ?>
<?php if ( is_active_sidebar('fourth-footer-widget-area') ) : ?> <?php if ( is_active_sidebar('fourth-footer-widget-area') ) : ?>
<div id="fourth" class="widget-area"> <div id="fourth" class="widget-area">
@ -32,7 +32,7 @@
<?php dynamic_sidebar('fourth-footer-widget-area'); ?> <?php dynamic_sidebar('fourth-footer-widget-area'); ?>
</ul> </ul>
</div><!-- #fourth .widget-area --> </div><!-- #fourth .widget-area -->
<?php endif; ?> <?php endif; ?>
</div><!-- #footer-widget-area --> </div><!-- #footer-widget-area -->
<?php endif; ?> <?php endif; ?>

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

@ -11,7 +11,7 @@
<?php wp_get_archives('type=monthly') ?> <?php wp_get_archives('type=monthly') ?>
</ul> </ul>
</li> </li>
<li id="meta" class="widget-container"> <li id="meta" class="widget-container">
<h3 class="widget-title"><?php _e('Meta', 'twentyten') ?></h3> <h3 class="widget-title"><?php _e('Meta', 'twentyten') ?></h3>
<ul> <ul>
@ -21,11 +21,11 @@
<?php wp_meta() ?> <?php wp_meta() ?>
</ul> </ul>
</li> </li>
<?php endif; // end primary widget area ?> <?php endif; // end primary widget area ?>
</ul> </ul>
</div><!-- #primary .widget-area --> </div><!-- #primary .widget-area -->
<?php if ( is_active_sidebar('secondary-widget-area') ) : // Nothing here by default and design ?> <?php if ( is_active_sidebar('secondary-widget-area') ) : // Nothing here by default and design ?>
<div id="secondary" class="widget-area"> <div id="secondary" class="widget-area">
<ul class="xoxo"> <ul class="xoxo">

40
wp-content/themes/twentyten/single.php
View File

@ -1,8 +1,8 @@
<?php get_header(); ?> <?php get_header(); ?>
<div id="container"> <div id="container">
<div id="content"> <div id="content">
<?php the_post(); ?> <?php the_post(); ?>
<div id="nav-above" class="navigation"> <div id="nav-above" class="navigation">
@ -12,36 +12,36 @@
<div id="post-<?php the_ID(); ?>" <?php post_class(); ?>> <div id="post-<?php the_ID(); ?>" <?php post_class(); ?>>
<h1 class="entry-title"><?php the_title(); ?></h1> <h1 class="entry-title"><?php the_title(); ?></h1>
<div class="entry-meta"> <div class="entry-meta">
<span class="meta-prep meta-prep-author"><?php _e('Posted by ', 'twentyten'); ?></span> <span class="meta-prep meta-prep-author"><?php _e('Posted by ', 'twentyten'); ?></span>
<span class="author vcard"><a class="url fn n" href="<?php echo get_author_posts_url( $authordata->ID, $authordata->user_nicename ); ?>" title="<?php printf( __( 'View all posts by %s', 'twentyten' ), $authordata->display_name ); ?>"><?php the_author(); ?></a></span> <span class="author vcard"><a class="url fn n" href="<?php echo get_author_posts_url( $authordata->ID, $authordata->user_nicename ); ?>" title="<?php printf( __( 'View all posts by %s', 'twentyten' ), $authordata->display_name ); ?>"><?php the_author(); ?></a></span>
<span class="meta-sep"> <?php _e('on ', 'twentyten'); ?> </span> <span class="meta-sep"> <?php _e('on ', 'twentyten'); ?> </span>
<a href="<?php <a href="<?php
the_permalink(); ?>" title="<?php the_time('Y-m-d\TH:i:sO') ?>" rel="bookmark"><span class="entry-date"><?php the_time( get_option( 'date_format' ) ); ?></span></a> the_permalink(); ?>" title="<?php the_time('Y-m-d\TH:i:sO') ?>" rel="bookmark"><span class="entry-date"><?php the_time( get_option( 'date_format' ) ); ?></span></a>
<?php edit_post_link( __( 'Edit', 'twentyten' ), "<span class=\"meta-sep\">|</span>\n\t\t\t\t\t\t<span class=\"edit-link\">", "</span>\n\t\t\t\t\t" ) ?> <?php edit_post_link( __( 'Edit', 'twentyten' ), "<span class=\"meta-sep\">|</span>\n\t\t\t\t\t\t<span class=\"edit-link\">", "</span>\n\t\t\t\t\t" ) ?>
</div><!-- .entry-meta --> </div><!-- .entry-meta -->
<div class="entry-content"> <div class="entry-content">
<?php the_content(); ?> <?php the_content(); ?>
<?php wp_link_pages('before=<div class="page-link">' . __( 'Pages:', 'twentyten' ) . '&after=</div>') ?> <?php wp_link_pages('before=<div class="page-link">' . __( 'Pages:', 'twentyten' ) . '&after=</div>') ?>
</div><!-- .entry-content --> </div><!-- .entry-content -->
<?php if ( get_the_author_meta('description') ) : // If a user has filled out their decscription show a bio on their entries ?> <?php if ( get_the_author_meta('description') ) : // If a user has filled out their decscription show a bio on their entries ?>
<div id="entry-author-info"> <div id="entry-author-info">
<div id="author-avatar"> <div id="author-avatar">
<?php echo get_avatar( get_the_author_meta('user_email'), apply_filters('twentyten_author_bio_avatar_size', 60) ); ?> <?php echo get_avatar( get_the_author_meta('user_email'), apply_filters('twentyten_author_bio_avatar_size', 60) ); ?>
</div><!-- #author-avatar --> </div><!-- #author-avatar -->
<div id="author-description"> <div id="author-description">
<h2><?php _e('About ', 'twentyten'); ?><?php the_author(); ?></h2> <h2><?php _e('About ', 'twentyten'); ?><?php the_author(); ?></h2>
<?php the_author_meta('description'); ?> <?php the_author_meta('description'); ?>
<div id="author-link"> <div id="author-link">
<a href="<?php echo get_author_posts_url( $authordata->ID, $authordata->user_nicename ); ?>" title="<?php printf( __( 'View all posts by %s', 'twentyten' ), $authordata->display_name ); ?>"><?php _e('View all posts by ', 'twentyten'); ?><?php the_author(); ?> &rarr;</a> <a href="<?php echo get_author_posts_url( $authordata->ID, $authordata->user_nicename ); ?>" title="<?php printf( __( 'View all posts by %s', 'twentyten' ), $authordata->display_name ); ?>"><?php _e('View all posts by ', 'twentyten'); ?><?php the_author(); ?> &rarr;</a>
</div><!-- #author-link --> </div><!-- #author-link -->
</div><!-- #author-description --> </div><!-- #author-description -->
</div><!-- .entry-author-info --> </div><!-- .entry-author-info -->
<?php endif; ?> <?php endif; ?>
<div class="entry-utility"> <div class="entry-utility">
<?php printf( __( 'This entry was posted in %1$s%2$s. Bookmark the <a href="%3$s" title="Permalink to %4$s" rel="bookmark">permalink</a>. Follow any comments here with the <a href="%5$s" title="Comments RSS to %4$s" rel="alternate" type="application/rss+xml">RSS feed for this post</a>.', 'twentyten' ), <?php printf( __( 'This entry was posted in %1$s%2$s. Bookmark the <a href="%3$s" title="Permalink to %4$s" rel="bookmark">permalink</a>. Follow any comments here with the <a href="%5$s" title="Comments RSS to %4$s" rel="alternate" type="application/rss+xml">RSS feed for this post</a>.', 'twentyten' ),
get_the_category_list(', '), get_the_category_list(', '),
@ -51,18 +51,18 @@ the_permalink(); ?>" title="<?php the_time('Y-m-d\TH:i:sO') ?>" rel="bookmark"><
get_post_comments_feed_link() ) ?> get_post_comments_feed_link() ) ?>
<?php edit_post_link( __( 'Edit', 'twentyten' ), "\n\t\t\t\t\t<span class=\"edit-link\">", "</span>" ) ?> <?php edit_post_link( __( 'Edit', 'twentyten' ), "\n\t\t\t\t\t<span class=\"edit-link\">", "</span>" ) ?>
</div><!-- .entry-utility --> </div><!-- .entry-utility -->
</div><!-- #post-<?php the_ID(); ?> --> </div><!-- #post-<?php the_ID(); ?> -->
<div id="nav-below" class="navigation"> <div id="nav-below" class="navigation">
<div class="nav-previous"><?php previous_post_link( '%link', '<span class="meta-nav">&larr;</span> %title' ) ?></div> <div class="nav-previous"><?php previous_post_link( '%link', '<span class="meta-nav">&larr;</span> %title' ) ?></div>
<div class="nav-next"><?php next_post_link( '%link', '%title <span class="meta-nav">&rarr;</span>' ) ?></div> <div class="nav-next"><?php next_post_link( '%link', '%title <span class="meta-nav">&rarr;</span>' ) ?></div>
</div><!-- #nav-below --> </div><!-- #nav-below -->
<?php comments_template('', true); ?> <?php comments_template('', true); ?>
</div><!-- #content --> </div><!-- #content -->
</div><!-- #container --> </div><!-- #container -->
<?php get_sidebar(); ?> <?php get_sidebar(); ?>
<?php get_footer(); ?> <?php get_footer(); ?>

92
wp-content/themes/twentyten/style.css
View File

@ -1,4 +1,4 @@
/* /*
Theme Name: Twenty Ten Theme Name: Twenty Ten
Theme URI: http://wordpress.org/ Theme URI: http://wordpress.org/
Description: The 2010 default theme for WordPress. Description: The 2010 default theme for WordPress.
@ -8,13 +8,13 @@ Tags: black, blue, white, two-columns, fixed-width, custom-header, theme-options
*/ */
/* -------------------------------------------------------------- /* --------------------------------------------------------------
Reset default browser CSS. Reset default browser CSS.
Based on work by Eric Meyer: Based on work by Eric Meyer:
http://meyerweb.com/eric/tools/css/reset/index.html http://meyerweb.com/eric/tools/css/reset/index.html
-------------------------------------------------------------- */ -------------------------------------------------------------- */
html, body, div, span, applet, object, iframe, html, body, div, span, applet, object, iframe,
@ -35,7 +35,7 @@ table, caption, tbody, tfoot, thead, tr, th, td {
body { body {
line-height: 1; line-height: 1;
} }
h1,h2,h3,h4,h5,h6 { h1,h2,h3,h4,h5,h6 {
font-weight: normal; font-weight: normal;
clear: both; clear: both;
} }
@ -92,8 +92,8 @@ DESCRIPTION: Two-column fixed layout with one sidebar right of content
/* =Fonts /* =Fonts
-------------------------------------------------------------- */ -------------------------------------------------------------- */
body, body,
input, input,
textarea, textarea,
.page-title span, .page-title span,
.pingback a.url { .pingback a.url {
@ -113,7 +113,7 @@ h3#reply-title,
.comment-body thead th, .comment-body thead th,
.entry-content label, .entry-content label,
.entry-content tr th, .entry-content tr th,
.entry-content thead th, .entry-content thead th,
.entry-meta, .entry-meta,
.entry-title, .entry-title,
.entry-utility, .entry-utility,
@ -360,16 +360,16 @@ a:hover {
} }
#access a { #access a {
display:block; display:block;
text-decoration:none; text-decoration:none;
color:#aaa; color:#aaa;
padding:0 10px; padding:0 10px;
line-height:38px; line-height:38px;
} }
#access ul ul { #access ul ul {
display:none; display:none;
position:absolute; position:absolute;
top:38px; top:38px;
left:0; left:0;
float:left; float:left;
-webkit-box-shadow: 0px 3px 3px rgba(0,0,0,0.2); -webkit-box-shadow: 0px 3px 3px rgba(0,0,0,0.2);
-moz-box-shadow: 0px 3px 3px rgba(0,0,0,0.2); -moz-box-shadow: 0px 3px 3px rgba(0,0,0,0.2);
@ -377,19 +377,19 @@ a:hover {
z-index: 99999; z-index: 99999;
} }
#access ul ul ul { #access ul ul ul {
left:100%; left:100%;
top:0; top:0;
} }
#access ul ul a { #access ul ul a {
background:#333; background:#333;
height:auto; height:auto;
line-height:1em; line-height:1em;
padding:10px; padding:10px;
width: 130px; width: 130px;
} }
#access li:hover > a, #access li:hover > a,
#access ul ul :hover > a { #access ul ul :hover > a {
color:#fff; color:#fff;
background:#333; background:#333;
} }
#access ul li:hover > ul { #access ul li:hover > ul {
@ -413,7 +413,7 @@ a:hover {
#content textarea { #content textarea {
color: #444; color: #444;
font-size: 16px; font-size: 16px;
line-height: 24px; line-height: 24px;
} }
#content p, #content p,
#content ul, #content ul,
@ -455,25 +455,25 @@ a:hover {
margin: 0 0 20px 0; margin: 0 0 20px 0;
line-height: 1.5em; line-height: 1.5em;
} }
#content table { #content table {
border: 1px solid #e7e7e7; border: 1px solid #e7e7e7;
text-align: left; text-align: left;
margin: 0 -1px 24px 0; margin: 0 -1px 24px 0;
width: 100%; width: 100%;
}
#content tr th,
#content thead th {
color: #888;
font-size: 12px;
font-weight: bold;
line-height: 18px;
padding: 9px 24px;
}
#content tr td {
border-top: 1px solid #e7e7e7;
padding: 6px 24px;
} }
#content tr.odd td { #content tr th,
#content thead th {
color: #888;
font-size: 12px;
font-weight: bold;
line-height: 18px;
padding: 9px 24px;
}
#content tr td {
border-top: 1px solid #e7e7e7;
padding: 6px 24px;
}
#content tr.odd td {
background: #F2F7FC; background: #F2F7FC;
} }
.hentry { .hentry {
@ -677,7 +677,7 @@ a:hover {
/* Gallery listing /* Gallery listing
-------------------------------------------------------------- */ -------------------------------------------------------------- */
.category-gallery { .category-gallery {
margin-bottom: 48px; margin-bottom: 48px;
} }
.category-gallery h2 { .category-gallery h2 {
@ -767,7 +767,7 @@ img.alignleft, img.alignright, img.aligncenter {
#content .wp-caption p.wp-caption-text { #content .wp-caption p.wp-caption-text {
margin: 0 0 4px; margin: 0 0 4px;
} }
#content .wp-smiley { #content .wp-smiley {
margin:0; margin:0;
} }
#content .gallery { #content .gallery {
@ -874,7 +874,7 @@ h3#comments-title {
#comments .comment-body ol { #comments .comment-body ol {
margin-bottom: 18px; margin-bottom: 18px;
} }
#comments .comment-body p:last-child { #comments .comment-body p:last-child {
margin-bottom: 6px; margin-bottom: 6px;
} }
#comments .comment-body blockquote p:last-child { #comments .comment-body blockquote p:last-child {
@ -997,10 +997,10 @@ h3#reply-title {
#form-allowed-tags { #form-allowed-tags {
color:#888; color:#888;
font-size: 12px; font-size: 12px;
line-height: 18px; line-height: 18px;
} }
#form-allowed-tags p { #form-allowed-tags p {
margin:0; margin:0;
} }
#form-allowed-tags span { #form-allowed-tags span {
} }
@ -1095,7 +1095,7 @@ h3#reply-title {
} }
/* Footer widget areas */ /* Footer widget areas */
#footer-widget-area { #footer-widget-area {
} }

38
wp-content/themes/twentyten/tag.php
View File

@ -1,20 +1,20 @@
<?php get_header(); ?> <?php get_header(); ?>
<div id="container"> <div id="container">
<div id="content"> <div id="content">
<?php the_post(); ?> <?php the_post(); ?>
<h1 class="page-title"><?php _e( 'Tag Archives:', 'twentyten' ) ?> <span><?php single_tag_title() ?></span></h1> <h1 class="page-title"><?php _e( 'Tag Archives:', 'twentyten' ) ?> <span><?php single_tag_title() ?></span></h1>
<?php rewind_posts(); ?> <?php rewind_posts(); ?>
<?php global $wp_query; $total_pages = $wp_query->max_num_pages; if ( $total_pages > 1 ) { ?> <?php global $wp_query; $total_pages = $wp_query->max_num_pages; if ( $total_pages > 1 ) { ?>
<div id="nav-above" class="navigation"> <div id="nav-above" class="navigation">
<div class="nav-previous"><?php next_posts_link(__( '<span class="meta-nav">&larr;</span> Older posts', 'twentyten' )) ?></div> <div class="nav-previous"><?php next_posts_link(__( '<span class="meta-nav">&larr;</span> Older posts', 'twentyten' )) ?></div>
<div class="nav-next"><?php previous_posts_link(__( 'Newer posts <span class="meta-nav">&rarr;</span>', 'twentyten' )) ?></div> <div class="nav-next"><?php previous_posts_link(__( 'Newer posts <span class="meta-nav">&rarr;</span>', 'twentyten' )) ?></div>
</div><!-- #nav-above --> </div><!-- #nav-above -->
<?php } ?> <?php } ?>
<?php while ( have_posts() ) : the_post(); ?> <?php while ( have_posts() ) : the_post(); ?>
@ -25,35 +25,35 @@
<span class="meta-prep meta-prep-author"><?php _e('Posted on ', 'twentyten'); ?></span> <span class="meta-prep meta-prep-author"><?php _e('Posted on ', 'twentyten'); ?></span>
<a href="<?php the_permalink(); ?>" title="<?php the_time('Y-m-d\TH:i:sO') ?>" rel="bookmark"><span class="entry-date"><?php the_time( get_option( 'date_format' ) ); ?></span></a> <a href="<?php the_permalink(); ?>" title="<?php the_time('Y-m-d\TH:i:sO') ?>" rel="bookmark"><span class="entry-date"><?php the_time( get_option( 'date_format' ) ); ?></span></a>
<span class="meta-sep"> <?php _e('by ', 'twentyten'); ?> </span> <span class="meta-sep"> <?php _e('by ', 'twentyten'); ?> </span>
<span class="author vcard"><a class="url fn n" href="<?php echo get_author_posts_url( $authordata->ID, $authordata->user_nicename ); ?>" title="<?php printf( __( 'View all posts by %s', 'twentyten' ), $authordata->display_name ); ?>"><?php the_author(); ?></a></span> <span class="author vcard"><a class="url fn n" href="<?php echo get_author_posts_url( $authordata->ID, $authordata->user_nicename ); ?>" title="<?php printf( __( 'View all posts by %s', 'twentyten' ), $authordata->display_name ); ?>"><?php the_author(); ?></a></span>
</div><!-- .entry-meta --> </div><!-- .entry-meta -->
<div class="entry-summary"> <div class="entry-summary">
<?php the_excerpt( __( 'Continue reading <span class="meta-nav">&rarr;</span>', 'twentyten' ) ); ?> <?php the_excerpt( __( 'Continue reading <span class="meta-nav">&rarr;</span>', 'twentyten' ) ); ?>
</div><!-- .entry-summary --> </div><!-- .entry-summary -->
<div class="entry-utility"> <div class="entry-utility">
<span class="cat-links"><span class="entry-utility-prep entry-utility-prep-cat-links"><?php _e( 'Posted in ', 'twentyten' ); ?></span><?php echo get_the_category_list(', '); ?></span> <span class="cat-links"><span class="entry-utility-prep entry-utility-prep-cat-links"><?php _e( 'Posted in ', 'twentyten' ); ?></span><?php echo get_the_category_list(', '); ?></span>
<span class="meta-sep"> | </span> <span class="meta-sep"> | </span>
<?php if ( $tag_ur_it = tag_ur_it(', ') ) : // Returns tags other than the one queried ?> <?php if ( $tag_ur_it = tag_ur_it(', ') ) : // Returns tags other than the one queried ?>
<span class="tag-links"><?php printf( __( 'Also tagged %s', 'twentyten' ), $tag_ur_it ) ?></span> <span class="tag-links"><?php printf( __( 'Also tagged %s', 'twentyten' ), $tag_ur_it ) ?></span>
<?php endif; ?> <?php endif; ?>
<span class="comments-link"><?php comments_popup_link( __( 'Leave a comment', 'twentyten' ), __( '1 Comment', 'twentyten' ), __( '% Comments', 'twentyten' ) ) ?></span> <span class="comments-link"><?php comments_popup_link( __( 'Leave a comment', 'twentyten' ), __( '1 Comment', 'twentyten' ), __( '% Comments', 'twentyten' ) ) ?></span>
<?php edit_post_link( __( 'Edit', 'twentyten' ), "<span class=\"meta-sep\">|</span>\n\t\t\t\t\t\t<span class=\"edit-link\">", "</span>\n\t\t\t\t\t\n" ) ?> <?php edit_post_link( __( 'Edit', 'twentyten' ), "<span class=\"meta-sep\">|</span>\n\t\t\t\t\t\t<span class=\"edit-link\">", "</span>\n\t\t\t\t\t\n" ) ?>
</div><!-- #entry-utility --> </div><!-- #entry-utility -->
</div><!-- #post-<?php the_ID(); ?> --> </div><!-- #post-<?php the_ID(); ?> -->
<?php endwhile; ?> <?php endwhile; ?>
<?php global $wp_query; $total_pages = $wp_query->max_num_pages; if ( $total_pages > 1 ) { ?> <?php global $wp_query; $total_pages = $wp_query->max_num_pages; if ( $total_pages > 1 ) { ?>
<div id="nav-below" class="navigation"> <div id="nav-below" class="navigation">
<div class="nav-previous"><?php next_posts_link(__( '<span class="meta-nav">&larr;</span> Older posts', 'twentyten' )) ?></div> <div class="nav-previous"><?php next_posts_link(__( '<span class="meta-nav">&larr;</span> Older posts', 'twentyten' )) ?></div>
<div class="nav-next"><?php previous_posts_link(__( 'Newer posts <span class="meta-nav">&rarr;</span>', 'twentyten' )) ?></div> <div class="nav-next"><?php previous_posts_link(__( 'Newer posts <span class="meta-nav">&rarr;</span>', 'twentyten' )) ?></div>
</div><!-- #nav-below --> </div><!-- #nav-below -->
<?php } ?> <?php } ?>
</div><!-- #content --> </div><!-- #content -->
</div><!-- #container --> </div><!-- #container -->
<?php get_sidebar(); ?> <?php get_sidebar(); ?>
<?php get_footer(); ?> <?php get_footer(); ?>

2
wp-includes/default-constants.php
View File

@ -258,7 +258,7 @@ function wp_default_constants( $context ) {
* @since 2.1.0 * @since 2.1.0
*/ */
define('STYLESHEETPATH', get_stylesheet_directory()); define('STYLESHEETPATH', get_stylesheet_directory());
/** /**
* Slug of the fallback theme for this install. * Slug of the fallback theme for this install.
* Will be used as the fallback if the current theme doesn't exist. * Will be used as the fallback if the current theme doesn't exist.

2
wp-includes/ms-load.php
View File

@ -144,7 +144,7 @@ function wpmu_current_site() {
$current_site->cookie_domain = $cookie_domain; $current_site->cookie_domain = $cookie_domain;
return $current_site; return $current_site;
} }
if ( is_subdomain_install() ) { if ( is_subdomain_install() ) {
$sitedomain = substr( $domain, 1 + strpos( $domain, '.' ) ); $sitedomain = substr( $domain, 1 + strpos( $domain, '.' ) );
$current_site = $wpdb->get_row( $wpdb->prepare("SELECT * FROM $wpdb->site WHERE domain = %s AND path = %s", $sitedomain, $path) ); $current_site = $wpdb->get_row( $wpdb->prepare("SELECT * FROM $wpdb->site WHERE domain = %s AND path = %s", $sitedomain, $path) );

2
wp-includes/post-template.php
View File

@ -393,7 +393,7 @@ function get_body_class( $class = '' ) {
if ( is_single() ) { if ( is_single() ) {
$postID = $wp_query->get_queried_object_id(); $postID = $wp_query->get_queried_object_id();
$classes[] = 'single postid-' . $postID; $classes[] = 'single postid-' . $postID;
if ( is_attachment() ) { if ( is_attachment() ) {