From dc916d11212bebff9bb598eb48b182e130e83bc4 Mon Sep 17 00:00:00 2001 From: "Philip M. Hofer (Frumph)" Date: Tue, 20 Oct 2009 18:14:59 -0700 Subject: [PATCH] 2.8.1.33 Signed-off-by: Philip M. Hofer (Frumph) --- archive-comic-month.php | 47 ++ archive-comic-storyline-thumbs.php | 2 +- archive-comic-year.php | 2 - archive.php | 6 +- buystrip.php | 9 +- comicpress-config.php | 2 +- comicpress-options-config.php | 5 + comments.php | 6 +- footer.php | 6 +- functions.php | 50 +- functions/avatars.php | 18 +- functions/displayblogpost.php | 6 +- functions/displaycomicpost.php | 4 +- functions/moods.php | 16 +- functions/multicomics.php | 10 - header.php | 27 +- images/nav/default/navstyle.css | 4 +- index.php | 16 +- options/menubaroptions.php | 14 + options/themestyle.php | 3 + searchform-transcript.php | 2 +- searchform.php | 4 +- sidebar-left.php | 18 +- sidebar-menubar.php | 15 +- sidebar-right.php | 44 +- single.php | 4 +- style.css | 201 +++---- themepack/blueocean/background.png | Bin 0 -> 310 bytes themepack/blueocean/browse-search.png | Bin 0 -> 9651 bytes themepack/blueocean/comment-balloon.png | Bin 0 -> 2359 bytes themepack/blueocean/commentlink.php | 5 + themepack/blueocean/header.png | Bin 0 -> 32411 bytes themepack/blueocean/menu-nav.png | Bin 0 -> 8756 bytes themepack/blueocean/menu.png | Bin 0 -> 426 bytes themepack/blueocean/nav/archive.png | Bin 0 -> 11862 bytes themepack/blueocean/nav/buyprint.png | Bin 0 -> 14928 bytes themepack/blueocean/nav/comments.png | Bin 0 -> 12716 bytes themepack/blueocean/nav/first.png | Bin 0 -> 9912 bytes themepack/blueocean/nav/last.png | Bin 0 -> 9778 bytes themepack/blueocean/nav/navstyle.css | 128 +++++ themepack/blueocean/nav/next.png | Bin 0 -> 14651 bytes themepack/blueocean/nav/nextchap.png | Bin 0 -> 12640 bytes themepack/blueocean/nav/prev.png | Bin 0 -> 14887 bytes themepack/blueocean/nav/prevchap.png | Bin 0 -> 12707 bytes themepack/blueocean/nav/random.png | Bin 0 -> 16146 bytes themepack/blueocean/notes.php | 7 + themepack/blueocean/post-bottom-odd.png | Bin 0 -> 8759 bytes themepack/blueocean/post-bottom.png | Bin 0 -> 7814 bytes themepack/blueocean/screenshot.png | Bin 0 -> 14784 bytes themepack/blueocean/sidebar-left-bottom.png | Bin 0 -> 3314 bytes themepack/blueocean/sidebar-right-bottom.png | Bin 0 -> 3804 bytes themepack/blueocean/style.css | 562 +++++++++++++++++++ themepack/boxed/background.png | Bin 338 -> 200 bytes themepack/boxed/classic-background-wide.png | Bin 272 -> 269 bytes themepack/boxed/notes.php | 2 +- themepack/boxed/style.css | 4 +- themepack/moosemountain/browse-search.png | Bin 0 -> 9651 bytes themepack/moosemountain/earl-extras.jpg | Bin 0 -> 72175 bytes themepack/moosemountain/nav/first.png | Bin 8748 -> 5866 bytes themepack/moosemountain/nav/firstlast.psd | Bin 0 -> 202031 bytes themepack/moosemountain/nav/last.png | Bin 8650 -> 5675 bytes themepack/moosemountain/nav/navstyle.css | 37 +- themepack/moosemountain/nav/next.png | Bin 13120 -> 3538 bytes themepack/moosemountain/nav/prev.png | Bin 13109 -> 3549 bytes themepack/moosemountain/nav/prevnext.psd | Bin 0 -> 225027 bytes themepack/moosemountain/style.css | 76 ++- themepack/silver/notes.php | 2 +- themepack/silver/style.css | 29 +- themepack/slickblack/notes.php | 1 - themepack/slickblack/style.css | 19 +- widgets/archive-dropdown.php | 37 +- widgets/bookmark.php | 35 +- widgets/calendar.php | 3 + widgets/comiccomments.php | 2 +- widgets/graphical-navigation.php | 60 +- widgets/latestcomicjump.php | 2 +- widgets/menubar.php | 12 +- widgets/social.php | 95 ++++ 78 files changed, 1295 insertions(+), 364 deletions(-) create mode 100644 archive-comic-month.php create mode 100644 themepack/blueocean/background.png create mode 100644 themepack/blueocean/browse-search.png create mode 100644 themepack/blueocean/comment-balloon.png create mode 100644 themepack/blueocean/commentlink.php create mode 100644 themepack/blueocean/header.png create mode 100644 themepack/blueocean/menu-nav.png create mode 100644 themepack/blueocean/menu.png create mode 100644 themepack/blueocean/nav/archive.png create mode 100644 themepack/blueocean/nav/buyprint.png create mode 100644 themepack/blueocean/nav/comments.png create mode 100644 themepack/blueocean/nav/first.png create mode 100644 themepack/blueocean/nav/last.png create mode 100644 themepack/blueocean/nav/navstyle.css create mode 100644 themepack/blueocean/nav/next.png create mode 100644 themepack/blueocean/nav/nextchap.png create mode 100644 themepack/blueocean/nav/prev.png create mode 100644 themepack/blueocean/nav/prevchap.png create mode 100644 themepack/blueocean/nav/random.png create mode 100644 themepack/blueocean/notes.php create mode 100644 themepack/blueocean/post-bottom-odd.png create mode 100644 themepack/blueocean/post-bottom.png create mode 100644 themepack/blueocean/screenshot.png create mode 100644 themepack/blueocean/sidebar-left-bottom.png create mode 100644 themepack/blueocean/sidebar-right-bottom.png create mode 100644 themepack/blueocean/style.css create mode 100644 themepack/moosemountain/browse-search.png create mode 100644 themepack/moosemountain/earl-extras.jpg create mode 100644 themepack/moosemountain/nav/firstlast.psd create mode 100644 themepack/moosemountain/nav/prevnext.psd create mode 100644 widgets/social.php diff --git a/archive-comic-month.php b/archive-comic-month.php new file mode 100644 index 0000000..c2b0c44 --- /dev/null +++ b/archive-comic-month.php @@ -0,0 +1,47 @@ + + + + +
+
+
+ +
+

