From a8665bcb7c9435cc2fc2fe7982ff9bb5215ccdd6 Mon Sep 17 00:00:00 2001
From: "Philip M. Hofer (Frumph)" <frumph_dragon@yahoo.com>
Date: Tue, 17 Nov 2009 08:37:03 -0800
Subject: [PATCH] Okay I lied, it's back. Working on making the page-image
 header code look nice.

- Phil

Signed-off-by: Philip M. Hofer (Frumph) <frumph_dragon@yahoo.com>
---
 404.php                        |  6 +++---
 archive-comic-month.php        |  2 +-
 archive.php                    |  6 +++---
 comicpress-options-config.php  |  5 +++++
 functions.php                  |  6 ++----
 functions/displayblogpost.php  |  9 +++++++++
 functions/displaycomicpost.php |  6 ++++++
 options/generaloptions.php     | 14 ++++++++++++++
 style.css                      | 35 ++++++++++++++++++++++++++++++++++
 9 files changed, 78 insertions(+), 11 deletions(-)

diff --git a/404.php b/404.php
index 7f37159..1767a93 100644
--- a/404.php
+++ b/404.php
@@ -4,14 +4,14 @@
 <div class="<?php comicpress_post_class(); ?>">
 	<div class="post-page-head"></div>
 	<div class="post-page">
-		<h2 class="pagetitle"><?php _e('Page Not Found','comicpress'); ?></h2>
+		<?php if ($disable_page_titles != 'yes') { ?>
+			<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><?php include (get_template_directory() . '/searchform.php') ?></p>
 	</div>
 	<div class="post-page-foot"></div>
 </div>
-		</div>
-	</div>
 
 <?php include(get_template_directory() . '/layout-foot.php'); ?>
 <?php get_footer() ?>
\ No newline at end of file
diff --git a/archive-comic-month.php b/archive-comic-month.php
index 8e67b50..bc32940 100644
--- a/archive-comic-month.php
+++ b/archive-comic-month.php
@@ -10,8 +10,8 @@ Template Name: Month at a glance
 	<div class="post-page-head"></div>
 	<div class="post-page">
 	<?php while (have_posts()) : the_post() ?>
+		<h2 class="pagetitle"><?php the_title() ?></h2>
 		<div class="entry">
-			<h2 class="pagetitle"><?php the_title() ?></h2>
 			<?php the_content(); ?>
 		</div>
 	<?php endwhile; ?>
diff --git a/archive.php b/archive.php
index 889b807..d394ac0 100644
--- a/archive.php
+++ b/archive.php
@@ -51,7 +51,7 @@
 
 				<div class="comicthumbwrap">
 					<div class="comicarchiveframe" style="width: <?php echo $mini_comic_width; ?>px">
-						<a href="<?php the_permalink() ?>"><img src="<?php the_comic_mini() ?>" alt="<?php the_title() ?>" title="<?php the_title() ?>" /></a>
+						<a href="<?php the_permalink() ?>"><img src="<?php the_comic_mini() ?>" alt="<?php the_title() ?>" title="<?php the_title() ?>"  /></a>
 					</div>
 				</div>
 
@@ -84,8 +84,8 @@
 							</div>
 							<div class="clear"></div>
 						</div>
-						<div class="comicarchiveframe" style="width:<?php echo $archive_comic_width; ?>px;">
-							<a href="<?php the_permalink() ?>"><img src="<?php the_comic_archive() ?>" alt="<?php the_title() ?>" title="Click for full size." width="<?php echo $archive_comic_width ?>" /></a>
+						<div class="comicarchiveframe" style="max-width:<?php echo $archive_comic_width; ?>px;">
+							<a href="<?php the_permalink() ?>"><img src="<?php the_comic_archive() ?>" alt="<?php the_title() ?>" title="Click for full size." style="max-width: <?php echo $archive_comic_width ?>px" /></a>
 						</div>
 					</div>
 					<div class="post-comic-foot"></div>
diff --git a/comicpress-options-config.php b/comicpress-options-config.php
index a591e29..00d893b 100644
--- a/comicpress-options-config.php
+++ b/comicpress-options-config.php
@@ -284,6 +284,11 @@ $options = array (
 			"default" => "no",
 			"type" => "comicpress-disable_blogheader"),
 			
+		array(
+			"id" => "comicpress-disable_page_titles",
+			"default" => "no",
+			"type" => "comicpress-disable_page_titles"),
+			
 		array("type" => "close")
 		);
 ?>
\ No newline at end of file
diff --git a/functions.php b/functions.php
index a5fa740..814b74a 100644
--- a/functions.php
+++ b/functions.php
@@ -1,13 +1,10 @@
 <?php
 
-
 // the_post_image('thumbnail/medium/full'); 
 if (function_exists('add_theme_support')) {
 	add_theme_support( 'post-thumbnails' );
 }
 
-
-
 // Queue up the scripts.
 wp_enqueue_script('comicpress_scroll', get_template_directory_uri() . '/js/scroll.js');
 
