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

404.php

@@ -7,7 +7,6 @@
 		<h2 class="pagetitle"><?php _e('Page Not Found','comicpress'); ?></h2>
 		<p><a href="<?php bloginfo('wpurl') ?>"><?php _e('Click here to return to the home page','comicpress'); ?></a> <?php _e('or try a search:','comicpress'); ?></p>
 		<p><?php include (get_template_directory() . '/searchform.php') ?></p>
-		<br class="clear-margins" />
 	</div>
 	<div class="post-page-foot"></div>
 </div>

archive-comic.php

@@ -39,11 +39,9 @@ Template Name: Comic Archive
 			</table>
 	<?php } } ?>
 
-			<br class="clear-margins" />
-		
-		</div>
-		<div class="post-page-foot"></div>
 	</div>
+	<div class="post-page-foot"></div>
+</div>
 
 
 <?php include(get_template_directory() . '/layout-foot.php'); ?>

archive.php

@@ -40,7 +40,6 @@
 			<?php } ?>
 				<div class="searchresults"><?php printf(__ngettext("%d item.", "%d items.", $count,'comicpress'),$count); ?></div>
 			</div>
-			<br class="clear-margins" />
 		</div>
 		<div class="post-page-foot"></div>
 	</div>
@@ -86,9 +85,8 @@
 							<div class="clear"></div>
 						</div>
 						<div class="comicarchiveframe" style="width:<?php echo $archive_comic_width; ?>px;">
-							<a href="<?php the_permalink() ?>"><img src="<?php the_comic_archive() ?>" alt="<?php the_title() ?>" title="Click for full size." width="<?php echo $archive_comic_width ?>" /></a><br />
+							<a href="<?php the_permalink() ?>"><img src="<?php the_comic_archive() ?>" alt="<?php the_title() ?>" title="Click for full size." width="<?php echo $archive_comic_width ?>" /></a>
 						</div>
-						<br class="clear-margins" />
 					</div>
 					<div class="post-comic-foot"></div>
 				</div>
@@ -122,7 +120,6 @@
 				} else { 
 					the_excerpt();
 						} ?>
-						<br class="clear-margins" />
 						<div class="post-extras">
 							<div class="tags">
 								<?php the_tags(__('&#9492; Tags:','comicpress'),'','','<br />'); ?>
@@ -143,7 +140,6 @@
 			<h3><?php _e('No posts found.','comicpress'); ?></h3>
 			<p><?php _e('Try another search?','comicpress'); ?></p>
 			<p><?php include(get_template_directory() . '/searchform.php') ?></p>
-			<br class="clear-margins" />
 		</div>
 		<div class="post-foot"></div>
 	</div>

archives.php

@@ -25,8 +25,8 @@ Template Name: Archives
 					<ul><?php wp_get_archives('type=monthly') ?></ul>
 					<h2><?php _e('Archives by Subject:','comicpress'); ?></h2>
 					<ul><?php wp_list_categories() ?></ul>
-					<br class="clear-margins" />
 				</div>
+				<div class="clear"></div>
 			</div>
 			<div class="post-page-foot"></div>
 		</div>

functions/displayblogpost.php

@@ -12,7 +12,7 @@ function display_blog_post() {
 		<div class="blognav">
 			<div class="nav-single">
 				<?php previous_post_link('%link',__(' &lsaquo; Previous ','comicpress'), TRUE); ?>
-				<?php next_post_link('%link',__(' Next &rsaquo; ','comicpress'), TRUE); ?>
+				<?php next_post_link('%link',__('| Next &rsaquo; ','comicpress'), TRUE); ?>
 			</div>
 		</div>
 	<?php } ?>
@@ -42,11 +42,10 @@ function display_blog_post() {
 					<?php } else { ?>
 						<h2><a href="<?php the_permalink(); ?>" rel="bookmark" title="Permanent Link to <?php the_title(); ?>"><?php the_title(); ?></a></h2>
 					<?php } ?>
