Navstyle cleanups, fixed bystrip to work with child themes, added silver navigation to core

Signed-off-by: Philip M. Hofer (Frumph) <frumph_dragon@yahoo.com>

buystrip.php

@@ -18,7 +18,7 @@ Templete Author Email: philip@frumph.net
 		<div class="post-page">
 			<div style="float:right;">
 				<br />
-				<img src="<?php bloginfo('stylesheet_directory'); ?>/images/paypal.png" alt="<?php _e('Powered by Paypal','comicpress'); ?>" /><br />
+				<img src="<?php echo get_template_directory_uri(); ?>/images/paypal.png" alt="<?php _e('Powered by Paypal','comicpress'); ?>" /><br />
 			</div>
 			<div style="float:left;">
 				<h2 class="pagetitle"><?php _e('Buy Print!','comicpress'); ?></h2>
@@ -57,7 +57,7 @@ Templete Author Email: philip@frumph.net
 						<input type="hidden" name="shipping" value="<?php echo $buy_print_us_ship; ?>">
 						US/Canada<br>
 						$<?php echo $buy_print_us_amount; ?> + $<?php echo $buy_print_us_ship; ?> <?php _e('shipping','comicpress'); ?><br />
-						<input type="image" src="<?php bloginfo('stylesheet_directory'); ?>/images/buynow_paypal.png" name="submit32" alt="<?php _e('Make payments with PayPal - it is fast, free and secure!','comicpress'); ?>" /> 
+						<input type="image" src="<?php echo get_template_directory_uri(); ?>/images/buynow_paypal.png" name="submit32" alt="<?php _e('Make payments with PayPal - it is fast, free and secure!','comicpress'); ?>" /> 
 						</form>
 				</td>
 				<td width="40">
@@ -79,7 +79,7 @@ Templete Author Email: philip@frumph.net
 						<input type="hidden" name="shipping" value="<?php echo $buy_print_int_ship; ?>">
 						International<br>
 						$<?php echo $buy_print_int_amount; ?> + $<?php echo $buy_print_int_ship; ?> <?php _e('shipping','comicpress'); ?><br />
-						<input type="image" src="<?php bloginfo('stylesheet_directory'); ?>/images/buynow_paypal.png" name="submit32" alt="<?php _e('Make payments with PayPal - it is fast, free and secure!','comicpress'); ?>" />
+						<input type="image" src="<?php echo get_template_directory_uri(); ?>/images/buynow_paypal.png" name="submit32" alt="<?php _e('Make payments with PayPal - it is fast, free and secure!','comicpress'); ?>" />
 					</form>
 				</td>
 			</tr>

functions.php

@@ -1,5 +1,12 @@
 <?php
 
+// Run this when a theme is switched to revert the navigation to default
+function comicpress_on_theme_switch() {
+	update_option('comicpress-graphicnav_directory', 'default');
+}
+
+add_action('switch_theme','comicpress_on_theme_switch',1,10);
+
 // Queue up the scripts.
 wp_enqueue_script('comicpress_scroll', get_template_directory_uri() . '/js/scroll.js');
 
@@ -19,7 +26,7 @@ if (function_exists('id_get_comment_number')) {
 	remove_filter('comments_number','id_get_comment_number');
 }
 
-$comicpress_version = '2.8.2.2';
+$comicpress_version = '2.8.2.3';
 
 global $wpmu_version;
 if (!empty($wpmu_version)) {

images/nav/scifi/navstyle.css

@@ -4,7 +4,6 @@ Style: Sci Fi
 */
 
 #comic_navi_wrapper {
-	width: 100%;
 	text-align: center;
 }
 
@@ -23,7 +22,7 @@ Style: Sci Fi
 	float: right;
 }
 
-#comic_navi {
+.comic_navi {
 	display: table;
 	border-collapse: collapse;
 	margin: 0 auto;
@@ -56,7 +55,11 @@ Style: Sci Fi
 	background: url('first.png') no-repeat;
 }
 
-.navi-prevchap {
+.navi-story_prev_in {
+	background: url('previnchap.png') no-repeat;
+}
+
+.navi-prevchap, .navi-story_prev {
 	background: url('prevchap.png') no-repeat;
 }
 
@@ -83,7 +86,7 @@ Style: Sci Fi
 		padding: 0;
 		}
 
-.navi-archive {
+.navi-archive, .navi-archives {
 	background: url('archive.png') no-repeat;
 }
 
@@ -116,10 +119,14 @@ Style: Sci Fi
 	background: url('next.png') no-repeat;
 }
 
