diff --git a/404.php b/404.php index e33b438..426287a 100644 --- a/404.php +++ b/404.php @@ -12,23 +12,37 @@ get_header(); ?>
+
+
+

+
+
+

- + + + +

- +

+
+
+
+
+
diff --git a/archive.php b/archive.php index c60bac1..7519f6f 100644 --- a/archive.php +++ b/archive.php @@ -22,7 +22,7 @@ if ( is_category() ) { if ( isset( $wp_query->query_vars['cat'] ) ) $theCatID = (int) $wp_query->query_vars['cat']; } -$count = $wp_query->found_posts; +$count = $wp_query->found_posts; if ( empty( $count ) ) $count = 'No'; $title_string = ''; @@ -45,7 +45,7 @@ if ( $count > 0 ) { } elseif ( isset( $wp_query->query_vars['taxonomy'] ) && taxonomy_exists( $wp_query->query_vars['taxonomy'] ) ) { $taxonomy_name = ''; if ( isset( $wp_query->query_vars['chapters'] ) ) { - $taxonomy_name = get_term_by('slug', $wp_query->query_vars['chapters'], 'chapters'); + $taxonomy_name = get_term_by( 'slug', $wp_query->query_vars['chapters'], 'chapters' ); if ( ! is_wp_error( $taxonomy_name ) && ! empty( $taxonomy_name ) ) $title_string = $taxonomy_name->name; } elseif (isset($wp_query->query_vars['locations'])) { $taxonomy_name = get_term_by( 'slug', $wp_query->query_vars['locations'], 'locations' ); @@ -63,11 +63,17 @@ if ( $count > 0 ) { } else $title_string = __( 'No Archive Found.', 'comicpress' ); if ( have_posts() ) { ?> -

+ +

+ +

+ query_vars['chapters'] ) || ( $wp_query->query_vars['post_type'] == 'comic' ) ) { ?> +
+ +
+ +
+ +
+ +
+ query_vars['chapters'] ) || isset( $wp_query->query_vars['characters'] ) || isset( $wp_query->query_vars['locations'] ) || ( $wp_query->query_vars['post_type'] == 'comic' ) ) && ( comicpress_themeinfo( 'display_archive_as_links' ) && ! comicpress_is_bbpress() ) ) { while ( have_posts() ) : the_post(); ?> +
+
+ +
+
+ -
+ + + + +
+
+
+ + } elseif ( comicpress_themeinfo( 'display_archive_as_links' ) || comicpress_is_bbpress() ) { + ?> +
> +
+
- - - - - - + +
- - - - -
+ + + + + + + + -
+ + + + + + + + + + +
+ ?> + + +
+
+ post_type !== 'post' ) ? $post->post_type : get_post_format(); get_template_part( 'content', $post_format ); endwhile; } ?> +
+ +

+
+ +
+
+ + +
> +
+
+
+
- user_email, 64, comicpress_random_default_avatar( $curauth->user_email ), esc_attr( $curauth->display_name, 1) ) ); ?> + + user_email, 64, comicpress_random_default_avatar( $curauth->user_email ), esc_attr( $curauth->display_name, 1 ) ) ); + ?> +
+
+
+ display_name ) $authorname = $curauth->display_name; @@ -46,92 +59,142 @@ if ( get_query_var( 'author_name' ) ) { $authorname = $curauth->user_nicename; else $authorname = $curauth->user_login; ?> -

- - - - - - - - - - - - + +

+ +

+ + + + + + + + + + + + + + + +
- + + + + user_url ) ) { ?> + twitter ) ) { ?> + + facebook ) ) { ?> + - + + +
- user_email; ?> + + user_email; ?> +
- user_url; ?> + + user_url; ?> +
- twitter; ?> + + twitter; ?> +
- facebook; ?> + + facebook; ?> +
+
- description ) ) { ?> + description ) ) { + ?> +
- description; ?> + + description; + ?> +
- + +
+
- + +
+


+ - + + +
- + + +
+
- + + +
+
+
+
+ $paged, - 'post_type' => 'post' + 'post_type' => 'post', ); $wp_query = new WP_Query(); diff --git a/comments.php b/comments.php index 9463d6d..9d664cc 100644 --- a/comments.php +++ b/comments.php @@ -1,6 +1,11 @@ -

