Signed-off-by: Philip M. Hofer (Frumph) <frumph_dragon@yahoo.com>
This commit is contained in:
Philip M. Hofer (Frumph) 2009-10-07 02:27:51 -07:00
parent dcea704ae9
commit e2bd6282bd
9 changed files with 558 additions and 147 deletions

View File

@ -254,6 +254,21 @@ $options = array (
"default" => "no", "default" => "no",
"type" => "comicpress-blogposts_with_comic"), "type" => "comicpress-blogposts_with_comic"),
array(
"id" => "comicpress-split_column_in_two",
"default" => "no",
"type" => "comicpress-split_column_in_two"),
array(
"id" => "comicpress-author_column_one",
"default" => "1",
"type" => "comicpress-author_column_one"),
array(
"id" => "comicpress-author_column_two",
"default" => "1",
"type" => "comicpress-author_column_two"),
array("type" => "close") array("type" => "close")
); );
?> ?>

View File

@ -16,7 +16,7 @@ if (function_exists('id_get_comment_number')) {
remove_filter('comments_number','id_get_comment_number'); remove_filter('comments_number','id_get_comment_number');
} }
$comicpress_version = '2.8.1.16'; $comicpress_version = '2.8.1.18';
// Remove the wptexturizer from changing the quotes and squotes. // Remove the wptexturizer from changing the quotes and squotes.
// remove_filter('the_content', 'wpautop'); // remove_filter('the_content', 'wpautop');
@ -102,7 +102,10 @@ if (get_option('upload_path') !== false) {
'excerpt_or_content_search' => 'excerpt_or_content_search', 'excerpt_or_content_search' => 'excerpt_or_content_search',
'category_thumbnail_postcount' => 'category_thumbnail_postcount', 'category_thumbnail_postcount' => 'category_thumbnail_postcount',
'members_post_category' => 'members_post_category', 'members_post_category' => 'members_post_category',
'blogposts_with_comic' => 'blogposts_with_comic' ) as $options => $variable_name) { 'blogposts_with_comic' => 'blogposts_with_comic',
'split_column_in_two' => 'split_column_in_two',
'author_column_one' => 'author_column_one',
'author_column_two' => 'author_column_two' ) as $options => $variable_name) {
$variables_to_extract[$variable_name] = get_option("comicpress-${options}"); $variables_to_extract[$variable_name] = get_option("comicpress-${options}");
} }

View File

@ -33,10 +33,11 @@ function display_blog_post() {
<?php } ?> <?php } ?>
<div class="post-text"> <div class="post-text">
<h2><a href="<?php the_permalink(); ?>" rel="bookmark" title="Permanent Link to <?php the_title(); ?>"><?php the_title(); ?></a></h2> <h2><a href="<?php the_permalink(); ?>" rel="bookmark" title="Permanent Link to <?php the_title(); ?>"><?php the_title(); ?></a></h2>
<small> By <?php the_author_posts_link(); ?> on <?php the_time('F jS, Y'); ?> <?php edit_post_link(__('Edit Post','comicpress'), ' [ ', ' ] '); ?></small><br /> <small> By <?php the_author_posts_link(); ?> on <?php the_time('F jS, Y'); ?></small><br />
<?php if ($disable_categories_in_posts != 'yes') { ?> <?php if ($disable_categories_in_posts != 'yes') { ?>
<small><?php _e('Posted In:','comicpress'); ?> <?php the_category(','); ?></small><br /> <small><?php _e('Posted In:','comicpress'); ?> <?php the_category(','); ?></small><br />
<?php } ?> <?php } ?>
<small><?php edit_post_link(__('Edit Post','comicpress'), ' [ ', ' ] '); ?></small>
<?php if(function_exists('the_ratings')) { the_ratings(); } ?> <?php if(function_exists('the_ratings')) { the_ratings(); } ?>
</div> </div>
<div class="clear"></div> <div class="clear"></div>

View File

