post-image fixes for templates, single.php now has the wrapper on comments disabled so 'comments disabled'. isn't seen if they're disabled.

Signed-off-by: Philip M. Hofer (Frumph) <frumph_dragon@yahoo.com>
This commit is contained in:
Philip M. Hofer (Frumph) 2009-11-18 15:15:24 -08:00
parent 7809be7817
commit 21b917f2fc
14 changed files with 73 additions and 48 deletions

View File

@ -4,9 +4,7 @@
<div class="<?php comicpress_post_class(); ?>"> <div class="<?php comicpress_post_class(); ?>">
<div class="post-page-head"></div> <div class="post-page-head"></div>
<div class="post-page"> <div class="post-page">
<?php if ($disable_page_titles != 'yes') { ?>
<h2 class="pagetitle"><?php _e('Page Not Found','comicpress'); ?></h2> <h2 class="pagetitle"><?php _e('Page Not Found','comicpress'); ?></h2>
<?php } ?>
<p><a href="<?php bloginfo('wpurl') ?>"><?php _e('Click here to return to the home page','comicpress'); ?></a> <?php _e('or try a search:','comicpress'); ?></p> <p><a href="<?php bloginfo('wpurl') ?>"><?php _e('Click here to return to the home page','comicpress'); ?></a> <?php _e('or try a search:','comicpress'); ?></p>
<p><?php include (get_template_directory() . '/searchform.php') ?></p> <p><?php include (get_template_directory() . '/searchform.php') ?></p>
</div> </div>

View File

@ -71,8 +71,17 @@ $month['12'] = array('month' => __('December','comicpress'), 'days' => '31');
<div class="post-page-head"></div> <div class="post-page-head"></div>
<div class="post-page"> <div class="post-page">
<?php while (have_posts()) : the_post() ?> <?php while (have_posts()) : the_post() ?>
<div class="entry"> <?php if (function_exists('the_post_image')) {
if ( has_post_image() ) { ?>
<div class="post-page-image">
<?php the_post_image('full'); ?>
</div>
<?php } ?>
<?php } ?>
<?php if ($disable_page_titles != 'yes') { ?>
<h2 class="pagetitle"><?php the_title() ?> <span class="page-archive-year"> <?php echo $archive_year; ?></span></h2> <h2 class="pagetitle"><?php the_title() ?> <span class="page-archive-year"> <?php echo $archive_year; ?></span></h2>
<?php } ?>
<div class="entry">
<?php the_content(); ?> <?php the_content(); ?>
</div> </div>
<?php endwhile; ?> <?php endwhile; ?>

View File

@ -10,7 +10,16 @@ Template Name: Month at a glance
<div class="post-page-head"></div> <div class="post-page-head"></div>
<div class="post-page"> <div class="post-page">
<?php while (have_posts()) : the_post() ?> <?php while (have_posts()) : the_post() ?>
<?php if (function_exists('the_post_image')) {
if ( has_post_image() ) { ?>
<div class="post-page-image">
<?php the_post_image('full'); ?>
</div>
<?php } ?>
<?php } ?>
<?php if ($disable_page_titles != 'yes') { ?>
<h2 class="pagetitle"><?php the_title() ?></h2> <h2 class="pagetitle"><?php the_title() ?></h2>
<?php } ?>
<div class="entry"> <div class="entry">
<?php the_content(); ?> <?php the_content(); ?>
</div> </div>

View File

@ -10,8 +10,17 @@ Template Name: Comic Storyline with Thumbs
<div class="post-page-head"></div> <div class="post-page-head"></div>
<div class="post-page"> <div class="post-page">
<?php while (have_posts()) : the_post() ?> <?php while (have_posts()) : the_post() ?>
<div class="entry"> <?php if (function_exists('the_post_image')) {
if ( has_post_image() ) { ?>
<div class="post-page-image">
<?php the_post_image('full'); ?>
</div>
<?php } ?>
<?php } ?>
<?php if ($disable_page_titles != 'yes') { ?>
<h2 class="pagetitle"><?php the_title() ?></h2> <h2 class="pagetitle"><?php the_title() ?></h2>
<?php } ?>
<div class="entry">
<?php the_content(); ?> <?php the_content(); ?>
</div> </div>
<?php endwhile; ?> <?php endwhile; ?>

