subcontent-area and added layout-foot.php and layout-head.php to handle the referencing of the layouts

Signed-off-by: Philip M. Hofer (Frumph) <frumph_dragon@yahoo.com>
This commit is contained in:
Philip M. Hofer (Frumph) 2009-09-17 15:45:30 -07:00
parent 850c39b608
commit efee24cff9
28 changed files with 192 additions and 809 deletions

37
404.php
View File

@ -1,22 +1,5 @@
<?php get_header(); ?> <?php get_header(); ?>
<?php include(get_template_directory() . '/layout-head.php'); ?>
<div id="content-wrapper-top"></div>
<div id="content-wrapper">
<?php if (is_cp_theme_layout('gn,v3c')) get_sidebar('left'); ?>
<?php if (is_cp_theme_layout('gn')) { ?>
<div id="pagewrap-right">
<?php } ?>
<?php if (is_cp_theme_layout('v3c,v')) { ?>
<div id="content" class="narrowcolumn">
<div class="column">
<?php } ?>
<?php if (is_cp_theme_layout('3c,v')) { ?>
<div id="area-wrapper">
<?php } ?>
<?php get_sidebar('overblog'); ?> <?php get_sidebar('overblog'); ?>
<?php if (is_cp_theme_layout('3c')) get_sidebar('left'); ?> <?php if (is_cp_theme_layout('3c')) get_sidebar('left'); ?>
@ -39,21 +22,5 @@
</div> </div>
</div> </div>
<?php <?php include(get_template_directory() . '/layout-foot.php'); ?>
if (is_cp_theme_layout('3c,v3c,gn,standard,v')) {
get_sidebar('right'); ?>
<?php } ?>
<?php if (is_cp_theme_layout('3c,v')) { ?>
<div class="clear"></div>
</div>
<?php } ?>
<?php if (is_cp_theme_layout('gn')) { ?>
</div>
<?php } ?>
<div class="clear"></div>
</div>
<div id="content-wrapper-bottom"></div>
<?php get_footer() ?> <?php get_footer() ?>

View File

