diff --git a/404.php b/404.php index 128c72f..29146e5 100644 --- a/404.php +++ b/404.php @@ -5,7 +5,7 @@

-

+


diff --git a/archive-comic-calendar.php b/archive-comic-calendar.php index d0b527e..e8986a7 100644 --- a/archive-comic-calendar.php +++ b/archive-comic-calendar.php @@ -95,16 +95,16 @@ foreach ( $years as $year ) { 0) { if (is_array($monthfile)) $monthfile = reset($monthfile); ?> - <?php echo $month[$i]['month'] ?> + <?php echo $month[$i]['month'] ?> - <?php echo $month[$i]['month'] ?> + <?php echo $month[$i]['month'] ?> 0) { if (is_array($monthfile)) $monthfile = reset($monthfile); ?> - <?php echo $month[$i]['month'] ?> + <?php echo $month[$i]['month'] ?> - <?php echo $month[$i]['month'] ?> + <?php echo $month[$i]['month'] ?> diff --git a/comicpress-options.php b/comicpress-options.php index b277e41..da16d4c 100644 --- a/comicpress-options.php +++ b/comicpress-options.php @@ -10,11 +10,11 @@ function comicpress_options() { function comicpress_admin_page_head() { global $is_IE; if ($is_IE) { ?> - + - + - + diff --git a/functions.php b/functions.php index 42f76d6..b51c5f1 100644 --- a/functions.php +++ b/functions.php @@ -1,12 +1,15 @@ + + + + \ No newline at end of file diff --git a/functions/checkbrowser.php b/functions/checkbrowser.php deleted file mode 100644 index 099b43a..0000000 --- a/functions/checkbrowser.php +++ /dev/null @@ -1,7 +0,0 @@ - \ No newline at end of file diff --git a/functions/comment-functions.php b/functions/comment-functions.php index 8c7c35d..312f6a9 100644 --- a/functions/comment-functions.php +++ b/functions/comment-functions.php @@ -123,20 +123,19 @@ function comicpress_comments_callback($comment, $args, $depth) {
  • - + -
    +
    + +
    +
    +
    -
    -
    -
    + + + - - - - - | - + | '.__('Edit','comicpress').'',' | ',''); ?> comment_approved == '0') : ?> -
    +
    -
    - -
    - +
    + +
    +
    - - -
    -
    - - -
    + 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; ?> + +
    +
    + +
    - -
    -
    -
    -
    id="post-"> -
    - -
    - - - -
    -
    -
    - -
    -

    -
    By on
    - -
    - -
    - -
    -
    -
    -
    - - - '
    Pages: ', 'after' => '
    ', 'next_or_number' => 'number')); ?> -
    -
    -
    - -
    - '); ?> +
    + +
    +
    +
    +
    id="post-"> +
    + +
    + + + +
    +
    - comment_status && !is_single()) { - if (comicpress_check_themepack_file('commentlink') == false) { ?> -
      '.__('No Comments ','comicpress'), '1 '.__('Comment ','comicpress'), '% '.__('Comments ','comicpress')); ?>
    - +
    +

    +
    By on
    + +
    + +
    + +
    - +
    +
    + + + '
    Pages: ', 'after' => '
    ', 'next_or_number' => 'number')); ?>

    +
    + +
    + '); ?> +
    + + comment_status && !is_single()) { + if (comicpress_check_child_file('partials/commentlink') == false) { ?> +
      '.__('No Comments ','comicpress'), '1 '.__('Comment ','comicpress'), '% '.__('Comments ','comicpress')); ?>
    + +
    +
    -
    -
    - +
    +
    +
    + \ No newline at end of file diff --git a/functions/displaycomicpost.php b/functions/displaycomicpost.php index 1895bdd..604b7a1 100644 --- a/functions/displaycomicpost.php +++ b/functions/displaycomicpost.php @@ -7,7 +7,6 @@ */ 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; ?>
    @@ -50,7 +49,7 @@ function display_comic_post() { comment_status == 'open' && !is_single()) { - if (comicpress_check_themepack_file('commentlink') == false) { ?> + if (comicpress_check_child_file('partials/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')); ?>
    - -
    - -
    -
    -
    -
    -
    - - \ No newline at end of file diff --git a/functions/moods.php b/functions/moods.php index 1ea8b4b..eb4bfac 100644 --- a/functions/moods.php +++ b/functions/moods.php @@ -23,9 +23,11 @@ function comicpress_show_mood_in_post() { if (!empty($mood_file) && $mood_file != '') { $mood = explode(".", $mood); $mood = reset($mood); - if ( !empty($mood_file) && file_exists(get_template_directory() . '/images/moods/'.$moods_directory.'/'.$mood_file) ) { ?> -
    <?php echo $mood; ?>
    - +
    <?php echo $mood; ?>
    + +
    <?php echo $mood; ?>
    + '.__('Using Moods from directory: ','comicpress').$moods_directory.'
    '.__('Current Mood: ','comicpress').$mood.'

    '; @@ -67,7 +75,7 @@ function comicpress_showmood_edit_post() { $newmood = $newmood[0]; ?>

    diff --git a/functions/rawformatting.php b/functions/rawformatting.php deleted file mode 100644 index fa72462..0000000 --- a/functions/rawformatting.php +++ /dev/null @@ -1,6 +0,0 @@ - \ No newline at end of file diff --git a/header.php b/header.php index ec2ac55..800451d 100644 --- a/header.php +++ b/header.php @@ -2,41 +2,28 @@ > <?php - bloginfo('name'); - if (is_home () ) { - echo " - "; bloginfo('description'); - } elseif (is_category() ) { - echo " - "; single_cat_title(); - } elseif (is_single() || is_page() ) { - echo " - "; single_post_title(); - } elseif (is_search() ) { + bloginfo('name'); + if (is_home () ) { + echo " - "; bloginfo('description'); + } elseif (is_category() ) { + echo " - "; single_cat_title(); + } elseif (is_single() || is_page() ) { + echo " - "; single_post_title(); + } elseif (is_search() ) { echo __(" search results: ",'comicpress'); echo wp_specialchars($s); - } else { - echo " - "; wp_title('',true); - } + } else { + echo " - "; wp_title('',true); + } ?> - - - - - - - - - + + - @@ -48,30 +35,27 @@
    -
    - - + - - - diff --git a/images/nav/bar/navstyle.css b/images/nav/bar/navstyle.css deleted file mode 100644 index 2f9298d..0000000 --- a/images/nav/bar/navstyle.css +++ /dev/null @@ -1,145 +0,0 @@ -/* COMIC NAVIGATION -Author: Tyler Martin -Style: Default -*/ -#comic_navi_wrapper { - width: 100%; - text-align: center; -} - -.comic_navi_left { - display: inline-block; - float: left; -} - -.comic_navi_center { - margin: 0 auto; - display: inline-block; -} - -.comic_navi_right { - display: inline-block; - float: right; -} - -.comic_navi { - width: 100%; - background: #000; - margin: 0 auto; - list-style: none; - line-height: 25px; - font-size: 13px; - display: inline-block; -} - -.navi-comictitle { - padding: 0px 10px; - text-align: center; - display: inline-block; -} - .navi-comictitle a { - color: #fff; - } - - .navi-comictitle a:hover { - color: #f00; - } - -.navi { - padding: 0 10px; - color: #fff; -} - -.navi a { - display: block; - color: #fff; - text-decoration: none; -} - - .navi a:hover { - color: #000; - background: #f00; - } - -.navi-first { - float: left; -} - -.navi-prevchap, .navi-story_prev { - float: left; -} - -.navi-story_prev_in { - float: left; -} - -.navi-prev, .navi-previous { - float: left; -} - - -.navi-comments, .navi-archive, .navi-random, .navi-buyprint { - display: inline-block; -} - -.navi-buyprint { - height: 25px; - width: 80px; - line-height: 15px; - color: #000; - margin: 0; - padding: 0; -} - - .navi-buyprint:hover, button .navi-buyprint:hover { - } - - .navi-buyprint-form { - display: inline-block; - } - -.navi-archive, .navi-archives { - display: inline-block; -} - -.navi-random { - display: inline-block; -} - -.navi-comments { -} - - a.navi-comments span { - } - - 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 { -/* margin: 0 5px; */ - } - diff --git a/images/nav/default/archive.png b/images/nav/default/archive.png deleted file mode 100644 index 55ceb86..0000000 Binary files a/images/nav/default/archive.png and /dev/null differ diff --git a/images/nav/default/buyprint.png b/images/nav/default/buyprint.png deleted file mode 100644 index 8f4b09e..0000000 Binary files a/images/nav/default/buyprint.png and /dev/null differ diff --git a/images/nav/default/comments.png b/images/nav/default/comments.png deleted file mode 100644 index d71f087..0000000 Binary files a/images/nav/default/comments.png and /dev/null differ diff --git a/images/nav/default/first.png b/images/nav/default/first.png deleted file mode 100644 index e230e5e..0000000 Binary files a/images/nav/default/first.png and /dev/null differ diff --git a/images/nav/default/last.png b/images/nav/default/last.png deleted file mode 100644 index b60e7c6..0000000 Binary files a/images/nav/default/last.png and /dev/null differ diff --git a/images/nav/default/navstyle.css b/images/nav/default/navstyle.css index bee8d8f..2f9298d 100644 --- a/images/nav/default/navstyle.css +++ b/images/nav/default/navstyle.css @@ -3,131 +3,140 @@ Author: Tyler Martin Style: Default */ #comic_navi_wrapper { - padding: 5px 0 10px 0; + width: 100%; + text-align: center; } -#comic_navi { - display: table; - border-collapse: collapse; - margin: 0 auto; +.comic_navi_left { + display: inline-block; + float: left; +} +.comic_navi_center { + margin: 0 auto; + display: inline-block; +} + +.comic_navi_right { + display: inline-block; + float: right; +} + +.comic_navi { + width: 100%; + background: #000; + margin: 0 auto; + list-style: none; + line-height: 25px; + font-size: 13px; + display: inline-block; } .navi-comictitle { + padding: 0px 10px; text-align: center; - float: left; - display: block; - padding-top: 26px; - max-width: 200px; + display: inline-block; } + .navi-comictitle a { + color: #fff; + } + + .navi-comictitle a:hover { + color: #f00; + } .navi { - width: 66px; - padding: 66px 0 0 0; -/* margin: 0 5px; */ - display: block; - float: left; - overflow: hidden; - font-size: 11px; - text-align: center; - color: #555; + padding: 0 10px; + color: #fff; } - .navi:hover { - background-position: -66px 0; +.navi a { + display: block; + color: #fff; + text-decoration: none; +} + + .navi a:hover { + color: #000; + background: #f00; } .navi-first { - margin: 0; - background: url('first.png') no-repeat; + float: left; } .navi-prevchap, .navi-story_prev { - background: url('prevchap.png') no-repeat; + float: left; } .navi-story_prev_in { - background: url('prevchap.png') no-repeat; + float: left; } .navi-prev, .navi-previous { - margin-right: 30px; - background: url('prev.png') no-repeat; + float: left; } .navi-comments, .navi-archive, .navi-random, .navi-buyprint { - margin: 0 5px; + display: inline-block; } .navi-buyprint { - border: none; - cursor: pointer; - background: url('buyprint.png') no-repeat; + height: 25px; + width: 80px; + line-height: 15px; + color: #000; + margin: 0; + padding: 0; } .navi-buyprint:hover, button .navi-buyprint:hover { - background: url('buyprint.png') no-repeat; - background-position: -66px 0; - color: #f00; } .navi-buyprint-form { - width: 76px; - display: block; - float: left; - margin: 0; - padding: 0; + display: inline-block; } .navi-archive, .navi-archives { - background: url('archive.png') no-repeat; + display: inline-block; } .navi-random { - background: url('random.png') no-repeat; + display: inline-block; } .navi-comments { - padding: 0; - background: url('comments.png') no-repeat; } a.navi-comments span { - width: 66px; - height: 66px; - display: block; - font-size: 16px; - font-weight: bold; - line-height: 66px; - color: #c5c5c5; } a.navi-comments span:hover { - color: #860b04; + } + + .navi-comments-count { + padding-right: 4px; } .navi-next { - margin-left: 30px; - background: url('next.png') no-repeat; + float: left; } .navi-nextchap, .navi-story_next { - background: url('nextchap.png') no-repeat; + float: left; } .navi-story_next_in { - background: url('nextchap.png') no-repeat; + float: left; } .navi-last { - margin: 0; - background: url('last.png') no-repeat; + float: left; } .navi-void, .navi-void:hover { - color: #999; - background-position: -132px 0; + color: #555; } .comic-left .navi-prev, .comic-right .navi-prev, .comic-left .navi-next, .comic-right .navi-next { diff --git a/images/nav/default/next.png b/images/nav/default/next.png deleted file mode 100644 index 5139003..0000000 Binary files a/images/nav/default/next.png and /dev/null differ diff --git a/images/nav/default/nextchap.png b/images/nav/default/nextchap.png deleted file mode 100644 index 1aa1253..0000000 Binary files a/images/nav/default/nextchap.png and /dev/null differ diff --git a/images/nav/default/prev.png b/images/nav/default/prev.png deleted file mode 100644 index eba5251..0000000 Binary files a/images/nav/default/prev.png and /dev/null differ diff --git a/images/nav/default/prevchap.png b/images/nav/default/prevchap.png deleted file mode 100644 index 09365c6..0000000 Binary files a/images/nav/default/prevchap.png and /dev/null differ diff --git a/images/nav/default/random.png b/images/nav/default/random.png deleted file mode 100644 index e1cc5c4..0000000 Binary files a/images/nav/default/random.png and /dev/null differ diff --git a/index.php b/index.php index 8eb3707..846aeef 100644 --- a/index.php +++ b/index.php @@ -18,9 +18,9 @@ - in_the_loop = true; $comicFrontpage = new WP_Query(); $comicFrontpage->query('showposts=1&cat='.get_all_comic_categories_as_cat_string()); + 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() ?> - +
    @@ -56,15 +56,15 @@
    - - have_posts()) : $comicFrontpage->the_post(); - display_comic_post(); - $comicFrontPage->is_single = true; - comments_template(); + have_posts()) : $comicFrontpage->the_post(); + display_comic_post(); + $comicFrontPage->is_single = true; + comments_template(); endwhile; ?> @@ -72,55 +72,55 @@ if ($disable_comic_frontpage != 'yes' && $disable_comic_blog_frontpage != 'yes'
    - -
    -
    -
    - View all posts by:
    - View all posts by:
    - - \ No newline at end of file + diff --git a/layout-foot.php b/layout-foot.php index da2ca46..e5ebdc5 100644 --- a/layout-foot.php +++ b/layout-foot.php @@ -1,3 +1,4 @@ +
    + diff --git a/layout-head.php b/layout-head.php index 1cf129e..8aa1394 100644 --- a/layout-head.php +++ b/layout-head.php @@ -1,3 +1,4 @@ +
    @@ -24,4 +25,5 @@
    + diff --git a/links.php b/links.php index 9cbeac7..5bbcd85 100644 --- a/links.php +++ b/links.php @@ -7,9 +7,9 @@ Template Name: Links ]*)>#', '
  • ', $bookmarks); - $bookmarks = preg_replace('#