diff -rc mandigo-1.33/404.php mandigo-1.32/404.php
*** mandigo-1.33/404.php	2008-04-27 17:20:08.000000000 -0400
--- mandigo-1.32/404.php	2008-03-09 14:47:33.000000000 -0400
***************
*** 3,8 ****
--- 3,9 ----
  
  	get_header();
  
+ 	$tag_posttitle_single = get_option('mandigo_tag_posttitle_single');
  ?>
  	<td id="content" class="narrowcolumn">
  
***************
*** 14,26 ****
  	</td>
  
  <?php
- 	// if we have at least on sidebar to display
  	if (!get_option('mandigo_nosidebars')) {
  		include (TEMPLATEPATH . '/sidebar.php');
! 
! 		// if this is a 3-column layout
! 		if (get_option('mandigo_1024') && get_option('mandigo_3columns'))
! 			include (TEMPLATEPATH . '/sidebar2.php');
  	}
  
  	get_footer(); 
--- 15,23 ----
  	</td>
  
  <?php
  	if (!get_option('mandigo_nosidebars')) {
  		include (TEMPLATEPATH . '/sidebar.php');
! 		if (get_option('mandigo_1024') && get_option('mandigo_3columns')) include (TEMPLATEPATH . '/sidebar2.php');
  	}
  
  	get_footer(); 
diff -rc mandigo-1.33/README.txt mandigo-1.32/README.txt
*** mandigo-1.33/README.txt	2008-04-27 17:20:08.000000000 -0400
--- mandigo-1.32/README.txt	2008-03-09 14:47:33.000000000 -0400
***************
*** 28,34 ****
  
  
  
! === INSTALLING =========================================================================
  
  To add Mandigo to your WordPress installation, follow these basic steps:
  
--- 28,34 ----
  
  
  
! === INSTALLATION =======================================================================
  
  To add Mandigo to your WordPress installation, follow these basic steps:
  
***************
*** 42,94 ****
  
  
  
- === UPGRADING ==========================================================================
- 
- Upgrading Mandigo is generally only a matter of uploading the new files, overwriting the
- existing ones.
- 
- If you haven't made any modification to the PHP files, and if you haven't overwritten 
- any of the standard images, all you have to do is upload the new files. The settings 
- made on the Theme Options page will remain untouched.
- 
- If you only have uploaded your own header images to the images/headers/ folder, there is
- nothing to worry about: since these files do not exist in the theme zip file, they will 
- not be overwritten when you upload the update.
- 
- If you have modified a scheme file, be it the CSS file or some images, you can simply 
- upload the new theme files, except those you have edited. On a side note, the best way 
- to customize a scheme is to create your own (see "color schemes" below).
- 
- If you did modify some PHP files, you will have to reapply the same modifications to 
- new theme files. Please note that most modifications, such as including some javascript
- or some style rules can be done using the HTML Inserts feature (see the tab next to 
- "Theme Options" in you WP dashboard).
- 
- Remember it's always a good thing to backup your files prior to updating. Even if you 
- don't remember changing a file, just download the full theme folder from your hosting 
- account to your computer. It only takes a few seconds and you can't be too cautious!
- 
- ** Upgrading from a pre-1.26 version:
- If you are upgrading from a previous version and you had made modifications to either 
- a scheme stylesheet (eg. blue.css) or you had overwritten some of the default images,
- make sure you move these files to new appropriate directories. My advice would be to 
- create a new scheme, even if yours is only slightly different from the default one, as 
- this will make future upgrades even easier.
- 
- Once your blog/site looks the same as it used to, we can safely delete these files/dirs:
- - stylesheets: blue.css, green.css, orange.css, pink.css, purple.css, read.css, teal.css
- - thumbnails: scheme-*.jpg
- - images sub-directories: images/blue/, images/green/, images/orange/, images/pink/, 
-   images/purple/, images/red/, images/teal/
- 
- ** Upgrading from a pre 1.33 version:
- Some classes and tags have changed in 1.33 so if you have created or customized your own
- scheme, you will need to change some CSS selectors:
- - ".calborder" becomes ".datestamp"
- - ".cal"       becomes ".datestamp div"
- 
- 
- 
  === SHOW YOUR SUPPORT ==================================================================
  
  If you enjoy this theme, please consider doing some (all) of the following things:
--- 42,47 ----
***************
*** 98,104 ****
  - make a donation using the link at the top of the Theme Options page:
    http://www.onehertz.com/portfolio/wordpress/donate/
  
! - leave a comment on the Theme Viewer (outdated):
    http://themes.wordpress.net/columns/2-columns/1378/
  
  - bookmark it on del.icio.us:
--- 51,57 ----
  - make a donation using the link at the top of the Theme Options page:
    http://www.onehertz.com/portfolio/wordpress/donate/
  
! - leave a comment on the Theme Viewer:
    http://themes.wordpress.net/columns/2-columns/1378/
  
  - bookmark it on del.icio.us:
***************
*** 220,226 ****
      `-- style.css                    # style, colors
  
  
! If you want to create your own scheme, the easiest way is to make a copy of one of the 
  default schemes, give the directory the desired name, and then replace the files with 
  your own.
  
--- 173,179 ----
      `-- style.css                    # style, colors
  
  
! If you want to create your own scheme, the easiets way is to make a copy of one of the 
  default schemes, give the directory the desired name, and then replace the files with 
  your own.
  
***************
*** 229,234 ****
--- 182,200 ----
  random scheme switching feature. This also allows for some schemes to be excluded from 
  the random switching (delete the folder in schemes/ or rename its style.css).
  
+ ** Upgrading from a pre-1.26 version:
+ If you are upgrading from a previous version and you had made modifications to either 
+ a scheme stylesheet (eg. blue.css) or you had overwritten some of the default images,
+ make sure you move these files to new appropriate directories. My advice would be to 
+ create a new scheme, even if yours is only slightly different from the default one, as 
+ this will make future upgrades even easier.
+ 
+ Once your blog/site looks the same as it used to, we can safely delete these files/dirs:
+ - stylesheets: blue.css, green.css, orange.css, pink.css, purple.css, read.css, teal.css
+ - thumbnails: scheme-*.jpg
+ - images sub-directories: images/blue/, images/green/, images/orange/, images/pink/, 
+   images/purple/, images/red/, images/teal/
+ 
  
  
  === SEO OPTIONS ========================================================================
***************
*** 309,324 ****
  Lithuanian:            Simonas Kiela
  Malay:                 Intan Keristina
  Maltese:               James Cauchi
! Norwegian (Bokmal):    Torbjorn Blystad, Espen Gjelsvik
  Norwegian (Nynorsk):   Eivind Odegard
  Polish:                Mateusz Baran
  Portuguese (PT):       Rodrigo Neves
! Portuguese (BR):       Oscar Nogueira Neto, Marcelo Todaro
  Romanian:              Victor Butiu
  Russian:               Michael Dolgov
  Serbian:               Aleksandar Duric
  Slovak:                Marek, Marian Trnka
- Slovenian:             Xin
  Spanish:               Juan Luis Perez Perez
  Swedish:               Ulf Wrede, Johan
  Turkish:               Mert Yabul
--- 275,289 ----
  Lithuanian:            Simonas Kiela
  Malay:                 Intan Keristina
  Maltese:               James Cauchi
! Norwegian (Bokmal):    Torbjorn Blystad
  Norwegian (Nynorsk):   Eivind Odegard
  Polish:                Mateusz Baran
  Portuguese (PT):       Rodrigo Neves
! Portuguese (BR):       Oscar Nogueira Neto
  Romanian:              Victor Butiu
  Russian:               Michael Dolgov
  Serbian:               Aleksandar Duric
  Slovak:                Marek, Marian Trnka
  Spanish:               Juan Luis Perez Perez
  Swedish:               Ulf Wrede, Johan
  Turkish:               Mert Yabul
***************
*** 341,358 ****
  
  === CHANGELOG ==========================================================================
  
- 1.33
- + language: Slovenian (sl_SI)
- + added an option to disable submenus in header navigation
- + added gravatars support in comments
- + added support for the new image classes in 2.5, no more hair tearing! (well hopefully)
- * grammar fixes: Brazilian Portuguese (pt_BR)
- * grammar fixes: Norwegian (nb_NO)
- * MAJOR code cleanup
- * fixed non clickable sidebar links in IE6
- * now using the packed version of jQuery
- * fixed the "restore default color" links
- 
  1.32
  + language: Basque (eu)
  + language: Finish (fi_FI)
--- 306,311 ----
diff -rc mandigo-1.33/archive.php mandigo-1.32/archive.php
*** mandigo-1.33/archive.php	2008-04-27 17:20:08.000000000 -0400
--- mandigo-1.32/archive.php	2008-03-09 14:47:32.000000000 -0400
***************
*** 3,200 ****
  
  	get_header();
  
- 	// heading levels for posts (h1, h2, div, ...)
  	$tag_posttitle_multi = get_option('mandigo_tag_posttitle_multi');
  	$tag_pagetitle       = get_option('mandigo_tag_pagetitle'      );
  ?>
  	<td id="content" class="narrowcolumn">
  
! <?php
! 	if (have_posts()) {
! 
! 		$post = $posts[0]; // Hack. Set $post so that the_date() works.
! 		
! 		// if this is a category archive
! 		if (is_category()) {
! 			$pagetitle = sprintf(
! 				__('Archive for the %s Category', 'mandigo'),
! 				'&#8220;'. single_cat_title('',false) .'&#8221;'
! 			);
! 		}
! 
! 		// if wp supports tags and this is a tag archive
! 		elseif (function_exists(is_tag) && is_tag()) {
! 			$pagetitle = sprintf(
! 				__('Posts Tagged %s', 'mandigo'),
! 				'&#8220;'. single_tag_title('',false) .'&#8221;'
! 			);
! 		}
! 		
! 		// if this is a daily archive
! 		elseif (is_day()) {
! 			$pagetitle = sprintf(
! 				__('Archive for %s', 'mandigo'),
! 				get_the_time(__('F jS, Y', 'mandigo'))
! 			);
! 		}
! 		
! 		// if this is a monthly archive
! 		elseif (is_month()) {
! 			$pagetitle = sprintf(
! 				__('Archive for %s', 'mandigo'),
! 				get_the_time(__('F, Y', 'mandigo'))
! 			);
! 		}
! 		
! 		// if this is a yearly archive
! 		elseif (is_year()) {
! 			$pagetitle = sprintf(
! 				__('Archive for %s', 'mandigo'),
! 				get_the_time('Y')
! 			);
! 		}
! 		
! 		// if this is a search result
! 		elseif (is_search()) {
! 			$pagetitle = __('Search Results', 'mandigo');
! 		}
! 		
! 		// if this is an author archive
! 		elseif (is_author()) {
! 			$pagetitle = __('Author Archive', 'mandigo');
! 		}
! 		
! 		// otherwise, not sure when this is triggered
! 		elseif (isset($_GET['paged']) && !empty($_GET['paged'])) {
! 			$pagetitle = __('Blog Archives', 'mandigo');
! 		}
! 		
! 		// output
! ?>
  
! 		<<?php echo $tag_pagetitle; ?> class="pagetitle"><?php echo $pagetitle; ?></<?php echo $tag_pagetitle; ?>>
! 		
! <?php
! 		// if this is a category archive
! 		if (is_category()) {
! 			// add the category description
! ?>
  		<div class="catdesc"><?php echo category_description(); ?></div>
! <?php
! 		}
! ?>
  
  		<div class="navigation">
! 			<div class="alignleft"><?php next_posts_link('&laquo;&nbsp;'. __('Previous Entries', 'mandigo')) ?></div>
! 			<div class="alignright"><?php previous_posts_link(__('Next Entries', 'mandigo'). '&nbsp;&raquo;') ?></div>
  		</div>
  
! <?php
! 		// main loop
! 		while (have_posts()) {
! 			the_post();
! ?>
  		<div class="post" id="post-<?php the_ID(); ?>">
                                  <div class="postinfo">
  					<?php mandigo_date_icon(get_the_time('Y M m d')); ?>
! <?php
! 			// unless we disabled animations, display the buttons
! 			if (!get_option('mandigo_no_animations')) {
! ?>
! 				<span class="switch-post">
! 					<a href="javascript:toggleSidebars();" class="switch-sidebars"><img src="<?php echo $dirs['www']['icons']; ?>bullet_sidebars_hide.png" alt="" class="png" /></a><a href="javascript:togglePost(<?php the_ID(); ?>);" id="switch-post-<?php the_ID(); ?>"><img src="<?php echo $dirs['www']['icons']; ?>bullet_toggle_minus.png" alt="" class="png" /></a>
! 				</span>
! 
! <?php
! 			}
! 			
! 			// the post title
! ?>
! 				<<?php echo $tag_posttitle_multi; ?> class="posttitle posttitle-archive"><a href="<?php the_permalink() ?>" rel="bookmark" title="<?php printf(__('Permanent Link to %s', 'mandigo'), the_title('', '', false)); ?>"><?php the_title(); ?></a></<?php echo $tag_posttitle_multi; ?>>
! 				<small>
! <?php
! 			// author information
! 			printf(
! 				__('Posted by: %s in %s', 'mandigo'),
! 				mandigo_author_link(get_the_author_ID(), get_the_author()),
! 				get_the_category_list(', ')
! 			);
! 
! 			// if wp supports tags, and unless we chose to display tags after the post
! 			if (function_exists('the_tags') && !get_option('mandigo_tags_after'))
! 				the_tags(', '. __('tags', 'mandigo') .': ');
! 
! 			// the "edit post" link, which displays when you are logged in
! 			edit_post_link(
! 				__('Edit', 'mandigo'),
! 				sprintf(
! 					' - <img src="%simages/edit.gif" alt="%s" /> ',
! 					$dirs['www']['scheme'],
! 					__('Edit this post', 'mandigo')
! 				),
! 				''
! 			);
! ?>
! 				</small>
  
! 			</div>
  
- 			<div class="entry">
- <?php
- 			// the content itself!
- 			the_content(__('Read the rest of this entry', 'mandigo') .' &raquo;');
- 
- 			// if wp supports tags, and if we chose to display tags after the post
- 			if (function_exists('the_tags') && get_option('mandigo_tags_after'))
- 				the_tags();
- ?>
  			</div>
  
! 			<p class="clear">
! 				<img src="<?php echo $dirs['www']['scheme']; ?>images/comments.gif" alt="Comments" />
! <?php
! 			// comments link
! 			comments_popup_link(
! 				__('No Comments', 'mandigo'). ' &#187;',
! 				__('1 Comment',   'mandigo'). ' &#187;',
! 				__('% Comments',  'mandigo'). ' &#187;'
! 			);
! ?>
! 			</p>
! 		</div>
! 
! <?php
! 		} // end of main loop
! ?>
  
  		<div class="navigation">
! 			<div class="alignleft"><?php next_posts_link('&laquo;&nbsp;'. __('Previous Entries', 'mandigo')) ?></div>
! 			<div class="alignright"><?php previous_posts_link(__('Next Entries', 'mandigo'). '&nbsp;&raquo;') ?></div>
  		</div>
  
! <?php
! 	}
! 	
! 	// if have_posts() was false
! 	else {
! ?>
  
! 		<<?php echo $tag_pagetitle; ?> class="center"><?php _e('Not Found', 'mandigo'); ?></<?php echo $tag_pagetitle; ?>>
! 		<p class="center"><?php _e("Sorry, but you are looking for something that isn't here.", 'mandigo'); ?></p>
  
- <?php
- 	} 
- ?>
  	</td>
  
  <?php
- 	// if we have at least on sidebar to display
  	if (!get_option('mandigo_nosidebars')) {
  		include (TEMPLATEPATH . '/sidebar.php');
! 
! 		// if this is a 3-column layout
! 		if (get_option('mandigo_1024') && get_option('mandigo_3columns'))
! 			include (TEMPLATEPATH . '/sidebar2.php');
  	}
  
  	get_footer(); 
--- 3,93 ----
  
  	get_header();
  
  	$tag_posttitle_multi = get_option('mandigo_tag_posttitle_multi');
  	$tag_pagetitle       = get_option('mandigo_tag_pagetitle'      );
  ?>
  	<td id="content" class="narrowcolumn">
  
! 	<?php if (have_posts()) : ?>
  
! 		<?php $post = $posts[0]; // Hack. Set $post so that the_date() works. ?>
! 		<?php if (is_category()) { ?>
! 		<<?php echo $tag_pagetitle; ?> class="pagetitle"><?php printf(__('Archive for the %s Category','mandigo'),'&#8220;'. single_cat_title('',false) .'&#8221;'); ?></<?php echo $tag_pagetitle; ?>>
  		<div class="catdesc"><?php echo category_description(); ?></div>
! 
! 		<?php } elseif(function_exists(is_tag) && is_tag() ) { ?>
! 		<<?php echo $tag_pagetitle; ?> class="pagetitle"><?php printf(__('Posts Tagged %s','mandigo'),'&#8220;'. single_tag_title('',false) .'&#8221;'); ?></<?php echo $tag_pagetitle; ?>>
! 
! 		<?php } elseif (is_day()) { ?>
! 		<<?php echo $tag_pagetitle; ?> class="pagetitle"><?php printf(__('Archive for %s','mandigo'),get_the_time(__('F jS, Y','mandigo'))); ?></<?php echo $tag_pagetitle; ?>>
! 
! 		<?php } elseif (is_month()) { ?>
! 		<<?php echo $tag_pagetitle; ?> class="pagetitle"><?php printf(__('Archive for %s','mandigo'),get_the_time(__('F, Y','mandigo'))); ?></<?php echo $tag_pagetitle; ?>>
! 
! 		<?php } elseif (is_year()) { ?>
! 		<<?php echo $tag_pagetitle; ?> class="pagetitle"><?php printf(__('Archive for %s','mandigo'),get_the_time('Y')); ?></<?php echo $tag_pagetitle; ?>>
! 
! 		<?php } elseif (is_search()) { ?>
! 		<<?php echo $tag_pagetitle; ?> class="pagetitle"><?php _e('Search Results','mandigo'); ?></<?php echo $tag_pagetitle; ?>>
! 
! 		<?php } elseif (is_author()) { ?>
! 		<<?php echo $tag_pagetitle; ?> class="pagetitle"><?php _e('Author Archive','mandigo'); ?></<?php echo $tag_pagetitle; ?>>
! 
! 		<?php } elseif (isset($_GET['paged']) && !empty($_GET['paged'])) { ?>
! 		<<?php echo $tag_pagetitle; ?> class="pagetitle"><?php _e('Blog Archives','mandigo'); ?></<?php echo $tag_pagetitle; ?>>
! 
! 		<?php } ?>
! 
  
  		<div class="navigation">