@ -4,32 +4,7 @@ Template Name: Comic Calendar Archive
*/ */
?> ?>
<?php get_header(); ?> <?php get_header(); ?>
<?php include(get_template_directory() . '/layout-head.php'); ?>
<div id="content-wrapper-top"></div>
<div id="content-wrapper">
<?php if (is_cp_theme_layout('gn,v3c')) get_sidebar('left'); ?>
<?php if (is_cp_theme_layout('gn')) { ?>
<div id="pagewrap-right">
<?php } ?>
<?php if (is_cp_theme_layout('v3c,v')) { ?>
<div id="content" class="narrowcolumn">
<div class="column">
<?php } ?>
<?php if (is_cp_theme_layout('3c,v')) { ?>
<div id="area-wrapper">
<?php } ?>
<?php get_sidebar('overblog'); ?>
<?php if (is_cp_theme_layout('3c')) get_sidebar('left'); ?>
<?php if (!is_cp_theme_layout('v3c,v')) { ?>
<div id="content" class="narrowcolumn">
<div class="column">
<?php } ?>
<?php <?php
@ -163,21 +138,5 @@ foreach ( $years as $year ) {
</div> </div>
</div> </div>
<?php <?php include(get_template_directory() . '/layout-foot.php'); ?>
if (is_cp_theme_layout('3c,v3c,gn,standard,v')) {
get_sidebar('right'); ?>
<?php } ?>
<?php if (is_cp_theme_layout('3c,v')) { ?>
<div class="clear"></div>
</div>
<?php } ?>
<?php if (is_cp_theme_layout('gn')) { ?>
</div>
<?php } ?>
<div class="clear"></div>
</div>
<div id="content-wrapper-bottom"></div>
<?php get_footer() ?> <?php get_footer() ?>

View File

@ -4,32 +4,7 @@ Template Name: Comic Storyline with Thumbs
*/ */
?> ?>
<?php get_header(); ?> <?php get_header(); ?>
<?php include(get_template_directory() . '/layout-head.php'); ?>
<div id="content-wrapper-top"></div>
<div id="content-wrapper">
<?php if (is_cp_theme_layout('gn,v3c')) get_sidebar('left'); ?>
<?php if (is_cp_theme_layout('gn')) { ?>
<div id="pagewrap-right">
<?php } ?>
<?php if (is_cp_theme_layout('v3c,v')) { ?>
<div id="content" class="narrowcolumn">
<div class="column">
<?php } ?>
<?php if (is_cp_theme_layout('3c,v')) { ?>
<div id="area-wrapper">
<?php } ?>
<?php get_sidebar('overblog'); ?>
<?php if (is_cp_theme_layout('3c')) get_sidebar('left'); ?>
<?php if (!is_cp_theme_layout('v3c,v')) { ?>
<div id="content" class="narrowcolumn">
<div class="column">
<?php } ?>
<div class="<?php comicpress_blogpost_class(); ?>"> <div class="<?php comicpress_blogpost_class(); ?>">
<div class="post-page-head"></div> <div class="post-page-head"></div>
@ -98,21 +73,5 @@ Template Name: Comic Storyline with Thumbs
</div> </div>
</div> </div>
<?php <?php include(get_template_directory() . '/layout-foot.php'); ?>
if (is_cp_theme_layout('3c,v3c,gn,standard,v')) {
get_sidebar('right'); ?>
<?php } ?>
<?php if (is_cp_theme_layout('3c,v')) { ?>
<div class="clear"></div>
</div>
<?php } ?>
<?php if (is_cp_theme_layout('gn')) { ?>
</div>
<?php } ?>
<div class="clear"></div>
</div>
<div id="content-wrapper-bottom"></div>
<?php get_footer() ?> <?php get_footer() ?>

View File

@ -4,32 +4,7 @@ Template Name: Comic Storyline Archive
*/ */
?> ?>
<?php get_header(); ?> <?php get_header(); ?>
<?php include(get_template_directory() . '/layout-head.php'); ?>
<div id="content-wrapper-top"></div>
<div id="content-wrapper">
<?php if (is_cp_theme_layout('gn,v3c')) get_sidebar('left'); ?>
<?php if (is_cp_theme_layout('gn')) { ?>
<div id="pagewrap-right">
<?php } ?>
<?php if (is_cp_theme_layout('v3c,v')) { ?>
<div id="content" class="narrowcolumn">
<div class="column">
<?php } ?>
<?php if (is_cp_theme_layout('3c,v')) { ?>
<div id="area-wrapper">
<?php } ?>
<?php get_sidebar('overblog'); ?>
<?php if (is_cp_theme_layout('3c')) get_sidebar('left'); ?>
<?php if (!is_cp_theme_layout('v3c,v')) { ?>
<div id="content" class="narrowcolumn">
<div class="column">
<?php } ?>
<div class="<?php comicpress_blogpost_class(); ?>"> <div class="<?php comicpress_blogpost_class(); ?>">
<div class="post-page-head"></div> <div class="post-page-head"></div>
@ -100,21 +75,5 @@ Template Name: Comic Storyline Archive
</div> </div>
</div> </div>
<?php <?php include(get_template_directory() . '/layout-foot.php'); ?>
if (is_cp_theme_layout('3c,v3c,gn,standard,v')) {
get_sidebar('right'); ?>
<?php } ?>
<?php if (is_cp_theme_layout('3c,v')) { ?>
<div class="clear"></div>
</div>
<?php } ?>
<?php if (is_cp_theme_layout('gn')) { ?>
</div>
<?php } ?>
<div class="clear"></div>
</div>
<div id="content-wrapper-bottom"></div>
<?php get_footer() ?> <?php get_footer() ?>

View File

@ -13,32 +13,7 @@ Template Name: Comic Year Archive
if (empty($archive_year)) $archive_year = date('Y'); if (empty($archive_year)) $archive_year = date('Y');
?> ?>
<?php get_header(); ?> <?php get_header(); ?>
<?php include(get_template_directory() . '/layout-head.php'); ?>
<div id="content-wrapper-top"></div>
<div id="content-wrapper">
<?php if (is_cp_theme_layout('gn,v3c')) get_sidebar('left'); ?>
<?php if (is_cp_theme_layout('gn')) { ?>
<div id="pagewrap-right">
<?php } ?>
<?php if (is_cp_theme_layout('v3c,v')) { ?>
<div id="content" class="narrowcolumn">
<div class="column">
<?php } ?>
<?php if (is_cp_theme_layout('3c,v')) { ?>
<div id="area-wrapper">
<?php } ?>
<?php get_sidebar('overblog'); ?>
<?php if (is_cp_theme_layout('3c')) get_sidebar('left'); ?>
<?php if (!is_cp_theme_layout('v3c,v')) { ?>
<div id="content" class="narrowcolumn">
<div class="column">
<?php } ?>
<div class="<?php comicpress_blogpost_class(); ?>"> <div class="<?php comicpress_blogpost_class(); ?>">
<div class="post-page-head"></div> <div class="post-page-head"></div>
@ -73,21 +48,5 @@ Template Name: Comic Year Archive
</div> </div>
</div> </div>
<?php <?php include(get_template_directory() . '/layout-foot.php'); ?>
if (is_cp_theme_layout('3c,v3c,gn,standard,v')) {
get_sidebar('right'); ?>
<?php } ?>
<?php if (is_cp_theme_layout('3c,v')) { ?>
<div class="clear"></div>
</div>
<?php } ?>
<?php if (is_cp_theme_layout('gn')) { ?>
</div>
<?php } ?>
<div class="clear"></div>
</div>
<div id="content-wrapper-bottom"></div>
<?php get_footer() ?> <?php get_footer() ?>

View File

@ -4,32 +4,7 @@ Template Name: Comic Archive
*/ */
?> ?>
<?php get_header(); ?> <?php get_header(); ?>
<?php include(get_template_directory() . '/layout-head.php'); ?>
<div id="content-wrapper-top"></div>
<div id="content-wrapper">
<?php if (is_cp_theme_layout('gn,v3c')) get_sidebar('left'); ?>
<?php if (is_cp_theme_layout('gn')) { ?>
<div id="pagewrap-right">
<?php } ?>
<?php if (is_cp_theme_layout('v3c,v')) { ?>
<div id="content" class="narrowcolumn">
<div class="column">
<?php } ?>
<?php if (is_cp_theme_layout('3c,v')) { ?>
<div id="area-wrapper">
<?php } ?>
<?php get_sidebar('overblog'); ?>
<?php if (is_cp_theme_layout('3c')) get_sidebar('left'); ?>
<?php if (!is_cp_theme_layout('v3c,v')) { ?>
<div id="content" class="narrowcolumn">
<div class="column">
<?php } ?>
<div class="<?php comicpress_blogpost_class(); ?>"> <div class="<?php comicpress_blogpost_class(); ?>">
<div class="post-page-head"></div> <div class="post-page-head"></div>
@ -61,21 +36,5 @@ Template Name: Comic Archive
</div> </div>
</div> </div>
<?php <?php include(get_template_directory() . '/layout-foot.php'); ?>
if (is_cp_theme_layout('3c,v3c,gn,standard,v')) {
get_sidebar('right'); ?>
<?php } ?>
<?php if (is_cp_theme_layout('3c,v')) { ?>
<div class="clear"></div>
</div>
<?php } ?>
<?php if (is_cp_theme_layout('gn')) { ?>
</div>
<?php } ?>
<div class="clear"></div>
</div>
<div id="content-wrapper-bottom"></div>
<?php get_footer() ?> <?php get_footer() ?>

View File

@ -1,30 +1,5 @@
<?php get_header(); ?> <?php get_header(); ?>
<?php include(get_template_directory() . '/layout-head.php'); ?>
<div id="content-wrapper-top"></div>
<div id="content-wrapper">
<?php if (is_cp_theme_layout('gn,v3c')) get_sidebar('left'); ?>
<?php if (is_cp_theme_layout('gn')) { ?>
<div id="pagewrap-right">
<?php } ?>
<?php if (is_cp_theme_layout('v3c,v')) { ?>
<div id="content" class="narrowcolumn">
<div class="column">
<?php } ?>
<?php if (is_cp_theme_layout('3c,v')) { ?>
<div id="area-wrapper">
<?php } ?>
<?php get_sidebar('overblog'); ?>
<?php if (is_cp_theme_layout('3c')) get_sidebar('left'); ?>
<?php if (!is_cp_theme_layout('v3c,v')) { ?>
<div id="content" class="narrowcolumn">
<div class="column">
<?php } ?>
<?php <?php
global $archive_display_order; global $archive_display_order;
@ -154,21 +129,5 @@
</div> </div>
</div> </div>
<?php <?php include(get_template_directory() . '/layout-foot.php'); ?>
if (is_cp_theme_layout('3c,v3c,gn,standard,v')) {
get_sidebar('right'); ?>
<?php } ?>
<?php if (is_cp_theme_layout('3c,v')) { ?>
<div class="clear"></div>
</div>
<?php } ?>
<?php if (is_cp_theme_layout('gn')) { ?>
</div>
<?php } ?>
<div class="clear"></div>
</div>
<div id="content-wrapper-bottom"></div>
<?php get_footer() ?> <?php get_footer() ?>

View File

@ -4,32 +4,7 @@ Template Name: Archives
*/ */
?> ?>
<?php get_header(); ?> <?php get_header(); ?>
<?php include(get_template_directory() . '/layout-head.php'); ?>
<div id="content-wrapper-top"></div>
<div id="content-wrapper">
<?php if (is_cp_theme_layout('gn,v3c')) get_sidebar('left'); ?>
<?php if (is_cp_theme_layout('gn')) { ?>
<div id="pagewrap-right">
<?php } ?>
<?php if (is_cp_theme_layout('v3c,v')) { ?>
<div id="content" class="narrowcolumn">
<div class="column">
<?php } ?>
<?php if (is_cp_theme_layout('3c,v')) { ?>
<div id="area-wrapper">
<?php } ?>
<?php get_sidebar('overblog'); ?>
<?php if (is_cp_theme_layout('3c')) get_sidebar('left'); ?>
<?php if (!is_cp_theme_layout('v3c,v')) { ?>
<div id="content" class="narrowcolumn">
<div class="column">
<?php } ?>
<div class="<?php comicpress_blogpost_class(); ?>"> <div class="<?php comicpress_blogpost_class(); ?>">
<div class="post-page-head"></div> <div class="post-page-head"></div>
@ -47,21 +22,5 @@ Template Name: Archives
</div> </div>
</div> </div>
<?php <?php include(get_template_directory() . '/layout-foot.php'); ?>
if (is_cp_theme_layout('3c,v3c,gn,standard,v')) {
get_sidebar('right'); ?>
<?php } ?>
<?php if (is_cp_theme_layout('3c,v')) { ?>
<div class="clear"></div>
</div>
<?php } ?>
<?php if (is_cp_theme_layout('gn')) { ?>
</div>
<?php } ?>
<div class="clear"></div>
</div>
<div id="content-wrapper-bottom"></div>
<?php get_footer() ?> <?php get_footer() ?>

View File

@ -1,30 +1,5 @@
<?php get_header(); ?> <?php get_header(); ?>
<?php include(get_template_directory() . '/layout-head.php'); ?>
<div id="content-wrapper-top"></div>
<div id="content-wrapper">
<?php if (is_cp_theme_layout('gn,v3c')) get_sidebar('left'); ?>
<?php if (is_cp_theme_layout('gn')) { ?>
<div id="pagewrap-right">
<?php } ?>
<?php if (is_cp_theme_layout('v3c,v')) { ?>
<div id="content" class="narrowcolumn">
<div class="column">
<?php } ?>
<?php if (is_cp_theme_layout('3c,v')) { ?>
<div id="area-wrapper">
<?php } ?>
<?php get_sidebar('overblog'); ?>
<?php if (is_cp_theme_layout('3c')) get_sidebar('left'); ?>
<?php if (!is_cp_theme_layout('v3c,v')) { ?>
<div id="content" class="narrowcolumn">
<div class="column">
<?php } ?>
<?php <?php
if(get_query_var('author_name') ) { if(get_query_var('author_name') ) {
@ -84,21 +59,5 @@
</div> </div>
</div> </div>
<?php <?php include(get_template_directory() . '/layout-foot.php'); ?>
if (is_cp_theme_layout('3c,v3c,gn,standard,v')) {
get_sidebar('right'); ?>
<?php } ?>
<?php if (is_cp_theme_layout('3c,v')) { ?>
<div class="clear"></div>
</div>
<?php } ?>
<?php if (is_cp_theme_layout('gn')) { ?>
</div>
<?php } ?>
<div class="clear"></div>
</div>
<div id="content-wrapper-bottom"></div>
<?php get_footer() ?> <?php get_footer() ?>

View File

@ -4,34 +4,9 @@ Template Name: Blog
*/ */
?> ?>
<?php get_header(); ?> <?php get_header(); ?>
<?php include(get_template_directory() . '/layout-head.php'); ?>
<div id="content-wrapper-top"></div>
<div id="content-wrapper">
<?php if (is_cp_theme_layout('gn,v3c')) get_sidebar('left'); ?>
<?php if (is_cp_theme_layout('gn')) { ?>
<div id="pagewrap-right">
<?php } ?>
<?php if (is_cp_theme_layout('v3c,v')) { ?>
<div id="content" class="narrowcolumn">
<div class="column">
<?php } ?>
<?php if (is_cp_theme_layout('3c,v')) { ?> <?php if (have_posts()):
<div id="area-wrapper">
<?php } ?>
<?php get_sidebar('overblog'); ?>
<?php if (is_cp_theme_layout('3c')) get_sidebar('left'); ?>
<?php if (!is_cp_theme_layout('v3c,v')) { ?>
<div id="content" class="narrowcolumn">
<div class="column">
<?php }
if (have_posts()):
$blog_query = '&cat=-"'.exclude_comic_categories().'"&paged='.$paged; $blog_query = '&cat=-"'.exclude_comic_categories().'"&paged='.$paged;
@ -49,21 +24,5 @@ Template Name: Blog
</div> </div>
</div> </div>
<?php <?php include(get_template_directory() . '/layout-foot.php'); ?>
if (is_cp_theme_layout('3c,v3c,gn,standard,v')) {
get_sidebar('right'); ?>
<?php } ?>
<?php if (is_cp_theme_layout('3c,v')) { ?>
<div class="clear"></div>
</div>
<?php } ?>
<?php if (is_cp_theme_layout('gn')) { ?>
</div>
<?php } ?>
<div class="clear"></div>
</div>
<div id="content-wrapper-bottom"></div>
<?php get_footer() ?> <?php get_footer() ?>

View File

@ -8,32 +8,7 @@ Templete Author Email: philip@frumph.net
if (isset($_REQUEST['comic'])) $comicnum = (int)$_REQUEST['comic']; if (isset($_REQUEST['comic'])) $comicnum = (int)$_REQUEST['comic'];
?> ?>
<?php get_header(); ?> <?php get_header(); ?>
<?php include(get_template_directory() . '/layout-head.php'); ?>
<div id="content-wrapper-top"></div>
<div id="content-wrapper">
<?php if (is_cp_theme_layout('gn,v3c')) get_sidebar('left'); ?>
<?php if (is_cp_theme_layout('gn')) { ?>
<div id="pagewrap-right">
<?php } ?>
<?php if (is_cp_theme_layout('v3c,v')) { ?>
<div id="content" class="narrowcolumn">
<div class="column">
<?php } ?>
<?php if (is_cp_theme_layout('3c,v')) { ?>
<div id="area-wrapper">
<?php } ?>
<?php get_sidebar('overblog'); ?>
<?php if (is_cp_theme_layout('3c')) get_sidebar('left'); ?>
<?php if (!is_cp_theme_layout('v3c,v')) { ?>
<div id="content" class="narrowcolumn">
<div class="column">
<?php } ?>
<?php if (!empty($comicnum)): ?> <?php if (!empty($comicnum)): ?>
<?php $temppost = $post; ?> <?php $temppost = $post; ?>
@ -131,21 +106,5 @@ Templete Author Email: philip@frumph.net
</div> </div>
</div> </div>
<?php <?php include(get_template_directory() . '/layout-foot.php'); ?>
if (is_cp_theme_layout('3c,v3c,gn,standard,v')) {
get_sidebar('right'); ?>
<?php } ?>
<?php if (is_cp_theme_layout('3c,v')) { ?>
<div class="clear"></div>
</div>
<?php } ?>
<?php if (is_cp_theme_layout('gn')) { ?>
</div>
<?php } ?>
<div class="clear"></div>
</div>
<div id="content-wrapper-bottom"></div>
<?php get_footer() ?> <?php get_footer() ?>

View File

@ -425,7 +425,7 @@ function comicpress_admin() {
case "comicpress-excerpt_or_content_search": ?> case "comicpress-excerpt_or_content_search": ?>
<tr> <tr>
<th scope="row"><strong>Would you like to have users see the entire content or just an excerpt when searching?</strong><br /><br /></th> <th scope="row"><strong>Would you like to have users see the entire content or just an excerpt when searching?</strong><br /><br /></th>
<td valign="top"> <td valign="top" width="160">
<label><input name="<?php echo $value['id']; ?>" id="<?php echo $value['id']; ?>-excerpt" type="radio" value="excerpt"<?php if ( get_option( $value['id'] ) == "excerpt") { echo " checked"; } ?> />Excerpt</label> <label><input name="<?php echo $value['id']; ?>" id="<?php echo $value['id']; ?>-excerpt" type="radio" value="excerpt"<?php if ( get_option( $value['id'] ) == "excerpt") { echo " checked"; } ?> />Excerpt</label>
&nbsp;&nbsp; &nbsp;&nbsp;
<label><input name="<?php echo $value['id']; ?>" id="<?php echo $value['id']; ?>-content" type="radio" value="content"<?php if ( get_option( $value['id'] ) == "content") { echo " checked"; } ?> />Content</label> <label><input name="<?php echo $value['id']; ?>" id="<?php echo $value['id']; ?>-content" type="radio" value="content"<?php if ( get_option( $value['id'] ) == "content") { echo " checked"; } ?> />Content</label>

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.1 KiB

View File

@ -18,7 +18,7 @@
<?php global $disable_page_restraints; if ($disable_page_restraints == 'no') { ?> <?php global $disable_page_restraints; if ($disable_page_restraints == 'no') { ?>
</div><!-- Ends "page/page-wide" --> </div><!-- Ends "page/page-wide" -->
</div><!-- ends "page-wrap" --> </div><!-- Ends "page-wrap" -->
<?php } ?> <?php } ?>
<div id="page-bottom"></div> <div id="page-bottom"></div>

View File

@ -5,7 +5,7 @@ if (function_exists('id_get_comment_number')) {
remove_filter('comments_number','id_get_comment_number'); remove_filter('comments_number','id_get_comment_number');
} }
$comicpress_version = '2.8.1.8'; $comicpress_version = '2.8.1.9';
// Remove the wptexturizer from changing the quotes and squotes. // Remove the wptexturizer from changing the quotes and squotes.
// remove_filter('the_title', 'wptexturize'); // remove_filter('the_title', 'wptexturize');
@ -767,4 +767,14 @@ function cp_copyright_year() {
return $output; return $output;
} }
function comicpress_check_themepack_file($filename = '') {
global $themepack_directory;
if (empty($filename)) return false;
if ( ($themepack_directory != 'none' && !empty($themepack_directory) ) && file_exists(get_template_directory() . '/themepack/'.$themepack_directory.'/'.$filename) ) {
include(get_template_directory() . '/themepack/' .$themepack_directory. '/'.$filename);
return true;
}
return false;
}
?> ?>

View File

@ -44,9 +44,7 @@ function display_blog_post() {
<?php } ?> <?php } ?>
<?php if (!is_single()) { <?php if (!is_single()) {
if ('open' == $post->comment_status) { if ('open' == $post->comment_status) {
if ( ($themepack_directory != 'none' && !empty($themepack_directory) ) && file_exists(get_template_directory() . '/themepack/'.$themepack_directory.'/commentlink.php') ) { if (comicpress_check_themepack_file('commentlink.php') == false) { ?>
include(get_template_directory() . '/themepack/' .$themepack_directory. '/commentlink.php');
} else { ?>
<div class="comment-link"><?php comments_popup_link('<span class="comment-balloon comment-balloon-empty">&nbsp;</span> No Comments ', '<span class="comment-balloon">1</span> Comment ', '<span class="comment-balloon">%</span> Comments '); ?></div> <div class="comment-link"><?php comments_popup_link('<span class="comment-balloon comment-balloon-empty">&nbsp;</span> No Comments ', '<span class="comment-balloon">1</span> Comment ', '<span class="comment-balloon">%</span> Comments '); ?></div>
<?php } <?php }
} }

View File

@ -24,7 +24,6 @@
if ($themepack_directory != 'none') { ?> if ($themepack_directory != 'none') { ?>
<link rel="stylesheet" href="<?php bloginfo('stylesheet_directory'); ?>/themepack/<?php echo $themepack_directory; ?>/style.css" type="text/css" media="screen" /> <link rel="stylesheet" href="<?php bloginfo('stylesheet_directory'); ?>/themepack/<?php echo $themepack_directory; ?>/style.css" type="text/css" media="screen" />
<?php } ?> <?php } ?>
<link rel="SHORTCUT ICON" href="<?php bloginfo('stylesheet_directory'); ?>/favicon.ico" />
<link rel="alternate" type="application/rss+xml" title="<?php bloginfo('name') ?> RSS2 Feed" href="<?php bloginfo('rss2_url') ?>" /> <link rel="alternate" type="application/rss+xml" title="<?php bloginfo('name') ?> RSS2 Feed" href="<?php bloginfo('rss2_url') ?>" />
<link rel="alternate" type="application/atom+xml" title="<?php bloginfo('name') ?> Atom Feed" href="<?php bloginfo('atom_url') ?>" /> <link rel="alternate" type="application/atom+xml" title="<?php bloginfo('name') ?> Atom Feed" href="<?php bloginfo('atom_url') ?>" />
<link rel="pingback" href="<?php bloginfo('pingback_url') ?>" /> <link rel="pingback" href="<?php bloginfo('pingback_url') ?>" />
@ -38,7 +37,6 @@
</head> </head>
<body <?php if (function_exists('body_class')) { body_class(); } ?>> <body <?php if (function_exists('body_class')) { body_class(); } ?>>
<?php if ( function_exists( 'get_sliding_panel' ) ) get_sliding_panel(); ?>
<?php do_action('comicpress-header'); ?> <?php do_action('comicpress-header'); ?>
<?php get_sidebar('above'); ?> <?php get_sidebar('above'); ?>
@ -46,14 +44,16 @@
<?php if ($disable_page_restraints != 'yes') { <?php if ($disable_page_restraints != 'yes') {
if (is_cp_theme_layout('standard,v')) { ?> if (is_cp_theme_layout('standard,v')) { ?>
<div id="page"><!-- Defines entire site width - Ends in Footer --> <div id="page-wrap"><!-- Wraps outside the site width -->
<div id="page-wrap"><!-- Wraps inside the site width --> <div id="page"><!-- Defines entire site width - Ends in Footer -->
<?php } else { ?> <?php } else { ?>
<div id="page-wide"> <div id="page-wrap-wide">
<div id="page-wrap"> <div id="page-wide">
<?php } <?php }
} ?> } ?>
<?php
if (comicpress_check_themepack_file('header.php') == false) { ?>
<div id="header"> <div id="header">
<?php if (function_exists('the_project_wonderful_ad')) { ?> <?php if (function_exists('the_project_wonderful_ad')) { ?>
<div class="headerpwad"> <div class="headerpwad">
@ -68,4 +68,5 @@
<?php } ?> <?php } ?>
<div class="clear"></div> <div class="clear"></div>
</div> </div>
<?php } ?>
<?php get_sidebar('menubar'); ?> <?php get_sidebar('menubar'); ?>

View File

@ -1,30 +1,5 @@
<?php get_header(); ?> <?php get_header(); ?>
<?php include(get_template_directory() . '/layout-head.php'); ?>
<div id="content-wrapper-top"></div>
<div id="content-wrapper">
<?php if (is_cp_theme_layout('gn,v3c')) get_sidebar('left'); ?>
<?php if (is_cp_theme_layout('gn')) { ?>
<div id="pagewrap-right">
<?php } ?>
<?php if (is_cp_theme_layout('v3c,v')) { ?>
<div id="content" class="narrowcolumn">
<div class="column">
<?php } ?>
<?php if (is_cp_theme_layout('3c,v')) { ?>
<div id="area-wrapper">
<?php } ?>
<?php get_sidebar('overblog'); ?>
<?php if (is_cp_theme_layout('3c')) get_sidebar('left'); ?>
<?php if (!is_cp_theme_layout('v3c,v')) { ?>
<div id="content" class="narrowcolumn">
<div class="column">
<?php } ?>
<?php if (have_posts()) : while (have_posts()) : the_post() ?> <?php if (have_posts()) : while (have_posts()) : the_post() ?>
<div class="<?php comicpress_blogpost_class(); ?>"> <div class="<?php comicpress_blogpost_class(); ?>">
@ -89,21 +64,5 @@
</div> </div>
</div> </div>
<?php <?php include(get_template_directory() . '/layout-foot.php'); ?>
if (is_cp_theme_layout('3c,v3c,gn,standard,v')) {
get_sidebar('right'); ?>
<?php } ?>
<?php if (is_cp_theme_layout('3c,v')) { ?>
<div class="clear"></div>
</div>
<?php } ?>
<?php if (is_cp_theme_layout('gn')) { ?>
</div>
<?php } ?>
<div class="clear"></div>
</div>
<div id="content-wrapper-bottom"></div>
<?php get_footer() ?> <?php get_footer() ?>

View File

@ -34,7 +34,8 @@
<?php } ?> <?php } ?>
<?php if (is_cp_theme_layout('3c,v')) { ?> <?php if (is_cp_theme_layout('3c,v')) { ?>
<div id="area-wrapper"> <div id="subcontent-wrapper-head"></div>
<div id="subcontent-wrapper">
<?php } ?> <?php } ?>
<?php get_sidebar('overblog'); ?> <?php get_sidebar('overblog'); ?>
@ -57,6 +58,11 @@
<?php } <?php }
} else { ?> } else { ?>
<?php if (is_cp_theme_layout('3c,v')) { ?>
<div id="subcontent-wrapper-head"></div>
<div id="subcontent-wrapper">
<?php } ?>
<?php get_sidebar('overblog'); ?> <?php get_sidebar('overblog'); ?>
@ -96,21 +102,5 @@ if ($disable_blog_frontpage != 'yes') {
</div> </div>
</div> </div>
<?php <?php include(get_template_directory() . '/layout-foot.php'); ?>
if (is_cp_theme_layout('3c,v3c,gn,standard,v')) {
get_sidebar('right'); ?>
<?php } ?>
<?php if (is_cp_theme_layout('3c,v')) { ?>
<div class="clear"></div>
</div>
<?php } ?>
<?php if (is_cp_theme_layout('gn')) { ?>
</div>
<?php } ?>
<div class="clear"></div>
</div>
<div id="content-wrapper-bottom"></div>
<?php get_footer() ?> <?php get_footer() ?>

22
layout-foot.php Normal file
View File

@ -0,0 +1,22 @@
<?php if (is_cp_theme_layout('v')) { ?>
</div>
<?php } ?>
<?php
if (is_cp_theme_layout('3c,v3c,gn,standard,v')) {
get_sidebar('right'); ?>
<?php } ?>
<?php if (is_cp_theme_layout('3c')) { ?>
<div class="clear"></div>
<div id="subcontent-wrapper-bottom"></div>
</div>
<?php } ?>
<?php if (is_cp_theme_layout('gn')) { ?>
</div>
<?php } ?>
<div class="clear"></div>
</div>
<div id="content-wrapper-bottom"></div>

26
layout-head.php Normal file
View File

@ -0,0 +1,26 @@
<div id="content-wrapper-top"></div>
<div id="content-wrapper">
<?php if (is_cp_theme_layout('gn,v3c')) get_sidebar('left'); ?>
<?php if (is_cp_theme_layout('gn')) { ?>
<div id="pagewrap-right">
<?php } ?>
<?php if (is_cp_theme_layout('v3c,v')) { ?>
<div id="content" class="narrowcolumn">
<div class="column">
<?php } ?>
<?php if (is_cp_theme_layout('3c,v')) { ?>
<div id="subcontent-wrapper-top"></div>
<div id="subcontent-wrapper">
<?php } ?>
<?php get_sidebar('overblog'); ?>
<?php if (is_cp_theme_layout('3c')) get_sidebar('left'); ?>
<?php if (!is_cp_theme_layout('v3c,v')) { ?>
<div id="content" class="narrowcolumn">
<div class="column">
<?php } ?>

View File

@ -4,32 +4,9 @@ Template Name: Links
*/ */
?> ?>
<?php get_header(); ?> <?php get_header(); ?>
<?php include(get_template_directory() . '/layout-head.php'); ?>
<div id="content-wrapper-top"></div> <?php
<div id="content-wrapper">
<?php if (is_cp_theme_layout('gn,v3c')) get_sidebar('left'); ?>
<?php if (is_cp_theme_layout('gn')) { ?>
<div id="pagewrap-right">
<?php } ?>
<?php if (is_cp_theme_layout('v3c,v')) { ?>
<div id="content" class="narrowcolumn">
<div class="column">
<?php } ?>
<?php if (is_cp_theme_layout('3c,v')) { ?>
<div id="area-wrapper">
<?php } ?>
<?php get_sidebar('overblog'); ?>
<?php if (is_cp_theme_layout('3c')) get_sidebar('left'); ?>
<?php if (!is_cp_theme_layout('v3c,v')) { ?>
<div id="content" class="narrowcolumn">
<div class="column">
<?php }
$bookmarks = wp_list_bookmarks('echo=0'); $bookmarks = wp_list_bookmarks('echo=0');
$bookmarks = preg_replace('#<li ([^>]*)>#', '<li>', $bookmarks); $bookmarks = preg_replace('#<li ([^>]*)>#', '<li>', $bookmarks);
$bookmarks = preg_replace('#<ul ([^>]*)>#', '<ul>', $bookmarks); $bookmarks = preg_replace('#<ul ([^>]*)>#', '<ul>', $bookmarks);
@ -53,21 +30,5 @@ Template Name: Links
</div> </div>
</div> </div>
<?php <?php include(get_template_directory() . '/layout-foot.php'); ?>
if (is_cp_theme_layout('3c,v3c,gn,standard,v')) {
get_sidebar('right'); ?>
<?php } ?>
<?php if (is_cp_theme_layout('3c,v')) { ?>
<div class="clear"></div>
</div>
<?php } ?>
<?php if (is_cp_theme_layout('gn')) { ?>
</div>
<?php } ?>
<div class="clear"></div>
</div>
<div id="content-wrapper-bottom"></div>
<?php get_footer() ?> <?php get_footer() ?>

View File

@ -1,30 +1,5 @@
<?php get_header(); ?> <?php get_header(); ?>
<?php include(get_template_directory() . '/layout-head.php'); ?>
<div id="content-wrapper-top"></div>
<div id="content-wrapper">
<?php if (is_cp_theme_layout('gn,v3c')) get_sidebar('left'); ?>
<?php if (is_cp_theme_layout('gn')) { ?>
<div id="pagewrap-right">
<?php } ?>
<?php if (is_cp_theme_layout('v3c,v')) { ?>
<div id="content" class="narrowcolumn">
<div class="column">
<?php } ?>
<?php if (is_cp_theme_layout('3c,v')) { ?>
<div id="area-wrapper">
<?php } ?>
<?php get_sidebar('overblog'); ?>
<?php if (is_cp_theme_layout('3c')) get_sidebar('left'); ?>
<?php if (!is_cp_theme_layout('v3c,v')) { ?>
<div id="content" class="narrowcolumn">
<div class="column">
<?php } ?>
<?php if (have_posts()) : while (have_posts()) : the_post() ?> <?php if (have_posts()) : while (have_posts()) : the_post() ?>
<div class="<?php comicpress_blogpost_class(); ?>"> <div class="<?php comicpress_blogpost_class(); ?>">
@ -47,22 +22,5 @@
</div> </div>
</div> </div>
<?php <?php include(get_template_directory() . '/layout-foot.php'); ?>
if (is_cp_theme_layout('3c,v3c,gn,standard,v')) {
get_sidebar('right'); ?>
<?php } ?>
<?php if (is_cp_theme_layout('3c,v')) { ?>
<div class="clear"></div>
</div>
<?php } ?>
<?php if (is_cp_theme_layout('gn')) { ?>
</div>
<?php } ?>
<div class="clear"></div>
</div>
<div id="content-wrapper-bottom"></div>
<?php get_footer() ?> <?php get_footer() ?>

View File

@ -1,30 +1,5 @@
<?php get_header(); ?> <?php get_header(); ?>
<?php include(get_template_directory() . '/layout-head.php'); ?>
<div id="content-wrapper-top"></div>
<div id="content-wrapper">
<?php if (is_cp_theme_layout('gn,v3c')) get_sidebar('left'); ?>
<?php if (is_cp_theme_layout('gn')) { ?>
<div id="pagewrap-right">
<?php } ?>
<?php if (is_cp_theme_layout('v3c,v')) { ?>
<div id="content" class="narrowcolumn">
<div class="column">
<?php } ?>
<?php if (is_cp_theme_layout('3c,v')) { ?>
<div id="area-wrapper">
<?php } ?>
<?php get_sidebar('overblog'); ?>
<?php if (is_cp_theme_layout('3c')) get_sidebar('left'); ?>
<?php if (!is_cp_theme_layout('v3c,v')) { ?>
<div id="content" class="narrowcolumn">
<div class="column">
<?php } ?>
<?php <?php
$tmp_search = new WP_Query($query_string.'&order=desc&show_posts=-1&posts_per_page=-1'); $tmp_search = new WP_Query($query_string.'&order=desc&show_posts=-1&posts_per_page=-1');
@ -127,22 +102,5 @@ $count = $tmp_search->post_count;
</div> </div>
</div> </div>
<?php <?php include(get_template_directory() . '/layout-foot.php'); ?>
if (is_cp_theme_layout('3c,v3c,gn,standard,v')) {
get_sidebar('right'); ?>
<?php } ?>
<?php if (is_cp_theme_layout('3c,v')) { ?>
<div class="clear"></div>
</div>
<?php } ?>
<?php if (is_cp_theme_layout('gn')) { ?>
</div>
<?php } ?>
<div class="clear"></div>
</div>
</div>
<div id="content-wrapper-bottom"></div>
<?php get_footer() ?> <?php get_footer() ?>

View File

@ -1,30 +1,5 @@
<?php get_header(); ?> <?php get_header(); ?>
<?php include(get_template_directory() . '/layout-head.php'); ?>
<div id="content-wrapper-top"></div>
<div id="content-wrapper">
<?php if (is_cp_theme_layout('gn,v3c')) get_sidebar('left'); ?>
<?php if (is_cp_theme_layout('gn')) { ?>
<div id="pagewrap-right">
<?php } ?>
<?php if (is_cp_theme_layout('v3c,v')) { ?>
<div id="content" class="narrowcolumn">
<div class="column">
<?php } ?>
<?php if (is_cp_theme_layout('3c,v')) { ?>
<div id="area-wrapper">
<?php } ?>
<?php get_sidebar('overblog'); ?>
<?php if (is_cp_theme_layout('3c')) get_sidebar('left'); ?>
<?php if (!is_cp_theme_layout('v3c,v')) { ?>
<div id="content" class="narrowcolumn">
<div class="column">
<?php } ?>
<?php <?php
$tmp_search = new WP_Query($query_string.'&order=desc&show_posts=-1&posts_per_page=-1'); $tmp_search = new WP_Query($query_string.'&order=desc&show_posts=-1&posts_per_page=-1');
@ -134,21 +109,5 @@ $count = $tmp_search->post_count;
</div> </div>
</div> </div>
<?php <?php include(get_template_directory() . '/layout-foot.php'); ?>
if (is_cp_theme_layout('3c,v3c,gn,standard,v')) {
get_sidebar('right'); ?>
<?php } ?>
<?php if (is_cp_theme_layout('3c,v')) { ?>
<div class="clear"></div>
</div>
<?php } ?>
<?php if (is_cp_theme_layout('gn')) { ?>
</div>
<?php } ?>
<div class="clear"></div>
</div>
<div id="content-wrapper-bottom"></div>
<?php get_footer() ?> <?php get_footer() ?>

View File

@ -28,7 +28,8 @@
<?php } endwhile; ?> <?php } endwhile; ?>
<?php if (is_cp_theme_layout('3c,v')) { ?> <?php if (is_cp_theme_layout('3c,v')) { ?>
<div id="area-wrapper"> <div id="subcontent-wrapper-top"></div>
<div id="subcontent-wrapper">
<?php } ?> <?php } ?>
<?php get_sidebar('overblog'); ?> <?php get_sidebar('overblog'); ?>
@ -76,21 +77,5 @@
</div> </div>
</div> </div>
<?php <?php include(get_template_directory() . '/layout-foot.php'); ?>
if (is_cp_theme_layout('3c,v3c,gn,standard,v')) {
get_sidebar('right'); ?>
<?php } ?>
<?php if (is_cp_theme_layout('3c,v')) { ?>
<div class="clear"></div>
</div>
<?php } ?>
<?php if (is_cp_theme_layout('gn')) { ?>
</div>
<?php } ?>
<div class="clear"></div>
</div>
<div id="content-wrapper-bottom"></div>
<?php get_footer() ?> <?php get_footer() ?>

