From 999c661192ba1b11494312533af96d9e216b090c Mon Sep 17 00:00:00 2001
From: "Philip M. Hofer (Frumph)" <frumph_dragon@yahoo.com>
Date: Sat, 24 Oct 2009 07:47:31 -0700
Subject: [PATCH] New option to remove the #blogheader

Signed-off-by: Philip M. Hofer (Frumph) <frumph_dragon@yahoo.com>
---
 comicpress-options-config.php  |  5 +++++
 functions.php                  |  3 ++-
 index.php                      | 10 ++++++++--
 options/indexoptions.php       | 10 ++++++++++
 single.php                     |  4 ++--
 themepack/slickblack/style.css |  6 +++---
 themepack/spacecase/notes.php  |  4 ++--
 7 files changed, 32 insertions(+), 10 deletions(-)

diff --git a/comicpress-options-config.php b/comicpress-options-config.php
index 89e3c79..ee10fc4 100644
--- a/comicpress-options-config.php
+++ b/comicpress-options-config.php
@@ -279,6 +279,11 @@ $options = array (
 			"default" => "no",
 			"type" => "comicpress-disable_default_menubar"),
 			
+		array(
+			"id" => "comicpress-disable_blogheader",
+			"default" => "no",
+			"type" => "comicpress-disable_blogheader"),
+			
 		array("type" => "close")
 		);
 ?>
\ No newline at end of file
diff --git a/functions.php b/functions.php
index 1b9b9ef..260f8c4 100644
--- a/functions.php
+++ b/functions.php
@@ -100,7 +100,8 @@ if (get_option('upload_path') !== false) {
 				'author_column_one'				=> 'author_column_one',
 				'author_column_two'				=> 'author_column_two',
 				'remove_wptexturize'			=> 'remove_wptexturize',
-				'disable_default_menubar'		=> 'disable_default_menubar' ) as $options => $variable_name) {
+				'disable_default_menubar'		=> 'disable_default_menubar',
+				'disable_blogheader'			=> 'disable_blogheader' ) as $options => $variable_name) {
 		$variables_to_extract[$variable_name] = get_option("comicpress-${options}");
 	}
 	
diff --git a/index.php b/index.php
index be6b24e..f5dc81b 100644
--- a/index.php
+++ b/index.php
@@ -1,4 +1,4 @@
-<?php get_header();  ?>
+<?php get_header(); ?>
 
 <div id="content-wrapper-top"></div>
 	<div id="content-wrapper">
@@ -61,12 +61,18 @@
 if ($disable_comic_frontpage != 'yes' && $disable_comic_blog_frontpage != 'yes' && !is_paged() )  { ?>
 	<?php while ($comicFrontpage->have_posts()) : $comicFrontpage->the_post();
 		display_comic_post();
+		$comicFrontPage->is_single = true;
+		comments_template(); 
 	endwhile; ?>
 <?php } ?>
 
+<?php if ($disable_blogheader != 'yes') { ?>
 	<div id="blogheader"><!-- This area can be used for a heading above your main page blog posts --></div>
-	
+<?php } ?>
+
 	<?php get_sidebar('blog'); ?>
+	
+
 
 <?php if ($disable_blog_frontpage != 'yes') {
 	global $blog_postcount; ?>
diff --git a/options/indexoptions.php b/options/indexoptions.php
index 016742a..d20c25e 100644
--- a/options/indexoptions.php
+++ b/options/indexoptions.php
@@ -62,6 +62,16 @@
 				</td>
 				</tr>
 				
+				<?php break;
+			case "comicpress-disable_blogheader": ?>
+				<tr>
+				<th scope="row"><strong><?php _e('Disable blog header on the index page?','comicpress'); ?></strong><br /><br /><?php _e('Set to &quot;Yes&quot; and the index page/front page of your site will not display the #blogheader','comicpress'); ?><br /></th>
+				<td valign="top">
+				<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>
+				</tr>				
 				<?php break;
 		}
 	}
diff --git a/single.php b/single.php
index 2059dfb..0f20740 100644
--- a/single.php
+++ b/single.php
@@ -89,9 +89,9 @@
 		} ?>
 	
 		<?php comments_template('', true); ?>		
-		<?php get_sidebar('underblog'); ?>	
-	<?php else: ?>
 		
+	<?php else: ?>
+	<?php get_sidebar('underblog'); ?>	
 	<div class="<?php comicpress_post_class(); ?>">
 		<div class="post-head"></div>
 		<div class="post">
diff --git a/themepack/slickblack/style.css b/themepack/slickblack/style.css
index 22fce4f..5c58aa8 100644
--- a/themepack/slickblack/style.css
+++ b/themepack/slickblack/style.css
@@ -72,13 +72,13 @@ h1, h1 a, h2, h2 a, h3, h3 a {
 }
 
 .narrowcolumn {
-	width: 546px;
+	width: 536px;
 	background: #333;
 	border: solid 1px #000;
 }
 
-.layout-standard .narrowcolumn, .layout-3c2r .narrowcolumn, .layout-v .narrowcolumn {
-	width: 551px;
+.layout-standard .narrowcolumn, .layout-v .narrowcolumn {
+	width: 541px;
 	margin-left: 5px;
 }
 
diff --git a/themepack/spacecase/notes.php b/themepack/spacecase/notes.php
index e3070db..2d1e36e 100644
--- a/themepack/spacecase/notes.php
+++ b/themepack/spacecase/notes.php
@@ -1,7 +1,7 @@
 <strong>ThemePack</strong>: spacecase<br />
 <strong>Author</strong>: Philip M. Hofer (Frumph)<br />
-<strong>Layouts</strong>: standard, 3c, gn, v, v3c<br />
+<strong>Version</strong>: 1.0.1<br />
 <br />
 <strong>Installation Notes</strong>:<br />
-SciFi Buttons.
+Use SciFi Buttons.
 <br />