Changeset 168
- Timestamp:
- Apr 8, 2009, 9:07:06 PM (16 years ago)
- Location:
- trunk/wp-content/themes/xpress_default
- Files:
-
- 2 edited
-
comments.php (modified) (3 diffs)
-
single.php (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
-
trunk/wp-content/themes/xpress_default/comments.php
r150 r168 36 36 <?php if ('open' == $post->comment_status) : ?> 37 37 <div id="xpress-respond"> 38 39 38 <h3><?php comment_form_title( __('Leave a Reply', 'xpress'), __('Leave a Reply for %s' , 'xpress') ); ?></h3> 40 39 </div> … … 42 41 <div id="cancel-comment-reply"> 43 42 <small><?php cancel_comment_reply_link() ?></small> 44 43 </div> 45 44 46 <?php if ( get_option('comment_registration') && !$user_ID ) : ?> 47 <p><?php printf(__('You must be <a href="%s">logged in</a> to post a comment.', 'xpress'), get_option('siteurl') . '/wp-login.php?redirect_to=' . urlencode(get_permalink())); ?></p> 48 <?php else : ?> 45 <?php if ( get_option('comment_registration') && !$user_ID ) : ?> 46 <p><?php printf(__('You must be <a href="%s">logged in</a> to post a comment.', 'xpress'), get_option('siteurl') . '/wp-login.php?redirect_to=' . urlencode(get_permalink())); ?></p> 47 <?php else : ?> 48 <form action="<?php echo get_option('siteurl'); ?>/wp-comments-post.php" method="post" id="commentform"> 49 49 <div id="xpress-comment-user"> 50 <form action="<?php echo get_option('siteurl'); ?>/wp-comments-post.php" method="post" id="commentform">51 50 <?php if ( $user_ID ) : ?> 52 51 <p><?php printf(__('Logged in as <a href="%1$s">%2$s</a>.', 'xpress'), get_option('siteurl') . '/wp-admin/profile.php', $user_identity); ?> <a href="<?php echo wp_logout_url(get_permalink()); ?>" title="<?php _e('Log out of this account', 'xpress'); ?>"><?php _e('Log out »', 'xpress'); ?></a></p> … … 72 71 <?php comment_id_fields(); ?> 73 72 <?php do_action('comment_form', $post->ID); ?> 74 </form>75 73 </div> 76 < ?php endif; // If registration required and not logged in ?>77 < /div>74 </form> 75 <?php endif; // If registration required and not logged in ?> 78 76 79 77 <?php endif; // if you delete this the sky will fall on your head ?> -
trunk/wp-content/themes/xpress_default/single.php
r163 r168 1 1 <?php get_header(); ?> 2 2 3 <div id="xpress_wrap"> 4 <?php 5 if(xpress_is_theme_sidebar_disp()) { 6 echo '<div id="xpress_content" class="narrowcolumn">'; 7 } else { 8 echo '<div id="xpress_content" class="narrowcolumn_nonside">'; 9 } 10 ?> 11 <?php if (have_posts()) : ?> 3 12 4 <div id="xpress_wrap"> 5 <?php 6 if(xpress_is_theme_sidebar_disp()) { 7 echo '<div id="xpress_content" class="narrowcolumn">'; 8 } else { 9 echo '<div id="xpress_content" class="narrowcolumn_nonside">'; 10 } 11 ?> 12 <?php if (have_posts()) : while (have_posts()) : the_post(); ?> 13 <div class="xpress-navi-bar"> 14 <div class="alignleft"><?php xpress_left_arrow_post_link(true) ?></div> 15 <div class="alignright"><?php xpress_right_arrow_post_link(true) ?></div> 16 </div> 17 18 <div class="xpress-post" id="post-<?php the_ID(); ?>"> 19 <div class ="xpress-post-header"> 20 <?php if (function_exists('hotDates')) { hotDates(); }?> 21 <div class ="xpress-post-title"> 22 <h2><a href="<?php the_permalink() ?>" rel="bookmark" title="<?php printf(__('Permanent Link to %s', 'xpress'), the_title_attribute('echo=0')); ?>"><?php the_title(); ?></a></h2> 13 <?php while (have_posts()) : the_post(); ?> 14 <div class="xpress-navi-bar"> 15 <div class="alignleft"><?php xpress_left_arrow_post_link(true); ?></div> 16 <div class="alignright"><?php xpress_right_arrow_post_link(true); ?></div> 23 17 </div> 24 </div>25 18 26 <div class="xpress-post-entry"> 27 <?php the_content('<p class="serif">' . __('Read the rest of this entry »', 'xpress') . '</p>'); ?> 28 </div> 29 30 <div class="xpress-link-pages"><?php wp_link_pages() ?></div> 31 32 <div class ="xpress-post-footer"> 33 <?php 34 the_time('Y/m/d l'); 35 echo ' - '; 36 the_author_posts_link(); 37 echo ' (' . xpress_post_views_count($post->ID,__('Views :%d', 'xpress'),false) . ')'; 38 echo ' | '; 39 // echo the_tags(__('Tags:', 'xpress') . ' ', ', ', ' | '); 40 printf(__('Posted in %s', 'xpress'), get_the_category_list(', ')); 41 echo ' | '; 42 edit_post_link(__('Edit', 'xpress'), '', ' | '); 43 comments_popup_link(__('No Comments »', 'xpress'), __('1 Comment »', 'xpress'), __('% Comments »', 'xpress'), '', __('Comments Closed', 'xpress') ); 44 ?> 45 </div> 46 47 <div id ="xpress-pings-block"> 48 <h3><?php xpress_pings_number(__('No Trackback/Pingback', 'xpress'),__('One Trackback/Pingback', 'xpress'),__('% TrackBack/Pingback', 'xpress')) ?></h3> 49 50 <?php xpress_pings_list(true) ?> 51 </div> 52 53 <div id ="xpress-comments-block"> 54 <?php comments_template('', true); ?> 55 </div> 19 <div class="xpress-post" id="post-<?php the_ID(); ?>"> 20 <div class ="xpress-post-header"> 21 <?php if (function_exists('hotDates')) { hotDates(); }?> 22 <div class ="xpress-post-title"> 23 <h2><a href="<?php the_permalink() ?>" rel="bookmark" title="<?php printf(__('Permanent Link to %s', 'xpress'), the_title_attribute('echo=0')); ?>"><?php the_title(); ?></a></h2> 24 </div> 25 </div> 26 27 <div class="xpress-post-entry"> 28 <?php the_content('<p class="serif">' . __('Read the rest of this entry »', 'xpress') . '</p>'); ?> 29 </div> 30 31 <div class="xpress-link-pages"><?php wp_link_pages() ?></div> 32 33 <div class ="xpress-post-footer"> 34 <?php 35 the_time('Y/m/d l'); 36 echo ' - '; 37 the_author_posts_link(); 38 echo ' (' . xpress_post_views_count($post->ID,__('Views :%d', 'xpress'),false) . ')'; 39 echo ' | '; 40 // echo the_tags(__('Tags:', 'xpress') . ' ', ', ', ' | '); 41 printf(__('Posted in %s', 'xpress'), get_the_category_list(', ')); 42 echo ' | '; 43 edit_post_link(__('Edit', 'xpress'), '', ' | '); 44 comments_popup_link(__('No Comments »', 'xpress'), __('1 Comment »', 'xpress'), __('% Comments »', 'xpress'), '', __('Comments Closed', 'xpress') ); 45 ?> 46 </div> 47 48 <div id ="xpress-pings-block"> 49 <h3><?php xpress_pings_number(__('No Trackback/Pingback', 'xpress'),__('One Trackback/Pingback', 'xpress'),__('% TrackBack/Pingback', 'xpress')) ?></h3> 50 51 <?php xpress_pings_list(true) ?> 52 </div> 53 54 <div id ="xpress-comments-block"> 55 <?php comments_template('', true); ?> 56 </div> 57 </div> 58 59 <div class="xpress-navi-bar"> 60 <div class="alignleft"><?php xpress_left_arrow_post_link(true) ?></div> 61 <div class="alignright"><?php xpress_right_arrow_post_link(true) ?></div> 62 </div> 56 63 57 64 58 </div> 65 <?php endwhile; ?> 66 67 <div class="xpress-navi-bar"> 68 <?php if(function_exists('wp_pagenavi')) : ?> 69 <div class="xpress_pagenavi"><?php wp_pagenavi(); ?></div> 70 <?php else : ?> 71 <div class="alignleft"><?php xpress_left_arrow_posts_link(true); ?></div> 72 <div class="alignright"><?php xpress_right_arrow_posts_link(true); ?></div> 73 <?php endif; ?> 74 </div> 75 76 <?php else : ?> 77 <p><?php _e('Sorry, no posts matched your criteria.', 'xpress'); ?></p> 78 <?php endif; ?> 79 </div> 80 </div> 81 <?php if(xpress_is_theme_sidebar_disp()) get_sidebar(); ?> 59 82 60 <div class="xpress-navi-bar">61 <div class="alignleft"><?php xpress_left_arrow_post_link(true) ?></div>62 <div class="alignright"><?php xpress_right_arrow_post_link(true) ?></div>63 </div>64 <?php endwhile; else: ?>65 <p><?php _e('Sorry, no posts matched your criteria.', 'xpress'); ?></p>66 <?php endif; ?>67 68 </div>69 </div>70 <?php if(xpress_is_theme_sidebar_disp()) get_sidebar(); ?>71 72 83 <?php get_footer(); ?> 84
Note: See TracChangeset
for help on using the changeset viewer.
