Merge lp:~sillydeveloper/osdf/wp-big-block-page into lp:osdf/wp

[Andrew Ettinger]

Add in a template for big block of text like action.php

Add in Toast as author

Remove references to 'rpac template' from code; add in osdf.

[Andrew Ettinger (sillydeveloper)]

Whoops. I initially assigned to the wrong Toast!

review: Approve

[Toast (swetoast-deactivatedaccount)]

yepp ^^

review: Abstain

[myddrn (myddrn)]

skimmed through, didn't see anything crazy.

review: Approve

[Toast McFarland (daimoneze)]

Looks good. I recommend making this the default look of the "page" content type.

review: Approve

=== added file 'big-block-page.php'
--- big-block-page.php	1970-01-01 00:00:00 +0000
+++ big-block-page.php	2010-12-08 23:09:57 +0000
@@ -0,0 +1,38 @@
+<?
+/**
+ * Template Name: One large block of text
+ *
+ * A custom page template without sidebar.
+ *
+ * The "Template Name:" bit above allows this to be selectable
+ * from a dropdown menu on the edit page screen.
+ *
+ * @package WordPress
+ * @subpackage osdf
+ * @since osdf 2.0
+ */
+?>
+ 
+<?php get_header(); ?>
+
+   <div id="container">
+    <div id="content">
+        <div class='big_block'>
+ <?php the_post(); ?>
+
+     <div id="post-<?php the_ID(); ?>" <?php post_class(); ?>>
+      <h3><?php the_title(); ?></h3>
+      <div class="entry-content">
+ <?php the_content(); ?>
+ <?php wp_link_pages('before=<div class="page-link">' . __( 'Pages:', 'osdf' ) . '&after=</div>') ?>    
+ <?php edit_post_link( __( 'Edit', 'osdf' ), '<span class="edit-link">', '</span>' ) ?>
+      </div><!-- .entry-content -->
+     </div><!-- #post-<?php the_ID(); ?> -->  
+
+ <?php //if ( get_post_custom_values('comments') ) comments_template() // Add a custom field with Name and Value of "comments" to enable comments on this page ?>  
+      </div>
+    </div><!-- #content -->  
+   </div><!-- #container -->
+
+ <?php //get_sidebar(); ?>
+ <?php get_footer(); ?>
\ No newline at end of file

=== modified file 'comments.php'
--- comments.php	2010-11-25 02:58:47 +0000
+++ comments.php	2010-12-08 23:09:57 +0000
@@ -8,7 +8,7 @@
  if ( ! empty($post->post_password) ) :
   if ( $_COOKIE['wp-postpass_' . COOKIEHASH] != $post->post_password ) :
 ?>
-    <div class="nopassword"><?php _e('This post is password protected. Enter the password to view any comments.', 'rpac') ?></div>
+    <div class="nopassword"><?php _e('This post is password protected. Enter the password to view any comments.', 'osdf') ?></div>
    </div><!-- .comments -->
 <?php
   return;
@@ -29,7 +29,7 @@
 <?php if ( ! empty($comments_by_type['comment']) ) : ?>
  
     <div id="comments-list" class="comments">
-     <h3><?php printf($comment_count > 1 ? __('<span>%d</span> Comments', 'rpac') : __('<span>One</span> Comment', 'rpac'), $comment_count) ?></h3>
+     <h3><?php printf($comment_count > 1 ? __('<span>%d</span> Comments', 'osdf') : __('<span>One</span> Comment', 'osdf'), $comment_count) ?></h3>
  
 <?php /* If there are enough comments, build the comment navigation  */ ?>    
 <?php $total_pages = get_comment_pages_count(); if ( $total_pages > 1 ) : ?>
@@ -58,7 +58,7 @@
 <?php if ( ! empty($comments_by_type['pings']) ) : ?>
  
     <div id="trackbacks-list" class="comments">