-.navi-nextchap {
+.navi-nextchap, .navi-story_next {
 	background: url('nextchap.png') no-repeat;
 }
 
+.navi-story_next_in {
+	background: url('nextinchap.png') no-repeat;
+}
+
 .navi-last {
 	margin: 0;
 	background: url('last.png') no-repeat;

images/nav/silver/navstyle.css

@@ -0,0 +1,151 @@
+/* COMIC NAVIGATION 
+Author: Tyler Martin
+Style: Default
+*/
+#comic_navi_wrapper {
+	text-align: center;
+}
+
+.comic_navi_left {
+	display: inline-block;
+	float: left;
+}
+
+.comic_navi_center {
+	margin: 0 auto;
+	display: inline-block;
+}
+
+.comic_navi_right {
+	display: inline-block;
+	float: right;
+}
+
+.comic_navi {
+	display: table;
+	border-collapse: collapse;
+	margin: 0 auto;
+
+}
+
+.navi-comictitle {
+	text-align: center;
+	float: left;
+	display: block;
+	padding-top: 26px;
+	max-width: 200px;
+}
+
+.navi {
+	width: 66px;
+	padding: 66px 0 0 0;
+/*	margin: 0 5px; */
+	display: block;
+	float: left;
+	overflow: hidden;
+	font-size: 11px;
+	text-align: center;
+	color: #555;
+}
+
+	.navi:hover {
+		background-position: -66px 0;
+	}
+
+.navi-first {
+	margin: 0;
+	background: url('first.png') no-repeat;
+}
+
+.navi-prevchap, .navi-story_prev {
+	background: url('prevchap.png') no-repeat;
+}
+
+.navi-story_prev_in {
+	background: url('prevchap.png') no-repeat;
+}
+
+.navi-prev, .navi-previous {
+	margin-right: 30px;
+	background: url('prev.png') no-repeat;
+}
+
+
+.navi-comments, .navi-archive, .navi-random, .navi-buyprint {
+	margin: 0 5px;
+}
+
+.navi-buyprint {
+	border: none;
+	cursor: pointer;
+	background: url('buyprint.png') no-repeat;
+}
+
+	.navi-buyprint:hover, button .navi-buyprint:hover {
+		background: url('buyprint.png') no-repeat;
+		background-position: -66px 0;
+		color: #f00;
+	}
+
+	.navi-buyprint-form {
+		width: 76px;
+		display: block;
+		float: left;
+		margin: 0;
+		padding: 0;
+		}
+
+.navi-archive, .navi-archives {
+	background: url('archive.png') no-repeat;
+}
+
+.navi-random {
+	background: url('random.png') no-repeat;
+}
+
+.navi-comments {
+	padding: 0;
+	background: url('comments.png') no-repeat;
+}
+
+	a.navi-comments span {
+		width: 66px;
+		height: 66px;
+		display: block;
+		font-size: 16px;
+		font-weight: bold;
+		line-height: 66px;
+		color: #c5c5c5;
+	}
+	
+		a.navi-comments span:hover {
+			color: #860b04;
+			}
+	
+.navi-next {
+	margin-left: 30px;
+	background: url('next.png') no-repeat;
+}
+
+.navi-nextchap, .navi-story_next {
+	background: url('nextchap.png') no-repeat;
+}
+
+.navi-story_next_in {
+	background: url('nextchap.png') no-repeat;
+}
+
+.navi-last {
+	margin: 0;
+	background: url('last.png') no-repeat;
+}
+
+.navi-void, .navi-void:hover {
+	color: #999;
+	background-position: -132px 0;
+}
+
+.comic-left .navi-prev, .comic-right .navi-prev, .comic-left .navi-next, .comic-right .navi-next {
+/*	margin: 0 5px; */
+	}
+

layout-head.php

@@ -1,4 +1,9 @@
 <?php if (comicpress_check_child_file('layout-head') == false) { ?>
+
+<?php if (have_posts()) : while (have_posts()) : the_post(); ?>
+	<div id="header-<?php the_ID(); ?>"></div>
+<?php endwhile; endif; ?>
+
 <div id="content-wrapper-head"></div>
 	<div id="content-wrapper">
 

sidebar-above.php

@@ -1,3 +1,5 @@
+<?php if (comicpress_is_active_sidebar('Above Header')) { ?>
 <div id="sidebar-aboveheader" class="customsidebar <?php global $enable_if_widgetarea_use_sidebar_css; if ($enable_widgetarea_use_sidebar_css == 'yes') { ?> sidebar<?php } ?>">
 	<?php if ( !function_exists('dynamic_sidebar') || !dynamic_sidebar('Above Header') ) : ?><?php endif; ?>
 </div>
+<?php } ?>

sidebar-left.php

@@ -5,9 +5,8 @@
 	<div class="sidebar-head"></div>
 	<div class="sidebar">
 		<?php if ( !function_exists('dynamic_sidebar') || !dynamic_sidebar('Left Sidebar') ) : ?> 
-			<?php $default_image = get_template_directory_uri() . '/images/cal/default.png'; ?>
 			<div class="widget">
-				<?php comicpress_calendar(array('thumbnail' => $default_image)) ?>
+				<?php comicpress_calendar() ?>
 			</div>
 			<div class="widget">
 				<?php comicpress_archive_dropdown(); ?>

sidebar-right.php

@@ -8,9 +8,8 @@
 				<?php comicpress_comic_bookmark() ?>
 				
 				<?php if (is_cp_theme_layout('standard,v')) { ?>
-				<?php $default_image = get_template_directory_uri() . '/images/cal/default.png'; ?>
 					<div class="widget">
-						<?php comicpress_calendar(array('thumbnail' => $default_image)) ?>
+						<?php comicpress_calendar(); ?>
 					</div>
 				<?php } ?>
 				<div class="widget">

style.css

@@ -625,20 +625,21 @@ a.navi-comments:hover span {
 			padding-left: 5px;
 		}
 		
+		.comment-moderated em {
+			color: #f00;
+			padding-left: 5px;
+		}
+		
 		li.comment {
 			margin-top: 10px;
 		}
 
 .comment-meta-data {
-	background: #efefef;
-	border-bottom: solid 1px #999;
-	border-right: solid 1px #aaa;
 	margin: 0;
 	padding-left: 5px;
 }
 
 .bypostauthor .comment-meta-data {
-	background: #dedede;
 }
 
 .comment-meta {