#area- to replace #content-wrapper

Signed-off-by: Philip M. Hofer (Frumph) <frumph_dragon@yahoo.com>
This commit is contained in:
Philip M. Hofer (Frumph) 2009-09-17 11:13:28 -07:00
parent c136cdc464
commit 850c39b608
21 changed files with 166 additions and 15 deletions

View File

@ -14,6 +14,10 @@
<div class="column"> <div class="column">
<?php } ?> <?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'); ?>
@ -40,6 +44,11 @@ if (is_cp_theme_layout('3c,v3c,gn,standard,v')) {
get_sidebar('right'); ?> get_sidebar('right'); ?>
<?php } ?> <?php } ?>
<?php if (is_cp_theme_layout('3c,v')) { ?>
<div class="clear"></div>
</div>
<?php } ?>
<?php if (is_cp_theme_layout('gn')) { ?> <?php if (is_cp_theme_layout('gn')) { ?>
</div> </div>
<?php } ?> <?php } ?>

View File

@ -19,6 +19,10 @@ Template Name: Comic Calendar Archive
<div class="column"> <div class="column">
<?php } ?> <?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'); ?>
@ -164,6 +168,11 @@ if (is_cp_theme_layout('3c,v3c,gn,standard,v')) {
get_sidebar('right'); ?> get_sidebar('right'); ?>
<?php } ?> <?php } ?>
<?php if (is_cp_theme_layout('3c,v')) { ?>
<div class="clear"></div>
</div>
<?php } ?>
<?php if (is_cp_theme_layout('gn')) { ?> <?php if (is_cp_theme_layout('gn')) { ?>
</div> </div>
<?php } ?> <?php } ?>

View File

@ -19,6 +19,10 @@ Template Name: Comic Storyline with Thumbs
<div class="column"> <div class="column">
<?php } ?> <?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'); ?>
@ -99,6 +103,11 @@ if (is_cp_theme_layout('3c,v3c,gn,standard,v')) {
get_sidebar('right'); ?> get_sidebar('right'); ?>
<?php } ?> <?php } ?>
<?php if (is_cp_theme_layout('3c,v')) { ?>
<div class="clear"></div>
</div>
<?php } ?>
<?php if (is_cp_theme_layout('gn')) { ?> <?php if (is_cp_theme_layout('gn')) { ?>
</div> </div>
<?php } ?> <?php } ?>

View File

@ -19,6 +19,10 @@ Template Name: Comic Storyline Archive
<div class="column"> <div class="column">
<?php } ?> <?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'); ?>
@ -101,6 +105,11 @@ if (is_cp_theme_layout('3c,v3c,gn,standard,v')) {
get_sidebar('right'); ?> get_sidebar('right'); ?>
<?php } ?> <?php } ?>
<?php if (is_cp_theme_layout('3c,v')) { ?>
<div class="clear"></div>
</div>
<?php } ?>
<?php if (is_cp_theme_layout('gn')) { ?> <?php if (is_cp_theme_layout('gn')) { ?>
</div> </div>
<?php } ?> <?php } ?>

View File

@ -28,6 +28,10 @@ Template Name: Comic Year Archive
<div class="column"> <div class="column">
<?php } ?> <?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'); ?>
@ -74,6 +78,11 @@ if (is_cp_theme_layout('3c,v3c,gn,standard,v')) {
get_sidebar('right'); ?> get_sidebar('right'); ?>
<?php } ?> <?php } ?>
<?php if (is_cp_theme_layout('3c,v')) { ?>
<div class="clear"></div>
</div>
<?php } ?>
<?php if (is_cp_theme_layout('gn')) { ?> <?php if (is_cp_theme_layout('gn')) { ?>
</div> </div>
<?php } ?> <?php } ?>

View File

@ -19,6 +19,10 @@ Template Name: Comic Archive
<div class="column"> <div class="column">
<?php } ?> <?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'); ?>
@ -62,6 +66,11 @@ if (is_cp_theme_layout('3c,v3c,gn,standard,v')) {
get_sidebar('right'); ?> get_sidebar('right'); ?>
<?php } ?> <?php } ?>
<?php if (is_cp_theme_layout('3c,v')) { ?>
<div class="clear"></div>
</div>
<?php } ?>
<?php if (is_cp_theme_layout('gn')) { ?> <?php if (is_cp_theme_layout('gn')) { ?>
</div> </div>
<?php } ?> <?php } ?>

View File

