Skip to content
Browse files

ComicPress 2.9.4 for WordPress 3.4

Signed-off-by: Frumph <philip@frumph.net>
  • Loading branch information...
1 parent 5672eae commit c6fbf2f2ef24e87de01493aaf1b2cee8798c49e6 @Frumph committed
View
0 addons/ipn.php → addons/ipn.txt
File renamed without changes.
View
2 archive.php
@@ -18,7 +18,7 @@
$count = $wp_query->found_posts;
$post = $posts[0]; // Hack. Set $post so that the_date() works
$post_title_type = $title_string = '';
- if ($post->post_type !== 'post') $post_title_type = $post->post_type.'-'; // extra space at the end for visual
+// if ($post->post_type !== 'post') $post_title_type = $post->post_type.'-'; // extra space at the end for visual
if (is_category()) { /* Category */
$title_string = __('Archive for &#8216;','comicpress').$post_title_type.single_cat_title('',false).__('&#8217;', 'comicpress');
} elseif(is_tag()) { /* Tag */
View
20 changelog.txt
@@ -1,6 +1,24 @@
-2.9.3
+2.9.4
+Commented out padding: 10px 0 0 0; in the #header {} css.
+Changed to new code for custom-background and custom-header
+changed css for padding in style.css: #comment, #author, #email, #url, #s-search, .comicpress_control_panel_widget input { padding: 2px 0 3px 0; }
+changed css for padding in .menunav-rss
+changed css for the "current_page_item" in the menubar from a change of color to just being "bold"
+changed css for .menunav search adjusting the width with CSS of the search input box in the menubar. (fixed)
+removed extra wp_link_pages from the page.php file
+Template files were moved from the root into their own directory /templates/ if you have a template associated with a page you will have to re-associate it.
+Adjusted some parts of displaypost.php where it shows for custom post-types or not.
+
+
+
+2.9.3.1
+removed the stray project wonderful ad from the bottom in the footer.php file
+
+2.9.3
Adjusted how the search and archive pages work to reduce memory load & count
fixed the language textdomain lines
+changed how the .txt and .htm files are read in to pass the theme review
+renamed functions/ipn.php to functions/ipn.txt, change it back to functions/ipn.php in order to utilize the IPN from paypal
2.9.2.30.3
View
4 comicpress-config.php
@@ -1,10 +1,10 @@
<?php
//COMIC CATEGORY -the WordPress ID # of your comic category (default "3")
-$comiccat = "3";
+$comiccat = "4";
//BLOG CATEGORY - the WordPress ID of your blog category (default "4")
-$blogcat = "4";
+$blogcat = "3";
//COMIC FOLDER - the folder your comics files are located in (default "comics")
$comic_folder = "comics";
View
6 footer.php
@@ -5,9 +5,8 @@
if (!comicpress_themeinfo('disable_footer_text')) {
echo comicpress_footer_text();
-}
-
-if (comicpress_themeinfo('enable_page_load_info')) { ?>
+} ?>
+<?php if (comicpress_themeinfo('enable_page_load_info')) { ?>
<p><?php echo get_num_queries() ?> queries. <?php if (function_exists('memory_get_usage')) { $unit=array('b','kb','mb','gb','tb','pb'); echo @round(memory_get_usage(true)/pow(1024,($i=floor(log(memory_get_usage(true),1024)))),2).' '.$unit[$i]; ?> Memory usage. <?php } timer_stop(1) ?> seconds.</p>
<?php } else { ?>
<!-- <?php echo get_num_queries() ?> queries. <?php timer_stop(1) ?> seconds. //-->
@@ -15,6 +14,7 @@
</div><!-- Ends #footer -->
</div><!-- Ends "page/page-wide" -->
</div><!-- Ends "page-wrap" -->
+
<?php if (comicpress_themeinfo('enable_caps')) { ?><div id="page-foot"></div><?php } ?>
<?php wp_footer(); ?>
View
55 functions.php
@@ -1,42 +1,32 @@
-<?php
-
+<?php
+
+if ( ! function_exists( 'comicpress_enqueue_comment_reply' ) ) {
+ function comicpress_enqueue_comment_reply() {
+ if ( is_singular() && comments_open() && get_option( 'thread_comments' ) ) {
+ wp_enqueue_script( 'comment-reply' );
+ }
+ }
+}
+add_action( 'wp_enqueue_scripts', 'comicpress_enqueue_comment_reply' );
// Text domain - Languages location
load_theme_textdomain( 'comicpress', get_template_directory() . '/lang' );
-
// the_post_thumbnail('thumbnail/medium/full');
add_theme_support( 'post-thumbnails' );
-
-// Required by the wordpress review theme, it sucks donkey balls but is required.
add_theme_support( 'automatic-feed-links' );
-
-// This theme allows users to set a custom background
-add_custom_background();
+add_editor_style();
if (!isset($content_width)) $content_width = 520;
-global $comiccat, $blogcat,
-$comic_folder, $rss_comic_folder, $mini_comic_folder, $archive_comic_folder,
-$archive_comic_width, $rss_comic_width, $mini_comic_width, $blog_postcount;
+global $comiccat, $blogcat, $comic_folder, $rss_comic_folder, $mini_comic_folder, $archive_comic_folder,$archive_comic_width, $rss_comic_width, $mini_comic_width, $blog_postcount;
if (is_multisite()) {
// This section keeps it compatible with comicpress manager's options
$variables_to_extract = array();
-
- foreach (array(
- 'comiccat' => 'comiccat',
- 'blogcat' => 'blogcat',
- 'comics_path' => 'comic_folder',
- 'comicsrss_path' => 'rss_comic_folder',
- 'comicsarchive_path' => 'archive_comic_folder',
- 'comicsmini_path' => 'mini_comic_folder',
- 'archive_comic_width' => 'archive_comic_width',
- 'rss_comic_width' => 'rss_comic_width',
- 'mini_comic_width' => 'mini_comic_width',
- 'blog_postcount' => 'blog_postcount') as $options => $variable_name) {
+ foreach (array('comiccat' => 'comiccat','blogcat'=> 'blogcat','comics_path' => 'comic_folder','comicsrss_path' => 'rss_comic_folder','comicsarchive_path' => 'archive_comic_folder','comicsmini_path' => 'mini_comic_folder','archive_comic_width' => 'archive_comic_width', 'rss_comic_width' => 'rss_comic_width', 'mini_comic_width' => 'mini_comic_width','blog_postcount' => 'blog_postcount') as $options => $variable_name) {
$variables_to_extract[$variable_name] = get_option("comicpress-${options}");
}
extract($variables_to_extract);
-} else {
+} else {
@require_once( get_template_directory() . '/comicpress-config.php');
}
@@ -44,6 +34,16 @@
get_template_part('child', 'functions');
get_template_part('child', 'widgets');
+// This theme allows users to set a custom background
+// the global if has anything in it from the child theme, use it.
+$comicpress_background_array = array();
+if (function_exists('comicpress_child_theme_background_array'))
+ $comicpress_background_array = comicpress_child_theme_background_array();
+// Set defaults if it doesn't exit from the global
+if (!isset($comicpress_background_array)) $comicpress_background_array = array('default-color' => 'fff', 'default-image' => '');
+add_theme_support( 'custom-background', $comicpress_background_array );
+
+
// These autoload
foreach (glob(get_template_directory() . "/functions/*.php") as $funcfile) {
@require_once($funcfile);
@@ -155,7 +155,6 @@ function __comicpress_init() {
// initiate the scripts
if (!is_admin()) {
wp_enqueue_script('jquery');
- if ( comicpress_themeinfo('enable_comment_javascript') ) wp_enqueue_script( 'comment-reply' );
if (!comicpress_themeinfo('disable_jquery_menu_code')) {
wp_enqueue_script('ddsmoothmenu_js', get_template_directory_uri() . '/js/ddsmoothmenu.js', null, null, true);
wp_enqueue_script('menubar_js', get_template_directory_uri() . '/js/menubar.js', null, null, true);
@@ -236,7 +235,7 @@ function comicpress_add_head() {
var image_root = '<?php echo get_template_directory_uri(); ?>/images/';
var permalink = '<?php the_permalink() ?>';
</script>
- <?php }
+<?php }
}
if (!function_exists('is_cp_theme_layout')) {
@@ -522,7 +521,7 @@ function comicpress_themeinfo($whichinfo = null) {
$comicpress_coreinfo = wp_upload_dir();
$comicpress_addinfo = array(
'upload_path' => get_option('upload_path'),
- 'version' => '2.9.3',
+ 'version' => '2.9.4',
'siteurl' => trailingslashit(get_option('siteurl')),
'home' => trailingslashit(home_url()),
'comiccat' => $comiccat,
@@ -660,4 +659,4 @@ function comicpress_disable_sidebars() {
return false;
}
-?>
+?>
View
68 functions/custom-header.php
@@ -1,69 +1,61 @@
-<?php
-add_filter('comicpress_header_image_width', 'comicpress_change_header_width');
-
-function comicpress_change_header_width($width) {
- $new_width = comicpress_themeinfo('custom_image_header_width');
- if (!empty($new_width) && ((int)$new_width > 0))
- $width = $new_width;
- return $width;
-}
-
-add_filter('comicpress_header_image_height', 'comicpress_change_header_height');
-
-function comicpress_change_header_height($height) {
- $new_height = comicpress_themeinfo('custom_image_header_height');
- if (!empty($new_height) && ((int)$new_height > 0))
- $height = $new_height;
- return $height;
-}
-
-// Custom Image Header Defaults
-define('HEADER_TEXTCOLOR', '');
-define('HEADER_IMAGE', ''); // %s is theme dir
-define('NO_HEADER_TEXT', true);
-
-define( 'HEADER_IMAGE_WIDTH', apply_filters( 'comicpress_header_image_width', '980') );
-define( 'HEADER_IMAGE_HEIGHT', apply_filters( 'comicpress_header_image_height', '100') );
-set_post_thumbnail_size( HEADER_IMAGE_WIDTH, HEADER_IMAGE_HEIGHT, true );
-
-add_custom_image_header('comicpress_header_style', 'comicpress_admin_header_style');
+<?php
+
+$custom_header_args = array();
+
+add_theme_support( 'custom-header', array(
+ // Header image default
+ 'default-image' => false,
+ // Header text display default
+ 'header-text' => false,
+ // Header text color default
+ 'default-text-color' => '000',
+ // Header image width (in pixels)
+ 'width' => comicpress_themeinfo('custom_image_header_width'),
+ // Header image height (in pixels)
+ 'height' => comicpress_themeinfo('custom_image_header_height'),
+ // Header image random rotation default
+ 'random-default' => false,
+ // Template header style callback
+ 'wp-head-callback' => 'comicpress_header_style',
+ // Admin header style callback
+ 'admin-head-callback' => 'comicpress_admin_header_style',
+ // Admin preview style callback
+ 'admin-preview-callback' => 'comicpress_admin_header_style'
+ ) );
function comicpress_admin_header_style() { ?>
<style type="text/css">
#headimg {
- width: <?php echo HEADER_IMAGE_WIDTH; ?>px;
- height: <?php echo HEADER_IMAGE_HEIGHT; ?>px;
+ width: <?php echo get_custom_header()->width; ?>px;
+ height: <?php echo get_custom_header()->height; ?>px;
background: url(<?php header_image(); ?>) no-repeat center;
}
-
+
#headimg h1, #headimg .description {
display: none;
}
</style>
-
<?php
}
-
+
function comicpress_header_style() {
if (get_header_image()) { ?>
<style type="text/css">
#header {
width: <?php echo HEADER_IMAGE_WIDTH; ?>px;
- height: <?php echo HEADER_IMAGE_HEIGHT; ?>px;
+ /* height: <?php echo HEADER_IMAGE_HEIGHT; ?>px; */
background: url(<?php header_image(); ?>) top center no-repeat;
overflow: hidden;
}
-
#header h1 { padding: 0; }
#header h1 a {
display: block;
width: <?php echo HEADER_IMAGE_WIDTH; ?>px;
- height: <?php echo HEADER_IMAGE_HEIGHT; ?>px;
+ height: <?php echo HEADER_IMAGE_HEIGHT-1; ?>px;
text-indent: -9999px;
}
#header .description { display: none; }
</style>
-
<?php }
}
View
3 functions/displaycomic.php
@@ -81,8 +81,9 @@ function comicpress_init_comic_swf() {
// This function will let authors who want to use comicpress as a way to output their books/text in a comic area as a page.
function comicpress_display_comic_text($comic) {
+ $output = '';
if (file_exists(comicpress_themeinfo('basedir') . '/' .$comic)) {
- $output = file_get_contents(comicpress_themeinfo('basedir') . '/' .$comic);
+ $output = implode('', file(comicpress_themeinfo('basedir') . '/' .$comic));
}
return apply_filters('comicpress_display_comic_text', $output);
}
View
18 functions/displaypost.php
@@ -25,7 +25,7 @@ function comicpress_display_post_title($is_comic = false) {
if (!function_exists('comicpress_display_post_thumbnail')) {
function comicpress_display_post_thumbnail($is_comic = false) {
global $post;
- if (function_exists('has_post_thumbnail') && !$is_comic) {
+ if (function_exists('has_post_thumbnail') && !$is_comic && ($post->post_type == 'post')) {
if ( has_post_thumbnail() ) {
$link = get_post_meta( $post->ID, 'link', true );
if (empty($link)) $link = get_permalink();
@@ -63,7 +63,7 @@ function comicpress_display_post_calendar($is_comic = false) {
if (!function_exists('comicpress_display_post_author')) {
function comicpress_display_post_author() {
global $post,$authordata;
- if ($post->post_type == 'post') {
+ if ($post->post_type == 'post' || $post->post_type == 'comic') {
$post_author = '<span class="post-author">'.__('by','comicpress').' <a href="'.get_author_posts_url( $authordata->ID, $authordata->user_nicename ).'">'.get_the_author()."</a></span>\r\n";
echo apply_filters('comicpress_display_post_author',$post_author);
}
@@ -73,7 +73,7 @@ function comicpress_display_post_author() {
if (!function_exists('comicpress_display_post_date')) {
function comicpress_display_post_date() {
global $post;
- if ($post->post_type == 'post') {
+ if ($post->post_type == 'post' || $post->post_type =='comic') {
$post_date = "<span class=\"posted-on\">".__('on&nbsp;','comicpress')."</span><span class=\"post-date\">".get_the_date()."</span>\r\n";
echo apply_filters('comicpress_display_post_date',$post_date);
}
@@ -83,7 +83,7 @@ function comicpress_display_post_date() {
if (!function_exists('comicpress_display_post_time')) {
function comicpress_display_post_time() {
global $post;
- if ($post->post_type == 'post') {
+ if ($post->post_type == 'post' || $post->post_type == 'comic') {
$post_time = "<span class=\"posted-at\">".__('at&nbsp;','comicpress')."</span><span class=\"post-time\">".get_the_time()."</span>\r\n";
echo apply_filters('comicpress_display_post_time',$post_time);
}
@@ -103,8 +103,8 @@ function comicpress_display_post_category($is_comic = false) {
echo apply_filters('comicpress_display_post_category', $post_category);
}
} else {
- $post_category = "<div class=\"post-type-cat\">". __('Posted In: ','comicpress') .$post->post_type."</div>\r\n";
- echo apply_filters('comicpress_display_post_category',$post_category);
+// $post_category = "<div class=\"post-type-cat\">". __('Posted In: ','comicpress') .$post->post_type."</div>\r\n";
+// echo apply_filters('comicpress_display_post_category',$post_category);
}
}
}
@@ -146,7 +146,7 @@ function comicpress_display_related_posts($is_comic = false) {
if (!function_exists('comicpress_display_blog_navigation')) {
function comicpress_display_blog_navigation($is_comic = false) {
global $post, $wp_query;
- if (is_single() && !$is_comic && !is_page() && !is_archive() && !is_search() && !comicpress_themeinfo('split_column_in_two') ) { ?>
+ if (is_single() && !$is_comic && !is_page() && !is_archive() && !is_search() && !comicpress_themeinfo('split_column_in_two') && ($post->post_type == 'post') ) { ?>
<div class="blognav">
<?php previous_post_link('<span class="blognav-prev">%link</span>',__(' &lsaquo; Previous ','comicpress'), TRUE); ?>
<?php next_post_link('<span class="blognav-next">%link</span>',__('Next &rsaquo; ','comicpress'), TRUE); ?>
@@ -224,9 +224,10 @@ function comicpress_display_post() {
if (!is_page()) {
comicpress_display_post_author();
comicpress_display_post_date(); comicpress_display_post_time();
- if (!is_archive() && !is_search()) {edit_post_link(__('Edit','comicpress'), ' <span class="pipe">|</span> <span class="post-edit">', '</span>'); }
+ if (!is_archive() && !is_search() && $post->post_type == 'post') { edit_post_link(__('Edit','comicpress'), ' <span class="pipe">|</span> <span class="post-edit">', '</span>'); }
comicpress_display_post_category($is_comic);
if (function_exists('the_ratings') && $post->post_type == 'post') { the_ratings(); }
+ do_action('comic-post-info');
} ?>
</div>
</div>
@@ -251,6 +252,7 @@ function comicpress_display_post() {
</div>
<?php } ?>
<?php if (is_page()) { edit_post_link(__('Edit this page.','comicpress'), '', ''); } ?>
+ <?php do_action('comic-post-foot'); ?>
</div>
<?php if (comicpress_themeinfo('enable_caps')) { ?><div class="post-foot"></div><?php } ?>
</div>
View
8 functions/syndication.php
@@ -37,9 +37,13 @@ function comicpress_export_wp() {
//Insert the comic image into the RSS feed
if (!function_exists('comicpress_comic_feed')) {
function comicpress_comic_feed() {
- global $post;
+ global $wp_query, $post, $comiccat;
$output = '<p>';
- $output .= '<a href="'.get_permalink().'" title="'.comicpress_the_hovertext($post).'">'.comicpress_display_comic_thumbnail('rss',$post,true).'</a>';
+ if ($wp_query->query_vars['cat'] == $comiccat ) {
+ $output .= '<a href="'.get_permalink().'" title="'.comicpress_the_hovertext($post).'">'.comicpress_display_comic_thumbnail('comic',$post,true).'</a>';
+ } else {
+ $output .= '<a href="'.get_permalink().'" title="'.comicpress_the_hovertext($post).'">'.comicpress_display_comic_thumbnail('rss',$post,true).'</a>';
+ }
$output .= '</p>';
return apply_filters('comicpress_comic_feed', $output);
}
View
9 header.php
@@ -22,20 +22,18 @@
<meta name="ComicPress" content="<?php echo comicpress_themeinfo('version'); ?>" />
<?php wp_head(); ?>
</head>
-
<body <?php body_class(); ?>>
<?php
if (is_active_sidebar('above-header')) get_sidebar('above');
-?>
-<?php if (comicpress_themeinfo('enable_caps')) { ?><div id="page-head"></div><?php } ?>
-<?php if (is_cp_theme_layout('2cr,2cl,2cvr,2cvl')) { ?>
+if (comicpress_themeinfo('enable_caps')) { ?><div id="page-head"></div>
+<?php }
+if (is_cp_theme_layout('2cr,2cl,2cvr,2cvl')) { ?>
<div id="page-wrap"><!-- Wraps outside the site width -->
<div id="page"><!-- Defines entire site width - Ends in Footer -->
<?php } else { ?>
<div id="page-wide-wrap"><!-- Wraps outside the site width -->
<div id="page-wide"><!-- Defines entire site width - Ends in Footer -->
<?php } ?>
-
<div id="header">
<?php do_action('comicpress-header'); ?>
<h1><a href="<?php echo home_url(); ?>"><?php bloginfo('name') ?></a></h1>
@@ -43,7 +41,6 @@
<?php if (is_active_sidebar('header')) get_sidebar('header'); ?>
<div class="clear"></div>
</div>
-
<?php
if (!comicpress_themeinfo('disable_default_menubar')) comicpress_menubar();
if (is_active_sidebar('menubar')) get_sidebar('menubar');
View
BIN images/nav/box/sharebox.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
BIN images/nav/comical/sharebox.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
BIN images/nav/default/sharebox.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
BIN images/nav/scifi/sharebox.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
BIN images/nav/silver/sharebox.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
BIN lang/ro_RO.mo
Binary file not shown.
View
2,140 lang/ro_RO.po
2,140 additions, 0 deletions not shown because the diff is too large. Please use a local Git client to view these changes.
View
1 layout-head.php
@@ -12,3 +12,4 @@
<?php if (is_cp_theme_layout('rgn') && !comicpress_disable_sidebars()) get_sidebar('left'); ?>
<div id="content" class="narrowcolumn">
<?php if (is_active_sidebar('over-blog')) get_sidebar('overblog'); ?>
+ <?php do_action('comic-blog-area'); ?>
View
6 options/layout.php
@@ -11,11 +11,12 @@ function showimage(sel,pic) {
<div class="comicpress-options">
<div class="cpadmin-footer">
- <div class="comicpress-forum">Forums are at <a href="http://comicpress.net/forum/">http://comicpress.net/forum/</a> for Technical Assistance</div>
+ <div class="comicpress-forum">Forums are at <a href="http://forum.comicpress.org/">http://forum.comicpress.org/</a> for Technical Assistance</div>
<div id="comicpress-version-title"><a href="http://comicpress.net/">ComicPress <?php echo comicpress_themeinfo('version'); ?></a></div>
<br />
<?php _e('Developed and maintained by','comicpress'); ?> <a href="http://frumph.net/">Philip M. Hofer</a> <small>(<a href="http://frumph.net/">Frumph</a>)</small>, <?php _e('Originally created by','comicpress'); ?> <a href="http://mindfaucet.com/">Tyler Martin</a><br />
- <?php _e('If you like the ComicPress theme, please donate. It will help in developing new features and versions.','comicpress'); ?>
+ <?php _e('If you like the ComicPress theme, please donate. It will help in developing new features and versions.','comicpress'); ?><br />
+ Romanian <img src="http://mobirout.com/uploads/ro.gif" alt="Romanian translation" /> translation, Provided by: Web Geek Science (webhostinggeeks.com)
<table style="margin:0 auto;">
<tr>
<td style="width:200px;">
@@ -37,6 +38,7 @@ function showimage(sel,pic) {
</form>
</td>
</tr>
+
</table>
</div>
View
1 page.php
@@ -19,7 +19,6 @@
<?php comicpress_display_the_content($is_comic); ?>
<div class="clear"></div>
</div>
- <?php wp_link_pages(array('before' => '<div class="linkpages"><span class="linkpages-pagetext">'.__('Pages:','comicpress').'</span> ', 'after' => '</div>', 'next_or_number' => 'number')); ?>
<?php edit_post_link(__('Edit this page.','comicpress'), '', ''); ?>
</div>
<?php if (comicpress_themeinfo('enable_caps')) { ?><div class="post-foot"></div><?php } ?>
View
6 readme.txt
@@ -1,9 +1,9 @@
=== Easel ===
Contributors: frumph
Donate Link: http://frumph.net
-Requires at least: 3.0
-Tested up to: 3.1
-Stable tag: 2.9.2.30
+Requires at least: 3.4
+Tested up to: 3.4
+Stable tag: 2.9.4
Contact Email: philip@frumph.net
ComicPress 2.9* is released under GNU General Public License, v3 (or newer)
View
14 style.css
@@ -6,7 +6,7 @@ Description: Publish a comic with WordPress. Visit the ComicPress Website (<a hr
Author: Philip M. Hofer
Author URI: http://frumph.net
Tags: White, Two-Columns, Three-Columns, left-sidebar, right-sidebar, fixed-width, custom-header, theme-options, threaded-comments, sticky-post, translation-ready
-Version: 2.9.3
+Version: 2.9.4
License: GNU General Public License, v3 (or newer)
License URI: http://www.opensource.org/licenses/gpl-3.0.html
.
@@ -119,7 +119,7 @@ input, textarea {
/* HEADINGS */
h1, h1 a {
- padding: 10px 0 0 0;
+/* padding: 10px 0 0 0; */
margin: 0;
font-size: 56px;
line-height: 46px;
@@ -226,8 +226,8 @@ h4, h4 a {
.menunav-rss {
font-size: 13px;
- line-height: 26px;
- padding: 0 5px;
+ line-height: 27px;
+ padding: 0 6px;
float: left;
display: inline-block;
overflow: hidden;
@@ -350,7 +350,7 @@ h4, h4 a {
/* this is the color of the text in the menubar when its on that page */
.menu .current_page_item a {
- color: #fcff00 !important;
+ font-weight: 700;
}
/* Holly Hack for IE \*/
@@ -1031,7 +1031,7 @@ table#wp-calendar td {
/* SEARCH */
-#s-search, #s-transcript {
+.menunav #s-search, #s-transcript {
height: 16px;
width: 120px;
}
@@ -1048,7 +1048,7 @@ table#wp-calendar td {
/* comment form */
#comment, #author, #email, #url, #s-search, .comicpress_control_panel_widget input {
- padding: 2px;
+ padding: 2px 0 3px 0;
color: #000;
font-family: 'Verdana' , sans-serif;
font-size: 12px;
View
0 archive-comic-calendar.php → templates/archive-comic-calendar.php
File renamed without changes.
View
2 archive-comic-month.php → templates/archive-comic-month.php
@@ -31,7 +31,7 @@ function filter_where($where = '') {
<div class="comicthumbwrap">
<div class="comicarchiveframe">
- <a href="<?php the_permalink() ?>"><img src="<?php the_comic_mini() ?>" alt="<?php the_title() ?>" title="<?php the_title() ?>" style="width: <?php echo $mini_comic_width; ?>px" /></a><br />
+ <a href="<?php the_permalink() ?>"><?php comicpress_display_comic_thumbnail($type = 'mini', $post, true); ?></a><br />
</div>
</div>
View
0 archive-comic-storyline-thumbs.php → templates/archive-comic-storyline-thumbs.php
File renamed without changes.
View
0 archive-comic-storyline.php → templates/archive-comic-storyline.php
File renamed without changes.
View
0 archive-comic-year.php → templates/archive-comic-year.php
File renamed without changes.
View
0 archive-comic.php → templates/archive-comic.php
File renamed without changes.
View
0 blog.php → templates/blog.php
File renamed without changes.
View
0 buystrip.php → templates/buystrip.php
File renamed without changes.
View
0 links.php → templates/links.php
File renamed without changes.
View
0 members-blog.php → templates/members-blog.php
File renamed without changes.
View
46 widgets/comic-navigation.php
@@ -182,29 +182,29 @@ function sharethis() {
</table>
<?php if ($instance['sharethis']) { ?>
<div id="navi-share-box">
- <a href="http://reddit.com/submit?url=<?php echo $url; ?>&amp;title=<?php echo comicpress_clean_url($title); ?>" title="Reddit">Reddit</a>
- <a href="http://digg.com/submit?phase=2&amp;url=<?php echo $url; ?>&amp;title=<?php echo $title; ?>" title="Digg">Digg</a>
- <a href="http://www.facebook.com/share.php?u=<?php echo $url; ?>" title="Facebook">Facebook</a>
- <a href="http://www.myspace.com/Modules/PostTo/Pages/?l=3&amp;u=<?php echo $url; ?>&amp;t=<?php echo $title; ?>&amp;c=" title="MySpace">MySpace</a>
- <a href="http://del.icio.us/post?url=<?php echo $url; ?>" title="Delicious">Delicious</a>
-
- <a href="http://www.stumbleupon.com/submit?url=<?php echo $url; ?>&amp;title=<?php echo $title; ?>" title="Stumbleupon">Stumbleupon</a>
- <a href="http://buzz.yahoo.com/submit/?submitUrl=<?php echo $url; ?>&amp;submitHeadline=<?php echo $title; ?>" title="Buzz Up!">Buzz Up!</a>
- <a href="http://www.mixx.com/submit?page_url=<?php echo $url; ?>" title="Mixx">Mixx</a>
- <a href="http://www.technorati.com/faves?add=<?php echo $url; ?>" title="Technorati">Technorati</a>
- <a href="http://www.google.com/bookmarks/mark?op=edit&amp;bkmk=<?php echo $url; ?>&amp;title=<?php echo $title; ?>" title="Google Bookmarks">Google Bookmarks</a>
- <a href="http://bookmarks.yahoo.com/toolbar/savebm?opener=tb&amp;u=<?php echo $url; ?>&amp;t=<?php echo $title; ?>" title="Yahoo Bookmarks">Yahoo Bookmarks</a>
-
- <a href="http://myweb2.search.yahoo.com/myresults/bookmarklet?u=<?php echo $url; ?>&amp;t=<?php echo $title; ?>" title="Yahoo MyWeb">Yahoo MyWeb</a>
- <a href="https://favorites.live.com/quickadd.aspx?marklet=1&amp;mkt=en-us&amp;url=<?php echo $url; ?>&amp;title=<?php echo $title; ?>" title="Windows Live">Windows Live</a>
- <a href="http://www.propeller.com/submit/?U=<?php echo $url; ?>&amp;T=<?php echo $title; ?>" title="Propeller">Propeller</a>
- <a href="http://friendfeed.com/share?url=<?php echo $url; ?>&amp;title=<?php echo $title; ?>" title="FriendFeed">FriendFeed</a>
- <a href="http://www.newsvine.com/_tools/seed&amp;save?popoff=0&amp;u=<?php echo $url; ?>&amp;h=<?php echo $title; ?>" title="Newsvine">Newsvine</a>
- <a href="http://www.xanga.com/private/editorx.aspx?t=<?php echo $title; ?>&amp;u=<?php echo $url; ?>&amp;s=" title="Xanga">Xanga</a>
-
- <a href="http://www.linkedin.com/shareArticle?mini=true&amp;url=<?php echo $url; ?>&amp;title=<?php echo $title; ?>&amp;summary=<?php echo $excerpt; ?>&amp;source=" title="LinkedIn">LinkedIn</a>
- <a href="http://blinklist.com/index.php?Action=Blink/addblink.php&amp;Url=<?php echo $url; ?>&amp;Title=<?php echo $title; ?>" title="Blinklist">Blinklist</a>
- <a href="http://furl.net/storeIt.jsp?u=<?php echo $url; ?>&amp;t=<?php echo $title; ?>" title="Furl">Furl</a>
+ <a href="http://reddit.com/submit?url=<?php echo $url; ?>&amp;title=<?php echo comicpress_clean_url($title); ?>" title="Reddit">Reddit</a>
+ <a href="http://digg.com/submit?phase=2&amp;url=<?php echo $url; ?>&amp;title=<?php echo $title; ?>" title="Digg">Digg</a>
+ <a href="http://www.facebook.com/share.php?u=<?php echo $url; ?>" title="Facebook">Facebook</a>
+ <a href="http://www.myspace.com/Modules/PostTo/Pages/?l=3&amp;u=<?php echo $url; ?>&amp;t=<?php echo $title; ?>&amp;c=" title="MySpace">MySpace</a>
+ <a href="http://del.icio.us/post?url=<?php echo $url; ?>" title="Delicious">Delicious</a>
+
+ <a href="http://www.stumbleupon.com/submit?url=<?php echo $url; ?>&amp;title=<?php echo $title; ?>" title="Stumbleupon">Stumbleupon</a>
+ <a href="http://buzz.yahoo.com/submit/?submitUrl=<?php echo $url; ?>&amp;submitHeadline=<?php echo $title; ?>" title="Buzz Up!">Buzz Up!</a>
+ <a href="http://www.mixx.com/submit?page_url=<?php echo $url; ?>" title="Mixx">Mixx</a>
+ <a href="http://www.technorati.com/faves?add=<?php echo $url; ?>" title="Technorati">Technorati</a>
+ <a href="http://www.google.com/bookmarks/mark?op=edit&amp;bkmk=<?php echo $url; ?>&amp;title=<?php echo $title; ?>" title="Google Bookmarks">Google Bookmarks</a>
+ <a href="http://bookmarks.yahoo.com/toolbar/savebm?opener=tb&amp;u=<?php echo $url; ?>&amp;t=<?php echo $title; ?>" title="Yahoo Bookmarks">Yahoo Bookmarks</a>
+
+ <a href="http://myweb2.search.yahoo.com/myresults/bookmarklet?u=<?php echo $url; ?>&amp;t=<?php echo $title; ?>" title="Yahoo MyWeb">Yahoo MyWeb</a>
+ <a href="https://favorites.live.com/quickadd.aspx?marklet=1&amp;mkt=en-us&amp;url=<?php echo $url; ?>&amp;title=<?php echo $title; ?>" title="Windows Live">Windows Live</a>
+ <a href="http://www.propeller.com/submit/?U=<?php echo $url; ?>&amp;T=<?php echo $title; ?>" title="Propeller">Propeller</a>
+ <a href="http://friendfeed.com/share?url=<?php echo $url; ?>&amp;title=<?php echo $title; ?>" title="FriendFeed">FriendFeed</a>
+ <a href="http://www.newsvine.com/_tools/seed&amp;save?popoff=0&amp;u=<?php echo $url; ?>&amp;h=<?php echo $title; ?>" title="Newsvine">Newsvine</a>
+ <a href="http://www.xanga.com/private/editorx.aspx?t=<?php echo $title; ?>&amp;u=<?php echo $url; ?>&amp;s=" title="Xanga">Xanga</a>
+
+ <a href="http://www.linkedin.com/shareArticle?mini=true&amp;url=<?php echo $url; ?>&amp;title=<?php echo $title; ?>&amp;summary=<?php echo $excerpt; ?>&amp;source=" title="LinkedIn">LinkedIn</a>
+ <a href="http://blinklist.com/index.php?Action=Blink/addblink.php&amp;Url=<?php echo $url; ?>&amp;Title=<?php echo $title; ?>" title="Blinklist">Blinklist</a>
+ <a href="http://twitter.com/intent/tweet?original_referer=<?php echo $url; ?>&amp;source=tweetbutton&amp;text=<?php echo $title; ?>&amp;url=<?php echo $url; ?>" title="Twitter">Twitter</a>
</div>
<?php } ?>
</div>
View
12 widgets/menubar.php
@@ -6,7 +6,6 @@
Author: Philip M. Hofer (Frumph)
Version: 1.07
Author URI: http://frumph.net/
-
*/
function comicpress_menubar() {
@@ -21,7 +20,7 @@ function comicpress_menubar() {
<?php get_search_form(); ?>
</div>
<?php } ?>
- <?php do_action('comicpress-menubar-menunav'); ?>
+ <?php do_action('comic-mini-navigation'); ?>
<?php if (comicpress_themeinfo('enable_rss_in_menubar')) { ?>
<a href="<?php bloginfo('rss2_url') ?>" title="RSS Feed" class="menunav-rss">RSS</a>
<?php } ?>
@@ -60,19 +59,19 @@ function comicpress_menubar() {
}
class comicpress_menubar_widget extends WP_Widget {
-
+
function comicpress_menubar_widget($skip_widget_init = false) {
if (!$skip_widget_init) {
$widget_ops = array('classname' => __CLASS__, 'description' => __('Displays a menubar.','comicpress') );
$this->WP_Widget(__CLASS__, __('Menubar','comicpress'), $widget_ops);
}
}
-
+
+
function widget($args, $instance) {
global $post;
Protect();
extract($args, EXTR_SKIP);
-
echo $before_widget;
$title = empty($instance['title']) ? '' : apply_filters('widget_title', $instance['title']);
if ( !empty( $title ) ) { echo $before_title . $title . $after_title; };
@@ -80,7 +79,7 @@ function widget($args, $instance) {
echo $after_widget;
UnProtect();
}
-
+
function update($new_instance, $old_instance) {
$instance = $old_instance;
$instance['title'] = strip_tags($new_instance['title']);
@@ -98,5 +97,4 @@ function form($instance) {
register_widget('comicpress_menubar_widget');
-
?>
View
161 wpmu/comicpress_manager_wpmu.php
@@ -1,161 +0,0 @@
-<?php
-/*
-Plugin Name: ComicPress WPMU Functionality
-Plugin URI: http://webcomicplanet.com/
-Description: Provide the functionality to use ComicPress and ComicPress Manager on a WordPress MU site.
-Version: 1.0
-Author: John Bintz
-Author URI: http://www.coswellproductions.org/wordpress/
-
-Copyright 2008 John Bintz (email : jcoswell@coswellproductions.org), All Rights Reserved.
-*/
-
-/* Functions for ComicPress Themes */
-
-if (get_option('upload_path') !== false) {
- $variables_to_extract = array();
-
- foreach (array(
- 'comiccat' => 'comiccat',
- 'blogcat' => 'blogcat',
- 'comics_path' => 'comic_folder',
- 'comicsrss_path' => 'rss_comic_folder',
- 'comicsarchive_path' => 'archive_comic_folder',
- 'comicsmini_path' => 'mini_comic_folder',
- 'archive_comic_width' => 'archive_comic_width',
- 'rss_comic_width' => 'rss_comic_width',
- 'mini_comic_width' => 'mini_comic_width',
- 'blog_postcount' => 'blog_postcount') as $options => $variable_name) {
- $variables_to_extract[$variable_name] = cp_option($option);
- }
-
- extract($variables_to_extract);
-}
-
-/**
- * Fix the search path for comics.
- */
-function cpm_wpmu_fix_folder_to_use($folder) {
- $wpmu_path = get_option('upload_path');
- if (!empty($wpmu_path)) {
- $folder = get_option('siteurl') . '/files';
- }
- return $folder;
-}
-
-/**
- * Fix the search path for comics.
- */
-function cpm_wpmu_fix_comic_path($comic) {
- if (($wpmu_path = get_option('upload_path')) !== false) {
- $comic = str_replace($wpmu_path, "files", $comic);
- }
- return $comic;
-}
-
-/* Functions for ComicPress Manager */
-
-function cp_option($name) { return get_option("comicpress-${name}"); }
-
-/**
- * Add additional parameters to every ComicPress Manager object created.
- */
-function cpm_wpmu_config_setup($cpm_config) {
- $cpm_config->wpmu_disk_space_message = __("<strong>You've exceeded your disk space quota!</strong> Either delete files you don't need, or find out how to get more disk space for your account.", 'comicpress-manager');
-}
-
-/**
- * Add WPMU path information to the document root.
- */
-function cpm_wpmu_modify_path($document_root) {
- $result = get_option('upload_path');
- $root_path = str_replace('\wp-admin','',getcwd());
- $root_path = str_replace('/wp-admin','',$root_path);
- if (!empty($result)) { $document_root = $root_path . '/' . $result; }
- return $document_root;
-}
-
-/**
- * Load ComicPress options from the options table.
- */
-function cpm_wpmu_load_options() {
- global $cpm_config;
-
- include(ABSPATH . 'wp-content/plugins/comicpress-manager/cp_configuration_options.php');
-
- foreach ($comicpress_configuration_options as $field_info) {
- $config_id = (isset($field_info['variable_name'])) ? $field_info['variable_name'] : $field_info['id'];
-
- $result = cp_option($field_info['id']);
-
- if ($result === false) {
- update_option("comicpress-" . $field_info['id'], $field_info['default']);
- $result = $field_info['default'];
- }
-
- $cpm_config->properties[$config_id] = $result;
- }
-}
-
-/**
- * Save ComicPress options to the options table.
- */
-function cpm_wpmu_save_options() {
- global $cpm_config;
-
- include(ABSPATH . 'wp-content/plugins/comicpress-manager/cp_configuration_options.php');
-
- foreach ($comicpress_configuration_options as $field_info) {
- $config_id = (isset($field_info['variable_name'])) ? $field_info['variable_name'] : $field_info['id'];
-
- update_option("comicpress-" . $field_info['id'], $cpm_config->properties[$config_id]);
- }
-}
-
-/**
- * Return the first run directory.
- */
-function cpm_wpmu_first_run_root_dir() {
- global $blog_id;
-
- return "wp-content/blogs.dir/${blog_id}";
-}
-
-/**
- * Get the list of directories to create.
- */
-function cpm_wpmu_first_run_dir_list() {
- $root_dir = ABSPATH . cpm_wpmu_first_run_root_dir();
-
- return array("$root_dir",
- "$root_dir/files",
- "$root_dir/files/comics",
- "$root_dir/files/comics-rss",
- "$root_dir/files/comics-archive",
- "$root_dir/files/comics-mini");
-}
-
-/**
- * Action to perform on the end of the first run.
- */
-function cpm_wpmu_complete_first_run() {
- update_option("upload_path", cpm_wpmu_first_run_root_dir() . "/files");
-}
-
-/**
- * Get the available disk space for this account.
- */
-function cpm_wpmu_get_available_disk_space() {
- $space_allowed = 1048576 * get_space_allowed();
- $space_used = get_dirsize( constant( "ABSPATH" ) . constant( "UPLOADS" ) );
- return $space_allowed - $space_used;
-}
-
-/**
- * Returns true if current blog is over storage limit.
- */
-function cpm_wpmu_is_over_storage_limit() {
- return cpm_wpmu_get_available_disk_space() < 0;
-}
-
-?>

0 comments on commit c6fbf2f

Please sign in to comment.
Something went wrong with that request. Please try again.