From 91bbf499d401710f0503eeaf1115a75d94008e11 Mon Sep 17 00:00:00 2001
From: "Philip M. Hofer (Frumph)" <frumph_dragon@yahoo.com>
Date: Wed, 2 Sep 2009 21:39:23 -0700
Subject: [PATCH] edits to everything

Signed-off-by: Philip M. Hofer (Frumph) <frumph_dragon@yahoo.com>
---
 404.php                            |  7 +++++--
 archive-comic-calendar.php         |  2 +-
 archive-comic-storyline-thumbs.php |  2 +-
 archive-comic-storyline.php        |  2 +-
 archive-comic-year.php             |  2 +-
 archive-comic.php                  |  2 +-
 archive.php                        |  2 +-
 archives.php                       |  2 +-
 author.php                         |  2 +-
 blog.php                           |  2 +-
 buystrip.php                       |  2 +-
 comicpress-config.php              | 10 +++++-----
 footer.php                         |  2 --
 functions.php                      |  2 +-
 image.php                          |  2 +-
 index.php                          |  8 ++++----
 links.php                          | 13 +++++++++++++
 page.php                           |  6 ++++++
 search.php                         |  2 +-
 single.php                         |  8 ++++----
 style.css                          |  8 ++++++++
 21 files changed, 58 insertions(+), 30 deletions(-)

diff --git a/404.php b/404.php
index 46b61f5..e43e719 100644
--- a/404.php
+++ b/404.php
@@ -39,9 +39,12 @@ if (is_cp_theme_style('3c,v3c,gn,standard,v')) {
 	get_sidebar('right'); ?>
 <?php } ?>
 
-<?php if (is_cp_theme_style('standard,gn,3c')) { ?>
+	<?php if (is_cp_theme_style('gn')) { ?>
+		</div>
+	<?php } ?>	
+
 	<div class="clear"></div>
+
 </div> <!-- end pageright-wrapper / content-wrapper -->
-<?php } ?>	
 
 <?php get_footer() ?>
\ No newline at end of file
diff --git a/archive-comic-calendar.php b/archive-comic-calendar.php
index 13a8b17..e16f1f1 100644
--- a/archive-comic-calendar.php
+++ b/archive-comic-calendar.php
@@ -176,7 +176,7 @@ if (is_cp_theme_style('3c,v3c,gn,standard,v')) {
 	<?php } ?>	
 
 	<div class="clear"></div>
-	</div>
+
 </div> <!-- end pageright-wrapper / content-wrapper -->
 
 <?php get_footer() ?>
\ No newline at end of file
diff --git a/archive-comic-storyline-thumbs.php b/archive-comic-storyline-thumbs.php
index bc00e65..a06d751 100644
--- a/archive-comic-storyline-thumbs.php
+++ b/archive-comic-storyline-thumbs.php
@@ -106,7 +106,7 @@ if (is_cp_theme_style('3c,v3c,gn,standard,v')) {
 	<?php } ?>	
 
 	<div class="clear"></div>
-	</div>
+
 </div> <!-- end pageright-wrapper / content-wrapper -->
 
 <?php get_footer() ?>
\ No newline at end of file
diff --git a/archive-comic-storyline.php b/archive-comic-storyline.php
index 69eee5d..ebb8ace 100644
--- a/archive-comic-storyline.php
+++ b/archive-comic-storyline.php
@@ -108,7 +108,7 @@ if (is_cp_theme_style('3c,v3c,gn,standard,v')) {
 	<?php } ?>	
 
 	<div class="clear"></div>
-	</div>
+
 </div> <!-- end pageright-wrapper / content-wrapper -->
 
 <?php get_footer() ?>
\ No newline at end of file
diff --git a/archive-comic-year.php b/archive-comic-year.php
index 095ff70..a9b84a3 100644
--- a/archive-comic-year.php
+++ b/archive-comic-year.php
@@ -81,7 +81,7 @@ if (is_cp_theme_style('3c,v3c,gn,standard,v')) {
 	<?php } ?>	
 
 	<div class="clear"></div>
-	</div>
+
 </div> <!-- end pageright-wrapper / content-wrapper -->
 
 <?php get_footer() ?>
\ No newline at end of file
diff --git a/archive-comic.php b/archive-comic.php
index cf02330..811faf0 100644
--- a/archive-comic.php
+++ b/archive-comic.php
@@ -69,7 +69,7 @@ if (is_cp_theme_style('3c,v3c,gn,standard,v')) {
 	<?php } ?>	
 
 	<div class="clear"></div>
-	</div>
+
 </div> <!-- end pageright-wrapper / content-wrapper -->
 
 <?php get_footer() ?>
