changed require_once to @include for the check_child_theme (fixes comments) fixed the navstyles to work in both IE and FF, i think .. /shrug changed divs to spans inside the graphical-navigation.php
Signed-off-by: Philip M. Hofer (Frumph) <frumph_dragon@yahoo.com>
This commit is contained in:
Philip M. Hofer (Frumph)
parent
4283f066da
commit
763b2c42b2
|
|
@ -19,7 +19,7 @@ if (function_exists('id_get_comment_number')) {
|
|||
remove_filter('comments_number','id_get_comment_number');
|
||||
}
|
||||
|
||||
$comicpress_version = '2.8.2.4';
|
||||
$comicpress_version = '2.8.2.5';
|
||||
|
||||
global $wpmu_version;
|
||||
if (!empty($wpmu_version)) {
|
||||
|
|
@ -853,7 +853,7 @@ function comicpress_check_child_file($filename = '') {
|
|||
if (empty($filename)) return false;
|
||||
if (get_stylesheet_directory() != get_template_directory()) {
|
||||
if (file_exists(get_stylesheet_directory() .'/'. $filename . '.php')) {
|
||||
@require_once(get_stylesheet_directory() .'/'. $filename . '.php');
|
||||
@include(get_stylesheet_directory() .'/'. $filename . '.php');
|
||||
return true;
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -54,7 +54,7 @@ function display_blog_post() {
|
|||
</div>
|
||||
<?php } ?>
|
||||
<?php
|
||||
if ('open' == $post->comment_status && !is_single()) {
|
||||
if ('open' == $post->comment_status) {
|
||||
if (comicpress_check_child_file('partials/commentlink') == false) { ?>
|
||||
<div class="comment-link"><?php comments_popup_link('<span class="comment-balloon comment-balloon-empty"> </span> '.__('No Comments ','comicpress'), '<span class="comment-balloon">1</span> '.__('Comment ','comicpress'), '<span class="comment-balloon">%</span> '.__('Comments ','comicpress')); ?></div>
|
||||
<?php }
|
||||
|
|
|
|||
|
|
@ -56,7 +56,7 @@ function display_comic_post() {
|
|||
</div>
|
||||
<?php } ?>
|
||||
<?php
|
||||
if ($post->comment_status == 'open' && !is_single()) {
|
||||
if ('open' == $post->comment_status) {
|
||||
if (comicpress_check_child_file('partials/commentlink') == false) { ?>
|
||||
<div class="comment-link"><?php comments_popup_link('<span class="comment-balloon comment-balloon-empty"> </span> '.__('No Comments ','comicpress'), '<span class="comment-balloon">1</span> '.__('Comment ','comicpress'), '<span class="comment-balloon">%</span> '.__('Comments ','comicpress')); ?></div>
|
||||
<?php }
|
||||
|
|
|
|||
|
|
@ -3,40 +3,37 @@ Author: Tyler Martin
|
|||
Style: Default
|
||||
*/
|
||||
#comic_navi_wrapper {
|
||||
width: 100%;
|
||||
display: table;
|
||||
border-collapse: collapse;
|
||||
text-align: center;
|
||||
margin: 0 auto;
|
||||
}
|
||||
|
||||
.comic_navi_left {
|
||||
height: 25px;
|
||||
display: inline-block;
|
||||
float: left;
|
||||
}
|
||||
|
||||
.comic_navi_center {
|
||||
height: 25px;
|
||||
margin-bottom: 10px;
|
||||
margin: 0 auto;
|
||||
display: inline-block;
|
||||
}
|
||||
|
||||
.comic_navi_right {
|
||||
height: 25px;
|
||||
display: inline-block;
|
||||
float: right;
|
||||
}
|
||||
|
||||
.comic_navi {
|
||||
background: #000;
|
||||
height: 25px;
|
||||
line-height: 24px;
|
||||
display: table;
|
||||
border-collapse: collapse;
|
||||
margin: 0 auto;
|
||||
|
||||
background: #555;
|
||||
padding: 2px;
|
||||
border: solid 1px #333;
|
||||
-moz-border-radius: 8px;
|
||||
-khtml-border-radius: 8px;
|
||||
-webkit-border-radius: 8px;
|
||||
border-radius: 8px;
|
||||
}
|
||||
|
||||
|
||||
.navi-comictitle {
|
||||
padding: 0px 10px;
|
||||
padding: 0px 6px;
|
||||
text-align: center;
|
||||
display: inline-block;
|
||||
}
|
||||
|
|
@ -49,7 +46,7 @@ Style: Default
|
|||
}
|
||||
|
||||
.navi {
|
||||
padding: 0 10px;
|
||||
padding: 0 6px;
|
||||
color: #fff;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -4,42 +4,36 @@ Style: Sci Fi
|
|||
*/
|
||||
|
||||
#comic_navi_wrapper {
|
||||
display: table;
|
||||
border-collapse: collapse;
|
||||
text-align: center;
|
||||
margin: 0 auto;
|
||||
}
|
||||
|
||||
.comic_navi_left {
|
||||
display: inline-block;
|
||||
float: left;
|
||||
}
|
||||
|
||||
.comic_navi_center {
|
||||
margin: 0 auto;
|
||||
display: inline-block;
|
||||
}
|
||||
|
||||
.comic_navi_right {
|
||||
display: inline-block;
|
||||
float: right;
|
||||
}
|
||||
|
||||
.comic_navi {
|
||||
display: table;
|
||||
border-collapse: collapse;
|
||||
margin: 0 auto;
|
||||
|
||||
}
|
||||
|
||||
.navi-comictitle {
|
||||
text-align: center;
|
||||
float: left;
|
||||
display: inline-block;
|
||||
padding-top: 26px;
|
||||
max-width: 100px;
|
||||
}
|
||||
|
||||
.navi {
|
||||
width: 60px;
|
||||
padding: 56px 0 0 0;
|
||||
display: block;
|
||||
float: left;
|
||||
padding: 60px 0 0 0;
|
||||
/* margin: 0 5px; */
|
||||
display: inline-block;
|
||||
overflow: hidden;
|
||||
font-size: 11px;
|
||||
text-align: center;
|
||||
|
|
@ -101,7 +95,7 @@ Style: Sci Fi
|
|||
|
||||
a.navi-comments span {
|
||||
width: 60px;
|
||||
height: 56px;
|
||||
height: 60px;
|
||||
position: relative;
|
||||
display: block;
|
||||
font-size: 22px;
|
||||
|
|
|
|||
|
|
@ -3,45 +3,36 @@ Author: Tyler Martin
|
|||
Style: Default
|
||||
*/
|
||||
#comic_navi_wrapper {
|
||||
display: table;
|
||||
border-collapse: collapse;
|
||||
text-align: center;
|
||||
margin: 0 auto;
|
||||
}
|
||||
|
||||
.comic_navi_left {
|
||||
display: inline-block;
|
||||
float: left;
|
||||
}
|
||||
|
||||
.comic_navi_center {
|
||||
margin: 0 auto;
|
||||
display: inline-block;
|
||||
}
|
||||
|
||||
.comic_navi_right {
|
||||
display: inline-block;
|
||||
float: right;
|
||||
}
|
||||
|
||||
.comic_navi {
|
||||
display: table;
|
||||
border-collapse: collapse;
|
||||
margin: 0 auto;
|
||||
|
||||
}
|
||||
|
||||
.navi-comictitle {
|
||||
text-align: center;
|
||||
float: left;
|
||||
display: block;
|
||||
padding-top: 26px;
|
||||
max-width: 200px;
|
||||
max-width: 100px;
|
||||
}
|
||||
|
||||
.navi {
|
||||
width: 66px;
|
||||
padding: 66px 0 0 0;
|
||||
/* margin: 0 5px; */
|
||||
display: block;
|
||||
float: left;
|
||||
display: inline-block;
|
||||
overflow: hidden;
|
||||
font-size: 11px;
|
||||
text-align: center;
|
||||
|
|
@ -53,7 +44,6 @@ Style: Default
|
|||
}
|
||||
|
||||
.navi-first {
|
||||
margin: 0;
|
||||
background: url('first.png') no-repeat;
|
||||
}
|
||||
|
||||
|
|
@ -66,7 +56,7 @@ Style: Default
|
|||
}
|
||||
|
||||
.navi-prev, .navi-previous {
|
||||
margin-right: 30px;
|
||||
margin-right: 10px;
|
||||
background: url('prev.png') no-repeat;
|
||||
}
|
||||
|
||||
|
|
@ -89,8 +79,7 @@ Style: Default
|
|||
|
||||
.navi-buyprint-form {
|
||||
width: 76px;
|
||||
display: block;
|
||||
float: left;
|
||||
display: inline-block;
|
||||
margin: 0;
|
||||
padding: 0;
|
||||
}
|
||||
|
|
@ -109,9 +98,10 @@ Style: Default
|
|||
}
|
||||
|
||||
a.navi-comments span {
|
||||
display: inline-block;
|
||||
width: 66px;
|
||||
height: 66px;
|
||||
display: block;
|
||||
display: inline-block;
|
||||
font-size: 16px;
|
||||
font-weight: bold;
|
||||
line-height: 66px;
|
||||
|
|
@ -123,7 +113,7 @@ Style: Default
|
|||
}
|
||||
|
||||
.navi-next {
|
||||
margin-left: 30px;
|
||||
margin-left: 10px;
|
||||
background: url('next.png') no-repeat;
|
||||
}
|
||||
|
||||
|
|
@ -136,7 +126,6 @@ Style: Default
|
|||
}
|
||||
|
||||
.navi-last {
|
||||
margin: 0;
|
||||
background: url('last.png') no-repeat;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -347,6 +347,7 @@ h3, h3 a {
|
|||
|
||||
#comic-foot {
|
||||
padding-bottom: 5px;
|
||||
text-align: center;
|
||||
}
|
||||
|
||||
/* THE FOOTER */
|
||||
|
|
|
|||
|
|
@ -101,7 +101,7 @@ class WidgetComicPressGraphicalStorylineNavigation extends WP_Widget {
|
|||
class="navi <?php echo implode(" ", $navi_class_names); ?>"
|
||||
title="<?php echo $instance["${which}_title"]; ?>"><?php echo htmlspecialchars_decode($instance["${which}_title"]); ?></a><?php
|
||||
} else {
|
||||
?><div class="navi <?php echo implode(" ", $navi_class_names); ?> navi-void"><?php echo htmlspecialchars_decode($instance["${which}_title"]); ?></div><?php
|
||||
?><span class="navi <?php echo implode(" ", $navi_class_names); ?> navi-void"><?php echo htmlspecialchars_decode($instance["${which}_title"]); ?></span><?php
|
||||
}
|
||||
break;
|
||||
case 'archives':
|
||||
|
|
@ -115,7 +115,7 @@ class WidgetComicPressGraphicalStorylineNavigation extends WP_Widget {
|
|||
title="<?php echo $instance['random_title']; ?>"><?php echo $instance['random_title']; ?></a><?php
|
||||
break;
|
||||
case 'comictitle':
|
||||
?><div class="navi-comictitle"><a href="<?php echo get_permalink($current) ?>"><?php echo get_the_title($current->ID); ?></a></div><?php
|
||||
?><span class="navi-comictitle"><a href="<?php echo get_permalink($current) ?>"><?php echo get_the_title($current->ID); ?></a></span><?php
|
||||
break;
|
||||
case 'comments':
|
||||
$temp_id = $id;
|
||||
|
|
@ -213,7 +213,7 @@ class WidgetComicPressGraphicalStorylineNavigation extends WP_Widget {
|
|||
if (is_array($buttons)) {
|
||||
$output = array();
|
||||
foreach ($this->_group_navigation_buttons($buttons) as $group => $grouped_buttons) {
|
||||
$output[] = '<div class="' . $group . '">' . implode('', array_values($grouped_buttons)) . '</div>';
|
||||
$output[] = '<span class="' . $group . '">' . implode('', array_values($grouped_buttons)) . '</span>';
|
||||
}
|
||||
|
||||
$buttons_text = implode('', $output);
|
||||
|
|
|
|||
Loading…
Reference in New Issue