From 14fa039813272693fa22fd760825966e9e3db141 Mon Sep 17 00:00:00 2001
From: "Philip M. Hofer (Frumph)" <frumph_dragon@yahoo.com>
Date: Tue, 17 Nov 2009 16:38:24 -0800
Subject: [PATCH] Working on the post-images more

Signed-off-by: Philip M. Hofer (Frumph) <frumph_dragon@yahoo.com>
---
 archive-comic-calendar.php | 12 +++++++++++-
 buystrip.php               |  7 +++----
 image.php                  | 11 +----------
 links.php                  | 12 ++++++++----
 page.php                   |  9 ++++-----
 style.css                  |  2 +-
 6 files changed, 28 insertions(+), 25 deletions(-)

diff --git a/archive-comic-calendar.php b/archive-comic-calendar.php
index c5754a9..23ec2af 100644
--- a/archive-comic-calendar.php
+++ b/archive-comic-calendar.php
@@ -71,10 +71,20 @@ $month['12'] = array('month' => __('December','comicpress'), 'days' => '31');
 	<div class="post-page-head"></div>
 	<div class="post-page">
 	<?php while (have_posts()) : the_post() ?>
-		<div class="entry">
+		<?php if ($disable_page_titles != 'yes') { ?>
 			<h2 class="pagetitle"><?php the_title() ?> <span class="page-archive-year"> <?php echo $archive_year; ?></span></h2>
+		<?php } ?>
+		<?php if (function_exists('the_post_image')) {
+			if ( has_post_image() ) { ?>
+				<div class="post-page-image">
+				<?php the_post_image('full'); ?>
+				</div>
+			<?php } ?>
+		<?php } ?>
+		<div class="entry">	
 			<?php the_content(); ?>
 		</div>
+		<?php edit_post_link(__('Edit this page.','comicpress'), '<p>', '</p>') ?>
 	<?php endwhile; ?>
 
 		<div class="archive-yearlist">| 
diff --git a/buystrip.php b/buystrip.php
index b440cb5..e769716 100644
--- a/buystrip.php
+++ b/buystrip.php
@@ -21,16 +21,15 @@ Template Version: 2.14
 				<br />
 				<img src="<?php echo get_template_directory_uri(); ?>/images/paypal.png" alt="<?php _e('Powered by Paypal','comicpress'); ?>" /><br />
 			</div>
+			<?php if ($disable_page_titles != 'yes') { ?>
+				<h2 class="pagetitle"><?php the_title() ?></h2>
+			<?php } ?>
 			<?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>
 				<?php } ?>
-			<?php } else { ?>
-				<h2 class="pagetitle"><?php the_title() ?></h2>
 			<?php } ?>
 			<br class="clear-margins" />
 			<?php _e('Comic ID','comicpress'); ?> - #<?php echo $comicnum; ?><br />
diff --git a/image.php b/image.php
index 1ba3826..5025463 100644
--- a/image.php
+++ b/image.php
@@ -5,18 +5,9 @@
 	<div class="<?php comicpress_post_class(); ?>">
 		<div class="post-page-head"></div>
 		<div class="post-page" id="post-<?php the_ID() ?>">
-			<?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>
-				<?php } ?>
-			<?php } else { ?>
+			<?php if ($disable_page_titles != 'yes') { ?>
 				<h2 class="pagetitle"><?php the_title() ?></h2>
 			<?php } ?>
-			<br class="clear-margins" />
 			<div class="gallery-image">
 				<a href="<?php echo wp_get_attachment_url($post->ID) ?>" target="_blank" title="<?php _e('Click for full size.','comicpress'); ?>" ><img src="<?php echo wp_get_attachment_url($post->ID) ?>" alt="<?php the_title() ?>" /></a>
 			</div>
diff --git a/links.php b/links.php
index 43e7b07..f935188 100644
--- a/links.php
+++ b/links.php
@@ -16,18 +16,22 @@ Template Name: Links
 	<div class="<?php comicpress_post_class(); ?>">
 		<div class="post-page-head"></div>
 		<div class="post-page">
+			<?php if ($disable_page_titles != 'yes') { ?>
+				<h2 class="pagetitle"><?php the_title() ?></h2>
+			<?php } ?>
 			<?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>
 				<?php } ?>
-			<?php } else { ?>
-				<h2 class="pagetitle"><?php the_title() ?></h2>
 			<?php } ?>
 			<br class="clear-margins" />
+			<div class="entry">
+				<?php the_content() ?>
+				<?php wp_link_pages(array('before' => '<div class="linkpages"><span class="linkpages-pagetext">'.__('Pages:','comicpress').'</span> ', 'after' => '</div>', 'next_or_number' => 'number'));  ?>
+			</div>
+			<?php edit_post_link(__('Edit this page.','comicpress'), '<p>', '</p>') ?>
 			<div id="linkspage">
 			<ul>
 				<?php echo $bookmarks; ?>
diff --git a/page.php b/page.php
index 60d56a7..90d0839 100644
--- a/page.php
+++ b/page.php
@@ -4,17 +4,16 @@
 	<?php if (have_posts()) : while (have_posts()) : the_post() ?>
 	<div class="<?php comicpress_post_class(); ?>">
 		<div class="post-page-head"></div>
-		<div class="post-page" id="post-<?php the_ID() ?>">
+			<div class="post-page" id="post-<?php the_ID() ?>">
+			<?php if ($disable_page_titles != 'yes') { ?>
+				<h2 class="pagetitle"><?php the_title() ?></h2>
+			<?php } ?>
 			<?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>
 				<?php } ?>
-			<?php } else { ?>
-				<h2 class="pagetitle"><?php the_title() ?></h2>
 			<?php } ?>
 			<div class="entry">
 				<?php the_content() ?>
diff --git a/style.css b/style.css
index 1b78a7d..9138fe4 100644
--- a/style.css
+++ b/style.css
@@ -1358,7 +1358,7 @@ li.pingback div p, li.trackback div p {
 		color: #ff0000; 
 	}
 
-/* Tool Tips */
+/* Tool Tips (ComicPress Rascal) */
 
 .tt a {
 	position: relative;