From ba7701007b006433014438166ce27d46f477f38d Mon Sep 17 00:00:00 2001 From: Dion Hulse Date: Sun, 14 Feb 2010 01:00:22 +0000 Subject: [PATCH] Formatting, Translations & Whitespace. Props ptahdunbar. See #9015 git-svn-id: https://develop.svn.wordpress.org/trunk@13128 602fd350-edb4-49c9-b593-d223f7449a82 --- wp-content/themes/twentyten/404.php | 4 +- wp-content/themes/twentyten/archive.php | 31 +++--- wp-content/themes/twentyten/attachment.php | 32 +++--- wp-content/themes/twentyten/author.php | 29 +++--- wp-content/themes/twentyten/category.php | 34 +++---- wp-content/themes/twentyten/comments.php | 16 +-- wp-content/themes/twentyten/footer.php | 4 +- wp-content/themes/twentyten/functions.php | 99 ++++++++++--------- wp-content/themes/twentyten/header.php | 18 ++-- wp-content/themes/twentyten/index.php | 83 ++++++++-------- wp-content/themes/twentyten/page.php | 8 +- wp-content/themes/twentyten/search.php | 41 ++++---- wp-content/themes/twentyten/searchform.php | 4 +- .../themes/twentyten/sidebar-footer.php | 13 ++- wp-content/themes/twentyten/sidebar.php | 18 ++-- wp-content/themes/twentyten/single.php | 37 ++++--- wp-content/themes/twentyten/tag.php | 30 +++--- 17 files changed, 247 insertions(+), 254 deletions(-) diff --git a/wp-content/themes/twentyten/404.php b/wp-content/themes/twentyten/404.php index 7605688507..128cc78057 100644 --- a/wp-content/themes/twentyten/404.php +++ b/wp-content/themes/twentyten/404.php @@ -4,9 +4,9 @@
-

Not Found

+

-

Apologies, but the page you requested could not be found. Perhaps searching will help.

+

diff --git a/wp-content/themes/twentyten/archive.php b/wp-content/themes/twentyten/archive.php index 9e8b8800b6..c9a3e2cfde 100644 --- a/wp-content/themes/twentyten/archive.php +++ b/wp-content/themes/twentyten/archive.php @@ -6,21 +6,21 @@ -

%s', 'twentyten' ), get_the_date() ) ?>

+

%s', 'twentyten' ), get_the_date() ); ?>

-

%s', 'twentyten' ), get_the_date('F Y') ) ?>

+

%s', 'twentyten' ), get_the_date('F Y') ); ?>

-

%s', 'twentyten' ), get_the_date('Y') ) ?>

+

%s', 'twentyten' ), get_the_date('Y') ); ?>

-

+

max_num_pages; if ( $total_pages > 1 ) { ?> @@ -31,10 +31,9 @@
- - - + + +
@@ -43,10 +42,10 @@
- | - ' . __('Tagged ', 'twentyten' ) . '', ", ", "\n\t\t\t\t\t\t|\n" ) ?> - - |\n\t\t\t\t\t\t", "\n\t\t\t\t\t\n" ) ?> + + ' . __('Tagged ', 'twentyten' ) . '', ", ", "\n\t\t\t\t\t\t|\n" ); ?> + + |\n\t\t\t\t\t\t", "\n\t\t\t\t\t\n" ); ?>
@@ -54,8 +53,8 @@ max_num_pages; if ( $total_pages > 1 ) { ?> diff --git a/wp-content/themes/twentyten/attachment.php b/wp-content/themes/twentyten/attachment.php index ee03e97064..cfcbb71428 100644 --- a/wp-content/themes/twentyten/attachment.php +++ b/wp-content/themes/twentyten/attachment.php @@ -5,18 +5,18 @@ -

← post_parent) ?>

+

← post_parent); ?>

>

