From 94e42570103b2cd8ec73f610a928af4285cca69e Mon Sep 17 00:00:00 2001
From: "Philip M. Hofer (Frumph)" <frumph_dragon@yahoo.com>
Date: Tue, 24 Nov 2009 22:00:24 -0800
Subject: [PATCH] Fix for the turning default nav off and comic bookmark style
 change and just moved the global in the footer up some.

Signed-off-by: Philip M. Hofer (Frumph) <frumph_dragon@yahoo.com>
---
 footer.php                     | 3 ++-
 functions/displaycomicpost.php | 7 ++++---
 style.css                      | 4 +++-
 3 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/footer.php b/footer.php
index 3ee3bec..64dbfd7 100644
--- a/footer.php
+++ b/footer.php
@@ -1,3 +1,4 @@
+<?php global $wpmu_version, $comicpress_options; ?>
 <div id="footer">
 	<?php if (function_exists('the_project_wonderful_ad')) { ?>
 		<div class="footerpwad">
@@ -7,7 +8,7 @@
 		</div>
 	<?php } ?>
 	<?php get_sidebar('footer'); ?>
-	<?php global $wpmu_version, $comicpress_options; if (!$comicpress_options['disable_footer_text']) { ?>
+	<?php if (!$comicpress_options['disable_footer_text']) { ?>
 		<p>
 			<span class="footer-copyright">
 				<?php echo comicpress_copyright(); ?>
diff --git a/functions/displaycomicpost.php b/functions/displaycomicpost.php
index c479e60..de461b1 100644
--- a/functions/displaycomicpost.php
+++ b/functions/displaycomicpost.php
@@ -7,15 +7,16 @@
  */
 
 function display_comic_post() { 
-		global $post, $wp_query, $authordata, $comicpress_options;
-			$first_comic = get_first_comic_permalink(); $last_comic = get_last_comic_permalink();
-		?>
+	global $post, $wp_query, $authordata, $comicpress_options;
+	$first_comic = get_first_comic_permalink(); $last_comic = get_last_comic_permalink();
+	if (!$comicpress_options['disable_default_comic_nav']) { ?>
 		<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>
+	<?php } ?>
 		<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/style.css b/style.css
index 7be5125..f64fbf0 100644
--- a/style.css
+++ b/style.css
@@ -823,8 +823,10 @@ ul.children {
 	background: #000;
 }
 
-.sidebar .comic-bookmark-holder {
+.sidebar #comic-bookmark-holder {
+	width: 152px;
 	margin: 0 auto;
+	margin-bottom: 10px;
 }
 
 .archive-dropdown {