Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

New page option to disable sidebars on pages via the page-editor, tot…

…al rewrite of layout-head and layout-foot completely optimizing performance, added 3 new layouts as well while doing it.

Removed #pagewrap-right and #pagewrap-left in exchange for .area-wrap to handle the wraps of the GN layouts

Changed the way the functions.php handles certain variables that were global to see if I could release some overhead memory

Signed-off-by: Philip M. Hofer (Frumph) <frumph_dragon@yahoo.com>
  • Loading branch information...
commit 117facab28686f99afd826854db7e68d88f9ab9c 1 parent 7804484
Philip M. Hofer (Frumph) authored
Showing with 254 additions and 227 deletions.
  1. +49 −0 addons/page-options.php
  2. +5 −2 archive-comic-year.php
  3. +3 −1 changelog.txt
  4. +2 −1  comicpress-admin.php
  5. +54 −49 functions.php
  6. +2 −0  functions/classes.php
  7. +20 −4 functions/displaycomic.php
  8. +4 −1 functions/displaypost.php
  9. +1 −2  functions/navigation.php
  10. +4 −4 functions/profile-options.php
  11. +1 −1  header.php
  12. BIN  images/options/2cl.png
  13. BIN  images/options/2cr.png
  14. BIN  images/options/2cvl.png
  15. BIN  images/options/2cvr.png
  16. BIN  images/options/3c2l.png
  17. BIN  images/options/lgn.png
  18. BIN  images/options/rgn.png
  19. BIN  images/options/v3cl.png
  20. +5 −28 layout-foot.php
  21. +9 −61 layout-head.php
  22. +9 −9 options/addons.php
  23. +1 −2  options/configuration.php
  24. +19 −7 options/layout.php
  25. +9 −0 options/post-pages.php
  26. +3 −6 sidebar-left.php
  27. +3 −5 sidebar-right.php
  28. +29 −22 style.css
  29. +1 −1  widgets/archivedropdown.php
  30. +17 −17 widgets/comic-navigation.php
  31. +2 −2 widgets/controlpanel.php
  32. +1 −1  widgets/randomcomic.php
  33. +1 −1  widgets/randompostlink.php
