moved the customsidebar class in sidebars up one level into the div id for the sidebar, all -bottom and -top's are now -head & -foot, bunch of CSS cleanups. 2.8.1.34

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

Signed-off-by: Philip M. Hofer (Frumph) <frumph_dragon@yahoo.com>
This commit is contained in:
Philip M. Hofer (Frumph) 2009-11-04 03:09:56 -08:00
parent 89652293ff
commit 8a0239ec40
29 changed files with 289 additions and 281 deletions

View File

@ -1,15 +1,15 @@
<?php get_header(); global $category_thumbnail_postcount; ?> <?php
<?php remove_filter('pre_get_posts','comicpress_members_filter'); ?> get_header(); global $category_thumbnail_postcount;
<?php include(get_template_directory() . '/layout-head.php'); ?> remove_filter('pre_get_posts','comicpress_members_filter');
include(get_template_directory() . '/layout-head.php');
<?php
global $archive_display_order; global $archive_display_order;
if (empty($archive_display_order)) $archive_display_order = 'desc'; if (empty($archive_display_order)) $archive_display_order = 'desc';
$tmp_search = new WP_Query($query_string.'&order='.$archive_display_order.'&show_posts=-1&posts_per_page=-1'); $tmp_search = new WP_Query($query_string.'&order='.$archive_display_order.'&show_posts=-1&posts_per_page=-1');
$count = $tmp_search->post_count; $count = $tmp_search->post_count;
?>
<?php if (!$count) $count = "no"; ?> if (!$count) $count = "no";
<div class="searchresults">Found <?php echo $count; ?> result<?php if ($count !== 1) { echo "s"; } ?>.</div> ?>
<?php if (have_posts()) : ?> <?php if (have_posts()) : ?>
<?php <?php
@ -21,23 +21,25 @@
<div class="<?php comicpress_post_class(); ?>"> <div class="<?php comicpress_post_class(); ?>">
<div class="post-page-head"></div> <div class="post-page-head"></div>
<div class="post-page"> <div class="post-page">
<div class="content">
<?php $post = $posts[0]; // Hack. Set $post so that the_date() works. ?> <?php $post = $posts[0]; // Hack. Set $post so that the_date() works. ?>
<?php /* Category Archive */ if (is_category()) { ?> <?php /* Category Archive */ if (is_category()) { ?>
<div class="content"><h2 class="pagetitle"><?php _e('Archive for &#8216;','comicpress'); ?><?php single_cat_title() ?>&#8217;</h2></div> <h2 class="pagetitle"><?php _e('Archive for &#8216;','comicpress'); ?><?php single_cat_title() ?>&#8217;</h2>
<?php /* Tag Archive */ } elseif( is_tag() ) { ?> <?php /* Tag Archive */ } elseif( is_tag() ) { ?>
<div class="content"><h2 class="pagetitle"><?php _e('Posts Tagged &#8216;','comicpress'); ?><?php single_tag_title() ?>&#8217;</h2></div> <h2 class="pagetitle"><?php _e('Posts Tagged &#8216;','comicpress'); ?><?php single_tag_title() ?>&#8217;</h2>
<?php /* Daily Archive */ } elseif (is_day()) { ?> <?php /* Daily Archive */ } elseif (is_day()) { ?>
<div class="content"><h2 class="pagetitle"><?php _e('Archive for','comicpress'); ?> <?php the_time('F jS, Y') ?></h2></div> <h2 class="pagetitle"><?php _e('Archive for','comicpress'); ?> <?php the_time('F jS, Y') ?></h2>
<?php /* Monthly Archive */ } elseif (is_month()) { ?> <?php /* Monthly Archive */ } elseif (is_month()) { ?>
<div class="content"><h2 class="pagetitle"><?php _e('Archive for','comicpress'); ?> <?php the_time('F, Y') ?></h2></div> <h2 class="pagetitle"><?php _e('Archive for','comicpress'); ?> <?php the_time('F, Y') ?></h2>
<?php /* Yearly Archive */ } elseif (is_year()) { ?> <?php /* Yearly Archive */ } elseif (is_year()) { ?>
<div class="content"><h2 class="pagetitle"><?php _e('Archive for','comicpress'); ?> <?php the_time('Y') ?></h2></div> <h2 class="pagetitle"><?php _e('Archive for','comicpress'); ?> <?php the_time('Y') ?></h2>
<?php /* Author Archive */ } elseif (is_author()) { ?> <?php /* Author Archive */ } elseif (is_author()) { ?>
<div class="content"><h2 class="pagetitle"><?php _e('Author Archive','comicpress'); ?></h2></div> <h2 class="pagetitle"><?php _e('Author Archive','comicpress'); ?></h2>
<?php /* Paged Archive */ } elseif (isset($_GET['paged']) && !empty($_GET['paged'])) { ?> <?php /* Paged Archive */ } elseif (isset($_GET['paged']) && !empty($_GET['paged'])) { ?>
<div class="content"><h2 class="pagetitle"><?php _e('Archives','comicpress'); ?></h2></div> <h2 class="pagetitle"><?php _e('Archives','comicpress'); ?></h2>
<?php } ?> <?php } ?>
<div class="searchresults"><?php printf(__ngettext("%d item.", "%d items.", $count,'comicpress'),$count); ?></div>
</div>
<br class="clear-margins" /> <br class="clear-margins" />
</div> </div>
<div class="post-page-foot"></div> <div class="post-page-foot"></div>

View File