! 			<div class="alignleft"><?php next_posts_link('&laquo;&nbsp;'. __('Previous Entries','mandigo')) ?></div>
! 			<div class="alignright"><?php previous_posts_link(__('Next Entries','mandigo'). '&nbsp;&raquo;') ?></div>
  		</div>
  
! 		<?php while (have_posts()) : the_post(); ?>
  		<div class="post" id="post-<?php the_ID(); ?>">
                                  <div class="postinfo">
  					<?php mandigo_date_icon(get_the_time('Y M m d')); ?>
! 					<?php if (!get_option('mandigo_no_animations')): ?>
! 					<span class="switch-post">
! 						<a href="javascript:toggleSidebars();" class="switch-sidebars"><img src="<?php echo $dirs['www']['icons']; ?>bullet_sidebars_hide.png" alt="" class="png" /></a><a href="javascript:togglePost(<?php the_ID(); ?>);" id="switch-post-<?php the_ID(); ?>"><img src="<?php echo $dirs['www']['icons']; ?>bullet_toggle_minus.png" alt="" class="png" /></a>
! 					</span>
! 					<?php endif; ?>
!                                         <<?php echo $tag_posttitle_multi; ?> class="posttitle posttitle-archive"><a href="<?php the_permalink() ?>" rel="bookmark" title="<?php printf(__('Permanent Link to %s','mandigo'),the_title('','',false)); ?>"><?php the_title(); ?></a></<?php echo $tag_posttitle_multi; ?>>
!                                         <small>
! 						<?php printf(__('Posted by: %s in %s','mandigo'),mandigo_author_link(get_the_author_ID(),get_the_author()),get_the_category_list(', ')) ?><?php if (function_exists('the_tags') && !get_option('mandigo_tags_after')) the_tags(', '. __('tags','mandigo') .': '); ?><?php edit_post_link('<img src="'. $dirs['www']['scheme'] .'images/edit.gif" alt="'. __('Edit this post','mandigo') .'" /> '. __('Edit','mandigo'), ' - ', ''); ?>  
! 					</small>
!                                 </div>
! 
! 				<div class="entry">
! 					<?php the_content() ?>
! 					<?php if (function_exists('the_tags') && get_option('mandigo_tags_after')) the_tags(); ?>
! 				</div>
  
! 				<p class="clear"><img src="<?php echo $dirs['www']['scheme']; ?>images/comments.gif" alt="Comments" /> <?php comments_popup_link(__('No Comments','mandigo'). ' &#187;', __('1 Comment','mandigo'). ' &#187;', __('% Comments','mandigo'). ' &#187;'); ?></p>
  
  			</div>
  
! 		<?php endwhile; ?>
  
  		<div class="navigation">
! 			<div class="alignleft"><?php next_posts_link('&laquo;&nbsp;'. __('Previous Entries','mandigo')) ?></div>
! 			<div class="alignright"><?php previous_posts_link(__('Next Entries','mandigo'). '&nbsp;&raquo;') ?></div>
  		</div>
  
! 	<?php else : ?>
  
! 		<<?php echo $tag_pagetitle; ?> class="pagetitle"><?php _e('Not Found','mandigo'); ?></<?php echo $tag_pagetitle; ?>>
! 		<p class="center"><?php _e('Sorry, but you are looking for something that isn\'t here','mandigo'); ?>.</p>
! 
! 	<?php endif; ?>
  
  	</td>
  
  <?php
  	if (!get_option('mandigo_nosidebars')) {
  		include (TEMPLATEPATH . '/sidebar.php');
! 		if (get_option('mandigo_1024') && get_option('mandigo_3columns')) include (TEMPLATEPATH . '/sidebar2.php');
  	}
  
  	get_footer(); 
diff -rc mandigo-1.33/archives.php mandigo-1.32/archives.php
*** mandigo-1.33/archives.php	2008-04-27 17:20:08.000000000 -0400
--- mandigo-1.32/archives.php	2008-03-09 14:47:33.000000000 -0400
***************
*** 2,53 ****
  /*
  Template Name: Archives Template
  */
! 
! 	global $dirs;
! 
  	get_header();
  
- 	// heading level for page title (h1, h2, div, ...)
  	$tag_pagetitle = get_option('mandigo_tag_pagetitle'      );
  ?>
  	<td id="content" class="narrowcolumn">
! 		<div class="post">
! <?php
! 	// unless we disabled animations, display the buttons
! 	if (!get_option('mandigo_no_animations')) {
! ?>
! 			<span class="switch-post">
! 				<a href="javascript:toggleSidebars();" class="switch-sidebars"><img src="<?php echo $dirs['www']['icons']; ?>bullet_sidebars_hide.png" alt="" class="png" /></a><a href="javascript:togglePost(<?php the_ID(); ?>);" id="switch-post-<?php the_ID(); ?>"><img src="<?php echo $dirs['www']['icons']; ?>bullet_toggle_minus.png" alt="" class="png" /></a>
! 			</span>
! 
! <?php
! 	}
! ?>
  
! 		<<?php echo $tag_pagetitle; ?> class="pagetitle"><?php _e('Search', 'mandigo'); ?>:</<?php echo $tag_pagetitle; ?>>
! 		<?php include (TEMPLATEPATH . '/searchform.php'); ?>
! 
! 		<<?php echo $tag_pagetitle; ?> class="pagetitle"><?php _e('Archives by Month', 'mandigo'); ?>:</<?php echo $tag_pagetitle; ?>>
! 		<ul>
! 			<?php wp_get_archives('type=monthly'); ?>
! 		</ul>
! 
! 		<<?php echo $tag_pagetitle; ?> class="pagetitle"><?php _e('Archives by Subject', 'mandigo'); ?>:</<?php echo $tag_pagetitle; ?>>
! 		<ul>
! 			<?php wp_list_cats(); ?>
! 		</ul>
! 
! 		</div>
  	</td>
  
  <?php
- 	// if we have at least on sidebar to display
  	if (!get_option('mandigo_nosidebars')) {
  		include (TEMPLATEPATH . '/sidebar.php');
! 
! 		// if this is a 3-column layout
! 		if (get_option('mandigo_1024') && get_option('mandigo_3columns'))
! 			include (TEMPLATEPATH . '/sidebar2.php');
  	}
  
  	get_footer(); 
--- 2,41 ----
  /*
  Template Name: Archives Template
  */
! ?>
! <?php 
  	get_header();
  
  	$tag_pagetitle = get_option('mandigo_tag_pagetitle'      );
  ?>
  	<td id="content" class="narrowcolumn">
! 	<div class="post">
! 	<?php if (!get_option('mandigo_no_animations')): ?>
! 		<span class="switch-post">
! 			<a href="javascript:toggleSidebars();" class="switch-sidebars"><img src="<?php echo $dirs['www']['icons']; ?>bullet_sidebars_hide.png" alt="" class="png" /></a><a href="javascript:togglePost(<?php the_ID(); ?>);" id="switch-post-<?php the_ID(); ?>"><img src="<?php echo $dirs['www']['icons']; ?>bullet_toggle_minus.png" alt="" class="png" /></a>
! 		</span>
! 	<?php endif; ?>
! 
! 	<<?php echo $tag_pagetitle; ?> class="pagetitle"><?php _e('Search','mandigo'); ?>:</<?php echo $tag_pagetitle; ?>>
! 	<?php include (TEMPLATEPATH . '/searchform.php'); ?>
! 
! 	<<?php echo $tag_pagetitle; ?> class="pagetitle"><?php _e('Archives by Month','mandigo'); ?>:</<?php echo $tag_pagetitle; ?>>
! 	<ul>
! 		<?php wp_get_archives('type=monthly'); ?>
! 	</ul>
! 
! 	<<?php echo $tag_pagetitle; ?> class="pagetitle"><?php _e('Archives by Subject','mandigo'); ?>:</<?php echo $tag_pagetitle; ?>>
! 	<ul>
! 		<?php wp_list_cats(); ?>
! 	</ul>
  
! 	</div>
  	</td>
  
  <?php
  	if (!get_option('mandigo_nosidebars')) {
  		include (TEMPLATEPATH . '/sidebar.php');
! 		if (get_option('mandigo_1024') && get_option('mandigo_3columns')) include (TEMPLATEPATH . '/sidebar2.php');
  	}
  
  	get_footer(); 
diff -rc mandigo-1.33/attachment.php mandigo-1.32/attachment.php
*** mandigo-1.33/attachment.php	2008-04-27 17:20:08.000000000 -0400
--- mandigo-1.32/attachment.php	2008-03-09 14:47:33.000000000 -0400
***************
*** 1,144 ****
  <?php 
- 	global $dirs;
- 
  	get_header();
  
! 	// heading levels for attachment name (h1, h2, div, ...)
! 	$tag_pagetitle = get_option('mandigo_tag_pagetitle');
  ?>
  	<td id="content" class="<?php echo ($alwayssidebars ? 'narrow' : 'wide'); ?>column">
  
! <?php
! 	// if we have posts
! 	if (have_posts()) {
! 		// main loop
! 		while (have_posts()) {
! 			the_post();
! 
! 			$attachment_link = get_the_attachment_link(
! 				$post->ID,
! 				true,
! 				array(450, 800)
! 			); // This also populates the iconsize for the next line
! 			
! 			$_post = &get_post($post->ID);
! 			
! 			$classname = (
! 				$_post->iconsize[0] <= 128
! 				? 'small'
! 				: ''
! 			);
! 			$classname .= 'attachment';
! ?>
! 		<div class="post" id="post-<?php the_ID(); ?>">
! <?php
! 			// unless we disabled animations, display the buttons
! 			if (!get_option('mandigo_no_animations')) {
! ?>
! 			<span class="switch-post">
! 				<a href="javascript:toggleSidebars();" class="switch-sidebars"><img src="<?php echo $dirs['www']['icons']; ?>bullet_sidebars_hide.png" alt="" class="png" /></a><a href="javascript:togglePost(<?php the_ID(); ?>);" id="switch-post-<?php the_ID(); ?>"><img src="<?php echo $dirs['www']['icons']; ?>bullet_toggle_minus.png" alt="" class="png" /></a>
! 			</span>
  
! <?php
! 			}
! 	
! 			// the attachment name
! ?>
  			<<?php echo $tag_pagetitle; ?> class="pagetitle"><a href="<?php echo get_permalink($post->post_parent); ?>" rel="attachment"><?php echo get_the_title($post->post_parent); ?></a> &raquo; <a href="<?php echo get_permalink() ?>" rel="bookmark" title="Permanent Link: <?php the_title(); ?>"><?php the_title(); ?></a></<?php echo $tag_pagetitle; ?>>
- 
  			<div class="entry">
  				<p class="<?php echo $classname; ?>"><?php echo $attachment_link; ?><br /><?php echo basename($post->guid); ?></p>
  
! <?php
! 			// the content itself!
! 			the_content(__('Read the rest of this entry', 'mandigo') .' &raquo;');
  
! 			link_pages(
! 				'<p><strong>'. __('Pages', 'mandigo') .':</strong> ',
! 				'</p>',
! 				'number'
! 			);
! ?>
  
  				<p class="postmetadata alt">
  					<small>
! <?php
! 			printf(
! 				__('This entry was posted on %s at %s and is filed under %s.', 'mandigo'),
! 				get_the_time(__('l, F jS, Y', 'mandigo')),
! 				get_the_time(),
! 				get_the_category_list(', ')
! 			);
! 
! 			// link to rss feed
! 			printf(
! 				__('You can follow any responses to this entry through the %s feed.', 'mandigo'),
! 				'<a href="'. comments_rss() .'">RSS 2.0</a>'
! 			);
! 			
! 			// if both comments and pings are open
! 			if ($post->comment_status == 'open' && $post->ping_status == 'open') {
! 				printf(
! 					__('You can <a href="#respond">leave a response</a>, or <a href="%s" rel="trackback">trackback</a> from your own site.', 'mandigo'),
! 					trackback_url(false)
! 				);
! 			}
! 			
! 			// if only pings are open
! 			elseif ($post->comment_status != 'open' && $post->ping_status == 'open') {
! 				printf(
! 					__('Responses are currently closed, but you can <a href="%s" rel="trackback">trackback</a> from your own site.', 'mandigo'),
! 					trackback_url(false)
! 				);
! 			}
! 			
! 			// if only comments are open
! 			elseif ($post->comment_status == 'open' && $post->ping_status != 'open') {
! 				_e('You can <a href="#respond">skip to the end</a> and leave a response. Pinging is currently not allowed.', 'mandigo');
! 			}
! 
! 			// if neither comments or pings are open
! 			elseif ($post->comment_status != 'open' && $post->ping_status != 'open') {
! 				_e('Both comments and pings are currently closed.', 'mandigo');
! 			}
! 
! 			// the "edit post" link
! 			edit_post_link(
! 				__('Edit this entry.', 'mandigo'),
! 				'',
! 				''
! 			);
! ?>					</small>
  				</p>
  			</div>
  		</div>
  
! <?php
! 			// include the comments template
! 			comments_template();
! 		} // end of main loop
! 	}
! 	
! 	// if have_posts() was false
! 	else {
! ?>
  
! 		<<?php echo $tag_pagetitle; ?>><?php _e('Sorry, no posts matched your criteria.', 'mandigo'); ?></<?php echo $tag_pagetitle; ?>>
  
! <?php
! 	}
! ?>
  
  	</td>
  
  <?php
! 	// if we have at least on sidebar to display
! 	if (!get_option('mandigo_nosidebars')) {
! 		include (TEMPLATEPATH . '/sidebar.php');
! 
! 		// if this is a 3-column layout
! 		if (get_option('mandigo_1024') && get_option('mandigo_3columns'))
! 			include (TEMPLATEPATH . '/sidebar2.php');
  	}
  
  	get_footer(); 
--- 1,64 ----
  <?php 
  	get_header();
  
! 	$tag_pagetitle = get_option('mandigo_tag_pagetitle'       );
  ?>
  	<td id="content" class="<?php echo ($alwayssidebars ? 'narrow' : 'wide'); ?>column">
  
! 	<?php if (have_posts()) : while (have_posts()) : the_post(); ?>
  
! 	<?php $attachment_link = get_the_attachment_link($post->ID, true, array(450, 800)); // This also populates the iconsize for the next line ?>
! 	<?php $_post = &get_post($post->ID); $classname = ($_post->iconsize[0] <= 128 ? 'small' : '') . 'attachment'; // This lets us style narrow icons specially ?>
! 		<div class="post" id="post-<?php the_ID(); ?>">
  			<<?php echo $tag_pagetitle; ?> class="pagetitle"><a href="<?php echo get_permalink($post->post_parent); ?>" rel="attachment"><?php echo get_the_title($post->post_parent); ?></a> &raquo; <a href="<?php echo get_permalink() ?>" rel="bookmark" title="Permanent Link: <?php the_title(); ?>"><?php the_title(); ?></a></<?php echo $tag_pagetitle; ?>>
  			<div class="entry">
  				<p class="<?php echo $classname; ?>"><?php echo $attachment_link; ?><br /><?php echo basename($post->guid); ?></p>
  
! 				<?php the_content('<p class="serif">'. __('Read the rest of this entry','mandigo') .' &raquo;</p>'); ?>
  
! 				<?php link_pages('<p><strong>'. __('Pages','mandigo') .':</strong> ', '</p>', 'number'); ?>
  
  				<p class="postmetadata alt">
  					<small>
! 						<?php printf(__('This entry was posted on %s at %s and is filed under %s.','mandigo'),get_the_time(__('l, F jS, Y','mandigo')),get_the_time(),get_the_category_list(', ')); ?>
! 						<?php printf(__('You can follow any responses to this entry through the %s feed.','mandigo'),'<a href="'. comments_rss() .'">RSS 2.0</a>'); ?>
! 
! 						<?php if (('open' == $post-> comment_status) && ('open' == $post->ping_status)) { ?>
! 							<?php printf(__('You can <a href="#respond">leave a response</a>, or <a href="%s" rel="trackback">trackback</a> from your own site.','mandigo'),trackback_url(false)); ?>
! 
! 						<?php } elseif (!('open' == $post-> comment_status) && ('open' == $post->ping_status)) { ?>
! 							<?php printf(__('Responses are currently closed, but you can <a href="%s" rel="trackback">trackback</a> from your own site.','mandigo'),trackback_url(false)); ?>
! 
! 						<?php } elseif (('open' == $post-> comment_status) && !('open' == $post->ping_status)) { ?>
! 							<?php _e('You can <a href="#respond">skip to the end</a> and leave a response. Pinging is currently not allowed.','mandigo'); ?>
! 
! 						<?php } elseif (!('open' == $post-> comment_status) && !('open' == $post->ping_status)) { ?>
! 							<?php _e('Both comments and pings are currently closed.','mandigo'); ?>
! 
! 						<?php } edit_post_link(__('Edit this entry.','mandigo'),'',''); ?>
! 
! 					</small>
  				</p>
+ 
  			</div>
  		</div>
  
! 	<?php comments_template(); ?>
  
! 	<?php endwhile; else: ?>
  
! 		<p><?php _e('Sorry, no posts matched your criteria.','mandigo'); ?></p>
! 
! <?php endif; ?>
  
  	</td>
  
  <?php
! 	if (get_option('mandigo_always_show_sidebars')) {
! 		if (!get_option('mandigo_nosidebars')) {
! 			include (TEMPLATEPATH . '/sidebar.php');
! 			if (get_option('mandigo_1024') && get_option('mandigo_3columns')) include (TEMPLATEPATH . '/sidebar2.php');
! 		}
  	}
  
  	get_footer(); 
diff -rc mandigo-1.33/comments.php mandigo-1.32/comments.php
*** mandigo-1.33/comments.php	2008-04-27 17:20:08.000000000 -0400
--- mandigo-1.32/comments.php	2008-03-09 14:47:33.000000000 -0400
***************
*** 1,279 ****
! <?php
! 	global $dirs;
! 
! 	/* do not delete these lines */
  	if ('comments.php' == basename($_SERVER['SCRIPT_FILENAME']))
  		die ('Please do not load this page directly. Thanks!');
  
! 	// if there's a password
! 	if (!empty($post->post_password)) { 
! 		// and it doesn't match the cookie
! 		if ($_COOKIE['wp-postpass_' . COOKIEHASH] != $post->post_password) {
! ?>
! 			<p class="nocomments">This post is password protected. Enter the password to view comments.<p>
! <?php
! 			return;
! 		}
! 	}
! 
! 	/* you can start editing here */
! 	
! 	// for alternating comment background
! 	$oddcomment = 0;
! 	
! 	// if we chose to highlight author comments
! 	$authorcomments = get_option('mandigo_author_comments');
  
! 	// the post/page author
! 	$the_author = get_the_author();
  
