github-migration
/
comicpress-2.8
1
0
Fork 0
Code Issues 17 Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of git@github.com:johnbintz/comicpress-2.8

This commit is contained in:
John Bintz 2009-10-25 23:18:16 -04:00
parent 1beee70377 999c661192
commit af72c837e8
7 changed files with 32 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
comicpress-options-config.php
View File

@ -279,6 +279,11 @@ $options = array (
"default" => "no",
"type" => "comicpress-disable_default_menubar"),
array(
"id" => "comicpress-disable_blogheader",
"default" => "no",
"type" => "comicpress-disable_blogheader"),
array("type" => "close")
);
?>

3
functions.php
View File

@ -100,7 +100,8 @@ if (get_option('upload_path') !== false) {
'author_column_one' => 'author_column_one',
'author_column_two' => 'author_column_two',
'remove_wptexturize' => 'remove_wptexturize',
'disable_default_menubar' => 'disable_default_menubar' ) as $options => $variable_name) {
'disable_default_menubar' => 'disable_default_menubar',
'disable_blogheader' => 'disable_blogheader' ) as $options => $variable_name) {
$variables_to_extract[$variable_name] = get_option("comicpress-${options}");
}

10
index.php
View File

@ -1,4 +1,4 @@
<?php get_header(); ?>
<?php get_header(); ?>
<div id="content-wrapper-top"></div>
<div id="content-wrapper">
@ -61,12 +61,18 @@
if ($disable_comic_frontpage != 'yes' && $disable_comic_blog_frontpage != 'yes' && !is_paged() ) { ?>
<?php while ($comicFrontpage->have_posts()) : $comicFrontpage->the_post();
display_comic_post();
$comicFrontPage->is_single = true;
comments_template();
endwhile; ?>
<?php } ?>
<?php if ($disable_blogheader != 'yes') { ?>
<div id="blogheader"><!-- This area can be used for a heading above your main page blog posts --></div>
<?php } ?>
<?php get_sidebar('blog'); ?>
<?php if ($disable_blog_frontpage != 'yes') {
global $blog_postcount; ?>

10
options/indexoptions.php
View File

@ -62,6 +62,16 @@
</td>
</tr>
<?php break;
case "comicpress-disable_blogheader": ?>
<tr>
<th scope="row"><strong><?php _e('Disable blog header on the index page?','comicpress'); ?></strong><br /><br /><?php _e('Set to &quot;Yes&quot; and the index page/front page of your site will not display the #blogheader','comicpress'); ?><br /></th>
<td valign="top">
<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><br />
</td>
</tr>
<?php break;
}
}

4
single.php
View File

@ -89,9 +89,9 @@
} ?>
<?php comments_template('', true); ?>
<?php get_sidebar('underblog'); ?>
<?php else: ?>
<?php else: ?>
<?php get_sidebar('underblog'); ?>
<div class="<?php comicpress_post_class(); ?>">
<div class="post-head"></div>
<div class="post">

6
themepack/slickblack/style.css
View File

@ -72,13 +72,13 @@ h1, h1 a, h2, h2 a, h3, h3 a {
}
.narrowcolumn {
width: 546px;
width: 536px;
background: #333;
border: solid 1px #000;
}
.layout-standard .narrowcolumn, .layout-3c2r .narrowcolumn, .layout-v .narrowcolumn {
width: 551px;
.layout-standard .narrowcolumn, .layout-v .narrowcolumn {
width: 541px;
margin-left: 5px;
}

4
themepack/spacecase/notes.php
View File

@ -1,7 +1,7 @@
<strong>ThemePack</strong>: spacecase<br />
<strong>Author</strong>: Philip M. Hofer (Frumph)<br />
<strong>Layouts</strong>: standard, 3c, gn, v, v3c<br />
<strong>Version</strong>: 1.0.1<br />
<br />
<strong>Installation Notes</strong>:<br />
SciFi Buttons.
Use SciFi Buttons.
<br />