View File

@ -68,23 +68,24 @@ body {
color: #fff; color: #fff;
} }
#page {
padding: 0 20px;
background: url('classic-background-narrow.png') top center repeat-y;
}
#page-wide { #page, #page-wide {
padding: 0 20px;
background: url('classic-background-wide.png') top center repeat-y;
}
#page-wrap {
background: #ddd; background: #ddd;
border-left: solid 1px #000; border-left: solid 1px #000;
border-right: solid 1px #000; border-right: solid 1px #000;
border-bottom: solid 1px #000; border-bottom: solid 1px #000;
} }
#page-wrap {
padding: 0 10px;
background: url('classic-background-narrow.png') top center repeat-y;
}
#page-wrap-wide {
padding: 0 10px;
background: url('classic-background-wide.png') top center repeat-y;
}
.page .narrowcolumn { padding-top: 5px; } .page .narrowcolumn { padding-top: 5px; }
#comic-head { #comic-head {

View File

@ -11,81 +11,79 @@ Author URI: http://webcomicplanet.com/
function comicpress_menubar() { function comicpress_menubar() {
global $contact_in_menubar,$enable_search_in_menubar,$enable_rss_in_menubar,$enable_navigation_in_menubar,$disable_dynamic_menubar_links, $themepack_directory; global $contact_in_menubar,$enable_search_in_menubar,$enable_rss_in_menubar,$enable_navigation_in_menubar,$disable_dynamic_menubar_links, $themepack_directory;
if (file_exists(get_template_directory() . '/'.$themepack_directory.'/menubar.php') || function_exists('suckerfish')) { if (comicpress_check_themepack_file('menubar.php') == false) {
if (function_exists('suckerfish')) { if (function_exists('suckerfish')) {
suckerfish(); suckerfish();
} else { } else { ?>
include(get_template_directory() . '/'.$themepack_directory.'/menubar.php'); <div id="menubar">
}
} else { ?> <div id="menunav">
<div id="menubar"> <?php if ($enable_search_in_menubar == 'yes') { ?>
<div class="menunav-search"><?php include(get_template_directory() . '/searchform.php'); ?></div>
<div id="menunav"> <?php } ?>
<?php if ($enable_search_in_menubar == 'yes') { ?> <?php if ($enable_rss_in_menubar == 'yes') { ?>
<div class="menunav-search"><?php include(get_template_directory() . '/searchform.php'); ?></div> <a href="<?php bloginfo('rss2_url') ?>" title="RSS Feed" class="menunav-rss">RSS</a>
<?php } ?> <?php } ?>
<?php if ($enable_rss_in_menubar == 'yes') { ?> <?php if ($enable_navigation_in_menubar == 'yes') { ?>
<a href="<?php bloginfo('rss2_url') ?>" title="RSS Feed" class="menunav-rss">RSS</a> <?php if (is_home()) {
<?php } ?> $comicFrontpage = new WP_Query(); $comicFrontpage->query('showposts=1&cat='.get_all_comic_categories_as_cat_string());
<?php if ($enable_navigation_in_menubar == 'yes') { ?> while ($comicFrontpage->have_posts()) : $comicFrontpage->the_post();
<?php if (is_home()) { global $wp_query; $wp_query->is_single = true; ?>
$comicFrontpage = new WP_Query(); $comicFrontpage->query('showposts=1&cat='.get_all_comic_categories_as_cat_string()); <div class="menunav-prev">
while ($comicFrontpage->have_posts()) : $comicFrontpage->the_post(); <?php previous_comic_link('%link', '&lsaquo;'); ?>
global $wp_query; $wp_query->is_single = true; ?> </div>
<?php $wp_query->is_single = false;
endwhile;
} elseif (is_single() & in_comic_category()) { ?>
<div class="menunav-prev"> <div class="menunav-prev">
<?php previous_comic_link('%link', '&lsaquo;'); ?> <?php previous_comic_link('%link', '&lsaquo;'); ?>
</div> </div>
<?php $wp_query->is_single = false; <div class="menunav-next">
endwhile; <?php next_comic_link('%link', '&rsaquo;'); ?>
} elseif (is_single() & in_comic_category()) { ?> </div>
<div class="menunav-prev"> <?php } ?>
<?php previous_comic_link('%link', '&lsaquo;'); ?>
</div>
<div class="menunav-next">
<?php next_comic_link('%link', '&rsaquo;'); ?>
</div>
<?php } ?> <?php } ?>
<?php } ?> </div>
</div> <?php
<?php $menulinks = wp_list_bookmarks('echo=0&title_li=&categorize=0&title_before=&title_after=&category_name=menubar');
$menulinks = wp_list_bookmarks('echo=0&title_li=&categorize=0&title_before=&title_after=&category_name=menubar'); $menulinks = preg_replace('#<li ([^>]*)>#', '<li class="page-item link">', $menulinks);
$menulinks = preg_replace('#<li ([^>]*)>#', '<li class="page-item link">', $menulinks); $menulinks = preg_replace('#<ul ([^>]*)>#', '', $menulinks);
$menulinks = preg_replace('#<ul ([^>]*)>#', '', $menulinks); $menulinks = str_replace('</ul>', '', $menulinks);
$menulinks = str_replace('</ul>', '', $menulinks); $bookmarkargs =
$bookmarkargs = $bookmarks = wp_list_bookmarks('echo=0&title_li=&categorize=1&title_before=&title_after=&exclude_name=menubar');
$bookmarks = wp_list_bookmarks('echo=0&title_li=&categorize=1&title_before=&title_after=&exclude_name=menubar'); $bookmarks = preg_replace('#<li ([^>]*)>#', '<li class="page-item link">', $bookmarks);
$bookmarks = preg_replace('#<li ([^>]*)>#', '<li class="page-item link">', $bookmarks); $bookmarks = preg_replace('#<ul ([^>]*)>#', '<ul>', $bookmarks);
$bookmarks = preg_replace('#<ul ([^>]*)>#', '<ul>', $bookmarks); $listpages = '';
$listpages = ''; if ($disable_dynamic_menubar_links != 'yes') {
if ($disable_dynamic_menubar_links != 'yes') { $listpages = wp_list_pages('echo=0&sort_column=menu_order&depth=4&title_li=');
$listpages = wp_list_pages('echo=0&sort_column=menu_order&depth=4&title_li='); }
} if (!empty($bookmarks)) {
if (!empty($bookmarks)) { $listpages = str_replace('Links</a></li>', 'Links</a>
$listpages = str_replace('Links</a></li>', 'Links</a> <ul>
<ul> '.$bookmarks.'
'.$bookmarks.' </ul>
</ul> </li>
</li> ', $listpages);
', $listpages); $listpages .= $menulinks;
$listpages .= $menulinks; } else {
} else { $listpages = str_replace('Links</a></li>', 'Links</a>
$listpages = str_replace('Links</a></li>', 'Links</a> </li>
</li> ', $listpages);
', $listpages); $listpages .= $menulinks;
$listpages .= $menulinks; }
} ?>
?> <ul id="menu">
<ul id="menu"> <li class="page_item page-item-home<?php if (is_home()) { ?> current_page_item<?php } ?>"><a href="<?php bloginfo('url'); ?>">Home</a></li>
<li class="page_item page-item-home<?php if (is_home()) { ?> current_page_item<?php } ?>"><a href="<?php bloginfo('url'); ?>">Home</a></li> <?php echo $listpages; ?>
<?php echo $listpages; ?> <?php if ($contact_in_menubar == 'yes') { ?>
<?php if ($contact_in_menubar == 'yes') { ?> <li class="page_item page-item-contact"><a href="mailto:<?php bloginfo('admin_email'); ?>">Contact</a></li>
<li class="page_item page-item-contact"><a href="mailto:<?php bloginfo('admin_email'); ?>">Contact</a></li> <?php } ?>
<?php } ?> </ul>
</ul> <div class="clear"></div>
<div class="clear"></div> </div>
</div> <?php }
<?php } }
} }
class widget_comicpress_menubar extends WP_Widget { class widget_comicpress_menubar extends WP_Widget {