From 58062ff7206d5e9cac16b84e7193adb2bfc31bba Mon Sep 17 00:00:00 2001 From: "Philip M. Hofer (Frumph)" Date: Thu, 5 Nov 2009 21:27:52 -0800 Subject: [PATCH] 2.8.2.2 - Fixed Avatars, Moods, Calendar's to work with child themes. Removed all traces of themepacks completely. Signed-off-by: Philip M. Hofer (Frumph) --- archive-comic-calendar.php | 23 +++++++++++------------ comicpress-options-config.php | 5 ----- functions.php | 3 +-- functions/avatars.php | 12 ++++++++---- functions/displayblogpost.php | 2 +- functions/displaycomicpost.php | 2 +- images/nav/scifi/navstyle.css | 18 +++++++++++++++++- sidebar-left.php | 2 +- sidebar-right.php | 2 +- style.css | 18 ++++++++++++++---- widgets/calendar.php | 2 +- widgets/menubar.php | 2 +- 12 files changed, 57 insertions(+), 34 deletions(-) diff --git a/archive-comic-calendar.php b/archive-comic-calendar.php index e8986a7..c5754a9 100644 --- a/archive-comic-calendar.php +++ b/archive-comic-calendar.php @@ -87,26 +87,25 @@ foreach ( $years as $year ) {
- + - - 0) { + + 0) { if (is_array($monthfile)) $monthfile = reset($monthfile); ?> - <?php echo $month[$i]['month'] ?> + <?php echo $month[$i]['month'] ?> <?php echo $month[$i]['month'] ?> - 0) { + 0) { if (is_array($monthfile)) $monthfile = reset($monthfile); ?> - <?php echo $month[$i]['month'] ?> + <?php echo $month[$i]['month'] ?> <?php echo $month[$i]['month'] ?> - + @@ -114,16 +113,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-config.php b/comicpress-options-config.php index 9cfc8cb..c4a1415 100644 --- a/comicpress-options-config.php +++ b/comicpress-options-config.php @@ -214,11 +214,6 @@ $options = array ( "default" => "no", "type" => "comicpress-disable_footer_text"), - array( - "id" => "comicpress-themepack_directory", - "default" => "silver", - "type" => "comicpress-themepack_directory"), - array( "id" => "comicpress-avatar_directory", "default" => "default", diff --git a/functions.php b/functions.php index b51c5f1..75b32e5 100644 --- a/functions.php +++ b/functions.php @@ -19,7 +19,7 @@ if (function_exists('id_get_comment_number')) { remove_filter('comments_number','id_get_comment_number'); } -$comicpress_version = '2.8.2.1'; +$comicpress_version = '2.8.2.2'; global $wpmu_version; if (!empty($wpmu_version)) { @@ -113,7 +113,6 @@ if (get_option('upload_path') !== false) { } if (empty($avatar_directory)) $avatar_directory = 'default'; -if (empty($themepack_directory)) $themepack_directory = 'silver'; if (empty($graphicnav_directory)) $graphicnav_directory = 'default'; if (empty($moods_directory)) $moods_directory = 'default'; if (empty($calendar_directory)) $calendar_directory = 'default'; diff --git a/functions/avatars.php b/functions/avatars.php index 39f451f..08b713c 100644 --- a/functions/avatars.php +++ b/functions/avatars.php @@ -90,9 +90,13 @@ function comicpress_random_default_avatar($id_or_email = '') { $current_avatar_directory = get_option('comicpress-avatar_directory'); if (empty($current_avatar_directory)) $current_avatar_directory = 'default'; - - $count = count($results = glob(get_template_directory() . '/images/avatars/'.$current_avatar_directory.'/*')); - + if (file_exists(get_stylesheet_directory() . '/images/avatars/' . $current_avatar_directory)) { + $count = count($results = glob(get_stylesheet_directory() . '/images/avatars/'.$current_avatar_directory.'/*')); + $blogurl = get_stylesheet_directory_uri(); + } else { + $count = count($results = glob(get_template_directory() . '/images/avatars/'.$current_avatar_directory.'/*')); + $blogurl = get_template_directory_uri(); + } if ($count) { $default = ''; @@ -102,7 +106,7 @@ function comicpress_random_default_avatar($id_or_email = '') { } else { return false; } - return get_bloginfo('stylesheet_directory').'/images/avatars/'.$current_avatar_directory.'/'.$default; + return $blogurl.'/images/avatars/'.$current_avatar_directory.'/'.$default; } return false; } diff --git a/functions/displayblogpost.php b/functions/displayblogpost.php index f3f759a..b175af8 100644 --- a/functions/displayblogpost.php +++ b/functions/displayblogpost.php @@ -7,7 +7,7 @@ */ function display_blog_post() { - 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; ?> + global $post, $wp_query, $authordata, $enable_related_posts, $enable_post_author_gravatar, $enable_post_calendar, $disable_categories_in_posts, $disable_tags_in_posts; ?>
diff --git a/functions/displaycomicpost.php b/functions/displaycomicpost.php index 604b7a1..6b2ced5 100644 --- a/functions/displaycomicpost.php +++ b/functions/displaycomicpost.php @@ -7,7 +7,7 @@ */ function display_comic_post() { - 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; ?> + global $post, $wp_query, $authordata, $enable_related_comics, $enable_comic_post_author_gravatar, $enable_comic_post_calendar, $disable_categories_in_posts, $disable_tags_in_posts; ?>
id="post-comic-"> diff --git a/images/nav/scifi/navstyle.css b/images/nav/scifi/navstyle.css index 918d7bd..3dfac79 100644 --- a/images/nav/scifi/navstyle.css +++ b/images/nav/scifi/navstyle.css @@ -4,7 +4,23 @@ Style: Sci Fi */ #comic_navi_wrapper { - padding: 5px 0 5px 0; + 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 { diff --git a/sidebar-left.php b/sidebar-left.php index dc57fb3..48e104b 100644 --- a/sidebar-left.php +++ b/sidebar-left.php @@ -5,7 +5,7 @@
- +
$default_image)) ?>
diff --git a/sidebar-right.php b/sidebar-right.php index 7646667..816dfbd 100644 --- a/sidebar-right.php +++ b/sidebar-right.php @@ -8,7 +8,7 @@ - +
$default_image)) ?>
diff --git a/style.css b/style.css index 803be22..88fc159 100644 --- a/style.css +++ b/style.css @@ -4,7 +4,7 @@ Theme URI: http://comicpress.org Description: Publish a comic with WordPress. Visit the ComicPress Website. This is the ComicPress Core Framework. Author: Tyler Martin, John Bintz, Philip M. Hofer Author URI: http://mindfaucet.com/ -Version: 2.8.1 +Version: 2.8.2 . The CSS, XHTML and design is released under GPL v3: http://www.opensource.org/licenses/gpl-3.0.html @@ -616,13 +616,23 @@ a.navi-comments:hover span { float: left; } -.comment-author { - display: inline; -} + .comment-author { + padding-left: 5px; + display: inline; + } + + .comment-time { + padding-left: 5px; + } + + li.comment { + margin-top: 10px; + } .comment-meta-data { background: #efefef; border-bottom: solid 1px #999; + border-right: solid 1px #aaa; margin: 0; padding-left: 5px; } diff --git a/widgets/calendar.php b/widgets/calendar.php index 758a7e7..cd61b70 100644 --- a/widgets/calendar.php +++ b/widgets/calendar.php @@ -70,7 +70,7 @@ class widget_comicpress_calendar extends WP_Widget { } function form($instance) { - $default_image = get_bloginfo('stylesheet_directory').'/images/cal/default.png'; + $default_image = get_template_directory_uri() . '/images/cal/default.png'; $instance = wp_parse_args( (array) $instance, array( 'thumbnail' => $default_image, 'small' => '', 'medium' => '', 'large' => '', 'link' => '') ); $thumbnail = strip_tags($instance['thumbnail']); $small = strip_tags($instance['small']); diff --git a/widgets/menubar.php b/widgets/menubar.php index 45c2699..b217393 100644 --- a/widgets/menubar.php +++ b/widgets/menubar.php @@ -11,7 +11,7 @@ Author URI: http://webcomicplanet.com/ function comicpress_menubar() { -global $contact_in_menubar,$enable_search_in_menubar,$enable_rss_in_menubar,$enable_navigation_in_menubar,$disable_dynamic_menubar_links, $themepack_directory; +global $contact_in_menubar,$enable_search_in_menubar,$enable_rss_in_menubar,$enable_navigation_in_menubar,$disable_dynamic_menubar_links; if (comicpress_check_child_file('menubar') == false) { if (file_exists(get_template_directory() . '/custom-menubar.php')) { include(get_template_directory() . '/custom-menubar.php');