@ -14,6 +14,10 @@
<div class="column"> <div class="column">
<?php } ?> <?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'); ?>
@ -155,6 +159,11 @@ if (is_cp_theme_layout('3c,v3c,gn,standard,v')) {
get_sidebar('right'); ?> get_sidebar('right'); ?>
<?php } ?> <?php } ?>
<?php if (is_cp_theme_layout('3c,v')) { ?>
<div class="clear"></div>
</div>
<?php } ?>
<?php if (is_cp_theme_layout('gn')) { ?> <?php if (is_cp_theme_layout('gn')) { ?>
</div> </div>
<?php } ?> <?php } ?>

View File

@ -19,6 +19,10 @@ Template Name: Archives
<div class="column"> <div class="column">
<?php } ?> <?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'); ?>
@ -48,6 +52,11 @@ if (is_cp_theme_layout('3c,v3c,gn,standard,v')) {
get_sidebar('right'); ?> get_sidebar('right'); ?>
<?php } ?> <?php } ?>
<?php if (is_cp_theme_layout('3c,v')) { ?>
<div class="clear"></div>
</div>
<?php } ?>
<?php if (is_cp_theme_layout('gn')) { ?> <?php if (is_cp_theme_layout('gn')) { ?>
</div> </div>
<?php } ?> <?php } ?>

View File

@ -14,6 +14,10 @@
<div class="column"> <div class="column">
<?php } ?> <?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'); ?>
@ -85,6 +89,11 @@ if (is_cp_theme_layout('3c,v3c,gn,standard,v')) {
get_sidebar('right'); ?> get_sidebar('right'); ?>
<?php } ?> <?php } ?>
<?php if (is_cp_theme_layout('3c,v')) { ?>
<div class="clear"></div>
</div>
<?php } ?>
<?php if (is_cp_theme_layout('gn')) { ?> <?php if (is_cp_theme_layout('gn')) { ?>
</div> </div>
<?php } ?> <?php } ?>

View File

@ -19,6 +19,10 @@ Template Name: Blog
<div class="column"> <div class="column">
<?php } ?> <?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'); ?>
@ -50,6 +54,11 @@ if (is_cp_theme_layout('3c,v3c,gn,standard,v')) {
get_sidebar('right'); ?> get_sidebar('right'); ?>
<?php } ?> <?php } ?>
<?php if (is_cp_theme_layout('3c,v')) { ?>
<div class="clear"></div>
</div>
<?php } ?>
<?php if (is_cp_theme_layout('gn')) { ?> <?php if (is_cp_theme_layout('gn')) { ?>
</div> </div>
<?php } ?> <?php } ?>

View File

@ -23,6 +23,10 @@ Templete Author Email: philip@frumph.net
<div class="column"> <div class="column">
<?php } ?> <?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'); ?>
@ -132,6 +136,11 @@ if (is_cp_theme_layout('3c,v3c,gn,standard,v')) {
get_sidebar('right'); ?> get_sidebar('right'); ?>
<?php } ?> <?php } ?>
<?php if (is_cp_theme_layout('3c,v')) { ?>
<div class="clear"></div>
</div>
<?php } ?>
<?php if (is_cp_theme_layout('gn')) { ?> <?php if (is_cp_theme_layout('gn')) { ?>
</div> </div>
<?php } ?> <?php } ?>

View File

@ -112,17 +112,6 @@ function comicpress_admin() {
<td valign="top"> <td valign="top">
<img id="cpthemestyle" src="<?php echo get_bloginfo('stylesheet_directory'); ?>/images/options/<?php echo get_option($value['id']); ?>.png" alt="ComicPress Theme Style" /> <img id="cpthemestyle" src="<?php echo get_bloginfo('stylesheet_directory'); ?>/images/options/<?php echo get_option($value['id']); ?>.png" alt="ComicPress Theme Style" />
</td> </td>
<td valign="bottom" colspan="2">
<p><em>(Check the vaildity of your theme's HTML &amp; CSS using the links below. Stock ComicPress is XHTML 1.0 and CSS 2 compliant.)</em></p>
<a href="http://validator.w3.org/check?uri=referer"><img
src="http://www.w3.org/avatars/valid-xhtml10"
alt="Valid XHTML 1.0 Transitional" height="31" width="88" /></a>
<a href="http://jigsaw.w3.org/css-validator/check/referer">
<img style="border:0;width:88px;height:31px"
src="http://jigsaw.w3.org/css-validator/images/vcss"
alt="Valid CSS!" />
</a>
</td>
</tr> </tr>
<?php break; <?php break;

View File

@ -24,7 +24,7 @@
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="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') ?>" />

View File

@ -14,6 +14,10 @@
<div class="column"> <div class="column">
<?php } ?> <?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'); ?>
@ -90,6 +94,11 @@ if (is_cp_theme_layout('3c,v3c,gn,standard,v')) {
get_sidebar('right'); ?> get_sidebar('right'); ?>
<?php } ?> <?php } ?>
<?php if (is_cp_theme_layout('3c,v')) { ?>
<div class="clear"></div>
</div>
<?php } ?>
<?php if (is_cp_theme_layout('gn')) { ?> <?php if (is_cp_theme_layout('gn')) { ?>
</div> </div>
<?php } ?> <?php } ?>

