diff --git a/archive.php b/archive.php index 72bf666..a90c1aa 100644 --- a/archive.php +++ b/archive.php @@ -1,15 +1,15 @@ - - - - - post_count; - ?> - -
Found result.
+post_count; + + if (!$count) $count = "no"; +?> ">
- +
-

’

+

’

-

’

+

’

-

+

-

+

-

+

-

+

-

+

+
+

diff --git a/comments.php b/comments.php index bc491c7..21b7598 100644 --- a/comments.php +++ b/comments.php @@ -34,26 +34,6 @@ if ( post_password_required() ) { ?> }?> - - -

-
    - -
- comment_status) : ?> - - - - -

@@ -133,5 +108,27 @@ if ( post_password_required() ) { ?> + + + +

+
    + +
+ +
\ No newline at end of file diff --git a/functions.php b/functions.php index 180cade..20a9c53 100644 --- a/functions.php +++ b/functions.php @@ -16,7 +16,7 @@ if (function_exists('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; if (!empty($wpmu_version)) { diff --git a/functions/avatars.php b/functions/avatars.php index 91b636c..39f451f 100644 --- a/functions/avatars.php +++ b/functions/avatars.php @@ -78,9 +78,9 @@ function comicpress_get_avatar( $id_or_email, $size = '64', $alt = false) { if ( !empty( $rating ) ) $out .= "&r={$rating}"; - $avatar = "{$safe_alt}"; + $avatar = "{$safe_alt}"; } else { - $avatar = "{$safe_alt}"; + $avatar = "{$safe_alt}"; } return apply_filters('comicpress_get_avatar', $avatar, $id_or_email, $size, $default, $alt); diff --git a/functions/displayblogpost.php b/functions/displayblogpost.php index 87a3bf7..66b7940 100644 --- a/functions/displayblogpost.php +++ b/functions/displayblogpost.php @@ -21,32 +21,33 @@ function display_blog_post() {
id="post-"> -
- -
- - - -
-
+
+ +
+ + + +
+
+
+ +
+

+
By on
+ +
+ +
+
- -
-

-
By on
- -
- -
- -
-
+
- - - '
Pages: ', 'after' => '
', 'next_or_number' => 'number')); ?> + + + '
Pages: ', 'after' => '
', 'next_or_number' => 'number')); ?>
+
diff --git a/functions/displaycomicpost.php b/functions/displaycomicpost.php index 586a9d0..4f374b0 100644 --- a/functions/displaycomicpost.php +++ b/functions/displaycomicpost.php @@ -7,70 +7,125 @@ */ 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; ?> +
+
+
id="post-comic-"> +
+ +
+ + + +
+
+
+ +
+

+
By on
+ +
  • ', multiple) ?>
+ + +
+ + +
+ +
+
+
+
+ + + '
Pages: ', 'after' => '
', 'next_or_number' => 'number')); ?> +
+
+ +
+ '); ?> +
+ + comment_status == 'open') { + if (comicpress_check_themepack_file('commentlink') == false) { ?> +
  '.__('No Comments ','comicpress'), '1 '.__('Comment ','comicpress'), '% '.__('Comments ','comicpress')); ?>
+ +
+ +
+
+
+
+
+ -
-
-
is_single; $wp_query->is_single = true; previous_comic_link('%link', __('‹ Previous','comicpress')); $wp_query->is_single = $temp_query;$temp_query = null; ?>
-
-
-
-
-
-
-
- -
- - - -
-
-
- -
-

-
By on
- -
  • ', multiple) ?>
- - -
- - -
- -
-
-
-
- - - '
Pages: ', 'after' => '
', 'next_or_number' => 'number')); ?> -
- -
- -
- '); ?> -
- - comment_status) { - if (comicpress_check_themepack_file('commentlink') == false) { ?> -
  '.__('No Comments ','comicpress'), '1 '.__('Comment ','comicpress'), '% '.__('Comments ','comicpress')); ?>
- -
- -
-
-
-
+
+
+
+ +
+ + + +
+
+
+ +
+

+
By on
+ +
  • ', multiple) ?>
+ + +
+ + +
+ +
+
+
+
+ + + '
Pages: ', 'after' => '
', 'next_or_number' => 'number')); ?> +
+
+ +
+ +
+ '); ?> +
+ + comment_status) { + if (comicpress_check_themepack_file('commentlink') == false) { ?> +
  '.__('No Comments ','comicpress'), '1 '.__('Comment ','comicpress'), '% '.__('Comments ','comicpress')); ?>
+ +
+ +
+
+
+
- -> + +> + <?php bloginfo('name'); if (is_home () ) { diff --git a/images/nav/bar/navstyle.css b/images/nav/bar/navstyle.css index 847ec0f..9a2fee5 100644 --- a/images/nav/bar/navstyle.css +++ b/images/nav/bar/navstyle.css @@ -3,29 +3,30 @@ Author: Tyler Martin Style: Default */ #comic_navi_wrapper { - width: 100%; - height: 25px; - background: black; + text-align: center; } -#comic_navi { - padding: 0; - margin: 0; +.comic_navi { + width: 100%; + background: #000; + margin: 0 auto; list-style: none; - float: left; line-height: 25px; font-size: 13px; + display: inline-block; } .navi-comictitle { + padding: 0px 10px; text-align: center; } .navi { + padding: 0 10px; + color: #fff; } .navi a { - padding: 0px 10px 0 10px; display: block; color: #fff; text-decoration: none; @@ -37,15 +38,19 @@ Style: Default } .navi-first { + float: left; } .navi-prevchap, .navi-story_prev { + float: left; } .navi-story_prev_in { + float: left; } .navi-prev, .navi-previous { + float: left; } @@ -75,20 +80,29 @@ Style: Default a.navi-comments span:hover { } + + .navi-comments-count { + padding-right: 4px; + } .navi-next { + float: left; } .navi-nextchap, .navi-story_next { + float: left; } .navi-story_next_in { + float: left; } .navi-last { + float: left; } .navi-void, .navi-void:hover { + color: #555; } .comic-left .navi-prev, .comic-right .navi-prev, .comic-left .navi-next, .comic-right .navi-next { diff --git a/index.php b/index.php index 542ec8b..8eb3707 100644 --- a/index.php +++ b/index.php @@ -58,6 +58,8 @@ </div> <?php } +get_sidebar('blog'); + if ($disable_comic_frontpage != 'yes' && $disable_comic_blog_frontpage != 'yes' && !is_paged() ) { ?> <?php while ($comicFrontpage->have_posts()) : $comicFrontpage->the_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> <?php } ?> - <?php get_sidebar('blog'); ?> - - - <?php if ($disable_blog_frontpage != 'yes') { global $blog_postcount; ?> <?php diff --git a/search-transcript.php b/search-transcript.php index ed523a7..de387d9 100644 --- a/search-transcript.php +++ b/search-transcript.php @@ -7,9 +7,8 @@ $tmp_search = new WP_Query($query_string.'&order=desc&show_posts=-1&posts_per_pa $count = $tmp_search->post_count; ?> <?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 ‘','comicpress'); ?><?php the_search_query() ?><?php _e('’','comicpress'); ?></h2> - + <div class="searchresults"><?php printf(__ngettext("%d item.", "%d items.", $count,'comicpress'),$count); ?></div> <?php if (have_posts()) : ?> <?php $posts = query_posts($query_string.'&order=asc'); diff --git a/search.php b/search.php index c0ad081..503c7a9 100644 --- a/search.php +++ b/search.php @@ -8,9 +8,9 @@ $count = $tmp_search->post_count; ?> <?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 ‘','comicpress'); the_search_query(); _e('’','comicpress'); ?></h2> - + <div class="searchresults"><?php printf(__ngettext("%d item.", "%d items.", $count,'comicpress'),$count); ?></div> <?php if (have_posts()) : ?> <?php $posts = query_posts($query_string.'&order=asc'); diff --git a/sidebar-above.php b/sidebar-above.php index 20650c1..b0fbeac 100644 --- a/sidebar-above.php +++ b/sidebar-above.php @@ -1,7 +1,5 @@ <?php if (comicpress_is_active_sidebar('Above Header')) { ?> -<div id="sidebar-aboveheader"> - <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; ?> - </div> +<div id="sidebar-aboveheader" 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; ?> </div> <?php } ?> diff --git a/sidebar-blog.php b/sidebar-blog.php index 194b854..75b5178 100644 --- a/sidebar-blog.php +++ b/sidebar-blog.php @@ -1,7 +1,5 @@ <?php if (comicpress_is_active_sidebar('Blog')) { ?> -<div id="sidebar-blog"> - <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; ?> - </div> +<div id="sidebar-blog" 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; ?> </div> <?php } ?> diff --git a/sidebar-comicleft.php b/sidebar-comicleft.php index 7caf827..2bc77fd 100644 --- a/sidebar-comicleft.php +++ b/sidebar-comicleft.php @@ -1,7 +1,5 @@ <?php if (comicpress_is_active_sidebar('Left of Comic')) { ?> -<div id="sidebar-comicleft"> - <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; ?> - </div> +<div id="sidebar-comicleft" 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; ?> </div> <?php } ?> diff --git a/sidebar-comicright.php b/sidebar-comicright.php index dd865ae..e4d1a5e 100644 --- a/sidebar-comicright.php +++ b/sidebar-comicright.php @@ -1,7 +1,5 @@ <?php if (comicpress_is_active_sidebar('Right of Comic')) { ?> -<div id="sidebar-comicright"> - <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; ?> - </div> +<div id="sidebar-comicright" 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; ?> </div> <?php } ?> diff --git a/sidebar-footer.php b/sidebar-footer.php index a30df72..5868f8f 100644 --- a/sidebar-footer.php +++ b/sidebar-footer.php @@ -1,7 +1,5 @@ <?php if (comicpress_is_active_sidebar('Footer')) { ?> -<div id="sidebar-footer"> - <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; ?> - </div> +<div id="sidebar-footer" 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; ?> </div> <?php } ?> diff --git a/sidebar-header.php b/sidebar-header.php index 14af939..150b269 100644 --- a/sidebar-header.php +++ b/sidebar-header.php @@ -1,7 +1,4 @@ - -<div id="sidebar-header"> - <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 id="sidebar-header" 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> diff --git a/sidebar-menubar.php b/sidebar-menubar.php index de8b15c..02e1748 100644 --- a/sidebar-menubar.php +++ b/sidebar-menubar.php @@ -5,11 +5,8 @@ } ?> <?php if (comicpress_is_active_sidebar('Menubar')) { ?> -<div id="sidebar-menubar"> - <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; ?> - </div> +<div id="sidebar-menubar" 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; ?> </div> <?php } ?> diff --git a/sidebar-over.php b/sidebar-over.php index cd5e6e4..aa9e139 100644 --- a/sidebar-over.php +++ b/sidebar-over.php @@ -1,7 +1,5 @@ <?php if (comicpress_is_active_sidebar('Over Comic')) { ?> -<div id="sidebar-overcomic"> - <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; ?> - </div> +<div id="sidebar-overcomic" 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; ?> </div> <?php } ?> diff --git a/sidebar-overblog.php b/sidebar-overblog.php index 3c721b7..0a65151 100644 --- a/sidebar-overblog.php +++ b/sidebar-overblog.php @@ -1,7 +1,5 @@ <?php if (comicpress_is_active_sidebar('Over Blog')) { ?> -<div id="sidebar-overblog"> - <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; ?> - </div> +<div id="sidebar-overblog" 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; ?> </div> <?php } ?> diff --git a/sidebar-under.php b/sidebar-under.php index f3d33f1..5f977fb 100644 --- a/sidebar-under.php +++ b/sidebar-under.php @@ -1,7 +1,5 @@ <?php if (comicpress_is_active_sidebar('Under Comic')) { ?> -<div id="sidebar-undercomic"> - <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; ?> - </div> +<div id="sidebar-undercomic" 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; ?> </div> <?php } ?> diff --git a/sidebar-underblog.php b/sidebar-underblog.php index 8fd5478..e03052c 100644 --- a/sidebar-underblog.php +++ b/sidebar-underblog.php @@ -1,7 +1,5 @@ <?php if (comicpress_is_active_sidebar('Under Blog')) { ?> -<div id="sidebar-underblog"> - <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; ?> - </div> +<div id="sidebar-underblog" 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; ?> </div> <?php } ?> diff --git a/style.css b/style.css index 31b8a8d..4100382 100644 --- a/style.css +++ b/style.css @@ -48,7 +48,7 @@ img { } small { - font-size: 11px; + font-size: 10px; } hr { @@ -62,7 +62,6 @@ blockquote { margin: 10px; padding: 5px 10px 5px 20px; font-family: 'Georgia', serif; - font-size: 13px; border-width: 1px 1px 1px 5px; border-style: solid; border-color: #000; @@ -125,7 +124,6 @@ h2, h2 a { h2.pagetitle, h2.pagetitle a { padding: 0 0 5px 0; - margin: 0 0 20px 0; font-family: 'Georgia' , serif; font-size: 32px; font-weight: normal; @@ -338,6 +336,10 @@ h3, h3 a { /* THE COMIC */ +#comic-head { + clear: both; +} + #comic { padding: 5px 0; text-align: center; @@ -364,38 +366,9 @@ a.navi-comments:hover span { 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 { height: 25px; color: #000; - font-size: 12px; font-weight: bold; line-height: 25px; padding: 0 5px 0 5px; @@ -429,6 +402,10 @@ a.navi-comments:hover span { overflow: hidden; } +#subcontent-wrapper { + clear: both; +} + #content { float: left; } @@ -460,8 +437,6 @@ a.navi-comments:hover span { } .column_one_header { - padding: 5px; - border-top: solid 1px #c45253; } .column_two { @@ -470,8 +445,6 @@ a.navi-comments:hover span { padding: 1%; } .column_two_header { - padding: 5px; - border-top: solid 1px #c45253; } .post, .post-comic, .post-page { @@ -487,16 +460,17 @@ a.navi-comments:hover span { margin-bottom: 20px; } -.post-info { - margin-bottom: 5px; +.post-info, .post-comic-info { + padding-bottom: 5px; + font-size: 10px; } -.post-text { +.post-text, .post-comic-text { overflow: hidden; display: block; } -.post-author-gravatar { +.post-author-gravatar, .post-comic-author-gravatar { float: right; } @@ -505,7 +479,7 @@ a.navi-comments:hover span { margin-right: 2px; } -.post-date { +.post-date, .post-comic-date { color: #777; font-family: 'Georgia' , serif; font-size: 15px; @@ -514,7 +488,7 @@ a.navi-comments:hover span { margin-right: 3px; } -.post-date .date { +.post-date .date, .post-comic-date .date { height: 50px; width: 45px; 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; display: block; font: normal 11px Verdana, Arial, Helvetica, sans-serif; @@ -556,7 +530,7 @@ a.navi-comments:hover span { clear: both; } -.post-tags { +.post-tags, .post-comic-tags { font-size: 11px; } @@ -571,13 +545,13 @@ a.navi-comments:hover span { font-size: 12px; } -.post .members-only { +.post .members-only, .post-comic .members-only { border: dotted 1px #000; background: #fafafa; padding: 3px; } -.post .non-member { +.post .non-member, .post-comic .non-member { border: dotted 1px #000; background: #fafafa; padding: 3px; @@ -925,11 +899,11 @@ ul.children { #searchform button, #searchform-transcript button { height: 23px; + float: left; } - + .searchresults { - float: right; - padding: 5px; + padding-left: 10px; } /* GALLERY */ diff --git a/themepack/blueocean/style.css b/themepack/blueocean/style.css index 7f774bd..1d17635 100644 --- a/themepack/blueocean/style.css +++ b/themepack/blueocean/style.css @@ -368,11 +368,6 @@ button { border: 0; } - .searchresults { - float: right; - padding: 5px; - } - /* GALLERY */ .gallery-image { diff --git a/themepack/sandy/style.css b/themepack/sandy/style.css index 3615e7f..fa747cb 100644 --- a/themepack/sandy/style.css +++ b/themepack/sandy/style.css @@ -44,6 +44,14 @@ body { 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, .layout-v3c #content-wrapper { background: url('contentbg.jpg') repeat; @@ -52,16 +60,19 @@ body { 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 { padding-top: 5px; width: 768px; } -#comic-foot, #comic-head { - background: url('contentbg.jpg') repeat; - border-left: solid 1px #000; - border-right: solid 1px #000; - padding: 0; +#comic-foot .archive-dropdown-wrap, #comic-head .archive-dropdown-wrap, #comic-foot .widget, #comic-head .widget { + margin: 0; } .layout-gn #subcontent-wrapper, .layout-gn #comic-head, .layout-gn, #comic-foot, @@ -104,6 +115,7 @@ body { .layout-3c #comic, .layout-3c2r #comic { width: 1010px; + margin: 0 auto; } .layout-3c #comic-foot, .layout-3c2r #comic-foot, diff --git a/themepack/silver/style.css b/themepack/silver/style.css index 0ffc490..534b0f0 100644 --- a/themepack/silver/style.css +++ b/themepack/silver/style.css @@ -326,11 +326,6 @@ button { border: 0; } - .searchresults { - float: right; - padding: 5px; - } - /* GALLERY */ .gallery-image { diff --git a/themepack/slickblack/style.css b/themepack/slickblack/style.css index 5c58aa8..73c259c 100644 --- a/themepack/slickblack/style.css +++ b/themepack/slickblack/style.css @@ -281,11 +281,6 @@ h1, h1 a, h2, h2 a, h3, h3 a { #searchform button:hover, #searchform-transcript button:-moz-focus-inner { border: 0; } - - .searchresults { - float: right; - padding: 5px; - } /* MENUNAV */ .menunav-rss { diff --git a/themepack/spacecase/style.css b/themepack/spacecase/style.css index 59e5c38..6b85d77 100644 --- a/themepack/spacecase/style.css +++ b/themepack/spacecase/style.css @@ -364,11 +364,6 @@ h1 a:hover, h2 a:hover, h3 a:hover { border: 0; } - .searchresults { - float: right; - padding: 5px; - } - /* GALLERY */ .gallery-image { diff --git a/widgets/graphical-navigation.php b/widgets/graphical-navigation.php index 3755e17..78bb5e6 100644 --- a/widgets/graphical-navigation.php +++ b/widgets/graphical-navigation.php @@ -79,13 +79,13 @@ class WidgetComicPressGraphicalStorylineNavigation extends WP_Widget { ob_start(); switch ($which) { case 'first': - case 'last': case 'previous': + case 'next': + case 'last': case 'story_prev': case 'story_next': case 'story_prev_in': case 'story_next_in': - case 'next': $navi_class_names = array("navi-${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) { ?><a href="<?php echo $link; ?>" 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 { - ?><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; case 'archives': @@ -158,7 +158,7 @@ class WidgetComicPressGraphicalStorylineNavigation extends WP_Widget { */ function comicpress_display_navigation_order($order = 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); } ob_start(); ?> <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> <?php return array($buttons, $content); @@ -231,16 +231,16 @@ class WidgetComicPressGraphicalStorylineNavigation extends WP_Widget { $instance = 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', - 'comments', 'next', 'buyprint', 'comictitle', 'nextgohome', + 'comments', 'next', 'last', 'buyprint', 'comictitle', 'nextgohome', 'story_prev_acts_as_prev_in' ); foreach ($all_fields as $field) { $instance[$field] = (isset($new_instance[$field])) ? 'on' : 'off'; 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) { $field_defaults = array( 'first' => 'on', - 'last' => 'on', 'story_prev' => 'off', 'story_prev_in' => 'off', 'story_next' => 'off', @@ -262,6 +261,7 @@ class WidgetComicPressGraphicalStorylineNavigation extends WP_Widget { 'archives' => 'off', 'comments' => 'off', 'next' => 'on', + 'last' => 'on', 'archive_path' => '', 'buyprint' => 'off', 'comictitle' => 'off', @@ -271,7 +271,6 @@ class WidgetComicPressGraphicalStorylineNavigation extends WP_Widget { $title_defaults = array( 'first_title' => __('‹‹ First', 'comicpress'), - 'last_title' => __('Last ››', 'comicpress'), 'story_prev_title' => __('Chapter', 'comicpress'), 'story_next_title' => __('Chapter', 'comicpress'), 'story_prev_in_title' => __('In Chapter', 'comicpress'), @@ -281,6 +280,7 @@ class WidgetComicPressGraphicalStorylineNavigation extends WP_Widget { 'archives_title' => __('Archives', 'comicpress'), 'comments_title' => __('Comments', 'comicpress'), 'next_title' => __('Next ›', 'comicpress'), + 'last_title' => __('Last ››', 'comicpress'), 'buyprint_title' => __('Buy Print', 'comicpress') ); @@ -288,9 +288,9 @@ class WidgetComicPressGraphicalStorylineNavigation extends WP_Widget { foreach (array( 'first' => __('‹‹ First', 'comicpress'), - 'last' => __('Last ››', 'comicpress'), 'previous' => __('‹ Previous', 'comicpress'), 'next' => __('Next ›', 'comicpress'), + 'last' => __('Last ››', 'comicpress'), 'story_prev' => __('Previous Chapter', 'comicpress'), 'story_next' => __('Next 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); ?>" name="<?php echo $this->get_field_name($title_field); ?>" type="text" - value="<?php echo attribute_escape($instance[$title_field]); ?>" /> + value="<?php echo htmlspecialchars($instance[$title_field]); ?>" /> <?php } ?> <?php