diff -rc mandigo-1.34/404.php mandigo-1.33.1/404.php
*** mandigo-1.34/404.php	2008-06-03 20:47:22.000000000 -0400
--- mandigo-1.33.1/404.php	2008-04-28 08:56:54.000000000 -0400
***************
*** 1,5 ****
  <?php
! 	global $mandigo_options, $dirs;
  
  	get_header();
  
--- 1,5 ----
  <?php
! 	global $dirs;
  
  	get_header();
  
***************
*** 14,25 ****
  	</td>
  
  <?php
! 	// if we have at least one sidebar to display
! 	if ($mandigo_options['sidebar_count']) {
  		include (TEMPLATEPATH . '/sidebar.php');
  
  		// if this is a 3-column layout
! 		if ($mandigo_options['layout_width'] == 1024 && $mandigo_options['sidebar_count'] == 2)
  			include (TEMPLATEPATH . '/sidebar2.php');
  	}
  
--- 14,25 ----
  	</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');
  	}
  
diff -rc mandigo-1.34/README.txt mandigo-1.33.1/README.txt
*** mandigo-1.34/README.txt	2008-06-03 20:47:22.000000000 -0400
--- mandigo-1.33.1/README.txt	2008-04-28 08:56:54.000000000 -0400
***************
*** 51,58 ****
  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.
  
! For more information, check out the Upgrade Notes on the Mandigo wiki:
! http://wiki.onehertz.com/WordPress/Mandigo/Upgrading
  
  
  
--- 51,91 ----
  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 your 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"
  
  
  
***************
*** 62,68 ****
  
  - let me know and send an email to tom@onehertz.com
  
! - show your support by making a donation:
    http://www.onehertz.com/portfolio/wordpress/donate/
  
  - leave a comment on the Theme Viewer (outdated):
--- 95,101 ----
  
  - let me know and send an email to tom@onehertz.com
  
! - 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):
***************
*** 89,101 ****
  
  === HEADER IMAGES ======================================================================
  
- Header images management will eventually be better explained on the Mandigo wiki:
- http://wiki.onehertz.com/WordPress/Mandigo
- 
  ** Replacing Default Header Images
! If none of the headers satisfy your needs, create a new scheme by copying one of the
! existing ones and just replace the head.jpg file in the newly created images/ subfolder.
! If you are using the wide layout, save your image as head-1024.jpg instead.
  
  You DO NOT have to modify the PNG files, as the JPG files are displayed ON TOP of them.
  
--- 122,132 ----
  
  === HEADER IMAGES ======================================================================
  
  ** Replacing Default Header Images
! If none of the headers satisfy your needs, just replace the contents of head.jpg in the 
! images/ subfolder that corresponds to your current color scheme (i.e. the one you have 
! set on the Theme Options page) with your own image. If you are using the wide layout, 
! save your image as head-1024.jpg instead.
  
  You DO NOT have to modify the PNG files, as the JPG files are displayed ON TOP of them.
  
***************
*** 133,161 ****
  per-page header could not be found, Mandigo will use a random file from the 
  images/headers/ folder. Valid file types are JPG, GIF, PNG and BMP.
  
- ** Detection Order:
- As of version 1.34, Mandigo will first look for headers in the user's uploaded files,
- THEN in images/headers/ as this allows for people in a WPMU environment to still benefit
- from this functionality.
- 
- For images to be detected from the user's uploaded files (the WordPress Media library),
- the files have to be named according to the following pattern PRIOR to uploading:
- - "mandigo_header.jpg" in the case of a image to use site-wide
- - "mandigo_header_ID.jpg" where ID is the post ID (see per-page headers section above)
- 
  
  
  === IMAGES IN POSTS ====================================================================
  
! Image management will eventually be better explained on the Mandigo wiki:
  http://wiki.onehertz.com/WordPress/Mandigo
  
  ** Alignment:
- Most of the time Mandigo will follow the alignment options you set in the rich editor,
- but in some cases, depending on how you want the pictures to be arranged and which set 
- of options you enabled, things may get a little trickier. This section should help you 
- solve most alignment problems.
- 
  Text is set to wrap around images by default, however if you want to override this 
  behaviour, there is an option ("Do not wrap text around images") to disable it.
  
--- 164,177 ----
  per-page header could not be found, Mandigo will use a random file from the 
  images/headers/ folder. Valid file types are JPG, GIF, PNG and BMP.
  
  
  
  === IMAGES IN POSTS ====================================================================
  
! The following section will eventually be better explained on the Mandigo wiki 
  http://wiki.onehertz.com/WordPress/Mandigo
  
  ** Alignment:
  Text is set to wrap around images by default, however if you want to override this 
  behaviour, there is an option ("Do not wrap text around images") to disable it.
  
***************
*** 164,169 ****
--- 180,188 ----
  <p class="clear">. If you don't use <p>s, adding <br class="clear" /> between paragraphs
  will do the trick as well.
  
+ If you want to have an image float to the right, simply give it the "alignright" class,
+ i.e. <img src="..." alt="..." class="alignright" />
+ 
  If you want to center an image, use the "aligncenter" class instead. Note however that
  text can't be wrapped around centered images, and that such aligned images occupy a 
  full line. This implies that if you want to have more than one picture side by side but
***************
*** 290,296 ****
  Dutch:                 Ramsy de Vos
  Finish:                Mika Majakorpi
  French:                Michel Bibal, David Sahli
! German:                Michael Nickel, Ted Box, Philipp Fischer
  Greek:                 Andrew Kontokanis
  Hebrew:                Omry Yadan
  Hungarian:             Horvath Zoltan
--- 309,315 ----
  Dutch:                 Ramsy de Vos
  Finish:                Mika Majakorpi
  French:                Michel Bibal, David Sahli
! German:                Michael Nickel, Ted Box
  Greek:                 Andrew Kontokanis
  Hebrew:                Omry Yadan
  Hungarian:             Horvath Zoltan
***************
*** 326,358 ****
  
  ** Other Credits
  "Silk" Iconset by Mark James: http//www.famfamfam.com/lab/icons/silk/
  "jQuery" by John Resig: http://www.jquery.com
- "jQuery ifixpng plugin" by khurshid: http://jquery.khurshid.com/ifixpng.php
- 
  
  
  === CHANGELOG ==========================================================================
  
- 1.34
- + the theme now also looks for custom header images in the user's uploaded files. See
-   the updated section about headers in the README file
- + added a registration link to the footer for WordPress MU setups
- - removed the option to float all images to the right by default
- - removed jquery.dimensions.js since it's now part of the jQuery core library
- * grammar fixes: German (de_DE)
- * MORE code cleanup: the file structure has changed somewhat, but there's now a set of 
-   functions to move the files for you. Just make sure the theme directory is writable
-   by the web server prior to uploading this version. See the upgrade notes in the README
- * updated jQuery to 1.2.6
- * fixed comment numbers overlapping gravatars (except in Opera)
- * fixed comment alternate coloring for when trackbacks are displayed separately
- * fixed author comment highlighting, now also checks the commenter's email address
- * fixed the sidebars always showing up in single post view
- * fixed the jQuery/prototype conflicts: this should fix broken lightboxes and all other
-   prototype-based plugins
- * fixed the animation links showing up in comments even when animations are disabled
- * fixed adsense units not working in sidebars when placed on the left
- 
  1.33.1
  * added an option to wrap one paragraph at most
  * moved image control options from misc to posts
--- 345,356 ----
  
  ** Other Credits
  "Silk" Iconset by Mark James: http//www.famfamfam.com/lab/icons/silk/
+ "IE5.5+ PNG Alpha Fix" by Angus Turnbull: http://www.twinhelix.com
  "jQuery" by John Resig: http://www.jquery.com
  
  
  === CHANGELOG ==========================================================================
  
  1.33.1
  * added an option to wrap one paragraph at most
  * moved image control options from misc to posts
diff -rc mandigo-1.34/archive.php mandigo-1.33.1/archive.php
*** mandigo-1.34/archive.php	2008-06-03 20:47:21.000000000 -0400
--- mandigo-1.33.1/archive.php	2008-04-28 08:56:54.000000000 -0400
***************
*** 1,23 ****
  <?php 
! 	global $mandigo_options, $dirs;
  
  	get_header();
  
  	// heading levels for posts (h1, h2, div, ...)