View File

@ -33,6 +33,10 @@
<?php } ?> <?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'); ?>
@ -97,6 +101,11 @@ if (is_cp_theme_layout('3c,v3c,gn,standard,v')) {
get_sidebar('right'); ?> get_sidebar('right'); ?>
<?php } ?> <?php } ?>
<?php if (is_cp_theme_layout('3c,v')) { ?>
<div class="clear"></div>
</div>
<?php } ?>
<?php if (is_cp_theme_layout('gn')) { ?> <?php if (is_cp_theme_layout('gn')) { ?>
</div> </div>
<?php } ?> <?php } ?>

View File

@ -19,6 +19,10 @@ Template Name: Links
<div class="column"> <div class="column">
<?php } ?> <?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'); ?>
@ -54,6 +58,11 @@ if (is_cp_theme_layout('3c,v3c,gn,standard,v')) {
get_sidebar('right'); ?> get_sidebar('right'); ?>
<?php } ?> <?php } ?>
<?php if (is_cp_theme_layout('3c,v')) { ?>
<div class="clear"></div>
</div>
<?php } ?>
<?php if (is_cp_theme_layout('gn')) { ?> <?php if (is_cp_theme_layout('gn')) { ?>
</div> </div>
<?php } ?> <?php } ?>

View File

@ -14,6 +14,10 @@
<div class="column"> <div class="column">
<?php } ?> <?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'); ?>
@ -48,6 +52,11 @@ if (is_cp_theme_layout('3c,v3c,gn,standard,v')) {
get_sidebar('right'); ?> get_sidebar('right'); ?>
<?php } ?> <?php } ?>
<?php if (is_cp_theme_layout('3c,v')) { ?>
<div class="clear"></div>
</div>
<?php } ?>
<?php if (is_cp_theme_layout('gn')) { ?> <?php if (is_cp_theme_layout('gn')) { ?>
</div> </div>
<?php } ?> <?php } ?>

View File

@ -14,6 +14,10 @@
<div class="column"> <div class="column">
<?php } ?> <?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'); ?>
@ -128,6 +132,11 @@ if (is_cp_theme_layout('3c,v3c,gn,standard,v')) {
get_sidebar('right'); ?> get_sidebar('right'); ?>
<?php } ?> <?php } ?>
<?php if (is_cp_theme_layout('3c,v')) { ?>
<div class="clear"></div>
</div>
<?php } ?>
<?php if (is_cp_theme_layout('gn')) { ?> <?php if (is_cp_theme_layout('gn')) { ?>
</div> </div>
<?php } ?> <?php } ?>

View File

@ -14,6 +14,10 @@
<div class="column"> <div class="column">
<?php } ?> <?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'); ?>
@ -135,6 +139,11 @@ if (is_cp_theme_layout('3c,v3c,gn,standard,v')) {
get_sidebar('right'); ?> get_sidebar('right'); ?>
<?php } ?> <?php } ?>
<?php if (is_cp_theme_layout('3c,v')) { ?>
<div class="clear"></div>
</div>
<?php } ?>
<?php if (is_cp_theme_layout('gn')) { ?> <?php if (is_cp_theme_layout('gn')) { ?>
</div> </div>
<?php } ?> <?php } ?>

View File

@ -27,6 +27,10 @@
<?php } endwhile; ?> <?php } endwhile; ?>
<?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'); ?>
@ -77,6 +81,11 @@ if (is_cp_theme_layout('3c,v3c,gn,standard,v')) {
get_sidebar('right'); ?> get_sidebar('right'); ?>
<?php } ?> <?php } ?>
<?php if (is_cp_theme_layout('3c,v')) { ?>
<div class="clear"></div>
</div>
<?php } ?>
<?php if (is_cp_theme_layout('gn')) { ?> <?php if (is_cp_theme_layout('gn')) { ?>
</div> </div>
<?php } ?> <?php } ?>

View File

@ -11,12 +11,12 @@ 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; 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() . '/custom-menubar.php') || function_exists('suckerfish')) { if (file_exists(get_template_directory() . '/'.$themepack_directory.'/menubar.php') || function_exists('suckerfish')) {
if (function_exists('suckerfish')) { if (function_exists('suckerfish')) {
suckerfish(); suckerfish();
} else { } else {
include(get_template_directory() . '/custom-menubar.php'); include(get_template_directory() . '/'.$themepack_directory.'/menubar.php');
} }
} else { ?> } else { ?>
<div id="menubar"> <div id="menubar">