-					<div class="post-author"> By <?php the_author_posts_link(); ?> on <?php the_time('F jS, Y'); ?></div>
+					<div class="post-author"> <?php the_time('F jS, Y'); ?> <span class="pipe">|</span> by <?php the_author_posts_link(); ?> <?php edit_post_link(__('Edit Post','comicpress'), ' [ ', ' ] '); ?></div>
 					<?php if ($disable_categories_in_posts != 'yes') { ?>
 						<div class="post-cat"><?php _e('Posted In:','comicpress'); ?> <?php the_category(','); ?></div>
 					<?php } ?>
-					<div class="post-edit"><?php edit_post_link(__('Edit Post','comicpress'), ' [ ', ' ] '); ?></div>
 					<?php if(function_exists('the_ratings')) { the_ratings(); } ?>
 				</div>
 				<div class="clear"></div>
@@ -55,8 +54,8 @@ function display_blog_post() {
 				<?php if (!is_single()) { global $more; $more = 0; } ?>
 				<?php the_content(__('&darr; Read the rest of this entry...','comicpress')); ?>
 				<?php if (is_single()) wp_link_pages(array('before' => '<div class="linkpages"><span class="linkpages-pagetext">Pages:</span> ', 'after' => '</div>', 'next_or_number' => 'number'));  ?>
+				<div class="clear"></div>
 			</div>
-			<br class="clear-margins" />
 			<div class="post-extras">
 			<?php if ($disable_tags_in_posts != 'yes') { ?>
 				<div class="post-tags">
@@ -66,14 +65,13 @@ function display_blog_post() {
 			<?php 
 				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">&nbsp;</span> '.__('No Comments ','comicpress'), '<span class="comment-balloon">1</span> '.__('Comment ','comicpress'), '<span class="comment-balloon">%</span> '.__('Comments ','comicpress')); ?></div>
+						<div class="comment-link"><?php comments_popup_link('<span class="comment-balloon comment-balloon-empty">&nbsp;</span> '.__('Comments ','comicpress'), '<span class="comment-balloon">1</span> '.__('Comment ','comicpress'), '<span class="comment-balloon">%</span> '.__('Comments ','comicpress')); ?></div>
 					<?php }
 				}
 			?>
 			<div class="clear"></div>
 			<?php if ($enable_related_posts == 'yes') echo related_posts_shortcode(); ?>
 		</div>
-		<br class="clear-margins" />
 	</div>
 	<div class="post-foot"></div>
 	</div>

functions/displaycomicpost.php

@@ -41,7 +41,7 @@ function display_comic_post() {
 						<?php } else { ?>
 							<h2><a href="<?php the_permalink(); ?>" rel="bookmark" title="Permanent Link to <?php the_title(); ?>"><?php the_title(); ?></a></h2>
 						<?php } ?>
-						<div class="post-comic-author"> By <?php the_author_posts_link(); ?> on <?php the_time('F jS, Y'); ?></div>
+						<div class="post-comic-author"> <?php the_time('F jS, Y'); ?> <span class="pipe">|</span> by <?php the_author_posts_link(); ?> <?php edit_post_link(__('Edit Post','comicpress'), ' [ ', ' ] '); ?></div>
 						<?php if (get_option('comicpress-enable-storyline-support') == 1) { ?>
 							<ul class="storyline-cats"><li class="storyline-root"><?php the_category(' &raquo; </li><li>', multiple) ?></li></ul>
 						<?php } else { ?>
@@ -49,15 +49,14 @@ function display_comic_post() {
 								<div class="post-comic-cat"><?php _e('Posted In:','comicpress'); ?> <?php the_category(','); ?></div>
 							<?php } ?>
 						<?php } ?>
-						<div class="post-comic-edit"><?php edit_post_link(__('Edit Post','comicpress'), ' [ ', ' ] '); ?></div>
 						<?php if(function_exists('the_ratings')) { the_ratings(); } ?>
 					</div>
-					<br class="clear-margins" />
 				</div>
 				<div class="entry">
 					<?php if (!is_single()) { global $more; $more = 0; } ?>
 					<?php the_content(__('&darr; Read the rest of this entry...','comicpress')); ?>
 					<?php if (is_single()) wp_link_pages(array('before' => '<div class="linkpages"><span class="linkpages-pagetext">Pages:</span> ', 'after' => '</div>', 'next_or_number' => 'number'));  ?>
+					<div class="clear"></div>
 				</div>
 				<div class="post-comic-extras">
 				<?php if ($disable_tags_in_posts != 'yes') { ?>
@@ -68,14 +67,13 @@ function display_comic_post() {
 				<?php 
 					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">&nbsp;</span> '.__('No Comments ','comicpress'), '<span class="comment-balloon">1</span> '.__('Comment ','comicpress'), '<span class="comment-balloon">%</span> '.__('Comments ','comicpress')); ?></div>
+							<div class="comment-link"><?php comments_popup_link('<span class="comment-balloon comment-balloon-empty">&nbsp;</span> '.__('Comments ','comicpress'), '<span class="comment-balloon">1</span> '.__('Comment ','comicpress'), '<span class="comment-balloon">%</span> '.__('Comments ','comicpress')); ?></div>
 						<?php }
 					}
 				?>
 				<div class="clear"></div>
 				<?php if ($enable_related_comics == 'yes') echo related_comics_shortcode(); ?>
 			</div>
-			<br class="clear-margins" />
 		</div>
 		<div class="post-comic-foot"></div>
 		</div>

links.php

@@ -33,7 +33,7 @@ Template Name: Links
 				<?php echo $bookmarks; ?>
 			</ul>
 			</div>
-			<br class="clear-margins" />
+			<div class="clear"></div>
 		</div>
 		<div class="post-page-foot"></div>
 	</div>

page.php

@@ -16,13 +16,12 @@
 			<?php } else { ?>
 				<h2 class="pagetitle"><?php the_title() ?></h2>
 			<?php } ?>