! 	$tag_post_title_multi = $mandigo_options['heading_level_post_title_multi'];
! 	$tag_page_title       = $mandigo_options['heading_level_page_title'      ];
  ?>
  	<td id="content" class="narrowcolumn">
  
  <?php
  	if (have_posts()) {
  
! 		// Hack. Set $post so that the_date() works.
! 		$post = $posts[0];
  		
  		// if this is a category archive
  		if (is_category()) {
! 			$page_title = sprintf(
  				__('Archive for the %s Category', 'mandigo'),
  				'&#8220;'. single_cat_title('',false) .'&#8221;'
  			);
--- 1,22 ----
  <?php 
! 	global $dirs;
  
  	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;'
  			);
***************
*** 25,31 ****
  
  		// if wp supports tags and this is a tag archive
  		elseif (function_exists(is_tag) && is_tag()) {
! 			$page_title = sprintf(
  				__('Posts Tagged %s', 'mandigo'),
  				'&#8220;'. single_tag_title('',false) .'&#8221;'
  			);
--- 24,30 ----
  
  		// 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;'
  			);
***************
*** 33,39 ****
  		
  		// if this is a daily archive
  		elseif (is_day()) {
! 			$page_title = sprintf(
  				__('Archive for %s', 'mandigo'),
  				get_the_time(__('F jS, Y', 'mandigo'))
  			);
--- 32,38 ----
  		
  		// if this is a daily archive
  		elseif (is_day()) {
! 			$pagetitle = sprintf(
  				__('Archive for %s', 'mandigo'),
  				get_the_time(__('F jS, Y', 'mandigo'))
  			);
***************
*** 41,47 ****
  		
  		// if this is a monthly archive
  		elseif (is_month()) {
! 			$page_title = sprintf(
  				__('Archive for %s', 'mandigo'),
  				get_the_time(__('F, Y', 'mandigo'))
  			);
--- 40,46 ----
  		
  		// if this is a monthly archive
  		elseif (is_month()) {
! 			$pagetitle = sprintf(
  				__('Archive for %s', 'mandigo'),
  				get_the_time(__('F, Y', 'mandigo'))
  			);
***************
*** 49,55 ****
  		
  		// if this is a yearly archive
  		elseif (is_year()) {
! 			$page_title = sprintf(
  				__('Archive for %s', 'mandigo'),
  				get_the_time('Y')
  			);
--- 48,54 ----
  		
  		// if this is a yearly archive
  		elseif (is_year()) {
! 			$pagetitle = sprintf(
  				__('Archive for %s', 'mandigo'),
  				get_the_time('Y')
  			);
***************
*** 57,84 ****
  		
  		// if this is a search result
  		elseif (is_search()) {
! 			$page_title = __('Search Results', 'mandigo');
  		}
  		
  		// if this is an author archive
  		elseif (is_author()) {
! 			$page_title = __('Author Archive', 'mandigo');
  		}
  		
  		// otherwise, not sure when this is triggered
  		elseif (isset($_GET['paged']) && !empty($_GET['paged'])) {
! 			$page_title = __('Blog Archives', 'mandigo');
  		}
  		
  		// output
  ?>
  
! 		<<?php echo $tag_page_title; ?> class="pagetitle"><?php echo $page_title; ?></<?php echo $tag_page_title; ?>>
  		
  <?php
  		// if this is a category archive
  		if (is_category()) {
! 			// display the category description
  ?>
  		<div class="catdesc"><?php echo category_description(); ?></div>
  <?php
--- 56,83 ----
  		
  		// 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
***************
*** 100,106 ****
  					<?php mandigo_date_icon(get_the_time('Y M m d')); ?>
  <?php
  			// unless we disabled animations, display the buttons
! 			if (!$mandigo_options['disable_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>
--- 99,105 ----
  					<?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>
***************
*** 111,117 ****
  			
  			// the post title
  ?>
! 				<<?php echo $tag_post_title_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_post_title_multi; ?>>
  				<small>
  <?php
  			// author information
--- 110,116 ----
  			
  			// 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
***************
*** 122,128 ****
  			);
  
  			// if wp supports tags, and unless we chose to display tags after the post
! 			if (function_exists('the_tags') && !$mandigo_options['display_tags_after_content'])
  				the_tags(', '. __('tags', 'mandigo') .': ');
  
  			// the "edit post" link, which displays when you are logged in
--- 121,127 ----
  			);
  
  			// 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
***************
*** 146,152 ****
  			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') && $mandigo_options['display_tags_after_content'])
  				the_tags();
  ?>
  			</div>
--- 145,151 ----
  			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>
***************
*** 180,186 ****
  	else {
  ?>
  
! 		<<?php echo $tag_page_title; ?> class="center"><?php _e('Not Found', 'mandigo'); ?></<?php echo $tag_page_title; ?>>
  		<p class="center"><?php _e("Sorry, but you are looking for something that isn't here.", 'mandigo'); ?></p>
  
  <?php
--- 179,185 ----
  	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
***************
*** 189,202 ****
  	</td>
  
  <?php
! 	// if we have at least one sidebar to display
! 	if ($mandigo_options['sidebar_count']) {
  		include (TEMPLATEPATH . '/sidebar.php');
  
  		// if this is a 3-column layout
! 		if ($mandigo_options['layout_width'] == 1024 && $mandigo_options['sidebar_count'] == 2)
  			include (TEMPLATEPATH . '/sidebar2.php');
  	}
  
! 	get_footer();
  ?>
--- 188,201 ----
  	</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(); 
  ?>
diff -rc mandigo-1.34/archives.php mandigo-1.33.1/archives.php
*** mandigo-1.34/archives.php	2008-06-03 20:47:22.000000000 -0400
--- mandigo-1.33.1/archives.php	2008-04-28 08:56:54.000000000 -0400
***************
*** 3,21 ****
  Template Name: Archives Template
  */
  
! 	global $mandigo_options, $dirs;
  
  	get_header();
  
  	// heading level for page title (h1, h2, div, ...)
! 	$tag_post_title_multi = $mandigo_options['heading_level_post_title_multi'];
! 	$tag_page_title       = $mandigo_options['heading_level_page_title'];
  ?>
  	<td id="content" class="narrowcolumn">
  		<div class="post">
  <?php
  	// unless we disabled animations, display the buttons
! 	if (!$mandigo_options['disable_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>
--- 3,20 ----
  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>
***************
*** 25,41 ****
  	}
  ?>
  
! 		<<?php echo $tag_page_title; ?> class="posttitle"><?php the_title(); ?></<?php echo $tag_page_title; ?>>
! 		
! 		<<?php echo $tag_post_title_multi; ?> class="pagetitle"><?php _e('Search', 'mandigo'); ?>:</<?php echo $tag_post_title_multi; ?>>
  		<?php include (TEMPLATEPATH . '/searchform.php'); ?>
  
! 		<<?php echo $tag_post_title_multi; ?> class="pagetitle"><?php _e('Archives by Month', 'mandigo'); ?>:</<?php echo $tag_post_title_multi; ?>>
  		<ul>
  			<?php wp_get_archives('type=monthly'); ?>
  		</ul>
  
! 		<<?php echo $tag_post_title_multi; ?> class="pagetitle"><?php _e('Archives by Subject', 'mandigo'); ?>:</<?php echo $tag_post_title_multi; ?>>
  		<ul>
  			<?php wp_list_cats(); ?>
  		</ul>
--- 24,38 ----
  	}
  ?>
  
! 		<<?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>
***************
*** 44,57 ****
  	</td>
  
  <?php
! 	// if we have at least one sidebar to display
! 	if ($mandigo_options['sidebar_count']) {
  		include (TEMPLATEPATH . '/sidebar.php');
  
  		// if this is a 3-column layout
! 		if ($mandigo_options['layout_width'] == 1024 && $mandigo_options['sidebar_count'] == 2)
  			include (TEMPLATEPATH . '/sidebar2.php');
  	}
  
! 	get_footer();
  ?>
--- 41,54 ----
  	</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(); 
  ?>
diff -rc mandigo-1.34/attachment.php mandigo-1.33.1/attachment.php
*** mandigo-1.34/attachment.php	2008-06-03 20:47:22.000000000 -0400
--- mandigo-1.33.1/attachment.php	2008-04-28 08:56:54.000000000 -0400
***************
*** 1,12 ****
  <?php 
! 	global $mandigo_options, $dirs;
  
  	get_header();
  
  	// heading levels for attachment name (h1, h2, div, ...)
! 	$tag_page_title = $mandigo_options['heading_level_page_title'      ];
  ?>
! 	<td id="content" class="<?php echo ($mandigo_options['sidebar_always_show'] ? 'narrow' : 'wide'); ?>column">
  
  <?php
  	// if we have posts
--- 1,12 ----
  <?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
***************
*** 33,39 ****
  		<div class="post" id="post-<?php the_ID(); ?>">
  <?php
  			// unless we disabled animations, display the buttons
! 			if (!$mandigo_options['disable_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>
--- 33,39 ----
  		<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>
***************
*** 44,50 ****
  	
  			// the attachment name
  ?>
! 			<<?php echo $tag_page_title; ?> 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_page_title; ?>>
  
  			<div class="entry">
  				<p class="<?php echo $classname; ?>"><?php echo $attachment_link; ?><br /><?php echo basename($post->guid); ?></p>
--- 44,50 ----
  	
  			// 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>
***************
*** 123,129 ****
  	else {
  ?>
  
! 		<<?php echo $tag_page_title; ?>><?php _e('Sorry, no posts matched your criteria.', 'mandigo'); ?></<?php echo $tag_page_title; ?>>
  
  <?php
  	}
--- 123,129 ----
  	else {
  ?>
  
! 		<<?php echo $tag_pagetitle; ?>><?php _e('Sorry, no posts matched your criteria.', 'mandigo'); ?></<?php echo $tag_pagetitle; ?>>
  
  <?php
  	}
***************
*** 132,145 ****
  	</td>
  
  <?php
! 	// if we have at least one sidebar to display
! 	if ($mandigo_options['sidebar_always_show'] && $mandigo_options['sidebar_count']) {
  		include (TEMPLATEPATH . '/sidebar.php');
  
  		// if this is a 3-column layout
! 		if ($mandigo_options['layout_width'] == 1024 && $mandigo_options['sidebar_count'] == 2)
  			include (TEMPLATEPATH . '/sidebar2.php');
  	}
  
! 	get_footer();
  ?>
--- 132,145 ----
  	</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(); 
  ?>
Only in mandigo-1.34: backend
diff -rc mandigo-1.34/comments.php mandigo-1.33.1/comments.php
*** mandigo-1.34/comments.php	2008-06-03 20:47:22.000000000 -0400
--- mandigo-1.33.1/comments.php	2008-04-28 08:56:54.000000000 -0400
***************
*** 1,5 ****
  <?php
! 	global $mandigo_options, $dirs;
  
  	/* do not delete these lines */
  	if ('comments.php' == basename($_SERVER['SCRIPT_FILENAME']))
--- 1,5 ----
  <?php
! 	global $dirs;
  
  	/* do not delete these lines */
  	if ('comments.php' == basename($_SERVER['SCRIPT_FILENAME']))
***************
*** 16,29 ****
  		}
  	}
  
! 	/*
! 		if you really feel like it,
! 		you can start editing here
! 	*/
  	
  	// the post/page author
! 	$the_author       = get_the_author();
! 	$the_author_email = get_the_author_email();
  
  	// if there's at least one comment
  	if ($comments) {
--- 16,31 ----
  		}
  	}
  
! 	/* 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) {
***************
*** 46,136 ****
  		foreach ($comments as $comment) {
  			// the comment id
  			$id = get_comment_ID();
! 			
  			// a BIG sprintf, not for the faint of heart
  			$comment_list_item = sprintf('
! 				<li class="clear%s" id="comment-%s">
! 					<div class="commenter%s"%s>
  					%s
! 						<cite>%s</cite>
  						%s
  						<small class="commentmetadata"><a href="#comment-%s">%s</a> %s</small>
- 					</div>
- 					<div class="comment">
  						%s
  					</div>
  				</li>
  				',
  
! 				( // first %s, highlight author comment class
! 					(
! 						$mandigo_options['comments_highlight_author']
! 						&& get_comment_author() == $the_author
! 						&& get_comment_author_email() == $the_author_email
! 					)
! 					? ' authorcomment'
  					: ''
  				),
  				
! 				$id, // second %s, the comment id
! 				
! 				( // 3rd %s, gravatar class
! 					(
! 						!$mandigo_options['comments_no_gravatars']
! 						&& function_exists('get_avatar')
! 						&& function_exists('get_comment_author_email')
! 					)
! 					? ' avatar'
  					: ''
! 				),
  				
! 				( // 4th %s, gravatar
! 					!$mandigo_options['comments_no_gravatars']
  					? (
  						function_exists('get_avatar') && function_exists('get_comment_author_email')
! 						? sprintf(
! 							' style="background: url(%s) no-repeat top left;"',
! 							preg_replace(
! 								'/.+src=[\'"]([^\'"]+)[\'"].+/',
! 								'\1',
! 								get_avatar(get_comment_author_email(), '36')
! 							)
!  						)
  						: ''
  					)
  					: ''
  				),
  				
! 				( // 5th %s, animation link
! 					!$mandigo_options['disable_animations'] // if animations are not disabled
! 					? sprintf(
! 						'<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>',
! 						$id,
! 						$id
! 					)
! 					: ''
! 				),
! 				
! 				sprintf( // 6th %s, the user name
  					__('%s says:', 'mandigo'),
  					get_comment_author_link()
  				),
  				
! 				( // 7th %s, whether the comment is pending moderation or not
  					$comment->comment_approved == '0'
  					? '<em>'. __('Your comment is awaiting moderation.', 'mandigo') .'</em><br />'
  					: ''
  				),
  				
! 				$id, // 8th %s, the comment id again
  				
! 				sprintf( // 9th %s, "which date at what time"
  					__('%s at %s', 'mandigo'),
  					get_comment_date(__('F jS, Y', 'mandigo')),
  					get_comment_time()
  				),
  				
! 				( // 10th %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',
--- 48,119 ----
  		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',
***************
*** 140,162 ****
  					: ''
  				),
  				
! 				// 11th %s, the comment itself
! 				apply_filters('comment_text', get_comment_text())
! 				
  			); // end of big sprintf, phew!
  
  		
  			// if this is a trackback
  			if ($comment->comment_type == 'trackback') {
  			
! 				// and we chose to display them either above or below regular comments
! 				if ($mandigo_options['trackbacks_position'] == 'above' || $mandigo_options['trackbacks_position'] == 'below') {
  					// put them in a separate list
  					$trackback_list[] = $comment_list_item;
  				}
  				
! 				// if we chose to display them along other comments
! 				elseif ($mandigo_options['trackbacks_position'] == 'along') {
  					$comment_list[] = $comment_list_item;
  				}
  			}
--- 123,143 ----
  					: ''
  				),
  				
! 				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;
  				}
  			}
***************
*** 167,174 ****
  
  		} // end of foreach loop
  
! 		// if we have trackbacks and we chose to display them ABOVE comments
! 		if ($mandigo_options['trackbacks_position'] == 'above' && $trackback_list) {
  ?>
  	<br />
  	<div id="trackbacks"><?php _e('Trackbacks', 'mandigo'); ?></div> 
--- 148,155 ----
  
  		} // 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> 
***************
*** 180,189 ****
  	<div id="trackbacks"><?php _e('Comments', 'mandigo'); ?></div> 
  <?php
  		}
- 
- 
- 
- 		// the comments
  ?>
  
  	<ol class="commentlist">
--- 161,166 ----
***************
*** 193,203 ****
  	</ol>
  
  <?php
! 
! 
! 
! 		// if we have trackbacks and we chose to display them BELOW comments
! 		if ($mandigo_options['trackbacks_position'] == 'below' && $trackback_list) {
  ?>
  	<div id="trackbacks"><?php _e('Trackbacks', 'mandigo'); ?></div> 
  	<ol class="commentlist">
--- 170,177 ----
  	</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">
***************
*** 212,218 ****
  	
  	
  	
! 	// this is displayed when there are no comments
  	else {
  
  		// if comments are open (but there are no comments)
--- 186,192 ----
  	
  	
  	
! 	// this is displayed if there are no comments so far
  	else {
  
  		// if comments are open (but there are no comments)
***************
*** 228,235 ****
  		}
  	} // end of 'whether there are comments or not' condition
  
! 
! 
  	// if comments are open
  	if ($post->comment_status == 'open') {
  ?>
--- 202,209 ----
  		}
  	} // end of 'whether there are comments or not' condition
  
! 	
! 	
  	// if comments are open
  	if ($post->comment_status == 'open') {
  ?>
***************
*** 244,251 ****
  <?php
  	}
  
! 
! 
  	// if user can leave a comment
  	else {
  ?>
--- 218,225 ----
  <?php
  	}
  
! 	
! 	
  	// if user can leave a comment
  	else {
  ?>
***************
*** 261,267 ****
  
  <?php
  		}
! 
  		// if the user is not logged in
  		else {
  ?>
--- 235,241 ----
  
  <?php
  		}
! 		
  		// if the user is not logged in
  		else {
  ?>
***************
*** 281,287 ****
  		
  		
  		// if HTML tags are allowed in comments
! 		if ($mandigo_options['comments_allow_markup']) {
  ?>
  	<p><small><strong>XHTML:</strong> <?php _e('You can use these tags:', 'mandigo'); ?> <?php echo allowed_tags(); ?></small></p>
  <?php
--- 255,261 ----
  		
  		
  		// 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
Binary files mandigo-1.34/de_DE.mo and mandigo-1.33.1/de_DE.mo differ
Only in mandigo-1.33.1: farbtastic.css
diff -rc mandigo-1.34/footer.php mandigo-1.33.1/footer.php
*** mandigo-1.34/footer.php	2008-06-03 20:47:22.000000000 -0400
--- mandigo-1.33.1/footer.php	2008-04-28 08:56:54.000000000 -0400
***************
*** 14,20 ****
  
  	*/
  
! 	global $mandigo_options, $dirs, $wpmu;
  ?>
  </tr>
  </table>
--- 14,20 ----
  
  	*/
  
! 	global $dirs, $wpmu;
  ?>
  </tr>
  </table>
***************
*** 31,38 ****
  	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><br />
! 		<a href="http://<?php echo $current_site->domain . $current_site->path ?>wp-signup.php">Create a new blog</a> and join in the fun! <a href="http://www.onehertz.com/portfolio/wordpress/" target="_blank" title="WordPress MU themes">Mandigo theme</a> by tom
  
  <?php
  	}
--- 31,37 ----
  	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
  	}
***************
*** 44,61 ****
  
  <?php
  	}
- 
- 
- 
- 	// the rss links
  ?>
  		<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 ($mandigo_options['footer_statistics']) {
  ?>
  		<br /><?php echo get_num_queries(); ?> queries. <?php timer_stop(1); ?> seconds.
  <?php
--- 43,54 ----
  
  <?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
***************
*** 69,100 ****
  	// WordPress footer
  	wp_footer();
  
! 	// set the theorical max-width value for the content column
! 	switch ($mandigo_options['layout_width']) {
! 		case 1024:
! 			switch ($mandigo_options['sidebar_count']) {
! 				case 0:
! 					$maxw = 915;
! 					break;
! 				case 1:
! 					$maxw = 685;
! 					break;
! 				case 2:
! 					$maxw = 455;
! 					break;
! 			}
! 			break;
! 		case 800:
! 			switch ($mandigo_options['sidebar_count']) {
! 				case 0:
! 					$maxw = 691;
! 					break;
! 				case 1:
! 				case 2:
! 					$maxw = 461;
! 					break;
! 			}
! 			break;
  	}
  ?>
  
--- 62,80 ----
  	// 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;
! 		}
! 		elseif (get_option('mandigo_nosidebars')) {
! 			$maxw = 915;
! 		}
! 		else {
! 			$maxw = 685;
! 		}
! 	}
! 	else {
  	}
  ?>
  
***************
*** 111,117 ****
  			if (/^[56]/.test(jQuery.browser.version)) {
  				jQuery.ifixpng('<?php echo $dirs['www']['images']; ?>1x1.gif');
  				jQuery('body, .png').ifixpng();
- 				jQuery('.commentlist .avatar').height(36);
  			}
  			jQuery('.entry object, .entry img').load(function() {
  				o = jQuery(this);
--- 91,96 ----
***************
*** 127,137 ****
  			});
  
  <?php
- 
- 
- 
  	// if the 'pre whitespace' fix is enabled
! 	if ($mandigo_options['fixes_whitespace_pre']) {
  ?>
  			jQuery('*').each(function() { if (this.style.whiteSpace == 'pre') jQuery(this).css({'white-space':'normal'}); });
  <?php
--- 106,113 ----
  			});
  
  <?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
***************
*** 140,171 ****
  		}
  
  <?php
- 
- 
- 
  	// if the 'strip url in comments' fix is enabled
! 	if ($mandigo_options['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 ($mandigo_options['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 (!$mandigo_options['disable_animations']) {
! 		// if we chose to collapse all posts by default,
! 		// have jquery hide all containers which have the .entry class
! 		if ($mandigo_options['collapse_posts']) {
  ?>
  		jQuery('.entry').hide();
  <?php
--- 116,139 ----
  		}
  
  <?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
***************
*** 182,188 ****
  			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.comment').animate({ height: 'toggle', opacity: 'toggle' }, 1000);
  		}
  
  		toggleSidebars = function() {
--- 150,156 ----
  			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() {
***************
*** 201,217 ****
  
  
  	// if we chose to apply a drop shadow to blog name & description
! 	if ($mandigo_options['header_blogname_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 ($mandigo_options['header_blogname_stroke']) {
  ?>
  		jQuery.each(['tl','tr','bl','br'],function() {
  			jQuery('#blogname').after('<span class="blogname text-stroke-'+ this +'">'+ jQuery('#blogname a').html() +'<\/span>');
--- 169,185 ----
  
  
  	// 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>');
***************
*** 221,262 ****
  	}
  
  
! 
  	// if sidebar1 should go to the left
! 	if ($mandigo_options['sidebar_1_position'] == 'left') {
  ?>
- 		jQuery('#sidebar1 script[src@=googlesyndication]').remove();
  		t = jQuery('#sidebar1').clone();
  		jQuery('#sidebar1').remove();
  		jQuery('td#content').before(t);
  <?php
  	}
! 
! 
! 
  	// if sidebar2 should go to the left
! 	if ($mandigo_options['sidebar_2_position'] == 'left') {
  ?>
- 		jQuery('#sidebar2 script[src@=googlesyndication]').remove();
  		t = jQuery('#sidebar2').clone();
  		jQuery('#sidebar2').remove();
  		jQuery('td#content').before(t);
  <?php
  	}
! 
! 
! 
  	// if the 'touch content' fix is enabled
! 	if ($mandigo_options['fixes_touch_content']) {
  ?>
  		jQuery('#content').css({verticalAlign:'top'});
  		window.onLoad = function() { jQuery('#content').css({verticalAlign:'top'}); }
  <?php
  	}
- 
- 
- 
- 	// header navigation submenus
  ?>
  
  		jQuery('#header .page_item').hover(
--- 189,224 ----
  	}
  
  
! 	
  	// 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(
***************
*** 265,277 ****
  				ul = jQuery(this).find('ul');
  				y = a.position().top + a.height();
  <?php
! 	// apply the same alignment as the top navigation items to submenus 
! 	if ($mandigo_options['header_navigation_position'] == 'left') {
  ?>
  				x = a.position().left;
  <?php
  	}
! 	elseif ($mandigo_options['header_navigation_position'] == 'right') {
  ?>
  				x = a.position().left + a.width() - ul.width();
  <?php
--- 227,239 ----
  				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
***************
*** 282,312 ****
  <?php
  	}
  ?>
! 				ul.css({left:x, top:y}).show();
  			},
  			function() {
  				jQuery(this).find('ul').hide();
  			}
  		);
! <?php
! 
! 
! 
! 	// fix the shifted footer in the signup form on WPMU
! 	if ($wpmu && function_exists('signup_blog')) {
! ?>
! 		jQuery('#page').css({marginBottom:0});
! <?php
! 	}
! 
! 
! 
! 	// alternate coloring of comments
! ?>
! 
! 		jQuery('.commentlist li:even').addClass('alt');
! });
! 
  // ]]> -->
  </script>
  </body>
--- 244,256 ----
  <?php
  	}
  ?>
! 				ul.css({left:x, top:y}).slideDown().css({zIndex:999});
  			},
  			function() {
  				jQuery(this).find('ul').hide();
  			}
  		);
! 	});
  // ]]> -->
  </script>
  </body>
