Permalink
Browse files

Text cleanup and 404 page

  • Loading branch information...
andrewspittle committed Mar 28, 2011
1 parent 0dcdc75 commit 4cac2a912f3c7380480e31edd5bc21610353b184
Showing with 53 additions and 56 deletions.
  1. +4 −7 404.php
  2. +6 −6 archive.php
  3. +11 −11 comments.php
  4. +12 −12 functions.php
  5. +1 −1 header.php
  6. +7 −7 loop-attachment.php
  7. +4 −4 loop-single.php
  8. +8 −8 loop.php
View
11 404.php
@@ -1,13 +1,10 @@
<?php get_header(); ?>
<div id="content">
-
- <h2><a href="/"><?php bloginfo('name'); ?></a> : <b>not found</b></h2>
-<br>
-<br>
-Our search is lonely,<br>
-as futile as this lost page<br>
-Let's <a href="<?php echo get_option('home'); ?>/">go home</a> instead.
+ <h2 class="entry-title"><?php _e( 'Not Found', 'minimalstream' ); ?></h2>
+
+ <p><?php _e( 'Apologies, but the page you requested could not be found. Perhaps searching will help.', 'twentyten' ); ?></p>
+ <?php get_search_form(); ?>
</div>
<?php get_footer(); ?>
View
@@ -15,17 +15,17 @@
<h1 class="page-title">
<?php if ( is_day() ) : ?>
- <?php printf( __( 'Daily Archives: <span>%s</span>', 'mnmlist' ), get_the_date() ); ?>
+ <?php printf( __( 'Daily Archives: <span>%s</span>', 'minimalstream' ), get_the_date() ); ?>
<?php elseif ( is_month() ) : ?>
- <?php printf( __( 'Monthly Archives: <span>%s</span>', 'mnmlist' ), get_the_date( 'F Y' ) ); ?>
+ <?php printf( __( 'Monthly Archives: <span>%s</span>', 'minimalstream' ), get_the_date( 'F Y' ) ); ?>
<?php elseif ( is_year() ) : ?>
- <?php printf( __( 'Yearly Archives: <span>%s</span>', 'mnmlist' ), get_the_date( 'Y' ) ); ?>
+ <?php printf( __( 'Yearly Archives: <span>%s</span>', 'minimalstream' ), get_the_date( 'Y' ) ); ?>
<?php elseif ( is_category() ) : ?>
- <?php printf( __( 'Category Archives: %s', 'mnmlist' ), '<span>' . single_cat_title( '', false ) . '</span>' ); ?>
+ <?php printf( __( 'Category Archives: %s', 'minimalstream' ), '<span>' . single_cat_title( '', false ) . '</span>' ); ?>
<?php elseif ( is_author() ) : ?>
- <?php printf( __( 'Author Archives: %s', 'mnmlist' ), get_the_author() ); ?>
+ <?php printf( __( 'Author Archives: %s', 'minimalstream' ), get_the_author() ); ?>
<?php else : ?>
- <?php _e( 'Blog Archives', 'mnmlist' ); ?>
+ <?php _e( 'Blog Archives', 'minimalstream' ); ?>
<?php endif; ?>
</h1>
View
@@ -1,6 +1,6 @@
<div id="comments">
<?php if ( post_password_required() ) : ?>
- <p class="nopassword"><?php _e( 'This post is password protected. Enter the password to view any comments.', 'mnmlist' ); ?></p>
+ <p class="nopassword"><?php _e( 'This post is password protected. Enter the password to view any comments.', 'minimalstream' ); ?></p>
</div><!-- #comments -->
<?php
/* Stop the rest of comments.php from being processed,
@@ -17,33 +17,33 @@
<?php if ( have_comments() ) : ?>
<h3 id="comments-title"><?php
- printf( _n( 'One Response to %2$s', '%1$s Responses to %2$s', get_comments_number(), 'mnmlist' ),
+ printf( _n( 'One Response to %2$s', '%1$s Responses to %2$s', get_comments_number(), 'minimalstream' ),
number_format_i18n( get_comments_number() ), '<em>' . get_the_title() . '</em>' );
?></h3>
<?php if ( get_comment_pages_count() > 1 && get_option( 'page_comments' ) ) : // Are there comments to navigate through? ?>
<div class="navigation">
- <div class="nav-previous"><?php previous_comments_link( __( '<span class="meta-nav">&larr;</span> Older Comments', 'mnmlist' ) ); ?></div>
- <div class="nav-next"><?php next_comments_link( __( 'Newer Comments <span class="meta-nav">&rarr;</span>', 'mnmlist' ) ); ?></div>
+ <div class="nav-previous"><?php previous_comments_link( __( '<span class="meta-nav">&larr;</span> Older Comments', 'minimalstream' ) ); ?></div>
+ <div class="nav-next"><?php next_comments_link( __( 'Newer Comments <span class="meta-nav">&rarr;</span>', 'minimalstream' ) ); ?></div>
</div> <!-- .navigation -->
<?php endif; // check for comment navigation ?>
<ol class="commentlist">
<?php
/* Loop through and list the comments. Tell wp_list_comments()
- * to use mnmlist_comment() to format the comments.
+ * to use minimalstream_comment() to format the comments.
* If you want to overload this in a child theme then you can
- * define mnmlist_comment() and that will be used instead.
- * See mnmlist_comment() in mnmlist/functions.php for more.
+ * define minimalstream_comment() and that will be used instead.
+ * See minimalstream_comment() in minimalstream/functions.php for more.
*/
- wp_list_comments( array( 'callback' => 'mnmlist_comment' ) );
+ wp_list_comments( array( 'callback' => 'minimalstream_comment' ) );
?>
</ol>
<?php if ( get_comment_pages_count() > 1 && get_option( 'page_comments' ) ) : // Are there comments to navigate through? ?>
<div class="navigation">
- <div class="nav-previous"><?php previous_comments_link( __( '<span class="meta-nav">&larr;</span> Older Comments', 'mnmlist' ) ); ?></div>
- <div class="nav-next"><?php next_comments_link( __( 'Newer Comments <span class="meta-nav">&rarr;</span>', 'mnmlist' ) ); ?></div>
+ <div class="nav-previous"><?php previous_comments_link( __( '<span class="meta-nav">&larr;</span> Older Comments', 'minimalstream' ) ); ?></div>
+ <div class="nav-next"><?php next_comments_link( __( 'Newer Comments <span class="meta-nav">&rarr;</span>', 'minimalstream' ) ); ?></div>
</div><!-- .navigation -->
<?php endif; // check for comment navigation ?>
@@ -54,7 +54,7 @@
*/
if ( ! comments_open() ) :
?>
- <p class="nocomments"><?php _e( 'Comments are closed.', 'mnmlist' ); ?></p>
+ <p class="nocomments"><?php _e( 'Comments are closed.', 'minimalstream' ); ?></p>
<?php endif; // end ! comments_open() ?>
<?php endif; // end have_comments() ?>
View
@@ -2,11 +2,11 @@
if ( ! isset( $content_width ) )
$content_width = 560;
-/** Tell WordPress to run mnmlist_setup() when the 'after_setup_theme' hook is run. */
-add_action( 'after_setup_theme', 'mnmlist_setup' );
+/** Tell WordPress to run minimalstream_setup() when the 'after_setup_theme' hook is run. */
+add_action( 'after_setup_theme', 'minimalstream_setup' );
-if ( ! function_exists( 'mnmlist_setup' ) ):
-function mnmlist_setup() {
+if ( ! function_exists( 'minimalstream_setup' ) ):
+function minimalstream_setup() {
// Post Format support. You can also use the legacy "gallery" or "asides" (note the plural) categories.
add_theme_support( 'post-formats', array( 'aside', 'gallery', 'status' ) );
@@ -26,15 +26,15 @@ function mnmlist_setup() {
* filter instead, as seen above.
*
*/
-function mnmlist_remove_gallery_css( $css ) {
+function minimalstream_remove_gallery_css( $css ) {
return preg_replace( "#<style type='text/css'>(.*?)</style>#s", '', $css );
}
// Backwards compatibility with WordPress 3.0.
if ( version_compare( $GLOBALS['wp_version'], '3.1', '<' ) )
- add_filter( 'gallery_style', 'mnmlist_remove_gallery_css' );
+ add_filter( 'gallery_style', 'minimalstream_remove_gallery_css' );
-if ( ! function_exists( 'mnmlist_comment' ) ) :
-function mnmlist_comment( $comment, $args, $depth ) {
+if ( ! function_exists( 'minimalstream_comment' ) ) :
+function minimalstream_comment( $comment, $args, $depth ) {
$GLOBALS['comment'] = $comment;
switch ( $comment->comment_type ) :
case '' :
@@ -43,17 +43,17 @@ function mnmlist_comment( $comment, $args, $depth ) {
<div id="comment-<?php comment_ID(); ?>">
<div class="comment-author vcard">
<?php echo get_avatar( $comment, 40 ); ?>
- <?php printf( __( '%s <span class="says">says:</span>', 'mnmlist' ), sprintf( '<cite class="fn">%s</cite>', get_comment_author_link() ) ); ?>
+ <?php printf( __( '%s <span class="says">says:</span>', 'minimalstream' ), sprintf( '<cite class="fn">%s</cite>', get_comment_author_link() ) ); ?>
</div><!-- .comment-author .vcard -->
<?php if ( $comment->comment_approved == '0' ) : ?>
- <em class="comment-awaiting-moderation"><?php _e( 'Your comment is awaiting moderation.', 'mnmlist' ); ?></em>
+ <em class="comment-awaiting-moderation"><?php _e( 'Your comment is awaiting moderation.', 'minimalstream' ); ?></em>
<br />
<?php endif; ?>
<div class="comment-meta commentmetadata"><a href="<?php echo esc_url( get_comment_link( $comment->comment_ID ) ); ?>">
<?php
/* translators: 1: date, 2: time */
- printf( __( '%1$s at %2$s', 'mnmlist' ), get_comment_date(), get_comment_time() ); ?></a><?php edit_comment_link( __( '(Edit)', 'mnmlist' ), ' ' );
+ printf( __( '%1$s at %2$s', 'minimalstream' ), get_comment_date(), get_comment_time() ); ?></a><?php edit_comment_link( __( '(Edit)', 'minimalstream' ), ' ' );
?>
</div><!-- .comment-meta .commentmetadata -->
@@ -70,7 +70,7 @@ function mnmlist_comment( $comment, $args, $depth ) {
case 'trackback' :
?>
<li class="post pingback">
- <p><?php _e( 'Pingback:', 'mnmlist' ); ?> <?php comment_author_link(); ?><?php edit_comment_link( __( '(Edit)', 'mnmlist' ), ' ' ); ?></p>
+ <p><?php _e( 'Pingback:', 'minimalstream' ); ?> <?php comment_author_link(); ?><?php edit_comment_link( __( '(Edit)', 'minimalstream' ), ' ' ); ?></p>
<?php
break;
endswitch;
View
@@ -22,7 +22,7 @@
// Add a page number if necessary:
if ( $paged >= 2 || $page >= 2 )
- echo ' | ' . sprintf( __( 'Page %s', 'mnmlist' ), max( $paged, $page ) );
+ echo ' | ' . sprintf( __( 'Page %s', 'minimalstream' ), max( $paged, $page ) );
?></title>
View
@@ -1,9 +1,9 @@
<?php if ( have_posts() ) while ( have_posts() ) : the_post(); ?>
<?php if ( ! empty( $post->post_parent ) ) : ?>
- <p class="page-title"><a href="<?php echo get_permalink( $post->post_parent ); ?>" title="<?php esc_attr( printf( __( 'Return to %s', 'mnmlist' ), get_the_title( $post->post_parent ) ) ); ?>" rel="gallery"><?php
+ <p class="page-title"><a href="<?php echo get_permalink( $post->post_parent ); ?>" title="<?php esc_attr( printf( __( 'Return to %s', 'minimalstream' ), get_the_title( $post->post_parent ) ) ); ?>" rel="gallery"><?php
/* translators: %s - title of parent post */
- printf( __( '<span class="meta-nav">&larr;</span> %s', 'mnmlist' ), get_the_title( $post->post_parent ) );
+ printf( __( '<span class="meta-nav">&larr;</span> %s', 'minimalstream' ), get_the_title( $post->post_parent ) );
?></a></p>
<?php endif; ?>
@@ -12,7 +12,7 @@
<div class="entry-meta">
<?php
- printf( __( '<span class="%1$s">Published</span> %2$s', 'mnmlist' ),
+ printf( __( '<span class="%1$s">Published</span> %2$s', 'minimalstream' ),
'meta-prep meta-prep-entry-date',
sprintf( '<span class="entry-date"><abbr class="published" title="%1$s">%2$s</abbr></span>',
esc_attr( get_the_time() ),
@@ -22,10 +22,10 @@
if ( wp_attachment_is_image() ) {
echo ' <span class="meta-sep">|</span> ';
$metadata = wp_get_attachment_metadata();
- printf( __( 'Full size is %s pixels', 'mnmlist' ),
+ printf( __( 'Full size is %s pixels', 'minimalstream' ),
sprintf( '<a href="%1$s" title="%2$s">%3$s &times; %4$s</a>',
wp_get_attachment_url(),
- esc_attr( __( 'Link to full-size image', 'mnmlist' ) ),
+ esc_attr( __( 'Link to full-size image', 'minimalstream' ) ),
$metadata['width'],
$metadata['height']
)
@@ -57,8 +57,8 @@
}
?>
<p class="attachment"><a href="<?php echo $next_attachment_url; ?>" title="<?php echo esc_attr( get_the_title() ); ?>" rel="attachment"><?php
- $attachment_width = apply_filters( 'mnmlist_attachment_size', 540 );
- $attachment_height = apply_filters( 'mnmlist_attachment_height', 540 );
+ $attachment_width = apply_filters( 'minimalstream_attachment_size', 540 );
+ $attachment_height = apply_filters( 'minimalstream_attachment_height', 540 );
echo wp_get_attachment_image( $post->ID, array( $attachment_width, $attachment_height ) ); // filterable image width with, essentially, no limit for image height.
?></a></p>
View
@@ -17,19 +17,19 @@
<div id="entry-author-info">
<div id="author-avatar">
- <?php echo get_avatar( get_the_author_meta( 'user_email' ), apply_filters( 'mnmlist_author_bio_avatar_size', 60 ) ); ?>
+ <?php echo get_avatar( get_the_author_meta( 'user_email' ), apply_filters( 'minimalstream_author_bio_avatar_size', 60 ) ); ?>
</div><!-- #author-avatar -->
<div id="author-description">
- <h2><?php printf( esc_attr__( 'About %s', 'mnmlist' ), get_the_author() ); ?></h2>
+ <h2><?php printf( esc_attr__( 'About %s', 'minimalstream' ), get_the_author() ); ?></h2>
<?php the_author_meta( 'description' ); ?>
</div><!-- #author-description -->
</div><!-- #entry-author-info -->
</div>
<div id="nav-below" class="navigation">
- <div class="nav-previous"><?php previous_post_link( 'Previously: %link', '<span class="meta-nav">' . _x( '', 'Previous post link', 'mnmlist' ) . '</span> %title' ); ?></div>
- <div class="nav-next"><?php next_post_link( 'Next: %link', '<span class="meta-nav">' . _x( '', 'Next post link', 'mnmlist' ) . '</span> %title' ); ?></div>
+ <div class="nav-previous"><?php previous_post_link( 'Previously: %link', '<span class="meta-nav">' . _x( '', 'Previous post link', 'minimalstream' ) . '</span> %title' ); ?></div>
+ <div class="nav-next"><?php next_post_link( 'Next: %link', '<span class="meta-nav">' . _x( '', 'Next post link', 'minimalstream' ) . '</span> %title' ); ?></div>
</div><!-- #nav-below -->
</div>
View
@@ -3,9 +3,9 @@
<?php /* If there are no posts to display, such as an empty archive page */ ?>
<?php if ( ! have_posts() ) : ?>
<div id="post-0" class="post error404 not-found">
- <h1 class="entry-title"><?php _e( 'Not Found', 'mnmlist' ); ?></h1>
+ <h1 class="entry-title"><?php _e( 'Not Found', 'minimalstream' ); ?></h1>
<div class="entry-content">
- <p><?php _e( 'Apologies, but no results were found for the requested archive. Perhaps searching will help find a related post.', 'mnmlist' ); ?></p>
+ <p><?php _e( 'Apologies, but no results were found for the requested archive. Perhaps searching will help find a related post.', 'minimalstream' ); ?></p>
<?php get_search_form(); ?>
</div><!-- .entry-content -->
</div><!-- #post-0 -->
@@ -15,7 +15,7 @@
<?php /* How to display posts of the Gallery format. The gallery category is the old way. */ ?>
- <?php if ( ( function_exists( 'get_post_format' ) && 'gallery' == get_post_format( $post->ID ) ) || in_category( _x( 'gallery', 'gallery category slug', 'mnmlist' ) ) ) : ?>
+ <?php if ( ( function_exists( 'get_post_format' ) && 'gallery' == get_post_format( $post->ID ) ) || in_category( _x( 'gallery', 'gallery category slug', 'minimalstream' ) ) ) : ?>
<div id="post-<?php the_ID(); ?>" <?php post_class(); ?>>
<h2 class="entry-title"><a href="<?php the_permalink() ?>" rel="bookmark" title="Permanent Link to <?php the_title_attribute(); ?>"><?php the_title(); ?></a></h2>
@@ -31,8 +31,8 @@
<div class="gallery-thumb">
<a class="size-thumbnail" href="<?php the_permalink(); ?>"><?php echo $image_img_tag; ?></a>
</div><!-- .gallery-thumb -->
- <p><em><?php printf( _n( 'This gallery contains <a %1$s>%2$s photo</a>.', 'This gallery contains <a %1$s>%2$s photos</a>.', $total_images, 'mnmlist' ),
- 'href="' . get_permalink() . '" title="' . sprintf( esc_attr__( 'Permalink to %s', 'mnmlist' ), the_title_attribute( 'echo=0' ) ) . '" rel="bookmark"',
+ <p><em><?php printf( _n( 'This gallery contains <a %1$s>%2$s photo</a>.', 'This gallery contains <a %1$s>%2$s photos</a>.', $total_images, 'minimalstream' ),
+ 'href="' . get_permalink() . '" title="' . sprintf( esc_attr__( 'Permalink to %s', 'minimalstream' ), the_title_attribute( 'echo=0' ) ) . '" rel="bookmark"',
number_format_i18n( $total_images )
); ?></em></p>
<?php endif; ?>
@@ -48,7 +48,7 @@
<?php /* How to display posts of the Aside format. The asides category is the old way. */ ?>
- <?php elseif ( ( function_exists( 'get_post_format' ) && 'aside' == get_post_format( $post->ID ) ) || in_category( _x( 'asides', 'asides category slug', 'mnmlist' ) ) ) : ?>
+ <?php elseif ( ( function_exists( 'get_post_format' ) && 'aside' == get_post_format( $post->ID ) ) || in_category( _x( 'asides', 'asides category slug', 'minimalstream' ) ) ) : ?>
<div id="post-<?php the_ID(); ?>" <?php post_class(); ?>>
<div class="entry">
@@ -109,7 +109,7 @@
<?php /* Display navigation to next/previous pages when applicable */ ?>
<?php if ( $wp_query->max_num_pages > 1 ) : ?>
<div id="nav-below" class="navigation">
- <div class="nav-previous"><?php next_posts_link( __( '<span class="meta-nav">&larr;</span> Older posts', 'mnmlist' ) ); ?></div>
- <div class="nav-next"><?php previous_posts_link( __( 'Newer posts <span class="meta-nav">&rarr;</span>', 'mnmlist' ) ); ?></div>
+ <div class="nav-previous"><?php next_posts_link( __( '<span class="meta-nav">&larr;</span> Older posts', 'minimalstream' ) ); ?></div>
+ <div class="nav-next"><?php previous_posts_link( __( 'Newer posts <span class="meta-nav">&rarr;</span>', 'minimalstream' ) ); ?></div>
</div><!-- #nav-below -->
<?php endif; ?>

0 comments on commit 4cac2a9

Please sign in to comment.