@ -56,34 +56,58 @@
</div> </div>
<?php } <?php }
if ($disable_comic_frontpage != 'yes' && $disable_comic_blog_frontpage != 'yes' && !is_paged() ) { if ($disable_comic_frontpage != 'yes' && $disable_comic_blog_frontpage != 'yes' && !is_paged() ) { ?>
while ($comicFrontpage->have_posts()) : $comicFrontpage->the_post(); <?php while ($comicFrontpage->have_posts()) : $comicFrontpage->the_post();
display_comic_post(); display_comic_post();
endwhile; ?> endwhile; ?>
<?php } ?>
<div id="blogheader"><!-- This area can be used for a heading above your main page blog posts --></div> <div id="blogheader"><!-- This area can be used for a heading above your main page blog posts --></div>
<?php } <?php get_sidebar('blog'); ?>
get_sidebar('blog'); <?php if ($disable_blog_frontpage != 'yes') {
global $blog_postcount; ?>
if ($disable_blog_frontpage != 'yes') { <?php
if (have_posts()) { if ($split_column_in_two != 'yes') {
global $blog_postcount; $blog_query = 'showposts='.$blog_postcount.'&cat="-'.exclude_comic_categories().'"&paged='.$paged;
$blog_query = 'showposts='.$blog_postcount.'&cat=-"'.exclude_comic_categories().'"&paged='.$paged;
$posts = query_posts($blog_query); $posts = query_posts($blog_query);
if (have_posts()) {
while (have_posts()) : the_post(); while (have_posts()) : the_post();
display_blog_post(); display_blog_post();
endwhile; endwhile;
comicpress_pagination();
} }
comicpress_pagination();
} else { ?>
<div class="column_one">
<?php $blog_query = 'showposts='.$blog_postcount.'&cat="-'.exclude_comic_categories().'"&author='.$author_column_one.'&paged='.$paged;
$posts = query_posts($blog_query);
if (have_posts()) {
while (have_posts()) : the_post();
display_blog_post();
endwhile;
} ?> } ?>
<span class="viewpostsbyone">View all posts by: <?php the_author_posts_link(); ?><span><br />
</div>
<div class="column_two">
<?php $blog_query = 'showposts='.$blog_postcount.'&cat="-'.exclude_comic_categories().'"&author='.$author_column_two;
$posts = query_posts($blog_query);
if (have_posts()) {
while (have_posts()) : the_post();
display_blog_post();
endwhile;
} ?>
<span class="viewpostsbytwo">View all posts by: <?php the_author_posts_link(); ?></span><br />
</div>
<div class="clear"></div>
<?php }
} ?>
<?php get_sidebar('underblog'); ?> <?php get_sidebar('underblog'); ?>
</div> </div>
</div> </div>

View File

@ -4,6 +4,7 @@
<?php wp_nonce_field('update-options') ?> <?php wp_nonce_field('update-options') ?>
<table class="form-table" style="width: auto"> <table class="form-table" style="width: auto">
<?php <?php
global $split_column_in_two, $author_column_one, $author_column_two;
foreach ($options as $value) { foreach ($options as $value) {
switch ( $value['type'] ) { switch ( $value['type'] ) {
case "comicpress-transcript_in_posts": ?> case "comicpress-transcript_in_posts": ?>
@ -184,6 +185,58 @@
</td> </td>
</tr> </tr>
<?php break;
case "comicpress-split_column_in_two": ?>
<tr>
<th scope="row"><strong><?php _e('Split the column in two to have 2 author post columns?','comicpress'); ?></strong><br /><br /></th>
<td valign="top" width="100">
<label><input name="<?php echo $value['id']; ?>" id="<?php echo $value['id']; ?>-yes" type="radio" value="yes"<?php if ( get_option( $value['id'] ) == "yes") { echo " checked"; } ?> /><?php _e('Yes','comicpress'); ?></label>
&nbsp;&nbsp;
<label><input name="<?php echo $value['id']; ?>" id="<?php echo $value['id']; ?>-no" type="radio" value="no"<?php if ( get_option( $value['id'] ) == "no") { echo " checked"; } ?> /><?php _e('No','comicpress'); ?></label>
</td>
<td valign="top">
<?php _e('When enabled, it will make 2 seperate columns to have two seperate columns available to two different post authors.','comicpress'); ?>
</td>
</tr>
<?php break;
case "comicpress-author_column_one": ?>
<tr>
<th scope="row"><strong><?php _e('Author for Column one?','comicpress'); ?></strong><br /><br /><?php _e('If column is split in two.','comicpress'); ?></th>
<td valign="top" width="100">
<label>
<?php
$args = array('echo' => '0', 'show' => 'display_name', 'selected' => $author_column_one);
$selected = wp_dropdown_users($args);
$selected = preg_replace('#<select([^>]*)>#', '<select name="'.$value['id'].'" id="'.$value['id'].'">', $selected);
echo $selected;
?>
</label>
</td>
<td valign="top">
</td>
</tr>
<?php break;
case "comicpress-author_column_two": ?>
<tr>
<th scope="row"><strong><?php _e('Author for Column two?','comicpress'); ?></strong><br /><br /><?php _e('If column is split in two.','comicpress'); ?></th>
<td valign="top" width="100">
<label>
<?php
$args = array('echo' => '0', 'show' => 'display_name', 'selected' => $author_column_two);
$selected = wp_dropdown_users($args);
$selected = preg_replace('#<select([^>]*)>#', '<select name="'.$value['id'].'" id="'.$value['id'].'">', $selected);
echo $selected;
?>
</label>
</td>
<td valign="top">
</td>
</tr>
<?php break; <?php break;
} }
} }