\ No newline at end of file
diff --git a/archive.php b/archive.php
index f4c9635..92dbf13 100644
--- a/archive.php
+++ b/archive.php
@@ -155,7 +155,7 @@ if (is_cp_theme_style('3c,v3c,gn,standard,v')) {
 	<?php } ?>	
 
 	<div class="clear"></div>
-	</div>
+
 </div> <!-- end pageright-wrapper / content-wrapper -->
 
 <?php get_footer() ?>
\ No newline at end of file
diff --git a/archives.php b/archives.php
index a96e569..a20e150 100644
--- a/archives.php
+++ b/archives.php
@@ -54,7 +54,7 @@ if (is_cp_theme_style('3c,v3c,gn,standard,v')) {
 	<?php } ?>	
 
 	<div class="clear"></div>
-	</div>
+
 </div> <!-- end pageright-wrapper / content-wrapper -->
 
 <?php get_footer() ?>
\ No newline at end of file
diff --git a/author.php b/author.php
index 291b13a..ef6c733 100644
--- a/author.php
+++ b/author.php
@@ -94,7 +94,7 @@ if (is_cp_theme_style('3c,v3c,gn,standard,v')) {
 	<?php } ?>	
 
 	<div class="clear"></div>
-	</div>
+
 </div> <!-- end pageright-wrapper / content-wrapper -->
 
 <?php get_footer() ?>
\ No newline at end of file
diff --git a/blog.php b/blog.php
index e1c9835..6f5fe59 100644
--- a/blog.php
+++ b/blog.php
@@ -59,7 +59,7 @@ if (is_cp_theme_style('3c,v3c,gn,standard,v')) {
 	<?php } ?>	
 
 	<div class="clear"></div>
-	</div>
+
 </div> <!-- end pageright-wrapper / content-wrapper -->
 
 <?php get_footer() ?>
\ No newline at end of file
diff --git a/buystrip.php b/buystrip.php
index 5769424..8b18567 100644
--- a/buystrip.php
+++ b/buystrip.php
@@ -136,7 +136,7 @@ if (is_cp_theme_style('3c,v3c,gn,standard,v')) {
 	<?php } ?>	
 
 	<div class="clear"></div>
-	</div>
+
 </div> <!-- end pageright-wrapper / content-wrapper -->
 
 <?php get_footer() ?>
diff --git a/comicpress-config.php b/comicpress-config.php
index 6056ffe..ff2bd9a 100644
--- a/comicpress-config.php
+++ b/comicpress-config.php
@@ -1,25 +1,25 @@
 <?php
 
 //COMIC CATEGORY -the WordPress ID # of your comic category (default "3")
-$comiccat = "4";
+$comiccat = "3";
 		
 //BLOG CATEGORY - the WordPress ID of your blog category (default "1")
-$blogcat = "3";
+$blogcat = "1";
 		
 //COMIC FOLDER - the folder your comics files are located in (default "comics")
 $comic_folder = "comics";
 		
 //RSS COMIC FOLDER - the folder your comic files are in for the RSS feed (default "comics")
-$rss_comic_folder = "comics-rss";
+$rss_comic_folder = "comics";
 		
 //ARCHIVE COMIC FOLDER - the folder your comic files are in for your archive pages (default "comics")
-$archive_comic_folder = "comics-archive";
+$archive_comic_folder = "comics";
 		
 //ARCHIVE COMIC WIDTH - the width your comics will appear on archive or search results (default "380")
 $archive_comic_width = "380";
 		
 //RSS COMIC WIDTH - ComicPress Manager plugin users only - the width your comics appear in the RSS feed (default "600").
-$rss_comic_width = "180";
+$rss_comic_width = "600";
 
 //BLOG POSTCOUNT - the number of blog entries to appear on the home page (default "5").
 $blog_postcount = "5";
