Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

2 returning layouts, 3c rgn 3c lgn, where the one sidebar is next to …

…the content as the comic is put into the content column
  • Loading branch information...
commit 7f804afe0d8fc2f6db3286fb8aa40b2518d5e9d0 1 parent b3221f8
@Frumph authored
View
BIN  images/options/3clgn.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/3crgn.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
10 layout-foot.php
@@ -1,10 +1,16 @@
+
<?php if (!comicpress_sidebars_disabled()) comicpress_get_sidebar('under-blog'); ?>
</div>
- </div>
+<?php
+if (!comicpress_is_signup() && !comicpress_sidebars_disabled()) {
+ if (comicpress_is_layout('3clgn')) comicpress_get_sidebar('right');
+}
+?>
+ </div>
<?php
if (!comicpress_is_signup() && !comicpress_sidebars_disabled()) {
if (comicpress_is_layout('3cl,3cr')) comicpress_get_sidebar('left');
- if (comicpress_is_layout('2cr,2crw,3c,3cr')) comicpress_get_sidebar('right');
+ if (comicpress_is_layout('2cr,2crw,3c,3cr,3crgn')) comicpress_get_sidebar('right');
}
?>
<div class="clear"></div>
View
9 layout-head.php
@@ -6,12 +6,17 @@
<div id="subcontent-wrapper">
<?php
if (!comicpress_is_signup() && !comicpress_sidebars_disabled()) {
- if (comicpress_is_layout('2cl,2clw,3c,3cl')) comicpress_get_sidebar('left');
+ if (comicpress_is_layout('2cl,2clw,3c,3cl,3clgn')) comicpress_get_sidebar('left');
if (comicpress_is_layout('3cl')) comicpress_get_sidebar('right');
}
?>
<div id="content-column">
- <?php if (get_theme_mod('comicpress-customize-comic-in-column', false)) do_action('comic-area'); ?>
+ <?php
+ if (get_theme_mod('comicpress-customize-comic-in-column', false)) do_action('comic-area');
+ if (!comicpress_is_signup() && !comicpress_sidebars_disabled()) {
+ if (comicpress_is_layout('3crgn')) comicpress_get_sidebar('left');
+ }
+ ?>
<div id="content" class="narrowcolumn">
<?php do_action('comic-blog-area'); ?>
<?php do_action('comicpress-narrowcolumn-area'); ?>
View
31 options/general.php
@@ -288,36 +288,7 @@
<?php _e('If enabled will show the post thumbnail of the post in the RSS feed.','comicpress'); ?>
</td>
</tr>
- </table>
-<?php
-/*
- <table class="widefat">
- <thead>
- <tr>
- <th colspan="3"><?php _e('Facebook','comicpress'); ?></th>
- </tr>
- </thead>
- <tr class="alternate">
- <th scope="row"><label for="facebook_like_blog_post"><?php _e('Enable the Facebook Like button in Blog Posts?','comicpress'); ?></label></th>
- <td>
- <input id="facebook_like_blog_post" name="facebook_like_blog_post" type="checkbox" value="1" <?php checked(true, $comicpress_options['facebook_like_blog_post']); ?> />
- </td>
- <td>
- <?php _e('When enabled this option will allow the Facebook like button to appear at the bottom of regular blog posts.','comicpress'); ?>
- </td>
- </tr>
- <tr>
- <th scope="row"><label for="facebook_meta"><?php _e('Enable the Facebook Meta?','comicpress'); ?></label></th>
- <td>
- <input id="facebook_meta" name="facebook_meta" type="checkbox" value="1" <?php checked(true, $comicpress_options['facebook_meta']); ?> />
- </td>
- <td>
- <?php _e('When setting this option, it will add meta information to the head area of each page so that facebook will recognize the content within.','comicpress'); ?>
- </td>
- </tr>
- </table>
-*/
-?>
+ </table>
<table class="widefat">
<thead>
<tr>
View
2  options/layout.php
@@ -33,6 +33,8 @@ function sshowimage(sel,pic) {
<option class="level-0" value="2cr" <?php if ($comicpress_options['layout'] == '2cr') { ?>selected="selected" <?php } ?>><?php _e('2 Column - Sidebar on Right (780px)','comicpress'); ?></option>
<option class="level-0" value="2clw" <?php if ($comicpress_options['layout'] == '2clw') { ?>selected="selected" <?php } ?>><?php _e('2 Column Wide - Sidebar on Left (980px)', 'comicpress'); ?></option>
<option class="level-0" value="2crw" <?php if ($comicpress_options['layout'] == '2crw') { ?>selected="selected" <?php } ?>><?php _e('2 Column Wide - Sidebar on Right (980px)','comicpress'); ?></option>
+ <option class="level-0" value="3clgn" <?php if ($comicpress_options['layout'] == '3clgn') { ?>selected="selected" <?php } ?>><?php _e('3 Column - Sidebar on Left, Sidebar on right under comic. ','comicpress'); ?></option>
+ <option class="level-0" value="3crgn" <?php if ($comicpress_options['layout'] == '3crgn') { ?>selected="selected" <?php } ?>><?php _e('3 Column - Sidebar on Right, Sidebar on left under comic.','comicpress'); ?></option>
</select>
<br />
</th>
View
15 style.css
@@ -409,6 +409,21 @@ body.layout-2crw #content-column {
width: 658px;
}
+body.layout-3clgn #content-column,
+body.layout-3crgn #content-column {
+ width: 762px;
+}
+
+body.layout-3clgn #content {
+ width: 538px;
+ float: left;
+}
+
+body.layout-3crgn #content {
+ width: 538px;
+ float: right;
+}
+
body.wide #content-column, body.signup #content-column {
width: auto!important;
float: none!important;
View
13 widgets/dogecoins.php
@@ -4,19 +4,19 @@
Description: Accept Dogecoins button with input box for wallet_id
Author: Philip M. Hofer (Frumph)
Author URI: http://frumph.net/
-Version: 1.04
+Version: 1.05
*/
-
+/*
if (is_active_widget('comicpress_dogecoins_widget', false, 'comicpress_dogecoins_widget', true)) {
- add_action('after_theme_setup', comicpress_enqueue_dogecoin_js());
+ add_action('wp_head', 'comicpress_enqueue_dogecoin_js');
}
function comicpress_enqueue_dogecoin_js() {
- wp_enqueue_script('dogecoins-js', 'http://cdn.bitmindo.com/dogecoin.min.js', null, null, false);
+ echo '<script src="http://cdn.bitmindo.com/dogecoin.min.js"></script>'."\r\n";
}
-
+*/
class comicpress_dogecoins_widget extends WP_Widget {
function comicpress_dogecoins_widget($skip_widget_init = false) {
@@ -31,7 +31,8 @@ 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; };
- echo '<script>
+ echo '<script src="http://cdn.bitmindo.com/dogecoin.min.js"></script>
+ <script>
CoinWidgetCom.go({
wallet_address: "'.$instance['wallet_id'].'"
, currency: "dogecoin"
Please sign in to comment.
Something went wrong with that request. Please try again.