diff --git a/functions.php b/functions.php index e00b5bd..8372fee 100644 --- a/functions.php +++ b/functions.php @@ -5,7 +5,7 @@ if (function_exists('id_get_comment_number')) { remove_filter('comments_number','id_get_comment_number'); } -$comicpress_version = '2.8.1.11'; +$comicpress_version = '2.8.1.12'; // Remove the wptexturizer from changing the quotes and squotes. // remove_filter('the_content', 'wpautop'); diff --git a/functions/classes.php b/functions/classes.php index d9aef9f..a724307 100644 --- a/functions/classes.php +++ b/functions/classes.php @@ -5,7 +5,7 @@ * * Author: Philip M. Hofer (Frumph) * Author URI: http://webcomicplanet.com/ http://frumph.net/ - * Version: 1.0.1 + * Version: 1.0.6 * * This function adds the browser type as a class * in the tag where you can then do .ie #page and do things specific @@ -19,22 +19,14 @@ add_filter('body_class','comicpress_body_class'); function comicpress_body_class($classes = '') { global $current_user, $is_lynx, $is_gecko, $is_IE, $is_opera, $is_NS4, $is_safari, $is_chrome, $is_iphone, $post, $wp_query, $cp_theme_layout; - + if (!empty($current_user)) { $user_login = addslashes($current_user->user_login); $classes[] = 'user-'.$user_login; } else { $classes[] = 'user-guest'; } - - if (is_single()) { - if (in_comic_category()) { - $classes[] = 'comiccat'; - } else { - $classes[] = 'blogcat'; - } - } - + if (function_exists('comicpress_is_member')) { if (comicpress_is_member()) { $classes[] = 'sitemember'; @@ -42,7 +34,7 @@ function comicpress_body_class($classes = '') { $classes[] = 'non-sitemember'; } } - + if($is_lynx) $classes[] = 'lynx'; elseif($is_gecko) $classes[] = 'gecko'; elseif($is_opera) $classes[] = 'opera'; @@ -64,23 +56,21 @@ function comicpress_body_class($classes = '') { if ( is_sticky( $wp_query->post->ID ) ) { $classes[] = 'sticky-post'; } - + // NOT hijacked from anything, doi! people should do this. - $rightnow = date('gi'); + $rightnow = date('Gi'); $ampm = date('a'); $classes[] = $ampm; + + if ((int)$rightnow > 559 && (int)$rightnow < 1800) $classes[] = 'day'; + if ((int)$rightnow < 600 || (int)$rightnow > 1759) $classes[] = 'night'; - if ($ampm == 'am') { - if ((int)$rightnow < 30) $classes[] = 'midnight'; - if ((int)$rightnow < 560) $classes[] = 'night'; - if ((int)$rightnow > 559 && (int)$rightnow < 1130) $classes[] = 'morning'; - if ((int)$rightnow > 1129) $classes[]='noon'; - } else { - if ((int)$rightnow < 30) $classes[] = 'noon'; - if ((int)$rightnow < 559) $classes[] = 'day'; - if ((int)$rightnow > 559 && (int)$rightnow < 1130) $classes[] = 'evening'; - if ((int)$rightnow > 1129) $classes[]='midnight'; - } + if ((int)$rightnow > 2329 || (int)$rightnow < 0030) $classes[] = 'midnight'; + if ((int)$rightnow > 0559 && (int)$rightnow < 1130) $classes[] = 'morning'; + if ((int)$rightnow > 1129 && (int)$rightnow < 1230) $classes[] = 'noon'; + if ((int)$rightnow > 1759 && (int)$rightnow < 2330) $classes[] = 'evening'; + + $classes[] = strtolower(date('D')); if ( is_attachment() ) { $classes[] = 'attachment attachment-' . $wp_query->post->ID; @@ -89,9 +79,9 @@ function comicpress_body_class($classes = '') { $classes[] = 'attachment-' . $type; endforeach; } - + $classes[] = 'layout-'.$cp_theme_layout; - + return $classes; } diff --git a/header.php b/header.php index 5cc1cd2..efb7a8a 100644 --- a/header.php +++ b/header.php @@ -17,10 +17,16 @@ ?> - - - - + + + + + @@ -44,11 +50,11 @@ -
-
+
+
-
-
+
+
diff --git a/images/options/rgn.png b/images/options/rgn.png new file mode 100644 index 0000000..628a249 Binary files /dev/null and b/images/options/rgn.png differ diff --git a/index.php b/index.php index 517475e..e3e0a0c 100644 --- a/index.php +++ b/index.php @@ -5,7 +5,7 @@ - +
@@ -39,7 +39,7 @@ - +
@@ -66,7 +66,7 @@ - +
diff --git a/layout-foot.php b/layout-foot.php index f804daa..6f359dd 100644 --- a/layout-foot.php +++ b/layout-foot.php @@ -13,10 +13,10 @@ if (is_cp_theme_layout('3c,v3c,gn,standard,v')) {
- +
- +
diff --git a/layout-head.php b/layout-head.php index 9c5dd84..02a89da 100644 --- a/layout-head.php +++ b/layout-head.php @@ -3,7 +3,7 @@ - +
@@ -18,7 +18,7 @@ - +
diff --git a/options/generaloptions.php b/options/generaloptions.php index 2e0ee58..7d4d232 100644 --- a/options/generaloptions.php +++ b/options/generaloptions.php @@ -86,12 +86,20 @@ $count = count($results = glob(get_template_directory() . '/images/nav/'.$current_gnav_directory.'/*')); $gnav_directories = glob(get_template_directory() . '/images/nav/*'); + $themepack_directory = get_option('comicpress-themepack_directory'); + if (!empty($themepack_directory) && $themepack_directory != 'none') { + if (file_exists(get_template_directory().'/themepack/'.$themepack_directory.'/nav/navstyle.css')) $themepacknav = 1; + } + ?> Graphic Navigation Directory

Choose a directory to get the graphic navigation styling from.
diff --git a/single.php b/single.php index d0ca852..4c26546 100644 --- a/single.php +++ b/single.php @@ -5,7 +5,7 @@ - +
@@ -33,7 +33,7 @@ - +
diff --git a/style.css b/style.css index f22be3f..313c308 100644 --- a/style.css +++ b/style.css @@ -174,7 +174,7 @@ h3, h3 a { /* Change this width to set the entire site's width - increase/reduce #content width by the same amount */ /* Maintains the #page and #pagewide width after padding is set */ -#page-wrap { +#page-wrap, #page-wrap-wide { } #page { diff --git a/themepack/moosemountain/2009-09-24.jpg b/themepack/moosemountain/2009-09-24.jpg new file mode 100644 index 0000000..cb343c8 Binary files /dev/null and b/themepack/moosemountain/2009-09-24.jpg differ diff --git a/themepack/moosemountain/header.jpg b/themepack/moosemountain/header.jpg new file mode 100644 index 0000000..ac4a7c2 Binary files /dev/null and b/themepack/moosemountain/header.jpg differ diff --git a/themepack/moosemountain/nav/archive.png b/themepack/moosemountain/nav/archive.png new file mode 100644 index 0000000..55ceb86 Binary files /dev/null and b/themepack/moosemountain/nav/archive.png differ diff --git a/themepack/moosemountain/nav/buyprint.png b/themepack/moosemountain/nav/buyprint.png new file mode 100644 index 0000000..8f4b09e Binary files /dev/null and b/themepack/moosemountain/nav/buyprint.png differ diff --git a/themepack/moosemountain/nav/comments.png b/themepack/moosemountain/nav/comments.png new file mode 100644 index 0000000..d71f087 Binary files /dev/null and b/themepack/moosemountain/nav/comments.png differ diff --git a/themepack/moosemountain/nav/first.png b/themepack/moosemountain/nav/first.png new file mode 100644 index 0000000..e230e5e Binary files /dev/null and b/themepack/moosemountain/nav/first.png differ diff --git a/themepack/moosemountain/nav/last.png b/themepack/moosemountain/nav/last.png new file mode 100644 index 0000000..b60e7c6 Binary files /dev/null and b/themepack/moosemountain/nav/last.png differ diff --git a/themepack/moosemountain/nav/navstyle.css b/themepack/moosemountain/nav/navstyle.css new file mode 100644 index 0000000..3eb7162 --- /dev/null +++ b/themepack/moosemountain/nav/navstyle.css @@ -0,0 +1,117 @@ +/* COMIC NAVIGATION +Author: Tyler Martin +Style: Default +*/ +#comic_navi_wrapper { + padding: 5px 0 10px 0; +} + +#comic_navi { + display: table; + border-collapse: collapse; + margin: 0 auto; +} + +.navi { + width: 66px; + padding: 66px 0 0 0; +/* margin: 0 5px; */ + display: block; + float: left; + overflow: hidden; + font-size: 11px; + text-align: center; + color: #555; +} + + .navi:hover { + background-position: -66px 0; + } + +.navi-first { + margin: 0; + background: url('first.png') no-repeat; +} + +.navi-prevchap { + background: url('prevchap.png') no-repeat; +} + +.navi-prev { + margin-right: 30px; + background: url('prev.png') no-repeat; +} + + +.navi-comments, .navi-archive, .navi-random, .navi-buyprint { + margin: 0 5px; +} + +.navi-buyprint { + border: none; + cursor: pointer; + background: url('buyprint.png') no-repeat; +} + + .navi-buyprint:hover { + color: #f00; + } + + .navi-buyprint-form { + width: 76px; + display: block; + float: left; + margin: 0; + padding: 0; + } + +.navi-archive { + background: url('archive.png') no-repeat; +} + +.navi-random { + background: url('random.png') no-repeat; +} + +.navi-comments { + padding: 0; + background: url('comments.png') no-repeat; +} + + a.navi-comments span { + width: 66px; + height: 66px; + display: block; + font-size: 16px; + font-weight: bold; + line-height: 66px; + color: #c5c5c5; + } + + a.navi-comments span:hover { + color: #860b04; + } + +.navi-next { + margin-left: 30px; + background: url('next.png') no-repeat; +} + +.navi-nextchap { + background: url('nextchap.png') no-repeat; +} + +.navi-last { + margin: 0; + background: url('last.png') no-repeat; +} + +.navi-void, .navi-void:hover { + color: #999; + background-position: -132px 0; +} + +.comic-left .navi-prev, .comic-right .navi-prev, .comic-left .navi-next, .comic-right .navi-next { +/* margin: 0 5px; */ + } + diff --git a/themepack/moosemountain/nav/next.png b/themepack/moosemountain/nav/next.png new file mode 100644 index 0000000..5139003 Binary files /dev/null and b/themepack/moosemountain/nav/next.png differ diff --git a/themepack/moosemountain/nav/nextchap.png b/themepack/moosemountain/nav/nextchap.png new file mode 100644 index 0000000..1aa1253 Binary files /dev/null and b/themepack/moosemountain/nav/nextchap.png differ diff --git a/themepack/moosemountain/nav/prev.png b/themepack/moosemountain/nav/prev.png new file mode 100644 index 0000000..eba5251 Binary files /dev/null and b/themepack/moosemountain/nav/prev.png differ diff --git a/themepack/moosemountain/nav/prevchap.png b/themepack/moosemountain/nav/prevchap.png new file mode 100644 index 0000000..09365c6 Binary files /dev/null and b/themepack/moosemountain/nav/prevchap.png differ diff --git a/themepack/moosemountain/nav/random.png b/themepack/moosemountain/nav/random.png new file mode 100644 index 0000000..e1cc5c4 Binary files /dev/null and b/themepack/moosemountain/nav/random.png differ diff --git a/themepack/moosemountain/style.css b/themepack/moosemountain/style.css new file mode 100644 index 0000000..4ff354f --- /dev/null +++ b/themepack/moosemountain/style.css @@ -0,0 +1,425 @@ +/* +ThemePack Name: MooseMountain +ThemePack URI: http://comicpress.org +Description: +Author: Philip M. Hofer (Frumph) +Author URI: http://frumph.net/ +Version: 0.1.0 +. +The CSS, XHTML and design is released under GPL v3: +http://www.opensource.org/licenses/gpl-3.0.html +. +*/ + +/* STANDARD TAGS */ + +body { + margin: 0; + font-family: 'Arial',sans-serif; + background: #A28366 none repeat scroll 0 0; + color: #572B2A; + font-size: 14px; +} + +a { + color: #000; + text-decoration: none; + } + + a:hover { + color: #5e6f29; + } + + a img { + border: none; + } + +hr { + height: 1px; + color: #5e6f29; + background-color: #5e6f29; + border: 0px; + } + +blockquote { + margin: 10px; + padding: 5px 10px 5px 20px; + border-width: 1px 1px 1px 5px; + border-style: solid; + border-color: #d6e1b4; + } + + blockquote cite { + margin: 5px 0 0; + display: block; + } + +/* HEADINGS */ + +h1, h1 a, h1 a:hover { + margin: 0; + padding: 0 0 0 5px; + color: #fff; + font-family: 'Georgia', serif; + font-size: 50px; + font-weight: normal; + text-align: left; + text-decoration: none; + letter-spacing: -2px; + } + +h2, h2 a { + margin: 0; + color: #fff; + font-weight: bold; + font-size: 22px; + text-align: left; + text-decoration: none; + } + + h2.pagetitle, h2.pagetitle a { + margin: 20px 0 0 0; + padding: 0 0 5px 0; + color: #fff; + font-family: 'Georgia', serif; + font-size: 32px; + font-weight: normal; + letter-spacing: -2px; + text-align: left; + } + +h3, h3 a { + margin: 30px 10px 0 0; + padding: 0; + color: #fff; + font-size: 18px; + font-weight: bold; + text-align: left; + text-decoration: none; + clear: both; + } + +h2 a:hover, h3 a:hover { + color: #fff; + border-bottom: 1px dotted #fff; + } + + + +/* PAGE */ + +#page-wide { + width: 900px; +} + +/* THE HEADER */ + +#header { + width: 567px; + height: 56px; + padding: 102px 0 0 333px; + margin: 0 auto; + background: url('header.jpg') no-repeat; + overflow: hidden; + } + + #header h1 { + text-indent: -9999px; + } + + .description { + text-indent: -9999px; + } + + #header ul { + margin: 0; + padding: 0; + list-style: none; + background: #f00; + } + + #header li { + margin: 0; + padding: 0; + float: left; + } + + #header li a { + height: 40px; + padding: 0; + margin: 0; + display: block; + text-indent: -1000px; + background-image: url('header.jpg'); + background-repeat: no-repeat; + overflow: hidden; + } + + .menu-home { + width: 78px; + background-position: 0 40px; + } + + .menu-home:hover { + background-position: -333px -158px; + } + + .menu-newreaders { + width: 162px; + background-position: 0 40px; + } + + .menu-newreaders:hover { + background-position: -411px -158px; + } + + .menu-forum { + width: 94px; + background-position: 0 40px; + } + + .menu-forum:hover { + background-position: -573px -158px; + } + + .menu-store { + width: 87px; + background-position: 0 40px; + } + + .menu-store:hover { + background-position: -667px -158px; + } + + .menu-contact { + width: 110px; + background-position: 0 40px; + } + + .menu-contact:hover { + background-position: -754px -158px; + } + +/* THE MENU */ + +#menubar { + width: 900px; + height: 25px; + margin: 0 auto; + background: #000; + } + +#menunav { + margin: 0; + padding: 1px 0 0 0; + float: right; + font-size: 19px; + } + + #menunav a { + margin: 0 1px 0 0; + color: #aaa; + text-decoration: none; + background: #222; + -moz-border-radius: 10px; + -khtml-border-radius: 10px; + -webkit-border-radius: 10px; + border-radius: 10px; + } + + #menunav a:hover { + color: #fff; + background: #555; + } + + .prev { + padding: 0 2px 0 0; + } + + .next { + padding: 0 0 0 2px; + } + +#menu { + color: #999; + font-size: 12px; + text-transform: uppercase; + } + + #menu ul { + margin: 0; + padding: 0; + list-style: none; + } + + #menu li { + margin: 0; + padding: 0; + float: left; + } + + #menu li a { + height: 25px; + padding: 0 5px 0 5px; + display: block; + float: left; + color: #aaa; + line-height: 25px; + text-decoration: none; + border-width: 0 1px 0 0; + border-style: solid; + border-color: #aaa; + } + + #menu li a:hover { + color: #fff; + background: #333; + } + + +#content-wrapper { + padding: 0; +} + +/* Comic */ + +#comic-head, #comic, #comic-foot { + background: #fff; + border: 0; +} + +#comic-foot { + border-bottom: 30px solid #5e6f29; +} + +#subcontent-wrapper { + background: #9bae5f; + padding: 5px 0; +} + +.narrowcolumn { + width: 470px; +} + +/* CALENDAR */ + +#wp-calendar-wrap { + background-color: transparent; + border: 0; +} + +#wp-calendar-wrap img { + border: solid 1px #5d2d29; + width: 163px; +} + +table#wp-calendar td { + border: 1px solid #5E6F29; +} + +#wp-calendar th { + color: #5e6f29; + } + +#wp-calendar caption { + color: #5e6f29; + font-size: 20px; + } + +#wp-calendar td { + border: 1px solid #5E6F29; + font-size: 12px; + } + +#wp-calendar a { + color: #fff; + background: #5e6f29; + } + + #wp-calendar a:hover { + color: #fff; + background: #572b2a; + } + + +/* Sidebar */ + +.sidebar ul { + margin: 0; + padding: 0; + list-style: none; + } + + .sidebar ul li { + padding: 0; + } + + .sidebar ul li ul li { + padding: 0; + } + + .sidebar ul li ul li a { + color: #000; + text-decoration: none; + } + + .sidebar ul li ul li a:hover { + color: #000; + background: #d6e1b4; + } + +.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; + } + + +/* THE FOOTER */ + +#footer { + width: 900px; + margin: 0px auto; + padding: 20px 0; + color: #9bae5f; + text-align: center; + background: #5e6f29; + } + + #footer a { + color: #fff; + text-decoration: none; + border: none; + } + + #footer a:hover { + border-bottom: 1px dotted #fff; + } + +#footer-ad { + width: 900px; + margin: 0 auto; + padding: 30px 0; + text-align: center; + }