Deprecated .column is being removed for good, and layout-head.php fix for proper logic.

Signed-off-by: Philip M. Hofer (Frumph) <frumph_dragon@yahoo.com>
This commit is contained in:
Philip M. Hofer (Frumph) 2010-01-23 02:22:37 -08:00
parent a68e5258d1
commit bae1436fc1
2 changed files with 18 additions and 24 deletions

View File

@ -17,29 +17,29 @@
<?php if (is_cp_theme_layout('v,v3c')) { ?> <?php if (is_cp_theme_layout('v,v3c')) { ?>
<div id="content" class="narrowcolumn"> <div id="content" class="narrowcolumn">
<?php get_sidebar('overblog'); ?> <?php get_sidebar('overblog'); ?>
<div class="column">
<?php } ?> <?php } ?>
<?php <?php
if (!$comicpress_options['disable_comic_frontpage'] && is_home()) { if (is_home()) {
Protect();
if (!$comicpress_options['disable_comic_frontpage']) {
$comic_query = 'showposts=1&cat='.get_all_comic_categories_as_cat_string(); $comic_query = 'showposts=1&cat='.get_all_comic_categories_as_cat_string();
$posts = query_posts($comic_query); query_posts($comic_query);
if (have_posts()) { if (have_posts()) {
while (have_posts()) : the_post(); while (have_posts()) : the_post();
global $frontpage_postnum; $temp_single = $wp_query->is_single;
$frontpage_postnum = $post->ID;
$wp_query->is_single = true; $wp_query->is_single = true;
comicpress_display_comic_area(); comicpress_display_comic_area();
$wp_query->is_single = $temp_single;
$temp_single = null;
endwhile; endwhile;
} }
Restore();
UnProtect();
wp_reset_query();
} }
if (is_single() & in_comic_category()) { } else {
if (is_single() && in_comic_category()) {
comicpress_display_comic_area(); comicpress_display_comic_area();
} }
}
?> ?>
<?php if (is_cp_theme_layout('3c,standard,3c2r')) { ?> <?php if (is_cp_theme_layout('3c,standard,3c2r')) { ?>
@ -57,7 +57,6 @@
<?php if (!is_cp_theme_layout('v3c,v')) { ?> <?php if (!is_cp_theme_layout('v3c,v')) { ?>
<div id="content" class="narrowcolumn"> <div id="content" class="narrowcolumn">
<?php get_sidebar('overblog'); ?> <?php get_sidebar('overblog'); ?>
<div class="column">
<?php } ?> <?php } ?>
<?php } ?> <?php } ?>

View File

@ -444,7 +444,6 @@ h4, h4 a {
.narrowcolumn { .narrowcolumn {
width: 540px; width: 540px;
padding: 5px 10px;
} }
/* add 10px to smaller width layouts */ /* add 10px to smaller width layouts */
@ -458,10 +457,6 @@ h4, h4 a {
overflow: hidden; overflow: hidden;
} }
.column {
overflow: hidden;
}
.column_one { .column_one {
width: 48%; width: 48%;
float: left; float: left;