nav fixed
This commit is contained in:
parent
133f419e84
commit
4a15725d3f
@ -174,14 +174,17 @@ class ComicPress {
|
|||||||
}
|
}
|
||||||
|
|
||||||
function get_nav_comics() {
|
function get_nav_comics() {
|
||||||
|
global $post;
|
||||||
|
|
||||||
$comic_posts = array();
|
$comic_posts = array();
|
||||||
foreach (array('first', 'last', 'previous', 'next') as $which) {
|
foreach (array('first', 'last', 'previous', 'next') as $which) {
|
||||||
$comic_posts[$which] = $this->{"get_${which}_comic"}();
|
$comic_posts[$which] = $this->{"get_${which}_comic"}();
|
||||||
}
|
}
|
||||||
|
|
||||||
$comic_posts['show_first'] = ($comic_posts['first']->ID !== $comic_posts['last']->ID);
|
$comic_posts['show_first'] = ($comic_posts['first']->ID != $comic_posts['last']->ID);
|
||||||
$comic_posts['show_previous'] = (!empty($comic_posts['previous']) && ($comic_posts['first']->ID !== $comic_posts['previous']->ID));
|
$comic_posts['show_previous'] = (!empty($comic_posts['previous']) && ($comic_posts['first']->ID != $comic_posts['previous']->ID));
|
||||||
$comic_posts['show_next'] = (!empty($comic_posts['next']) && ($comic_posts['last']->ID !== $comic_posts['next']->ID));
|
$comic_posts['show_next'] = (!empty($comic_posts['next']) && ($comic_posts['last']->ID != $comic_posts['next']->ID));
|
||||||
|
$comic_posts['show_last'] = (trim($post->ID) != trim($comic_posts['last']->ID));
|
||||||
|
|
||||||
return $comic_posts;
|
return $comic_posts;
|
||||||
}
|
}
|
||||||
|
@ -75,61 +75,12 @@ function __comicpress_init() {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
//get_all_comic_categories();
|
|
||||||
}
|
}
|
||||||
|
|
||||||
function the_comic_img_tag($url, $type, $additional_parameters = array()) {
|
function in_comic_category() {
|
||||||
global $comicpress;
|
global $post, $comicpress;
|
||||||
|
|
||||||
echo $comicpress->get_comic_img_tag($url, $type, $additional_parameters);
|
return $comicpress->in_comic_category($post->ID);
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Get the hyperlink to the first comic post in the database.
|
|
||||||
* @return string The hyperlink to the first comic post, or false.
|
|
||||||
*/
|
|
||||||
function get_first_comic_permalink() {
|
|
||||||
global $comicpress;
|
|
||||||
|
|
||||||
$terminal = $comicpress->get_first_comic();
|
|
||||||
return !empty($terminal) ? get_permalink($terminal->ID) : false;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Get the hyperlink to the last comic post in the database.
|
|
||||||
* @return string The hyperlink to the first comic post, or false.
|
|
||||||
*/
|
|
||||||
function get_last_comic_permalink() {
|
|
||||||
global $comicpress;
|
|
||||||
|
|
||||||
$terminal = $comicpress->get_last_comic();
|
|
||||||
return !empty($terminal) ? get_permalink($terminal->ID) : false;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Get the link to the previous comic from the current one.
|
|
||||||
*/
|
|
||||||
function previous_comic_link($format, $link) {
|
|
||||||
global $non_comic_categories;
|
|
||||||
previous_post_link($format, $link, false, $non_comic_categories);
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Get the link to the next comic from the current one.
|
|
||||||
*/
|
|
||||||
function next_comic_link($format, $link) {
|
|
||||||
global $non_comic_categories;
|
|
||||||
next_post_link($format, $link, false, $non_comic_categories);
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Get the adjacent comic from the current one.
|
|
||||||
* @param int $category The category to use.
|
|
||||||
* @param boolean $next True if the next chronological comic should be retrieved.
|
|
||||||
* @return array The WordPress post object for the comic post.
|
|
||||||
*/
|
|
||||||
function get_adjacent_comic($category, $next = false) {
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -42,6 +42,4 @@
|
|||||||
</ul>
|
</ul>
|
||||||
|
|
||||||
<div class="clear"></div>
|
<div class="clear"></div>
|
||||||
|
|
||||||
|
|
||||||
</div>
|
</div>
|
25
index.php
25
index.php
@ -2,6 +2,9 @@
|
|||||||
global $comicpress;
|
global $comicpress;
|
||||||
|
|
||||||
get_header();
|
get_header();
|
||||||
|
|
||||||
|
$nav_comics = $comicpress->get_nav_comics();
|
||||||
|
$post = $nav_comics['last'];
|
||||||
?>
|
?>
|
||||||
|
|
||||||
<?php if (!is_paged()) { ?>
|
<?php if (!is_paged()) { ?>
|
||||||
@ -12,28 +15,10 @@
|
|||||||
|
|
||||||
<div id="content" class="narrowcolumn">
|
<div id="content" class="narrowcolumn">
|
||||||
|
|
||||||
<?php if (!is_paged()) {
|
<?php if (!is_paged()) { ?>
|
||||||
$nav_comics = $comicpress->get_nav_comics();
|
|
||||||
|
|
||||||
$post = $nav_comics['last'];
|
|
||||||
|
|
||||||
?>
|
|
||||||
<div class="post-comic-head"></div>
|
<div class="post-comic-head"></div>
|
||||||
<div class="post-comic">
|
<div class="post-comic">
|
||||||
<div class="nav">
|
<?php include(dirname(__FILE__) . '/partials/nav.inc') ?>
|
||||||
<?php if ($nav_comics['show_first']) { ?>
|
|
||||||
<div class="nav-first">
|
|
||||||
<a href="<?php echo get_permalink($nav_comics['first']->ID) ?>"
|
|
||||||
title="<?php _e('Go to the first comic', 'comicpress') ?>">‹‹ First</a>
|
|
||||||
</div>
|
|
||||||
<?php } ?>
|
|
||||||
<?php if ($nav_comics['show_previous']) { ?>
|
|
||||||
<div class="nav-previous">
|
|
||||||
<a href="<?php echo get_permalink($nav_comics['previous']->ID) ?>"
|
|
||||||
title="<?php _e('Go to the previous comic', 'comicpress') ?>">‹ Previous</a>
|
|
||||||
</div>
|
|
||||||
<?php } ?>
|
|
||||||
</div>
|
|
||||||
<div class="comicdate">
|
<div class="comicdate">
|
||||||
<?php the_date('F jS, Y') ?>
|
<?php the_date('F jS, Y') ?>
|
||||||
</div>
|
</div>
|
||||||
|
135
single.php
135
single.php
@ -1,73 +1,74 @@
|
|||||||
<?php get_header(); $first_comic = get_first_comic_permalink(); $last_comic = get_last_comic_permalink() ?>
|
<?php
|
||||||
|
global $comicpress;
|
||||||
|
|
||||||
<?php while (have_posts()) : the_post(); if (in_comic_category()) { ?>
|
get_header();
|
||||||
<div id="comic-head"></div>
|
|
||||||
<div id="comic">
|
if (have_posts()) {
|
||||||
<img src="<?php the_comic() ?>" alt="<?php the_title() ?>" title="<?php the_hovertext() ?>" />
|
the_post();
|
||||||
</div>
|
if (in_comic_category()) { ?>
|
||||||
<div id="comic-foot"></div>
|
<div id="comic-head"></div>
|
||||||
<?php } endwhile; ?>
|
<div id="comic"><?php do_action('show_comic'); ?></div>
|
||||||
|
<div id="comic-foot"></div>
|
||||||
|
<?php }
|
||||||
|
}
|
||||||
|
rewind_posts();
|
||||||
|
|
||||||
|
$nav_comics = $comicpress->get_nav_comics();
|
||||||
|
?>
|
||||||
|
|
||||||
<div id="content" class="narrowcolumn">
|
<div id="content" class="narrowcolumn">
|
||||||
|
<?php if (have_posts()) { ?>
|
||||||
<?php if (have_posts()) : while (have_posts()) : the_post() ?>
|
<?php while (have_posts()) { the_post() ?>
|
||||||
|
<?php if (in_comic_category()) { ?>
|
||||||
<?php if (in_comic_category()) { ?>
|
<div class="post-comic-head"></div>
|
||||||
<div class="post-comic-head"></div>
|
<div class="post-comic" id="post-<?php the_ID() ?>">
|
||||||
<div class="post-comic" id="post-<?php the_ID() ?>">
|
<div class="comicdate">
|
||||||
<div class="comicdate">
|
<?php include(dirname(__FILE__) . '/partials/nav.inc') ?>
|
||||||
<div class="nav">
|
<?php the_time('F jS, Y') ?>
|
||||||
<?php if ( get_permalink() != $first_comic ) { ?><div class="nav-first"><a href="<?php echo $first_comic ?>">‹‹ First</a></div><?php } ?>
|
</div>
|
||||||
<div class="nav-previous"><?php previous_comic_link('%link', '‹ Previous') ?></div>
|
<?php if (get_option('comicpress-enable-storyline-support') == 1) { ?>
|
||||||
<div class="nav-next"><?php next_comic_link('%link', 'Next ›') ?></div>
|
<ul class="storyline-cats"><li class="storyline-root"><?php the_category(' » </li><li>', 'multiple') ?></li></ul>
|
||||||
<?php if ( get_permalink() != $last_comic ) { ?><div class="nav-last"><a href="<?php echo $last_comic ?>">Last ››</a></div><?php } ?>
|
<?php } ?>
|
||||||
</div>
|
<h2><?php the_title() ?></h2>
|
||||||
<?php the_time('F jS, Y') ?>
|
<div class="entry">
|
||||||
</div>
|
<?php the_content() ?>
|
||||||
<?php if (get_option('comicpress-enable-storyline-support') == 1) { ?>
|
<?php the_transcript('styled') ?>
|
||||||
<ul class="storyline-cats"><li class="storyline-root"><?php the_category(' » </li><li>', 'multiple') ?></li></ul>
|
<div class="tags">
|
||||||
<?php } ?>
|
<?php the_tags('└ Tags: ', ', ', ''); edit_post_link('Edit Post', ' [ ', ' ] ') ?>
|
||||||
<h2><?php the_title() ?></h2>
|
</div>
|
||||||
<div class="entry">
|
<?php wp_link_pages(array('before' => '<p><strong>Pages:</strong> ', 'after' => '</p>', 'next_or_number' => 'number')) ?>
|
||||||
<?php the_content() ?>
|
</div>
|
||||||
<?php the_transcript('styled') ?>
|
<br class="clear-margins" />
|
||||||
<div class="tags">
|
</div>
|
||||||
<?php the_tags('└ Tags: ', ', ', ''); edit_post_link('Edit Post', ' [ ', ' ] ') ?>
|
<div class="post-comic-foot"></div>
|
||||||
</div>
|
<?php } else { ?>
|
||||||
<?php wp_link_pages(array('before' => '<p><strong>Pages:</strong> ', 'after' => '</p>', 'next_or_number' => 'number')) ?>
|
<div class="post-head"></div>
|
||||||
</div>
|
<div class="post" id="post-<?php the_ID() ?>">
|
||||||
<br class="clear-margins" />
|
<div class="nav-blog">
|
||||||
</div>
|
<div class="nav-blog-previous"><?php previous_post_link('%link','‹ Previous', TRUE) ?></div>
|
||||||
<div class="post-comic-foot"></div>
|
<div class="nav-blog-next"><?php next_post_link('%link','Next ›', TRUE) ?></div>
|
||||||
|
</div>
|
||||||
<?php } else { ?>
|
<div class="clear"></div>
|
||||||
|
<h2><?php the_title() ?></h2>
|
||||||
<div class="post-head"></div>
|
<div class="postdate"><?php the_time('F jS, Y') ?></div>
|
||||||
<div class="post" id="post-<?php the_ID() ?>">
|
<div class="entry">
|
||||||
<div class="nav-blog">
|
<?php the_content() ?>
|
||||||
<div class="nav-blog-previous"><?php previous_post_link('%link','‹ Previous', TRUE) ?></div>
|
<?php the_transcript('styled') ?>
|
||||||
<div class="nav-blog-next"><?php next_post_link('%link','Next ›', TRUE) ?></div>
|
<div class="tags">
|
||||||
</div>
|
<?php the_tags('└ Tags: ', ', ', ''); edit_post_link('Edit Post', ' [ ', ' ] ') ?>
|
||||||
<div class="clear"></div>
|
</div>
|
||||||
<h2><?php the_title() ?></h2>
|
<?php wp_link_pages(array('before' => '<p><strong>Pages:</strong> ', 'after' => '</p>', 'next_or_number' => 'number')) ?>
|
||||||
<div class="postdate"><?php the_time('F jS, Y') ?></div>
|
</div>
|
||||||
<div class="entry">
|
<br class="clear-margins" />
|
||||||
<?php the_content() ?>
|
</div>
|
||||||
<?php the_transcript('styled') ?>
|
<div class="post-foot"></div>
|
||||||
<div class="tags">
|
|
||||||
<?php the_tags('└ Tags: ', ', ', ''); edit_post_link('Edit Post', ' [ ', ' ] ') ?>
|
<?php } ?>
|
||||||
</div>
|
|
||||||
<?php wp_link_pages(array('before' => '<p><strong>Pages:</strong> ', 'after' => '</p>', 'next_or_number' => 'number')) ?>
|
|
||||||
</div>
|
|
||||||
<br class="clear-margins" />
|
|
||||||
</div>
|
|
||||||
<div class="post-foot"></div>
|
|
||||||
|
|
||||||
<?php } ?>
|
|
||||||
|
|
||||||
<?php comments_template() ?>
|
<?php comments_template() ?>
|
||||||
|
|
||||||
<?php endwhile; else: ?>
|
<?php }
|
||||||
|
} else { ?>
|
||||||
|
|
||||||
<div class="post-head"></div>
|
<div class="post-head"></div>
|
||||||
<div class="post">
|
<div class="post">
|
||||||
@ -76,7 +77,7 @@
|
|||||||
</div>
|
</div>
|
||||||
<div class="post-foot"></div>
|
<div class="post-foot"></div>
|
||||||
|
|
||||||
<?php endif; ?>
|
<?php } ?>
|
||||||
|
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user