diff --git a/footer.php b/footer.php
index 05c8a90..c7c8365 100644
--- a/footer.php
+++ b/footer.php
@@ -1,5 +1,3 @@
-<div class="clear"></div><!-- Clears floated columns and sidebars -->
-
 <div id="footer">
 	<?php if (function_exists('the_project_wonderful_ad')) { ?>
 		<div class="footerpwad">
diff --git a/functions.php b/functions.php
index b970448..d106870 100644
--- a/functions.php
+++ b/functions.php
@@ -5,7 +5,7 @@ if (function_exists('id_get_comment_number')) {
 	remove_filter('comments_number','id_get_comment_number');
 }
 
-$comicpress_version = '2.8.0.R5';
+$comicpress_version = '2.8.0.1';
 
 // Remove the wptexturizer from changing the quotes and squotes.
 // remove_filter('the_title', 'wptexturize');
diff --git a/image.php b/image.php
index cdaba25..04b6ecb 100644
--- a/image.php
+++ b/image.php
@@ -99,7 +99,7 @@ if (is_cp_theme_style('3c,v3c,gn,standard,v')) {
 	<?php } ?>	
 
 	<div class="clear"></div>
-	</div>
+
 </div> <!-- end pageright-wrapper / content-wrapper -->
 
 <?php get_footer() ?>
\ No newline at end of file
diff --git a/index.php b/index.php
index 83de718..030b74e 100644
--- a/index.php
+++ b/index.php
@@ -23,12 +23,12 @@
 		while ($comicFrontpage->have_posts()) : $comicFrontpage->the_post() ?>	
 
 			<div id="comic-head"><?php get_sidebar('over'); ?></div>
-			<?php get_sidebar('comicleft'); ?>
 			<div id="comic">
+				<?php get_sidebar('comicleft'); ?>
 				<?php display_comic(); ?>
+				<?php get_sidebar('comicright'); ?>
+				<div class="clear"></div>
 			</div>
-			<?php get_sidebar('comicright'); ?>
-			<div class="clear"></div>
 			<div id="comic-foot"><?php get_sidebar('under'); ?></div>
 			
 		<?php endwhile; ?>
@@ -112,7 +112,7 @@ if (is_cp_theme_style('3c,v3c,gn,standard,v')) {
 	<?php } ?>	
 
 	<div class="clear"></div>
-	</div>
+
 </div> <!-- end pageright-wrapper / content-wrapper -->
 
 <?php get_footer() ?>
\ No newline at end of file
diff --git a/links.php b/links.php
index d74e3fa..c2d766f 100644
--- a/links.php
+++ b/links.php
@@ -67,4 +67,17 @@ if (is_cp_theme_style('3c,v3c,gn,standard,v')) {
 	</div>
 </div> <!-- end pageright-wrapper / content-wrapper -->
 
+<?php get_footer() ?><?php 
+if (is_cp_theme_style('3c,v3c,gn,standard,v')) { 
+	get_sidebar('right'); ?>
+<?php } ?>
+
+	<?php if (is_cp_theme_style('gn')) { ?>
+		</div>
+	<?php } ?>	
+
+	<div class="clear"></div>
+
+</div> <!-- end pageright-wrapper / content-wrapper -->
+
 <?php get_footer() ?>
\ No newline at end of file
diff --git a/page.php b/page.php
index 0f97682..0c73ecc 100644
--- a/page.php
+++ b/page.php
@@ -52,7 +52,13 @@
 if (is_cp_theme_style('3c,v3c,gn,standard,v')) { 
 	get_sidebar('right'); ?>
 <?php } ?>
+
+	<?php if (is_cp_theme_style('gn')) { ?>
+		</div>
+	<?php } ?>	
+
 	<div class="clear"></div>
+
 </div> <!-- end pageright-wrapper / content-wrapper -->
 
 <?php get_footer() ?>
\ No newline at end of file
diff --git a/search.php b/search.php
index 2f5f3ba..dfdd00e 100644
--- a/search.php
+++ b/search.php
@@ -138,7 +138,7 @@ if (is_cp_theme_style('3c,v3c,gn,standard,v')) {
 	<?php } ?>	
 
 	<div class="clear"></div>
-	</div>
+
 </div> <!-- end pageright-wrapper / content-wrapper -->
 
 <?php get_footer() ?>
\ No newline at end of file
diff --git a/single.php b/single.php
index 164f536..bfd983f 100644
--- a/single.php
+++ b/single.php
@@ -19,12 +19,12 @@
 		if (in_comic_category()) { ?>
 	
 				<div id="comic-head"><?php get_sidebar('over'); ?></div>
-				<?php get_sidebar('comicleft'); ?>
 				<div id="comic">
+					<?php get_sidebar('comicleft'); ?>
 					<?php display_comic(); ?>
+					<?php get_sidebar('comicright'); ?>
+					<div class="clear"></div>
 				</div>
-				<?php get_sidebar('comicright'); ?>
-				<div class="clear"></div>
 				<div id="comic-foot"><?php get_sidebar('under'); ?></div>
 		
 	<?php } endwhile; ?>
@@ -87,7 +87,7 @@ if (is_cp_theme_style('3c,v3c,gn,standard,v')) {
 	<?php } ?>	
 
 	<div class="clear"></div>
-	</div>
+
 </div> <!-- end pageright-wrapper / content-wrapper -->
 
 <?php get_footer() ?>
\ No newline at end of file
diff --git a/style.css b/style.css
index 45b3fd5..2a02ec7 100644
--- a/style.css
+++ b/style.css
@@ -385,6 +385,14 @@ h3, h3 a {
 	padding-bottom: 5px;
 }
 
+#sidebar-comicleft {
+float: left;
+}
+
+#sidebar-comicright {
+float: right;
+}
+
 
 /* THE FOOTER */