! 	// if there's at least one comment
! 	if ($comments) {
! ?>
! 	<div id="comments">
! <?php
! 		comments_number(
! 			__('No Responses to ', 'mandigo'),
! 			__('One Response to ', 'mandigo'),
! 			__('% Responses to ',  'mandigo')
! 		);
  ?>
! 		&#8220;<?php the_title();?>&#8221;
! 	</div> 
  
  <?php
! 		// loop through comments
! 		// what we do here is process each comment, build <li> items, and separate real comments from trackbacks
! 		// we will display them later according to the chosen options
! 		foreach ($comments as $comment) {
! 			// the comment id
! 			$id = get_comment_ID();
!    
!    // echo get_avatar( 't0m@gawd.net' , $size = '48', $default = $dirs['www']['images'] .'1x1.gif' ); 
!    
!    
! 			// a BIG sprintf, not for the faint of heart
! 			$comment_list_item = sprintf('
! 				<li class="clear %s%s" id="comment-%s">
! 					<span class="switch-post">
! 						<a href="javascript:toggleComment(%s);" id="switch-comment-%s"><img src="'. $dirs['www']['icons'] .'bullet_toggle_minus.png" alt="" class="png" /></a>
! 					</span>
! 					%s
! 					<cite>%s</cite>
! 					<div>
! 						%s
! 						<small class="commentmetadata"><a href="#comment-%s">%s</a> %s</small>
! 						%s
! 					</div>
! 				</li>
! 				',
! 
! 				( // first %s, whether it's an odd/even comment
! 					++$oddcomment%2
! 					? 'alt'
! 					: ''
! 				),
! 				
! 				( // second %s, highlight author comment
! 					$authorcomments && get_comment_author() == $the_author
! 					? ' authorcomment'
! 					: ''
! 				), 
! 				
! 				$id, // 3rd 4th and 5th %s, the comment id
! 				$id,
! 				$id,
! 				
! 				( // 6th %s, gravatar
! 					!get_option('mandigo_disable_comment_gravatars')
! 					? (
! 						function_exists('get_avatar') && function_exists('get_comment_author_email')
! 						? get_avatar(get_comment_author_email(), '36')
! 						: ''
! 					)
! 					: ''
! 				),
! 				
! 				sprintf( // 7th %s, the user name
! 					__('%s says:', 'mandigo'),
! 					get_comment_author_link()
! 				),
! 				
! 				( // 8th %s, whether the comment is pending moderation or not
! 					$comment->comment_approved == '0'
! 					? '<em>'. __('Your comment is awaiting moderation.', 'mandigo') .'</em><br />'
! 					: ''
! 				),
! 				
! 				$id, // 9th %s, the comment id again
! 				
! 				sprintf( // 10th %s, "which date at what time"
! 					__('%s at %s', 'mandigo'),
! 					get_comment_date(__('F jS, Y', 'mandigo')),
! 					get_comment_time()
! 				),
! 				
! 				( // 11th %s, the edit comment link, if appropriate
! 					function_exists('get_edit_comment_link') && current_user_can('edit_post', $post->ID)
! 					? ' - '. apply_filters(
! 						'edit_comment_link',
! 						'<a href="'. get_edit_comment_link($id) .'">'. __('Edit', 'mandigo') .'</a>',
! 						$comment->comment_ID
! 					)
! 					: ''
! 				),
! 				
! 				apply_filters('comment_text', get_comment_text()) // 11th %s, the comment itself
! 			); // end of big sprintf, phew!
! 
! 		
! 			// if this is a trackback
! 			if ($comment->comment_type == 'trackback') {
! 			
! 				// and we chose to not display them along regular comments
! 				if (get_option('mandigo_trackbacks') == 'above' || get_option('mandigo_trackbacks') == 'below') {
! 					// put them in a separate list
! 					$trackback_list[] = $comment_list_item;
! 				}
! 				
! 				// otherwise
! 				elseif (get_option('mandigo_trackbacks') == 'along') {
! 					$comment_list[] = $comment_list_item;
! 				}
! 			}
! 			
! 			else {
! 				$comment_list[] = $comment_list_item;
! 			}
  
! 		} // end of foreach loop
  
! 		// if we have trackbacks and we chose to display them above comments
! 		if (get_option('mandigo_trackbacks') == 'above' && $trackback_list) {
  ?>
  	<br />
! 	<div id="trackbacks"><?php _e('Trackbacks', 'mandigo'); ?></div> 
  	<ol class="commentlist">
! <?php
! 			echo implode("\n", $trackback_list);
! ?>
  	</ol>
! 	<div id="trackbacks"><?php _e('Comments', 'mandigo'); ?></div> 
! <?php
! 		}
! ?>
  
  	<ol class="commentlist">
! <?php
! 			echo implode("\n", $comment_list);
! ?>
  	</ol>
  
! <?php
! 		// if we have trackbacks and we chose to display them below comments
! 		if (get_option('mandigo_trackbacks') == 'below' && $trackback_list) {
! ?>
! 	<div id="trackbacks"><?php _e('Trackbacks', 'mandigo'); ?></div> 
  	<ol class="commentlist">
! <?php
! 			echo implode("\n", $trackback_list);
! ?>
  	</ol>
  <?php
! 		}
! 	
! 	}
! 	
! 	
! 	
! 	// this is displayed if there are no comments so far
! 	else {
! 
! 		// if comments are open (but there are no comments)
! 		if ($post->comment_status == 'open') {
! 		}
! 		
! 		// if comments are closed
! 		else {
  ?>
! 		<p class="nocomments"><?php _e('Comments are closed.', 'mandigo'); ?></p>
  
  <?php
! 		}
! 	} // end of 'whether there are comments or not' condition
  
! 	
! 	
! 	// if comments are open
! 	if ($post->comment_status == 'open') {
  ?>
  
! 	<div id="respond"><?php _e('Leave a Reply', 'mandigo'); ?></div>
  
! <?php
! 	// if only registered users can comment, and the current user is not logged in
! 	if (get_option('comment_registration') && !$user_ID) {
! ?>
! 	<p><?php _e('You must be logged in to post a comment.', 'mandigo'); ?> <a href="<?php echo get_option('siteurl'); ?>/wp-login.php?redirect_to=<?php the_permalink(); ?>"><?php _e('Login', 'mandigo'); ?> &raquo;</a></p>
! <?php
! 	}
  
! 	
! 	
! 	// if user can leave a comment
! 	else {
! ?>
  
! 	<form action="<?php echo get_option('siteurl'); ?>/wp-comments-post.php" method="post" id="commentform">
  
! <?php
! 		// if the user is logged in
! 		if ($user_ID) {
! ?>
  
! 	<p><?php printf(__('Logged in as %s', 'mandigo'),'<a href="'. get_option('siteurl') .'/wp-admin/profile.php">'. $user_identity .'</a>'); ?>. <a href="<?php echo get_option('siteurl'); ?>/wp-login.php?action=logout" title="<?php _e('Log out of this account', 'mandigo'); ?>"><?php _e('Logout', 'mandigo'); ?> &raquo;</a></p>
  
! <?php
! 		}
! 		
! 		// if the user is not logged in
! 		else {
! ?>
  
! 	<p><input type="text" name="author" id="author" value="<?php echo $comment_author; ?>" size="22" tabindex="1" />
! 	<label for="author"><small><?php _e('Name', 'mandigo'); ?> <?php if ($req) echo "(". __('required', 'mandigo') .")"; ?></small></label></p>
  
! 	<p><input type="text" name="email" id="email" value="<?php echo $comment_author_email; ?>" size="22" tabindex="2" />
! 	<label for="email"><small><?php _e('E-mail', 'mandigo'); ?> (<?php _e('will not be published', 'mandigo'); ?>) <?php if ($req) echo "(". __('required', 'mandigo') .")"; ?></small></label></p>
  
! 	<p><input type="text" name="url" id="url" value="<?php echo $comment_author_url; ?>" size="22" tabindex="3" />
! 	<label for="url"><small><?php _e('Website', 'mandigo'); ?></small></label></p>
  
! <?php
! 		}
  
! 		
! 		
! 		// if HTML tags are allowed in comments
! 		if (get_option('mandigo_xhtml_comments')) {
! ?>
! 	<p><small><strong>XHTML:</strong> <?php _e('You can use these tags:', 'mandigo'); ?> <?php echo allowed_tags(); ?></small></p>
! <?php
! 		}
! ?>
  
! 	<p><textarea name="comment" id="comment" cols="100%" rows="10" tabindex="4"></textarea></p>
  
- 	<p>
- 		<input name="submit" type="submit" id="submit" tabindex="5" value="<?php _e('Submit Comment', 'mandigo'); ?>" />
- 		<input type="hidden" name="comment_post_ID" value="<?php echo $post->ID; ?>" />
- 	</p>
- <?php
- 	do_action('comment_form', $post->ID);
- ?>
  </form>
  
! <?php
! 		} // end of 'whether the user is logged in or not' condition
! 	} // end of 'if comments are open' condition
! ?>
--- 1,144 ----
! <?php // Do not delete these lines
  	if ('comments.php' == basename($_SERVER['SCRIPT_FILENAME']))
  		die ('Please do not load this page directly. Thanks!');
  
!         if (!empty($post->post_password)) { // if there's a password
!             if ($_COOKIE['wp-postpass_' . COOKIEHASH] != $post->post_password) {  // and it doesn't match the cookie
! 				?>
  
! 				<p class="nocomments">This post is password protected. Enter the password to view comments.<p>
  
! 				<?php
! 				return;
!             }
!         }
! 
! 		/* This variable is for alternating comment background */
! 		$oddcomment = 'alt';
! 		$authorcomments = get_option('mandigo_author_comments');
! 		$the_author = get_the_author();
! $a = '';
  ?>
! 
! <!-- You can start editing here. -->
! 
! <?php if ($comments) : ?>
! 	<div id="comments"><?php comments_number(__('No Responses to ','mandigo'), __('One Response to ','mandigo'), __('% Responses to ','mandigo')); ?> &#8220;<?php the_title(); ?>&#8221;</div> 
  
  <?php
! 	foreach ($comments as $comment):
! 	$id = get_comment_ID();
! 	global $dirs;
! 	$comment_list_item = sprintf('
! 		<li class="%s%s" id="comment-%s">
! 			<span class="switch-post">
! 				<a href="javascript:toggleComment(%s);" id="switch-comment-%s"><img src="'. $dirs['www']['icons'] .'bullet_toggle_minus.png" alt="" class="png" /></a>
! 			</span>
! 			<cite>%s</cite>
! 			<div>
! 				%s<br />
! 				<small class="commentmetadata"><a href="#comment-%s">%s</a> %s</small>
! 				%s
! 			</div>
! 			</li>',
! 
! 		$oddcomment, ($authorcomments && get_comment_author() == $the_author ? ' authorcomment' : ''), $id,
! 		$id, $id,
! 		sprintf(__('%s says:','mandigo'),get_comment_author_link()),
! 		($comment->comment_approved == '0' ? '<em>'. __('Your comment is awaiting moderation.','mandigo') .'</em>' : ''),
! 		$id, sprintf(__('%s at %s','mandigo'),get_comment_date(__('F jS, Y','mandigo')),get_comment_time()), function_exists('get_edit_comment_link') && current_user_can( 'edit_post', $post->ID ) ? ' - '. apply_filters('edit_comment_link', '<a href="'. get_edit_comment_link($id) .'">'. __('Edit','mandigo') .'</a>', $comment->comment_ID) : '',
! 		apply_filters('comment_text', get_comment_text())
! 	);
! 
! 	if ($comment->comment_type == 'trackback'):
! 		if (get_option('mandigo_trackbacks') == 'above' || get_option('mandigo_trackbacks') == 'below'):
! 			$trackback_list .= $comment_list_item;
! 		elseif (get_option('mandigo_trackbacks') == 'along'):
! 			$comment_list   .= $comment_list_item;
! 		endif;
! 	else:
! 		$comment_list   .= $comment_list_item;
! 	endif;
  
! 	if ('alt' == $oddcomment) $oddcomment = '';
! 	else $oddcomment = 'alt';
  
! 	endforeach;
! 
! 	if (get_option('mandigo_trackbacks') == 'above' && $trackback_list):
  ?>
  	<br />
! 	<div id="trackbacks"><?php _e('Trackbacks','mandigo'); ?></div> 
  	<ol class="commentlist">
! 	<?php echo $trackback_list; ?>
  	</ol>
! 	<div id="trackbacks"><?php _e('Comments','mandigo'); ?></div> 
! <?php endif; ?>
  
  	<ol class="commentlist">
! 	<?php echo $comment_list; ?>
  	</ol>
  
! <?php if (get_option('mandigo_trackbacks') == 'below' && $trackback_list): ?>
! 	<div id="trackbacks"><?php _e('Trackbacks','mandigo'); ?></div> 
! 
  	<ol class="commentlist">
! 	<?php echo $trackback_list; ?>
  	</ol>
  <?php
! 		endif;
! 	else: // this is displayed if there are no comments so far
! 
! 		if ('open' == $post->comment_status): // If comments are open, but there are no comments.
! 		else : // if comments are closed
  ?>
! 		<p class="nocomments"><?php _e('Comments are closed.','mandigo'); ?></p>
  
  <?php
! 		endif;
! 	endif;
  
! 	if ('open' == $post->comment_status):
  ?>
  
! <div id="respond"><?php _e('Leave a Reply','mandigo'); ?></div>
  
! <?php if ( get_option('comment_registration') && !$user_ID ) : ?>
! <p><?php _e('You must be logged in to post a comment.','mandigo'); ?> <a href="<?php echo get_option('siteurl'); ?>/wp-login.php?redirect_to=<?php the_permalink(); ?>"><?php _e('Login','mandigo'); ?> &raquo;</a></p>
! <?php else : ?>
  
! <form action="<?php echo get_option('siteurl'); ?>/wp-comments-post.php" method="post" id="commentform">
  
! <?php if ( $user_ID ) : ?>
  
! <p><?php printf(__('Logged in as %s','mandigo'),'<a href="'. get_option('siteurl') .'/wp-admin/profile.php">'. $user_identity .'</a>'); ?>. <a href="<?php echo get_option('siteurl'); ?>/wp-login.php?action=logout" title="<?php _e('Log out of this account','mandigo'); ?>"><?php _e('Logout','mandigo'); ?> &raquo;</a></p>
  
! <?php else : ?>
  
! <p><input type="text" name="author" id="author" value="<?php echo $comment_author; ?>" size="22" tabindex="1" />
! <label for="author"><small><?php _e('Name','mandigo'); ?> <?php if ($req) echo "(". __('required','mandigo') .")"; ?></small></label></p>
  
! <p><input type="text" name="email" id="email" value="<?php echo $comment_author_email; ?>" size="22" tabindex="2" />
! <label for="email"><small><?php _e('E-mail','mandigo'); ?> (<?php _e('will not be published','mandigo'); ?>) <?php if ($req) echo "(". __('required','mandigo') .")"; ?></small></label></p>
  
! <p><input type="text" name="url" id="url" value="<?php echo $comment_author_url; ?>" size="22" tabindex="3" />
! <label for="url"><small><?php _e('Website','mandigo'); ?></small></label></p>
  
! <?php endif; ?>
  
! <?php if (get_option('mandigo_xhtml_comments')): ?>
! <p><small><strong>XHTML:</strong> <?php _e('You can use these tags:','mandigo'); ?> <?php echo allowed_tags(); ?></small></p>
! <?php endif; ?>
  
! <p><textarea name="comment" id="comment" cols="100%" rows="10" tabindex="4"></textarea></p>
  
! <p><input name="submit" type="submit" id="submit" tabindex="5" value="<?php _e('Submit Comment','mandigo'); ?>" />
! <input type="hidden" name="comment_post_ID" value="<?php echo $post->ID; ?>" />
! </p>
! <?php do_action('comment_form', $post->ID); ?>
  
  </form>
  
! <?php endif; // If registration required and not logged in ?>
! 
! <?php endif; // if you delete this the sky will fall on your head ?>
diff -rc mandigo-1.33/footer.php mandigo-1.32/footer.php
*** mandigo-1.33/footer.php	2008-04-27 17:20:08.000000000 -0400
--- mandigo-1.32/footer.php	2008-03-09 14:47:33.000000000 -0400
***************
*** 1,68 ****
! <?php
! 	/*
  
! 		Hi,
  
! 		Please DO NOT remove the link to my website from the footer. I have
! 		been working hard to make this theme and you have downloaded it for
! 		FREE. This is all I ask from you in return for Mandigo which didn't
! 		cost you a cent.
  
! 		Thank you.
  
! 		tom
  
! 	*/
  
! 	global $dirs, $wpmu;
  ?>
  </tr>
  </table>
! <?php
! 	// HTML Inserts: footer
! 	echo get_option('mandigo_inserts_footer');
! ?>
  </div>
- 
  <div id="footer" class="png">
  	<p>
! <?php
! 	// if this is WordPress MU
! 	if ($wpmu) {
! 		$current_site = get_current_site();
! ?>
! 		<?php _e('Powered by <a href="http://mu.wordpress.org/">WordPress MU</a>', 'mandigo'); ?> &amp; hosted by <a href="http://<?php echo $current_site->domain . $current_site->path ?>"><?php echo $current_site->site_name ?></a>, <a href="http://www.onehertz.com/portfolio/wordpress/" target="_blank" title="WordPress themes">Mandigo theme</a> by tom.
  
! <?php
! 	}
! 	
! 	// if this is a regular WordPress
! 	else {
! ?>
! 		<?php _e('Powered by <a href="http://wordpress.org/">WordPress</a>', 'mandigo'); ?>, <a href="http://www.onehertz.com/portfolio/wordpress/" target="_blank" title="WordPress themes">Mandigo theme</a> by tom.
  
! <?php
! 	}
! ?>
! 		<br /><a href="<?php bloginfo('rss2_url'); ?>"><img src="<?php echo $dirs['www']['scheme']; ?>images/rss_s.gif" alt="" /> <?php _e('Entries (RSS)', 'mandigo'); ?></a>
! 		<?php _e('and', 'mandigo'); ?> <a href="<?php bloginfo('comments_rss2_url'); ?>"><img src="<?php echo $dirs['www']['scheme']; ?>images/rss_s.gif" alt="" /> <?php _e('Comments (RSS)', 'mandigo'); ?></a>.
! <?php
! 	// if we chose to display statistics at the bottom
! 	if (get_option('mandigo_footer_stats')) {
! ?>
  		<br /><?php echo get_num_queries(); ?> queries. <?php timer_stop(1); ?> seconds.
! <?php
! 	}
! ?>
  	</p>
  </div>
  </div>
  
  <?php
- 	// WordPress footer
  	wp_footer();
  