View File

@ -10,8 +10,17 @@ Template Name: Comic Storyline Archive
<div class="post-page-head"></div> <div class="post-page-head"></div>
<div class="post-page"> <div class="post-page">
<?php while (have_posts()) : the_post() ?> <?php while (have_posts()) : the_post() ?>
<div class="entry"> <?php if (function_exists('the_post_image')) {
if ( has_post_image() ) { ?>
<div class="post-page-image">
<?php the_post_image('full'); ?>
</div>
<?php } ?>
<?php } ?>
<?php if ($disable_page_titles != 'yes') { ?>
<h2 class="pagetitle"><?php the_title() ?></h2> <h2 class="pagetitle"><?php the_title() ?></h2>
<?php } ?>
<div class="entry">
<?php the_content(); ?> <?php the_content(); ?>
</div> </div>
<?php endwhile; ?> <?php endwhile; ?>

View File

@ -21,8 +21,17 @@ if (empty($archive_year) || $archive_year == '') $archive_year = date('Y');
<div class="post-page-head"></div> <div class="post-page-head"></div>
<div class="post-page"> <div class="post-page">
<?php while (have_posts()) : the_post() ?> <?php while (have_posts()) : the_post() ?>
<div class="entry"> <?php if (function_exists('the_post_image')) {
if ( has_post_image() ) { ?>
<div class="post-page-image">
<?php the_post_image('full'); ?>
</div>
<?php } ?>
<?php } ?>
<?php if ($disable_page_titles != 'yes') { ?>
<h2 class="pagetitle"><?php the_title() ?> <span class="page-archive-year"> <?php echo $archive_year; ?></span></h2> <h2 class="pagetitle"><?php the_title() ?> <span class="page-archive-year"> <?php echo $archive_year; ?></span></h2>
<?php } ?>
<div class="entry">
<?php the_content(); ?> <?php the_content(); ?>
</div> </div>
<?php endwhile; ?> <?php endwhile; ?>

View File

@ -15,13 +15,11 @@ Template Name: Comic Archive
<div class="post-page-image"> <div class="post-page-image">
<?php the_post_image('full'); ?> <?php the_post_image('full'); ?>
</div> </div>
<?php } else { ?> <?php } ?>
<?php } ?>
<?php if ($disable_page_titles != 'yes') { ?>
<h2 class="pagetitle"><?php the_title() ?></h2> <h2 class="pagetitle"><?php the_title() ?></h2>
<?php } ?> <?php } ?>
<?php } else { ?>
<h2 class="pagetitle"><?php the_title() ?></h2>
<?php } ?>
<br class="clear-margins" />
<div class="entry"> <div class="entry">
<?php the_content(); ?> <?php the_content(); ?>
</div> </div>

View File

@ -10,18 +10,7 @@ Template Name: Archives
<div class="post-page-head"></div> <div class="post-page-head"></div>
<div class="post-page"> <div class="post-page">
<div id="archivepage"> <div id="archivepage">
<?php if (function_exists('the_post_image')) {
if ( has_post_image() ) { ?>
<div class="post-page-image">
<?php the_post_image('full'); ?>
</div>
<?php } else { ?>
<h2 class="pagetitle"><?php the_title() ?></h2> <h2 class="pagetitle"><?php the_title() ?></h2>
<?php } ?>
<?php } else { ?>
<h2 class="pagetitle"><?php the_title() ?></h2>
<?php } ?>
<br class="clear-margins" />
<ul><?php wp_get_archives('type=monthly') ?></ul> <ul><?php wp_get_archives('type=monthly') ?></ul>
<h2><?php _e('Archives by Subject:','comicpress'); ?></h2> <h2><?php _e('Archives by Subject:','comicpress'); ?></h2>
<ul><?php wp_list_categories() ?></ul> <ul><?php wp_list_categories() ?></ul>

View File

