From 83abc7aeee3f1963e57c5a18610d160e1fb12123 Mon Sep 17 00:00:00 2001
From: "Philip M. Hofer (Frumph)" <frumph_dragon@yahoo.com>
Date: Sat, 28 Nov 2009 00:38:44 -0800
Subject: [PATCH] fix for links page showing the menubar, moved the pw ad space
 in blog and the blog sidebar to under comic blog post on the index page

Signed-off-by: Philip M. Hofer (Frumph) <frumph_dragon@yahoo.com>
---
 comicpress-config.php |  6 +++---
 index.php             | 22 +++++++++++-----------
 links.php             |  4 +++-
 style.css             |  1 +
 4 files changed, 18 insertions(+), 15 deletions(-)

diff --git a/comicpress-config.php b/comicpress-config.php
index 9fbbd05..09b1b10 100644
--- a/comicpress-config.php
+++ b/comicpress-config.php
@@ -1,10 +1,10 @@
 <?php
 
 //COMIC CATEGORY -the WordPress ID # of your comic category (default "3")
-$comiccat = "58";
+$comiccat = "3";
 
 //BLOG CATEGORY - the WordPress ID of your blog category (default "1")
-$blogcat = "55";
+$blogcat = "4";
 
 //COMIC FOLDER - the folder your comics files are located in (default "comics")
 $comic_folder = "comics";
@@ -30,4 +30,4 @@ $mini_comic_width = "80";
 //Minithumb Comic Folder - The folder for your your mini thumbs (default "comics-mini")
 $mini_comic_folder = "comics-mini";
 
-?>
+?>
\ No newline at end of file
diff --git a/index.php b/index.php
index b5f5a88..93a8c12 100644
--- a/index.php
+++ b/index.php
@@ -48,17 +48,7 @@
 			<div class="column">
 	<?php } ?>
 
-	<?php if (function_exists('the_project_wonderful_ad')) { ?>
-			<div class="blogpwad">
-				<center>
-				<?php the_project_wonderful_ad('blog'); ?>
-				</center>
-			</div>
-	<?php }
-
-	get_sidebar('blog');
-
-if (!$comicpress_options['disable_comic_frontpage'] && !$comicpress_options['disable_comic_blog_frontpage'] && !is_paged() )  { ?>
+<?php if (!$comicpress_options['disable_comic_frontpage'] && !$comicpress_options['disable_comic_blog_frontpage'] && !is_paged() )  { ?>
 		<?php while ($comicFrontpage->have_posts()) : $comicFrontpage->the_post();
 			display_comic_post();
 			$comicFrontPage->is_single = true;
@@ -66,6 +56,16 @@ if (!$comicpress_options['disable_comic_frontpage'] && !$comicpress_options['dis
 	endwhile; ?>
 <?php } ?>
 
+	<?php if (function_exists('the_project_wonderful_ad')) { ?>
+			<div class="blogpwad">
+				<center>
+				<?php the_project_wonderful_ad('blog'); ?>
+				</center>
+			</div>
+	<?php } ?>
+
+	<?php get_sidebar('blog'); ?>
+
 <?php if (!$comicpress_options['disable_blogheader']) { ?>
 	<div id="blogheader"><!-- This area can be used for a heading above your main page blog posts --></div>
 <?php } ?>
diff --git a/links.php b/links.php
index c0c9df0..bc44f8b 100644
--- a/links.php
+++ b/links.php
@@ -7,7 +7,9 @@ Template Name: Links
 <?php include(get_template_directory() . '/layout-head.php'); ?>
 
 	<?php 
-	$bookmarks = wp_list_bookmarks('echo=0');
+	$linkcatid = get_term_by('name','menubar','link_category');
+	$linkcatid = $linkcatid->term_id;
+	$bookmarks = wp_list_bookmarks('echo=0&categorize=1&exclude_category='.$linkcatid); 
 	$bookmarks = preg_replace('#<li ([^>]*)>#', '<li>', $bookmarks);
 	$bookmarks = preg_replace('#<ul ([^>]*)>#', '<ul>', $bookmarks);
 	 ?>
diff --git a/style.css b/style.css
index f64fbf0..5148486 100644
--- a/style.css
+++ b/style.css
@@ -229,6 +229,7 @@ h3, h3 a {
 	}
 
 #menu {
+	text-transform: capitalize;
 	padding: 0;
 	margin: 0;
 	list-style: none;