View File

@ -485,6 +485,18 @@ a.navi-comments:hover span {
overflow: hidden; overflow: hidden;
} }
.column_one {
width: 48%;
float: left;
padding: 1%;
}
.column_two {
width: 48%;
float: left;
padding: 1%;
}
.post, .post-comic, .post-page { .post, .post-comic, .post-page {
clear: both; clear: both;
text-align: left; text-align: left;
@ -563,6 +575,7 @@ a.navi-comments:hover span {
.entry { .entry {
line-height: 1.45em; line-height: 1.45em;
font-size: 13px; font-size: 13px;
padding: 3px 0;
} }
.more-link { .more-link {

View File

@ -1,7 +1,8 @@
<a href="/" id="logo">Moose Mountain</a>
<div id="moosemenubar"> <div id="moosemenubar">
<ul> <ul>
<li><a href="/feed/" class="menu-rss">RSS</a></li> <li><a href="/feed/" id="menu-rss">RSS</a></li>
<li><a href="http://www.uptocampink.com " class="menu-store">Store</a></li> <li><a href="http://www.uptocampink.com " id="menu-shop">Shop</a></li>
<li><a href="mailto:info@uptocampink.com " class="menu-contact">Contact</a></li> <li><a href="mailto:info@uptocampink.com " id="menu-contact">Contact</a></li>
</ul> </ul>
</div> </div>

View File

@ -124,7 +124,7 @@ background: url('header.png');
padding: 0; padding: 0;
} }
#header h1 a { #logo {
height: 158px; height: 158px;
width: 320px; width: 320px;
padding: 0; padding: 0;
@ -176,7 +176,6 @@ text-indent: -9999px;
background: url('header.png') -780px -158px; background: url('header.png') -780px -158px;
} }
#content-wrapper { #content-wrapper {
padding: 0; padding: 0;
} }
@ -201,6 +200,21 @@ background: url('header.png') -780px -158px;
width: 470px; width: 470px;
} }
#sidebar-undercomic p {
padding: 5px;
margin-left: 30px;
margin-right: 30px;
background: #d6e1b4;
border: 1px solid #9bae5f;
text-align: center;
}
.nav, #sidebar-undercomic .post-text, #sidebar-undercomic .post-extras {
display: none;
}
/* CALENDAR */ /* CALENDAR */
#wp-calendar-wrap { #wp-calendar-wrap {
@ -323,3 +337,290 @@ table#wp-calendar td {
padding: 30px 0; padding: 30px 0;
text-align: center; text-align: center;
} }
/* CAST PAGE */
.cast {
min-height: 120px;
margin: 10px 0;
padding: 20px;
border: 2px solid #5e6f29;
background: #d0dea1;
}
.cast img {
float: left;
display: block;
}
.cast h2 {
color: #5e6f29;
padding: 0 0 10px 0;
margin: 0 0 0 130px;
}
.cast p {
margin: 0 0 0 130px;
}
/* AUTHOR PAGE */
/*
.author {
min-height: 120px;
margin: 10px 0;
padding: 20px;
border: 2px solid #5e6f29;
background: #d0dea1;
}
.author img {
float: left;
display: block;
}
.author h2 {
color: #5e6f29;
padding: 0 0 10px 0;
margin: 0 0 0 130px;
}
.author p {
margin: 0 0 0 130px;
}
*/
/* PAGE HEADERS */
#header-9 {
width: 900px;
height: 90px;
margin: 0 auto;
background: #9bae5f url('extras_header.jpg') no-repeat;
}
#header-16 {
width: 900px;
height: 90px;
margin: 0 auto;
background: #9bae5f url('advertise_header.jpg') no-repeat;
}
#header-14 {
width: 900px;
height: 90px;
margin: 0 auto;
background: #9bae5f url('banner_header.jpg') no-repeat;
}
#header-13 {
width: 900px;
height: 90px;
margin: 0 auto;
background: #9bae5f url('donate_header.jpg') no-repeat;
}
#header-12 {
width: 900px;
height: 90px;
margin: 0 auto;
background: #9bae5f url('links_header.jpg') no-repeat;
}
#header-10 {
width: 900px;
height: 90px;
margin: 0 auto;
background: #9bae5f url('cast_header.jpg') no-repeat;
}
#header-18 {
width: 900px;
height: 90px;
margin: 0 auto;
background: #9bae5f url('author_header.jpg') no-repeat;
}
/* SIDEBAR */
.sidebar-earl a {
width: 192px;
height: 192px;
display: block;
color: #9bae5f;
background: url('earl-extras.jpg') no-repeat;
}
.sidebar-earl a:hover {
color: #9bae5f;
background-position: 0 -192px;
}
.sidebar-extras a {
width: 192px;
height: 154px;
line-height: 154px;
display: block;
color: #9bae5f;
background: url('earl-extras.jpg') 0 -384px no-repeat;
}
.sidebar-extras a:hover {
color: #9bae5f;
background-position: 0 -538px;
}
/* ARCHIVE */
.comicarchiveframe {
margin: 20px 0 10px 0;
padding: 5px 10px 5px 10px;
border-width: 1px;
border-style: solid;
border-color: #572b2a;
background: #fff;
filter: alpha(opacity=99);
-moz-opacity: 0.99;
opacity: 0.99;
}
.comicarchiveframe h3 {
margin: 0;
color: #5e6f29;
}
.comicarchiveframe small {
display: block;
}
.comicarchiveframe:hover {
filter: alpha(opacity=50);
-moz-opacity: 0.50;
opacity: 0.50;
}
/* COMMENTS */
.comment-wrapper {
padding: 0 20px;
}
.comment-wrapper h3 {
margin: 0;
padding: 20px 0 0 0;
color: #5e6f29;
font-family: 'Georgia' , serif;
font-weight: normal;
font-size: 24px;
letter-spacing: -1px;
clear: both;
}
.bigballoon {
color: #ccc;
font-family: 'Webdings' , fantasy;
font-size: 28px;
}
.comment-wrapper a {
text-decoration: none;
border-bottom: 1px dotted #5e6f29;
}
.comment-wrapper a:hover {
color: #5e6f29;
border-bottom: 1px solid #5e6f29;
}
.comment-wrapper p {
margin: 10px 0 0 0;
}
.avatar {
margin: 0 10px 10px 0;
padding: 5px;
float: left;
border: 1px solid #5e6f29;
-moz-border-radius: 3px;
-khtml-border-radius: 3px;
-webkit-border-radius: 3px;
border-radius: 3px;
}
#comment, #author, #email, #url {
padding: 2px;
color: #000;
font-family: 'Verdana' , sans-serif;
font-size: 12px;
background: #d6e1b4;
border: 1px solid #5e6f29;
-moz-border-radius: 6px;
-khtml-border-radius: 6px;
-webkit-border-radius: 6px;
border-radius: 6px;
}
#comment:hover, #author:hover, #email:hover, #url:hover, #comment:focus, #author:focus, #email:focus, #url:focus {
background: #fff;
}
#comment {
width: 100%;
}
#author, #email, #url {
width: 200px;
}
ol.commentlist {
margin: 0;
padding: 0;
font-size: 11px;
list-style: none;
}
.commentlist li {
padding: 20px 0 0 0;
clear: both;
}
/* THE BLOG HEADER */
#blogheader {
height: 95px;
margin: 0 0 20px 0;
padding: 10px 0 0 20px;
color: #aaa;
font-family: 'Georgia' , serif;
font-size: 36px;
letter-spacing: -3px;
background: url('bloglog.jpg') center center no-repeat;
border: 0px;
}
.button, .button a {
margin: 0 0 20px 0;
padding: 0 5px;
float: right;
color: #fff;
background: #5e6f29;
font-family: 'Verdana' , sans-serif;
font-size: 12px;
border-width: 2px;
border-style: solid;
border-color: #fff;
-moz-border-radius: 10px;
-khtml-border-radius: 10px;
-webkit-border-radius: 10px;
border-radius: 10px;
}
.button:hover {
cursor: pointer;
background: #9bae5f;
}
.userpage-info {
padding-left: 10px;
}