View
49 addons/page-options.php
@@ -0,0 +1,49 @@
+<?php
+// page options - extra page options for comicpress, shown in a meta box in the page editor
+
+function comicpress_page_editor_options($post) {
+?>
+<div class="inside" style="overflow: hidden">
+ <?php
+ wp_nonce_field( 'comicpress_post_options-'.$post->ID, 'comicpress-update-page-options' );
+ $disable_sidebars = get_post_meta($post->ID, 'disable-sidebars', true);
+ ?>
+ <table>
+ <td valign="top">
+ <input id="comicpress_sidebar_remove" name="comicpress_sidebar_remove" type="checkbox" value="1"<?php echo $disable_sidebars ? ' checked="checked"' : ''; ?> /> Disable Sidebars
+ </td>
+ </tr>
+ </table>
+</div>
+<?php
+}
+add_action('add_meta_boxes', 'comicpress_add_page_editor_meta_box');
+
+function comicpress_add_page_editor_meta_box() {
+ add_meta_box('comicpress-page-options', __('ComicPress Page Options', 'comicpress'), 'comicpress_page_editor_options', 'page', 'side', 'high');
+}
+
+function comicpress_save_page_editor_options($post_id) {
+ if (isset($_POST['comicpress-update-page-options']) && !wp_verify_nonce( $_POST['comicpress-update-page-options'], 'comicpress_post_options-'.$post_id )) {
+ return $post_id;
+ }
+ if ( defined('DOING_AUTOSAVE') && DOING_AUTOSAVE )
+ return $post_id;
+ if ( $_POST['post_type'] == 'page' ) {
+ if ( !current_user_can( 'edit_page', $post_id ) )
+ return $post_id;
+ } else {
+ if ( !current_user_can( 'edit_post', $post_id ) )
+ return $post_id;
+ }
+
+ if (isset($_POST['comicpress_sidebar_remove'])) {
+ update_post_meta($post_id, 'disable-sidebars', '1');
+ } else {
+ delete_post_meta($post_id, 'disable-sidebars');
+ }
+ return $post_id;
+}
+add_action('save_post', 'comicpress_save_page_editor_options');
+
+?>
View
7 archive-comic-year.php
@@ -3,7 +3,7 @@
Template Name: Comic Year Archive
*/
get_header();
-
+Protect();
if (isset($_GET['archive_year'])) {
$archive_year = (int)$_GET['archive_year'];
} else {
@@ -71,4 +71,7 @@
</div>
<div class="post-foot"></div>
</div>
-<?php get_footer() ?>
+<?php
+UnProtect();
+get_footer();
+?>
View
4 changelog.txt
@@ -1,9 +1,11 @@
-2.9.2.29.2
+2.9.2.30
Fixed the issue with the comic navigation widget text boxes not properly escaping and unescapping strings
moved the facebook like script to load in the header to avoid a script error
fixed the reply to javascript to show apparently it doesnt like is_singular, go figure
displaying category list properly now, instead of multiple
removed trailingslashit from around $comic in displaycomic.php line #350, thanks @nismorack
+added easels disable sidebars on page options
+moved some data placement around to try to optimize usage
2.9.2.29.1
$is_comic needed to be set in the archive.php before hand, was giving notice
View
3  comicpress-admin.php
@@ -123,7 +123,8 @@ function comicpress_admin_options() {
'blogposts_with_comic',
'static_blog',
'disable_page_titles',
- 'disable_post_titles'
+ 'disable_post_titles',
+ 'enable_page_options'
) as $key) {
if (!isset($_REQUEST[$key])) $_REQUEST[$key] = 0;
$comicpress_options[$key] = (bool)( $_REQUEST[$key] == 1 ? true : false );
View
103 functions.php
@@ -1,5 +1,4 @@
<?php
-
/* DEFINES */
// xili-language plugin check
@@ -21,33 +20,6 @@
if (!isset($content_width)) $content_width = 520;
-global $comiccat, $blogcat, $comic_folder, $rss_comic_folder, $archive_comic_folder, $mini_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) {
- $variables_to_extract[$variable_name] = get_option("comicpress-${options}");
- }
-
- extract($variables_to_extract);
-
-} else {
- @require_once( get_template_directory() . '/comicpress-config.php');
-}
-
/* child-functions.php / child-widgets.php - in the child theme */
get_template_part('child', 'functions');
get_template_part('child', 'widgets');
@@ -103,7 +75,8 @@ function comicpress_config() {
@require_once(get_template_directory() . '/addons/relatedposts.php');
if (comicpress_themeinfo('facebook_meta') || comicpress_themeinfo('facebook_like_comic_post') || comicpress_themeinfo('facebook_like_comic_post'))
@require_once(get_template_directory() . '/addons/facebook.php');
-
+if (comicpress_themeinfo('enable_page_options'))
+ @require_once(get_template_directory() . '/addons/page-options.php');
// Dashboard Menu Comicpress Options and ComicPress CSS
if (is_admin()) {
@require_once(get_template_directory() . '/comicpress-admin.php');
@@ -152,8 +125,7 @@ function comicpress_sidebar_init() {
// put things in here that need to go into the init ONLY
function __comicpress_init() {
- global $wp_query, $comiccat, $blogcat, $comic_folder, $rss_comic_folder, $archive_comic_folder,
- $archive_comic_width, $rss_comic_width, $mini_comic_width, $blog_postcount, $content_width;
+ global $wp_query;
// initiate the scripts
if (!is_admin()) {
@@ -186,7 +158,7 @@ function __comicpress_init() {
wp_enqueue_script('bookmark', get_template_directory_uri() . '/js/bookmark.js', array('prototype', 'cookiejar'));
}
if (is_active_widget('comicpress_facebook_like_widget', false, 'comicpress_facebook_like_widget', true) || comicpress_themeinfo('facebook_like_blog_post') || comicpress_themeinfo('facebook_like_comic_post'))
- wp_enqueue_script('easel-facebook', 'http://connect.facebook.net/en_US/all.js#xfbml=1'); // force to the header instead of footer
+ wp_enqueue_script('comicpress-facebook', 'http://connect.facebook.net/en_US/all.js#xfbml=1'); // force to the header instead of footer
}
do_action('comicpress_init');
@@ -230,7 +202,6 @@ function comicpress_add_head() {
<?php }
}
-
if (!function_exists('is_cp_theme_layout')) {
function is_cp_theme_layout($choices) {
$choices = explode(",", $choices);
@@ -245,7 +216,7 @@ function is_cp_theme_layout($choices) {
function is_cp_layout_avail($layout, $avail_layouts) {
if (empty($layout)) return false;
- if (empty($avail_layouts)) $avail_layouts = 'standard,v,3c,3c2r,v3c,v3cr,gn,rgn';
+ if (empty($avail_layouts)) $avail_layouts = '2cr,2cl,2cvr,2cvl,3c,3c2r,3c2l,v3c,v3cr,v3cl,lgn,rgn';
$avail_layouts = explode(",",$avail_layouts);
foreach ($avail_layouts as $able_layout) {
if ($layout == $able_layout) {
@@ -268,7 +239,7 @@ function comicpress_stripslashes($str_to_strip) {
return $str_to_strip;
}
-function comicpress_clean_filename($filename) {
+function comicpress_clean_url($filename) {
return str_replace("%2F", "/", rawurlencode($filename));
}
@@ -299,7 +270,7 @@ function comicpress_in_comic_category($cat = null) {
* Parse all categories and sort them into comics and non-comics categories.
*/
function comicpress_create_category_tree() {
- global $category_tree, $comiccat;
+ global $category_tree;
if (empty($category_tree)) {
$categories_by_id = comicpress_get_comic_category_objects_by_id();
if (empty($categories_by_id) || !is_array($categories_by_id)) return false;
@@ -335,7 +306,7 @@ function comicpress_create_category_tree() {
$new_category_tree = array();
foreach ($category_tree as $node) {
$parts = explode("/", $node);
- if ($parts[1] == $comiccat) {
+ if ($parts[1] == comicpress_themeinfo('comiccat')) {
$new_category_tree[] = $node;
}
}
@@ -482,7 +453,7 @@ function comicpress_load_options() {
'facebook_meta' => false,
'enable_comic_lightbox' => false,
'cdn_url' => '',
- 'comiccat' => '1',
+/* 'comiccat' => '1',
'blogcat' => '3',
'comic_folder' => 'comics',
'rss_comic_folder' => 'comics-rss',
@@ -490,7 +461,8 @@ function comicpress_load_options() {
'mini_comic_folder' => 'comics-mini',
'rss_comic_width' => '240',
'archive_comic_width' => '420',
- 'mini_comic_width' => '198'
+ 'mini_comic_width' => '198' */
+ 'enable_page_options' => true
) as $field => $value) {
$comicpress_options[$field] = $value;
}
@@ -501,17 +473,41 @@ function comicpress_load_options() {
}
function comicpress_themeinfo($whichinfo = null) {
- global $comicpress_themeinfo, $comiccat, $blogcat, $comic_folder, $rss_comic_folder, $archive_comic_folder, $mini_comic_folder,
- $archive_comic_width, $rss_comic_width, $mini_comic_width, $blog_postcount;
+ global $comicpress_themeinfo;
+
if (empty($comicpress_themeinfo) || $whichinfo == 'reset') {
-
+
+ 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) {
+ $variables_to_extract[$variable_name] = get_option("comicpress-${options}");
+ }
+
+ extract($variables_to_extract);
+
+ } else {
+ @require_once( get_template_directory() . '/comicpress-config.php');
+ }
+
$comicpress_themeinfo = '';
// $comicpress_config = comicpress_load_config();
$comicpress_options = comicpress_load_options();
$comicpress_coreinfo = wp_upload_dir();
$comicpress_addinfo = array(
'upload_path' => get_option('upload_path'),
- 'version' => '2.9.2.29.2',
+ 'version' => '2.9.2.30',
'siteurl' => trailingslashit(get_option('siteurl')),
'home' => trailingslashit(home_url()),
'comiccat' => $comiccat,
@@ -529,6 +525,7 @@ function comicpress_themeinfo($whichinfo = null) {
$comicpress_themeinfo = array_merge($comicpress_coreinfo, $comicpress_addinfo);
$comicpress_themeinfo = array_merge($comicpress_themeinfo, $comicpress_options);
+
if ($comicpress_themeinfo['enable-storyline-support']) {
// This is now sep. to make sure that it only loads when it needs to
$comicpress_storyline = array(
@@ -536,8 +533,8 @@ function comicpress_themeinfo($whichinfo = null) {
'storyline-category-order' => get_option('comicpress-storyline-category-order')
);
$comicpress_themeinfo = array_merge($comicpress_themeinfo, $comicpress_storyline);
- }
- $comicpress_themeinfo['blog_postcount'] = $blog_postcount;
+ }
+
if (is_multisite()) {
$comicpress_themeinfo['basedir'] = trailingslashit(ABSPATH.$comicpress_themeinfo['upload_path']);
$comicpress_themeinfo['baseurl'] = trailingslashit($comicpress_themeinfo['siteurl'].'files');
@@ -569,12 +566,11 @@ function comicpress_get_comic_category_objects_by_id() {
// This uses the comicpress_load_config() because it's not yet triggered in themeinfo
function comicpress_all_comic_categories_array() {
- global $comicpress_all_comic_categories_array, $comiccat;
+ global $comicpress_all_comic_categories_array;
if (empty($comicpress_all_comic_categories_array)) {
-// $comicpress_config = comicpress_load_config();
- $comicpress_all_comic_categories_array[] = $comiccat;
+ $comicpress_all_comic_categories_array[] = comicpress_themeinfo('comiccat');
foreach (get_all_category_ids() as $cats) {
- if (cat_is_ancestor_of($comiccat, $cats)) {
+ if (cat_is_ancestor_of(comicpress_themeinfo('comiccat'), $cats)) {
$comicpress_all_comic_categories_array[] = $cats;
}
}
@@ -636,5 +632,14 @@ function comicpress_get_string_to_exclude_all_but_provided_categories($category)
return implode(" and ", array_diff($category_ids, $category));
}
+function comicpress_disable_sidebars() {
+ global $post;
+ if (comicpress_is_signup()) return true;
+ if (is_page() && !empty($post)) {
+ $sidebars_disabled = get_post_meta($post->ID, 'disable-sidebars', true);
+ if ($sidebars_disabled) return true;
+ }
+ return false;
+}
?>
View
2  functions/classes.php
@@ -84,6 +84,8 @@ function comicpress_body_class($classes = '') {
$classes[] = 'attachment-' . $type;
endforeach;
}
+
+ if (comicpress_disable_sidebars()) $classes[] = 'wide';
$classes[] = 'layout-'.comicpress_themeinfo('cp_theme_layout');
View
24 functions/displaycomic.php
@@ -47,7 +47,7 @@ function comicpress_display_comic_area() {
}
function comicpress_display_comic_swf($post, $comic) {
- $file_url = comicpress_themeinfo('baseurl') . comicpress_clean_filename($comic);
+ $file_url = comicpress_themeinfo('baseurl') . comicpress_clean_url($comic);
$height = get_post_meta( $post->ID, "fheight", true );
$width = get_post_meta( $post->ID, "fwidth", true );
if (empty($height)) $height = '300';
@@ -112,7 +112,7 @@ function comicpress_display_comic_thumbnail($type = 'mini', $override_post = nul
$thumbnail = array();
if (!empty($thumb_found)) {
foreach ($thumb_found as $thumb) {
- $thumbnail[] = comicpress_themeinfo('baseurl') . comicpress_clean_filename($thumb);
+ $thumbnail[] = comicpress_themeinfo('baseurl') . comicpress_clean_url($thumb);
}
}
}
@@ -161,9 +161,9 @@ function comicpress_display_comic_image($post, $comic) {
global $wp_query;
$cdn_url = comicpress_themeinfo('cdn_url');
if (!empty($cdn_url)) {
- $file_url = trailingslashit($cdn_url) . comicpress_clean_filename($comic);
+ $file_url = trailingslashit($cdn_url) . comicpress_clean_url($comic);
} else {
- $file_url = comicpress_themeinfo('baseurl') . comicpress_clean_filename($comic);
+ $file_url = comicpress_themeinfo('baseurl') . comicpress_clean_url($comic);
}
$alt_text = comicpress_the_hovertext($post);
if (!is_search() && !is_archive() && !is_feed()) {
@@ -413,5 +413,21 @@ function get_comic_url($folder = 'comic', $override_post = null, $filter = 'defa
return false;
}
+add_action('comic-area', 'comicpress_inject_comic_home');
+function comicpress_inject_comic_home() {
+ global $wp_query;
+ if (!is_paged() && is_home()) {
+ if (!comicpress_themeinfo('disable_comic_frontpage')) {
+ $wp_query->in_the_loop = true; $comicFrontpage = new WP_Query(); $comicFrontpage->query('showposts=1&cat='.comicpress_all_comic_categories_string());
+ while ($comicFrontpage->have_posts()) : $comicFrontpage->the_post();
+ comicpress_display_comic_area();
+ endwhile;
+ }
+ } else {
+ if (is_single() && comicpress_in_comic_category()) {
+ comicpress_display_comic_area();
+ }
+ }
+}
?>
View
5 functions/displaypost.php
@@ -12,7 +12,10 @@ function comicpress_display_post_title($is_comic = false) {
}
if (is_home() || is_search() || is_archive() || $is_comic && !is_page()) $post_title .= "<a href=\"".get_permalink()."\">";
- $post_title .= get_the_title();
+ $the_post_title = get_the_title();
+ if (empty($the_post_title)) $the_post_title = __('No Post Title','comicpress');
+ $post_title .= $the_post_title;
+
if (is_home() || is_search() || is_archive() || $is_comic && !is_page()) $post_title .= "</a>";
$post_title .= "</h2>\r\n";
echo apply_filters('comicpress_display_post_title',$post_title);
View
3  functions/navigation.php
@@ -197,8 +197,7 @@ function comicpress_get_next_storyline_start_permalink() {
}
function comicpress_get_adjacent_storyline_category_id($next = false) {
- global $post;
- $category_tree = comicpress_themeinfo('category_tree');
+ global $post, $category_tree;
$categories = get_the_category($post->ID);
if (is_array($categories)) {
$category_id = $categories[0]->cat_ID;
View
8 functions/profile-options.php
@@ -9,22 +9,22 @@
*
*/
-function easel_remove_unwanted_contactmethods( $contactmethods ) {
+function comicpress_remove_unwanted_contactmethods( $contactmethods ) {
unset($contactmethods['aim']);
unset($contactmethods['jabber']);
unset($contactmethods['yim']);
return $contactmethods;
}
-// add_filter('user_contactmethods','easel_remove_unwanted_contactmethods',10,1);
+// add_filter('user_contactmethods','comicpress_remove_unwanted_contactmethods',10,1);
-function add_new_contactmethods($methods){
+function comicpress_add_new_contactmethods($methods){
$methods['twitter'] = 'Twitter ID';
$methods['facebook'] = 'Facebook';
$methods['msn'] = 'MSN';
return $methods;
}
-add_filter('user_contactmethods','add_new_contactmethods');
+add_filter('user_contactmethods','comicpress_add_new_contactmethods');
View
2  header.php
@@ -28,7 +28,7 @@
?>
<div id="page-head"></div>
<?php if (!comicpress_themeinfo('disable_page_restraints')) {
- if (is_cp_theme_layout('standard,v')) { ?>
+ 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 { ?>
View
BIN  images/options/2cl.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/options/2cr.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/options/2cvl.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/options/2cvr.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/options/3c2l.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/options/lgn.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/options/rgn.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/options/v3cl.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
33 layout-foot.php
@@ -1,37 +1,14 @@
-<?php if (is_cp_theme_layout('v,v3c')) { ?>
</div>
- <div class="clear"></div>
- <div id="subcontent-wrapper-foot"></div>
-<?php } ?>
-</div>
-<?php if (is_cp_theme_layout('v3cr')) { ?>
+ <?php if (is_cp_theme_layout('lgn,rgn')) { ?>
+ <?php if (is_cp_theme_layout('lgn') && !comicpress_disable_sidebars()) get_sidebar('right'); ?>
<div class="clear"></div>
</div>
+ <?php } ?>
+ <?php if (is_cp_theme_layout('3c2r,v3cr') && !comicpress_disable_sidebars()) get_sidebar('left'); ?>
+ <?php if (is_cp_theme_layout('2cr,2cvr,3c,3c2r,v3c,v3cr,rgn') && !comicpress_disable_sidebars()) get_sidebar('right'); ?>
<div class="clear"></div>
<div id="subcontent-wrapper-foot"></div>
</div>
-<?php }
-
-if (is_cp_theme_layout('3c2r,v3cr') && !comicpress_is_signup()) get_sidebar('left');
-
-if (is_cp_theme_layout('rgn')) { ?>
- <div class="clear"></div>
- <div id="subcontent-wrapper-foot"></div>
- </div>
-<?php }
-
-if (is_cp_theme_layout('3c,v3c,gn,standard,v,3c2r,v3cr') && !comicpress_is_signup()) get_sidebar('right');
-
-if (is_cp_theme_layout('3c,standard,3c2r,gn')) { ?>
- <div class="clear"></div>
- <?php if (!comicpress_is_signup()) { ?></div><?php } ?>
- <div id="subcontent-wrapper-foot"></div>
-<?php }
-
-if (is_cp_theme_layout('gn,rgn')) { ?>
- </div>
-<?php }
-if (is_cp_theme_layout('rgn') && !comicpress_is_signup()) get_sidebar('right'); ?>
<div class="clear"></div>
</div>
<div id="content-wrapper-foot"></div>
View
70 layout-head.php
@@ -1,64 +1,12 @@
<div id="content-wrapper-head"></div>
<div id="content-wrapper">
-
- <?php
-if (is_cp_theme_layout('gn,v3c') && !comicpress_is_signup()) get_sidebar('left');
-
- if (is_cp_theme_layout('gn,rgn')) { ?>
- <div id="pagewrap-right">
- <?php }
-
- if (is_cp_theme_layout('v3cr')) { ?>
- <div id="pagewrap-left">
- <?php }
-
-if (is_cp_theme_layout('v,v3c')) {
- if (is_page('chat') || is_page('forum') && !comicpress_is_signup()) { ?>
- <div id="content" class="widecolumn">
- <?php } elseif (!comicpress_is_signup()) { ?>
+ <?php if (is_cp_theme_layout('2cr,2cl,3c,3c2l,3c2r')) do_action('comic-area'); ?>
+ <div id="subcontent-wrapper-head"></div>
+ <div id="subcontent-wrapper">
+ <?php if (is_cp_theme_layout('2cl,2cvl,3c,3c2l,v3c,v3cl,lgn') && !comicpress_disable_sidebars()) get_sidebar('left'); ?>
+ <?php if (is_cp_theme_layout('3c2l,v3cl') && !comicpress_disable_sidebars()) get_sidebar('right'); ?>
+ <?php if (is_cp_theme_layout('lgn,rgn')) { ?><div class="gn-wrap"><?php do_action('comic-area'); } ?>
+ <?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');
-}
-
-if (!is_paged()) {
- if (is_home()) {
- if (!comicpress_themeinfo('disable_comic_frontpage')) {
- $wp_query->in_the_loop = true; $comicFrontpage = new WP_Query(); $comicFrontpage->query('showposts=1&cat='.comicpress_all_comic_categories_string());
- while ($comicFrontpage->have_posts()) : $comicFrontpage->the_post();
- comicpress_display_comic_area();
- endwhile;
- }
- } else {
- if (is_single() && comicpress_in_comic_category()) {
- comicpress_display_comic_area();
- }
- }
-}
-
-if (is_cp_theme_layout('3c,standard,3c2r,v3c,rgn')) { ?>
-<div id="subcontent-wrapper-head"></div>
- <div id="subcontent-wrapper">
-<?php }
-
-if (is_cp_theme_layout('3c,rgn') && !comicpress_is_signup()) get_sidebar('left');
-
-if (is_cp_theme_layout('v3cr,gn')) { ?>
-<div id="subcontent-wrapper-head"></div>
- <div id="subcontent-wrapper">
-<?php }
-
-if (!is_cp_theme_layout('v3c,v')) {
- if (is_page('chat') || is_page('forum') && !comicpress_is_signup()) { ?>
- <div id="content" class="widecolumn">
- <?php } elseif (!comicpress_is_signup()) { ?>
- <div id="content" class="narrowcolumn">
- <?php }
- if (is_active_sidebar('over-blog')) get_sidebar('overblog');
-}
-
-if (is_cp_theme_layout('v')) { ?>
-<div id="subcontent-wrapper-head"></div>
- <div id="subcontent-wrapper">
-<?php }
-?>
+ <?php if (is_cp_theme_layout('2cvr,2cvl,v3c,v3cr,v3cl')) do_action('comic-area'); ?>
+ <?php if (is_active_sidebar('over-blog')) get_sidebar('overblog'); ?>
View
18 options/addons.php
@@ -8,15 +8,15 @@
<table class="widefat">
<thead>
<tr>
- <th colspan="5"><?php _e('Custom Header','easel'); ?></th>
+ <th colspan="5"><?php _e('Custom Header','comicpress'); ?></th>
</tr>
</thead>
<tr class="alternate">
- <th scope="row"><label for="custom_image_header_width"><?php _e('Custom Header Values','easel'); ?></label></th>
+ <th scope="row"><label for="custom_image_header_width"><?php _e('Custom Header Values','comicpress'); ?></label></th>
<td>
- <?php _e('Width:','easel'); ?> <input type="text" size="5" name="custom_image_header_width" id="custom_image_header_width" value="<?php echo comicpress_themeinfo('custom_image_header_width'); ?>" />px &nbsp;
- <?php _e('Height:','easel'); ?> <input type="text" size="5" name="custom_image_header_height" id="custom_image_header_height" value="<?php echo comicpress_themeinfo('custom_image_header_height'); ?>" />px<br />
- <?php _e('Modify the height and width of the custom header *if* you use Appearance - Header - 780px is for standard and v layouts, the rest are wide at 980px.','easel'); ?>
+ <?php _e('Width:','comicpress'); ?> <input type="text" size="5" name="custom_image_header_width" id="custom_image_header_width" value="<?php echo comicpress_themeinfo('custom_image_header_width'); ?>" />px &nbsp;
+ <?php _e('Height:','comicpress'); ?> <input type="text" size="5" name="custom_image_header_height" id="custom_image_header_height" value="<?php echo comicpress_themeinfo('custom_image_header_height'); ?>" />px<br />
+ <?php _e('Modify the height and width of the custom header *if* you use Appearance - Header - 780px is for standard and v layouts, the rest are wide at 980px.','comicpress'); ?>
</td>
</tr>
</table>
@@ -239,14 +239,14 @@
<table class="widefat">
<thead>
<tr>
- <th colspan="5"><?php _e('CDN (Content Delivery Network)','easel'); ?></th>
+ <th colspan="5"><?php _e('CDN (Content Delivery Network)','comicpress'); ?></th>
</tr>
</thead>
<tr class="alternate">
- <th scope="row"><label for="cdn_url"><?php _e('CDN URL','easel'); ?></label></th>
+ <th scope="row"><label for="cdn_url"><?php _e('CDN URL','comicpress'); ?></label></th>
<td>
- <?php _e('URL:','easel'); ?> <input type="text" size="40" name="cdn_url" id="cdn_url" value="<?php echo comicpress_themeinfo('cdn_url'); ?>" /><br />
- <?php _e('If you are using a content delivery network, put the URL to where the comics are stored here. This will replace the url used in the img tag when outputting the comic.','easel'); ?>
+ <?php _e('URL:','comicpress'); ?> <input type="text" size="40" name="cdn_url" id="cdn_url" value="<?php echo comicpress_themeinfo('cdn_url'); ?>" /><br />
+ <?php _e('If you are using a content delivery network, put the URL to where the comics are stored here. This will replace the url used in the img tag when outputting the comic.','comicpress'); ?>
</td>
</tr>
</table>
View
3  options/configuration.php
@@ -16,8 +16,7 @@
<th scope="row">
<label for="comiccat"><?php _e('Comic Category','comicpress'); ?></label>
<?php
- $comiccat = comicpress_themeinfo('comiccat');
- $select = wp_dropdown_categories('show_option_all=Select category&hide_empty=0&show_count=0&orderby=name&echo=0&selected='.$comiccat);
+ $select = wp_dropdown_categories('show_option_all=Select category&hide_empty=0&show_count=0&orderby=name&echo=0&selected='.comicpress_themeinfo('comiccat'));
$select = preg_replace('#<select([^>]*)>#', '<select name="comiccat" id="comicccat">', $select);
echo $select;
?>
View
26 options/layout.php
@@ -54,26 +54,38 @@ function showimage(sel,pic) {
<tr class="alternate">
<th scope="row" style="width:250px"><label for="cp_theme_layout" style="text-align:left"><?php _e('Choose Your Website Layout','comicpress'); ?></label>
<select name="cp_theme_layout" id="cp_theme_layout" onchange="showimage(this,'cpthemestyle')">
- <?php if (is_cp_layout_avail('standard',$avail_layouts)) { ?>
- <option class="level-0" value="standard" <?php if (comicpress_themeinfo('cp_theme_layout') == 'standard') { ?>selected="selected" <?php } ?>><?php _e('2 Column - Standard','comicpress'); ?></option>
+ <?php if (is_cp_layout_avail('2cr',$avail_layouts)) { ?>
+ <option class="level-0" value="2cr" <?php if (comicpress_themeinfo('cp_theme_layout') == '2cr') { ?>selected="selected" <?php } ?>><?php _e('2 Column - Sidebar on Right','comicpress'); ?></option>
<?php } ?>
- <?php if (is_cp_layout_avail('v',$avail_layouts)) { ?>
- <option class="level-0" value="v" <?php if (comicpress_themeinfo('cp_theme_layout') =='v') { ?>selected="selected" <?php } ?>><?php _e('2 Column - Vertical','comicpress'); ?></option>
+ <?php if (is_cp_layout_avail('2cl',$avail_layouts)) { ?>
+ <option class="level-0" value="2cl" <?php if (comicpress_themeinfo('cp_theme_layout') == '2cl') { ?>selected="selected" <?php } ?>><?php _e('2 Column - Sidebar on Left','comicpress'); ?></option>
+ <?php } ?>
+ <?php if (is_cp_layout_avail('2cvr',$avail_layouts)) { ?>
+ <option class="level-0" value="2cvr" <?php if (comicpress_themeinfo('cp_theme_layout') =='2cvr') { ?>selected="selected" <?php } ?>><?php _e('2 Column - Vertical, Sidebar on Right','comicpress'); ?></option>
+ <?php } ?>
+ <?php if (is_cp_layout_avail('2cvl',$avail_layouts)) { ?>
+ <option class="level-0" value="2cvl" <?php if (comicpress_themeinfo('cp_theme_layout') =='2cvl') { ?>selected="selected" <?php } ?>><?php _e('2 Column - Vertical, Sidebar on Left','comicpress'); ?></option>
<?php } ?>
<?php if (is_cp_layout_avail('3c',$avail_layouts)) { ?>
- <option class="level-0" value="3c" <?php if (comicpress_themeinfo('cp_theme_layout') =='3c') { ?>selected="selected" <?php } ?>><?php _e('3 Column - Standard ','comicpress'); ?></option>
+ <option class="level-0" value="3c" <?php if (comicpress_themeinfo('cp_theme_layout') =='3c') { ?>selected="selected" <?php } ?>><?php _e('3 Column','comicpress'); ?></option>
<?php } ?>
<?php if (is_cp_layout_avail('3c2r',$avail_layouts)) { ?>
<option class="level-0" value="3c2r" <?php if (comicpress_themeinfo('cp_theme_layout') =='3c2r') { ?>selected="selected" <?php } ?>><?php _e('3 Column - Double Right Sidebar','comicpress'); ?></option>
<?php } ?>
+ <?php if (is_cp_layout_avail('3c2l',$avail_layouts)) { ?>
+ <option class="level-0" value="3c2l" <?php if (comicpress_themeinfo('cp_theme_layout') =='3c2l') { ?>selected="selected" <?php } ?>><?php _e('3 Column - Double Left Sidebar','comicpress'); ?></option>
+ <?php } ?>
<?php if (is_cp_layout_avail('v3c',$avail_layouts)) { ?>
<option class="level-0" value="v3c" <?php if (comicpress_themeinfo('cp_theme_layout') =='v3c') { ?>selected="selected" <?php } ?>><?php _e('3 Column - Vertical','comicpress'); ?></option>
<?php } ?>
<?php if (is_cp_layout_avail('v3cr',$avail_layouts)) { ?>
<option class="level-0" value="v3cr" <?php if (comicpress_themeinfo('cp_theme_layout') =='v3cr') { ?>selected="selected" <?php } ?>><?php _e('3 Column - Vertical Double Right Sidebar','comicpress'); ?></option>
<?php } ?>
- <?php if (is_cp_layout_avail('gn',$avail_layouts)) { ?>
- <option class="level-0" value="gn" <?php if (comicpress_themeinfo('cp_theme_layout') =='gn') { ?>selected="selected" <?php } ?>><?php _e('Graphic Novel - Left Sidebar','comicpress'); ?></option>
+ <?php if (is_cp_layout_avail('v3cl',$avail_layouts)) { ?>
+ <option class="level-0" value="v3cl" <?php if (comicpress_themeinfo('cp_theme_layout') =='v3cl') { ?>selected="selected" <?php } ?>><?php _e('3 Column - Vertical Double left Sidebar','comicpress'); ?></option>
+ <?php } ?>
+ <?php if (is_cp_layout_avail('lgn',$avail_layouts)) { ?>
+ <option class="level-0" value="lgn" <?php if (comicpress_themeinfo('cp_theme_layout') =='lgn') { ?>selected="selected" <?php } ?>><?php _e('Graphic Novel - Left Sidebar','comicpress'); ?></option>
<?php } ?>
<?php if (is_cp_layout_avail('rgn',$avail_layouts)) { ?>
<option class="level-0" value="rgn" <?php if (comicpress_themeinfo('cp_theme_layout') =='rgn') { ?>selected="selected" <?php } ?>><?php _e('Graphic Novel - Right Sidebar','comicpress'); ?></option>
View
9 options/post-pages.php
@@ -288,6 +288,15 @@
<?php _e('If you disable the titles no pages you can still add a post-image in the page editor.','comicpress'); ?>
</td>
</tr>
+ <tr>
+ <th scope="row"><label for="enable_page_options"><?php _e('Enable Additional Page Options','comicpress'); ?></label></th>
+ <td>
+ <input id="enable_page_options" name="enable_page_options" type="checkbox" value="1" <?php checked(true, comicpress_themeinfo('enable_page_options')); ?> />
+ </td>
+ <td>
+ <?php _e('Extra Options when editing a page, like disable sidebars on that page only.','comicpress'); ?>
+ </td>
+ </tr>
</table>
</div>
View
9 sidebar-left.php
@@ -1,17 +1,14 @@
-<?php
-if (!comicpress_themeinfo('disable_lrsidebars') && !is_page('chat') && !is_page('forum')) { ?>
<div id="sidebar-left">
<div class="sidebar-head"></div>
<div class="sidebar">
<?php
- if ( !dynamic_sidebar('left-sidebar') ) :
+ if ( !dynamic_sidebar('left-sidebar') ) {
if (!is_cp_theme_layout('standard,v')) {
the_widget('comicpress_calendar_widget');
}
the_widget('comicpress_latest_comics_widget');
- endif;
+ }
?>
</div>
<div class="sidebar-foot"></div>
-</div>
-<?php } ?>
+</div>
View
8 sidebar-right.php
@@ -1,9 +1,8 @@
-<?php if (!comicpress_themeinfo('disable_lrsidebars') && !is_page('chat') && !is_page('forum')) { ?>
<div id="sidebar-right">
<div class="sidebar-head"></div>
<div class="sidebar">
<?php
- if ( !dynamic_sidebar('right-sidebar') ) :
+ if ( !dynamic_sidebar('right-sidebar') ) {
if (is_cp_theme_layout('standard,v')) {
the_widget('comicpress_calendar_widget');
}
@@ -12,9 +11,8 @@
}
the_widget('WP_Widget_Pages');
the_widget('WP_Widget_Categories','hierarchical=1&count=1&dropdown=0');
- endif;
+ }
?>
</div>
<div class="sidebar-foot"></div>
-</div>
-<?php } ?>
+</div>
View
51 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.2.29.2
+Version: 2.9.2.30
License: GNU General Public License, v3 (or newer)
License URI: http://www.opensource.org/licenses/gpl-3.0.html
.
@@ -372,6 +372,15 @@ h4, h4 a {
/* THE COMIC */
+#comic-wrap {
+ width: auto;
+}
+
+.layout-lgn #comic-wrap {
+ width: 770px;
+ float: left;
+}
+
#comic-head {
clear: both;
}
@@ -486,7 +495,7 @@ h4, h4 a {
/* POSTS - PAGES */
-#pagewrap-right {
+.gn-wrap {
width: 770px;
padding: 0;
margin: 0;
@@ -494,10 +503,8 @@ h4, h4 a {
overflow: hidden;
}
-#pagewrap-left {
- width: 560px;
- float: left;
- overflow: hidden;
+.wide .gn-wrap {
+ width: 100%;
}
#subcontent-wrapper {
@@ -509,14 +516,20 @@ h4, h4 a {
}
.narrowcolumn {
- width: 550px;
- padding: 0 5px;
+ width: 560px;
overflow: hidden;
}
/* add 10px to smaller width layouts */
-.layout-standard .narrowcolumn, .layout-v .narrowcolumn {
- width: 560px;
+.layout-2cr .narrowcolumn,
+.layout-2cl .narrowcolumn,
+.layout-2cvr .narrowcolumn,
+.layout-2cvl .narrowcolumn {
+ width: 570px;
+}
+
+.wide .narrowcolumn {
+ width: 100%;
}
.widecolumn {
@@ -536,7 +549,8 @@ h4, h4 a {
padding: 1%;
}
-.post {
+.post, #comment-wrapper {
+ padding: 0 5px;
}
.post-type-cat {
@@ -739,7 +753,7 @@ textarea#comment {
}
.form-submit {
- float: right;
+ float: left;
display: inline-block
}
@@ -864,17 +878,10 @@ ul.children {
/* SIDEBAR */
/* Left Sidebar Themes */
-#sidebar-left {
+#sidebar-left, #sidebar-right {
float: left;
- width: 200px;
- padding: 5px;
-}
-
-/* Right Sidebar Themes */
-#sidebar-right {
- float: right;
- width: 200px;
- padding: 5px;
+ width: 206px;
+ padding: 2px;
}
#sidebar-overcomic {
View
2  widgets/archivedropdown.php
@@ -19,7 +19,7 @@ function comicpress_archive_dropdown_widget() {
}
function widget($args, $instance) {
- global $comiccat, $wp_query, $post;
+ global $wp_query, $post;
Protect();
extract($args, EXTR_SKIP);
echo $before_widget;
View
34 widgets/comic-navigation.php
@@ -88,7 +88,7 @@ function widget($args, $instance) {
<a href="<?php echo $instance['archive_path']; ?>" class="navi navi-archives navi-archive" title="<?php echo $instance['archives_title']; ?>"><?php echo $instance['archives_title']; ?></a>
<?php }
if ($instance['random']) { ?>
- <a href="<?php echo home_url(); ?>/?randomcomic&nocache=1" class="navi navi-random" title="<?php echo $instance['random_title']; ?>"><?php echo $instance['random_title']; ?></a>
+ <a href="<?php echo home_url(); ?>/?randomcomic&amp;nocache=1" class="navi navi-random" title="<?php echo $instance['random_title']; ?>"><?php echo $instance['random_title']; ?></a>
<?php }
if ($instance['comictitle']) { ?>
<span class="navi-comictitle"><a href="<?php the_permalink(); ?>">"<?php the_title(); ?>"</a></span>
@@ -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; ?>&title=<?php echo $title; ?>" title="Reddit">Reddit</a>
- <a href="http://digg.com/submit?phase=2&url=<?php echo $url; ?>&title=<?php echo $title; ?>" title="Digg">Digg</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&u=<?php echo $url; ?>&t=<?php echo $title; ?>&c=" title="MySpace">MySpace</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; ?>&title=<?php echo $title; ?>" title="Stumbleupon">Stumbleupon</a>
- <a href="http://buzz.yahoo.com/submit/?submitUrl=<?php echo $url; ?>&submitHeadline=<?php echo $title; ?>" title="Buzz Up!">Buzz Up!</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&bkmk=<?php echo $url; ?>&title=<?php echo $title; ?>" title="Google Bookmarks">Google Bookmarks</a>
- <a href="http://bookmarks.yahoo.com/toolbar/savebm?opener=tb&u=<?php echo $url; ?>&t=<?php echo $title; ?>" title="Yahoo Bookmarks">Yahoo Bookmarks</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; ?>&t=<?php echo $title; ?>" title="Yahoo MyWeb">Yahoo MyWeb</a>
- <a href="https://favorites.live.com/quickadd.aspx?marklet=1&mkt=en-us&url=<?php echo $url; ?>&title=<?php echo $title; ?>" title="Windows Live">Windows Live</a>
- <a href="http://www.propeller.com/submit/?U=<?php echo $url; ?>&T=<?php echo $title; ?>" title="Propeller">Propeller</a>
- <a href="http://friendfeed.com/share?url=<?php echo $url; ?>&title=<?php echo $title; ?>" title="FriendFeed">FriendFeed</a>
- <a href="http://www.newsvine.com/_tools/seed&save?popoff=0&u=<?php echo $url; ?>&h=<?php echo $title; ?>" title="Newsvine">Newsvine</a>
- <a href="http://www.xanga.com/private/editorx.aspx?t=<?php echo $title; ?>&u=<?php echo $url; ?>&s=" title="Xanga">Xanga</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&url=<?php echo $url; ?>&title=<?php echo $title; ?>&summary=<?php echo $excerpt; ?>&source=" title="LinkedIn">LinkedIn</a>
- <a href="http://blinklist.com/index.php?Action=Blink/addblink.php&Url=<?php echo $url; ?>&Title=<?php echo $title; ?>" title="Blinklist">Blinklist</a>
- <a href="http://furl.net/storeIt.jsp?u=<?php echo $url; ?>&t=<?php echo $title; ?>" title="Furl">Furl</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>
</div>
<?php } ?>
</div>
View
4 widgets/controlpanel.php
@@ -20,8 +20,8 @@ function comicpress_show_control_panel() {
global $user_login;
if (!is_user_logged_in()) {
$args = array(
- 'label_username' => __('Username', 'easel'),
- 'label_password' => __('Password', 'easel')
+ 'label_username' => __('Username', 'comicpress'),
+ 'label_password' => __('Password', 'comicpress')
);
wp_login_form($args);
?>
View
2  widgets/randomcomic.php
@@ -24,7 +24,7 @@ function widget($args, $instance) {
echo $before_widget;
$title = empty($instance['title']) ? '' : apply_filters('widget_title', $instance['title']);
if ( !empty( $title ) ) { echo $before_title . $title . $after_title; }; ?>
- <h2 class="randomcomic"><a href="/?randomcomic&nocache=1"><span class="random-comic-icon">?</span> <?php _e('Random Comic','comicpress'); ?></a></h2>
+ <h2 class="randomcomic"><a href="/?randomcomic&amp;nocache=1"><span class="random-comic-icon">?</span> <?php _e('Random Comic','comicpress'); ?></a></h2>
<?php
echo $after_widget;
}
View
2  widgets/randompostlink.php
@@ -24,7 +24,7 @@ function widget($args, $instance) {
echo $before_widget;
$title = empty($instance['title']) ? '' : apply_filters('widget_title', $instance['title']);
if ( !empty( $title ) ) { echo $before_title . $title . $after_title; }; ?>
- <h2 class="randompost"><a href="/?randompost&nocache=1"><?php _e('Random Post','comicpress'); ?></a></h2>
+ <h2 class="randompost"><a href="/?randompost&amp;nocache=1"><?php _e('Random Post','comicpress'); ?></a></h2>
<?php
echo $after_widget;
}
Please sign in to comment.
Something went wrong with that request. Please try again.