- + - | - - - |\n\t\t\t\t\t\t", "\n\t\t\t\t\t" ) ?> + + + + |\n\t\t\t\t\t\t", "\n\t\t\t\t\t" ); ?>
@@ -32,13 +32,13 @@
- +
-
post_excerpt) ) the_excerpt() ?>
+
post_excerpt) ) the_excerpt(); ?>
-→', 'twentyten' ) ); ?> -' . __( 'Pages:', 'twentyten' ) . '&after=
') ?> + →', 'twentyten' ) ); ?> + ' . __( 'Pages:', 'twentyten' ) . '&after=' ); ?> @@ -48,18 +48,18 @@ get_the_tag_list( __( ' and tagged ', 'twentyten' ), ', ', '' ), get_permalink(), the_title_attribute('echo=0'), - get_post_comments_feed_link() ) ?> + get_post_comments_feed_link() ); ?> - Post a comment or leave a trackback: Trackback URL.', 'twentyten' ), get_trackback_url() ) ?> + Post a comment or leave a trackback: Trackback URL.', 'twentyten' ), get_trackback_url() ); ?> - Trackback URL.', 'twentyten' ), get_trackback_url() ) ?> + Trackback URL.', 'twentyten' ), get_trackback_url() ); ?> - post a comment.', 'twentyten' ) ?> + post a comment.', 'twentyten' ); ?> - + -", "" ) ?> +", "" ); ?> diff --git a/wp-content/themes/twentyten/author.php b/wp-content/themes/twentyten/author.php index c5bbe6649c..7cbbec21cd 100644 --- a/wp-content/themes/twentyten/author.php +++ b/wp-content/themes/twentyten/author.php @@ -5,16 +5,16 @@ -

%s', 'twentyten' ), "" . esc_html($authordata->display_name) . "" ) ?>

+

%s', 'twentyten' ), "" . esc_html($authordata->display_name) . "" ); ?>

- +

- +
@@ -23,8 +23,8 @@ max_num_pages; if ( $total_pages > 1 ) { ?> @@ -34,21 +34,20 @@

- - + +
-→', 'twentyten' ) ); ?> + →', 'twentyten' ) ); ?>
- + | - ' . __('Tagged ', 'twentyten' ) . '', ", ", "\n\t\t\t\t\t\t|\n" ) ?> - - |\n\t\t\t\t\t\t", "\n\t\t\t\t\t\n" ) ?> + ' . __('Tagged ', 'twentyten' ) . '', ", ", "\n\t\t\t\t\t\t|\n" ); ?> + + |\n\t\t\t\t\t\t", "\n\t\t\t\t\t\n" ); ?>
@@ -56,8 +55,8 @@ max_num_pages; if ( $total_pages > 1 ) { ?> diff --git a/wp-content/themes/twentyten/category.php b/wp-content/themes/twentyten/category.php index 77c379a704..768a714294 100644 --- a/wp-content/themes/twentyten/category.php +++ b/wp-content/themes/twentyten/category.php @@ -1,4 +1,3 @@ -
@@ -6,15 +5,15 @@ -

+

' . $categorydesc . '
' ); ?> max_num_pages; if ( $total_pages > 1 ) { ?> @@ -24,25 +23,24 @@

- - - - + + + +
-→', 'twentyten' ) ); ?> + →', 'twentyten' ) ); ?>
- - - | + + + - ' . __('Tagged ', 'twentyten' ) . '', ", ", "\n\t\t\t\t\t\t|\n" ) ?> - - |\n\t\t\t\t\t\t", "\n\t\t\t\t\t\n" ) ?> + ' . __('Tagged ', 'twentyten' ) . '', ", ", "\n\t\t\t\t\t\t|\n" ); ?> + + |\n\t\t\t\t\t\t", "\n\t\t\t\t\t\n" ); ?>
@@ -50,8 +48,8 @@ max_num_pages; if ( $total_pages > 1 ) { ?> diff --git a/wp-content/themes/twentyten/comments.php b/wp-content/themes/twentyten/comments.php index 0a86e8b0bc..da254bce23 100644 --- a/wp-content/themes/twentyten/comments.php +++ b/wp-content/themes/twentyten/comments.php @@ -1,12 +1,12 @@
-
+
1 ) : // are there comments to navigate through ?>
-
-
+
+
    - 'twentyten_comment') ); ?> + 'twentyten_comment') ); ?>