diff -rc mandigo-1.34/functions.php mandigo-1.33.1/functions.php
*** mandigo-1.34/functions.php	2008-06-03 20:47:22.000000000 -0400
--- mandigo-1.33.1/functions.php	2008-04-28 08:56:54.000000000 -0400
***************
*** 1,22 ****
  <?php
- 	$theme_data      = get_theme('Mandigo');
- 	$mandigo_version = $theme_data['Version'];
- 	
- 	$mandigo_options = get_option('mandigo_options');
- 	if (!$mandigo_options || $mandigo_version != $mandigo_options['version']) {
- 		include_once('backend/upgrade.php');
- 		mandigo_upgrade($from = $mandigo_options['version'], $to = $mandigo_version);
- 	}
- 
- 
- 
- 
- 
  	// this loads the .mo translation file defined in wp-config.php
  	load_theme_textdomain('mandigo');
  
! 
! 
  	// 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 .'/';
--- 1,8 ----
  <?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 .'/';
***************
*** 30,45 ****
  				'schemes',
  				'images/patterns',
  				'images/headers',
! 				'images/icons',
! 				'backend',
  			) 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) {
--- 16,28 ----
  				'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) {
***************
*** 50,134 ****
  	}
  	sort($schemes);
  
! 
  
  	// 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');
  
  
  