+if ( post_password_required() ) { + ?> + +

+ +

+ +
- + + +
- + + +
+

- + + +

+ query_vars['cpage'] ) || ( (int) $wp_query->query_vars['cpage'] < 2 ) ) && ( count( $comments_by_type['pings'] ) > 0 ) ) { ?>
+
    -
  1. -
      - +
        + + 'pings', 'avatar_size' => 32, @@ -34,16 +56,21 @@ if ( isset( $comments_by_type['pings'] ) && ( ! isset( $wp_query->query_vars['cp ); wp_list_comments( $comment_args ); ?> -
      - + +
    +
+
+ +
    - 'comment', 'reply_text' => __( 'Reply ¬', 'comicpress' ), @@ -53,7 +80,9 @@ if ( ! empty( $comments_by_type['comment'] ) ) { ); wp_list_comments( $comment_args ); ?> +
+ 1 && get_option( 'page_comments' ) ) { if ( comicpress_themeinfo( 'enable_numbered_pagination' ) ) { @@ -64,24 +93,51 @@ if ( ! empty( $comments_by_type['comment'] ) ) { $pagelinks = str_replace( '', '', $pagelinks ); ?> -
-
-
  • ' . __( 'Comment Pages', 'comicpress' ) . '
    • ' . $pagelinks . ''; ?> -
    -
    -
    - - -
    -
    - -
    -
    - +
    + +
    + +
  • ' . __( 'Comment Pages', 'comicpress' ) . '
    • ' . $pagelinks . ''; + ?> +
    +
    +
    + + + + + +
    + +
    + + + +
    + +
    + + + +
    + +
    + +
    + +
    + '

    ' . '' . '

    ', 'email' => '', 'url' => '

    ' . '

    ' + 'author' => '

    ' . '' . '

    ', + 'email' => '', + 'url' => '

    ' . '

    ' ); $args = array( 'fields' => apply_filters( 'comment_form_default_fields', $fields ), @@ -105,10 +165,19 @@ if ( comments_open() ) { ); comment_form( $args ); ?> +
    - 0 ) ) { ?> + + 0 ) ) { + ?> +

    - + + +
    diff --git a/content-aside.php b/content-aside.php index eeb839d..3df263c 100644 --- a/content-aside.php +++ b/content-aside.php @@ -1,10 +1,23 @@
    > +
    +
    - + + +
    - + + +
    +
    +
    +
    diff --git a/content-comic.php b/content-comic.php index 6e6e503..b5df396 100644 --- a/content-comic.php +++ b/content-comic.php @@ -1,40 +1,83 @@
    > +
    - + + +
    +
    Featured Post
    + +
    + Featured Post +
    + + +
    + post_type == 'post') { the_ratings(); } - do_action('comicpress-post-info'); - do_action('comic-post-info'); - wp_link_pages(array('before' => '
    Pages: ', 'after' => '
    ', 'next_or_number' => 'number')); + if ( function_exists( 'the_ratings' ) && $post->post_type == 'post' ) { + the_ratings(); + } + do_action( 'comicpress-post-info' ); + do_action( 'comic-post-info' ); + wp_link_pages( array( + 'before' => '
    Pages: ', + 'after' => '
    ', + 'next_or_number' => 'number', + ) ); ?> +
    +
    +
    +
    +
    - -
    -
    -
    + +
    +
    - + +
    + + + +
    + +
    + + +
    +
    diff --git a/content-link.php b/content-link.php index 25b71f4..7f56d3a 100644 --- a/content-link.php +++ b/content-link.php @@ -1,15 +1,40 @@
    + +
    + + +
    > +
    - + + +
    - + + +
    +
    - + + +
    +
    +
    +
    diff --git a/content-page.php b/content-page.php index bd0a7dd..9064c68 100644 --- a/content-page.php +++ b/content-page.php @@ -1,22 +1,49 @@ - + +
    > +
    +
    + +
    - '
    Pages: ', 'after' => '
    ', 'next_or_number' => 'number')); - ?> + + '
    Pages: ', + 'after' => '
    ', + 'next_or_number' => 'number', + ) ); + ?> +
    +
    +
    +
    - + + +
    +
    +
    - + + +
    +
    diff --git a/content.php b/content.php index 7356f15..9157c0a 100644 --- a/content.php +++ b/content.php @@ -1,19 +1,45 @@
    + +
    + + +
    > +
    - - + + + +
    +
    Featured Post
    + +
    + Featured Post +
    + + +
    + post_type == 'post') { the_ratings(); } - do_action('comicpress-post-info'); - wp_link_pages(array('before' => '
    Pages: ', 'after' => '
    ', 'next_or_number' => 'number')); + if ( function_exists( 'the_ratings' ) && $post->post_type == 'post' ) { + the_ratings(); + } + do_action( 'comicpress-post-info' ); + wp_link_pages( array( + 'before' => '
    Pages: ', + 'after' => '
    ', + 'next_or_number' => 'number', + ) ); ?> +
    +
    +
    +
    +
    - -
    -
    -
    + +
    +
    - + +
    + + + +
    + +
    + + +
    +
    +
    +
    diff --git a/footer.php b/footer.php index eb6b394..f8dac2b 100644 --- a/footer.php +++ b/footer.php @@ -1,48 +1,175 @@ - - -
    - - -
    - - - -

    queries. Memory usage. seconds.

    - -
    - -
    -
    - - - - - - \ No newline at end of file + + + + + + + + + + + + + + + + + + + diff --git a/functions/avatars.php b/functions/avatars.php index f7f2a94..03c6ad6 100644 --- a/functions/avatars.php +++ b/functions/avatars.php @@ -1,7 +1,9 @@ '; // tag after the current crumb /* === END OF OPTIONS === */ - if (!is_home() && !is_front_page() || is_paged()) { + if ( ! is_home() && ! is_front_page() || is_paged() ) { - echo ''; - } -} // end of dimox_breadcrumbs() \ No newline at end of file +} // end of dimox_breadcrumbs() diff --git a/functions/classes.php b/functions/classes.php index 08c1450..1047ba1 100644 --- a/functions/classes.php +++ b/functions/classes.php @@ -11,6 +11,7 @@ add_filter( 'body_class', 'comicpress_body_class' ); function comicpress_body_class( $classes = array() ) { + global $is_lynx, $is_gecko, $is_IE, $is_opera, $is_NS4, $is_safari, $is_chrome, $is_iphone, $post, $wp_query, $comicpress_is_signup; if ( is_user_logged_in() ) { @@ -88,6 +89,7 @@ function comicpress_body_class( $classes = array() ) { add_filter( 'post_class', 'comicpress_post_class' ); function comicpress_post_class( $classes = '' ) { + global $post; static $post_alt; @@ -133,6 +135,7 @@ function comicpress_post_class( $classes = '' ) { add_filter( 'comment_class', 'comicpress_comment_class' ); function comicpress_comment_class( $classes = '' ) { + global $current_user; /* http://microid.org */ @@ -146,4 +149,3 @@ function comicpress_comment_class( $classes = '' ) { if ( $current_user->user_email == $email ) $classes[] = 'ucomment'; return $classes; } -?> diff --git a/functions/comment-functions.php b/functions/comment-functions.php index c811ac6..04979c8 100644 --- a/functions/comment-functions.php +++ b/functions/comment-functions.php @@ -15,6 +15,7 @@ * @filter */ function comicpress_avatar() { + global $comment; $url = get_comment_author_url(); @@ -33,10 +34,10 @@ function comicpress_avatar() { if ( ! empty( $current_avatar_directory ) && ( $current_avatar_directory !== 'none' ) ) { $avatar_str = get_avatar( $id_or_email, 64, comicpress_random_default_avatar( $id_or_email ), esc_html( get_comment_author() ) ); } else $avatar_str = get_avatar( $id_or_email, 64 ); - $return_str = str_replace('photo', 'photo instant nocorner itxtalt', $avatar_str); - $return_str = str_replace('alt=', 'title="'.esc_html(get_comment_author()).'" alt=', $return_str); + $return_str = str_replace( 'photo', 'photo instant nocorner itxtalt', $avatar_str ); + $return_str = str_replace( 'alt=', 'title="'.esc_html(get_comment_author()).'" alt=', $return_str ); echo $return_str; - if( $url == true && $url != 'http://' ) + if ( $url == true && $url != 'http://' ) echo ''; echo ''; } @@ -52,10 +53,11 @@ function comicpress_avatar() { * @since 0.2.2 */ function comicpress_comment_author() { + global $comment; $author = get_comment_author(); - $url = get_comment_author_url(); + $url = get_comment_author_url(); /* * Registered members w/o URL defaults to 'http://' @@ -84,11 +86,11 @@ function comicpress_comment_author() { * Also properly cites trackbacks/pingbacks */ if( $url ) : - $output = ''; + $output = ''; $output .= '' . $author . ''; $output .= ''; else : - $output = ''; + $output = ''; $output .= $author; $output .= ''; endif; @@ -104,13 +106,15 @@ function comicpress_comment_author() { * @since 0.2.3 * * @param $comment The comment variable - * @param $args Array of arguments passed from wp_list_comments - * @param $depth What level the particular comment is + * @param $args Array of arguments passed from wp_list_comments + * @param $depth What level the particular comment is */ function comicpress_comments_callback( $comment, $args, $depth ) { + $GLOBALS['comment'] = $comment; $GLOBALS['comment_depth'] = $depth; ?> +
  • > @@ -118,12 +122,15 @@ function comicpress_comments_callback( $comment, $args, $depth ) {
    + +
    + + - | + | + + + comment_approved == '0' ) : ?> +
    + +
    + @@ -168,14 +183,19 @@ function comicpress_comments_callback( $comment, $args, $depth ) { +
    + +
    +
    +
    '; } function list_pings( $comment, $args, $depth ) { + $GLOBALS['comment'] = $comment; ?> -
    • +
  • + + + +
    • + \r\n"; $output .= comicpress_copyright_info(); $output .= "| "; @@ -23,7 +25,9 @@ if ( ! function_exists( 'comicpress_copyright_text' ) ) { } if ( ! function_exists( 'comicpress_hosted_on' ) ) { + function comicpress_hosted_on() { + if ( is_multisite() ) { $current_site = get_current_site(); if ( ! isset( $current_site->site_name ) ) { @@ -39,7 +43,9 @@ if ( ! function_exists( 'comicpress_hosted_on' ) ) { } if ( ! function_exists( 'comicpress_copyright_info' ) ) { + function comicpress_copyright_info() { + $copyright_name = comicpress_themeinfo( 'copyright_name' ); if ( empty( $copyright_name ) ) $copyright_name = get_bloginfo( 'name' ); $copyright_url = comicpress_themeinfo( 'copyright_url' ); @@ -50,7 +56,9 @@ if ( ! function_exists( 'comicpress_copyright_info' ) ) { } if ( ! function_exists( 'comicpress_copyright_dates' ) ) { + function comicpress_copyright_dates() { + global $wpdb; $copyright_dates = $wpdb->get_results(" SELECT @@ -61,7 +69,7 @@ if ( ! function_exists( 'comicpress_copyright_dates' ) ) { WHERE post_status = 'publish' "); - $output = ''; + $output = ''; if ( $copyright_dates ) { $copyright = $copyright_dates[0]->firstdate; if ( $copyright_dates[0]->firstdate != $copyright_dates[0]->lastdate ) { @@ -72,4 +80,3 @@ if ( ! function_exists( 'comicpress_copyright_dates' ) ) { return apply_filters( 'comicpress_copyright_dates', $output ); } } -?> diff --git a/functions/custom-header.php b/functions/custom-header.php index 1a210f5..6732f1a 100644 --- a/functions/custom-header.php +++ b/functions/custom-header.php @@ -3,7 +3,7 @@ $custom_header_args = array( 'default-text-color' => 'B00', 'flex-width' => true, - 'width' => get_theme_mod('comicpress-customize-range-site-width', '980'), + 'width' => get_theme_mod( 'comicpress-customize-range-site-width', '980' ), 'flex-height' => true, 'height' => '110', 'header-text' => false, @@ -15,10 +15,11 @@ $custom_header_args = array( add_theme_support( 'custom-header', $custom_header_args ); function comicpress_admin_header_style() { + ?> @@ -26,12 +27,13 @@ function comicpress_admin_header_style() { } function comicpress_header_style() { - if (get_header_image()) { + + if ( get_header_image() ) { $textcolor = get_header_textcolor() ?> +?> +
    +
    -

    -
    -
    + +

    + +

    + +
    + +
    +
    + +
    +

    - + + +

    +
    + +
    +

    - + + +

    +
    +

    - + + +

    +
    + + +
    +
    + __( 'Introduction', 'comicpress' ), @@ -244,22 +277,31 @@ function comicpress_admin_options() { $tab = 'splash'; } foreach ( $tab_info as $tab_id => $label ) { ?> +
    + +
    + +
    + +
    +
    + +
    -
    + +
    + +
    - Philip M. Hofer (Frumph), Tyler Martin
    - + + + + Philip M. Hofer + + + (Frumph) + + , + + + Tyler Martin + +
    + + +
    @@ -317,6 +391,7 @@ function comicpress_admin_options() {
    +
    found_posts; ?> +

    + +

    +
    - + ); + ?> +
    +
    +
    > +
    -
    + +
    + + - - - - + + + + + + -
    - - - -
    + + + + + +
    + + +
    +
    +
    + +
    + +
    +
    +
    +
    +

    @@ -77,10 +105,15 @@ if ( have_posts() ) :

    +
    +
    +
    +
    +