@ -26,13 +26,11 @@ Template Version: 2.14
<div class="post-page-image"> <div class="post-page-image">
<?php the_post_image('full'); ?> <?php the_post_image('full'); ?>
</div> </div>
<?php } else { ?> <?php } ?>
<?php } ?>
<?php if ($disable_page_titles != 'yes') { ?>
<h2 class="pagetitle"><?php the_title() ?></h2> <h2 class="pagetitle"><?php the_title() ?></h2>
<?php } ?> <?php } ?>
<?php } else { ?>
<h2 class="pagetitle"><?php the_title() ?></h2>
<?php } ?>
<br class="clear-margins" />
<?php _e('Comic ID','comicpress'); ?> - #<?php echo $comicnum; ?><br /> <?php _e('Comic ID','comicpress'); ?> - #<?php echo $comicnum; ?><br />
<?php _e('Title:','comicpress'); ?> <?php echo the_title(); ?><br /> <?php _e('Title:','comicpress'); ?> <?php echo the_title(); ?><br />
<br /> <br />

View File

@ -24,7 +24,7 @@ if (function_exists('id_get_comment_number')) {
remove_filter('comments_number','id_get_comment_number'); remove_filter('comments_number','id_get_comment_number');
} }
$comicpress_version = '2.8.2.6'; $comicpress_version = '2.9.0.0';
global $wpmu_version; global $wpmu_version;
if (!empty($wpmu_version)) { if (!empty($wpmu_version)) {

View File

@ -10,10 +10,9 @@
<div class="post-page-image"> <div class="post-page-image">
<?php the_post_image('full'); ?> <?php the_post_image('full'); ?>
</div> </div>
<?php } else { ?>
<h2 class="pagetitle"><?php the_title() ?></h2>
<?php } ?> <?php } ?>
<?php } else { ?> <?php } ?>
<?php if ($disable_page_titles != 'yes') { ?>
<h2 class="pagetitle"><?php the_title() ?></h2> <h2 class="pagetitle"><?php the_title() ?></h2>
<?php } ?> <?php } ?>
<br class="clear-margins" /> <br class="clear-margins" />

View File

@ -21,13 +21,11 @@ Template Name: Links
<div class="post-page-image"> <div class="post-page-image">
<?php the_post_image('full'); ?> <?php the_post_image('full'); ?>
</div> </div>
<?php } else { ?> <?php } ?>
<?php } ?>
<?php if ($disable_page_titles != 'yes') { ?>
<h2 class="pagetitle"><?php the_title() ?></h2> <h2 class="pagetitle"><?php the_title() ?></h2>
<?php } ?> <?php } ?>
<?php } else { ?>
<h2 class="pagetitle"><?php the_title() ?></h2>
<?php } ?>
<br class="clear-margins" />
<div id="linkspage"> <div id="linkspage">
<ul> <ul>
<?php echo $bookmarks; ?> <?php echo $bookmarks; ?>

View File

@ -10,10 +10,9 @@
<div class="post-page-image"> <div class="post-page-image">
<?php the_post_image('full'); ?> <?php the_post_image('full'); ?>
</div> </div>
<?php } else { ?>
<h2 class="pagetitle"><?php the_title() ?></h2>
<?php } ?> <?php } ?>
<?php } else { ?> <?php } ?>
<?php if ($disable_page_titles != 'yes') { ?>
<h2 class="pagetitle"><?php the_title() ?></h2> <h2 class="pagetitle"><?php the_title() ?></h2>
<?php } ?> <?php } ?>
<div class="entry"> <div class="entry">

View File

@ -86,10 +86,11 @@
endwhile; } endwhile; }
} }
$post = $temppost; $wp_query = $temp_query; $temppost = null; $temp_query = null; $post = $temppost; $wp_query = $temp_query; $temppost = null; $temp_query = null;
}
if ('open' == $post->comment_status) {
comments_template('', true);
} ?> } ?>
<?php comments_template('', true); ?>
<?php else: ?> <?php else: ?>
<?php get_sidebar('underblog'); ?> <?php get_sidebar('underblog'); ?>
<div class="<?php comicpress_post_class(); ?>"> <div class="<?php comicpress_post_class(); ?>">