- 	// some options may have no value, but we can't live without these ones
- 	$old_options = $mandigo_options;
- 	// make sure a scheme is selected, and that it's part of the pool of available schemes
- 	if (!$mandigo_options['scheme'] || !array_search($mandigo_options['scheme'], $schemes))
- 		$mandigo_options['scheme'] = $schemes[0];
- 
- 	if (!$mandigo_options['background_color'])           $mandigo_options['background_color']            = '#44484F';
- 	if (!$mandigo_options['background_pattern_repeat'])  $mandigo_options['background_pattern_repeat']   = 'repeat';
- 	if (!$mandigo_options['trackbacks_position'])        $mandigo_options['trackbacks_position']         = 'along';
- 	if (!$mandigo_options['header_navigation_position']) $mandigo_options['header_navigation_position']  = 'right';
- 	if (!$mandigo_options['date_format'])                $mandigo_options['date_format']                 = 'MdY';
- 	// colors
- 	if (!$mandigo_options['color_post_background'])      $mandigo_options['color_post_background']       = '#FAFAFA';
- 	if (!$mandigo_options['color_post_border'])          $mandigo_options['color_post_border']           = '#EEEEEE';
- 	if (!$mandigo_options['color_sidebar_background'])   $mandigo_options['color_sidebar_background']    = '#EEEEEE';
- 	if (!$mandigo_options['color_sidebar_border'])       $mandigo_options['color_sidebar_border']        = '#DDDDDD';
- 	// SEO title schemes
- 	if (!$mandigo_options['title_scheme_index'])         $mandigo_options['title_scheme_index']          = '%blogname% - %tagline%';
- 	if (!$mandigo_options['title_scheme_single'])        $mandigo_options['title_scheme_single']         = '%blogname% &raquo; %post%';
- 	if (!$mandigo_options['title_scheme_page'])          $mandigo_options['title_scheme_page']           = '%blogname% &raquo; %post%';
- 	if (!$mandigo_options['title_scheme_category'])      $mandigo_options['title_scheme_category']       = '%blogname% &raquo; Archive for %category%';
- 	if (!$mandigo_options['title_scheme_date'])          $mandigo_options['title_scheme_date']           = '%blogname% &raquo; Archive for %date%';
- 	if (!$mandigo_options['title_scheme_search'])        $mandigo_options['title_scheme_search']         = '%blogname% &raquo; Search Results for &quot;%search%&quot;';
- 	// SEO heading levels
- 	if (!$mandigo_options['heading_level_blogname'])          $mandigo_options['heading_level_blogname']          = 'h1';
- 	if (!$mandigo_options['heading_level_blogdesc'])          $mandigo_options['heading_level_blogdesc']          = 'h6';
- 	if (!$mandigo_options['heading_level_post_title_multi'])  $mandigo_options['heading_level_post_title_multi']  = 'h3';
- 	if (!$mandigo_options['heading_level_post_title_single']) $mandigo_options['heading_level_post_title_single'] = 'h2';
- 	if (!$mandigo_options['heading_level_page_title'])        $mandigo_options['heading_level_pagetitle']         = 'h2';
- 	if (!$mandigo_options['heading_level_widget_title'])      $mandigo_options['heading_level_widget_title']      = 'h4';
- 	// if we have reset some options, save changes
- 	if ($old_options != $mandigo_options)
- 		update_option('mandigo_options', $mandigo_options);
- 
- 
- 	// now that we have a (valid) current scheme, set its local and remote locations
- 	$dirs['loc']['scheme'] = $dirs['loc']['schemes'] . $mandigo_options['scheme'] .'/';
- 	$dirs['www']['scheme'] = $dirs['www']['schemes'] . $mandigo_options['scheme'] .'/';
  
  
  