-			<br class="clear-margins" />
 			<div class="entry">
 				<?php the_content() ?>
 				<?php wp_link_pages(array('before' => '<div class="linkpages"><span class="linkpages-pagetext">'.__('Pages:','comicpress').'</span> ', 'after' => '</div>', 'next_or_number' => 'number'));  ?>
 			</div>
 			<?php edit_post_link(__('Edit this page.','comicpress'), '<p>', '</p>') ?>
-			<br class="clear-margins" />
+			<div class="clear"></div>
 		</div>
 		<div class="post-page-foot"></div>
 	</div>

search-transcript.php

@@ -41,9 +41,8 @@ $count = $tmp_search->post_count;
 					<div class="clear"></div>
 				</div>
 				<div class="comicarchiveframe" style="width:<?php echo $archive_comic_width; ?>px;">
-					<a href="<?php the_permalink() ?>"><img src="<?php the_comic_archive() ?>" alt="<?php the_title() ?>" title="Click for full size." width="<?php echo $archive_comic_width ?>" /></a><br />
+					<a href="<?php the_permalink() ?>"><img src="<?php the_comic_archive() ?>" alt="<?php the_title() ?>" title="Click for full size." width="<?php echo $archive_comic_width ?>" /></a>
 				</div>
-				<br class="clear-margins" />
 			</div>
 			<div class="post-comic-foot"></div>
 		</div>
@@ -77,7 +76,7 @@ $count = $tmp_search->post_count;
 				<div class="clear"></div>
 			</div>
             <?php the_excerpt() ?>
-            <br class="clear-margins" />
+            <div class="clear"></div>
           </div>
           <div class="post-foot"></div>
 		</div>
@@ -92,7 +91,6 @@ $count = $tmp_search->post_count;
       <h3><?php _e('No transcripts found.','comicpress'); ?></h3>
       <p><?php _e('Try another search?','comicpress'); ?></p>
       <p><?php include(get_template_directory() . '/searchform-transcript.php') ?></p>
-      <br class="clear-margins" />
     </div>
     <div class="post-page-foot"></div>
 </div>

search.php

@@ -48,9 +48,8 @@
 					<div class="clear"></div>
 				</div>
 				<div class="comicarchiveframe" style="width:<?php echo $archive_comic_width; ?>px;">
-					<a href="<?php the_permalink() ?>"><img src="<?php the_comic_archive() ?>" alt="<?php the_title() ?>" title="Click for full size." width="<?php echo $archive_comic_width ?>" /></a><br />
+					<a href="<?php the_permalink() ?>"><img src="<?php the_comic_archive() ?>" alt="<?php the_title() ?>" title="Click for full size." width="<?php echo $archive_comic_width ?>" /></a>
 				</div>