@@ -113,7 +110,8 @@ if (get_option('upload_path') !== false) {
 				'author_column_two'				=> 'author_column_two',
 				'remove_wptexturize'			=> 'remove_wptexturize',
 				'disable_default_menubar'		=> 'disable_default_menubar',
-				'disable_blogheader'			=> 'disable_blogheader' ) as $options => $variable_name) {
+				'disable_blogheader'			=> 'disable_blogheader',
+				'disable_page_titles'			=> 'disable_page_titles' ) as $options => $variable_name) {
 		$variables_to_extract[$variable_name] = get_option("comicpress-${options}");
 	}
 	
diff --git a/functions/displayblogpost.php b/functions/displayblogpost.php
index e54d526..0e9563a 100644
--- a/functions/displayblogpost.php
+++ b/functions/displayblogpost.php
@@ -8,6 +8,15 @@
 
 function display_blog_post() { 
 	global $post, $wp_query, $authordata, $enable_related_posts, $enable_post_author_gravatar, $enable_post_calendar, $disable_categories_in_posts, $disable_tags_in_posts;  ?>
+	<?php if (is_single()) { ?>
+		<div class="blognav">
+			<div class="nav-single">
+				<?php previous_post_link('%link',__(' &lsaquo; Previous ','comicpress'), TRUE); ?>
+				<?php next_post_link('%link',__('| Next &rsaquo; ','comicpress'), TRUE); ?>
+			</div>
+		</div>
+	<?php } ?>
+	<div class="clear"></div>
 	<div class="<?php comicpress_post_class(); ?>">
 		<div class="post-head"></div>
 			<div class="post" id="post-<?php the_ID() ?>">
diff --git a/functions/displaycomicpost.php b/functions/displaycomicpost.php
index 2dd88d8..881c257 100644
--- a/functions/displaycomicpost.php
+++ b/functions/displaycomicpost.php
@@ -10,6 +10,12 @@ function display_comic_post() {
 		global $post, $wp_query, $authordata, $enable_related_comics, $enable_comic_post_author_gravatar, $enable_comic_post_calendar, $disable_categories_in_posts, $disable_tags_in_posts;
 			$first_comic = get_first_comic_permalink(); $last_comic = get_last_comic_permalink();
 		?>
+		<div class="nav">
+			<?php if ( get_permalink() != $first_comic ) { ?><div class="nav-first"><a href="<?php echo $first_comic ?>"><?php _e('&lsaquo;&lsaquo; First','comicpress'); ?></a></div><?php } ?>
+			<div class="nav-previous"><?php $temp_query = $wp_query->is_single; $wp_query->is_single = true; previous_comic_link('%link', __('&lsaquo; Previous','comicpress')); $wp_query->is_single = $temp_query;$temp_query = null; ?></div>
+			<div class="nav-next"><?php next_comic_link('%link', __('Next &rsaquo;','comicpress')) ?></div>
+			<?php if ( get_permalink() != $last_comic ) { ?><div class="nav-last"><a href="<?php echo $last_comic ?>"><?php _e('Last &rsaquo;&rsaquo;','comicpress'); ?></a></div><?php } ?>
+		</div>
 		<div class="<?php comicpress_post_class(); ?>">
 			<div class="post-comic-head"></div>
 				<div class="post-comic" id="post-comic-<?php the_ID() ?>">
diff --git a/options/generaloptions.php b/options/generaloptions.php
index 376eb82..456567c 100644
--- a/options/generaloptions.php
+++ b/options/generaloptions.php
@@ -89,6 +89,20 @@
 				</td>
 				</tr>
 				
+				<?php break;
+			case "comicpress-disable_page_titles": ?>
+				<tr>
+				<th scope="row"><strong><?php _e('Disable the titles on pages?','comicpress'); ?></strong><br /></th>
+				<td valign="top" width="100">
+				<label><input name="<?php echo $value['id']; ?>" id="<?php echo $value['id']; ?>-yes" type="radio" value="yes"<?php if ( get_option( $value['id'] ) == "yes") { echo " checked"; } ?> /><?php _e('Yes','comicpress'); ?></label>
+				&nbsp;&nbsp;
+				<label><input  name="<?php echo $value['id']; ?>" id="<?php echo $value['id']; ?>-no" type="radio" value="no"<?php if ( get_option( $value['id'] ) == "no") { echo " checked"; } ?> /><?php _e('No','comicpress'); ?></label><br />
+				</td>
+				<td valign="top">
+				<?php _e('If you disable the titles no pages you can add a post-page-image in the page editor.','comicpress'); ?>
+				</td>
+				</tr>
+				
 				<?php break;
 			case "comicpress-disable_comment_note": ?>
 				<tr>
diff --git a/style.css b/style.css
index 3409daf..1b78a7d 100644
--- a/style.css
+++ b/style.css
@@ -345,6 +345,41 @@ h3, h3 a {
 
 /* NAVIGATION */
 
+.nav,.blognav {
+	float: right;
+	font-size: 12px;
+	font-weight: bold;
+	padding: 5px 0;
+}
+
+	.nav-first{
+		float: left;
+	}
+
+	.nav-previous {
+		float: left;
+	}
+
+		.nav-previous a {
+			padding-left: 10px;
+		}
+		
+	.nav-next {
+		float: left;
+	}
+
+		.nav-next a {
+			padding-left: 10px;
+		}
+	
+	.nav-last {
+		float: left;
+	}
+	
+		.nav-last a {
+			padding-left: 10px;
+		}
+
 .pagenav, .commentnav {
 	height: 25px;
 	color: #000;