+ +
+ + + '" . date('Y-m-d', strtotime('-30 days')) . "'"; +// $where .= " AND post_date >= '2009-03-01' AND post_date < '2009-03-16'"; + return $where; + } +add_filter('posts_where', 'filter_where'); +$posts = query_posts('&show_posts=-1&posts_per_page=-1&cat='.get_all_comic_categories_as_cat_string()); + +?> + + +
+
+ <?php the_title() ?>
+
+
+ +
+
+
+
+ + + + + \ No newline at end of file diff --git a/archive-comic-storyline-thumbs.php b/archive-comic-storyline-thumbs.php index 193649b..ff8f898 100644 --- a/archive-comic-storyline-thumbs.php +++ b/archive-comic-storyline-thumbs.php @@ -47,7 +47,7 @@ Template Name: Comic Storyline with Thumbs
  • > - + cat_name ?> diff --git a/archive-comic-year.php b/archive-comic-year.php index 979c2ba..4cefb02 100644 --- a/archive-comic-year.php +++ b/archive-comic-year.php @@ -16,8 +16,6 @@ if (isset($_REQUEST['archive_year'])) { } if (empty($archive_year) || $archive_year == '') $archive_year = date('Y'); ?> - -
    diff --git a/archive.php b/archive.php index 40a3d10..46479f7 100644 --- a/archive.php +++ b/archive.php @@ -49,8 +49,8 @@
    -
    - <?php the_title() ?>
    +
    + <?php the_title() ?>
    @@ -133,7 +133,7 @@ - +
    diff --git a/buystrip.php b/buystrip.php index 726f099..5a07bca 100644 --- a/buystrip.php +++ b/buystrip.php @@ -28,8 +28,15 @@ Templete Author Email: philip@frumph.net

    +
    - <?php the_title(); ?>
    + <?php the_title(); ?>

    diff --git a/comicpress-config.php b/comicpress-config.php index 09dd747..09a30e0 100644 --- a/comicpress-config.php +++ b/comicpress-config.php @@ -25,7 +25,7 @@ $rss_comic_width = "600"; $blog_postcount = "3"; //Mini Comic Width - The width your comics will appear in minithumbs (default "100") -$mini_comic_width = "100"; +$mini_comic_width = "80"; //Minithumb Comic Folder - The folder for your your mini thumbs (default "comics-mini") $mini_comic_folder = "comics-mini"; diff --git a/comicpress-options-config.php b/comicpress-options-config.php index 5c126f0..89e3c79 100644 --- a/comicpress-options-config.php +++ b/comicpress-options-config.php @@ -274,6 +274,11 @@ $options = array ( "default" => "no", "type" => "comicpress-remove_wptexturize"), + array( + "id" => "comicpress-disable_default_menubar", + "default" => "no", + "type" => "comicpress-disable_default_menubar"), + array("type" => "close") ); ?> \ No newline at end of file diff --git a/comments.php b/comments.php index c55455a..bc491c7 100644 --- a/comments.php +++ b/comments.php @@ -8,6 +8,7 @@ if ( post_password_required() ) { ?> return; } ?> +
    @@ -121,7 +122,7 @@ if ( post_password_required() ) { ?> ID); ?>

    - +

    @@ -132,4 +133,5 @@ if ( post_password_required() ) { ?>
    - \ No newline at end of file + +
    \ No newline at end of file diff --git a/footer.php b/footer.php index 4a39afd..f5c4c8d 100644 --- a/footer.php +++ b/footer.php @@ -1,4 +1,4 @@ - +','before_title' => '

    ', 'after_title' => '

    ' )); -} +} function storyline_category_list() { $listcats = wp_list_categories('echo=0&title_li=&include='.get_all_comic_categories_as_cat_string()); @@ -793,20 +794,26 @@ function storyline_category_list() { } /** - * This is function comicpress_is_active_sidebar - * - * @param $name - sidebar name made with register_sidebar(array('name'=>'Name of Sidebar'), - * use 'Sidebar 1' .. # if no sidebar names specified. - * @return true if sidebar with $name has widgets, false if not. + * function is_active_sidebar + * check if a sidebar has widgets based on index number or name * + * @param $index - sidebar name made with register_sidebar(array('name'=>'Name of Sidebar'), + * OR the index # as an int for specific sidebar. + * @return true if sidebar with $index has widgets, false if not. + * */ -function comicpress_is_active_sidebar( $name ) { +function comicpress_is_active_sidebar( $index ) { global $wp_registered_sidebars, $_wp_sidebars_widgets; - $i = 1; - foreach ( $wp_registered_sidebars as $sidebar => $registered_sidebar ) { - if ( $name == $registered_sidebar['name'] && !empty($_wp_sidebars_widgets[sanitize_title("sidebar-$i")]) ) + if ( is_int($index) ) { + if (!empty($_wp_sidebars_widgets[sanitize_title("sidebar-$index")]) ) return true; - $i++; + } else { + $i = 1; + foreach ( $wp_registered_sidebars as $sidebar => $registered_sidebar ) { + if ( $index == $registered_sidebar['name'] && !empty($_wp_sidebars_widgets[sanitize_title("sidebar-$i")]) ) + return true; + $i++; + } } return false; } @@ -836,11 +843,24 @@ function cp_copyright() { function comicpress_check_themepack_file($filename = '') { global $themepack_directory; if (empty($filename)) return false; - if ( ($themepack_directory != 'none' && !empty($themepack_directory) ) && file_exists(get_template_directory() . '/themepack/'.$themepack_directory.'/'.$filename) ) { - @include(get_template_directory() . '/themepack/' .$themepack_directory. '/'.$filename); + if ( ($themepack_directory != 'none' && !empty($themepack_directory) ) && file_exists(get_template_directory() . '/themepack/'.$themepack_directory.'/'.$filename.'.php') ) { + @include(get_template_directory() . '/themepack/' .$themepack_directory. '/'.$filename .'.php'); return true; } return false; } +function rss_count_comments(){ + global $wpdb,$post; + $args = func_get_args(); + $comments = get_comments_number(); + echo $args[0]; + if ($comments == 0) $comment_text = " (No Comments)"; + if ($comments == 1) $comment_text = " (1 Comment)"; + if ($comments > 1) $comment_text = " (". $comments . " Comments)"; + if ($comments>0) echo $comment_text; +} + +add_action('the_title_rss','rss_count_comments'); + ?> \ No newline at end of file diff --git a/functions/avatars.php b/functions/avatars.php index 6aa2631..1015773 100644 --- a/functions/avatars.php +++ b/functions/avatars.php @@ -92,15 +92,19 @@ function comicpress_random_default_avatar($id_or_email = '') { if (empty($current_avatar_directory)) $current_avatar_directory = 'default'; $count = count($results = glob(get_template_directory() . '/images/avatars/'.$current_avatar_directory.'/*')); - $default = ''; - $checknum = hexdec(substr(md5($id_or_email),0,5)) % $count; - if ($count > 0) { - $default = basename($results[(int)$checknum]); - } else { - return false; + if ($count) { + $default = ''; + + $checknum = hexdec(substr(md5($id_or_email),0,5)) % $count; + if ($count > 0) { + $default = basename($results[(int)$checknum]); + } else { + return false; + } + return get_bloginfo('stylesheet_directory').'/images/avatars/'.$current_avatar_directory.'/'.$default; } - return get_bloginfo('stylesheet_directory').'/images/avatars/'.$current_avatar_directory.'/'.$default; + return false; } ?> \ No newline at end of file diff --git a/functions/displayblogpost.php b/functions/displayblogpost.php index 97cf231..603bcb3 100644 --- a/functions/displayblogpost.php +++ b/functions/displayblogpost.php @@ -7,8 +7,8 @@ */ function display_blog_post() { - if (comicpress_check_themepack_file('displayblogpost.php') == false) { - global $post, $wp_query, $authordata, $enable_related_posts, $enable_post_author_gravatar, $enable_post_calendar, $themepack_directory; ?> + if (comicpress_check_themepack_file('displayblogpost') == false) { + global $post, $wp_query, $authordata, $enable_related_posts, $enable_post_author_gravatar, $enable_post_calendar, $themepack_directory, $disable_categories_in_posts, $disable_tags_in_posts; ?>
    @@ -55,7 +55,7 @@ function display_blog_post() { comment_status) { - if (comicpress_check_themepack_file('commentlink.php') == false) { ?> + if (comicpress_check_themepack_file('commentlink') == false) { ?>
      '.__('No Comments ','comicpress'), '1 '.__('Comment ','comicpress'), '% '.__('Comments ','comicpress')); ?>
    @@ -59,7 +59,7 @@ function display_comic_post() { comment_status) { - if (comicpress_check_themepack_file('commentlink.php') == false) { ?> + if (comicpress_check_themepack_file('commentlink') == false) { ?>
      '.__('No Comments ','comicpress'), '1 '.__('Comment ','comicpress'), '% '.__('Comments ','comicpress')); ?>
    -
    -



    @@ -78,7 +76,6 @@ function comicpress_showmood_edit_post() {
    -
    \ No newline at end of file diff --git a/functions/multicomics.php b/functions/multicomics.php index 3546366..a0ff225 100644 --- a/functions/multicomics.php +++ b/functions/multicomics.php @@ -15,16 +15,6 @@ function display_comics_multi() { <?php the_title(); ?>
    -
    - <?php the_title(); ?> -
    - - - + + - + \ No newline at end of file diff --git a/images/nav/default/navstyle.css b/images/nav/default/navstyle.css index 4e5f3c3..1eaf7eb 100644 --- a/images/nav/default/navstyle.css +++ b/images/nav/default/navstyle.css @@ -62,7 +62,9 @@ Style: Default background: url('buyprint.png') no-repeat; } - .navi-buyprint:hover { + .navi-buyprint:hover, button .navi-buyprint:hover { + background: url('buyprint.png') no-repeat; + background-position: -66px 0; color: #f00; } diff --git a/index.php b/index.php index 490a738..be6b24e 100644 --- a/index.php +++ b/index.php @@ -20,7 +20,7 @@ in_the_loop = true; $comicFrontpage = new WP_Query(); $comicFrontpage->query('showposts=1&cat='.get_all_comic_categories_as_cat_string()); while ($comicFrontpage->have_posts()) : $comicFrontpage->the_post() ?> - +
    @@ -75,15 +75,17 @@ if ($disable_comic_frontpage != 'yes' && $disable_comic_blog_frontpage != 'yes' $blog_query = 'showposts='.$blog_postcount.'&cat="-'.exclude_comic_categories().'"&paged='.$paged; $posts = query_posts($blog_query); - if (have_posts()) { - - while (have_posts()) : the_post(); + if (have_posts()) { ?> +
    +
    + +
    +
    +
    diff --git a/options/menubaroptions.php b/options/menubaroptions.php index 21c26b8..133d1ee 100644 --- a/options/menubaroptions.php +++ b/options/menubaroptions.php @@ -6,6 +6,20 @@ +
    + + + + + + diff --git a/options/themestyle.php b/options/themestyle.php index a88961e..7f10d57 100644 --- a/options/themestyle.php +++ b/options/themestyle.php @@ -35,6 +35,9 @@ + /">
    - +
    \ No newline at end of file diff --git a/searchform.php b/searchform.php index 647df52..83c514e 100644 --- a/searchform.php +++ b/searchform.php @@ -1,6 +1,6 @@
    - - + +
    \ No newline at end of file diff --git a/sidebar-left.php b/sidebar-left.php index ef8adb4..36de653 100644 --- a/sidebar-left.php +++ b/sidebar-left.php @@ -3,15 +3,21 @@ if ($disable_lrsidebars_frontpage == 'yes' && is_home()) { } else { ?>


    		+ +    + + + +


    		ComicPress Theme Style + Standard and Vertical themes are 780px, 3 Column, Graphic Novel and Vertical 3 Column are 980px wide. +
    -
    + if ($instance['archives'] == 'on' && !empty($instance['archive_path'])) { ?> + if ($instance['random'] == 'on') { ?> -
    + if ($instance['comictitle'] == 'on') { ?> +
    ""
    + if ($instance['comments'] == 'on') { ?> + if ($instance['buyprint'] == 'on') { ?>
    - +
    - + if ($instance['next'] == 'on') { + if (!empty($next_comic)) { + if (($next_comic == $latest_comic) && $instance['nextgohome'] == 'on') { ?> + + + +
    - + if ($instance['last'] == 'on') { + if (!empty($last_comic) && ($last_comic != $this_permalink)) { + if ($instance['nextgohome'] == 'on') { ?> + + + +
    -
    + + +
    'Comments', 'next_title' => 'Next', 'buyprint_title' => 'Buy Print', - 'comictitle' => 'off' + 'comictitle' => 'off', + 'nextgohome' => 'off', ) ); $first = $instance['first']; if (empty($first)) $first = 'on'; $last = $instance['last']; if (empty($last)) $last = 'on'; @@ -170,6 +183,7 @@ class widget_comicpress_graphical_navigation extends WP_Widget { $next = $instance['next']; if (empty($next)) $next = 'on'; $buyprint = $instance['buyprint']; if (empty($buyprint)) $buyprint = 'off'; $comictitle = $instance['comictitle']; if (empty($comictitle)) $comictitle = 'off'; + $nextgohome = $instance['nextgohome']; if (empty($nextgohome)) $nextgohome = 'off'; $first_title = $instance['first_title']; @@ -252,8 +266,10 @@ class widget_comicpress_graphical_navigation extends WP_Widget { />On  />Off
    Title:

    - - +
    +
    + />On  />Off
    + -