Moved </divs> to layout footer changed sandcastle to sandy added screencap for sandy

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

archive-comic-calendar.php

@@ -156,9 +156,8 @@ foreach ( $years as $year ) {
 	</div>
 	<div class="post-page-foot"></div>
 </div>
-<?php if ('open' == $post->comment_status) {
+
-	comments_template('', true);
+<?php if ('open' == $post->comment_status) { comments_template('', true); } ?>
-			} ?>
 
 <?php include(get_template_directory() . '/layout-foot.php'); ?>
 <?php get_footer() ?>

comicpress-options-config.php

@@ -14,6 +14,11 @@ $options = array (
 			"default" => "no",
 			"type" => "comicpress-disable_comic_blog_frontpage"),
 			
+		array(
+			"id" => "comicpress-disable_comic_blog_single",
+			"default" => "no",
+			"type" => "comicpress-disable_comic_blog_single"),
+			
 		array(
 			"id" => "comicpress-disable_blog_frontpage",
 			"default" => "no",

functions.php

@@ -51,6 +51,7 @@ if (get_option('upload_path') !== false) {
 	foreach (array(
 				'disable_comic_frontpage'		=> 'disable_comic_frontpage',
 				'disable_comic_blog_frontpage'	=> 'disable_comic_blog_frontpage',
+				'disable_comic_blog_single'		=> 'disable_comic_blog_single',
 				'disable_blog_frontpage'		=> 'disable_blog_frontpage',
 				'buy_print_email'				=> 'buy_print_email',
 				'buy_print_url'					=> 'buy_print_url',

options/indexoptions.php

@@ -23,7 +23,7 @@
 				<?php break;
 			case "comicpress-disable_comic_blog_frontpage": ?>
 				<tr>
-				<th scope="row"><strong><?php _e('Disable the comic blog on the index and single pages?','comicpress'); ?></strong><br /><br /><?php _e('Set to &quot;Yes&quot; and the blog portion of the comic will not display on the index page/front page of your site.','comicpress'); ?><br /></th>
+				<th scope="row"><strong><?php _e('Disable the comic blog on the index page?','comicpress'); ?></strong><br /><br /><?php _e('Set to &quot;Yes&quot; and the blog portion of the comic will not display on the index page/front page of your site.','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;
@@ -34,6 +34,19 @@
 				</td>
 				</tr>
 				
+				<?php break;
+			case "comicpress-disable_comic_blog_single": ?>
+				<tr>
+				<th scope="row"><strong><?php _e('Disable the comic blog on the single pages?','comicpress'); ?></strong><br /><br /><?php _e('Set to &quot;Yes&quot; and the blog portion of the comic will not display on the single/archive pages of your site.','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>
+				<td valign="top">
+				</td>
+				</tr>
+				
 				<?php break;
 			case "comicpress-disable_blog_frontpage": ?>
 				<tr>

single.php

@@ -52,8 +52,8 @@
 	<?php get_sidebar('blog'); ?>	
 <?php if (have_posts()) : while (have_posts()) : the_post();
 		if (in_comic_category()) {
-			global $disable_comic_blog_frontpage;
+			global $disable_comic_blog_single;
-			if ($disable_comic_blog_frontpage != 'yes') {
+			if ($disable_comic_blog_single != 'yes') {
 				display_comic_post();
 				$cur_date = mysql2date('Y-m-j', $post->post_date);
 				$next_comic = get_next_comic();

themepack/sandcastle/commentlink.php

@@ -1,3 +0,0 @@
-<?php global $post; if ($post->comment_status != 'closed') { ?>
-	<div class="comment-link">[ <?php comments_popup_link('No Comments', '1 Comment', '% Comments'); ?> ]</div>
-<?php } ?>

themepack/sandcastle/notes.php

@@ -1,7 +0,0 @@
-<strong>ThemePack</strong>: sandcastle<br />
-<strong>Author</strong>: ComicPress Development Team<br />
-<strong>Version</strong>: 0.1.0<br />
-<br />
-<strong>Installation Notes</strong>:<br />
-None<br />
-<br />

themepack/sandcastle/style.css

@@ -1,137 +0,0 @@
-/*
-ThemePack Name: Sandcastle
-ThemePack URI: http://comicpress.org
-Author: ComicPress Developement Team
-Author URI: http://mindfaucet.com/
-Version: 0.1.0
-*/
-
-/* STANDARD TAGS */
-
-body {
-	background: #dfc786 url('background.jpg') repeat;
-}
-
-#page, #page-wide {
-	width: auto;
-}
-
-.layout-v #page {
-	width: 780px;
-	margin: 0 auto;
-}
-
-
-#page #header, #page #menubar, #page #subcontent-wrapper, #page #footer, #page #comic-head, #page #comic-foot {
-	width: 780px;
-	margin: 0 auto;
-}
-
-.layout-gn #page-wide,
-.layout-rgn #page-wide,
-.layout-v3c #page-wide,
-#page-wide #header, 
-#page-wide #menubar, 
-#page-wide #subcontent-wrapper, 
-#page-wide #footer, 
-#page-wide #comic-head,
-#page-wide #comic-foot {
-	width: 980px;
-	margin: 0 auto;
-}
-
-#headerpwad {
-	margin-top: -20px;
-}
-
-#subcontent-wrapper, .layout-gn #content-wrapper, .layout-rgn #content-wrapper, .layout-v #content-wrapper,
-.layout-v3c #content-wrapper {
-	background: url('contentbg.jpg') repeat;
-	border-left: solid 1px #000;
-	border-right: solid 1px #000;
-	border-bottom: solid 1px #000;
-}
-
-.layout-gn #pagewrap-right, .layout-rgn #pagewrap-right {
-	padding-top: 5px;
-	width: 768px;
-}
-
-#comic-foot, #comic-head {
-	background: url('contentbg.jpg') repeat;
-	border-left: solid 1px #000;
-	border-right: solid 1px #000;
-	padding: 0;
-}
-
-.layout-gn #subcontent-wrapper, .layout-gn #comic-head, .layout-gn, #comic-foot, 
-.layout-rgn #subcontent-wrapper, .layout-rgn #comic-head, .layout-rgn, #comic-foot {
-	border: 0;
-}
-
-.layout-gn #page-wide #comic, .layout-gn #page-wide #comic-head, .layout-gn #page-wide #comic-foot {
-	margin-right: 5px;
-}
-
-.layout-gn #page-wide #comic-foot, .layout-gn #page-wide #comic-head,
-.layout-rgn #page-wide #comic-foot, .layout-rgn #page-wide #comic-head,
-.layout-v #page #comic-foot, .layout-v #page #comic-head {
-	width: auto;
-}
-
-.layout-standard #page #menubar {
-	width: 782px;
-}
-
-.layout-3c #page-wide #menubar, .layout-3c2r #page-wide #menubar {
-	width: 982px;
-}
-
-#comic {
-	margin: 0 auto;
-	background: #fff;
-	padding: 5px;
-	border: solid 2px #000;
-	-moz-border-radius: 10px;
-	-khtml-border-radius: 10px;
-	-webkit-border-radius: 10px;
-	border-radius: 10px;
-}
-
-.layout-rgn #page-wide #comic, .layout-rgn #page-wide #comic-head, .layout-rgn #page-wide #comic-foot {
-	margin-left: 5px;
-}
-
-.layout-3c #comic, .layout-3c2r #comic {
-	width: 1010px;
-}
-
-.layout-3c #comic-foot, .layout-3c2r #comic-foot,
-.layout-3c2r #comic-head, .layout-3c2r #comic-head,
-.layout-standard #comic-head, .layout-standard #comic-foot {
-	border-left: solid 1px #000;
-	border-right: solid 1px #000;
-}
-
-.layout-standard #comic {
-	width: 820px;
-}
-
-.layout-gn .narrowcolumn, .layout-rgn .narrowcolumn {
-	width: 538px;
-}
-
-.layout-v .narrowcolumn {
-	width: 558px;
-	padding: 5px;
-}
-
-#blogheader {
-	background: url('blogheader.jpg') top center no-repeat;
-	height: 250px;
-	border: 0;
-}
-
-button {
-	float: right;
-}