1 ) : // are there comments to navigate through ?>
-
-
+
+
diff --git a/wp-content/themes/twentyten/footer.php b/wp-content/themes/twentyten/footer.php index 000ed7c5bf..38180bc3c2 100644 --- a/wp-content/themes/twentyten/footer.php +++ b/wp-content/themes/twentyten/footer.php @@ -3,10 +3,10 @@ - + diff --git a/wp-content/themes/twentyten/search.php b/wp-content/themes/twentyten/search.php index 6b11b86d66..68477b0b37 100644 --- a/wp-content/themes/twentyten/search.php +++ b/wp-content/themes/twentyten/search.php @@ -9,58 +9,57 @@ max_num_pages; if ( $total_pages > 1 ) { ?> - +
>

-post_type == 'post' ) { ?> +post_type != 'page' ) : ?>
- - - - + + + +
- +
-→', 'twentyten' ) ); ?> -' . __( 'Pages:', 'twentyten' ) . '&after=
') ?> + →', 'twentyten' ) ); ?> + ' . __( 'Pages:', 'twentyten' ) . '&after=
' ); ?> -post_type == 'post' ) { ?> +post_type != 'page' ) : ?>
| - ' . __('Tagged ', 'twentyten' ) . '', ", ", "\n\t\t\t\t\t\t|\n" ) ?> - - |\n\t\t\t\t\t\t", "\n\t\t\t\t\t\n" ) ?> + ' . __('Tagged ', 'twentyten' ) . '', ", ", "\n\t\t\t\t\t\t|\n" ); ?> + + |\n\t\t\t\t\t\t", "\n\t\t\t\t\t\n" ); ?>
- + max_num_pages; if ( $total_pages > 1 ) { ?>
-

+

- +
diff --git a/wp-content/themes/twentyten/searchform.php b/wp-content/themes/twentyten/searchform.php index 81f9b9183c..39e34c5ff8 100644 --- a/wp-content/themes/twentyten/searchform.php +++ b/wp-content/themes/twentyten/searchform.php @@ -1,7 +1,7 @@
- + - +
\ No newline at end of file diff --git a/wp-content/themes/twentyten/sidebar-footer.php b/wp-content/themes/twentyten/sidebar-footer.php index 435a06d510..53a04c2786 100644 --- a/wp-content/themes/twentyten/sidebar-footer.php +++ b/wp-content/themes/twentyten/sidebar-footer.php @@ -1,11 +1,14 @@
\ No newline at end of file diff --git a/wp-content/themes/twentyten/single.php b/wp-content/themes/twentyten/single.php index bfcfe340d9..cecff1113c 100644 --- a/wp-content/themes/twentyten/single.php +++ b/wp-content/themes/twentyten/single.php @@ -6,37 +6,36 @@
>

- - - - - |\n\t\t\t\t\t\t", "\n\t\t\t\t\t" ) ?> + + + + + |\n\t\t\t\t\t\t", "\n\t\t\t\t\t" ); ?>
- -' . __( 'Pages:', 'twentyten' ) . '&after=
') ?> + + ' . __( 'Pages:', 'twentyten' ) . '&after=
' ); ?>
- +
-

- +

+
@@ -48,18 +47,18 @@ the_permalink(); ?>" title="" rel="bookmark">< get_the_tag_list( __( ' and tagged ', 'twentyten' ), ', ', '' ), get_permalink(), the_title_attribute('echo=0'), - get_post_comments_feed_link() ) ?> + get_post_comments_feed_link() ); ?> -", "" ) ?> +", "" ); ?> - + diff --git a/wp-content/themes/twentyten/tag.php b/wp-content/themes/twentyten/tag.php index 0d63f98ce0..99d5962543 100644 --- a/wp-content/themes/twentyten/tag.php +++ b/wp-content/themes/twentyten/tag.php @@ -5,14 +5,14 @@ -

+

max_num_pages; if ( $total_pages > 1 ) { ?> @@ -22,24 +22,24 @@

- - - - + + + +
-→', 'twentyten' ) ); ?> + →', 'twentyten' ) ); ?>
- - | + + - + - - |\n\t\t\t\t\t\t", "\n\t\t\t\t\t\n" ) ?> + + |\n\t\t\t\t\t\t", "\n\t\t\t\t\t\n" ); ?>
@@ -47,8 +47,8 @@ max_num_pages; if ( $total_pages > 1 ) { ?>