Merge branch 'master' of git@github.com:johnbintz/comicpress-2.8
This commit is contained in:
commit
372b8fc3d2
|
@ -1,19 +0,0 @@
|
|||
/* ComicPress Custom CSS over-rides for [ chrome ]: ComicPress - 2.8 */
|
||||
|
||||
html { overflow-y: scroll; }
|
||||
|
||||
.comicarchiveframe {
|
||||
opacity:0.99; /* firefox, opera, safari, chrome */
|
||||
}
|
||||
|
||||
.comicarchiveframe:hover {
|
||||
opacity:0.70; /* firefox, opera, safari, chrome */
|
||||
}
|
||||
|
||||
.imagenav-link img {
|
||||
opacity:0.5; /* firefox, opera, safari, chrome */
|
||||
}
|
||||
|
||||
.imagenav-link img:hover {
|
||||
opacity:0.5; /* firefox, opera, safari, chrome */
|
||||
}
|
|
@ -0,0 +1,68 @@
|
|||
<?php
|
||||
|
||||
function comicpress_notice_debug() {
|
||||
global $current_user, $comiccat, $blogcat, $comic_folder;
|
||||
|
||||
if( substr( $_SERVER[ 'PHP_SELF' ], -19 ) != '/wp-admin/index.php' )
|
||||
return;
|
||||
|
||||
$comicpress_options = comicpress_load_options();
|
||||
|
||||
$error = array();
|
||||
$post_cat_link = get_bloginfo('wpurl') . '/wp-admin/categories.php';
|
||||
|
||||
// Check Categories
|
||||
if ($comiccat == $blogcat) {
|
||||
$error[] = array('header', __('Primary Comic and Blog categories are not configured properly.','comicpress'));
|
||||
$error[] = __('ComicPress requires 2 categories to be added to the ','comicpress') . '<a href="'.$post_cat_link.'">' . __('post categories.','comicpress') . '</a>' .
|
||||
__(' It is necessary to have 2 more categories in addition to the uncategorized category, a Blog and Comic primary categories. These two additional categories will be the root categories that seperate the difference between the comic and blog posts. When you post a new comic you will be posting it into the comic category or heirarchal children of the comic category. When posting a new blog post you need to set it into the blog category or child of the blog category. Uncategorized will act as a blog post category (do not rename uncategorized). You can configure the categories to set as the primary blog and comic category from within the comicpress-config.php file or use ComicPress Manager - ComicPress Config','comicpress');
|
||||
}
|
||||
|
||||
// Check Comics Folder
|
||||
if (!is_dir(ABSPATH . '/' . $comic_folder)) {
|
||||
$error[] = array('header', __('Comics Folder is not configured and is unable to be found.','comicpress'));
|
||||
$error[] = __('ComicPress stores the files it uses inside a specific directory and that directory is set within the comicpress-config.php or you can configure it from within ComicPress Manager. When this error is present it means that the theme is unable to find the appropriate directory to read the comics from.','comicpress');
|
||||
}
|
||||
|
||||
// Make sure the ComicPress theme is installed in themes/comicpress
|
||||
if (ABSPATH . 'wp-content/themes/comicpress' != get_template_directory()) {
|
||||
$error[] = array('header', __('ComicPress theme is not installed into the correct folder.','comicpress'));
|
||||
$error[] = __('As of version 2.9, the ComicPress main core theme is required to be installed into the wp-content/themes/comicpress directory. It is currently not installed into that directory.','comicpress');
|
||||
}
|
||||
|
||||
if (!empty($error)) {
|
||||
?>
|
||||
<div class="error">
|
||||
<h2>ComicPress Debug</h2>
|
||||
ComicPress doesn't seem to be fully installed at this time, check out these messages.<br />
|
||||
<br />
|
||||
<?php
|
||||
foreach ($error as $info) {
|
||||
unset($text);
|
||||
if (is_array($info)) {
|
||||
list($type, $text) = $info;
|
||||
} else {
|
||||
if (is_string($info)) {
|
||||
$text = $info;
|
||||
$type = 'paragraph';
|
||||
}
|
||||
}
|
||||
if (!empty($text) && !empty($type)) {
|
||||
switch ($type) {
|
||||
case 'header': echo "<h3>${text}</h3>"; break;
|
||||
case 'raw': echo $text; break;
|
||||
default: echo "<p>${text}</p>"; break;
|
||||
}
|
||||
}
|
||||
}
|
||||
?>
|
||||
<br />
|
||||
<br />
|
||||
</div>
|
||||
<?php
|
||||
}
|
||||
}
|
||||
|
||||
add_action( 'admin_notices', 'comicpress_notice_debug' );
|
||||
|
||||
?>
|
|
@ -100,7 +100,7 @@ function comicpress_load_options() {
|
|||
global $comicpress_options;
|
||||
$comicpress_options = get_option('comicpress_options');
|
||||
if (empty($comicpress_options)) {
|
||||
$comicpress_options['comicpress_version'] = '2.9.0.4';
|
||||
$comicpress_options['comicpress_version'] = '2.9.0.5';
|
||||
foreach (array(
|
||||
'disable_comic_frontpage' => false,
|
||||
'disable_comic_blog_frontpage' => false,
|
||||
|
@ -177,7 +177,7 @@ function comicpress_load_options() {
|
|||
add_option('comicpress_options', $comicpress_options, '', 'yes');
|
||||
// update_option('comicpress_options', $comicpress_options);
|
||||
}
|
||||
$comicpress_options['comicpress_version'] = '2.9.0.4';
|
||||
$comicpress_options['comicpress_version'] = '2.9.0.5';
|
||||
update_option('comicpress_options', $comicpress_options);
|
||||
return $comicpress_options;
|
||||
}
|
||||
|
@ -231,6 +231,7 @@ foreach ($dirs_to_search as $dir) {
|
|||
|
||||
// Dashboard Menu Comicpress Options and ComicPress CSS
|
||||
require_once(get_template_directory() . '/comicpress-options.php');
|
||||
require_once(get_template_directory() . '/comicpress-debug.php');
|
||||
|
||||
// If you want to run multiple comics on a single day, define your additional filters here.
|
||||
// Example: you want to run an additional comic with the filename 2008-01-01-a-my-new-years-comic.jpg.
|
||||
|
|
|
@ -1,29 +0,0 @@
|
|||
/* ComicPress Custom CSS over-rides for [ gecko ]: ComicPress - 2.8 */
|
||||
|
||||
html { overflow-y: scroll; }
|
||||
|
||||
a:focus { outline: 0; }
|
||||
|
||||
.comicarchiveframe {
|
||||
-moz-opacity: 0.99; /* mozilla, netscape */
|
||||
opacity:0.99; /* firefox, opera, safari, chrome */
|
||||
}
|
||||
|
||||
.comicarchiveframe:hover {
|
||||
-moz-opacity: 0.7; /* mozilla, netscape */
|
||||
opacity:0.70; /* firefox, opera, safari, chrome */
|
||||
}
|
||||
|
||||
.imagenav-link img {
|
||||
-moz-opacity: 0.5; /* mozilla, netscape, gecko */
|
||||
opacity:0.5; /* firefox, opera, safari, chrome */
|
||||
}
|
||||
|
||||
.imagenav-link img:hover {
|
||||
-moz-opacity: 0; /* mozilla, netscape */
|
||||
opacity:0.5; /* firefox, opera, safari, chrome */
|
||||
}
|
||||
|
||||
::-moz-selection {
|
||||
background: #a1c0d9; /* Firefox */
|
||||
}
|
13
ie_style.css
13
ie_style.css
|
@ -1,13 +0,0 @@
|
|||
/* These overrides are for the IE browser, fixes and what not to make it work. */
|
||||
|
||||
html { overflow-y: scroll; }
|
||||
|
||||
#menubar {
|
||||
zoom: 1; /* IE fix, allows for variable height menu */
|
||||
}
|
||||
|
||||
tt a:hover
|
||||
{
|
||||
z-index:1000; color: #aaaaff;
|
||||
background-color: Transparent;
|
||||
}
|
Binary file not shown.
After Width: | Height: | Size: 1.6 KiB |
|
@ -1,3 +0,0 @@
|
|||
/* ComicPress Custom CSS over-rides for [ lynx ]: ComicPress - 2.8 */
|
||||
|
||||
html { overflow-y: scroll; }
|
|
@ -1,42 +0,0 @@
|
|||
/* ComicPress Custom CSS over-rides for [ gecko ]: ComicPress - 2.8 */
|
||||
|
||||
html { overflow-y: scroll; }
|
||||
|
||||
.comicarchiveframe
|
||||
{
|
||||
-moz-opacity: 0.99; /* mozilla, netscape */
|
||||
opacity:0.99; /* firefox, opera, safari, chrome */
|
||||
-khtml-opacity: 0.99; /* khtml, old safari */
|
||||
}
|
||||
|
||||
.comicarchiveframe:hover {
|
||||
-moz-opacity: 0.7; /* mozilla, netscape */
|
||||
opacity:0.70; /* firefox, opera, safari, chrome */
|
||||
-khtml-opacity: 0.7; /* khtml, old safari */
|
||||
|
||||
}
|
||||
|
||||
.imagenav-link img {
|
||||
-moz-opacity: 0.5; /* mozilla, netscape, gecko */
|
||||
opacity:0.5; /* firefox, opera, safari, chrome */
|
||||
-khtml-opacity: 0.5; /* khtml, old safari */
|
||||
}
|
||||
|
||||
.imagenav-link img:hover {
|
||||
-moz-opacity: 0; /* mozilla, netscape */
|
||||
opacity:0.5; /* firefox, opera, safari, chrome */
|
||||
-khtml-opacity: 0.5; /* khtml, old safari */
|
||||
}
|
||||
|
||||
::-moz-selection {
|
||||
background: #a1c0d9; /* Firefox */
|
||||
}
|
||||
|
||||
textarea {
|
||||
resize: none;
|
||||
}
|
||||
|
||||
/* selection colors */
|
||||
::selection {
|
||||
background: #ffb7b7; /* Safari */
|
||||
}
|
|
@ -1,23 +0,0 @@
|
|||
/* ComicPress Custom CSS over-rides for [ ns4 ]: ComicPress - 2.8 */
|
||||
|
||||
html { overflow-y: scroll; }
|
||||
|
||||
.comicarchiveframe {
|
||||
-moz-opacity: 0.99; /* mozilla, netscape */
|
||||
opacity:0.99; /* firefox, opera, safari, chrome */
|
||||
}
|
||||
|
||||
.comicarchiveframe:hover {
|
||||
-moz-opacity: 0.7; /* mozilla, netscape */
|
||||
opacity:0.70; /* firefox, opera, safari, chrome */
|
||||
}
|
||||
|
||||
.imagenav-link img {
|
||||
-moz-opacity: 0.5; /* mozilla, netscape, gecko */
|
||||
opacity:0.5; /* firefox, opera, safari, chrome */
|
||||
}
|
||||
|
||||
.imagenav-link img:hover {
|
||||
-moz-opacity: 0; /* mozilla, netscape */
|
||||
opacity:0.5; /* firefox, opera, safari, chrome */
|
||||
}
|
|
@ -1,20 +0,0 @@
|
|||
/* ComicPress Custom CSS over-rides for [ opera ]: ComicPress - 2.8 */
|
||||
|
||||
html { overflow-y: scroll; }
|
||||
|
||||
.comicarchiveframe {
|
||||
opacity:0.99; /* firefox, opera, safari, chrome */
|
||||
}
|
||||
|
||||
.comicarchiveframe:hover {
|
||||
opacity:0.70; /* firefox, opera, safari, chrome */
|
||||
}
|
||||
|
||||
.imagenav-link img {
|
||||
opacity:0.5; /* firefox, opera, safari, chrome */
|
||||
}
|
||||
|
||||
.imagenav-link img:hover {
|
||||
opacity:0.5; /* firefox, opera, safari, chrome */
|
||||
}
|
||||
|
|
@ -55,7 +55,7 @@
|
|||
</label>
|
||||
</td>
|
||||
<td>
|
||||
<?php _e('How many images in the comic category would you like to see in the archive page?','comicpress'); ?>
|
||||
<?php _e('How many images in the comic category would you like to see in the archive page (-1 will display all available).','comicpress'); ?>
|
||||
</td>
|
||||
</tr>
|
||||
</table>
|
||||
|
|
|
@ -79,7 +79,7 @@
|
|||
<input id="disable_default_comic_nav" name="disable_default_comic_nav" type="checkbox" value="1" <?php checked(true, $comicpress_options['disable_default_comic_nav']); ?> />
|
||||
</td>
|
||||
<td>
|
||||
<?php _e('Previous Entries and Next Entries buttons are replaced by a bar of numbered pages. The default comic post navigation is above each comic blog post.','comicpress'); ?>
|
||||
<?php _e('The default comic post navigation is above each comic blog post.','comicpress'); ?>
|
||||
</td>
|
||||
</tr>
|
||||
<?php
|
||||
|
|
|
@ -1,34 +0,0 @@
|
|||
/* ComicPress Custom CSS over-rides for [ safari ]: ComicPress - 2.8 */
|
||||
|
||||
html { overflow-y: scroll; }
|
||||
|
||||
.comicarchiveframe {
|
||||
-khtml-opacity: 0.99; /* khtml, old safari */
|
||||
}
|
||||
|
||||
.comicarchiveframe:hover {
|
||||
opacity:0.70; /* firefox, opera, safari, chrome */
|
||||
-khtml-opacity: 0.7; /* khtml, old safari */
|
||||
|
||||
}
|
||||
|
||||
.imagenav-link img {
|
||||
opacity:0.5; /* firefox, opera, safari, chrome */
|
||||
-khtml-opacity: 0.5; /* khtml, old safari */
|
||||
}
|
||||
|
||||
.imagenav-link img:hover {
|
||||
opacity:0.5; /* firefox, opera, safari, chrome */
|
||||
-khtml-opacity: 0.5; /* khtml, old safari */
|
||||
}
|
||||
|
||||
/* Supports: car, both, horizontal, none, vertical */
|
||||
|
||||
textarea {
|
||||
resize: none;
|
||||
}
|
||||
|
||||
/* selection colors */
|
||||
::selection {
|
||||
background: #ffb7b7; /* Safari */
|
||||
}
|
55
style.css
55
style.css
|
@ -13,6 +13,8 @@ http://www.opensource.org/licenses/gpl-3.0.html
|
|||
|
||||
/* STANDARD TAGS */
|
||||
|
||||
html { overflow-y: scroll; }
|
||||
|
||||
body {
|
||||
margin: 0;
|
||||
font-family: 'Arial', sans-serif;
|
||||
|
@ -167,6 +169,10 @@ h3, h3 a {
|
|||
list-style: none;
|
||||
}
|
||||
|
||||
.ie #menubar {
|
||||
zoom: 1; /* IE fix, allows for variable height menu */
|
||||
}
|
||||
|
||||
#menunav {
|
||||
float: right;
|
||||
text-align: center;
|
||||
|
@ -750,11 +756,34 @@ ul.children {
|
|||
padding: 2px 2px 6px 2px;
|
||||
}
|
||||
|
||||
.comicarchiveframe img {
|
||||
border: 1px solid #000;
|
||||
.comicarchiveframe
|
||||
{
|
||||
-moz-opacity: 0.99; /* mozilla, netscape */
|
||||
opacity:0.99; /* firefox, opera, safari, chrome */
|
||||
-khtml-opacity: 0.99; /* khtml, old safari */
|
||||
}
|
||||
|
||||
.comicarchiveframe:hover {
|
||||
.comicarchiveframe:hover {
|
||||
-moz-opacity: 0.7; /* mozilla, netscape */
|
||||
opacity:0.70; /* firefox, opera, safari, chrome */
|
||||
-khtml-opacity: 0.7; /* khtml, old safari */
|
||||
|
||||
}
|
||||
|
||||
.imagenav-link img {
|
||||
-moz-opacity: 0.5; /* mozilla, netscape, gecko */
|
||||
opacity:0.5; /* firefox, opera, safari, chrome */
|
||||
-khtml-opacity: 0.5; /* khtml, old safari */
|
||||
}
|
||||
|
||||
.imagenav-link img:hover {
|
||||
-moz-opacity: 0; /* mozilla, netscape */
|
||||
opacity:0.5; /* firefox, opera, safari, chrome */
|
||||
-khtml-opacity: 0.5; /* khtml, old safari */
|
||||
}
|
||||
|
||||
.comicarchiveframe img {
|
||||
border: 1px solid #000;
|
||||
}
|
||||
|
||||
.comicarchiveframe h3 {
|
||||
|
@ -1432,6 +1461,11 @@ ul.children {
|
|||
background: url('images/bubble.png') 0 -35px no-repeat;
|
||||
z-index: 1000;
|
||||
}
|
||||
|
||||
.ie .tt a:hover {
|
||||
z-index:1000; color: #aaaaff;
|
||||
background-color: Transparent;
|
||||
}
|
||||
|
||||
/* User Pages */
|
||||
|
||||
|
@ -1472,3 +1506,18 @@ ul.children {
|
|||
margin: 0;
|
||||
padding: 0;
|
||||
}
|
||||
|
||||
/* Non-IE browser additions */
|
||||
|
||||
::-moz-selection {
|
||||
background: #a1c0d9; /* Firefox */
|
||||
}
|
||||
|
||||
textarea {
|
||||
resize: none;
|
||||
}
|
||||
|
||||
/* selection colors */
|
||||
::selection {
|
||||
background: #ffb7b7; /* Safari */
|
||||
}
|
Loading…
Reference in New Issue