! 	// the following two functions search for files matching a regex pattern, recursively
! 	// based on http://www.php.net/function.opendir#78262
! 	function m_find_in_dir($root, $pattern) {
! 		$result = array();
! 		if (false === m_find_in_dir_i__($root, $pattern, $result))
! 			return false;
! 		return $result;
! 	}
! 	function m_find_in_dir_i__($root, $pattern, &$result ) {
! 		$dh = @opendir( $root );
! 		if (false === $dh)
! 			return false;
! 		while ($file = readdir($dh)) {
! 			if("." == $file || ".." == $file)
! 				continue;
! 			if(false !== @eregi($pattern, "{$root}/{$file}"))
! 				$result[] = "{$root}/{$file}";
! 			if(is_dir("{$root}/{$file}"))
! 				m_find_in_dir_i__("{$root}/{$file}", $pattern, $result);
  		}
! 		closedir($dh);
! 		return true;
  	}
  
  
  
  	// this function will build links to author archives for us
  	function mandigo_author_link($author_id, $author_nicename) {
! 		// the get_author_posts_url() function is not defined in some translated versions of WP
  		// so we double check it exists
  		if (function_exists('get_author_posts_url')) {
  			return sprintf(
--- 33,213 ----
  	}
  	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(
***************
*** 144,159 ****
  		return $author_nicename;
  	}
  
! 
! 
! 	// this function builds the 'date stamps'
  	function mandigo_date_icon($date) {
- 		global $mandigo_options;
- 		
  		// split the supplied argument into (year, month_name, month_number, day)
  		list($y, $mn, $m, $d) = explode(' ', $date);
  		
! 		switch ($mandigo_options['date_format']) {
  			case 'MdY':
  				$l = array($mn, $d, $y);
  				$x = array(1, 0, 0);
--- 223,236 ----
  		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);
***************
*** 177,185 ****
  
  
  
! 	include('backend/widgets.php');
! 	include('backend/theme_options.php');
! 	include('backend/html_inserts.php');
! 	include('backend/readme.php');
  
  ?>
--- 254,930 ----
  
  
  
! 	// 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']    );
+ 			mandigo_set_var('clear_all_paragraphs'      ,$_POST['clear_all_paragraphs'] );
+ 		}
+ 		
+ 		// 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 />
+ 
+ 		<input type="checkbox" name="random" value="1" ' .(get_option('mandigo_scheme_random') ? 'checked="checked"' : '') .' /> I like them all, change schemes randomly!<br /><br />
+ 
+ 		<label><b>Background</b></label><br />
+ 		<div id="picker" style="position: absolute; left: 600px;"></div>
+ 		<script type="text/javascript">
+ 			jQuery(document).ready(function() {
+ 				var f = jQuery.farbtastic("#picker");
+ 				jQuery("#picker").hide();
+ 				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();
+ 			}
+ 		</script>
+ 		<table border="0">
+ 			<tr>
+ 				<td align="right" width="180">Background color:</td>
+ 				<td>
+ 					<input type="text" name="bgcolor" id="bgcolor" class="colorpicker" value="'. get_option('mandigo_bgcolor') .'" /> <a href="#" onclick="defaultColor(\'bgcolor\',\'#44484F\'); return false;">restore default</a>
+ 				</td>
+ 			</tr>
+ 			<tr>
+ 				<td align="right">Background pattern:</td>
+ 				<td>
+ 					<select name="wp">
+ 						'.$select_patterns.'
+ 					</select>
+ 				</td>
+ 			</tr>
+ 			<tr>
+ 				<td align="right">Attachment :</td>
+ 				<td>
+ 					<input type="radio" name="wpfixed" value="0" '. ($wp_fixed ? '' : 'checked="checked"') .' />scroll &nbsp; 
+ 					<input type="radio" name="wpfixed" value="1" '. ($wp_fixed ? 'checked="checked"' : '') .' />fixed
+ 				</td>
+ 			</tr>
+ 			<tr>
+ 				<td align="right">Repeat :</td>
+ 				<td>
+ 					<select name="wprepeat">
+ 						<option value="repeat" '.    ($wp_repeat == 'repeat'    ? 'selected="selected"' : '') .'>both horizontally and vertically</option>
+ 						<option value="repeat-x" '.  ($wp_repeat == 'repeat-x'  ? 'selected="selected"' : '') .'>horizontally only</option>
+ 						<option value="repeat-y" '.  ($wp_repeat == 'repeat-y'  ? 'selected="selected"' : '') .'>vertically only</option>
+ 						<option value="no-repeat" '. ($wp_repeat == 'no-repeat' ? 'selected="selected"' : '') .'>do not repeat</option>
+ 					</select>
+ 				</td>
+ 			</tr>
+ 			<tr>
+ 				<td align="right">Position :</td>
+ 				<td>
+ 					<input type="text" name="wpposition" value="'. get_option('mandigo_wp_position') .'" size="30" /> <a href="http://www.w3.org/TR/CSS21/colors.html#propdef-background-position" target="_blank">help</a>
+ 				</td>
+ 			</tr>
+ 		</table>
+ 
+ 		<label><b>Colors</b></label><br />
+ 		<table>
+ 			<tr>
+ 				<td align="right" width="180">Posts background color :</td>
+ 				<td><input type="text" name="posts_bgcolor" id="posts_bgcolor" class="colorpicker" value="'. get_option('mandigo_posts_bgcolor') .'" /> <a href="#" onclick="defaultColor(\'posts_bgcolor\',\'#FAFAFA\'); return false;">restore default</a></td>
+ 			</tr>
+ 			<tr>
+ 				<td align="right">Posts border color :</td>
+ 				<td><input type="text" name="posts_bdcolor" id="posts_bdcolor" class="colorpicker" value="'. get_option('mandigo_posts_bdcolor') .'" /> <a href="#" onclick="defaultColor(\'posts_bdcolor\',\'#EEEEEE\'); return false;">restore default</a></td>
+ 			</tr>
+ 			<tr>
+ 				<td align="right">Sidebars background color :</td>
+ 				<td><input type="text" name="sidebars_bgcolor" id="sidebars_bgcolor" class="colorpicker" value="'. get_option('mandigo_sidebars_bgcolor') .'" /> <a href="#" onclick="defaultColor(\'sidebars_bgcolor\',\'#EEEEEE\'); return false;">restore default</a></td>
+ 			</tr>
+ 			<tr>
+ 				<td align="right">Sidebars border color :</td>
+ 				<td><input type="text" name="sidebars_bdcolor" id="sidebars_bdcolor" class="colorpicker" value="'. get_option('mandigo_sidebars_bdcolor') .'" /> <a href="#" onclick="defaultColor(\'sidebars_bdcolor\',\'#DDDDDD\'); return false;">restore default</a></td>
+ 			</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 />
+ 
+ 		Columns: <select name="sidebars">
+ 				<option value="0" '.  (get_option('mandigo_nosidebars') ? 'selected="selected"' : '') .'>1 column (no sidebar at all)</option>
+ 				<option value="1" '.  (!get_option('mandigo_nosidebars') && !get_option('mandigo_3columns') ? 'selected="selected"' : '') .'>2 columns (1 sidebar, default)</option>
+ 				<option value="2" '.  (get_option('mandigo_3columns') ? 'selected="selected"' : '') .'>3 columns (2 sidebars, 1024px must be selected)</option>
+ 		</select><br /><br />
+ 
+ 		<label><b>Sidebars position</b></label><br/>
+ 		<table border="0">
+ 			<tr>
+ 				<td align="right">First sidebar :</td>
+ 				<td>
+ 					<input type="radio" name="sidebar1" value="1"  '. ($sidebar1 ? 'checked="checked"' : '') .' />left &nbsp; 
+ 					<input type="radio" name="sidebar1" value="0"  '. ($sidebar1 ? '' : 'checked="checked"') .' />right
+ 				</td>
+ 			</tr>
+ 			<tr>
+ 				<td align="right">Second sidebar :</td>
+ 				<td>
+ 					<input type="radio" name="sidebar2" value="1"  '. ($sidebar2 ? 'checked="checked"' : '') .' />left &nbsp; 
+ 					<input type="radio" name="sidebar2" value="0"  '. ($sidebar2 ? '' : 'checked="checked"') .' />right
+ 				</td>
+ 			</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 />
+ 		<cite>It is also possible to use a different image on each page (per-page header images). Please consult the <a href="themes.php?page=README">README page</a> for more information.</cite><br /><br />
+ 
+ 		<label><b>Blog Name &amp; Description</b></label><br />
+ 		<input type="checkbox" name="smalltitle" '. (get_option('mandigo_small_title') ? 'checked="checked"' : '') .' /> Reduce the size font for the blog name (useful for looong titles)<br /> 
+ 		<input type="checkbox" name="hideblogname" '. (get_option('mandigo_hide_blogname') ? 'checked="checked"' : '') .' /> Do not display the blog name<br /> 
+ 		<input type="checkbox" name="hideblogdesc" '. (get_option('mandigo_hide_blogdesc') ? 'checked="checked"' : '') .' /> Do not display the tagline (blog description)<br />
+ 		<input type="checkbox" name="dropshadow" '. (get_option('mandigo_drop_shadow') ? 'checked="checked"' : '') .' /> Add a drop shadow to blog name and description<br /><br />
+                 Apply a black stroke to blog name and blog description for better readability on lighter header images:<br/><br/>
+ 		<input type="radio" name="stroke" value="0"  '. ($stroke ? '' : 'checked="checked"') .' /><img src="'. get_bloginfo('template_directory') .'/option-stroke-off.jpg" alt="off" /> &nbsp; 
+ 		<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>
+ 			<option value="right" '.  ($headnav_alignment == 'right'  ? 'selected="selected"' : '') .'>right</option>
+ 		</select><br /><br />
+                 Apply a translucent black stripe to the header navigation for better readability on light backgrounds:<br/><br/>
+ 		<input type="radio" name="headoverlay" value="0"  '. ($headoverlay ? '' : 'checked="checked"') .' /><img src="'. get_bloginfo('template_directory') .'/option-headoverlay-off.jpg" alt="off" /> &nbsp; 
+ 		<input type="radio" name="headoverlay" value="1"  '. ($headoverlay ? 'checked="checked"' : '') .' /><img src="'. get_bloginfo('template_directory') .'/option-headoverlay-on.jpg"  alt="on"  /><br /><br />
+ 
+ 		<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 />
+ 		<input type="checkbox" name="nojustify" '. (get_option('mandigo_nojustify') ? 'checked="checked"' : '') .' /> Align content to the left instead of using justify alignment<br />
+ 		<input type="checkbox" name="em" '. (get_option('mandigo_em_italics') ? 'checked="checked"' : '') .' /> Display &lt;em&gt; tags as italics<br /><br />
+ 
+ 		<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 />
+ 		
+ 		<label><b>Images</b></label><br/>
+ 		<input type="checkbox" name="clear_all_paragraphs" '. (get_option('mandigo_clear_all_paragraphs') ? 'checked="checked"' : '') .' /> Clear all paragraphs (wraps text of one paragraph at most)<br />
+ 		<input type="checkbox" name="nofloat" '. (get_option('mandigo_nofloat') ? 'checked="checked"' : '') .' /> Do not wrap text around images at all<br />
+ 		<input type="checkbox" name="floatright" '. (get_option('mandigo_floatright') ? 'checked="checked"' : '') .' /> Align images to the right (requires text wrapping)<br />
+ 		<input type="checkbox" name="noborder" '. (get_option('mandigo_noborder') ? 'checked="checked"' : '') .' /> Display images without a border<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>
+ 				<option value="below" '.  ($trackbacks == 'below' ? 'selected="selected"' : '') .'>below comments</option>
+ 				<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/>
+ 		Customize your title tag. Consult the <a href="themes.php?page=README">README page</a> for a list of available variables.
+ 		<table>
+ 			<tr>
+ 				<td style="text-align: right;">Default (index.php):</td>
+ 				<td><input type="text" name="title_scheme_index" size="60" value="'. get_option('mandigo_title_scheme_index') .'" /></td>
+ 			</tr>
+ 			<tr>
+ 				<td style="text-align: right;">Single posts (single.php):</td>
+ 				<td><input type="text" name="title_scheme_single" size="60" value="'. get_option('mandigo_title_scheme_single') .'" /></td>
+ 			</tr>
+ 			<tr>
+ 				<td style="text-align: right;">Pages (page.php):</td>
+ 				<td><input type="text" name="title_scheme_page" size="60" value="'. get_option('mandigo_title_scheme_page') .'" /></td>
+ 			</tr>
+ 			<tr>
+ 				<td style="text-align: right;">Category Archive (archive.php):</td>
+ 				<td><input type="text" name="title_scheme_category" size="60" value="'. get_option('mandigo_title_scheme_category') .'" /></td>
+ 			</tr>
+ 			<tr>
+ 				<td style="text-align: right;">Date Archive (archive.php):</td>
+ 				<td><input type="text" name="title_scheme_date" size="60" value="'. get_option('mandigo_title_scheme_date') .'" /></td>
+ 			</tr>
+ 			<tr>
+ 				<td style="text-align: right;">Search Results (search.php):</td>
+ 				<td><input type="text" name="title_scheme_search" size="60" value="'. get_option('mandigo_title_scheme_search') .'" /></td>
+ 			</tr>
+ 		</table><br />
+ 
+ 		<label><b>Custom header levels</b></label><br/>
+ 		Customize which tags you want to use for the blog name, blog description, posts title, ... This does not affect styles.
+ 		<table>
+ 			<tr>
+ 				<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>
+ 			</tr>
+ 			<tr>
+ 				<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>
+ 			</tr>
+ 			<tr>
+ 				<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>
+ 			</tr>
+ 			<tr>
+ 				<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>
+ 			</tr>
+ 			<tr>
+ 				<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>
+ 			</tr>
+ 			<tr>
+ 				<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 />
+ 		<input type="checkbox" name="fixes_comments_1" '. (get_option('mandigo_fixes_comments_1') ? 'checked="checked"' : '') .' /> Split long urls in users comments at slashes (inserts linebreaks at /\'s)<br />
+ 		<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>Animations</b></label><br/>
+ 		<input type="checkbox" name="no_animations" '. (get_option('mandigo_no_animations') ? 'checked="checked"' : '') .' /> Disable js animations (also removes show/hide buttons in posts)<br /><br />
+ 					
+ 		<label><b>Readability</b></label><br/>
+ 		<input type="checkbox" name="boldlinks" '. (get_option('mandigo_bold_links') ? 'checked="checked"' : '') .' /> Display all links in bold for better readability<br /><br />
+ 					
+ 		<label><b>Really miscellaneous options</b></label><br/>
+ 		<input type="checkbox" name="fullsearchresults" '. (get_option('mandigo_full_search_results') ? 'checked="checked"' : '') .' /> Display full search results, not just titles and metadata<br />
+ 		<input type="checkbox" name="footstats" '. (get_option('mandigo_footer_stats') ? 'checked="checked"' : '') .' /> Display rendering time and SQL statistics in the footer<br />
+ 		</fieldset>
+ 
+ 		<p class="submit"><input type="submit" name="Submit" value="'.__('Update Options &raquo;').'"/></p>
+ 		</form>
+ 
+ 		</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>
+ 		
+ 		<form name="mandigo_options_form" method="post" action="?page=Inserts">
+ 		<input type="hidden" name="updated" value="1" />
+ 		
+ 		<p class="submit"><input type="submit" name="Submit" value="'.__('Update Inserts &raquo;').'"/></p>
+ 
+ 		<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>
+ 		</form>
+ 		</div>';
+   }
+ 
+ 
+ 	// 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>';
+ 	}
  ?>
diff -rc mandigo-1.34/header.php mandigo-1.33.1/header.php
*** mandigo-1.34/header.php	2008-06-03 20:47:22.000000000 -0400
--- mandigo-1.33.1/header.php	2008-04-28 08:56:54.000000000 -0400
***************
*** 5,22 ****
  <meta http-equiv="Content-Type" content="<?php bloginfo('html_type'); ?>; charset=<?php bloginfo('charset'); ?>" />
  
  <title><?php
- 	global $mandigo_options, $mandigo_version, $schemes, $dirs;
  	$title = '';
  
  	// get the appropriate title scheme depending on the type of page
! 	if (is_single())                                 $title = $mandigo_options['title_scheme_single'];
! 	elseif (is_page())                               $title = $mandigo_options['title_scheme_page'];
  	elseif (is_archive()) {
! 		if (is_day() || is_month() || is_year()) $title = $mandigo_options['title_scheme_date'];
! 		else                                     $title = $mandigo_options['title_scheme_category'];
  	}
! 	elseif (is_search())                             $title = $mandigo_options['title_scheme_search'];
! 	else                                             $title = $mandigo_options['title_scheme_index'];
  
  	// proceed with tag substitution
  	$title = str_replace(
--- 5,21 ----
  <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');
! 	elseif (is_page())                           $title = get_option('mandigo_title_scheme_page');
  	elseif (is_archive()) {
! 		if (is_day() || is_month() || is_year()) $title = get_option('mandigo_title_scheme_date');
! 		else                                     $title = get_option('mandigo_title_scheme_category');
  	}
! 	elseif (is_search())                         $title = get_option('mandigo_title_scheme_search');
! 	else                                         $title = get_option('mandigo_title_scheme_index');
  
  	// proceed with tag substitution
  	$title = str_replace(
***************
*** 36,145 ****
  	);
  
  	// category tag substitution
! 	if (single_cat_title('',false))
! 		$title = str_replace('%category%', single_cat_title('', false), $title);
  	else {
  		$categories = str_replace('%category%', get_the_category_list(', '), $title);
  		$title = preg_replace('/<[^>]+>/', '', $categories);
  	}
  
  	// date tag substitution
! 	if     (is_day()  ) $title = str_replace('%date%', get_the_time(__('l, F jS, Y','mandigo')), $title);
! 	elseif (is_month()) $title = str_replace('%date%', get_the_time(__('F, Y','mandigo'))      , $title);
! 	elseif (is_year() ) $title = str_replace('%date%', get_the_time('Y')                       , $title);
  
  	// output the result
  	echo $title;
- 	
  ?></title>
  
  <meta name="generator" content="WordPress <?php bloginfo('version'); ?>" />
! <meta name="theme"     content="Mandigo <?php echo $mandigo_version; ?>" />
  
  <?php
  	// if the "random scheme" option is enabled
! 	if ($mandigo_options['scheme_randomize']) {
! 		$mandigo_options['scheme'] = $schemes[array_rand($schemes, 1)];
! 		update_option('mandigo_options', $mandigo_options);
! 		$dirs['loc']['scheme'] = $dirs['loc']['schemes'] . $mandigo_options['scheme'] .'/';
! 		$dirs['www']['scheme'] = $dirs['www']['schemes'] . $mandigo_options['scheme'] .'/';
  	}
  
! 	// if all links should be bold
! 	if ($mandigo_options['bold_links'])
! 		$lastminutecss[] = '  a { font-weight: bold; }';
  
  
! 	// custom header images magic!
! 	// recursivey find image files named mandigo_header_* in the user's uploaded files folder
! 	$user_headers = m_find_in_dir(
! 		ABSPATH . get_option('upload_path'),
! 		'mandigo_header(_.*)?\.(jpe?g|png|gif|bmp)$'
! 	);
! 	if ($user_headers) {
! 		// if one of the files we found is named after the current post id
! 		foreach ($user_headers as $file) {
! 			if (strstr($file, 'mandigo_header_'. $post->ID .'.')) {
! 				$user_header = $file;
! 			}
! 		}
! 		
! 		// if we didn't find one but the "random headers" option is enabled
! 		if (!$user_header && $mandigo_options['header_random_image']) {
! 			shuffle($user_headers);
! 			$user_header = array_shift($user_headers);
! 		}
! 		
! 		// if we found a header to display at one step or another,
! 		if ($user_header) {
! 			// translate its address
! 			$user_header = str_replace(
! 				ABSPATH . get_option('upload_path'),
! 				get_option('fileupload_url'),
! 				$user_header
! 			);
! 			// and add it to last minuste css rules
! 			$noheaderimg = 1;
! 			$lastminutecss[] = sprintf(
! 				'  #headerimg { background: url(%s) bottom center no-repeat; }',
! 				$user_header
! 			);
! 		}
  	}
! 	
! 	// if we didn't find a custom header in the user's uploaded files
! 	if (!$noheaderimg) {
! 		// if there's a .jpg file named after the current post id in the headers/ folder
! 		if (file_exists($dirs['loc']['headers'] . $post->ID .'.jpg')) {
  			$noheaderimg = 1;
  			$lastminutecss[] = sprintf(
! 				'  #headerimg { background: url(%s.jpg) bottom center no-repeat; }',
! 				$dirs['www']['headers'] . $post->ID
  			);
  		}
- 	
- 		// if we didn't find one but the "random headers" option is enabled
- 		elseif ($mandigo_options['header_random_image']) {
- 			// get a list of images in headers/
- 			$headersdir = opendir($dirs['loc']['headers']);
- 			while (false !== ($file = readdir($headersdir))) {
- 				if (preg_match('/\.(?:jpe?g|png|gif|bmp)$/i', $file))
- 					$headers[] = $file;
- 			}
- 	
- 			// if we have found at least one
- 			if (count($headers)) {
- 				$noheaderimg = 1;
- 				$lastminutecss[] = sprintf(
- 					'  #headerimg {   background: url(%s) bottom center no-repeat; }',
- 					str_replace(
- 						' ',
- 						'%20',
- 						$dirs['www']['headers'] . $headers[array_rand($headers, 1)]
- 					)
- 				);
- 			}
- 		}
  	}
  
  
--- 35,105 ----
  	);
  
  	// category tag substitution
! 	if (single_cat_title('',false)) $title = str_replace('%category%', single_cat_title('',false), $title);
  	else {
  		$categories = str_replace('%category%', get_the_category_list(', '), $title);
  		$title = preg_replace('/<[^>]+>/', '', $categories);
  	}
  
  	// date tag substitution
! 	if     (is_day()  ) $title = str_replace('%date%',get_the_time(__('l, F jS, Y','mandigo')),$title);
! 	elseif (is_month()) $title = str_replace('%date%',get_the_time(__('F, Y','mandigo'))      ,$title);
! 	elseif (is_year() ) $title = str_replace('%date%',get_the_time('Y')                       ,$title);
  
  	// output the result
  	echo $title;
  ?></title>
  
  <meta name="generator" content="WordPress <?php bloginfo('version'); ?>" />
! <meta name="theme"     content="Mandigo <?php $themes = get_themes(); echo $themes['Mandigo']['Version']; ?>" />
  
  <?php
+ 	global $schemes, $dirs;
+ 
  	// if the "random scheme" option is enabled
! 	if (get_option('mandigo_scheme_random')) {
! 		update_option('mandigo_scheme', $schemes[array_rand($schemes, 1)]);
! 		$dirs['loc']['scheme'] = $dirs['loc']['schemes'] . get_option('mandigo_scheme') .'/';
! 		$dirs['www']['scheme'] = $dirs['www']['schemes'] . get_option('mandigo_scheme') .'/';
  	}
  
! 	if (get_option('mandigo_bold_links'))
! 		$lastminutecss[] = "  a { font-weight: bold; }\n";
  
  
! 
! 	// if there a .jpg file named after the current post id in the headers/ folder
! 	if (file_exists($dirs['loc']['headers'] . $post->ID .'.jpg')) {
! 		$noheaderimg = 1;
! 		$lastminutecss[] = sprintf(
! 			"  #headerimg { background: url(%s.jpg) bottom center no-repeat; }\n",
! 			$dirs['www']['headers'] . $post->ID
! 		);
  	}
! 
! 
! 
! 	// if the "random headers" option is enabled
! 	elseif (get_option('mandigo_headers_random')) {
! 		// get a list of images in headers/
! 		$headersdir = opendir($dirs['loc']['headers']);
! 		while (false !== ($file = readdir($headersdir))) {
! 			if (preg_match('/\.(?:jpe?g|png|gif|bmp)$/i', $file))
! 				$headers[] = $file;
! 		}
! 
! 		// if we have found at least one
! 		if (count($headers)) {
  			$noheaderimg = 1;
  			$lastminutecss[] = sprintf(
! 				"  #headerimg {   background: url(%s) bottom center no-repeat; }\n",
! 				str_replace(
! 					' ',
! 					'%20',
! 					$dirs['www']['headers'] . $headers[array_rand($headers, 1)]
! 				)
  			);
  		}
  	}
  
  
***************
*** 151,158 ****
  <link rel="shortcut icon" href="<?php echo $favicon; ?>" type="image/x-icon" />
  <?php
  	}
- 
- 
  ?>
  <link rel="stylesheet" href="<?php bloginfo('stylesheet_url'); ?>.php<?php echo ($noheaderimg ? '?noheaderimg' : '') ?>" type="text/css" media="screen" />
  <link rel="stylesheet" href="<?php echo $dirs['www']['scheme']; ?>scheme.css" type="text/css" media="screen" />
--- 111,116 ----
***************
*** 166,172 ****
  
  <script type="text/javascript" src="<?php echo $dirs['www']['js']; ?>jquery.js"></script>
  <script type="text/javascript" src="<?php echo $dirs['www']['js']; ?>jquery.ifixpng.js"></script>
! <script type="text/javascript">jQuery.noConflict();</script>
  
  <?php
  	// last minute css rules, if any
--- 124,130 ----
  
  <script type="text/javascript" src="<?php echo $dirs['www']['js']; ?>jquery.js"></script>
  <script type="text/javascript" src="<?php echo $dirs['www']['js']; ?>jquery.ifixpng.js"></script>
! <script type="text/javascript" src="<?php echo $dirs['www']['js']; ?>jquery.dimensions.js"></script>
  
  <?php
  	// last minute css rules, if any
***************
*** 182,188 ****
  	}
  
  
