From 89652293ff72c185f67d8dbf57d94a234dabaf6b Mon Sep 17 00:00:00 2001
From: "Philip M. Hofer (Frumph)" <frumph_dragon@yahoo.com>
Date: Mon, 2 Nov 2009 04:38:14 -0800
Subject: [PATCH] fixing the rest of the get_avatars to comicpress_get_avatar
 and edit to graphical-navigation.php where trying to Last &rsaquo;&rsaquo;
 put the syntax into the text arrays however htmlspecialchars needs to be used
 (note to john)

Signed-off-by: Philip M. Hofer (Frumph) <frumph_dragon@yahoo.com>
---
 archive.php                      |  4 ++--
 functions/comment-functions.php  |  2 +-
 functions/displaycomicpost.php   | 10 +++++-----
 images/nav/bar/navstyle.css      | 27 +++++++++++++++++++--------
 search-transcript.php            |  4 ++--
 search.php                       |  4 ++--
 widgets/graphical-navigation.php | 16 ++++++++--------
 7 files changed, 39 insertions(+), 28 deletions(-)

diff --git a/archive.php b/archive.php
index bd02eca..72bf666 100644
--- a/archive.php
+++ b/archive.php
@@ -61,7 +61,7 @@
 					<div class="post-comic">
 						<div class="post-info">
 							<?php if ($enable_comic_post_author_gravatar == 'yes') { ?>
-								<div class="post-author-gravatar"><?php echo str_replace("alt='", "alt='".get_the_author_meta('display_name')."' title='".get_the_author_meta('display_name'),get_avatar(get_the_author_meta('email'), 64)); ?></div>
+								<div class="post-author-gravatar"><?php echo str_replace("alt='", "alt='".get_the_author_meta('display_name')."' title='".get_the_author_meta('display_name'),comicpress_get_avatar(get_the_author_meta('email'), 64)); ?></div>
 							<?php } ?>
 							<?php if (function_exists('comicpress_show_mood_in_post')) comicpress_show_mood_in_post(); ?>
 							<?php if ($enable_comic_post_calendar == 'yes') { ?>
@@ -96,7 +96,7 @@
 					<div <?php post_class(); ?>>
 					<div class="post-info">
 						<?php if ($enable_post_author_gravatar == 'yes') { ?>
-							<div class="post-author-gravatar"><?php echo str_replace("alt='", "alt='".get_the_author_meta('display_name')."' title='".get_the_author_meta('display_name'),get_avatar(get_the_author_meta('email'), 64)); ?></div>
+							<div class="post-author-gravatar"><?php echo str_replace("alt='", "alt='".get_the_author_meta('display_name')."' title='".get_the_author_meta('display_name'),comicpress_get_avatar(get_the_author_meta('email'), 64)); ?></div>
 						<?php } ?>
 						<?php if (function_exists('comicpress_show_mood_in_post')) comicpress_show_mood_in_post(); ?>
 						<?php if ($enable_post_calendar == 'yes') { ?>
diff --git a/functions/comment-functions.php b/functions/comment-functions.php
index bea4eb7..8c7c35d 100644
--- a/functions/comment-functions.php
+++ b/functions/comment-functions.php
@@ -37,7 +37,7 @@ function comicpress_avatar() {
 		echo '<a href="' . $url . '" rel="external nofollow" title="' . wp_specialchars(get_comment_author(), 1) . '">';
 	$id_or_email = get_comment_author_email();
 	if (empty($id_or_email)) $id_or_email = get_comment_author();
-	if(function_exists('get_avatar') && $comment_type != 'pingback' && $comment_type != 'trackback' ) { 
+	if(function_exists('comicpress_get_avatar') && $comment_type != 'pingback' && $comment_type != 'trackback' ) { 
 		echo str_replace("alt='", "alt='".wp_specialchars(get_comment_author(), 1)."' title='".wp_specialchars(get_comment_author(), 1), comicpress_get_avatar($id_or_email, 64));
 	} else {
 		if ($comment_type == 'pingback' || $comment_type == 'trackback') {
diff --git a/functions/displaycomicpost.php b/functions/displaycomicpost.php
index cacf69e..586a9d0 100644
--- a/functions/displaycomicpost.php
+++ b/functions/displaycomicpost.php
@@ -12,10 +12,10 @@ function display_comic_post() {
 		$first_comic = get_first_comic_permalink(); $last_comic = get_last_comic_permalink();
 		?>
 		<div class="nav">
-		<?php if ( get_permalink() != $first_comic ) { ?><div class="nav-first"><a href="<?php echo $first_comic ?>"><?php _e('&lsaquo;&lsaquo; First','comicpress'); ?></a></div><?php } ?>
-		<div class="nav-previous"><?php $temp_query = $wp_query->is_single; $wp_query->is_single = true; previous_comic_link('%link', __('&lsaquo; Previous','comicpress')); $wp_query->is_single = $temp_query;$temp_query = null; ?></div>
-		<div class="nav-next"><?php next_comic_link('%link', __('Next &rsaquo;','comicpress')) ?></div>
-		<?php if ( get_permalink() != $last_comic ) { ?><div class="nav-last"><a href="<?php echo $last_comic ?>"><?php _e('Last &rsaquo;&rsaquo;','comicpress'); ?></a></div><?php } ?>
+			<?php if ( get_permalink() != $first_comic ) { ?><div class="nav-first"><a href="<?php echo $first_comic ?>"><?php _e('&lsaquo;&lsaquo; First','comicpress'); ?></a></div><?php } ?>
+			<div class="nav-previous"><?php $temp_query = $wp_query->is_single; $wp_query->is_single = true; previous_comic_link('%link', __('&lsaquo; Previous','comicpress')); $wp_query->is_single = $temp_query;$temp_query = null; ?></div>
+			<div class="nav-next"><?php next_comic_link('%link', __('Next &rsaquo;','comicpress')) ?></div>
+			<?php if ( get_permalink() != $last_comic ) { ?><div class="nav-last"><a href="<?php echo $last_comic ?>"><?php _e('Last &rsaquo;&rsaquo;','comicpress'); ?></a></div><?php } ?>
 		</div>
 		<div class="clear"></div>
 		<div class="<?php comicpress_post_class(); ?>">
@@ -23,7 +23,7 @@ function display_comic_post() {
 		<div class="post-comic">
 		<div class="post-info">
 		<?php if ($enable_comic_post_author_gravatar == 'yes') { ?>
-			<div class="post-author-gravatar"><?php echo str_replace("alt='", "alt='".get_the_author_meta('display_name')."' title='".get_the_author_meta('display_name'),get_avatar(get_the_author_meta('email'), 64)); ?></div>
+			<div class="post-author-gravatar"><?php echo str_replace("alt='", "alt='".get_the_author_meta('display_name')."' title='".get_the_author_meta('display_name'),comicpress_get_avatar(get_the_author_meta('email'), 64)); ?></div>
 		<?php } ?>
 		<?php if (function_exists('comicpress_show_mood_in_post')) comicpress_show_mood_in_post(); ?>
 		<?php if ($enable_comic_post_calendar == 'yes') { ?>
diff --git a/images/nav/bar/navstyle.css b/images/nav/bar/navstyle.css
index 16e814f..847ec0f 100644
--- a/images/nav/bar/navstyle.css
+++ b/images/nav/bar/navstyle.css
@@ -3,16 +3,18 @@ Author: Tyler Martin
 Style: Default
 */
 #comic_navi_wrapper {
-	padding: 5px 0 10px 0;
+	width: 100%;
+	height: 25px;
+	background: black;
 }
 
 #comic_navi {
-	height: 25px;
-	background: black;
-	display: table;
-	border-collapse: collapse;
-	margin: 0 auto;
-
+	padding: 0;
+	margin: 0;
+	list-style: none;
+	float: left;
+	line-height: 25px;
+	font-size: 13px;
 }
 
 .navi-comictitle {
@@ -22,7 +24,16 @@ Style: Default
 .navi {
 }
 
-	.navi:hover {
+.navi a {
+	padding: 0px 10px 0 10px;
+	display: block;
+	color: #fff;
+	text-decoration: none;
+}
+
+	.navi a:hover {
+		color: #000;
+		background: #f00;
 	}
 
 .navi-first {
diff --git a/search-transcript.php b/search-transcript.php
index 87ea5d9..ed523a7 100644
--- a/search-transcript.php
+++ b/search-transcript.php
@@ -21,7 +21,7 @@ $count = $tmp_search->post_count;
 			<div class="post-comic">
 		<div class="post-info">
 			<?php if ($enable_comic_post_author_gravatar == 'yes') { ?>
-				<div class="post-author-gravatar"><?php echo str_replace("alt='", "alt='".get_the_author_meta('display_name')."' title='".get_the_author_meta('display_name'),get_avatar(get_the_author_meta('email'), 64)); ?></div>
+				<div class="post-author-gravatar"><?php echo str_replace("alt='", "alt='".get_the_author_meta('display_name')."' title='".get_the_author_meta('display_name'),comicpress_get_avatar(get_the_author_meta('email'), 64)); ?></div>
 			<?php } ?>
 			<?php if (function_exists('comicpress_show_mood_in_post')) comicpress_show_mood_in_post(); ?>
 			<?php if ($enable_comic_post_calendar == 'yes') { ?>
@@ -54,7 +54,7 @@ $count = $tmp_search->post_count;
           <div <?php post_class(); ?>>
 			<div class="post-info">
 					<?php if ($enable_post_author_gravatar == 'yes') { ?>
-						<div class="post-author-gravatar"><?php echo str_replace("alt='", "alt='".get_the_author_meta('display_name')."' title='".get_the_author_meta('display_name'),get_avatar(get_the_author_meta('email'), 64)); ?></div>
+						<div class="post-author-gravatar"><?php echo str_replace("alt='", "alt='".get_the_author_meta('display_name')."' title='".get_the_author_meta('display_name'),comicpress_get_avatar(get_the_author_meta('email'), 64)); ?></div>
 					<?php } ?>
 					<?php if (function_exists('comicpress_show_mood_in_post')) comicpress_show_mood_in_post(); ?>
 					<?php if ($enable_post_calendar == 'yes') { ?>
diff --git a/search.php b/search.php
index 76546e7..c0ad081 100644
--- a/search.php
+++ b/search.php
@@ -23,7 +23,7 @@ $count = $tmp_search->post_count;
 			<div class="post-comic">
 				<div class="post-info">
 					<?php if ($enable_comic_post_author_gravatar == 'yes') { ?>
-						<div class="post-author-gravatar"><?php echo str_replace("alt='", "alt='".get_the_author_meta('display_name')."' title='".get_the_author_meta('display_name'),get_avatar(get_the_author_meta('email'), 64)); ?></div>
+						<div class="post-author-gravatar"><?php echo str_replace("alt='", "alt='".get_the_author_meta('display_name')."' title='".get_the_author_meta('display_name'),comicpress_get_avatar(get_the_author_meta('email'), 64)); ?></div>
 					<?php } ?>
 					<?php if (function_exists('comicpress_show_mood_in_post')) comicpress_show_mood_in_post(); ?>
 					<?php if ($enable_comic_post_calendar == 'yes') { ?>
@@ -62,7 +62,7 @@ $count = $tmp_search->post_count;
 			<div <?php post_class(); ?>>
 				<div class="post-info">
 					<?php if ($enable_post_author_gravatar == 'yes') { ?>
-						<div class="post-author-gravatar"><?php echo str_replace("alt='", "alt='".get_the_author_meta('display_name')."' title='".get_the_author_meta('display_name'),get_avatar(get_the_author_meta('email'), 64)); ?></div>
+						<div class="post-author-gravatar"><?php echo str_replace("alt='", "alt='".get_the_author_meta('display_name')."' title='".get_the_author_meta('display_name'),comicpress_get_avatar(get_the_author_meta('email'), 64)); ?></div>
 					<?php } ?>
 					<?php if (function_exists('comicpress_show_mood_in_post')) comicpress_show_mood_in_post(); ?>
 					<?php if ($enable_post_calendar == 'yes') { ?>
diff --git a/widgets/graphical-navigation.php b/widgets/graphical-navigation.php
index cfaf7aa..3755e17 100644
--- a/widgets/graphical-navigation.php
+++ b/widgets/graphical-navigation.php
@@ -270,27 +270,27 @@ class WidgetComicPressGraphicalStorylineNavigation extends WP_Widget {
 		);
 
 		$title_defaults = array(
-			'first_title' => __('First', 'comicpress'),
-			'last_title' => __('Latest', 'comicpress'),
+			'first_title' => __('&lsaquo;&lsaquo; First', 'comicpress'),
+			'last_title' => __('Last &rsaquo;&rsaquo;', 'comicpress'),
 			'story_prev_title' => __('Chapter', 'comicpress'),
 			'story_next_title' => __('Chapter', 'comicpress'),
       'story_prev_in_title' => __('In Chapter', 'comicpress'),
       'story_next_in_title' => __('In Chapter', 'comicpress'),
-			'previous_title' => __('Previous', 'comicpress'),
+			'previous_title' => __('&lsaquo; Previous', 'comicpress'),
 			'random_title' => __('Random', 'comicpress'),
 			'archives_title' => __('Archives', 'comicpress'),
 			'comments_title' => __('Comments', 'comicpress'),
-			'next_title' => __('Next', 'comicpress'),
+			'next_title' => __('Next &rsaquo;', 'comicpress'),
 			'buyprint_title' => __('Buy Print', 'comicpress')
 	  );
 
 		$instance = wp_parse_args((array)$instance, array_merge($field_defaults, $title_defaults));
 
 		foreach (array(
-			'first' => __('First', 'comicpress'),
-			'last' => __('Last', 'comicpress'),
-			'previous' => __('Previous', 'comicpress'),
-			'next' => __('Next', 'comicpress'),
+			'first' => __('&lsaquo;&lsaquo; First', 'comicpress'),
+			'last' => __('Last &rsaquo;&rsaquo;', 'comicpress'),
+			'previous' => __('&lsaquo; Previous', 'comicpress'),
+			'next' => __('Next &rsaquo;', 'comicpress'),
 			'story_prev' => __('Previous Chapter', 'comicpress'),
 			'story_next' => __('Next Chapter', 'comicpress'),
       'story_prev_in' => __('Previous In Chapter', 'comicpress'),