-     <h3><?php printf($ping_count > 1 ? __('<span>%d</span> Trackbacks', 'rpac') : __('<span>One</span> Trackback', 'rpac'), $ping_count) ?></h3>
+     <h3><?php printf($ping_count > 1 ? __('<span>%d</span> Trackbacks', 'osdf') : __('<span>One</span> Trackback', 'osdf'), $ping_count) ?></h3>
  
 <?php /* An ordered list of our custom trackbacks callback, custom_pings(), in functions.php   */ ?>    
      <ol>
@@ -74,12 +74,12 @@
 <?php /* If comments are open, build the respond form */ ?>
 <?php if ( 'open' == $post->comment_status ) : ?>
     <div id="respond">
-        <h3><?php comment_form_title( __('Post a Comment', 'rpac'), __('Post a Reply to %s', 'rpac') ); ?></h3>
+        <h3><?php comment_form_title( __('Post a Comment', 'osdf'), __('Post a Reply to %s', 'osdf') ); ?></h3>
        
         <div id="cancel-comment-reply"><?php cancel_comment_reply_link() ?></div>
  
 <?php if ( get_option('comment_registration') && !$user_ID ) : ?>
-     <p id="login-req"><?php printf(__('You must be <a href="%s" title="Log in">logged in</a> to post a comment.', 'rpac'),
+     <p id="login-req"><?php printf(__('You must be <a href="%s" title="Log in">logged in</a> to post a comment.', 'osdf'),
      get_option('siteurl') . '/wp-login.php?redirect_to=' . get_permalink() ) ?></p>
  
 <?php else : ?>
@@ -89,44 +89,44 @@
       <form id="commentform" action="<?php echo get_option('siteurl'); ?>/wp-comments-post.php" method="post">
  
 <?php if ( $user_ID ) : ?>
-       <p id="login"><?php printf(__('<span class="loggedin">Logged in as <a href="%1$s" title="Logged in as %2$s">%2$s</a>.</span> <span class="logout"><a href="%3$s" title="Log out of this account">Log out?</a></span>', 'rpac'),
+       <p id="login"><?php printf(__('<span class="loggedin">Logged in as <a href="%1$s" title="Logged in as %2$s">%2$s</a>.</span> <span class="logout"><a href="%3$s" title="Log out of this account">Log out?</a></span>', 'osdf'),
         get_option('siteurl') . '/wp-admin/profile.php',
         wp_specialchars($user_identity, true),
         wp_logout_url(get_permalink()) ) ?></p>
  
 <?php else : ?>
  
-       <p id="comment-notes"><?php _e('Your email is <em>never</em> published nor shared.', 'rpac') ?> <?php if ($req) _e('Required fields are marked <span class="required">*</span>', 'rpac') ?></p>
+       <p id="comment-notes"><?php _e('Your email is <em>never</em> published nor shared.', 'osdf') ?> <?php if ($req) _e('Required fields are marked <span class="required">*</span>', 'osdf') ?></p>
  
               <div id="form-section-author" class="form-section">
-        <div class="form-label"><label for="author"><?php _e('Name', 'rpac') ?></label> <?php if ($req) _e('<span class="required">*</span>', 'rpac') ?></div>
+        <div class="form-label"><label for="author"><?php _e('Name', 'osdf') ?></label> <?php if ($req) _e('<span class="required">*</span>', 'osdf') ?></div>
         <div class="form-input"><input id="author" name="author" type="text" value="<?php echo $comment_author ?>" size="30" maxlength="20" tabindex="3" /></div>
               </div><!-- #form-section-author .form-section -->
  
               <div id="form-section-email" class="form-section">
-        <div class="form-label"><label for="email"><?php _e('Email', 'rpac') ?></label> <?php if ($req) _e('<span class="required">*</span>', 'rpac') ?></div>
+        <div class="form-label"><label for="email"><?php _e('Email', 'osdf') ?></label> <?php if ($req) _e('<span class="required">*</span>', 'osdf') ?></div>
         <div class="form-input"><input id="email" name="email" type="text" value="<?php echo $comment_author_email ?>" size="30" maxlength="50" tabindex="4" /></div>
               </div><!-- #form-section-email .form-section -->
  
               <div id="form-section-url" class="form-section">
-        <div class="form-label"><label for="url"><?php _e('Website', 'rpac') ?></label></div>
+        <div class="form-label"><label for="url"><?php _e('Website', 'osdf') ?></label></div>
         <div class="form-input"><input id="url" name="url" type="text" value="<?php echo $comment_author_url ?>" size="30" maxlength="50" tabindex="5" /></div>
               </div><!-- #form-section-url .form-section -->
  
 <?php endif /* if ( $user_ID ) */ ?>
  
               <div id="form-section-comment" class="form-section">
-        <div class="form-label"><label for="comment"><?php _e('Comment', 'rpac') ?></label></div>
+        <div class="form-label"><label for="comment"><?php _e('Comment', 'osdf') ?></label></div>
         <div class="form-textarea"><textarea id="comment" name="comment" cols="45" rows="8" tabindex="6"></textarea></div>
               </div><!-- #form-section-comment .form-section -->
              
               <div id="form-allowed-tags" class="form-section">
-               <p><span><?php _e('You may use these <abbr title="HyperText Markup Language">HTML</abbr> tags and attributes:', 'rpac') ?></span> <code><?php echo allowed_tags(); ?></code></p>
+               <p><span><?php _e('You may use these <abbr title="HyperText Markup Language">HTML</abbr> tags and attributes:', 'osdf') ?></span> <code><?php echo allowed_tags(); ?></code></p>
               </div>
        
 <?php do_action('comment_form', $post->ID); ?>
                  
-       <div class="form-submit"><input id="submit" name="submit" type="submit" value="<?php _e('Post Comment', 'rpac') ?>" tabindex="7" /><input type="hidden" name="comment_post_ID" value="<?php echo $id; ?>" /></div>
+       <div class="form-submit"><input id="submit" name="submit" type="submit" value="<?php _e('Post Comment', 'osdf') ?>" tabindex="7" /><input type="hidden" name="comment_post_ID" value="<?php echo $id; ?>" /></div>
  
 <?php comment_id_fields(); ?>  
  

=== modified file 'footer.php'
--- footer.php	2010-12-06 23:27:50 +0000
+++ footer.php	2010-12-08 23:09:57 +0000
@@ -1,4 +1,4 @@
-</div>
+
 </div>
 <div id="footer">
 	<img src="/images/footer_logo.gif" alt="" title="" width="61" height="61" class="left" />

=== modified file 'functions.php'
--- functions.php	2010-11-25 02:58:47 +0000
+++ functions.php	2010-12-08 23:09:57 +0000
@@ -1,7 +1,7 @@
 <?php
 // Make theme available for translation
 // Translations can be filed in the /languages/ directory
-load_theme_textdomain( 'rpac', TEMPLATEPATH . '/languages' );
+load_theme_textdomain( 'osdf', TEMPLATEPATH . '/languages' );
  
 $locale = get_locale();
 $locale_file = TEMPLATEPATH . "/languages/$locale.php";
@@ -11,7 +11,7 @@
 // Get the page number
 function get_page_number() {
     if ( get_query_var('paged') ) {
-        print ' | ' . __( 'Page ' , 'rpac') . get_query_var('paged');
+        print ' | ' . __( 'Page ' , 'osdf') . get_query_var('paged');
     }
 } // end get_page_number
 
@@ -20,12 +20,12 @@
        $GLOBALS['comment'] = $comment;
         ?>
       <li id="comment-<?php comment_ID() ?>" <?php comment_class() ?>>
-       <div class="comment-author"><?php printf(__('By %1$s on %2$s at %3$s', 'rpac'),
+       <div class="comment-author"><?php printf(__('By %1$s on %2$s at %3$s', 'osdf'),
          get_comment_author_link(),
          get_comment_date(),
          get_comment_time() );
-         edit_comment_link(__('Edit', 'rpac'), ' <span class="meta-sep">|</span> <span class="edit-link">', '</span>'); ?></div>
-    <?php if ($comment->comment_approved == '0') _e('\t\t\t\t\t<span class="unapproved">Your trackback is awaiting moderation.</span>\n', 'rpac') ?>
+         edit_comment_link(__('Edit', 'osdf'), ' <span class="meta-sep">|</span> <span class="edit-link">', '</span>'); ?></div>
+    <?php if ($comment->comment_approved == '0') _e('\t\t\t\t\t<span class="unapproved">Your trackback is awaiting moderation.</span>\n', 'osdf') ?>
             <div class="comment-content">
        <?php comment_text() ?>
    </div>
@@ -44,27 +44,27 @@
  echo $avatar . ' <span class="fn n">' . $commenter . '</span>';
 } // end commenter_link
 
-// Custom callback to list comments in the rpac style
+// Custom callback to list comments in the osdf style
 function custom_comments($comment, $args, $depth) {
   $GLOBALS['comment'] = $comment;
  $GLOBALS['comment_depth'] = $depth;
   ?>
    <li id="comment-<?php comment_ID() ?>" <?php comment_class() ?>>
     <div class="comment-author vcard"><?php commenter_link() ?></div>
-    <div class="comment-meta"><?php printf(__('Posted %1$s at %2$s <span class="meta-sep">|</span> <a href="%3$s" title="Permalink to this comment">Permalink</a>', 'rpac'),
+    <div class="comment-meta"><?php printf(__('Posted %1$s at %2$s <span class="meta-sep">|</span> <a href="%3$s" title="Permalink to this comment">Permalink</a>', 'osdf'),
        get_comment_date(),
        get_comment_time(),
        '#comment-' . get_comment_ID() );
-       edit_comment_link(__('Edit', 'rpac'), ' <span class="meta-sep">|</span> <span class="edit-link">', '</span>'); ?></div>
-  <?php if ($comment->comment_approved == '0') _e("\t\t\t\t\t<span class='unapproved'>Your comment is awaiting moderation.</span>\n", 'rpac') ?>
+       edit_comment_link(__('Edit', 'osdf'), ' <span class="meta-sep">|</span> <span class="edit-link">', '</span>'); ?></div>
+  <?php if ($comment->comment_approved == '0') _e("\t\t\t\t\t<span class='unapproved'>Your comment is awaiting moderation.</span>\n", 'osdf') ?>
           <div class="comment-content">
         <?php comment_text() ?>
     </div>
   <?php // echo the comment reply link
    if($args['type'] == 'all' || get_comment_type() == 'comment') :
     comment_reply_link(array_merge($args, array(
-     'reply_text' => __('Reply','rpac'),
-     'login_text' => __('Log in to reply.','rpac'),
+     'reply_text' => __('Reply','osdf'),
+     'login_text' => __('Log in to reply.','osdf'),
      'depth' => $depth,
      'before' => '<div class="comment-reply-link">',
      'after' => '</div>'

=== modified file 'header.php'
--- header.php	2010-12-06 23:27:50 +0000
+++ header.php	2010-12-08 23:09:57 +0000
@@ -18,8 +18,8 @@
  
  <?php wp_head(); ?>
  
- <link rel="alternate" type="application/rss+xml" href="<?php bloginfo('rss2_url'); ?>" title="<?php printf( __( '%s latest posts', 'rpac' ), 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', 'rpac' ), wp_specialchars( get_bloginfo('name'), 1 ) ); ?>" />
+ <link rel="alternate" type="application/rss+xml" href="<?php bloginfo('rss2_url'); ?>" title="<?php printf( __( '%s latest posts', 'osdf' ), 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', 'osdf' ), wp_specialchars( get_bloginfo('name'), 1 ) ); ?>" />
  <link rel="pingback" href="<?php bloginfo('pingback_url'); ?>" />
 </head>
 <body>
@@ -48,5 +48,4 @@
     				</ul>
     			</div>        
     		</div>
-    		<div id="main_content">
-    			<div class='big_block'>
\ No newline at end of file
+    		<div id="main_content">
\ No newline at end of file

=== modified file 'index.php'
--- index.php	2010-11-25 02:58:47 +0000
+++ index.php	2010-12-08 23:09:57 +0000
@@ -1,37 +1,39 @@
 <?php get_header(); ?>
+<div class='big_block'>
 <div id="container">
   <div id="left">
+
       <?php /* The Loop — with comments! */ ?>  
       <?php while ( have_posts() ) : the_post() ?>
 
       <?php /* Create a div with a unique ID thanks to the_ID() and semantic classes with post_class() */ ?>  
           <div id="post-<?php the_ID(); ?>" <?php post_class(); ?>>    
       <?php /* an h2 title */ ?>      
-           <h2 class="entry-title"><a href="<?php the_permalink(); ?>" title="<?php printf( __('Permalink to %s', 'rpac'), 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', 'osdf'), the_title_attribute('echo=0') ); ?>" rel="bookmark"><?php the_title(); ?></a></h2>
 
       <?php /* Microformatted, translatable post meta */ ?>          
            <div class="entry-meta">
-            <span class="meta-prep meta-prep-author"><?php _e('By ', 'rpac'); ?></span>
-            <span class="author vcard"><a class="url fn n" href="<?php echo get_author_link( false, $authordata->ID, $authordata->user_nicename ); ?>" title="<?php printf( __( 'View all posts by %s', 'rpac' ), $authordata->display_name ); ?>"><?php the_author(); ?></a></span>
+            <span class="meta-prep meta-prep-author"><?php _e('By ', 'osdf'); ?></span>
+            <span class="author vcard"><a class="url fn n" href="<?php echo get_author_link( false, $authordata->ID, $authordata->user_nicename ); ?>" title="<?php printf( __( 'View all posts by %s', 'osdf' ), $authordata->display_name ); ?>"><?php the_author(); ?></a></span>
             <span class="meta-sep"> | </span>
-            <span class="meta-prep meta-prep-entry-date"><?php _e('Published ', 'rpac'); ?></span>
+            <span class="meta-prep meta-prep-entry-date"><?php _e('Published ', 'osdf'); ?></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', 'rpac' ), "<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', 'osdf' ), "<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 -->
 
       <?php /* The entry content */ ?>    
            <div class="entry-content">
-      <?php the_content( __( 'Continue reading <span class="meta-nav">&raquo;</span>', 'rpac' )  ); ?>
-      <?php wp_link_pages('before=<div class="page-link">' . __( 'Pages:', 'rpac' ) . '&after=</div>') ?>
+      <?php the_content( __( 'Continue reading <span class="meta-nav">&raquo;</span>', 'osdf' )  ); ?>
+      <?php wp_link_pages('before=<div class="page-link">' . __( 'Pages:', 'osdf' ) . '&after=</div>') ?>
            </div><!-- .entry-content -->
 
       <?php /* Microformatted category and tag links along with a comments link */ ?>    
            <div class="entry-utility">
-            <span class="cat-links"><span class="entry-utility-prep entry-utility-prep-cat-links"><?php _e( 'Posted in ', 'rpac' ); ?></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 ', 'osdf' ); ?></span><?php echo get_the_category_list(', '); ?></span>
             <span class="meta-sep"> | </span>
-            <?php the_tags( '<span class="tag-links"><span class="entry-utility-prep entry-utility-prep-tag-links">' . __('Tagged ', 'rpac' ) . '</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', 'rpac' ), __( '1 Comment', 'rpac' ), __( '% Comments', 'rpac' ) ) ?></span>
-            <?php edit_post_link( __( 'Edit', 'rpac' ), "<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 the_tags( '<span class="tag-links"><span class="entry-utility-prep entry-utility-prep-tag-links">' . __('Tagged ', 'osdf' ) . '</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', 'osdf' ), __( '1 Comment', 'osdf' ), __( '% Comments', 'osdf' ) ) ?></span>
+            <?php edit_post_link( __( 'Edit', 'osdf' ), "<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><!-- #post-<?php the_ID(); ?> -->
 
@@ -47,6 +49,7 @@
 
  <div id="secondary" class="widget-area">
  </div><!-- #secondary -->
+</div> <!-- big block -->
 
 <?php get_sidebar(); ?>
 <?php get_footer(); ?>
\ No newline at end of file

=== modified file 'page.php'
--- page.php	2010-11-25 02:58:47 +0000
+++ page.php	2010-12-08 23:09:57 +0000
@@ -9,8 +9,8 @@
      <h1 class="entry-title"><?php the_title(); ?></h1>
      <div class="entry-content">
 <?php the_content(); ?>
-<?php wp_link_pages('before=<div class="page-link">' . __( 'Pages:', 'rpac' ) . '&after=</div>') ?>    
-<?php edit_post_link( __( 'Edit', 'rpac' ), '<span class="edit-link">', '</span>' ) ?>
+<?php wp_link_pages('before=<div class="page-link">' . __( 'Pages:', 'osdf' ) . '&after=</div>') ?>    
+<?php edit_post_link( __( 'Edit', 'osdf' ), '<span class="edit-link">', '</span>' ) ?>
      </div><!-- .entry-content -->
     </div><!-- #post-<?php the_ID(); ?> -->  
    

=== modified file 'single.php'
--- single.php	2010-11-25 02:58:47 +0000
+++ single.php	2010-12-08 23:09:57 +0000
@@ -7,19 +7,19 @@
 
             <?php /* Microformatted, translatable post meta */ ?>          
                    <div class="entry-meta">
-                    <span class="meta-prep meta-prep-author"><?php _e('By ', 'rpac'); ?></span>
-                    <span class="author vcard"><a class="url fn n" href="<?php echo get_author_link( false, $authordata->ID, $authordata->user_nicename ); ?>" title="<?php printf( __( 'View all posts by %s', 'rpac' ), $authordata->display_name ); ?>"><?php the_author(); ?></a></span>
+                    <span class="meta-prep meta-prep-author"><?php _e('By ', 'osdf'); ?></span>
+                    <span class="author vcard"><a class="url fn n" href="<?php echo get_author_link( false, $authordata->ID, $authordata->user_nicename ); ?>" title="<?php printf( __( 'View all posts by %s', 'osdf' ), $authordata->display_name ); ?>"><?php the_author(); ?></a></span>
                     <span class="meta-sep"> | </span>
-                    <span class="meta-prep meta-prep-entry-date"><?php _e('Published ', 'rpac'); ?></span>
+                    <span class="meta-prep meta-prep-entry-date"><?php _e('Published ', 'osdf'); ?></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', 'rpac' ), "<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', 'osdf' ), "<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 id="post-<?php the_ID(); ?>" <?php post_class(); ?>>
         <?php the_content() ?>
-        <?php wp_link_pages('before=<div class="page-link">' . __( 'Pages:', 'rpac' ) . '&after=</div>') ?>
+        <?php wp_link_pages('before=<div class="page-link">' . __( 'Pages:', 'osdf' ) . '&after=</div>') ?>
     </div><!-- #post-<?php the_ID(); ?> -->  
    
     <div id="nav-below" class="navigation">
@@ -28,23 +28,23 @@
        </div><!-- #nav-below -->
        
         <div class="entry-utility">
-            <?php printf( __( 'This entry was posted in %1$s%2$s. <br/>Bookmark the <a href="%3$s" title="Permalink to %4$s" rel="bookmark">permalink</a>. <br/>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>.', 'rpac' ),
+            <?php printf( __( 'This entry was posted in %1$s%2$s. <br/>Bookmark the <a href="%3$s" title="Permalink to %4$s" rel="bookmark">permalink</a>. <br/>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>.', 'osdf' ),
              get_the_category_list(', '),
-             get_the_tag_list( __( ' and tagged ', 'rpac' ), ', ', '' ),
+             get_the_tag_list( __( ' and tagged ', 'osdf' ), ', ', '' ),
              get_permalink(),
              the_title_attribute('echo=0'),
              comments_rss() ) ?>
 
        <?php if ( ('open' == $post->comment_status) && ('open' == $post->ping_status) ) : // Comments and trackbacks open ?>
-             <?php printf( __( '<br/><a class="comment-link" href="#respond" title="Post a comment">Post a comment</a> or leave a trackback: <a class="trackback-link" href="%s" title="Trackback URL for your post" rel="trackback">Trackback URL</a>.', 'rpac' ), get_trackback_url() ) ?>
+             <?php printf( __( '<br/><a class="comment-link" href="#respond" title="Post a comment">Post a comment</a> or leave a trackback: <a class="trackback-link" href="%s" title="Trackback URL for your post" rel="trackback">Trackback URL</a>.', 'osdf' ), get_trackback_url() ) ?>
        <?php elseif ( !('open' == $post->comment_status) && ('open' == $post->ping_status) ) : // Only trackbacks open ?>
-             <?php printf( __( '<br/>Comments are closed, but you can leave a trackback: <a class="trackback-link" href="%s" title="Trackback URL for your post" rel="trackback">Trackback URL</a>.', 'rpac' ), get_trackback_url() ) ?>
+             <?php printf( __( '<br/>Comments are closed, but you can leave a trackback: <a class="trackback-link" href="%s" title="Trackback URL for your post" rel="trackback">Trackback URL</a>.', 'osdf' ), get_trackback_url() ) ?>
        <?php elseif ( ('open' == $post->comment_status) && !('open' == $post->ping_status) ) : // Only comments open ?>
-             <?php _e( '<br/>Trackbacks are closed, but you can <a class="comment-link" href="#respond" title="Post a comment">post a comment</a>.', 'rpac' ) ?>
+             <?php _e( '<br/>Trackbacks are closed, but you can <a class="comment-link" href="#respond" title="Post a comment">post a comment</a>.', 'osdf' ) ?>
        <?php elseif ( !('open' == $post->comment_status) && !('open' == $post->ping_status) ) : // Comments and trackbacks closed ?>
-             <?php _e( '<br/>Both comments and trackbacks are currently closed.', 'rpac' ) ?>
+             <?php _e( '<br/>Both comments and trackbacks are currently closed.', 'osdf' ) ?>
        <?php endif; ?>
-       <?php edit_post_link( __( 'Edit', 'rpac' ), "\n\t\t\t\t\t<span class=\"edit-link\">", "</span>" ) ?>
+       <?php edit_post_link( __( 'Edit', 'osdf' ), "\n\t\t\t\t\t<span class=\"edit-link\">", "</span>" ) ?>
             </div><!-- .entry-utility -->
    <?php comments_template('', true); ?>
   </div><!-- #left -->

=== modified file 'style.css'
--- style.css	2010-12-06 07:13:04 +0000
+++ style.css	2010-12-08 23:09:57 +0000
@@ -2,8 +2,7 @@
 Theme Name: Open Source Democracy Foundation
 Theme URI: http://theosdf.org
 Description: A search engine optimized website framework for WordPress for the OSDF.
-Author: Andrew Ettinger
-Author URI: http://andrewsbrain.com/
+Author: Andrew Ettinger and Toast McFarland
 Version: 2.0
 .
 */