View File

@ -4,7 +4,7 @@ Widget Name: Comic Blog Post
Widget URI: http://comicpress.org/ Widget URI: http://comicpress.org/
Description: Display's the comic's blog post. Description: Display's the comic's blog post.
Author: Philip M. Hofer (Frumph) Author: Philip M. Hofer (Frumph)
Version: 1.01 Version: 1.04
Author URI: http://webcomicplanet.com/ Author URI: http://webcomicplanet.com/
*/ */
@ -12,8 +12,8 @@ Author URI: http://webcomicplanet.com/
class widget_comicpress_comic_blog_post extends WP_Widget { class widget_comicpress_comic_blog_post extends WP_Widget {
function widget_comicpress_comic_blog_post() { function widget_comicpress_comic_blog_post() {
$widget_ops = array('classname' => 'widget_comicpress_comic_blog_post', 'description' => __('Displays the comic blog post, ..used to be around the comic areas. Does not show if there is no content.','comicpress') ); $widget_ops = array('classname' => 'widget_comicpress_comic_blog_post', 'description' => 'Displays the comic blog post, ..used to be around the comic areas.' );
$this->WP_Widget('comic_blog_post', __('Comic Blog Post','comicpress'), $widget_ops); $this->WP_Widget('comic_blog_post', 'Comic Blog Post', $widget_ops);
} }
function widget($args, $instance) { function widget($args, $instance) {
@ -23,7 +23,7 @@ class widget_comicpress_comic_blog_post extends WP_Widget {
if (!empty($post->post_content)) { if (!empty($post->post_content)) {
echo $before_widget; echo $before_widget;
$title = empty($instance['title']) ? '' : apply_filters('widget_title', $instance['title']); $title = empty($instance['title']) ? '' : apply_filters('widget_title', $instance['title']);
if ( !empty( $title ) ) { echo $title; } if ( !empty( $title ) ) { echo '<div class="heading">'.$title.'</div>'; }
display_comic_post(); display_comic_post();
echo $after_widget; echo $after_widget;
@ -41,7 +41,7 @@ class widget_comicpress_comic_blog_post extends WP_Widget {
$instance = wp_parse_args( (array) $instance, array( 'title' => '' ) ); $instance = wp_parse_args( (array) $instance, array( 'title' => '' ) );
$title = strip_tags($instance['title']); $title = strip_tags($instance['title']);
?> ?>
<p><label for="<?php echo $this->get_field_id('title'); ?>">Words to use before date:<br /><input class="widefat" id="<?php echo $this->get_field_id('title'); ?>" name="<?php echo $this->get_field_name('title'); ?>" type="text" value="<?php echo attribute_escape($title); ?>" /></label></p> <p><label for="<?php echo $this->get_field_id('title'); ?>">Heading:<br /><input class="widefat" id="<?php echo $this->get_field_id('title'); ?>" name="<?php echo $this->get_field_name('title'); ?>" type="text" value="<?php echo attribute_escape($title); ?>" /></label></p>
<?php <?php
} }