added the loop for single pages to show the blog post

Signed-off-by: Philip M. Hofer (Frumph) <frumph_dragon@yahoo.com>
This commit is contained in:
Philip M. Hofer (Frumph) 2009-11-20 11:04:19 -08:00
parent 8c81ff96f5
commit 0cb36de9a3
5 changed files with 74 additions and 28 deletions

View File

@ -54,6 +54,11 @@ $options = array (
"default" => "default",
"type" => "comicpress-graphicnav_directory"),
array(
"id" => "comicpress-disable_default_comic_nav",
"default" => "no",
"type" => "comicpress-disable_default_comic_nav"),
array(
"id" => "comicpress-disable_lrsidebars_frontpage",
"default" => "no",

View File

@ -111,7 +111,8 @@ if (get_option('upload_path') !== false) {
'disable_default_menubar' => 'disable_default_menubar',
'disable_blogheader' => 'disable_blogheader',
'disable_page_titles' => 'disable_page_titles',
'static_blog' => 'static_blog' ) as $options => $variable_name) {
'static_blog' => 'static_blog',
'disable_default_comic_nav' => 'disable_default_comic_nav' ) as $options => $variable_name) {
$variables_to_extract[$variable_name] = get_option("comicpress-${options}");
}
@ -859,8 +860,7 @@ function comicpress_check_child_file($filename = '') {
if (empty($filename)) return false;
if (get_stylesheet_directory() != get_template_directory()) {
if (file_exists(get_stylesheet_directory() .'/'. $filename . '.php')) {
@include(get_stylesheet_directory() .'/'. $filename . '.php');
return true;
return include(get_stylesheet_directory() .'/'. $filename . '.php');
}
}
return false;

View File

@ -21,16 +21,17 @@ Style: Default
}
.comic_navi {
background: #222;
padding: 2px;
border: solid 1px #000;
border-top: 0;
-moz-border-radius: 0 0 8px 8px;
-khtml-border-radius: 0 0 8px 8px;
-webkit-border-radius: 0 0 8px 8px;
border-radius: 0 0 8px 8px;
}
.comic_navi a {
color: #000;
}
.comic_navi a:hover {
color: #b00;
}
.navi-comictitle {
padding: 0px 6px;

View File

@ -73,11 +73,7 @@
<?php _e('Numbered pagination appears on the Home page, the author(s) page, the blog template, and comments/single when there are more then the set number of comments per page. Uses the same styling as the Menubar.','comicpress'); ?>
</td>
</tr>
<?php break;
case "comicpress-comic_clicks_next": ?>
<tr>
<th scope="row"><strong><?php _e('Click comic to go next?','comicpress'); ?></strong><br /><?php _e('Allows users to click the comic itself to go to the next comic (unless on the latest comic).','comicpress'); ?><br /></th>
@ -91,9 +87,19 @@
</td>
</tr>
<?php break;
case "comicpress-disable_default_comic_nav": ?>
<tr>
<th scope="row"><strong><?php _e('Disable the default comic post navigation?','comicpress'); ?></strong><br /><?php _e('Previous Entries and Next Entries buttons are replaced by a bar of numbered pages.','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>
</td>
<td valign="top">
<?php _e('The default comic post navigation is above each comic blog post.','comicpress'); ?>
</td>
</tr>
<?php break;
case "comicpress-graphicnav_directory":
$current_gnav_directory = get_option($value['id']);

View File

@ -42,14 +42,7 @@
<div class="column">
<?php } ?>
<?php if (function_exists('the_project_wonderful_ad')) { ?>
<div class="blogpwad">
<center>
<?php the_project_wonderful_ad('blog'); ?>
</center>
</div>
<?php } ?>
<?php get_sidebar('blog'); ?>
<?php if (have_posts()) : while (have_posts()) : the_post();
if (in_comic_category()) {
global $disable_comic_blog_single;
@ -65,6 +58,45 @@
display_blog_post();
}
endwhile;
?>
<?php if (function_exists('the_project_wonderful_ad')) { ?>
<div class="blogpwad">
<center>
<?php the_project_wonderful_ad('blog'); ?>
</center>
</div>
<?php } ?>
<?php get_sidebar('blog'); ?>
<?php
global $static_blog;
if ($static_blog == 'yes' && in_comic_category()) {
global $blog_postcount;
if ($split_column_in_two != 'yes') {
$blog_query = 'showposts='.$blog_postcount.'&cat="-'.exclude_comic_categories().'"&paged='.$paged;
$posts = query_posts($blog_query);
if (have_posts()) { ?>
<?php if ($disable_blogheader != 'yes') { ?>
<div id="blogheader"><!-- This area can be used for a heading above your main page blog posts --></div>
<?php } ?>
<div class="blogindex-head"></div>
<div class="blogindex">
<?php while (have_posts()) : the_post();
display_blog_post();
endwhile; ?>
</div>
<div class="blogindex-foot"></div>
<?php }
comicpress_pagination();
} else {
comicpress_dual_columns();
}
} else {
global $blogposts_with_comic;
@ -87,9 +119,11 @@
}
$post = $temppost; $wp_query = $temp_query; $temppost = null; $temp_query = null;
}
if ('open' == $post->comment_status) {
comments_template('', true);
} ?>
}
if ('open' == $post->comment_status) {
comments_template('', true);
}
?>
<?php else: ?>
<?php get_sidebar('underblog'); ?>