- 	// get the expected max-width value for the content column
  	if (get_option('mandigo_1024')) {
  		if (get_option('mandigo_3columns')) {
  			$maxw = 455;
--- 1,45 ----
! <?php /*
  
!   Hi,
  
!   Please DO NOT remove the link to my website from the footer. I have
!   been working hard to make this theme and you have downloaded it for
!   FREE. This is all I ask from you in return for Mandigo which didn't
!   cost you a cent.
  
!   Thank you.
  
!   tom
  
! */
  
!   global $dirs, $wpmu;
  ?>
  </tr>
  </table>
! <?php echo get_option('mandigo_inserts_footer'); ?>
  </div>
  <div id="footer" class="png">
  	<p>
! <?php if ($wpmu): $current_site = get_current_site(); ?>
! 		<?php _e('Powered by <a href="http://mu.wordpress.org/">WordPress MU</a>','mandigo'); ?> &amp; hosted by <a href="http://<?php echo $current_site->domain . $current_site->path ?>"><?php echo $current_site->site_name ?></a>, <a href="http://www.onehertz.com/portfolio/wordpress/" target="_blank" title="WordPress themes">Mandigo theme</a> by tom.
  
! <?php else: ?>
! 		<?php _e('Powered by <a href="http://wordpress.org/">WordPress</a>','mandigo'); ?>, <a href="http://www.onehertz.com/portfolio/wordpress/" target="_blank" title="WordPress themes">Mandigo theme</a> by tom.
  
! <?php endif; ?>
! 		<br /><a href="<?php bloginfo('rss2_url'); ?>"><img src="<?php echo $dirs['www']['scheme']; ?>images/rss_s.gif" alt="" /> <?php _e('Entries (RSS)','mandigo'); ?></a>
! 		<?php _e('and','mandigo'); ?> <a href="<?php bloginfo('comments_rss2_url'); ?>"><img src="<?php echo $dirs['www']['scheme']; ?>images/rss_s.gif" alt="" /> <?php _e('Comments (RSS)','mandigo'); ?></a>.
! 		<?php if (get_option('mandigo_footer_stats')): ?>
  		<br /><?php echo get_num_queries(); ?> queries. <?php timer_stop(1); ?> seconds.
! 		<?php endif; ?>
  	</p>
  </div>
  </div>
  
  <?php
  	wp_footer();
  
  	if (get_option('mandigo_1024')) {
  		if (get_option('mandigo_3columns')) {
  			$maxw = 455;
***************
*** 80,256 ****
  
  <script type="text/javascript">
  <!-- // <![CDATA[
! 
! 	jQuery(document).ready(function() {
! 		jQuery('#rssicon, #searchsubmit').hover(
! 			function() { this.src = this.src.replace('.gif','_hover.gif'); },
! 			function() { this.src = this.src.replace('_hover.gif','.gif'); }
! 		);
! 
! 		if (jQuery.browser.msie) {
! 			if (/^[56]/.test(jQuery.browser.version)) {
! 				jQuery.ifixpng('<?php echo $dirs['www']['images']; ?>1x1.gif');
! 				jQuery('body, .png').ifixpng();
  			}
! 			jQuery('.entry object, .entry img').load(function() {
! 				o = jQuery(this);
! 				if (o.width() > 300) { // dont bother resizing below this width
! 					d = parseInt(o.css('padding-left')      )
! 					  + parseInt(o.css('padding-right')     )
! 					  + parseInt(o.css('margin-left')       )
! 					  + parseInt(o.css('margin-right')      )
! 					  + parseInt(o.css('border-left-width') )
! 					  + parseInt(o.css('border-right-width'));
! 					if (o.width() > <?php echo $maxw; ?>-d) o.width(<?php echo $maxw; ?>-d);
! 				}
! 			});
! 
! <?php
! 	// if the 'pre whitespace' fix is enabled
! 	if (get_option('mandigo_fixes_whitespace_pre')) {
! ?>
! 			jQuery('*').each(function() { if (this.style.whiteSpace == 'pre') jQuery(this).css({'white-space':'normal'}); });
! <?php
! 	}
! ?>
! 		}
  
! <?php
! 	// if the 'strip url in comments' fix is enabled
! 	if (get_option('mandigo_fixes_comments_1')) {
! ?>
! 		jQuery('.commentlist p a').each(function() { if (jQuery(this).width() > <?php echo $maxw; ?>) jQuery(this).text(this.innerHTML.replace(/\/([^\/])/g,'/\n$1')); });
! <?php
  	}
- 	
- 	// if the 'replace url in comments' fix is enabled
- 	if (get_option('mandigo_fixes_comments_2')) {
- ?>
- 		jQuery('.commentlist p a').each(function() { if (jQuery(this).width() > <?php echo $maxw; ?>) jQuery(this).text('link'); });
- <?php
- 	}
- 
- 	// unless we disabled animations
- 	if (!get_option('mandigo_no_animations')) {
- 		// if we chose to collapse all posts by default
- 		if (get_option('mandigo_collapse_posts')) {
- ?>
- 		jQuery('.entry').hide();
- <?php
- 		}
- ?>
- 		togglePost = function(id) {
- 			if (!id) return;
- 			icon = jQuery('#switch-post-'+ id +' img');
- 			icon.attr('src', /minus/.test(icon.attr('src')) ? icon.attr('src').replace('minus', 'plus') : icon.attr('src').replace('plus', 'minus'));
- 			jQuery('#post-'+ id +' .entry').animate({ height: 'toggle', opacity: 'toggle' }, 1000);
- 		}
- 
- 		toggleComment = function(id) {
- 			if (!id) return;
- 			icon = jQuery('#switch-comment-'+ id +' img');
- 			icon.attr('src', /minus/.test(icon.attr('src')) ? icon.attr('src').replace('minus', 'plus') : icon.attr('src').replace('plus', 'minus'));
- 			jQuery('#comment-'+ id +' div').animate({ height: 'toggle', opacity: 'toggle' }, 1000);
- 		}
- 
- 		toggleSidebars = function() {
- 			icon = jQuery('.switch-sidebars img');
- 			icon.attr('src', /hide/.test(icon.attr('src')) ? icon.attr('src').replace('hide', 'show') : icon.attr('src').replace('show', 'hide'));
- 			jQuery('.sidebars').animate({ width: 'toggle', height: 'toggle', padding: 'toggle', border: 'toggle' }, 1000);
- 		}
  
  <?php /* there's also "#wp-calendar caption", but it doesn't work too well */ ?>
! 		jQuery('.widgettitle, .linkcat *:first, .wpg2blockwidget h3').click(function() {
! 			jQuery(this).siblings().animate({ height: 'toggle', opacity: 'toggle' }, 1000);
! 		}).css({cursor: 'n-resize'});
! <?php
! 	} // end of 'unless animations are disabled' condition
! 
! 
! 
! 	// if we chose to apply a drop shadow to blog name & description
! 	if (get_option('mandigo_drop_shadow')) {
! ?>
! 		jQuery('#blogname').after('<span class="blogname text-shadow">'+ jQuery('#blogname a').html() +"<\/span>");
! 		jQuery('#blogdesc').after('<span class="blogdesc text-shadow">'+ jQuery('#blogdesc'  ).html() +'<\/span>');
! <?php
! 	}
! 
! 	
! 	
! 	// if we chose to apply a text stroke to blog name & description
! 	if (get_option('mandigo_stroke')) {
! ?>
! 		jQuery.each(['tl','tr','bl','br'],function() {
! 			jQuery('#blogname').after('<span class="blogname text-stroke-'+ this +'">'+ jQuery('#blogname a').html() +'<\/span>');
! 			jQuery('#blogdesc').after('<span class="blogdesc text-stroke-'+ this +'">'+ jQuery('#blogdesc'  ).html() +'<\/span>');
! 		});
! <?php
! 	}
! 
  
! 	
! 	// if sidebar1 should go to the left
! 	if (get_option('mandigo_sidebar1_left')) {
! ?>
! 		t = jQuery('#sidebar1').clone();
! 		jQuery('#sidebar1').remove();
! 		jQuery('td#content').before(t);
! <?php
! 	}
! 	
! 	
! 	
! 	// if sidebar2 should go to the left
! 	if (get_option('mandigo_sidebar2_left')) {
! ?>
! 		t = jQuery('#sidebar2').clone();
! 		jQuery('#sidebar2').remove();
! 		jQuery('td#content').before(t);
! <?php
! 	}
! 	
! 	
! 	
! 	// if the 'touch content' fix is enabled
! 	if (get_option('mandigo_fixes_touch_content')) {
! ?>
! 		jQuery('#content').css({verticalAlign:'top'});
! 		window.onLoad = function() { jQuery('#content').css({verticalAlign:'top'}); }
! <?php
  	}
! ?>
  
- 		jQuery('#header .page_item').hover(
- 			function() {
- 				a  = jQuery(this).find('a' );
- 				ul = jQuery(this).find('ul');
- 				y = a.position().top + a.height();
- <?php
- 	// this applies the same alignment as the top navigation items to submenus 
- 	if ($mandigo_headnav_alignment == 'left') {
- ?>
- 				x = a.position().left;
- <?php
- 	}
- 	elseif ($mandigo_headnav_alignment == 'right') {
- ?>
- 				x = a.position().left + a.width() - ul.width();
- <?php
- 	}
- 	else {
- ?>
- 				x = a.position().left + a.width() / 2 - ul.width() / 2;
- <?php
- 	}
- ?>
- 				ul.css({left:x, top:y}).slideDown().css({zIndex:999});
- 			},
- 			function() {
- 				jQuery(this).find('ul').hide();
- 			}
- 		);
- 	});
  // ]]> -->
  </script>
  </body>
--- 57,174 ----
  
  <script type="text/javascript">
  <!-- // <![CDATA[
! 	jQuery('#rssicon, #searchsubmit').hover(
! 		function() { this.src = this.src.replace('.gif','_hover.gif'); },
! 		function() { this.src = this.src.replace('_hover.gif','.gif'); }
! 	);
! 
! 	if (jQuery.browser.msie) {
! 		if (/^[56]/.test(jQuery.browser.version)) {
! 			jQuery.ifixpng('<?php echo $dirs['www']['images']; ?>1x1.gif');
! 			jQuery('body, .png').ifixpng();
! 		}
! 		jQuery('.entry object, .entry img').load(function() {
! 			o = jQuery(this);
! 			if (o.width() > 300) { // dont bother resizing below this width
! 				d = parseInt(o.css('padding-left')      )
! 				  + parseInt(o.css('padding-right')     )
! 				  + parseInt(o.css('margin-left')       )
! 				  + parseInt(o.css('margin-right')      )
! 				  + parseInt(o.css('border-left-width') )
! 				  + parseInt(o.css('border-right-width'));
! 				if (o.width() > <?php echo $maxw; ?>-d) o.width(<?php echo $maxw; ?>-d);
  			}
! 		});
  
! <?php if (get_option('mandigo_fixes_whitespace_pre')): ?>
! 		jQuery('*').each(function() { if (this.style.whiteSpace == 'pre') jQuery(this).css({'white-space':'normal'}); });
! <?php endif; ?>
! 	}
! 
! <?php if (get_option('mandigo_fixes_comments_1')): ?>
! 	jQuery('.commentlist p a').each(function() { if (jQuery(this).width() > <?php echo $maxw; ?>) jQuery(this).text(this.innerHTML.replace(/\/([^\/])/g,'/\n$1')); });
! <?php endif; ?>
! <?php if (get_option('mandigo_fixes_comments_2')): ?>
! 	jQuery('.commentlist p a').each(function() { if (jQuery(this).width() > <?php echo $maxw; ?>) jQuery(this).text('link'); });
! <?php endif; ?>
! <?php if (!get_option('mandigo_no_animations')): ?>
! 	<?php if (get_option('mandigo_collapse_posts')): ?>
! 	jQuery('.entry').hide();
! 	<?php endif; ?>
! 	togglePost = function(id) {
! 		if (!id) return;
! 		icon = jQuery('#switch-post-'+ id +' img');
! 		icon.attr('src', /minus/.test(icon.attr('src')) ? icon.attr('src').replace('minus', 'plus') : icon.attr('src').replace('plus', 'minus'));
! 		jQuery('#post-'+ id +' .entry').animate({ height: 'toggle', opacity: 'toggle' }, 1000);
! 	}
! 
! 	toggleComment = function(id) {
! 		if (!id) return;
! 		icon = jQuery('#switch-comment-'+ id +' img');
! 		icon.attr('src', /minus/.test(icon.attr('src')) ? icon.attr('src').replace('minus', 'plus') : icon.attr('src').replace('plus', 'minus'));
! 		jQuery('#comment-'+ id +' div').animate({ height: 'toggle', opacity: 'toggle' }, 1000);
! 	}
! 
! 	toggleSidebars = function() {
! 		icon = jQuery('.switch-sidebars img');
! 		icon.attr('src', /hide/.test(icon.attr('src')) ? icon.attr('src').replace('hide', 'show') : icon.attr('src').replace('show', 'hide'));
! 		jQuery('.sidebars').animate({ width: 'toggle', height: 'toggle', padding: 'toggle', border: 'toggle' }, 1000);
  	}
  
  <?php /* there's also "#wp-calendar caption", but it doesn't work too well */ ?>
! 	jQuery('.widgettitle, .linkcat *:first, .wpg2blockwidget h3').click(function() {
! 		jQuery(this).siblings().animate({ height: 'toggle', opacity: 'toggle' }, 1000);
! 	}).css({cursor: 'n-resize'});
! <?php endif; ?>
! 
! <?php if (get_option('mandigo_drop_shadow')): ?>
! 	jQuery('#blogname').after('<span class="blogname text-shadow">'+ jQuery('#blogname a').html() +"<\/span>");
! 	jQuery('#blogdesc').after('<span class="blogdesc text-shadow">'+ jQuery('#blogdesc'  ).html() +'<\/span>');
! <?php endif; ?>
! 
! <?php if (get_option('mandigo_stroke')): ?>
! 	jQuery.each(['tl','tr','bl','br'],function() {
! 		jQuery('#blogname').after('<span class="blogname text-stroke-'+ this +'">'+ jQuery('#blogname a').html() +'<\/span>');
! 		jQuery('#blogdesc').after('<span class="blogdesc text-stroke-'+ this +'">'+ jQuery('#blogdesc'  ).html() +'<\/span>');
! 	});
! <?php endif; ?>
  
! <?php if (get_option('mandigo_sidebar1_left')): ?>
! 	t = jQuery('#sidebar1').clone();
! 	jQuery('#sidebar1').remove();
! 	jQuery('td#content').before(t);
! <?php endif; ?>
! 
! <?php if (get_option('mandigo_sidebar2_left')): ?>
! 	t = jQuery('#sidebar2').clone();
! 	jQuery('#sidebar2').remove();
! 	jQuery('td#content').before(t);
! <?php endif; ?>
! 
! <?php if (get_option('mandigo_fixes_touch_content')): ?>
! 	jQuery('#content').css({verticalAlign:'top'});
! 	window.onLoad = function() { jQuery('#content').css({verticalAlign:'top'}); }
! <?php endif; ?>
! 
! jQuery('#header .page_item').hover(
! 	function() {
! 		a  = jQuery(this).find('a' );
! 		ul = jQuery(this).find('ul');
! 		y = a.position().top + a.height();
! 		<?php if ($mandigo_headnav_alignment == 'left'): ?>
! 		x = a.position().left;
! 		<?php elseif ($mandigo_headnav_alignment == 'right'): ?>
! 		x = a.position().left + a.width() - ul.width();
! 		<?php else: ?>
! 		x = a.position().left + a.width() / 2 - ul.width() / 2;
! 		<?php endif; ?>
! 		ul.css({left:x, top:y}).slideDown();
! 	},
! 	function() {
! 		jQuery(this).find('ul').hide();
  	}
! );
  
  // ]]> -->
  </script>
  </body>
diff -rc mandigo-1.33/functions.php mandigo-1.32/functions.php
*** mandigo-1.33/functions.php	2008-04-27 17:20:08.000000000 -0400
--- mandigo-1.32/functions.php	2008-03-09 14:47:33.000000000 -0400
***************
*** 1,507 ****
  <?php
! 	// this loads the .mo translation file defined in wp-config.php
! 	load_theme_textdomain('mandigo');
  
! 	// directories
! 	// we are going to hold a list of both local ('loc') and remote paths ('www'), which we will need throughout the theme
! 	$dirs = array();
! 	$dirs['loc']['theme'] = TEMPLATEPATH .'/';
! 	$dirs['www']['theme'] = get_bloginfo('template_directory') .'/';
! 
! 	foreach (array('loc', 'www') as $i) {
! 		foreach(
! 			array(
! 				'images',
! 				'js',
! 				'schemes',
! 				'images/patterns',
! 				'images/headers',
! 				'images/icons'
! 			) as $j
! 		) {
! 			$dirs[$i][preg_replace('/.+\//', '', $j)] = $dirs[$i]['theme'] . $j .'/';
! 		}
! 	}
! 
! 	// go through the images/schemes/ folder and build a list of installed schemes
! 	$schemes = array();
! 	if (($dir = opendir($dirs['loc']['schemes'])) !== false) {
! 		while (($node = readdir($dir)) !== false) {
! 			if (!preg_match('/^\.{1,2}$/', $node) && file_exists($dirs['loc']['schemes'] ."$node/scheme.css"))
! 				$schemes[] = $node;
! 		}
! 	}
! 	sort($schemes);
! 
! 	// Set default values
! 	if (!get_option('mandigo_scheme') || !array_search(get_option('mandigo_scheme'), $schemes)) update_option('mandigo_scheme', $schemes[0]);
! 	if (!get_option('mandigo_bgcolor'              )) update_option('mandigo_bgcolor'              ,'#44484F');
! 	if (!get_option('mandigo_wp_repeat'            )) update_option('mandigo_wp_repeat'            ,'repeat' );
! 
! 	if (!get_option('mandigo_title_scheme_index'   )) update_option('mandigo_title_scheme_index'   ,'%blogname% - %tagline%');
! 	if (!get_option('mandigo_title_scheme_single'  )) update_option('mandigo_title_scheme_single'  ,'%blogname% &raquo; %post%');
! 	if (!get_option('mandigo_title_scheme_page'    )) update_option('mandigo_title_scheme_page'    ,'%blogname% &raquo; %post%');
! 	if (!get_option('mandigo_title_scheme_category')) update_option('mandigo_title_scheme_category','%blogname% &raquo; Archive for %category%');
! 	if (!get_option('mandigo_title_scheme_date'    )) update_option('mandigo_title_scheme_date'    ,'%blogname% &raquo; Archive for %date%');
! 	if (!get_option('mandigo_title_scheme_search'  )) update_option('mandigo_title_scheme_search'  ,'%blogname% &raquo; Search Results for &quot;%search%&quot;');
! 
! 	if (!get_option('mandigo_tag_blogname'         )) update_option('mandigo_tag_blogname'         ,'h1');
! 	if (!get_option('mandigo_tag_blogdesc'         )) update_option('mandigo_tag_blogdesc'         ,'h6');
! 	if (!get_option('mandigo_tag_posttitle_multi'  )) update_option('mandigo_tag_posttitle_multi'  ,'h3');
! 	if (!get_option('mandigo_tag_posttitle_single' )) update_option('mandigo_tag_posttitle_single' ,'h2');
! 	if (!get_option('mandigo_tag_pagetitle'        )) update_option('mandigo_tag_pagetitle'        ,'h2');
! 	if (!get_option('mandigo_tag_sidebar'          )) update_option('mandigo_tag_sidebar'          ,'h4');
! 
! 	if (!get_option('mandigo_posts_bgcolor'        )) update_option('mandigo_posts_bgcolor'        ,'#FAFAFA');
! 	if (!get_option('mandigo_posts_bdcolor'        )) update_option('mandigo_posts_bdcolor'        ,'#EEEEEE');
! 	if (!get_option('mandigo_sidebars_bgcolor'     )) update_option('mandigo_sidebars_bgcolor'     ,'#EEEEEE');
! 	if (!get_option('mandigo_sidebars_bdcolor'     )) update_option('mandigo_sidebars_bdcolor'     ,'#DDDDDD');
! 
! 	if (!get_option('mandigo_trackbacks'           )) update_option('mandigo_trackbacks'           ,(get_option('mandigo_trackbacks_after') ? 'below' : 'along'));
! 	if (!get_option('mandigo_headnav_alignment'    )) update_option('mandigo_headnav_alignment'    ,(get_option('mandigo_headnav_left') ? 'left' : 'right'));
! 	if (!get_option('mandigo_date_format'          )) update_option('mandigo_date_format'          ,(get_option('mandigo_dates') ? 'dmY' : 'MdY'));
! 
! 	// some global vars
! 	$ie      = preg_match("/MSIE [4-6]/", $_SERVER['HTTP_USER_AGENT']);
! 	$ie7     = preg_match("/MSIE 7/",     $_SERVER['HTTP_USER_AGENT']);
! 	$wpmu    = function_exists('is_site_admin');
! 	
! 	// now that we have a current scheme, set its local and remote locations
! 	$dirs['loc']['scheme'] = $dirs['loc']['schemes'] . get_option('mandigo_scheme') .'/';
! 	$dirs['www']['scheme'] = $dirs['www']['schemes'] . get_option('mandigo_scheme') .'/';
! 
! 	// if wp supports widgets, register the sidebars
! 	if (function_exists('register_sidebar')) {
! 		$tag_sidebar = get_option('mandigo_tag_sidebar');
! 		// sidebar #1
! 		register_sidebar(
! 			array(
! 				'before_title' => "<$tag_sidebar class=\"widgettitle\">",
! 				'after_title'  => "</$tag_sidebar>\n",
! 			)
! 		);
! 		
! 		// sidebar #2
! 		register_sidebar(
! 			array(
! 				'before_title' => "<$tag_sidebar class=\"widgettitle\">",
! 				'after_title'  => "</$tag_sidebar>\n",
! 			)
! 		);
! 
! 		// top sidebar
! 		register_sidebar(
! 			array(
! 				'before_title' => "<$tag_sidebar class=\"widgettitle\">",
! 				'after_title'  => "</$tag_sidebar>\n",
! 				'name'         => 'Mandigo Top',
! 			)
! 		);
! 
! 		// bottom sidebar
! 		register_sidebar(
! 			array(
! 				'before_title' => "<$tag_sidebar class=\"widgettitle\">",
! 				'after_title'  => "</$tag_sidebar>\n",
! 				'name'         => 'Mandigo Bottom',
! 			)
! 		);
! 	}
  
  
  
  
  
! 	/* -------------------------------------------------
! 				  SEARCH WIDGET
! 	-------------------------------------------------- */
! 	// define the widget
! 	function widget_mandigo_search() {
! 		global $tag_sidebar;
  ?>
  			<li><<?php echo $tag_sidebar; ?> class="widgettitle"><?php _e('Search','mandigo'); ?></<?php echo $tag_sidebar; ?>>
  				<?php include(TEMPLATEPATH . '/searchform.php'); ?>
  			</li>
  <?php
! 	}
! 	
! 	// if wp supports widgets, register it (make it available)
! 	if (function_exists('register_sidebar_widget'))
! 		register_sidebar_widget('Search', 'widget_mandigo_search');
  
  
  
  
  
! 	/* -------------------------------------------------
! 					CALENDAR WIDGET
! 	-------------------------------------------------- */
! 	// define the widget
! 	function widget_mandigo_calendar() {
! 		global $tag_sidebar;
  ?>
  			<li><<?php echo $tag_sidebar; ?> class="widgettitle">&nbsp;</<?php echo $tag_sidebar; ?>>
  				<?php get_calendar(); ?>
  			</li>
  <?php
! 	}
! 	// if wp supports widgets, register it (make it available)
! 	if (function_exists('register_sidebar_widget'))
! 		register_sidebar_widget('Calendar', 'widget_mandigo_calendar');
  
  
  
  
  
! 	/* -------------------------------------------------
! 					   META WIDGET
! 	-------------------------------------------------- */
! 	// define the widget
! 	function widget_mandigo_meta() {
! 		global $dirs, $tag_sidebar, $wpmu;
! 		
! 		// if the meta widget was given a custom name, it will be fetched from this variable
! 		$options = get_option('widget_meta');
  ?>
! 				<li>
! 					<<?php echo $tag_sidebar; ?> class="widgettitle"><?php echo ($options['title'] ? $options['title'] : __('Meta','mandigo')); ?></<?php echo $tag_sidebar; ?>>
! 
! 					<span id="rss">
! 						<a href="<?php bloginfo('rss2_url'); ?>" title="RSS feed for <?php bloginfo('name'); ?>"><img src="<?php echo $dirs['www']['scheme']; ?>/images/rss_l.gif" alt="Entries (RSS)" id="rssicon" /></a>
! 					</span>
! 
! 					<ul>
! 						<?php wp_register(); ?>
! 						<li><?php wp_loginout(); ?></li>
  <?php
  
  
- 		// if this is WordPress MU
- 		if ($wpmu) {
- ?>
- 						<li><a href="http://mu.wordpress.org/" title="Powered by WordPress MU, state-of-the-art semantic personal publishing platform.">WordPress MU</a></li>
- <?php
- 		}
- 		
- 		// if this is the regular WordPress
- 		else {
- ?>
- 						<li><a href="http://wordpress.org/" title="Powered by WordPress, state-of-the-art semantic personal publishing platform.">WordPress</a></li>
- <?php
- 		}
- 		
- 		
- ?>
- 						<li><a href="http://www.onehertz.com/portfolio/wordpress/" title="More WordPress themes by the same author" target="_blank">Mandigo theme</a></li>
- 						<?php wp_meta(); ?>
- 					</ul>
- 				</li>
- <?php
- 	}
- 	// if wp supports widgets, register it (make it available)
- 	if (function_exists('register_sidebar_widget'))
- 		register_sidebar_widget('Meta', 'widget_mandigo_meta');
  
  
  
- 	// this function will build links to author archives for us
- 	function mandigo_author_link($author_id, $author_nicename) {
- 	
- 		// I'm not sure why, but the get_author_posts_url() function is undefined in some translated versions of WP
- 		// so we double check it exists
- 		if (function_exists('get_author_posts_url')) {
- 			return sprintf(
- 				'<a href="%s" title="%s">%s</a>',
- 				get_author_posts_url($author_id),
- 				sprintf(
- 					__("Posts by %s"),
- 					attribute_escape($author_nicename)
- 				),
- 				$author_nicename
- 			);
- 		}
- 		return $author_nicename;
- 	}
  
- 	
- 	
- 	// this one build the 'date stamps'
- 	function mandigo_date_icon($date) {
- 		// split the supplied argument into (year, month_name, month_number, day)
- 		list($y, $mn, $m, $d) = explode(' ', $date);
- 		
- 		switch (get_option('mandigo_date_format')) {
- 			case 'MdY':
- 				$l = array($mn, $d, $y);
- 				$x = array(1, 0, 0);
- 				break;
- 			case 'dmY':
- 				$l = array($d,  $m, $y);
- 				$x = array(1, 0, 0);
- 				break;
- 		}
- 		
- 		echo '
- 						<div class="datestamp">
- 							<div>
- 								<span class="cal1'. ($x[0] ? " cal1x" : "") .'">'. $l[0] .'</span>
- 								<span class="cal2'. ($x[1] ? " cal2x" : "") .'">'. $l[1] .'</span>
- 								<span class="cal3'. ($x[2] ? " cal3x" : "") .'">'. $l[2] .'</span>
- 							</div>
- 						</div>
- 		';
- 	}
- 
- 
- 
- 	// add the links to the theme options pages, and required files
- 	add_action('admin_menu', 'add_mandigo_options_page');
- 	add_action('admin_menu', 'add_mandigo_inserts_page');
- 	add_action('admin_menu', 'add_mandigo_readme_page');
- 	add_action('admin_menu', 'add_mandigo_farbtastic_js');
- 	add_action('admin_head', 'add_mandigo_options_css');
- 	add_action('admin_head', 'add_mandigo_farbtastic_css');
- 
- 	// the functions that load the theme options and readme pages
- 	function add_mandigo_options_page() {
- 		global $dirs;
- 		add_theme_page(
- 			'Theme Options',
- 			'<img src="'. $dirs['www']['images'] .'/attention_catcher.png" alt="" /> Theme Options',
- 			'edit_themes',
- 			basename(__FILE__),
- 			'mandigo_options_page'
- 		);
- 	}
-   	function add_mandigo_inserts_page() {
- 		global $dirs;
- 		add_theme_page(
- 			'HTML Inserts',
- 			'<img src="'. $dirs['www']['images'] .'/attention_catcher.png" alt="" /> HTML Inserts',
- 			'edit_themes',
- 			'Inserts',
- 			'mandigo_inserts_page'
- 		);
- 	}
- 	function add_mandigo_readme_page()  {
- 		add_theme_page(
- 			'README',
- 			'README',
- 			'switch_themes',
- 			'README',
- 			'mandigo_readme_page'
- 		);
- 	}
- 	function add_mandigo_options_css() {
- 		global $dirs;
- 		echo '<link rel="stylesheet" type="text/css" href="'. $dirs['www']['theme'] .'options.css" />';
- 	}
- 
- 	// these two functions include the required files for the colorpicker to work
- 	function add_mandigo_farbtastic_js() {
- 		global $dirs;
- 		wp_enqueue_script('jquery',     $dirs['www']['theme'] .'js/jquery.js');
- 		wp_enqueue_script('farbtastic', $dirs['www']['theme'] .'js/farbtastic.js');
- 	}
- 	function add_mandigo_farbtastic_css() {
- 		global $dirs;
- 		echo '<link rel="stylesheet" type="text/css" href="'. $dirs['www']['theme'] .'farbtastic.css" />';
- 	}
- 
- 	// a few functions to help us with redundant work
- 	function mandigo_set_var($var, $value) {
- 		update_option('mandigo_'. $var, $value);
- 	}
- 	// this one validate hex color codes
- 	function mandigo_color($value, $default) { 
- 		if (!preg_match("/^#/", $value))
- 			$value = '#'. $value;
- 		if (!preg_match("/^#([0-9A-F]{3}){1,2}$/i", $value))
- 			$value = $default;
- 		return $value;
- 	}
- 	// this one escapes strings
- 	function mandigo_escape($string) {
- 		$string = str_replace('\\"','&#34;', $string);
- 		$string = str_replace("\\'",'&#39;', $string);
- 		return $string;
- 	}
  
- 	
- 	
- 	// the BIG page
- 	function mandigo_options_page() {
- 		global $dirs, $schemes;
- 
- 		$ct = current_theme_info();
- 
- 		// process the submitted form if any, prior to displaying the options page
- 		if (isset($_POST['updated'])) {
- 			// build an array of pages to exclude
- 			$exclude[] = '';
- 			foreach ($_POST as $field => $value) {
- 				if (preg_match("/exclude_(\d+)/", $field, $id))
- 					$exclude[] = $id[1];
- 			}
- 			
- 			mandigo_set_var('exclude_pages'             ,implode(",",$exclude)          );
- 			mandigo_set_var('bgcolor'                   ,mandigo_color($_POST['bgcolor']         ,'#44484F'));
- 			mandigo_set_var('posts_bgcolor'             ,mandigo_color($_POST['posts_bgcolor']   ,'#FAFAFA'));
- 			mandigo_set_var('posts_bdcolor'             ,mandigo_color($_POST['posts_bdcolor']   ,'#EEEEEE'));
- 			mandigo_set_var('sidebars_bgcolor'          ,mandigo_color($_POST['sidebars_bgcolor'],'#EEEEEE'));
- 			mandigo_set_var('sidebars_bdcolor'          ,mandigo_color($_POST['sidebars_bdcolor'],'#DDDDDD'));
- 			mandigo_set_var('scheme'                    ,$_POST['scheme']               );
- 			mandigo_set_var('wp'                        ,$_POST['wp']                   );
- 			mandigo_set_var('scheme_random'             ,$_POST['random']               );
- 			mandigo_set_var('headoverlay'               ,$_POST['headoverlay']          );
- 			mandigo_set_var('bold_links'                ,$_POST['boldlinks']            );
- 			mandigo_set_var('1024'                      ,$_POST['wide']                 );
- 			mandigo_set_var('nofloat'                   ,$_POST['nofloat']              );
- 			mandigo_set_var('footer_stats'              ,$_POST['footstats']            );
- 			mandigo_set_var('nosidebars'                ,($_POST['sidebars'] == 0 ? 1:0));
- 			mandigo_set_var('3columns'                  ,($_POST['sidebars'] == 2 ? 1:0));
- 			mandigo_set_var('sidebar1_left'             ,$_POST['sidebar1']             );
- 			mandigo_set_var('sidebar2_left'             ,$_POST['sidebar2']             );
- 			mandigo_set_var('always_show_sidebars'      ,$_POST['alwayssidebars']       );
- 			mandigo_set_var('em_italics'                ,$_POST['em']                   );
- 			mandigo_set_var('stroke'                    ,$_POST['stroke']               );
- 			mandigo_set_var('headers_random'            ,$_POST['randomheaders']        );
- 			mandigo_set_var('slim_header'               ,$_POST['slimheader']           );
- 			mandigo_set_var('hide_blogname'             ,$_POST['hideblogname']         );
- 			mandigo_set_var('hide_blogdesc'             ,$_POST['hideblogdesc']         );
- 			mandigo_set_var('noborder'                  ,$_POST['noborder']             );
- 			mandigo_set_var('small_title'               ,$_POST['smalltitle']           );
- 			mandigo_set_var('wp_fixed'                  ,$_POST['wpfixed']              );
- 			mandigo_set_var('wp_repeat'                 ,$_POST['wprepeat']             );
- 			mandigo_set_var('wp_position'               ,$_POST['wpposition']           );
- 			mandigo_set_var('number_comments'           ,$_POST['numbercomments']       );
- 			mandigo_set_var('full_search_results'       ,$_POST['fullsearchresults']    );
- 			mandigo_set_var('drop_shadow'               ,$_POST['dropshadow']           );
- 			mandigo_set_var('author_comments'           ,$_POST['authorcomments']       );
- 			mandigo_set_var('floatright'                ,$_POST['floatright']           );
- 			mandigo_set_var('xhtml_comments'            ,$_POST['xhtmlcomments']        );
- 			mandigo_set_var('nojustify'                 ,$_POST['nojustify']            );
- 			mandigo_set_var('title_scheme_index'        ,mandigo_escape($_POST['title_scheme_index']   ));
- 			mandigo_set_var('title_scheme_single'       ,mandigo_escape($_POST['title_scheme_single']  ));
- 			mandigo_set_var('title_scheme_page'         ,mandigo_escape($_POST['title_scheme_page']    ));
- 			mandigo_set_var('title_scheme_category'     ,mandigo_escape($_POST['title_scheme_category']));
- 			mandigo_set_var('title_scheme_date'         ,mandigo_escape($_POST['title_scheme_date']    ));
- 			mandigo_set_var('title_scheme_search'       ,mandigo_escape($_POST['title_scheme_search']  ));
- 			mandigo_set_var('tag_blogname'              ,$_POST['tag_blogname']         );
- 			mandigo_set_var('tag_blogdesc'              ,$_POST['tag_blogdesc']         );
- 			mandigo_set_var('tag_posttitle_multi'       ,$_POST['tag_posttitle_multi']  );
- 			mandigo_set_var('tag_posttitle_single'      ,$_POST['tag_posttitle_single'] );
- 			mandigo_set_var('tag_pagetitle'             ,$_POST['tag_pagetitle']        );
- 			mandigo_set_var('tag_sidebar'               ,$_POST['tag_sidebar']          );
- 			mandigo_set_var('tags_after'                ,$_POST['tags_after']           );
- 			mandigo_set_var('no_animations'             ,$_POST['no_animations']        );
- 			mandigo_set_var('trackbacks'                ,$_POST['trackbacks']           );
- 			mandigo_set_var('fixes_comments_1'          ,$_POST['fixes_comments_1']     );
- 			mandigo_set_var('fixes_comments_2'          ,$_POST['fixes_comments_2']     );
- 			mandigo_set_var('fixes_whitespace_pre'      ,$_POST['fixes_whitespace_pre'] );
- 			mandigo_set_var('fixes_touch_content'       ,$_POST['fixes_touch_content']  );
- 			mandigo_set_var('collapse_posts'            ,$_POST['collapse_posts']       );
- 			mandigo_set_var('headnav_alignment'         ,$_POST['headnav_alignment']    );
- 			mandigo_set_var('date_format'               ,$_POST['date_format']          );
- 			mandigo_set_var('no_submenus'               ,$_POST['no_submenus']          );
- 			mandigo_set_var('disable_comment_gravatars' ,$_POST['comment_gravatars']    );
- 		}
- 		
- 		// store some of the options in variables (some = the ones we will use more than once)
- 		$exclude              = split(',', get_option('mandigo_exclude_pages'));
- 		$scheme               = get_option('mandigo_scheme'                  );
- 		$headoverlay          = get_option('mandigo_headoverlay'             );
- 		$date_format          = get_option('mandigo_date_format'             );
- 		$sidebar1             = get_option('mandigo_sidebar1_left'           );
- 		$sidebar2             = get_option('mandigo_sidebar2_left'           );
- 		$headnav_alignment    = get_option('mandigo_headnav_alignment'       );
- 		$wp                   = get_option('mandigo_wp'                      );
- 		$stroke               = get_option('mandigo_stroke'                  );
- 		$wp_fixed             = get_option('mandigo_wp_fixed'                );
- 		$wp_repeat            = get_option('mandigo_wp_repeat'               );
- 		$trackbacks           = get_option('mandigo_trackbacks'              );
- 
- 		$tag_blogname         = get_option('mandigo_tag_blogname'            );
- 		$tag_blogdesc         = get_option('mandigo_tag_blogdesc'            );
- 		$tag_posttitle_multi  = get_option('mandigo_tag_posttitle_multi'     );
- 		$tag_posttitle_single = get_option('mandigo_tag_posttitle_single'    );
- 		$tag_pagetitle        = get_option('mandigo_tag_pagetitle'           );
- 		$tag_sidebar          = get_option('mandigo_tag_sidebar'             );
- 
- 		// this remote path to the current scheme needs to be reset in some cases
- 		$dirs['www']['scheme'] = $dirs['www']['scheme'] . "$scheme/";
- 
- 		// build a list of selectable schemes from the array we built earlier
- 		foreach ($schemes as $i) {
- 			$select_schemes .= sprintf(
- 				'<input type="radio" name="scheme" value="%s" %s /><img src="%s/preview.jpg" alt="%s" /> &nbsp;',
- 				$i,
- 				(
- 					$scheme == $i
- 					? 'checked="checked"'
- 					: ''
- 				),
- 				$dirs['www']['schemes'] . $i,
- 				$i
- 			);
- 		}
- 
- 		// browse through the images/patterns/ dir for image files and build a stack of option fields
- 		$patternsdir = opendir($dirs['loc']['patterns']);
- 		$select_patterns = '<option value=""'. (!$wp ? ' selected="selected"' : '') .'>none</option>';
- 		while (false !== ($i = readdir($patternsdir))) {
- 			if (preg_match("/\.(?:jpe?g|png|gif|bmp)$/i",$i))
- 			  $select_patterns .= sprintf(
- 				'<option value="%s" %s>images/patterns/%s</option>',
- 				$i,
- 				(
- 					$i == $wp
- 					? ' selected="selected"'
- 					: ''
- 				),
- 				$i
- 			);
- 		}
- 
- 		// build the list of pages, for the 'pages to be excluded' part
- 		$pages = &get_pages('sort_column=menu_order');
- 		foreach ($pages as $i) {
- 			if (!$i->post_parent)
- 				$select_pages .= sprintf(
- 					'<input type="checkbox" name="exclude_%s" %s /> %s<br />',
- 					$i->ID,
- 					(
- 						array_search($i->ID, $exclude)
- 						? ' checked'
- 						: ''
- 					),
- 					$i->post_title
- 				);
- 		}
  
! 		// output the beast
! 		echo '
  		<p align="center"><a href="#versioncheck">Are you using the latest version?</a> - <a href="http://www.onehertz.com/portfolio/wordpress/donate/" title="Show your support, please make a donation" target="_blank">If you enjoy Mandigo, please consider '. (rand(0,1) ? '<strong>making a donation</strong>' : 'making a donation') .'.</a></p>
  		<div class="wrap">
  		<h2>Mandigo Options</h2>
- 		<div style="padding: 5px 0 0 0;">
- 			<a href="#color_scheme">Color Scheme</a> | 
- 			<a href="#layout_opts">Layout</a> | 
- 			<a href="#header_opts">Header</a> | 
- 			<a href="#posts_opts">Posts</a> | 
- 			<a href="#comments_opts">Comments</a> | 
- 			<a href="#seo_opts">SEO</a> | 
- 			<a href="#layout_fixes">Layout Fixes</a> | 
- 			<a href="#misc_opts">Miscellaneous</a>
- 		</div>
  	
  		<form name="mandigo_options_form" method="post" action="?page=functions.php">
  		<input type="hidden" name="updated" value="1" />
  		<p class="submit"><input type="submit" name="Submit" value="'.__('Update Options &raquo;').'"/></p>
- 
- 
  		
! 		<fieldset class="options" id="color_scheme">
  		<legend>Color Scheme</legend>
  		'.$select_schemes.'
  		<br /><br />
--- 1,353 ----
  <?php
!   load_theme_textdomain('mandigo');
  
!   // directories
!   $dirs = array();
!   $dirs['loc']['theme'] = TEMPLATEPATH ."/";
!   $dirs['www']['theme'] = get_bloginfo('template_directory') ."/";
! 
!   foreach(array('loc','www') as $i) {
!     foreach(array('images','js','schemes','images/patterns','images/headers','images/icons') as $j) {
!       $dirs[$i][preg_replace('/.+\//','',$j)] = $dirs[$i]['theme'].$j.'/';
!     }
!   }
! 
!   // schemes
!   $schemes = array();
!   if (($dir = opendir($dirs['loc']['schemes'])) !== false) {
!     while (($node = readdir($dir)) !== false) {
!       if (!preg_match('/^\.{1,2}$/',$node) && file_exists($dirs['loc']['schemes']."$node/scheme.css")) {
!         $schemes[] = $node;
!       }
!     }
!   }
!   sort($schemes);
! 
!   // Set default values
!   if (!get_option('mandigo_scheme') || !array_search(get_option('mandigo_scheme'),$schemes)) update_option('mandigo_scheme',$schemes[0]);
!   if (!get_option('mandigo_bgcolor'              )) update_option('mandigo_bgcolor'              ,'#44484F');
!   if (!get_option('mandigo_wp_repeat'            )) update_option('mandigo_wp_repeat'            ,'repeat' );
! 
!   if (!get_option('mandigo_title_scheme_index'   )) update_option('mandigo_title_scheme_index'   ,'%blogname% - %tagline%');
!   if (!get_option('mandigo_title_scheme_single'  )) update_option('mandigo_title_scheme_single'  ,'%blogname% &raquo; %post%');
!   if (!get_option('mandigo_title_scheme_page'    )) update_option('mandigo_title_scheme_page'    ,'%blogname% &raquo; %post%');
!   if (!get_option('mandigo_title_scheme_category')) update_option('mandigo_title_scheme_category','%blogname% &raquo; Archive for %category%');
!   if (!get_option('mandigo_title_scheme_date'    )) update_option('mandigo_title_scheme_date'    ,'%blogname% &raquo; Archive for %date%');
!   if (!get_option('mandigo_title_scheme_search'  )) update_option('mandigo_title_scheme_search'  ,'%blogname% &raquo; Search Results for &quot;%search%&quot;');
! 
!   if (!get_option('mandigo_tag_blogname'         )) update_option('mandigo_tag_blogname'         ,'h1');
!   if (!get_option('mandigo_tag_blogdesc'         )) update_option('mandigo_tag_blogdesc'         ,'h6');
!   if (!get_option('mandigo_tag_posttitle_multi'  )) update_option('mandigo_tag_posttitle_multi'  ,'h3');
!   if (!get_option('mandigo_tag_posttitle_single' )) update_option('mandigo_tag_posttitle_single' ,'h2');
!   if (!get_option('mandigo_tag_pagetitle'        )) update_option('mandigo_tag_pagetitle'        ,'h2');
!   if (!get_option('mandigo_tag_sidebar'          )) update_option('mandigo_tag_sidebar'          ,'h4');
! 
!   if (!get_option('mandigo_posts_bgcolor'        )) update_option('mandigo_posts_bgcolor'        ,'#FAFAFA');
!   if (!get_option('mandigo_posts_bdcolor'        )) update_option('mandigo_posts_bdcolor'        ,'#EEEEEE');
!   if (!get_option('mandigo_sidebars_bgcolor'     )) update_option('mandigo_sidebars_bgcolor'     ,'#EEEEEE');
!   if (!get_option('mandigo_sidebars_bdcolor'     )) update_option('mandigo_sidebars_bdcolor'     ,'#DDDDDD');
! 
!   if (!get_option('mandigo_trackbacks'           )) update_option('mandigo_trackbacks'           ,(get_option('mandigo_trackbacks_after') ? 'below' : 'along'));
!   if (!get_option('mandigo_headnav_alignment'    )) update_option('mandigo_headnav_alignment'    ,(get_option('mandigo_headnav_left') ? 'left' : 'right'));
!   if (!get_option('mandigo_date_format'          )) update_option('mandigo_date_format'          ,(get_option('mandigo_dates') ? 'dmY' : 'MdY'));
! 
!   // some global vars
!   $ie      = preg_match("/MSIE [4-6]/",$_SERVER['HTTP_USER_AGENT']);
!   $ie7     = preg_match("/MSIE 7/",    $_SERVER['HTTP_USER_AGENT']);
!   $wpmu    = function_exists('is_site_admin');
!   $dirs['loc']['scheme'] = $dirs['loc']['schemes'] . get_option('mandigo_scheme') ."/";
!   $dirs['www']['scheme'] = $dirs['www']['schemes'] . get_option('mandigo_scheme') ."/";
! 
! 
!   // Register sidebars
!   $tag_sidebar = get_option('mandigo_tag_sidebar');
!   if (function_exists('register_sidebar')) {
!     register_sidebar(array('before_title' => "<$tag_sidebar class=\"widgettitle\">", 'after_title' => "</$tag_sidebar>\n"));
!     register_sidebar(array('before_title' => "<$tag_sidebar class=\"widgettitle\">", 'after_title' => "</$tag_sidebar>\n"));
!     register_sidebar(array('before_title' => "<$tag_sidebar class=\"widgettitle\">", 'after_title' => "</$tag_sidebar>\n", 'name' => 'Mandigo Top'));
!     register_sidebar(array('before_title' => "<$tag_sidebar class=\"widgettitle\">", 'after_title' => "</$tag_sidebar>\n", 'name' => 'Mandigo Bottom'));
!   }
  
  
  
  
  
!   /* -------------------------------------------------
!                       SEARCH WIDGET
!   -------------------------------------------------- */
!   function widget_mandigo_search() {
!     global $tag_sidebar;
  ?>
  			<li><<?php echo $tag_sidebar; ?> class="widgettitle"><?php _e('Search','mandigo'); ?></<?php echo $tag_sidebar; ?>>
  				<?php include(TEMPLATEPATH . '/searchform.php'); ?>
  			</li>
  <?php
!   }
!   if (function_exists('register_sidebar_widget')) register_sidebar_widget('Search','widget_mandigo_search');
  
  
  
  
  
!   /* -------------------------------------------------
!                     CALENDAR WIDGET
!   -------------------------------------------------- */
!   function widget_mandigo_calendar() {
!     global $tag_sidebar;
  ?>
  			<li><<?php echo $tag_sidebar; ?> class="widgettitle">&nbsp;</<?php echo $tag_sidebar; ?>>
  				<?php get_calendar(); ?>
  			</li>
  <?php
!   }
!   if (function_exists('register_sidebar_widget')) register_sidebar_widget('Calendar','widget_mandigo_calendar');
  
  
  
  
  
!   /* -------------------------------------------------
!                        META WIDGET
!   -------------------------------------------------- */
!   function widget_mandigo_meta() {
!     global $dirs, $tag_sidebar, $wpmu;
!     $options = get_option('widget_meta');
  ?>
! 				<li><<?php echo $tag_sidebar; ?> class="widgettitle"><?php echo ($options['title'] ? $options['title'] : __('Meta','mandigo')); ?></<?php echo $tag_sidebar; ?>>
!                                 <span id="rss"><a href="<?php bloginfo('rss2_url'); ?>" title="RSS feed for <?php bloginfo('name'); ?>"><img src="<?php echo $dirs['www']['scheme']; ?>/images/rss_l.gif" alt="Entries (RSS)" id="rssicon" /></a></span>
! 				<ul>
! 					<?php wp_register(); ?>
! 					<li><?php wp_loginout(); ?></li>
! <?php if ($wpmu): ?>
! 					<li><a href="http://mu.wordpress.org/" title="Powered by WordPress MU, state-of-the-art semantic personal publishing platform.">WordPress MU</a></li>
! <?php else: ?>
! 					<li><a href="http://wordpress.org/" title="Powered by WordPress, state-of-the-art semantic personal publishing platform.">WordPress</a></li>
! <?php endif; ?>
! 					<li><a href="http://www.onehertz.com/portfolio/wordpress/" title="More WordPress themes by the same author" target="_blank">Mandigo theme</a></li>
! 					<?php wp_meta(); ?>
! 				</ul>
! 				</li>
  <?php
+   }
+   if (function_exists('register_sidebar_widget')) register_sidebar_widget('Meta','widget_mandigo_meta');
  
  
  
+   /* -------------------------------------------------
+                     internal stuff
+   -------------------------------------------------- */
+   function mandigo_author_link($author_id,$author_nicename) {
+     // I'm not sure why, but the get_author_posts_url() function is undefined in some translated versions of WP
+     if (function_exists('get_author_posts_url')) {
+       return '<a href="'. get_author_posts_url($author_id) .'" title="'. sprintf(__("Posts by %s"), attribute_escape($author_nicename)).' ">'. $author_nicename .'</a>';
+     }
+     return $author_nicename;
+   }
  
+   function mandigo_date_icon($date) {
+     list($y, $mn, $m, $d) = explode(' ', $date);
+     switch (get_option('mandigo_date_format')) {
+       case 'MdY': $l = array($mn, $d, $y); $x = array(1, 0, 0); break;
+       case 'dmY': $l = array($d,  $m, $y); $x = array(1, 0, 0); break;
+     }
+ 	echo '
+ 			        	<div class="calborder">
+ 			        	<div class="cal">
+                                                 <span class="cal1'. ($x[0] ? " cal1x" : "") .'">'. $l[0] .'</span>
+                                                 <span class="cal2'. ($x[1] ? " cal2x" : "") .'">'. $l[1] .'</span>
+                                                 <span class="cal3'. ($x[2] ? " cal3x" : "") .'">'. $l[2] .'</span>
+                                         </div>
+                                         </div>
+ 	';
+   }
  
  
  
  
!   /* -------------------------------------------------
!                   THEME OPTIONS PAGES
!   -------------------------------------------------- */
!   add_action('admin_menu', 'add_mandigo_options_page');
!   add_action('admin_menu', 'add_mandigo_inserts_page');
!   add_action('admin_menu', 'add_mandigo_readme_page');
!   add_action('admin_menu', 'add_mandigo_farbtastic_js');
!   add_action('admin_head', 'add_mandigo_farbtastic_css');
! 
!   function add_mandigo_options_page() {
!     global $dirs;
!     add_theme_page(
!       'Theme Options',
!       '<img src="'. $dirs['www']['images'] .'/attention_catcher.png" alt="" /> Theme Options',
!       'edit_themes',
!       basename(__FILE__),
!       'mandigo_options_page'
!     );
!   }
!   function add_mandigo_inserts_page() {
!     global $dirs;
!     add_theme_page(
!       'HTML Inserts',
!       '<img src="'. $dirs['www']['images'] .'/attention_catcher.png" alt="" /> HTML Inserts',
!       'edit_themes',
!       'Inserts',
!       'mandigo_inserts_page'
!     );
!   }
!   function add_mandigo_readme_page()  {
!     add_theme_page(
!       'README',
!       'README',
!       'switch_themes',
!       'README',
!       'mandigo_readme_page'
!     );
!   }
! 
!   function add_mandigo_farbtastic_js() {
!     global $dirs;
!     wp_enqueue_script('jquery',     $dirs['www']['theme'] .'js/jquery.js');
!     wp_enqueue_script('farbtastic', $dirs['www']['theme'] .'js/farbtastic.js');
!   }
! 
!   function add_mandigo_farbtastic_css() {
!     global $dirs;
!     echo '<link rel="stylesheet" type="text/css" href="'. $dirs['www']['theme'] .'farbtastic.css" />';
!   }
! 
!   function mandigo_set_var($var,$value) { update_option('mandigo_'. $var, $value); }
!   function mandigo_color($value,$default) { 
!     if (!preg_match("/^#/",$value)) $value = '#'. $value;
!     if (!preg_match("/^#([0-9A-F]{3}){1,2}$/i",$value)) $value = $default;
!     return $value;
!   }
!   function mandigo_escape($string)      {
!     $string = str_replace('\\"','&#34;',$string);
!     $string = str_replace("\\'",'&#39;',$string);
!     return $string;
!   }
! 
!   function mandigo_options_page() {
!     global $dirs, $schemes;
! 
!     if ( $_GET['page'] == basename(__FILE__) ) {
!       $ct = current_theme_info();
! 
!       if (isset($_POST['updated'])) {
!         $exclude[] = '';
!         foreach ($_POST as $field => $value) {
!           if (preg_match("/exclude_(\d+)/",$field,$id)) { $exclude[] = $id[1]; }
!         }
!         mandigo_set_var('exclude_pages'             ,implode(",",$exclude)          );
!         mandigo_set_var('bgcolor'                   ,mandigo_color($_POST['bgcolor']         ,'#44484F'));
!         mandigo_set_var('posts_bgcolor'             ,mandigo_color($_POST['posts_bgcolor']   ,'#FAFAFA'));
!         mandigo_set_var('posts_bdcolor'             ,mandigo_color($_POST['posts_bdcolor']   ,'#EEEEEE'));
!         mandigo_set_var('sidebars_bgcolor'          ,mandigo_color($_POST['sidebars_bgcolor'],'#EEEEEE'));
!         mandigo_set_var('sidebars_bdcolor'          ,mandigo_color($_POST['sidebars_bdcolor'],'#DDDDDD'));
!         mandigo_set_var('scheme'                    ,$_POST['scheme']               );
!         mandigo_set_var('wp'                        ,$_POST['wp']                   );
!         mandigo_set_var('scheme_random'             ,$_POST['random']               );
!         mandigo_set_var('headoverlay'               ,$_POST['headoverlay']          );
!         mandigo_set_var('bold_links'                ,$_POST['boldlinks']            );
!         mandigo_set_var('1024'                      ,$_POST['wide']                 );
!         mandigo_set_var('nofloat'                   ,$_POST['nofloat']              );
!         mandigo_set_var('footer_stats'              ,$_POST['footstats']            );
!         mandigo_set_var('nosidebars'                ,($_POST['sidebars'] == 0 ? 1:0));
!         mandigo_set_var('3columns'                  ,($_POST['sidebars'] == 2 ? 1:0));
!         mandigo_set_var('sidebar1_left'             ,$_POST['sidebar1']             );
!         mandigo_set_var('sidebar2_left'             ,$_POST['sidebar2']             );
!         mandigo_set_var('always_show_sidebars'      ,$_POST['alwayssidebars']       );
!         mandigo_set_var('em_italics'                ,$_POST['em']                   );
!         mandigo_set_var('stroke'                    ,$_POST['stroke']               );
!         mandigo_set_var('headers_random'            ,$_POST['randomheaders']        );
!         mandigo_set_var('slim_header'               ,$_POST['slimheader']           );
!         mandigo_set_var('hide_blogname'             ,$_POST['hideblogname']         );
!         mandigo_set_var('hide_blogdesc'             ,$_POST['hideblogdesc']         );
!         mandigo_set_var('noborder'                  ,$_POST['noborder']             );
!         mandigo_set_var('small_title'               ,$_POST['smalltitle']           );
!         mandigo_set_var('wp_fixed'                  ,$_POST['wpfixed']              );
!         mandigo_set_var('wp_repeat'                 ,$_POST['wprepeat']             );
!         mandigo_set_var('wp_position'               ,$_POST['wpposition']           );
!         mandigo_set_var('number_comments'           ,$_POST['numbercomments']       );
!         mandigo_set_var('full_search_results'       ,$_POST['fullsearchresults']    );
!         mandigo_set_var('drop_shadow'               ,$_POST['dropshadow']           );
!         mandigo_set_var('author_comments'           ,$_POST['authorcomments']       );
!         mandigo_set_var('floatright'                ,$_POST['floatright']           );
!         mandigo_set_var('xhtml_comments'            ,$_POST['xhtmlcomments']        );
!         mandigo_set_var('nojustify'                 ,$_POST['nojustify']            );
!         mandigo_set_var('title_scheme_index'        ,mandigo_escape($_POST['title_scheme_index']   ));
!         mandigo_set_var('title_scheme_single'       ,mandigo_escape($_POST['title_scheme_single']  ));
!         mandigo_set_var('title_scheme_page'         ,mandigo_escape($_POST['title_scheme_page']    ));
!         mandigo_set_var('title_scheme_category'     ,mandigo_escape($_POST['title_scheme_category']));
!         mandigo_set_var('title_scheme_date'         ,mandigo_escape($_POST['title_scheme_date']    ));
!         mandigo_set_var('title_scheme_search'       ,mandigo_escape($_POST['title_scheme_search']  ));
!         mandigo_set_var('tag_blogname'              ,$_POST['tag_blogname']         );
!         mandigo_set_var('tag_blogdesc'              ,$_POST['tag_blogdesc']         );
!         mandigo_set_var('tag_posttitle_multi'       ,$_POST['tag_posttitle_multi']  );
!         mandigo_set_var('tag_posttitle_single'      ,$_POST['tag_posttitle_single'] );
!         mandigo_set_var('tag_pagetitle'             ,$_POST['tag_pagetitle']        );
!         mandigo_set_var('tag_sidebar'               ,$_POST['tag_sidebar']          );
!         mandigo_set_var('tags_after'                ,$_POST['tags_after']           );
!         mandigo_set_var('no_animations'             ,$_POST['no_animations']        );
!         mandigo_set_var('trackbacks'                ,$_POST['trackbacks']           );
!         mandigo_set_var('fixes_comments_1'          ,$_POST['fixes_comments_1']     );
!         mandigo_set_var('fixes_comments_2'          ,$_POST['fixes_comments_2']     );
!         mandigo_set_var('fixes_whitespace_pre'      ,$_POST['fixes_whitespace_pre'] );
!         mandigo_set_var('fixes_touch_content'       ,$_POST['fixes_touch_content']  );
!         mandigo_set_var('collapse_posts'            ,$_POST['collapse_posts']       );
!         mandigo_set_var('headnav_alignment'         ,$_POST['headnav_alignment']    );
!         mandigo_set_var('date_format'               ,$_POST['date_format']          );
!       }
!       $exclude              = split(",",get_option('mandigo_exclude_pages'));
!       $scheme               = get_option('mandigo_scheme'                  );
!       $headoverlay          = get_option('mandigo_headoverlay'             );
!       $date_format          = get_option('mandigo_date_format'             );
!       $sidebar1             = get_option('mandigo_sidebar1_left'           );
!       $sidebar2             = get_option('mandigo_sidebar2_left'           );
!       $headnav_alignment    = get_option('mandigo_headnav_alignment'       );
!       $wp                   = get_option('mandigo_wp'                      );
!       $stroke               = get_option('mandigo_stroke'                  );
!       $wp_fixed             = get_option('mandigo_wp_fixed'                );
!       $wp_repeat            = get_option('mandigo_wp_repeat'               );
!       $trackbacks           = get_option('mandigo_trackbacks'              );
! 
!       $tag_blogname         = get_option('mandigo_tag_blogname'            );
!       $tag_blogdesc         = get_option('mandigo_tag_blogdesc'            );
!       $tag_posttitle_multi  = get_option('mandigo_tag_posttitle_multi'     );
!       $tag_posttitle_single = get_option('mandigo_tag_posttitle_single'    );
!       $tag_pagetitle        = get_option('mandigo_tag_pagetitle'           );
!       $tag_sidebar          = get_option('mandigo_tag_sidebar'             );
! 
!       $dirs['www']['scheme'] = $dirs['www']['scheme'] . "$scheme/";
! 
!       foreach ($schemes as $i) {
! 	$select_schemes .= '<input type="radio" name="scheme" value="'. $i .'" '. ($scheme == $i ? 'checked="checked"' : '') .' /><img src="'. $dirs['www']['schemes'] . $i .'/preview.jpg" alt="'. $i .'" /> &nbsp;';
!       }
! 
!       $patternsdir = opendir($dirs['loc']['patterns']);
!       $select_patterns = '<option value=""'. (!$wp ? ' selected="selected"' : '') .'>none</option>';
!       while (false !== ($i = readdir($patternsdir))) {
!         if (preg_match("/\.(?:jpe?g|png|gif|bmp)$/i",$i)) {
!           $select_patterns .= '<option value="'. $i .'"'. ($i == $wp ? ' selected="selected"' : '') .'>images/patterns/'. $i .'</option>';
!         }
!       }
! 
!       $pages = &get_pages('sort_column=menu_order');
!       foreach ($pages as $i) {
!         if (!$i->post_parent) {
!           $select_pages .= '<input type="checkbox" name="exclude_'. $i->ID .'"'. (array_search($i->ID, $exclude) ? ' checked' : '') .' /> '. $i->post_title . '<br />';
!         }
!       }
! 
!       echo '
  		<p align="center"><a href="#versioncheck">Are you using the latest version?</a> - <a href="http://www.onehertz.com/portfolio/wordpress/donate/" title="Show your support, please make a donation" target="_blank">If you enjoy Mandigo, please consider '. (rand(0,1) ? '<strong>making a donation</strong>' : 'making a donation') .'.</a></p>
  		<div class="wrap">
  		<h2>Mandigo Options</h2>
  	
  		<form name="mandigo_options_form" method="post" action="?page=functions.php">
  		<input type="hidden" name="updated" value="1" />
  		<p class="submit"><input type="submit" name="Submit" value="'.__('Update Options &raquo;').'"/></p>
  		
! 		<fieldset class="options">
  		<legend>Color Scheme</legend>
  		'.$select_schemes.'
  		<br /><br />
***************
*** 517,523 ****
  				jQuery(".colorpicker").each(function () { f.linkTo(this); }).focus(function() { f.linkTo(this); jQuery("#picker").fadeIn(); });
  			});
  			defaultColor = function(e,v) {
! 				var f = eval(\'document.forms.mandigo_options_form.\'+e);
  				f.value = v;
  				f.focus();
  			}
--- 363,369 ----
  				jQuery(".colorpicker").each(function () { f.linkTo(this); }).focus(function() { f.linkTo(this); jQuery("#picker").fadeIn(); });
  			});
  			defaultColor = function(e,v) {
! 				var f = document.forms.mandigo_options_form.eval(e);
  				f.value = v;
  				f.focus();
  			}
***************
*** 583,593 ****
  			</tr>
  		</table>
  		</fieldset>
  		<br/>
  
! 		
! 		
! 		<fieldset class="options" id="layout_opts">
  		<legend>Layout Options</legend>
  		<input type="checkbox" name="wide" '. (get_option('mandigo_1024') ? 'checked="checked"' : '') .' /> Use the 1024px theme look instead of the default 800px one<br />
  		<input type="checkbox" name="alwayssidebars" '. (get_option('mandigo_always_show_sidebars') ? 'checked="checked"' : '') .' /> Show sidebars even in single post view<br />
--- 429,438 ----
  			</tr>
  		</table>
  		</fieldset>
+ 
  		<br/>
  
! 		<fieldset class="options">
  		<legend>Layout Options</legend>
  		<input type="checkbox" name="wide" '. (get_option('mandigo_1024') ? 'checked="checked"' : '') .' /> Use the 1024px theme look instead of the default 800px one<br />
  		<input type="checkbox" name="alwayssidebars" '. (get_option('mandigo_always_show_sidebars') ? 'checked="checked"' : '') .' /> Show sidebars even in single post view<br />
***************
*** 616,626 ****
  			</tr>
  		</table>
  		</fieldset>
  		<br/>
  
! 		
! 		
! 		<fieldset class="options" id="header_opts">
  		<legend>Header</legend>
  		<input type="checkbox" name="slimheader" '. (get_option('mandigo_slim_header') ? 'checked="checked"' : '') .' /> Use slim (100px smaller) headers<br />
  		<input type="checkbox" name="randomheaders" '. (get_option('mandigo_headers_random') ? 'checked="checked"' : '') .' /> Use random images from the images/headers/ subfolder<br />
--- 461,470 ----
  			</tr>
  		</table>
  		</fieldset>
+ 
  		<br/>
  
! 		<fieldset class="options">
  		<legend>Header</legend>
  		<input type="checkbox" name="slimheader" '. (get_option('mandigo_slim_header') ? 'checked="checked"' : '') .' /> Use slim (100px smaller) headers<br />
  		<input type="checkbox" name="randomheaders" '. (get_option('mandigo_headers_random') ? 'checked="checked"' : '') .' /> Use random images from the images/headers/ subfolder<br />
***************
*** 636,642 ****
  		<input type="radio" name="stroke" value="1"  '. ($stroke ? 'checked="checked"' : '') .' /><img src="'. get_bloginfo('template_directory') .'/option-stroke-on.jpg"  alt="on"  /><br /><br />
  
  		<label><b>Navigation</b></label><br />
- 		<input type="checkbox" name="no_submenus" '. (get_option('mandigo_no_submenus') ? 'checked="checked"' : '') .' /> Disable submenus<br />
  		Navigation position : <select name="headnav_alignment">
  			<option value="left" '.   ($headnav_alignment == 'left'   ? 'selected="selected"' : '') .'>left</option>
  			<option value="center" '. ($headnav_alignment == 'center' ? 'selected="selected"' : '') .'>center</option>
--- 480,485 ----
***************
*** 649,659 ****
  		<label><b>Pages to Exclude from Header Navigation</b></label><br />
  		'. $select_pages .'<br />
  		</fieldset>
  		<br/>
  
! 		
! 		
! 		<fieldset class="options" id="posts_opts">
  		<legend>Posts</legend>
  		<input type="checkbox" name="collapse_posts" '. (get_option('mandigo_collapse_posts') ? 'checked="checked"' : '') .' /> Automatically collapse posts in archives & categories<br />
  		<input type="checkbox" name="tags_after" '. (get_option('mandigo_tags_after') ? 'checked="checked"' : '') .' /> Display tags after the content instead of next to categories (WP2.3+)<br />
--- 492,501 ----
  		<label><b>Pages to Exclude from Header Navigation</b></label><br />
  		'. $select_pages .'<br />
  		</fieldset>
+ 
  		<br/>
  
! 		<fieldset class="options">
  		<legend>Posts</legend>
  		<input type="checkbox" name="collapse_posts" '. (get_option('mandigo_collapse_posts') ? 'checked="checked"' : '') .' /> Automatically collapse posts in archives & categories<br />
  		<input type="checkbox" name="tags_after" '. (get_option('mandigo_tags_after') ? 'checked="checked"' : '') .' /> Display tags after the content instead of next to categories (WP2.3+)<br />
***************
*** 662,681 ****
  
  		<label><b>Date Format</b></label><br/>
  		<select name="date_format">
! 			<option value="dmY" '. ($date_format == 'dmY' ? 'selected="selected"' : '') .'>dd/mm/yyyy</option>
  			<option value="MdY" '. ($date_format == 'MdY' ? 'selected="selected"' : '') .'>month/dd/yyyy</option>
  		</select><br /><br />
  		</fieldset>
  		<br/>
  
! 		
! 		
! 		<fieldset class="options" id="comments_opts">
  		<legend>Comments</legend>
  		<input type="checkbox" name="authorcomments" '. (get_option('mandigo_author_comments') ? 'checked="checked"' : '') .' /> Highlight comments made by the author of the current post<br />
  		<input type="checkbox" name="numbercomments" '. (get_option('mandigo_number_comments') ? 'checked="checked"' : '') .' /> Number comments<br />
! 		<input type="checkbox" name="xhtmlcomments" '.  (get_option('mandigo_xhtml_comments')  ? 'checked="checked"' : '') .' /> Display allowed XHTML tags above the comment field<br />
! 		<input type="checkbox" name="comment_gravatars" '.  (get_option('mandigo_disable_comment_gravatars')  ? 'checked="checked"' : '') .' /> Do not display gravatars<br />
  		Display trackbacks: <select name="trackbacks">
  				<option value="along" '.  ($trackbacks == 'along' ? 'selected="selected"' : '') .'>along with comments, in chronological order</option>
  				<option value="above" '.  ($trackbacks == 'above' ? 'selected="selected"' : '') .'>above comments</option>
--- 504,521 ----
  
  		<label><b>Date Format</b></label><br/>
  		<select name="date_format">
! 			<option value="dmY" '. ($date_format == 'dmY'   ? 'selected="selected"' : '') .'>dd/mm/yyyy</option>
  			<option value="MdY" '. ($date_format == 'MdY' ? 'selected="selected"' : '') .'>month/dd/yyyy</option>
  		</select><br /><br />
  		</fieldset>
+ 
  		<br/>
  
! 		<fieldset class="options">
  		<legend>Comments</legend>
  		<input type="checkbox" name="authorcomments" '. (get_option('mandigo_author_comments') ? 'checked="checked"' : '') .' /> Highlight comments made by the author of the current post<br />
  		<input type="checkbox" name="numbercomments" '. (get_option('mandigo_number_comments') ? 'checked="checked"' : '') .' /> Number comments<br />
! 		<input type="checkbox" name="xhtmlcomments" '. (get_option('mandigo_xhtml_comments') ? 'checked="checked"' : '') .' /> Display allowed XHTML tags above the comment field<br />
  		Display trackbacks: <select name="trackbacks">
  				<option value="along" '.  ($trackbacks == 'along' ? 'selected="selected"' : '') .'>along with comments, in chronological order</option>
  				<option value="above" '.  ($trackbacks == 'above' ? 'selected="selected"' : '') .'>above comments</option>
***************
*** 683,693 ****
  				<option value="none"  '.  ($trackbacks == 'none'  ? 'selected="selected"' : '') .'>do not display trackbacks at all</option>
  		</select><br /><br />
  		</fieldset>
- 		<br/>
- 
  
! 		
! 		<fieldset class="options" id="seo_opts">
  		<legend>SEO Options</legend>
  
  		<label><b>Custom &lt;title&gt; tags</b></label><br/>
--- 523,532 ----
  				<option value="none"  '.  ($trackbacks == 'none'  ? 'selected="selected"' : '') .'>do not display trackbacks at all</option>
  		</select><br /><br />
  		</fieldset>
  
! 		<br/>
! 	
! 		<fieldset class="options">
  		<legend>SEO Options</legend>
  
  		<label><b>Custom &lt;title&gt; tags</b></label><br/>
***************
*** 726,737 ****
  				<td style="text-align: right;">Blog name:</td>
  				<td>
  					<select name="tag_blogname">
! 						<option value="h1"'.  ($tag_blogname == 'h1'  ? ' selected="selected"' : '') .'>h1</option>
! 						<option value="h2"'.  ($tag_blogname == 'h2'  ? ' selected="selected"' : '') .'>h2</option>
! 						<option value="h3"'.  ($tag_blogname == 'h3'  ? ' selected="selected"' : '') .'>h3</option>
! 						<option value="h4"'.  ($tag_blogname == 'h4'  ? ' selected="selected"' : '') .'>h4</option>
! 						<option value="h5"'.  ($tag_blogname == 'h5'  ? ' selected="selected"' : '') .'>h5</option>
! 						<option value="h6"'.  ($tag_blogname == 'h6'  ? ' selected="selected"' : '') .'>h6</option>
  						<option value="div"'. ($tag_blogname == 'div' ? ' selected="selected"' : '') .'>div</option>
  					</select>
  				</td>
--- 565,576 ----
  				<td style="text-align: right;">Blog name:</td>
  				<td>
  					<select name="tag_blogname">
! 						<option value="h1"'. ($tag_blogname == 'h1' ? ' selected="selected"' : '') .'>h1</option>
! 						<option value="h2"'. ($tag_blogname == 'h2' ? ' selected="selected"' : '') .'>h2</option>
! 						<option value="h3"'. ($tag_blogname == 'h3' ? ' selected="selected"' : '') .'>h3</option>
! 						<option value="h4"'. ($tag_blogname == 'h4' ? ' selected="selected"' : '') .'>h4</option>
! 						<option value="h5"'. ($tag_blogname == 'h5' ? ' selected="selected"' : '') .'>h5</option>
! 						<option value="h6"'. ($tag_blogname == 'h6' ? ' selected="selected"' : '') .'>h6</option>
  						<option value="div"'. ($tag_blogname == 'div' ? ' selected="selected"' : '') .'>div</option>
  					</select>
  				</td>
***************
*** 740,751 ****
  				<td style="text-align: right;">Blog description (tagline):</td>
  				<td>
  					<select name="tag_blogdesc">
! 						<option value="h1"'.  ($tag_blogdesc == 'h1'  ? ' selected="selected"' : '') .'>h1</option>
! 						<option value="h2"'.  ($tag_blogdesc == 'h2'  ? ' selected="selected"' : '') .'>h2</option>
! 						<option value="h3"'.  ($tag_blogdesc == 'h3'  ? ' selected="selected"' : '') .'>h3</option>
! 						<option value="h4"'.  ($tag_blogdesc == 'h4'  ? ' selected="selected"' : '') .'>h4</option>
! 						<option value="h5"'.  ($tag_blogdesc == 'h5'  ? ' selected="selected"' : '') .'>h5</option>
! 						<option value="h6"'.  ($tag_blogdesc == 'h6'  ? ' selected="selected"' : '') .'>h6</option>
  						<option value="div"'. ($tag_blogdesc == 'div' ? ' selected="selected"' : '') .'>div</option>
  					</select>
  				</td>
--- 579,590 ----
  				<td style="text-align: right;">Blog description (tagline):</td>
  				<td>
  					<select name="tag_blogdesc">
! 						<option value="h1"'. ($tag_blogdesc == 'h1' ? ' selected="selected"' : '') .'>h1</option>
! 						<option value="h2"'. ($tag_blogdesc == 'h2' ? ' selected="selected"' : '') .'>h2</option>
! 						<option value="h3"'. ($tag_blogdesc == 'h3' ? ' selected="selected"' : '') .'>h3</option>
! 						<option value="h4"'. ($tag_blogdesc == 'h4' ? ' selected="selected"' : '') .'>h4</option>
! 						<option value="h5"'. ($tag_blogdesc == 'h5' ? ' selected="selected"' : '') .'>h5</option>
! 						<option value="h6"'. ($tag_blogdesc == 'h6' ? ' selected="selected"' : '') .'>h6</option>
  						<option value="div"'. ($tag_blogdesc == 'div' ? ' selected="selected"' : '') .'>div</option>
  					</select>
  				</td>
***************
*** 754,765 ****
  				<td style="text-align: right;">Post title (when showing multiple posts):</td>
  				<td>
  					<select name="tag_posttitle_multi">
! 						<option value="h1"'.  ($tag_posttitle_multi == 'h1'  ? ' selected="selected"' : '') .'>h1</option>
! 						<option value="h2"'.  ($tag_posttitle_multi == 'h2'  ? ' selected="selected"' : '') .'>h2</option>
! 						<option value="h3"'.  ($tag_posttitle_multi == 'h3'  ? ' selected="selected"' : '') .'>h3</option>
! 						<option value="h4"'.  ($tag_posttitle_multi == 'h4'  ? ' selected="selected"' : '') .'>h4</option>
! 						<option value="h5"'.  ($tag_posttitle_multi == 'h5'  ? ' selected="selected"' : '') .'>h5</option>
! 						<option value="h6"'.  ($tag_posttitle_multi == 'h6'  ? ' selected="selected"' : '') .'>h6</option>
  						<option value="div"'. ($tag_posttitle_multi == 'div' ? ' selected="selected"' : '') .'>div</option>
  					</select>
  				</td>
--- 593,604 ----
  				<td style="text-align: right;">Post title (when showing multiple posts):</td>
  				<td>
  					<select name="tag_posttitle_multi">
! 						<option value="h1"'. ($tag_posttitle_multi == 'h1' ? ' selected="selected"' : '') .'>h1</option>
! 						<option value="h2"'. ($tag_posttitle_multi == 'h2' ? ' selected="selected"' : '') .'>h2</option>
! 						<option value="h3"'. ($tag_posttitle_multi == 'h3' ? ' selected="selected"' : '') .'>h3</option>
! 						<option value="h4"'. ($tag_posttitle_multi == 'h4' ? ' selected="selected"' : '') .'>h4</option>
! 						<option value="h5"'. ($tag_posttitle_multi == 'h5' ? ' selected="selected"' : '') .'>h5</option>
! 						<option value="h6"'. ($tag_posttitle_multi == 'h6' ? ' selected="selected"' : '') .'>h6</option>
  						<option value="div"'. ($tag_posttitle_multi == 'div' ? ' selected="selected"' : '') .'>div</option>
  					</select>
  				</td>
***************
*** 768,779 ****
  				<td style="text-align: right;">Post title (single post view):</td>
  				<td>
  					<select name="tag_posttitle_single">
! 						<option value="h1"'.  ($tag_posttitle_single == 'h1'  ? ' selected="selected"' : '') .'>h1</option>
! 						<option value="h2"'.  ($tag_posttitle_single == 'h2'  ? ' selected="selected"' : '') .'>h2</option>
! 						<option value="h3"'.  ($tag_posttitle_single == 'h3'  ? ' selected="selected"' : '') .'>h3</option>
! 						<option value="h4"'.  ($tag_posttitle_single == 'h4'  ? ' selected="selected"' : '') .'>h4</option>
! 						<option value="h5"'.  ($tag_posttitle_single == 'h5'  ? ' selected="selected"' : '') .'>h5</option>
! 						<option value="h6"'.  ($tag_posttitle_single == 'h6'  ? ' selected="selected"' : '') .'>h6</option>
  						<option value="div"'. ($tag_posttitle_single == 'div' ? ' selected="selected"' : '') .'>div</option>
  					</select>
  				</td>
--- 607,618 ----
  				<td style="text-align: right;">Post title (single post view):</td>
  				<td>
  					<select name="tag_posttitle_single">
! 						<option value="h1"'. ($tag_posttitle_single == 'h1' ? ' selected="selected"' : '') .'>h1</option>
! 						<option value="h2"'. ($tag_posttitle_single == 'h2' ? ' selected="selected"' : '') .'>h2</option>
! 						<option value="h3"'. ($tag_posttitle_single == 'h3' ? ' selected="selected"' : '') .'>h3</option>
! 						<option value="h4"'. ($tag_posttitle_single == 'h4' ? ' selected="selected"' : '') .'>h4</option>
! 						<option value="h5"'. ($tag_posttitle_single == 'h5' ? ' selected="selected"' : '') .'>h5</option>
! 						<option value="h6"'. ($tag_posttitle_single == 'h6' ? ' selected="selected"' : '') .'>h6</option>
  						<option value="div"'. ($tag_posttitle_single == 'div' ? ' selected="selected"' : '') .'>div</option>
  					</select>
  				</td>
***************
*** 782,793 ****
  				<td style="text-align: right;">Page title (\'Archives\', \'Search Results\'):</td>
  				<td>
  					<select name="tag_pagetitle">
! 						<option value="h1"'.  ($tag_pagetitle == 'h1'  ? ' selected="selected"' : '') .'>h1</option>
! 						<option value="h2"'.  ($tag_pagetitle == 'h2'  ? ' selected="selected"' : '') .'>h2</option>
! 						<option value="h3"'.  ($tag_pagetitle == 'h3'  ? ' selected="selected"' : '') .'>h3</option>
! 						<option value="h4"'.  ($tag_pagetitle == 'h4'  ? ' selected="selected"' : '') .'>h4</option>
! 						<option value="h5"'.  ($tag_pagetitle == 'h5'  ? ' selected="selected"' : '') .'>h5</option>
! 						<option value="h6"'.  ($tag_pagetitle == 'h6'  ? ' selected="selected"' : '') .'>h6</option>
  						<option value="div"'. ($tag_pagetitle == 'div' ? ' selected="selected"' : '') .'>div</option>
  					</select>
  				</td>
--- 621,632 ----
  				<td style="text-align: right;">Page title (\'Archives\', \'Search Results\'):</td>
  				<td>
  					<select name="tag_pagetitle">
! 						<option value="h1"'. ($tag_pagetitle == 'h1' ? ' selected="selected"' : '') .'>h1</option>
! 						<option value="h2"'. ($tag_pagetitle == 'h2' ? ' selected="selected"' : '') .'>h2</option>
! 						<option value="h3"'. ($tag_pagetitle == 'h3' ? ' selected="selected"' : '') .'>h3</option>
! 						<option value="h4"'. ($tag_pagetitle == 'h4' ? ' selected="selected"' : '') .'>h4</option>
! 						<option value="h5"'. ($tag_pagetitle == 'h5' ? ' selected="selected"' : '') .'>h5</option>
! 						<option value="h6"'. ($tag_pagetitle == 'h6' ? ' selected="selected"' : '') .'>h6</option>
  						<option value="div"'. ($tag_pagetitle == 'div' ? ' selected="selected"' : '') .'>div</option>
  					</select>
  				</td>
***************
*** 796,818 ****
  				<td style="text-align: right;">Widget title:</td>
  				<td>
  					<select name="tag_sidebar">
! 						<option value="h1"'.  ($tag_sidebar == 'h1'  ? ' selected="selected"' : '') .'>h1</option>
! 						<option value="h2"'.  ($tag_sidebar == 'h2'  ? ' selected="selected"' : '') .'>h2</option>
! 						<option value="h3"'.  ($tag_sidebar == 'h3'  ? ' selected="selected"' : '') .'>h3</option>
! 						<option value="h4"'.  ($tag_sidebar == 'h4'  ? ' selected="selected"' : '') .'>h4</option>
! 						<option value="h5"'.  ($tag_sidebar == 'h5'  ? ' selected="selected"' : '') .'>h5</option>
! 						<option value="h6"'.  ($tag_sidebar == 'h6'  ? ' selected="selected"' : '') .'>h6</option>
  						<option value="div"'. ($tag_sidebar == 'div' ? ' selected="selected"' : '') .'>div</option>
  					</select>
  				</td>
  			</tr>
  		</table>
  		</fieldset>
  		<br/>
  
! 		
! 		
! 		<fieldset class="options" id="layout_fixes">
  		<legend>Layout Fixes</legend>
  		You may want to experiment with these settings if you encounter problems with the columns showing up wider than they normally should:<br />
  		<input type="checkbox" name="fixes_whitespace_pre" '. (get_option('mandigo_fixes_whitespace_pre') ? 'checked="checked"' : '') .' /> Fix elements which use a "white-space: pre" style (prevents lines from being wrapped in IE)<br />
--- 635,656 ----
  				<td style="text-align: right;">Widget title:</td>
  				<td>
  					<select name="tag_sidebar">
! 						<option value="h1"'. ($tag_sidebar == 'h1' ? ' selected="selected"' : '') .'>h1</option>
! 						<option value="h2"'. ($tag_sidebar == 'h2' ? ' selected="selected"' : '') .'>h2</option>
! 						<option value="h3"'. ($tag_sidebar == 'h3' ? ' selected="selected"' : '') .'>h3</option>
! 						<option value="h4"'. ($tag_sidebar == 'h4' ? ' selected="selected"' : '') .'>h4</option>
! 						<option value="h5"'. ($tag_sidebar == 'h5' ? ' selected="selected"' : '') .'>h5</option>
! 						<option value="h6"'. ($tag_sidebar == 'h6' ? ' selected="selected"' : '') .'>h6</option>
  						<option value="div"'. ($tag_sidebar == 'div' ? ' selected="selected"' : '') .'>div</option>
  					</select>
  				</td>
  			</tr>
  		</table>
  		</fieldset>
+ 
  		<br/>
  
! 		<fieldset class="options">
  		<legend>Layout Fixes</legend>
  		You may want to experiment with these settings if you encounter problems with the columns showing up wider than they normally should:<br />
  		<input type="checkbox" name="fixes_whitespace_pre" '. (get_option('mandigo_fixes_whitespace_pre') ? 'checked="checked"' : '') .' /> Fix elements which use a "white-space: pre" style (prevents lines from being wrapped in IE)<br />
***************
*** 820,830 ****
  		<input type="checkbox" name="fixes_comments_2" '. (get_option('mandigo_fixes_comments_2') ? 'checked="checked"' : '') .' /> Replace long urls in users comments with "link"<br />
  		<input type="checkbox" name="fixes_touch_content" '. (get_option('mandigo_fixes_touch_content') ? 'checked="checked"' : '') .' /> Force the browser to re-render the content column<br />
  		</fieldset>
  		<br/>
  
! 		
! 		
! 		<fieldset class="options" id="misc_opts">
  		<legend>Miscellaneous Options</legend>
  
  		<label><b>Images</b></label><br/>
--- 658,667 ----
  		<input type="checkbox" name="fixes_comments_2" '. (get_option('mandigo_fixes_comments_2') ? 'checked="checked"' : '') .' /> Replace long urls in users comments with "link"<br />
  		<input type="checkbox" name="fixes_touch_content" '. (get_option('mandigo_fixes_touch_content') ? 'checked="checked"' : '') .' /> Force the browser to re-render the content column<br />
  		</fieldset>
+ 
  		<br/>
  
! 		<fieldset class="options">
  		<legend>Miscellaneous Options</legend>
  
  		<label><b>Images</b></label><br/>
***************
*** 848,883 ****
  
  		</div>
  
- 		
- 		
  		<div id="versioncheck" class="wrap">
  		<h2>Version Checker</h2>
  		<iframe src="http://www.onehertz.com/cgi-bin/wordpress:versioncheck.pl?theme=Mandigo&amp;version='. trim($ct->version) .'" width="100%" height="90" scrolling="auto" frameborder="0"></iframe>
  		</div>
  
- 		
- 		
  		<div id="preview" class="wrap">
  		<h2 id="preview-post">Preview (updated when options are saved)</h2>
  		<iframe src="../?preview=true" width="100%" height="600" ></iframe>
  		</div>';
! 	} // end of mandigo_options_page()
  
  
  
! 	function mandigo_set_insert($key, $value) {
! 		update_option('mandigo_inserts_'.$key, str_replace("\\", "", $value));
! 	}
! 	// the HTML inserts page
! 	function mandigo_inserts_page() {
! 		if (isset($_POST['updated'])) {
! 			mandigo_set_insert('header',$_POST['header']);
! 			mandigo_set_insert('body'  ,$_POST['body']  );
! 			mandigo_set_insert('top'   ,$_POST['top']   );
! 			mandigo_set_insert('footer',$_POST['footer']);
! 		}
  
! 	echo '
  		<div class="wrap">
  		<h2>Mandigo Options</h2>
  		
--- 685,714 ----
  
  		</div>
  
  		<div id="versioncheck" class="wrap">
  		<h2>Version Checker</h2>
  		<iframe src="http://www.onehertz.com/cgi-bin/wordpress:versioncheck.pl?theme=Mandigo&amp;version='. trim($ct->version) .'" width="100%" height="90" scrolling="auto" frameborder="0"></iframe>
  		</div>
  
  		<div id="preview" class="wrap">
  		<h2 id="preview-post">Preview (updated when options are saved)</h2>
  		<iframe src="../?preview=true" width="100%" height="600" ></iframe>
  		</div>';
!     }	
!   }
  
  
  
!   function mandigo_set_insert($key,$value)  { update_option('mandigo_inserts_'.$key,str_replace("\\","",$value)); }
!   function mandigo_inserts_page() {
!     if (isset($_POST['updated'])) {
!       mandigo_set_insert('header',$_POST['header']);
!       mandigo_set_insert('body'  ,$_POST['body']  );
!       mandigo_set_insert('top'   ,$_POST['top']   );
!       mandigo_set_insert('footer',$_POST['footer']);
!     }
  
!     echo '
  		<div class="wrap">
  		<h2>Mandigo Options</h2>
  		
***************
*** 889,913 ****
  		<fieldset class="options">
  		<legend>HTML Inserts</legend>
  
! 		<p>The fields on this page allow you to save pieces of code required by third-party plugins and widgets. You can also use them to save Google Maps/Analytics/AdSense javascript snippets, or whatever you want.</p>
! 		
! 		<p>This way you will never have to edit the source files manually each time you update Mandigo.</p>
  
  		<p>NO validation is made on the field values, so be careful not to paste invalid code. Also note that backslashes will be stripped.</p>
  
  		<label><b>header.php</b></label><br/>
!                 right before &lt;/HEAD&gt; (<i>useful for links to external stylesheets, javascript files. This is also the <strong>best place</strong> for your css rules</i>):<br />
! 		<textarea name="header" rows=7 style="width: 100%">'. str_replace("\\", "", get_option('mandigo_inserts_header')) .'</textarea><br /><br />
  
                  custom &lt;BODY&gt; tag (<i>useful for onload actions</i>):<br />
! 		<textarea name="body" rows=1 style="width: 100%">'. str_replace("\\", "", get_option('mandigo_inserts_body')) .'</textarea><br /><br />
  
                  right before the content and sidebars area. This differs from the top widget container in that it displays on all pages, and it spans the whole layout width.<br />
! 		<textarea name="top" rows=7 style="width: 100%">'. str_replace("\\", "", get_option('mandigo_inserts_top')) .'</textarea><br /><br />
  
  		<label><b>footer.php</b></label><br/>
                  before the "Powered by WordPress" credits, still inside the #main div. This differs from the bottom widget container in that it displays on all pages, and it spans the whole layout width.<br />
! 		<textarea name="footer" rows=7 style="width: 100%">'. str_replace("\\", "", get_option('mandigo_inserts_footer')) .'</textarea>
  		</fieldset>
  					
  		<p class="submit"><input type="submit" name="Submit" value="'.__('Update Inserts &raquo;').'"/></p>
--- 720,742 ----
  		<fieldset class="options">
  		<legend>HTML Inserts</legend>
  
! 		<p>The fields on this page allow you to save pieces of code required by third-party plugins and widgets. You can also use them to save Google Maps/Analytics/AdSense javascript snippets, or whatever you want. This way you will never have to insert code manually each time you update Mandigo.</p>
  
  		<p>NO validation is made on the field values, so be careful not to paste invalid code. Also note that backslashes will be stripped.</p>
  
  		<label><b>header.php</b></label><br/>
!                 right before &lt;/HEAD&gt; (<i>useful for links to external stylesheets, javascript files, or inline CSS</i>):<br />
! 		<textarea name="header" rows=7 style="width: 100%">'. str_replace("\\","",get_option('mandigo_inserts_header')) .'</textarea><br /><br />
  
                  custom &lt;BODY&gt; tag (<i>useful for onload actions</i>):<br />
! 		<textarea name="body" rows=1 style="width: 100%">'. str_replace("\\","",get_option('mandigo_inserts_body')) .'</textarea><br /><br />
  
                  right before the content and sidebars area. This differs from the top widget container in that it displays on all pages, and it spans the whole layout width.<br />
! 		<textarea name="top" rows=7 style="width: 100%">'. str_replace("\\","",get_option('mandigo_inserts_top')) .'</textarea><br /><br />
  
  		<label><b>footer.php</b></label><br/>
                  before the "Powered by WordPress" credits, still inside the #main div. This differs from the bottom widget container in that it displays on all pages, and it spans the whole layout width.<br />
! 		<textarea name="footer" rows=7 style="width: 100%">'. str_replace("\\","",get_option('mandigo_inserts_footer')) .'</textarea>
  		</fieldset>
  					
  		<p class="submit"><input type="submit" name="Submit" value="'.__('Update Inserts &raquo;').'"/></p>
***************
*** 916,927 ****
    }
  
  
! 	// the readme page
! 	function mandigo_readme_page() {
! 		echo '<div class="wrap">';
! 		echo '<pre>';
! 		echo htmlspecialchars(file_get_contents(TEMPLATEPATH.'/README.txt'));
! 		echo '</pre>';
! 		echo '</div>';
! 	}
  ?>
--- 745,756 ----
    }
  
  
! 
!   function mandigo_readme_page() {
!     echo '<div class="wrap">';
!     echo '<pre>';
!     echo htmlspecialchars(file_get_contents(TEMPLATEPATH.'/README.txt'));
!     echo '</pre>';
!     echo '</div>';
!   }
  ?>
diff -rc mandigo-1.33/header.php mandigo-1.32/header.php
*** mandigo-1.33/header.php	2008-04-27 17:20:08.000000000 -0400
--- mandigo-1.32/header.php	2008-03-09 14:47:33.000000000 -0400
***************
*** 5,220 ****
  <meta http-equiv="Content-Type" content="<?php bloginfo('html_type'); ?>; charset=<?php bloginfo('charset'); ?>" />
  
  <title><?php
! 	$title = '';
  
! 	// get the appropriate title scheme depending on the type of page
! 	if (is_single())                             $title = get_option('mandigo_title_scheme_single'