! 
  	// HTML Inserts: head
  	echo get_option('mandigo_inserts_header');
  ?>
--- 140,146 ----
  	}
  
  
! 	
  	// HTML Inserts: head
  	echo get_option('mandigo_inserts_header');
  ?>
***************
*** 200,207 ****
  
  
  	// heading levels for blog name & description (h1, h2, div, ...)
! 	$tag_blogname = $mandigo_options['heading_level_blogname'];
! 	$tag_blogdesc = $mandigo_options['heading_level_blogdesc'];
  ?>
  
  <div id="page">
--- 158,165 ----
  
  
  	// heading levels for blog name & description (h1, h2, div, ...)
! 	$tag_blogname = get_option('mandigo_tag_blogname');
! 	$tag_blogdesc = get_option('mandigo_tag_blogdesc');
  ?>
  
  <div id="page">
***************
*** 210,216 ****
  	<div id="headerimg">
  <?php
  	// unless we chose to hide the blogname
! 	if (!$mandigo_options['header_blogname_hide']) {
  ?>
  		<<?php echo $tag_blogname; ?> class="blogname" id="blogname"><a href="<?php echo get_option('home'); ?>/"><?php bloginfo('name'); ?></a></<?php echo $tag_blogname; ?>>
  <?php
--- 168,174 ----
  	<div id="headerimg">
  <?php
  	// unless we chose to hide the blogname
! 	if (!get_option('mandigo_hide_blogname')) {
  ?>
  		<<?php echo $tag_blogname; ?> class="blogname" id="blogname"><a href="<?php echo get_option('home'); ?>/"><?php bloginfo('name'); ?></a></<?php echo $tag_blogname; ?>>
  <?php
***************
*** 219,225 ****
  
  
  	// if blog description is set and unless we chose to hide it
! 	if (!$mandigo_options['header_blogdesc_hide'] && get_bloginfo('description')) {
  ?>
  		<<?php echo $tag_blogdesc; ?> class="blogdesc" id="blogdesc"><?php bloginfo('description'); ?></<?php echo $tag_blogdesc; ?>>
  <?php
--- 177,183 ----
  
  
  	// if blog description is set and unless we chose to hide it
! 	if (!get_option('mandigo_hide_blogdesc') && get_bloginfo('description')) {
  ?>
  		<<?php echo $tag_blogdesc; ?> class="blogdesc" id="blogdesc"><?php bloginfo('description'); ?></<?php echo $tag_blogdesc; ?>>
  <?php
***************
*** 231,246 ****
  	// the first <li> tag is the link to the homepage
  ?>
  
! 		<ul class="pages png<?php echo ($mandigo_options['header_navigation_stripe'] ? ' head_overlay' : ''); ?>">
  			<li class="page_item"><a href="<?php echo get_option('home'); ?>/"><?php _e('Home','mandigo'); ?></a></li>
  <?php
  	// wordpress pages, minus the ones excluded in the theme options
  	wp_list_pages(
  		array(
  			'sort_column' => 'menu_order',
! 			'depth'       => ($mandigo_options['header_navigation_no_submenus'] ? 1 : 2),
  			'title_li'    => '',
! 			'exclude'     => implode(',', $mandigo_options['header_navigation_exclude_pages']),
  		)
  	);
  	// if you want to add custom static links at the end, use something similar to the following
--- 189,204 ----
  	// the first <li> tag is the link to the homepage
  ?>
  
! 		<ul class="pages png<?php echo (get_option('mandigo_headoverlay') ? ' head_overlay' : ''); ?>">
  			<li class="page_item"><a href="<?php echo get_option('home'); ?>/"><?php _e('Home','mandigo'); ?></a></li>
  <?php
  	// wordpress pages, minus the ones excluded in the theme options
  	wp_list_pages(
  		array(
  			'sort_column' => 'menu_order',
! 			'depth'       => (get_option('mandigo_no_submenus') ? 1 : 2),
  			'title_li'    => '',
! 			'exclude'     => get_option('mandigo_exclude_pages'),
  		)
  	);
  	// if you want to add custom static links at the end, use something similar to the following
Only in mandigo-1.33.1/images: attention_catcher.png
Only in mandigo-1.33.1/images: farbtastic_marker.png
Only in mandigo-1.33.1/images: farbtastic_mask.png
Only in mandigo-1.33.1/images: farbtastic_wheel.png
diff -rc mandigo-1.34/index.php mandigo-1.33.1/index.php
*** mandigo-1.34/index.php	2008-06-03 20:47:22.000000000 -0400
--- mandigo-1.33.1/index.php	2008-04-28 08:56:54.000000000 -0400
***************
*** 1,11 ****
  <?php
! 	global $mandigo_options, $dirs;
  
  	get_header();
  
  	// heading levels for posts (h1, h2, div, ...)
! 	$tag_post_title_multi = $mandigo_options['heading_level_post_title_multi'];
! 	$tag_page_title       = $mandigo_options['heading_level_page_title'      ];
  
  	// get sidebar keys
  	global $wp_registered_sidebars;
--- 1,11 ----
  <?php
! 	global $dirs;
  
  	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'      );
  
  	// get sidebar keys
  	global $wp_registered_sidebars;
***************
*** 49,55 ****
  				<?php mandigo_date_icon(get_the_time('Y M m d')); ?>
  <?php
  			// unless we disabled animations, display the buttons
! 			if (!$mandigo_options['disable_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>
--- 49,55 ----
  				<?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>
***************
*** 60,66 ****
  			
  			// the post title
  ?>
! 				<<?php echo $tag_post_title_multi; ?> class="posttitle"><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_post_title_multi; ?>>
  				<small>
  <?php
  			// author information
--- 60,66 ----
  			
  			// the post title
  ?>
! 				<<?php echo $tag_posttitle_multi; ?> class="posttitle"><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
***************
*** 71,77 ****
  			);
  
  			// if wp supports tags, and unless we chose to display tags after the post
! 			if (function_exists('the_tags') && !$mandigo_options['display_tags_after_content'])
  				the_tags(', '. __('tags', 'mandigo') .': ');
  
  			// the "edit post" link, which displays when you are logged in
--- 71,77 ----
  			);
  
  			// 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
***************
*** 95,101 ****
  			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') && $mandigo_options['display_tags_after_content'])
  				the_tags();
  ?>
  			</div>
--- 95,101 ----
  			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>
***************
*** 129,135 ****
  	else {
  ?>
  
! 		<<?php echo $tag_page_title; ?> class="center"><?php _e('Not Found', 'mandigo'); ?></<?php echo $tag_page_title; ?>>
  		<p class="center"><?php _e("Sorry, but you are looking for something that isn't here.", 'mandigo'); ?></p>
  
  <?php
--- 129,135 ----
  	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
***************
*** 149,162 ****
  	</td>
  
  <?php
! 	// if we have at least one sidebar to display
! 	if ($mandigo_options['sidebar_count']) {
  		include (TEMPLATEPATH . '/sidebar.php');
  
  		// if this is a 3-column layout
! 		if ($mandigo_options['layout_width'] == 1024 && $mandigo_options['sidebar_count'] == 2)
  			include (TEMPLATEPATH . '/sidebar2.php');
  	}
  
! 	get_footer();
  ?>
--- 149,162 ----
  	</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(); 
  ?>
Only in mandigo-1.33.1/js: farbtastic.js
Only in mandigo-1.33.1/js: jquery.dimensions.js
diff -rc mandigo-1.34/js/jquery.js mandigo-1.33.1/js/jquery.js
*** mandigo-1.34/js/jquery.js	2008-06-03 20:47:21.000000000 -0400
--- mandigo-1.33.1/js/jquery.js	2008-04-28 08:56:54.000000000 -0400
***************
*** 1,32 ****
  /*
!  * jQuery 1.2.6 - New Wave Javascript
   *
   * Copyright (c) 2008 John Resig (jquery.com)
   * Dual licensed under the MIT (MIT-LICENSE.txt)
   * and GPL (GPL-LICENSE.txt) licenses.
   *
!  * $Date: 2008-05-24 14:22:17 -0400 (Sat, 24 May 2008) $
!  * $Rev: 5685 $
   */
! (function(){var _jQuery=window.jQuery,_$=window.$;var jQuery=window.jQuery=window.$=function(selector,context){return new jQuery.fn.init(selector,context);};var quickExpr=/^[^<]*(<(.|\s)+>)[^>]*$|^#(\w+)$/,isSimple=/^.[^:#\[\.]*$/,undefined;jQuery.fn=jQuery.prototype={init:function(selector,context){selector=selector||document;if(selector.nodeType){this[0]=selector;this.length=1;return this;}if(typeof selector=="string"){var match=quickExpr.exec(selector);if(match&&(match[1]||!context)){if(match[1])selector=jQuery.clean([match[1]],context);else{var elem=document.getElementById(match[3]);if(elem){if(elem.id!=match[3])return jQuery().find(selector);return jQuery(elem);}selector=[];}}else
! return jQuery(context).find(selector);}else if(jQuery.isFunction(selector))return jQuery(document)[jQuery.fn.ready?"ready":"load"](selector);return this.setArray(jQuery.makeArray(selector));},jquery:"1.2.6",size:function(){return this.length;},length:0,get:function(num){return num==undefined?jQuery.makeArray(this):this[num];},pushStack:function(elems){var ret=jQuery(elems);ret.prevObject=this;return ret;},setArray:function(elems){this.length=0;Array.prototype.push.apply(this,elems);return this;},each:function(callback,args){return jQuery.each(this,callback,args);},index:function(elem){var ret=-1;return jQuery.inArray(elem&&elem.jquery?elem[0]:elem,this);},attr:function(name,value,type){var options=name;if(name.constructor==String)if(value===undefined)return this[0]&&jQuery[type||"attr"](this[0],name);else{options={};options[name]=value;}return this.each(function(i){for(name in options)jQuery.attr(type?this.style:this,name,jQuery.prop(this,options[name],type,i,name));});},css:function(key,value){if((key=='width'||key=='height')&&parseFloat(value)<0)value=undefined;return this.attr(key,value,"curCSS");},text:function(text){if(typeof text!="object"&&text!=null)return this.empty().append((this[0]&&this[0].ownerDocument||document).createTextNode(text));var ret="";jQuery.each(text||this,function(){jQuery.each(this.childNodes,function(){if(this.nodeType!=8)ret+=this.nodeType!=1?this.nodeValue:jQuery.fn.text([this]);});});return ret;},wrapAll:function(html){if(this[0])jQuery(html,this[0].ownerDocument).clone().insertBefore(this[0]).map(function(){var elem=this;while(elem.firstChild)elem=elem.firstChild;return elem;}).append(this);return this;},wrapInner:function(html){return this.each(function(){jQuery(this).contents().wrapAll(html);});},wrap:function(html){return this.each(function(){jQuery(this).wrapAll(html);});},append:function(){return this.domManip(arguments,true,false,function(elem){if(this.nodeType==1)this.appendChild(elem);});},prepend:function(){return this.domManip(arguments,true,true,function(elem){if(this.nodeType==1)this.insertBefore(elem,this.firstChild);});},before:function(){return this.domManip(arguments,false,false,function(elem){this.parentNode.insertBefore(elem,this);});},after:function(){return this.domManip(arguments,false,true,function(elem){this.parentNode.insertBefore(elem,this.nextSibling);});},end:function(){return this.prevObject||jQuery([]);},find:function(selector){var elems=jQuery.map(this,function(elem){return jQuery.find(selector,elem);});return this.pushStack(/[^+>] [^+>]/.test(selector)||selector.indexOf("..")>-1?jQuery.unique(elems):elems);},clone:function(events){var ret=this.map(function(){if(jQuery.browser.msie&&!jQuery.isXMLDoc(this)){var clone=this.cloneNode(true),container=document.createElement("div");container.appendChild(clone);return jQuery.clean([container.innerHTML])[0];}else
! return this.cloneNode(true);});var clone=ret.find("*").andSelf().each(function(){if(this[expando]!=undefined)this[expando]=null;});if(events===true)this.find("*").andSelf().each(function(i){if(this.nodeType==3)return;var events=jQuery.data(this,"events");for(var type in events)for(var handler in events[type])jQuery.event.add(clone[i],type,events[type][handler],events[type][handler].data);});return ret;},filter:function(selector){return this.pushStack(jQuery.isFunction(selector)&&jQuery.grep(this,function(elem,i){return selector.call(elem,i);})||jQuery.multiFilter(selector,this));},not:function(selector){if(selector.constructor==String)if(isSimple.test(selector))return this.pushStack(jQuery.multiFilter(selector,this,true));else
! selector=jQuery.multiFilter(selector,this);var isArrayLike=selector.length&&selector[selector.length-1]!==undefined&&!selector.nodeType;return this.filter(function(){return isArrayLike?jQuery.inArray(this,selector)<0:this!=selector;});},add:function(selector){return this.pushStack(jQuery.unique(jQuery.merge(this.get(),typeof selector=='string'?jQuery(selector):jQuery.makeArray(selector))));},is:function(selector){return!!selector&&jQuery.multiFilter(selector,this).length>0;},hasClass:function(selector){return this.is("."+selector);},val:function(value){if(value==undefined){if(this.length){var elem=this[0];if(jQuery.nodeName(elem,"select")){var index=elem.selectedIndex,values=[],options=elem.options,one=elem.type=="select-one";if(index<0)return null;for(var i=one?index:0,max=one?index+1:options.length;i<max;i++){var option=options[i];if(option.selected){value=jQuery.browser.msie&&!option.attributes.value.specified?option.text:option.value;if(one)return value;values.push(value);}}return values;}else
! return(this[0].value||"").replace(/\r/g,"");}return undefined;}if(value.constructor==Number)value+='';return this.each(function(){if(this.nodeType!=1)return;if(value.constructor==Array&&/radio|checkbox/.test(this.type))this.checked=(jQuery.inArray(this.value,value)>=0||jQuery.inArray(this.name,value)>=0);else if(jQuery.nodeName(this,"select")){var values=jQuery.makeArray(value);jQuery("option",this).each(function(){this.selected=(jQuery.inArray(this.value,values)>=0||jQuery.inArray(this.text,values)>=0);});if(!values.length)this.selectedIndex=-1;}else
! this.value=value;});},html:function(value){return value==undefined?(this[0]?this[0].innerHTML:null):this.empty().append(value);},replaceWith:function(value){return this.after(value).remove();},eq:function(i){return this.slice(i,i+1);},slice:function(){return this.pushStack(Array.prototype.slice.apply(this,arguments));},map:function(callback){return this.pushStack(jQuery.map(this,function(elem,i){return callback.call(elem,i,elem);}));},andSelf:function(){return this.add(this.prevObject);},data:function(key,value){var parts=key.split(".");parts[1]=parts[1]?"."+parts[1]:"";if(value===undefined){var data=this.triggerHandler("getData"+parts[1]+"!",[parts[0]]);if(data===undefined&&this.length)data=jQuery.data(this[0],key);return data===undefined&&parts[1]?this.data(parts[0]):data;}else
! return this.trigger("setData"+parts[1]+"!",[parts[0],value]).each(function(){jQuery.data(this,key,value);});},removeData:function(key){return this.each(function(){jQuery.removeData(this,key);});},domManip:function(args,table,reverse,callback){var clone=this.length>1,elems;return this.each(function(){if(!elems){elems=jQuery.clean(args,this.ownerDocument);if(reverse)elems.reverse();}var obj=this;if(table&&jQuery.nodeName(this,"table")&&jQuery.nodeName(elems[0],"tr"))obj=this.getElementsByTagName("tbody")[0]||this.appendChild(this.ownerDocument.createElement("tbody"));var scripts=jQuery([]);jQuery.each(elems,function(){var elem=clone?jQuery(this).clone(true)[0]:this;if(jQuery.nodeName(elem,"script"))scripts=scripts.add(elem);else{if(elem.nodeType==1)scripts=scripts.add(jQuery("script",elem).remove());callback.call(obj,elem);}});scripts.each(evalScript);});}};jQuery.fn.init.prototype=jQuer