@ -34,26 +34,6 @@ if ( post_password_required() ) { ?>
}?> }?>
</ol> </ol>
<?php endif; ?> <?php endif; ?>
<?php if ( ! empty($comments_by_type['pings']) ) : ?>
<h4 id="comments"><?php _e('Pings & Trackbacks &not;','comicpress'); ?></h4>
<ol class="commentlist">
<ul>
<?php
if (function_exists('comicpress_comments_callback')) {
wp_list_comments(array(
'type' => 'pings',
'callback' => 'comicpress_comments_callback',
'end-callback' => 'comicpress_comments_end_callback',
'avatar_size'=>32
)
);
} else {
wp_list_comments(array('type' => 'pings', 'avatar_size'=>64));
}?>
</ul>
</ol>
<?php endif; ?>
<?php global $enable_numbered_pagination; if ($enable_numbered_pagination == 'yes') { ?> <?php global $enable_numbered_pagination; if ($enable_numbered_pagination == 'yes') { ?>
<?php <?php
@ -84,11 +64,6 @@ if ( post_password_required() ) { ?>
<?php if ('open' == $post->comment_status) : ?> <?php if ('open' == $post->comment_status) : ?>
<!-- If comments are open, but there are no comments. --> <!-- If comments are open, but there are no comments. -->
<?php else : // comments are closed ?> <?php else : // comments are closed ?>
<!-- If comments are closed. --> <!-- If comments are closed. -->
<p class="nocomments"><?php _e('Comments are closed.','comicpress'); ?></p> <p class="nocomments"><?php _e('Comments are closed.','comicpress'); ?></p>
@ -133,5 +108,27 @@ if ( post_password_required() ) { ?>
</div> </div>
<?php endif; ?> <?php endif; ?>
<?php if ( ! empty($comments_by_type['pings']) ) : ?>
<h4 id="comments"><?php _e('Pings & Trackbacks &not;','comicpress'); ?></h4>
<ol class="commentlist">
<ul>
<?php
if (function_exists('comicpress_comments_callback')) {
wp_list_comments(array(
'type' => 'pings',
'callback' => 'comicpress_comments_callback',
'end-callback' => 'comicpress_comments_end_callback',
'avatar_size'=>32
)
);
} else {
wp_list_comments(array('type' => 'pings', 'avatar_size'=>64));
}?>
</ul>
</ol>
<?php endif; ?>
</div> </div>
<div id="comment-wrapper-foot"></div> <div id="comment-wrapper-foot"></div>

View File

@ -16,7 +16,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.33'; $comicpress_version = '2.8.1.34';
global $wpmu_version; global $wpmu_version;
if (!empty($wpmu_version)) { if (!empty($wpmu_version)) {

View File

@ -78,9 +78,9 @@ function comicpress_get_avatar( $id_or_email, $size = '64', $alt = false) {
if ( !empty( $rating ) ) if ( !empty( $rating ) )
$out .= "&amp;r={$rating}"; $out .= "&amp;r={$rating}";
$avatar = "<img alt='{$safe_alt}' src='{$out}' class='avatar avatar-{$size} photo instant nocorner itxtalt' height='{$size}' width='{$size}' title='{$safe_alt}' />"; $avatar = "<img alt='{$safe_alt}' src='{$out}' class='avatar avatar-{$size} photo instant nocorner itxtalt' height='{$size}' width='{$size}' />";
} else { } else {
$avatar = "<img alt='{$safe_alt}' src='{$default}' class='avatar avatar-{$size} photo avatar-default instant nocorner itxtalt' height='{$size}' width='{$size}' title='{$safe_alt}' />"; $avatar = "<img alt='{$safe_alt}' src='{$default}' class='avatar avatar-{$size} photo avatar-default instant nocorner itxtalt' height='{$size}' width='{$size}' />";
} }
return apply_filters('comicpress_get_avatar', $avatar, $id_or_email, $size, $default, $alt); return apply_filters('comicpress_get_avatar', $avatar, $id_or_email, $size, $default, $alt);

View File

@ -21,32 +21,33 @@ function display_blog_post() {
<div class="<?php comicpress_post_class(); ?>"> <div class="<?php comicpress_post_class(); ?>">
<div class="post-head"></div> <div class="post-head"></div>
<div <?php post_class(); ?> id="post-<?php the_ID() ?>"> <div <?php post_class(); ?> id="post-<?php the_ID() ?>">
<div class="post-info"> <div class="post-info">
<?php if ($enable_post_author_gravatar == 'yes') { ?> <?php if ($enable_post_author_gravatar == 'yes') { ?>
<div class="post-author-gravatar"><?php echo str_replace("alt='", "alt='".get_the_author_meta('display_name')."' title='".get_the_author_meta('display_name'),comicpress_get_avatar(get_the_author_meta('email'), 64)); ?></div> <div class="post-author-gravatar"><?php echo str_replace("alt='", "alt='".get_the_author_meta('display_name')."' title='".get_the_author_meta('display_name'),comicpress_get_avatar(get_the_author_meta('email'), 64)); ?></div>
<?php } ?> <?php } ?>
<?php if (function_exists('comicpress_show_mood_in_post')) comicpress_show_mood_in_post(); ?> <?php if (function_exists('comicpress_show_mood_in_post')) comicpress_show_mood_in_post(); ?>
<?php if ($enable_post_calendar == 'yes') { ?> <?php if ($enable_post_calendar == 'yes') { ?>
<div class="post-date"> <div class="post-date">
<div class="date"><span><?php the_time('M') ?></span> <?php the_time('d') ?></div> <div class="date"><span><?php the_time('M') ?></span> <?php the_time('d') ?></div>
</div>
<?php } ?>
<div class="post-text">
<h2><a href="<?php the_permalink(); ?>" rel="bookmark" title="Permanent Link to <?php the_title(); ?>"><?php the_title(); ?></a></h2>
<div class="post-author"> By <?php the_author_posts_link(); ?> on <?php the_time('F jS, Y'); ?></div>
<?php if ($disable_categories_in_posts != 'yes') { ?>
<div class="post-cat"><?php _e('Posted In:','comicpress'); ?> <?php the_category(','); ?></div>
<?php } ?>
<div class="post-edit"><?php edit_post_link(__('Edit Post','comicpress'), ' [ ', ' ] '); ?></div>
<?php if(function_exists('the_ratings')) { the_ratings(); } ?>
</div> </div>
<?php } ?> <div class="clear"></div>
<div class="post-text">
<h2><a href="<?php the_permalink(); ?>" rel="bookmark" title="Permanent Link to <?php the_title(); ?>"><?php the_title(); ?></a></h2>
<div class="post-author"> By <?php the_author_posts_link(); ?> on <?php the_time('F jS, Y'); ?></div>
<?php if ($disable_categories_in_posts != 'yes') { ?>
<div class="post-cat"><?php _e('Posted In:','comicpress'); ?> <?php the_category(','); ?></div>
<?php } ?>
<div class="post-edit"><?php edit_post_link(__('Edit Post','comicpress'), ' [ ', ' ] '); ?></div>
<?php if(function_exists('the_ratings')) { the_ratings(); } ?>
</div>
<div class="clear"></div>
</div> </div>
<div class="entry"> <div class="entry">
<?php if (!is_single()) { global $more; $more = 0; } ?> <?php if (!is_single()) { global $more; $more = 0; } ?>
<?php the_content(__('&darr; Read the rest of this entry...','comicpress')); ?> <?php the_content(__('&darr; Read the rest of this entry...','comicpress')); ?>
<?php if (is_single()) wp_link_pages(array('before' => '<div class="linkpages"><span class="linkpages-pagetext">Pages:</span> ', 'after' => '</div>', 'next_or_number' => 'number')); ?> <?php if (is_single()) wp_link_pages(array('before' => '<div class="linkpages"><span class="linkpages-pagetext">Pages:</span> ', 'after' => '</div>', 'next_or_number' => 'number')); ?>
</div> </div>
<br class="clear-margins" />
<div class="post-extras"> <div class="post-extras">
<?php if ($disable_tags_in_posts != 'yes') { ?> <?php if ($disable_tags_in_posts != 'yes') { ?>
<div class="post-tags"> <div class="post-tags">

View File

@ -7,70 +7,125 @@
*/ */
function display_comic_post() { function display_comic_post() {
if (comicpress_check_themepack_file('displaycomicpost') == false) {
global $post, $wp_query, $authordata, $enable_related_comics, $enable_comic_post_author_gravatar, $enable_comic_post_calendar, $themepack_directory, $disable_categories_in_posts, $disable_tags_in_posts; ?>
<div class="<?php comicpress_post_class(); ?>">
<div class="post-comic-head"></div>
<div <?php post_class(); ?> id="post-comic-<?php the_ID() ?>">
<div class="post-comic-info">
<?php if ($enable_comic_post_author_gravatar == 'yes') { ?>
<div class="post-comic-author-gravatar"><?php echo str_replace("alt='", "alt='".get_the_author_meta('display_name')."' title='".get_the_author_meta('display_name'),comicpress_get_avatar(get_the_author_meta('email'), 64)); ?></div>
<?php } ?>
<?php if (function_exists('comicpress_show_mood_in_post')) comicpress_show_mood_in_post(); ?>
<?php if ($enable_comic_post_calendar == 'yes') { ?>
<div class="post-comic-date">
<div class="date"><span><?php the_time('M') ?></span> <?php the_time('d') ?></div>
</div>
<?php } ?>
<div class="post-comic-text">
<h2><a href="<?php the_permalink(); ?>" rel="bookmark" title="Permanent Link to <?php the_title(); ?>"><?php the_title(); ?></a></h2>
<div class="post-comic-author"> By <?php the_author_posts_link(); ?> on <?php the_time('F jS, Y'); ?></div>
<?php if (get_option('comicpress-enable-storyline-support') == 1) { ?>
<ul class="storyline-cats"><li class="storyline-root"><?php the_category(' &raquo; </li><li>', multiple) ?></li></ul>
<?php } else { ?>
<?php if ($disable_categories_in_posts != 'yes') { ?>
<div class="post-comic-cat"><?php _e('Posted In:','comicpress'); ?> <?php the_category(','); ?></div>
<?php } ?>
<?php } ?>
<div class="post-comic-edit"><?php edit_post_link(__('Edit Post','comicpress'), ' [ ', ' ] '); ?></div>
<?php if(function_exists('the_ratings')) { the_ratings(); } ?>
</div>
<br class="clear-margins" />
</div>
<div class="entry">
<?php if (!is_single()) { global $more; $more = 0; } ?>
<?php the_content(__('&darr; Read the rest of this entry...','comicpress')); ?>
<?php if (is_single()) wp_link_pages(array('before' => '<div class="linkpages"><span class="linkpages-pagetext">Pages:</span> ', 'after' => '</div>', 'next_or_number' => 'number')); ?>
</div>
<div class="post-comic-extras">
<?php if ($disable_tags_in_posts != 'yes') { ?>
<div class="post-comic-tags">
<?php the_tags(__('&#9492; Tags: ','comicpress'), ', ', '<br />'); ?>
</div>
<?php } ?>
<?php
if ($post->comment_status == 'open') {
if (comicpress_check_themepack_file('commentlink') == false) { ?>
<div class="comment-link"><?php comments_popup_link('<span class="comment-balloon comment-balloon-empty">&nbsp;</span> '.__('No Comments ','comicpress'), '<span class="comment-balloon">1</span> '.__('Comment ','comicpress'), '<span class="comment-balloon">%</span> '.__('Comments ','comicpress')); ?></div>
<?php }
}
?>
<div class="clear"></div>
<?php if ($enable_related_comics == 'yes') echo related_comics_shortcode(); ?>
</div>
<br class="clear-margins" />
</div>
<div class="post-comic-foot"></div>
</div>
<?php
}
}
function display_comic_post2() {
if (comicpress_check_themepack_file('displaycomicpost') == false) { if (comicpress_check_themepack_file('displaycomicpost') == false) {
global $post, $wp_query, $transcript_in_posts, $enable_related_comics, $enable_comic_post_author_gravatar, $enable_comic_post_calendar, $disable_categories_in_posts, $disable_tags_in_posts, $themepack_directory; global $post, $wp_query, $transcript_in_posts, $enable_related_comics, $enable_comic_post_author_gravatar, $enable_comic_post_calendar, $disable_categories_in_posts, $disable_tags_in_posts, $themepack_directory;
$first_comic = get_first_comic_permalink(); $last_comic = get_last_comic_permalink(); $first_comic = get_first_comic_permalink(); $last_comic = get_last_comic_permalink();
?> ?>
<div class="nav">
<?php if ( get_permalink() != $first_comic ) { ?><div class="nav-first"><a href="<?php echo $first_comic ?>"><?php _e('&lsaquo;&lsaquo; First','comicpress'); ?></a></div><?php } ?>
<div class="nav-previous"><?php $temp_query = $wp_query->is_single; $wp_query->is_single = true; previous_comic_link('%link', __('&lsaquo; Previous','comicpress')); $wp_query->is_single = $temp_query;$temp_query = null; ?></div>
<div class="nav-next"><?php next_comic_link('%link', __('Next &rsaquo;','comicpress')) ?></div>
<?php if ( get_permalink() != $last_comic ) { ?><div class="nav-last"><a href="<?php echo $last_comic ?>"><?php _e('Last &rsaquo;&rsaquo;','comicpress'); ?></a></div><?php } ?>
</div>
<div class="clear"></div>
<div class="<?php comicpress_post_class(); ?>"> <div class="<?php comicpress_post_class(); ?>">
<div class="post-comic-head"></div> <div class="post-comic-comic-head"></div>
<div class="post-comic"> <div class="post-comic-comic">
<div class="post-info"> <div class="post-comic-info">
<?php if ($enable_comic_post_author_gravatar == 'yes') { ?> <?php if ($enable_comic_post_author_gravatar == 'yes') { ?>
<div class="post-author-gravatar"><?php echo str_replace("alt='", "alt='".get_the_author_meta('display_name')."' title='".get_the_author_meta('display_name'),comicpress_get_avatar(get_the_author_meta('email'), 64)); ?></div> <div class="post-comic-author-gravatar"><?php echo str_replace("alt='", "alt='".get_the_author_meta('display_name')."' title='".get_the_author_meta('display_name'),comicpress_get_avatar(get_the_author_meta('email'), 64)); ?></div>
<?php } ?> <?php } ?>
<?php if (function_exists('comicpress_show_mood_in_post')) comicpress_show_mood_in_post(); ?> <?php if (function_exists('comicpress_show_mood_in_post')) comicpress_show_mood_in_post(); ?>
<?php if ($enable_comic_post_calendar == 'yes') { ?> <?php if ($enable_comic_post_calendar == 'yes') { ?>
<div class="post-date"> <div class="post-comic-date">
<div class="date"><span><?php the_time('M') ?></span> <?php the_time('d') ?></div> <div class="date"><span><?php the_time('M') ?></span> <?php the_time('d') ?></div>
</div> </div>
<?php } ?> <?php } ?>
<div class="post-text"> <div class="post-comic-text">
<h2><a href="<?php the_permalink(); ?>" rel="bookmark" title="Permanent Link to <?php the_title(); ?>"><?php the_title(); ?></a></h2> <h2><a href="<?php the_permalink(); ?>" rel="bookmark" title="Permanent Link to <?php the_title(); ?>"><?php the_title(); ?></a></h2>
<div class="post-author"> By <?php the_author_posts_link(); ?> on <?php the_time('F jS, Y'); ?></div> <div class="post-comic-author"> By <?php the_author_posts_link(); ?> on <?php the_time('F jS, Y'); ?></div>
<?php if (get_option('comicpress-enable-storyline-support') == 1) { ?> <?php if (get_option('comicpress-enable-storyline-support') == 1) { ?>
<ul class="storyline-cats"><li class="storyline-root"><?php the_category(' &raquo; </li><li>', multiple) ?></li></ul> <ul class="storyline-cats"><li class="storyline-root"><?php the_category(' &raquo; </li><li>', multiple) ?></li></ul>
<?php } else { ?> <?php } else { ?>
<?php if ($disable_categories_in_posts != 'yes') { ?> <?php if ($disable_categories_in_posts != 'yes') { ?>
<div class="post-cat"><?php _e('Posted In:','comicpress'); ?> <?php the_category(','); ?></div> <div class="post-comic-cat"><?php _e('Posted In:','comicpress'); ?> <?php the_category(','); ?></div>
<?php } ?> <?php } ?>
<?php } ?> <?php } ?>
<div class="post-edit"><?php edit_post_link(__('Edit Post','comicpress'), ' [ ', ' ] '); ?></div> <div class="post-comic-edit"><?php edit_post_link(__('Edit Post','comicpress'), ' [ ', ' ] '); ?></div>
<?php if(function_exists('the_ratings')) { the_ratings(); } ?> <?php if(function_exists('the_ratings')) { the_ratings(); } ?>
</div> </div>
<div class="clear"></div> <div class="clear"></div>
</div> </div>
<div class="entry"> <div class="entry">
<?php if (!is_single()) { global $more; $more = 0; } ?> <?php if (!is_single()) { global $more; $more = 0; } ?>
<?php the_content(__('&darr; Read the rest of this entry...','comicpress')); ?> <?php the_content(__('&darr; Read the rest of this entry...','comicpress')); ?>
<?php if (is_single()) wp_link_pages(array('before' => '<div class="linkpages"><span class="linkpages-pagetext">Pages:</span> ', 'after' => '</div>', 'next_or_number' => 'number')); ?> <?php if (is_single()) wp_link_pages(array('before' => '<div class="linkpages"><span class="linkpages-pagetext">Pages:</span> ', 'after' => '</div>', 'next_or_number' => 'number')); ?>
</div> </div>
<?php if ($transcript_in_posts == 'yes') the_transcript('styled'); ?> <br class="clear-margins" />
<div class="post-extras"> <?php if ($transcript_in_posts == 'yes') the_transcript('styled'); ?>
<?php if ($disable_tags_in_posts != 'yes') { ?> <div class="post-comic-extras">
<div class="post-tags"> <?php if ($disable_tags_in_posts != 'yes') { ?>
<?php the_tags(__('&#9492; Tags: ','comicpress'), ', ', '<br />'); ?> <div class="post-comic-tags">
</div> <?php the_tags(__('&#9492; Tags: ','comicpress'), ', ', '<br />'); ?>
<?php } ?> </div>
<?php <?php } ?>
if ('open' == $post->comment_status) { <?php
if (comicpress_check_themepack_file('commentlink') == false) { ?> if ('open' == $post->comment_status) {
<div class="comment-link"><?php comments_popup_link('<span class="comment-balloon comment-balloon-empty">&nbsp;</span> '.__('No Comments ','comicpress'), '<span class="comment-balloon">1</span> '.__('Comment ','comicpress'), '<span class="comment-balloon">%</span> '.__('Comments ','comicpress')); ?></div> if (comicpress_check_themepack_file('commentlink') == false) { ?>
<?php } <div class="comment-link"><?php comments_popup_link('<span class="comment-balloon comment-balloon-empty">&nbsp;</span> '.__('No Comments ','comicpress'), '<span class="comment-balloon">1</span> '.__('Comment ','comicpress'), '<span class="comment-balloon">%</span> '.__('Comments ','comicpress')); ?></div>
} <?php }
?> }
<div class="clear"></div> ?>
<?php if ($enable_related_comics == 'yes') echo related_comics_shortcode(); ?> <div class="clear"></div>
</div> <?php if ($enable_related_comics == 'yes') echo related_comics_shortcode(); ?>
<br class="clear-margins" /> </div>
</div> <br class="clear-margins" />
<div class="post-comic-foot"></div> </div>
<div class="post-comic-comic-foot"></div>
</div> </div>
<?php <?php

View File

@ -1,6 +1,6 @@
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Frameset//EN" "http://www.w3.org/TR/html4/frameset.dtd"> <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html> <html xmlns="http://www.w3.org/1999/xhtml" <?php language_attributes(); ?>>
<head <?php language_attributes() ?>> <head>
<title><?php <title><?php
bloginfo('name'); bloginfo('name');
if (is_home () ) { if (is_home () ) {

View File

@ -3,29 +3,30 @@ Author: Tyler Martin
Style: Default Style: Default
*/ */
#comic_navi_wrapper { #comic_navi_wrapper {
width: 100%; text-align: center;
height: 25px;
background: black;
} }
#comic_navi { .comic_navi {
padding: 0; width: 100%;
margin: 0; background: #000;
margin: 0 auto;
list-style: none; list-style: none;
float: left;
line-height: 25px; line-height: 25px;
font-size: 13px; font-size: 13px;
display: inline-block;
} }
.navi-comictitle { .navi-comictitle {
padding: 0px 10px;
text-align: center; text-align: center;
} }
.navi { .navi {
padding: 0 10px;
color: #fff;
} }
.navi a { .navi a {
padding: 0px 10px 0 10px;
display: block; display: block;
color: #fff; color: #fff;
text-decoration: none; text-decoration: none;
@ -37,15 +38,19 @@ Style: Default
} }
.navi-first { .navi-first {
float: left;
} }
.navi-prevchap, .navi-story_prev { .navi-prevchap, .navi-story_prev {
float: left;
} }
.navi-story_prev_in { .navi-story_prev_in {
float: left;
} }
.navi-prev, .navi-previous { .navi-prev, .navi-previous {
float: left;
} }
@ -75,20 +80,29 @@ Style: Default
a.navi-comments span:hover { a.navi-comments span:hover {
} }
.navi-comments-count {
padding-right: 4px;
}
.navi-next { .navi-next {
float: left;
} }
.navi-nextchap, .navi-story_next { .navi-nextchap, .navi-story_next {
float: left;
} }
.navi-story_next_in { .navi-story_next_in {
float: left;
} }
.navi-last { .navi-last {
float: left;
} }
.navi-void, .navi-void:hover { .navi-void, .navi-void:hover {
color: #555;
} }
.comic-left .navi-prev, .comic-right .navi-prev, .comic-left .navi-next, .comic-right .navi-next { .comic-left .navi-prev, .comic-right .navi-prev, .comic-left .navi-next, .comic-right .navi-next {

View File

@ -58,6 +58,8 @@
</div> </div>
<?php } <?php }
get_sidebar('blog');
if ($disable_comic_frontpage != 'yes' && $disable_comic_blog_frontpage != 'yes' && !is_paged() ) { ?> if ($disable_comic_frontpage != 'yes' && $disable_comic_blog_frontpage != 'yes' && !is_paged() ) { ?>
<?php while ($comicFrontpage->have_posts()) : $comicFrontpage->the_post(); <?php while ($comicFrontpage->have_posts()) : $comicFrontpage->the_post();
display_comic_post(); display_comic_post();
@ -70,10 +72,6 @@ if ($disable_comic_frontpage != 'yes' && $disable_comic_blog_frontpage != 'yes'
<div id="blogheader"><!-- This area can be used for a heading above your main page blog posts --></div> <div id="blogheader"><!-- This area can be used for a heading above your main page blog posts --></div>
<?php } ?> <?php } ?>
<?php get_sidebar('blog'); ?>
<?php if ($disable_blog_frontpage != 'yes') { <?php if ($disable_blog_frontpage != 'yes') {
global $blog_postcount; ?> global $blog_postcount; ?>
<?php <?php

View File

@ -7,9 +7,8 @@ $tmp_search = new WP_Query($query_string.'&order=desc&show_posts=-1&posts_per_pa
$count = $tmp_search->post_count; $count = $tmp_search->post_count;
?> ?>
<?php if (!$count) $count = "no"; ?> <?php if (!$count) $count = "no"; ?>
<div class="searchresults"><?php printf(__ngettext("Found %d result.", "Found %d results.", $count,'comicpress'),$count); ?></div>
<h2 class="pagetitle"><?php _e('Transcript search for &lsquo;','comicpress'); ?><?php the_search_query() ?><?php _e('&rsquo;','comicpress'); ?></h2> <h2 class="pagetitle"><?php _e('Transcript search for &lsquo;','comicpress'); ?><?php the_search_query() ?><?php _e('&rsquo;','comicpress'); ?></h2>
<div class="searchresults"><?php printf(__ngettext("%d item.", "%d items.", $count,'comicpress'),$count); ?></div>
<?php if (have_posts()) : ?> <?php if (have_posts()) : ?>
<?php $posts = query_posts($query_string.'&order=asc'); <?php $posts = query_posts($query_string.'&order=asc');

View File

@ -8,9 +8,9 @@ $count = $tmp_search->post_count;
?> ?>
<?php if (!$count) $count = "no"; ?> <?php if (!$count) $count = "no"; ?>
<div class="searchresults"><?php printf(__ngettext("Found %d result.", "Found %d results.", $count,'comicpress'),$count); ?></div>
<h2 class="pagetitle"><?php _e('Search for &lsquo;','comicpress'); the_search_query(); _e('&rsquo;','comicpress'); ?></h2> <h2 class="pagetitle"><?php _e('Search for &lsquo;','comicpress'); the_search_query(); _e('&rsquo;','comicpress'); ?></h2>
<div class="searchresults"><?php printf(__ngettext("%d item.", "%d items.", $count,'comicpress'),$count); ?></div>
<?php if (have_posts()) : ?> <?php if (have_posts()) : ?>
<?php $posts = query_posts($query_string.'&order=asc'); <?php $posts = query_posts($query_string.'&order=asc');

View File

@ -1,7 +1,5 @@
<?php if (comicpress_is_active_sidebar('Above Header')) { ?> <?php if (comicpress_is_active_sidebar('Above Header')) { ?>
<div id="sidebar-aboveheader"> <div id="sidebar-aboveheader" class="customsidebar <?php global $enable_if_widgetarea_use_sidebar_css; if ($enable_widgetarea_use_sidebar_css == 'yes') { ?> sidebar<?php } ?>">
<div class="customsidebar <?php global $enable_if_widgetarea_use_sidebar_css; if ($enable_widgetarea_use_sidebar_css == 'yes') { ?> sidebar<?php } ?>"> <?php if ( !function_exists('dynamic_sidebar') || !dynamic_sidebar('Above Header') ) : ?><?php endif; ?>
<?php if ( !function_exists('dynamic_sidebar') || !dynamic_sidebar('Above Header') ) : ?><?php endif; ?>
</div>
</div> </div>
<?php } ?> <?php } ?>

View File

@ -1,7 +1,5 @@
<?php if (comicpress_is_active_sidebar('Blog')) { ?> <?php if (comicpress_is_active_sidebar('Blog')) { ?>
<div id="sidebar-blog"> <div id="sidebar-blog" class="customsidebar <?php global $enable_if_widgetarea_use_sidebar_css; if ($enable_widgetarea_use_sidebar_css == 'yes') { ?> sidebar<?php } ?>">
<div class="customsidebar <?php global $enable_if_widgetarea_use_sidebar_css; if ($enable_widgetarea_use_sidebar_css == 'yes') { ?> sidebar<?php } ?>"> <?php if ( !function_exists('dynamic_sidebar') || !dynamic_sidebar('Blog') ) : ?><?php endif; ?>
<?php if ( !function_exists('dynamic_sidebar') || !dynamic_sidebar('Blog') ) : ?><?php endif; ?>
</div>
</div> </div>
<?php } ?> <?php } ?>

View File

@ -1,7 +1,5 @@
<?php if (comicpress_is_active_sidebar('Left of Comic')) { ?> <?php if (comicpress_is_active_sidebar('Left of Comic')) { ?>
<div id="sidebar-comicleft"> <div id="sidebar-comicleft" class="customsidebar <?php global $enable_if_widgetarea_use_sidebar_css; if ($enable_widgetarea_use_sidebar_css == 'yes') { ?> sidebar<?php } ?>">
<div class="customsidebar <?php global $enable_if_widgetarea_use_sidebar_css; if ($enable_widgetarea_use_sidebar_css == 'yes') { ?> sidebar<?php } ?>"> <?php if ( !function_exists('dynamic_sidebar') || !dynamic_sidebar('Left of Comic') ) : ?><?php endif; ?>
<?php if ( !function_exists('dynamic_sidebar') || !dynamic_sidebar('Left of Comic') ) : ?><?php endif; ?>
</div>
</div> </div>
<?php } ?> <?php } ?>

View File

@ -1,7 +1,5 @@
<?php if (comicpress_is_active_sidebar('Right of Comic')) { ?> <?php if (comicpress_is_active_sidebar('Right of Comic')) { ?>
<div id="sidebar-comicright"> <div id="sidebar-comicright" class="customsidebar <?php global $enable_if_widgetarea_use_sidebar_css; if ($enable_widgetarea_use_sidebar_css == 'yes') { ?> sidebar<?php } ?>">
<div class="customsidebar <?php global $enable_if_widgetarea_use_sidebar_css; if ($enable_widgetarea_use_sidebar_css == 'yes') { ?> sidebar<?php } ?>"> <?php if ( !function_exists('dynamic_sidebar') || !dynamic_sidebar('Right of Comic') ) : ?><?php endif; ?>
<?php if ( !function_exists('dynamic_sidebar') || !dynamic_sidebar('Right of Comic') ) : ?><?php endif; ?>
</div>
</div> </div>
<?php } ?> <?php } ?>

View File

@ -1,7 +1,5 @@
<?php if (comicpress_is_active_sidebar('Footer')) { ?> <?php if (comicpress_is_active_sidebar('Footer')) { ?>
<div id="sidebar-footer"> <div id="sidebar-footer" class="customsidebar <?php global $enable_if_widgetarea_use_sidebar_css; if ($enable_widgetarea_use_sidebar_css == 'yes') { ?> sidebar<?php } ?>">
<div class="customsidebar <?php global $enable_if_widgetarea_use_sidebar_css; if ($enable_widgetarea_use_sidebar_css == 'yes') { ?> sidebar<?php } ?>"> <?php if ( !function_exists('dynamic_sidebar') || !dynamic_sidebar('Footer') ) : ?><?php endif; ?>
<?php if ( !function_exists('dynamic_sidebar') || !dynamic_sidebar('Footer') ) : ?><?php endif; ?>
</div>
</div> </div>
<?php } ?> <?php } ?>

View File

@ -1,7 +1,4 @@
<div id="sidebar-header" class="customsidebar <?php global $enable_if_widgetarea_use_sidebar_css; if ($enable_widgetarea_use_sidebar_css == 'yes') { ?> sidebar<?php } ?>">
<div id="sidebar-header"> <?php if ( !function_exists('dynamic_sidebar') || !dynamic_sidebar('Header') ) : ?><?php endif; ?>
<div class="customsidebar <?php global $enable_if_widgetarea_use_sidebar_css; if ($enable_widgetarea_use_sidebar_css == 'yes') { ?> sidebar<?php } ?>">
<?php if ( !function_exists('dynamic_sidebar') || !dynamic_sidebar('Header') ) : ?><?php endif; ?>
</div>
</div> </div>

View File

@ -5,11 +5,8 @@
} }
?> ?>
<?php if (comicpress_is_active_sidebar('Menubar')) { ?> <?php if (comicpress_is_active_sidebar('Menubar')) { ?>
<div id="sidebar-menubar"> <div id="sidebar-menubar" class="customsidebar <?php global $enable_if_widgetarea_use_sidebar_css; if ($enable_widgetarea_use_sidebar_css == 'yes') { ?> sidebar<?php } ?>">
<div class="customsidebar <?php global $enable_if_widgetarea_use_sidebar_css; if ($enable_widgetarea_use_sidebar_css == 'yes') { ?> sidebar<?php } ?>"> <?php if ( !function_exists('dynamic_sidebar') || !dynamic_sidebar('Menubar') ) : ?><?php endif; ?>
<?php if ( !function_exists('dynamic_sidebar') || !dynamic_sidebar('Menubar') ) : ?>
<?php endif; ?>
</div>
</div> </div>
<?php } ?> <?php } ?>

View File

@ -1,7 +1,5 @@
<?php if (comicpress_is_active_sidebar('Over Comic')) { ?> <?php if (comicpress_is_active_sidebar('Over Comic')) { ?>
<div id="sidebar-overcomic"> <div id="sidebar-overcomic" class="customsidebar <?php global $enable_if_widgetarea_use_sidebar_css; if ($enable_widgetarea_use_sidebar_css == 'yes') { ?> sidebar<?php } ?>">
<div class="customsidebar <?php global $enable_if_widgetarea_use_sidebar_css; if ($enable_widgetarea_use_sidebar_css == 'yes') { ?> sidebar<?php } ?>"> <?php if ( !function_exists('dynamic_sidebar') || !dynamic_sidebar('Over Comic') ) : ?><?php endif; ?>
<?php if ( !function_exists('dynamic_sidebar') || !dynamic_sidebar('Over Comic') ) : ?><?php endif; ?>
</div>
</div> </div>
<?php } ?> <?php } ?>

View File

@ -1,7 +1,5 @@
<?php if (comicpress_is_active_sidebar('Over Blog')) { ?> <?php if (comicpress_is_active_sidebar('Over Blog')) { ?>
<div id="sidebar-overblog"> <div id="sidebar-overblog" class="customsidebar <?php global $enable_if_widgetarea_use_sidebar_css; if ($enable_widgetarea_use_sidebar_css == 'yes') { ?> sidebar<?php } ?>">
<div class="customsidebar <?php global $enable_if_widgetarea_use_sidebar_css; if ($enable_widgetarea_use_sidebar_css == 'yes') { ?> sidebar<?php } ?>"> <?php if ( !function_exists('dynamic_sidebar') || !dynamic_sidebar('Over Blog') ) : ?><?php endif; ?>
<?php if ( !function_exists('dynamic_sidebar') || !dynamic_sidebar('Over Blog') ) : ?><?php endif; ?>
</div>
</div> </div>
<?php } ?> <?php } ?>

View File

@ -1,7 +1,5 @@
<?php if (comicpress_is_active_sidebar('Under Comic')) { ?> <?php if (comicpress_is_active_sidebar('Under Comic')) { ?>
<div id="sidebar-undercomic"> <div id="sidebar-undercomic" class="customsidebar <?php global $enable_if_widgetarea_use_sidebar_css; if ($enable_widgetarea_use_sidebar_css == 'yes') { ?> sidebar<?php } ?>">
<div class="customsidebar <?php global $enable_if_widgetarea_use_sidebar_css; if ($enable_widgetarea_use_sidebar_css == 'yes') { ?> sidebar<?php } ?>"> <?php if ( !function_exists('dynamic_sidebar') || !dynamic_sidebar('Under Comic') ) : ?><?php endif; ?>
<?php if ( !function_exists('dynamic_sidebar') || !dynamic_sidebar('Under Comic') ) : ?><?php endif; ?>
</div>
</div> </div>
<?php } ?> <?php } ?>

View File

@ -1,7 +1,5 @@
<?php if (comicpress_is_active_sidebar('Under Blog')) { ?> <?php if (comicpress_is_active_sidebar('Under Blog')) { ?>
<div id="sidebar-underblog"> <div id="sidebar-underblog" class="customsidebar <?php global $enable_if_widgetarea_use_sidebar_css; if ($enable_widgetarea_use_sidebar_css == 'yes') { ?> sidebar<?php } ?>">
<div class="customsidebar <?php global $enable_if_widgetarea_use_sidebar_css; if ($enable_widgetarea_use_sidebar_css == 'yes') { ?> sidebar<?php } ?>"> <?php if ( !function_exists('dynamic_sidebar') || !dynamic_sidebar('Under Blog') ) : ?><?php endif; ?>
<?php if ( !function_exists('dynamic_sidebar') || !dynamic_sidebar('Under Blog') ) : ?><?php endif; ?>
</div>
</div> </div>
<?php } ?> <?php } ?>

View File

@ -48,7 +48,7 @@ img {
} }
small { small {
font-size: 11px; font-size: 10px;
} }
hr { hr {
@ -62,7 +62,6 @@ blockquote {
margin: 10px; margin: 10px;
padding: 5px 10px 5px 20px; padding: 5px 10px 5px 20px;
font-family: 'Georgia', serif; font-family: 'Georgia', serif;
font-size: 13px;
border-width: 1px 1px 1px 5px; border-width: 1px 1px 1px 5px;
border-style: solid; border-style: solid;
border-color: #000; border-color: #000;
@ -125,7 +124,6 @@ h2, h2 a {
h2.pagetitle, h2.pagetitle a { h2.pagetitle, h2.pagetitle a {
padding: 0 0 5px 0; padding: 0 0 5px 0;
margin: 0 0 20px 0;
font-family: 'Georgia' , serif; font-family: 'Georgia' , serif;
font-size: 32px; font-size: 32px;
font-weight: normal; font-weight: normal;
@ -338,6 +336,10 @@ h3, h3 a {
/* THE COMIC */ /* THE COMIC */
#comic-head {
clear: both;
}
#comic { #comic {
padding: 5px 0; padding: 5px 0;
text-align: center; text-align: center;
@ -364,38 +366,9 @@ a.navi-comments:hover span {
color:#860b04; color:#860b04;
} }
.nav,.blognav {
float: right;
font-size: 12px;
font-weight: bold;
margin-right: 10px;
padding: 8px 5px 5px 5px;
}
.nav-first {
padding: 0 5px 0 0;
float: left;
}
.nav-previous {
padding: 0 5px;
float: left;
}
.nav-next {
padding: 0 5px;
float: left;
}
.nav-last {
padding: 0 0 0 5px;
float: left;
}
.pagenav, .commentnav { .pagenav, .commentnav {
height: 25px; height: 25px;
color: #000; color: #000;
font-size: 12px;
font-weight: bold; font-weight: bold;
line-height: 25px; line-height: 25px;
padding: 0 5px 0 5px; padding: 0 5px 0 5px;
@ -429,6 +402,10 @@ a.navi-comments:hover span {
overflow: hidden; overflow: hidden;
} }
#subcontent-wrapper {
clear: both;
}
#content { #content {
float: left; float: left;
} }
@ -460,8 +437,6 @@ a.navi-comments:hover span {
} }
.column_one_header { .column_one_header {
padding: 5px;
border-top: solid 1px #c45253;
} }
.column_two { .column_two {
@ -470,8 +445,6 @@ a.navi-comments:hover span {
padding: 1%; padding: 1%;
} }
.column_two_header { .column_two_header {
padding: 5px;
border-top: solid 1px #c45253;
} }
.post, .post-comic, .post-page { .post, .post-comic, .post-page {
@ -487,16 +460,17 @@ a.navi-comments:hover span {
margin-bottom: 20px; margin-bottom: 20px;
} }
.post-info { .post-info, .post-comic-info {
margin-bottom: 5px; padding-bottom: 5px;
font-size: 10px;
} }
.post-text { .post-text, .post-comic-text {
overflow: hidden; overflow: hidden;
display: block; display: block;
} }
.post-author-gravatar { .post-author-gravatar, .post-comic-author-gravatar {
float: right; float: right;
} }
@ -505,7 +479,7 @@ a.navi-comments:hover span {
margin-right: 2px; margin-right: 2px;
} }
.post-date { .post-date, .post-comic-date {
color: #777; color: #777;
font-family: 'Georgia' , serif; font-family: 'Georgia' , serif;
font-size: 15px; font-size: 15px;
@ -514,7 +488,7 @@ a.navi-comments:hover span {
margin-right: 3px; margin-right: 3px;
} }
.post-date .date { .post-date .date, .post-comic-date .date {
height: 50px; height: 50px;
width: 45px; width: 45px;
background: url(images/calendar.png) center no-repeat; background: url(images/calendar.png) center no-repeat;
@ -526,7 +500,7 @@ a.navi-comments:hover span {
} }
.post-date .date span { .post-date .date span, .post-comic-date .date span {
height: 16px; height: 16px;
display: block; display: block;
font: normal 11px Verdana, Arial, Helvetica, sans-serif; font: normal 11px Verdana, Arial, Helvetica, sans-serif;
@ -556,7 +530,7 @@ a.navi-comments:hover span {
clear: both; clear: both;
} }
.post-tags { .post-tags, .post-comic-tags {
font-size: 11px; font-size: 11px;
} }
@ -571,13 +545,13 @@ a.navi-comments:hover span {
font-size: 12px; font-size: 12px;
} }
.post .members-only { .post .members-only, .post-comic .members-only {
border: dotted 1px #000; border: dotted 1px #000;
background: #fafafa; background: #fafafa;
padding: 3px; padding: 3px;
} }
.post .non-member { .post .non-member, .post-comic .non-member {
border: dotted 1px #000; border: dotted 1px #000;
background: #fafafa; background: #fafafa;
padding: 3px; padding: 3px;
@ -925,11 +899,11 @@ ul.children {
#searchform button, #searchform-transcript button { #searchform button, #searchform-transcript button {
height: 23px; height: 23px;
float: left;
} }
.searchresults { .searchresults {
float: right; padding-left: 10px;
padding: 5px;
} }
/* GALLERY */ /* GALLERY */

View File

@ -368,11 +368,6 @@ button {
border: 0; border: 0;
} }
.searchresults {
float: right;
padding: 5px;
}
/* GALLERY */ /* GALLERY */
.gallery-image { .gallery-image {

View File

@ -44,6 +44,14 @@ body {
margin-top: -20px; margin-top: -20px;
} }
.ie #content-wrapper-head, .ie #comic-head {
display: none;
}
#comic-head, #comic-foot {
padding: 0;
}
#subcontent-wrapper, .layout-gn #content-wrapper, .layout-rgn #content-wrapper, .layout-v #content-wrapper, #subcontent-wrapper, .layout-gn #content-wrapper, .layout-rgn #content-wrapper, .layout-v #content-wrapper,
.layout-v3c #content-wrapper { .layout-v3c #content-wrapper {
background: url('contentbg.jpg') repeat; background: url('contentbg.jpg') repeat;
@ -52,16 +60,19 @@ body {
border-bottom: solid 1px #000; border-bottom: solid 1px #000;
} }
#comic-foot, #comic-head {
background: url('contentbg.jpg') repeat;
border-left: solid 1px #000;
border-right: solid 1px #000;
}
.layout-gn #pagewrap-right, .layout-rgn #pagewrap-right { .layout-gn #pagewrap-right, .layout-rgn #pagewrap-right {
padding-top: 5px; padding-top: 5px;
width: 768px; width: 768px;
} }
#comic-foot, #comic-head { #comic-foot .archive-dropdown-wrap, #comic-head .archive-dropdown-wrap, #comic-foot .widget, #comic-head .widget {
background: url('contentbg.jpg') repeat; margin: 0;
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-gn #subcontent-wrapper, .layout-gn #comic-head, .layout-gn, #comic-foot,
@ -104,6 +115,7 @@ body {
.layout-3c #comic, .layout-3c2r #comic { .layout-3c #comic, .layout-3c2r #comic {
width: 1010px; width: 1010px;
margin: 0 auto;
} }
.layout-3c #comic-foot, .layout-3c2r #comic-foot, .layout-3c #comic-foot, .layout-3c2r #comic-foot,

View File

@ -326,11 +326,6 @@ button {
border: 0; border: 0;
} }
.searchresults {
float: right;
padding: 5px;
}
/* GALLERY */ /* GALLERY */
.gallery-image { .gallery-image {

View File

@ -281,11 +281,6 @@ h1, h1 a, h2, h2 a, h3, h3 a {
#searchform button:hover, #searchform-transcript button:-moz-focus-inner { #searchform button:hover, #searchform-transcript button:-moz-focus-inner {
border: 0; border: 0;
} }
.searchresults {
float: right;
padding: 5px;
}
/* MENUNAV */ /* MENUNAV */
.menunav-rss { .menunav-rss {

View File

@ -364,11 +364,6 @@ h1 a:hover, h2 a:hover, h3 a:hover {
border: 0; border: 0;
} }
.searchresults {
float: right;
padding: 5px;
}
/* GALLERY */ /* GALLERY */
.gallery-image { .gallery-image {

View File

@ -79,13 +79,13 @@ class WidgetComicPressGraphicalStorylineNavigation extends WP_Widget {
ob_start(); ob_start();
switch ($which) { switch ($which) {
case 'first': case 'first':
case 'last':
case 'previous': case 'previous':
case 'next':
case 'last':
case 'story_prev': case 'story_prev':
case 'story_next': case 'story_next':
case 'story_prev_in': case 'story_prev_in':
case 'story_next_in': case 'story_next_in':
case 'next':
$navi_class_names = array("navi-${which}"); $navi_class_names = array("navi-${which}");
if (isset($css_name_mapping[$which])) { $navi_class_names[] = "navi-{$css_name_mapping[$which]}"; } if (isset($css_name_mapping[$which])) { $navi_class_names[] = "navi-{$css_name_mapping[$which]}"; }
@ -94,9 +94,9 @@ class WidgetComicPressGraphicalStorylineNavigation extends WP_Widget {
if ($ok) { if ($ok) {
?><a href="<?php echo $link; ?>" ?><a href="<?php echo $link; ?>"
class="navi <?php echo implode(" ", $navi_class_names); ?>" class="navi <?php echo implode(" ", $navi_class_names); ?>"
title="<?php echo $instance["${which}_title"]; ?>"><?php echo $instance["${which}_title"]; ?></a><?php title="<?php echo $instance["${which}_title"]; ?>"><?php echo htmlspecialchars_decode($instance["${which}_title"]); ?></a><?php
} else { } else {
?><div class="navi <?php echo implode(" ", $navi_class_names); ?> navi-void"><?php echo $instance["${which}_title"]; ?></div><?php ?><div class="navi <?php echo implode(" ", $navi_class_names); ?> navi-void"><?php echo htmlspecialchars_decode($instance["${which}_title"]); ?></div><?php
} }
break; break;
case 'archives': case 'archives':
@ -158,7 +158,7 @@ class WidgetComicPressGraphicalStorylineNavigation extends WP_Widget {
*/ */
function comicpress_display_navigation_order($order = array()) { function comicpress_display_navigation_order($order = array()) {
return array( return array(
'first', 'story_prev', 'story_prev_in', 'previous', 'archives', 'random', 'comictitle', 'comments', 'buyprint', 'next', 'story_next_in', 'story_next', 'last' 'first', 'previous', 'story_prev_in', 'story_prev', 'archives', 'random', 'comictitle', 'comments', 'buyprint', 'story_next', 'story_next_in', 'next', 'last'
); );
} }
@ -172,7 +172,7 @@ class WidgetComicPressGraphicalStorylineNavigation extends WP_Widget {
if (is_array($buttons)) { $buttons_text = implode('', $buttons); } if (is_array($buttons)) { $buttons_text = implode('', $buttons); }
ob_start(); ?> ob_start(); ?>
<div id="comic_navi_wrapper"> <div id="comic_navi_wrapper">
<table id="comic_navi" cellpadding="0" cellspacing="0"><tr><td><?php echo $buttons_text; ?></td></tr></table> <div class="comic_navi"><?php echo $buttons_text; ?></div>
</div> </div>
<?php <?php
return array($buttons, $content); return array($buttons, $content);
@ -231,16 +231,16 @@ class WidgetComicPressGraphicalStorylineNavigation extends WP_Widget {
$instance = array(); $instance = array();
$all_fields = array( $all_fields = array(
'first', 'last', 'story_prev', 'story_next', 'story_prev_in', 'first', 'story_prev', 'story_next', 'story_prev_in',
'story_next_in', 'previous', 'random', 'archives', 'story_next_in', 'previous', 'random', 'archives',
'comments', 'next', 'buyprint', 'comictitle', 'nextgohome', 'comments', 'next', 'last', 'buyprint', 'comictitle', 'nextgohome',
'story_prev_acts_as_prev_in' 'story_prev_acts_as_prev_in'
); );
foreach ($all_fields as $field) { foreach ($all_fields as $field) {
$instance[$field] = (isset($new_instance[$field])) ? 'on' : 'off'; $instance[$field] = (isset($new_instance[$field])) ? 'on' : 'off';
if (isset($new_instance["${field}_title"])) { if (isset($new_instance["${field}_title"])) {
$instance["${field}_title"] = strip_tags($new_instance["${field}_title"]); $instance["${field}_title"] = strip_tags($new_instance["${field}_title"]);
} }
} }
@ -252,7 +252,6 @@ class WidgetComicPressGraphicalStorylineNavigation extends WP_Widget {
function form($instance) { function form($instance) {
$field_defaults = array( $field_defaults = array(
'first' => 'on', 'first' => 'on',
'last' => 'on',
'story_prev' => 'off', 'story_prev' => 'off',
'story_prev_in' => 'off', 'story_prev_in' => 'off',
'story_next' => 'off', 'story_next' => 'off',
@ -262,6 +261,7 @@ class WidgetComicPressGraphicalStorylineNavigation extends WP_Widget {
'archives' => 'off', 'archives' => 'off',
'comments' => 'off', 'comments' => 'off',
'next' => 'on', 'next' => 'on',
'last' => 'on',
'archive_path' => '', 'archive_path' => '',
'buyprint' => 'off', 'buyprint' => 'off',
'comictitle' => 'off', 'comictitle' => 'off',
@ -271,7 +271,6 @@ class WidgetComicPressGraphicalStorylineNavigation extends WP_Widget {
$title_defaults = array( $title_defaults = array(
'first_title' => __('&lsaquo;&lsaquo; First', 'comicpress'), 'first_title' => __('&lsaquo;&lsaquo; First', 'comicpress'),
'last_title' => __('Last &rsaquo;&rsaquo;', 'comicpress'),
'story_prev_title' => __('Chapter', 'comicpress'), 'story_prev_title' => __('Chapter', 'comicpress'),
'story_next_title' => __('Chapter', 'comicpress'), 'story_next_title' => __('Chapter', 'comicpress'),
'story_prev_in_title' => __('In Chapter', 'comicpress'), 'story_prev_in_title' => __('In Chapter', 'comicpress'),
@ -281,6 +280,7 @@ class WidgetComicPressGraphicalStorylineNavigation extends WP_Widget {
'archives_title' => __('Archives', 'comicpress'), 'archives_title' => __('Archives', 'comicpress'),
'comments_title' => __('Comments', 'comicpress'), 'comments_title' => __('Comments', 'comicpress'),
'next_title' => __('Next &rsaquo;', 'comicpress'), 'next_title' => __('Next &rsaquo;', 'comicpress'),
'last_title' => __('Last &rsaquo;&rsaquo;', 'comicpress'),
'buyprint_title' => __('Buy Print', 'comicpress') 'buyprint_title' => __('Buy Print', 'comicpress')
); );
@ -288,9 +288,9 @@ class WidgetComicPressGraphicalStorylineNavigation extends WP_Widget {
foreach (array( foreach (array(
'first' => __('&lsaquo;&lsaquo; First', 'comicpress'), 'first' => __('&lsaquo;&lsaquo; First', 'comicpress'),
'last' => __('Last &rsaquo;&rsaquo;', 'comicpress'),
'previous' => __('&lsaquo; Previous', 'comicpress'), 'previous' => __('&lsaquo; Previous', 'comicpress'),
'next' => __('Next &rsaquo;', 'comicpress'), 'next' => __('Next &rsaquo;', 'comicpress'),
'last' => __('Last &rsaquo;&rsaquo;', 'comicpress'),
'story_prev' => __('Previous Chapter', 'comicpress'), 'story_prev' => __('Previous Chapter', 'comicpress'),
'story_next' => __('Next Chapter', 'comicpress'), 'story_next' => __('Next Chapter', 'comicpress'),
'story_prev_in' => __('Previous In Chapter', 'comicpress'), 'story_prev_in' => __('Previous In Chapter', 'comicpress'),
@ -316,7 +316,7 @@ class WidgetComicPressGraphicalStorylineNavigation extends WP_Widget {
id="<?php echo $this->get_field_id($title_field); ?>" id="<?php echo $this->get_field_id($title_field); ?>"
name="<?php echo $this->get_field_name($title_field); ?>" name="<?php echo $this->get_field_name($title_field); ?>"
type="text" type="text"
value="<?php echo attribute_escape($instance[$title_field]); ?>" /> value="<?php echo htmlspecialchars($instance[$title_field]); ?>" />
<?php } ?> <?php } ?>
<?php <?php