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 1/2] 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;

From e8f938775f2f414ab69efa86af196d2a314e0000 Mon Sep 17 00:00:00 2001
From: "Philip M. Hofer (Frumph)" <frumph_dragon@yahoo.com>
Date: Tue, 17 Nov 2009 16:53:28 -0800
Subject: [PATCH 2/2] Uh trying to figure this merge crap out

Signed-off-by: Philip M. Hofer (Frumph) <frumph_dragon@yahoo.com>
---
 archive.php           |  2 +-
 footer.php            | 31 ++++++++++++++++++++++++++-----
 search-transcript.php |  2 +-
 search.php            |  2 +-
 style.css             | 22 ++++++++++++++--------
 5 files changed, 43 insertions(+), 16 deletions(-)

diff --git a/archive.php b/archive.php
index 9e194b1..a805602 100644
--- a/archive.php
+++ b/archive.php
@@ -121,7 +121,7 @@
 					the_excerpt();
 						} ?>
 						<div class="post-extras">
-							<div class="tags">
+							<div class="post-tags">
 								<?php the_tags(__('&#9492; Tags:','comicpress'),', ','<br />'); ?>
 							</div>
 							<div class="clear"></div>
diff --git a/footer.php b/footer.php
index 62c38ff..b9343f8 100644
--- a/footer.php
+++ b/footer.php
@@ -9,10 +9,31 @@
 	<?php get_sidebar('footer'); ?>
 	<?php global $disable_footer_text, $wpmu_version; if ($disable_footer_text != 'yes') { ?>
 		<p>
-			<span class="footer-copyright"><?php echo cp_copyright(); ?> <?php if (empty($wpmu_version)) { ?><?php echo the_author_meta('firstname',1); echo "&nbsp;"; echo the_author_meta('lastname',1); ?><span class="footer-pipe"> | </span><?php } ?></span>
-			<span class="footer-powered"><?php bloginfo('name'); ?> <?Php _e('Powered by','comicpress'); ?> <a href="http://wordpress.org/">WordPress</a> <?php _e('with','comicpress'); ?> <a href="http://comicpress.org/">ComicPress</a><span class="footer-pipe"> | </span></span>
-			<span class="footer-subscribe">Subscribe: <a href="<?php bloginfo('rss2_url') ?>">RSS Feed</a><span class="footer-pipe"> | </span></span>
-			<span class="footer-uptotop"><a href="#outside" onclick="scrollup(); return false;"><?php _e('Back to Top &uarr;','comicpress'); ?></a></span>
+			<span class="footer-copyright">
+				<?php echo cp_copyright(); ?>
+				<?php if (empty($wpmu_version)) {
+					$authorfirstname = get_the_author_meta('firstname',1);
+					$authorlastname = get_the_author_meta('lastname',1);
+					$blogname = get_bloginfo('title');
+					if ( $authorfirstname != "" ) {
+						echo $authorfirstname."	".$authorlastname;
+					} else {
+						echo $blogname;
+					}
+				} ?>
+			</span>
+			<span class="footer-powered">
+				<span class="footer-pipe">|</span>
+				<?php _e('Powered by','comicpress'); ?> <a href="http://wordpress.org/">WordPress</a> <?php _e('with','comicpress'); ?> <a href="http://comicpress.org/">ComicPress</a>
+			</span>
+			<span class="footer-subscribe">
+				<span class="footer-pipe">|</span>
+				Subscribe: <a href="<?php bloginfo('rss2_url') ?>">RSS</a>
+			</span>
+			<span class="footer-uptotop">
+				<span class="footer-pipe">|</span>
+				<a href="#outside" onclick="scrollup(); return false;"><?php _e('Back to Top &uarr;','comicpress'); ?></a>
+			</span>
 			<!-- <?php echo get_num_queries() ?> queries. <?php timer_stop(1) ?> seconds. -->
 		</p>
 	<?php } ?>
@@ -26,4 +47,4 @@
 
 <?php wp_footer() ?>
 </body>
-</html>
+</html>
\ No newline at end of file
diff --git a/search-transcript.php b/search-transcript.php
index fc03a34..d7901d1 100644
--- a/search-transcript.php
+++ b/search-transcript.php
@@ -35,7 +35,7 @@ $count = $tmp_search->post_count;
 			<div class="clear"></div>
 		</div>
 				<div class="post-extras">
-					<div class="tags">
+					<div class="post-tags">
 						<?php the_tags(__('&#9492; Tags:','comicpress'),', ','<br />'); ?>
 					</div>
 					<div class="clear"></div>
diff --git a/search.php b/search.php
index a0275ae..a203d1c 100644
--- a/search.php
+++ b/search.php
@@ -90,7 +90,7 @@
 					the_excerpt();
 					} ?>
 				<div class="post-extras">
-					<div class="tags">
+					<div class="post-tags">
 						<?php the_tags(__('&#9492; Tags:','comicpress'),', ','<br />'); ?>
 					</div>
 					<div class="clear"></div>
diff --git a/style.css b/style.css
index 9138fe4..4443286 100644
--- a/style.css
+++ b/style.css
@@ -830,10 +830,17 @@ ul.children {
 }
 
 .archive-dropdown {
+	width: 192px;
+	margin-left: 4px;
 	margin: 0 0 0 4px;
 	padding: 2px;
 }
 
+.widget_search #s-search, .widget_comicpress_search_transcripts #s-transcript {
+	width: 155px;
+	margin-left: 4px;
+}
+
 /* CALENDAR */
 
 #wp-calendar-wrap {
@@ -1329,8 +1336,12 @@ li.pingback div p, li.trackback div p {
 	line-height: 25px;
 }
 
+	#paginav .paginav-pages {
+		padding-right: 10px;
+	}
+
 	#paginav a {
-		padding: 0px 10px 0 10px;
+		padding: 0px 10px;
 		display: block;
 	}
 
@@ -1349,15 +1360,10 @@ li.pingback div p, li.trackback div p {
 	}
 
 	#paginav .paginav-current, #paginav .current {
-		padding: 0px 10px 0 10px;
-		font-size: larger;
+		padding: 0px 10px;
 		font-weight: bold;
 	}
 
-	#paginav li:hover a {
-		color: #ff0000; 
-	}
-
 /* Tool Tips (ComicPress Rascal) */
 
 .tt a {
@@ -1452,4 +1458,4 @@ li.pingback div p, li.trackback div p {
 		list-style: none;
 		margin: 0;
 		padding: 0;
-	}
\ No newline at end of file
+	}