-				<br class="clear-margins" />
 			</div>
 			<div class="post-comic-foot"></div>
 		</div>
@@ -75,7 +74,7 @@
 						<small> <?php _e('By','comicpress'); ?> <?php the_author_posts_link(); ?> <?php _e('on','comicpress'); ?> <?php the_time('F jS, Y'); ?> <?php edit_post_link(__('Edit Post','comicpress'), ' [ ', ' ] '); ?></small><br />
 						<?php if ($disable_categories_in_posts != 'yes') { ?>
 							<?php if ($post->post_type == 'page') { ?>
-								<small><?php _e('This is a page.','comicpress'); ?></small><break />
+								<small><?php _e('This is a page.','comicpress'); ?></small><br />
 							<?php } else { ?>
 								<small><?php _e('Posted In:','comicpress'); ?> <?php the_category(','); ?></small><br />
 							<?php } ?>
@@ -90,7 +89,6 @@
 				} else { 
 					the_excerpt();
 					} ?>
-				<br class="clear-margins" />
 				<div class="post-extras">
 					<div class="tags">
 						<?php the_tags(__('&#9492; Tags:','comicpress'),', ','<br />'); ?>
@@ -111,7 +109,6 @@
 				<h3><?php _e('No entries found.','comicpress'); ?></h3>
 				<p><?php _e('Try another search?','comicpress'); ?></p>
 				<p><?php include (get_template_directory() . '/searchform.php') ?></p>
-				<br class="clear-margins" />
 			</div>
 			<div class="post-page-foot"></div>
 		</div>

searchform-transcript.php

@@ -4,5 +4,6 @@
 		<input type="text" value="<?php _e('Search Transcripts...','comicpress'); ?>" name="s" id="s-transcript" onfocus="this.value=(this.value=='<?php _e('Search Transcripts...','comicpress'); ?>') ? '' : this.value;" onblur="this.value=(this.value=='') ? '<?php _e('Search Transcripts...','comicpress'); ?>' : this.value;" /><input type="hidden" name="key" value="transcript" />
 		<button type="submit">&raquo;</button>
 	</div>
+	<div class="clear"></div>
 </form>
 <?php } ?>

searchform.php

@@ -4,5 +4,6 @@
 		<input type="text" value="<?php _e('Search...','comicpress'); ?>" name="s" id="s-search" onfocus="this.value=(this.value=='<?php _e('Search...','comicpress'); ?>') ? '' : this.value;" onblur="this.value=(this.value=='') ? '<?php _e('Search...','comicpress'); ?>' : this.value;" />
 		<button type="submit">&raquo;</button>
 	</div>
+	<div class="clear"></div>
 </form>
 <?php } ?>

single.php

@@ -96,7 +96,7 @@
 		<div class="post-head"></div>
 		<div class="post">
 			<p><?php _e('Sorry, no posts matched your criteria.','comicpress'); ?></p>
-			<br class="clear-margins" />
+			<div class="clear"></div>
 		</div>
 		<div class="post-foot"></div>
 	</div>

style.css

@@ -352,25 +352,34 @@ h3, h3 a {
 	padding: 5px 0;
 }
 
-	.nav-first {
+	.nav-first{
 		float: left;
 	}
 
 	.nav-previous {
-		padding-left: 10px;
 		float: left;
 	}
 
+		.nav-previous a {
+			padding-left: 10px;
+		}
+		
 	.nav-next {
-		padding-left: 10px;
 		float: left;
 	}
 
+		.nav-next a {
+			padding-left: 10px;
+		}
+	
 	.nav-last {
-		padding-left: 10px;
 		float: left;
 	}
 	
+		.nav-last a {
+			padding-left: 10px;
+		}
+
 .pagenav, .commentnav {
 	height: 25px;
 	color: #000;
@@ -627,6 +636,13 @@ h3, h3 a {
 			display: inline;
 		}
 		
+			.comment-author cite {
+				padding: 0;
+				margin: 0;
+				font-size: 14px;
+				display: inline;
+			}
+		
 		.comment-time {
 			padding-left: 5px;
 		}