Permalink
Browse files

incorporating laras changes

themes.wordpress.org stuff is in, post formats fanciness will go in a future release once it's styled.

marking 1.7.11
  • Loading branch information...
1 parent 928c939 commit 8690dee3e3ed8175dd7270f5f049c9eaa14dc4f6 @slambert committed Mar 6, 2011
Showing with 11 additions and 15 deletions.
  1. +1 −1 attachment.php
  2. +0 −4 functions.php
  3. +1 −1 index.php
  4. +2 −2 library/theme-options.php
  5. +1 −1 page-fullwidth.php
  6. +1 −1 page.php
  7. +2 −2 search.php
  8. +2 −2 single.php
  9. +1 −1 style.css
View
@@ -27,7 +27,7 @@
</div> <!--.prevnext -->
<?php endwhile; else: ?>
- <p><?php _e('Sorry, no posts matched your criteria.'); ?></p>
+ <p><?php _e('Sorry, no posts matched your criteria.', 'wpfolio'); ?></p>
<?php endif; ?>
</div><!-- END CONTENT -->
View
@@ -1,9 +1,5 @@
<?php
-
-// Enable post formats
-add_theme_support( 'post-formats', array( 'aside', 'gallery', 'link', 'video') );
-
// Shortcode to add wide margins to a post page - works as is, but is applied in post lists
function wide_margins_shortcode ($atts, $content = null) {
View
@@ -36,7 +36,7 @@
</div> <!-- .category-nicename, .notable-post-->
<!-- <?php trackback_rdf(); ?> -->
-<?php }} else{ _e('Sorry, no posts matched your criteria.'); }?>
+<?php }} else{ _e('Sorry, no posts matched your criteria.', 'wpfolio'); }?>
<div class="prevnext">
<div class="prev"><?php previous_posts_link('Previous') ?></div>
@@ -255,7 +255,7 @@ function theme_options_do_page() {
<?php screen_icon(); echo "<h2>" . get_current_theme() . __( ' Theme Options' ) . "</h2>"; ?>
<?php if ( false !== $_REQUEST['updated'] ) : ?>
- <div class="updated fade"><p><strong><?php _e( 'Options saved' ); ?></strong></p></div>
+ <div class="updated fade"><p><strong><?php _e( 'Options saved', 'wpfolio' ); ?></strong></p></div>
<?php endif; ?>
@@ -313,7 +313,7 @@ function theme_options_do_page() {
</table>
<p class="submit">
- <input type="submit" class="button-primary" value="<?php _e( 'Save Options' ); ?>" />
+ <input type="submit" class="button-primary" value="<?php _e( 'Save Options', 'wpfolio' ); ?>" />
</p>
</form>
View
@@ -83,7 +83,7 @@
<!-- <?php trackback_rdf(); ?> -->
<?php endwhile; else: ?>
-<p><?php _e('Sorry, no posts matched your criteria.'); ?></p>
+<p><?php _e('Sorry, no posts matched your criteria.', 'wpfolio'); ?></p>
<?php endif; ?>
<!-- end page -->
View
@@ -72,7 +72,7 @@
<!-- <?php trackback_rdf(); ?> -->
<?php endwhile; else: ?>
-<p><?php _e('Sorry, no posts matched your criteria.'); ?></p>
+<p><?php _e('Sorry, no posts matched your criteria.', 'wpfolio'); ?></p>
<?php endif; ?>
<!-- end page -->
View
@@ -11,7 +11,7 @@
<!-- begin post -->
<div class="notable">
- <h2 class="pagetitle">Search Result for <?php /* Search Count */ $allsearch = &new WP_Query("s=$s&showposts=-1"); $key = esc_html($s, 1); $count = $allsearch->post_count; _e(''); _e('<span class="search-terms">'); echo $key; _e('</span>'); _e(' &mdash; '); echo $count . ' '; _e('articles'); wp_reset_query(); ?></h2> <!-- Pagetitle shows number of search results-->
+ <h2 class="pagetitle">Search Result for <?php /* Search Count */ $allsearch = &new WP_Query("s=$s&showposts=-1"); $key = esc_html($s, 1); $count = $allsearch->post_count; _e('', 'wpfolio'); _e('<span class="search-terms">', 'wpfolio'); echo $key; _e('</span>', 'wpfolio'); _e(' &mdash; ', 'wpfolio'); echo $count . ' '; _e('articles', 'wpfolio'); wp_reset_query(); ?></h2> <!-- Pagetitle shows number of search results-->
<?php if (! empty($display_stats) ) { get_stats(1); echo "<br />"; } else if (($posts & empty($display_stats)) ) : foreach ($posts as $post) : the_post(); ?>
@@ -62,7 +62,7 @@
<?php endforeach; else: ?>
<div class="notable-post">
- <h2><?php _e('Sorry, nothing matched your search. Try again.'); ?></h2>
+ <h2><?php _e('Sorry, nothing matched your search. Try again.', 'wpfolio'); ?></h2>
</div><!-- .notable-post -->
<?php endif; ?>
View
@@ -48,7 +48,7 @@
</div><!-- #content -->
<!-- <?php trackback_rdf(); ?> -->
-<?php endforeach; else: ?> <?php _e('Sorry, no posts matched your criteria.'); ?>
+<?php endforeach; else: ?> <?php _e('Sorry, no posts matched your criteria.', 'default'); ?>
<?php endif; ?>
<!-- end post-->
@@ -86,7 +86,7 @@
</div><!-- #content -->
<!-- <?php trackback_rdf(); ?> -->
-<?php endforeach; else: ?> <?php _e('Sorry, no posts matched your criteria.'); ?>
+<?php endforeach; else: ?> <?php _e('Sorry, no posts matched your criteria.', 'wpfolio'); ?>
<?php endif; ?>
<!-- end post-->
View
@@ -2,7 +2,7 @@
Theme Name: WPFolio
Theme URI: http://wpfolio.visitsteve.com/wiki/
Description: Designed specifically for artist's portfolios. Features large images, theme options, and plenty of versatility. GPLv3 licensed. We welcome your code.
-Version: 1.7.1
+Version: 1.7.11
Author: Steve Lambert & many others
Tags: fixed-width, photoblogging, one-column, two-columns, theme-options, custom-background, threaded-comments, custom-menu, custom-colors
License: GNU General Public License v3.0

0 comments on commit 8690dee

Please sign in to comment.