diff -rc mandigo-1.35/README.txt mandigo-1.34/README.txt
*** mandigo-1.35/README.txt	2008-06-15 12:42:28.000000000 -0400
--- mandigo-1.34/README.txt	2008-06-03 20:47:22.000000000 -0400
***************
*** 325,331 ****
  Teal Scheme:   "Green Globe" by Jenny W.:       http://www.sxc.hu/profile/emsago
  
  ** 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
  
--- 325,331 ----
  Teal Scheme:   "Green Globe" by Jenny W.:       http://www.sxc.hu/profile/emsago
  
  ** 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
  
***************
*** 333,345 ****
  
  === CHANGELOG ==========================================================================
  
- 1.35
- + added options to set the sidebars width
- + added an option to hide datestamps
- * finally fixed the dropdown menu bug in IE (hi Tim)
- * fixed the color picker not working on WP nightly builds
- * better Windows Live Writer compatibility
- 
  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
--- 333,338 ----
diff -rc mandigo-1.35/backend/html_inserts.php mandigo-1.34/backend/html_inserts.php
*** mandigo-1.35/backend/html_inserts.php	2008-06-15 12:42:28.000000000 -0400
--- mandigo-1.34/backend/html_inserts.php	2008-06-03 20:47:22.000000000 -0400
***************
*** 23,29 ****
  			mandigo_set_insert('body'  ,$_POST['body']  );
  			mandigo_set_insert('top'   ,$_POST['top']   );
  			mandigo_set_insert('footer',$_POST['footer']);
! 			echo '<div class="updated fade"><p>Options updated.</p></div>';
  		}
  
  	echo '
--- 23,29 ----
  			mandigo_set_insert('body'  ,$_POST['body']  );
  			mandigo_set_insert('top'   ,$_POST['top']   );
  			mandigo_set_insert('footer',$_POST['footer']);
! 			echo '<div class="updated fade"><p>Options <strong>updated</strong>.</p></div>';
  		}
  
  	echo '
diff -rc mandigo-1.35/backend/theme_options.php mandigo-1.34/backend/theme_options.php
*** mandigo-1.35/backend/theme_options.php	2008-06-15 12:42:28.000000000 -0400
--- mandigo-1.34/backend/theme_options.php	2008-06-03 20:47:22.000000000 -0400
***************
*** 1,8 ****
  <?php
  	// add the links to the theme options pages, and required files
! 	add_action('admin_menu', 'add_mandigo_options_page'   );
! 	add_action('admin_head', 'add_mandigo_options_css'    );
! 	add_action('admin_head', 'add_mandigo_farbtastic_libs');
  
  	// the functions that load the theme options page
  	function add_mandigo_options_page() {
--- 1,9 ----
  <?php
  	// 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_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 page
  	function add_mandigo_options_page() {
***************
*** 19,31 ****
  		global $dirs;
  		echo '<link rel="stylesheet" type="text/css" href="'. $dirs['www']['backend'] .'css/options.css" />';
  	}
! 	
! 	
! 	
! 	// this function includes the required files for the colorpicker to work
! 	function add_mandigo_farbtastic_libs() {
  		global $dirs;
- 		echo '<script type="text/javascript" src="'. $dirs['www']['backend'] .'js/farbtastic.js"></script>';
  		echo '<link rel="stylesheet" type="text/css" href="'. $dirs['www']['backend'] .'css/farbtastic.css" />';
  	}
  
--- 20,33 ----
  		global $dirs;
  		echo '<link rel="stylesheet" type="text/css" href="'. $dirs['www']['backend'] .'css/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', false, '1.2.6');
! 		wp_enqueue_script('farbtastic', 'http://'. $_SERVER['SERVER_NAME'] . $dirs['www']['backend'] .'js/farbtastic.js', array('jquery'), fale);
! 	}
! 	function add_mandigo_farbtastic_css() {
  		global $dirs;
  		echo '<link rel="stylesheet" type="text/css" href="'. $dirs['www']['backend'] .'css/farbtastic.css" />';
  	}
  
***************
*** 103,110 ****
  					'sidebar_always_show',
  					'sidebar_1_position',
  					'sidebar_2_position',
- 					'sidebar_1_width',
- 					'sidebar_2_width',
  					'header_blogname_smaller_font',
  					'header_blogname_stroke',
  					'header_blogname_shadow',
--- 105,110 ----
***************
*** 145,151 ****
  					'fixes_touch_content',
  					'footer_statistics',
  					'full_search_results',
- 					'no_datestamps',
  				)
  				as $field
  			) {
--- 145,150 ----
***************
*** 368,390 ****
  					<input type="radio" name="sidebar_2_position" value="right" '. ($mandigo_options['sidebar_2_position'] != 'left' ? 'checked="checked"' : '') .' />right
  				</td>
  			</tr>
- 		</table><br />
- 		
- 
- 		<label><b>Sidebars width</b></label><br/>
- 		<table border="0">
- 			<tr>
- 				<td align="right">First sidebar :</td>
- 				<td>
- 					<input type="text" name="sidebar_1_width" id="sidebar_1_width" value="'.  $mandigo_options['sidebar_1_width'] .'" style="width: 4em" /> px <a href="#" onclick="jQuery(\'#sidebar_1_width\').attr(\'value\', 210); return false;">restore default</a>
- 				</td>
- 			</tr>
- 			<tr>
- 				<td align="right">Second sidebar :</td>
- 				<td>
- 					<input type="text" name="sidebar_2_width" id="sidebar_2_width" value="'.  $mandigo_options['sidebar_2_width'] .'" style="width: 4em" /> px <a href="#" onclick="jQuery(\'#sidebar_2_width\').attr(\'value\', 210); return false;">restore default</a>
- 				</td>
- 			</tr>
  		</table>
  		</fieldset>
  		<br/>
--- 367,372 ----
***************
*** 430,440 ****
  		<input type="checkbox" name="display_tags_after_content" '. ($mandigo_options['display_tags_after_content'] ? 'checked="checked"' : '') .' /> Display tags after the content instead of next to categories (WP2.3+)<br />
  		<input type="checkbox" name="dont_justify" '. ($mandigo_options['dont_justify'] ? 'checked="checked"' : '') .' /> Align content to the left instead of using justify alignment<br />
  		<input type="checkbox" name="emphasize_as_bold" '. ($mandigo_options['emphasize_as_bold'] ? 'checked="checked"' : '') .' /> Display &lt;em&gt; tags as bold<br /><br />
- 		
- 		<label><b>Dates</b></label><br/>
- 		<input type="checkbox" name="no_datestamps" '. ($mandigo_options['no_datestamps'] ? 'checked="checked"' : '') .' /> Do not display date stamps<br />
  
! 		Date Format: <select name="date_format">
  			<option value="dmY" '. ($mandigo_options['date_format'] == 'dmY' ? 'selected="selected"' : '') .'>dd/mm/yyyy</option>
  			<option value="MdY" '. ($mandigo_options['date_format'] == 'MdY' ? 'selected="selected"' : '') .'>month/dd/yyyy</option>
  		</select><br /><br />
--- 412,420 ----
  		<input type="checkbox" name="display_tags_after_content" '. ($mandigo_options['display_tags_after_content'] ? 'checked="checked"' : '') .' /> Display tags after the content instead of next to categories (WP2.3+)<br />
  		<input type="checkbox" name="dont_justify" '. ($mandigo_options['dont_justify'] ? 'checked="checked"' : '') .' /> Align content to the left instead of using justify alignment<br />
  		<input type="checkbox" name="emphasize_as_bold" '. ($mandigo_options['emphasize_as_bold'] ? 'checked="checked"' : '') .' /> Display &lt;em&gt; tags as bold<br /><br />
  
! 		<label><b>Date Format</b></label><br/>
! 		<select name="date_format">
  			<option value="dmY" '. ($mandigo_options['date_format'] == 'dmY' ? 'selected="selected"' : '') .'>dd/mm/yyyy</option>
  			<option value="MdY" '. ($mandigo_options['date_format'] == 'MdY' ? 'selected="selected"' : '') .'>month/dd/yyyy</option>
  		</select><br /><br />
diff -rc mandigo-1.35/backend/upgrade.php mandigo-1.34/backend/upgrade.php
*** mandigo-1.35/backend/upgrade.php	2008-06-15 12:42:28.000000000 -0400
--- mandigo-1.34/backend/upgrade.php	2008-06-03 20:47:22.000000000 -0400
***************
*** 3,8 ****
--- 3,9 ----
  		global $mandigo_options, $global;
  		
  		switch ($to) {
+ 			default:
  			case 1.34:
  				mandigo_upgrade_134($from);
  				break;
diff -rc mandigo-1.35/footer.php mandigo-1.34/footer.php
*** mandigo-1.35/footer.php	2008-06-15 12:42:28.000000000 -0400
--- mandigo-1.34/footer.php	2008-06-03 20:47:22.000000000 -0400
***************
*** 107,115 ****
  			function() { this.src = this.src.replace('_hover.gif','.gif'); }
  		);
  
- 		jQuery('.entry img[align=left]' ).addClass('alignleft' );
- 		jQuery('.entry img[align=right]').addClass('alignright');
- 		
  		if (jQuery.browser.msie) {
  			if (/^[56]/.test(jQuery.browser.version)) {
  				jQuery.ifixpng('<?php echo $dirs['www']['images']; ?>1x1.gif');
--- 107,112 ----
diff -rc mandigo-1.35/functions.php mandigo-1.34/functions.php
*** mandigo-1.35/functions.php	2008-06-15 12:42:28.000000000 -0400
--- mandigo-1.34/functions.php	2008-06-03 20:47:22.000000000 -0400
***************
*** 89,99 ****
  	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';
- 	// sidebar width
- 	$mandigo_options['sidebar_1_width'] = intval($mandigo_options['sidebar_1_width']);
- 	$mandigo_options['sidebar_2_width'] = intval($mandigo_options['sidebar_2_width']);
- 	if (!is_int($mandigo_options['sidebar_1_width']) || !$mandigo_options['sidebar_1_width']) $mandigo_options['sidebar_1_width'] = 210;
- 	if (!is_int($mandigo_options['sidebar_2_width']) || !$mandigo_options['sidebar_2_width']) $mandigo_options['sidebar_2_width'] = 210;
  	// if we have reset some options, save changes
  	if ($old_options != $mandigo_options)
  		update_option('mandigo_options', $mandigo_options);
--- 89,94 ----
***************
*** 155,164 ****
  	function mandigo_date_icon($date) {
  		global $mandigo_options;
  		
- 		// if we chose to hide datestamps, stop here
- 		if ($mandigo_options['no_datestamps'])
- 			return;
- 		
  		// split the supplied argument into (year, month_name, month_number, day)
  		list($y, $mn, $m, $d) = explode(' ', $date);
  		
--- 150,155 ----
diff -rc mandigo-1.35/header.php mandigo-1.34/header.php
*** mandigo-1.35/header.php	2008-06-15 12:42:28.000000000 -0400
--- mandigo-1.34/header.php	2008-06-03 20:47:22.000000000 -0400
***************
*** 142,157 ****
  		}
  	}
  
- 	
- 	
- 	
- 	
- 	// Windows Live Writer needs this when it updates blog settings for image placement to work
- 	if (stristr($_SERVER['HTTP_USER_AGENT'], 'Windows Live Writer'))
- 		$lastminutecss[] = '  .entry img { float: none; }';
- 
- 
- 	
  
  
  	// if favicon is present
--- 142,147 ----
***************
*** 163,169 ****
  	}
  
  
- 	
  ?>
  <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" />
--- 153,158 ----
diff -rc mandigo-1.35/style.css mandigo-1.34/style.css
*** mandigo-1.35/style.css	2008-06-15 12:42:28.000000000 -0400
--- mandigo-1.34/style.css	2008-06-03 20:47:21.000000000 -0400
***************
*** 2,8 ****
  Theme Name: Mandigo
  Theme URI: http://www.onehertz.com/portfolio/wordpress/
  Description: Mandigo is an elegant widget-ready one/two/three-column Wordpress theme, available in two widths, SEVEN color schemes and 38 languages!
! Version: 1.35
  Author: t0mmmmmmm
  Author URI: http://www.onehertz.com/portfolio/wordpress/
  */
--- 2,8 ----
  Theme Name: Mandigo
  Theme URI: http://www.onehertz.com/portfolio/wordpress/
  Description: Mandigo is an elegant widget-ready one/two/three-column Wordpress theme, available in two widths, SEVEN color schemes and 38 languages!
! Version: 1.34
  Author: t0mmmmmmm
  Author URI: http://www.onehertz.com/portfolio/wordpress/
  */
diff -rc mandigo-1.35/style.css.php mandigo-1.34/style.css.php
*** mandigo-1.35/style.css.php	2008-06-15 12:42:28.000000000 -0400
--- mandigo-1.34/style.css.php	2008-06-03 20:47:22.000000000 -0400
***************
*** 65,73 ****
  	header('Content-type: text/css');
  
  	$ie      = preg_match("/MSIE [4-6]/", $_SERVER['HTTP_USER_AGENT']);
! 	$ie7     = stristr($_SERVER['HTTP_USER_AGENT'], 'MSIE 7');
! 	$safari  = stristr($_SERVER['HTTP_USER_AGENT'], 'Safari');
! 	$firefox = stristr($_SERVER['HTTP_USER_AGENT'], 'Firefox');
  ?>
  
  /* Begin Typography & Colors */
--- 65,73 ----
  	header('Content-type: text/css');
  
  	$ie      = preg_match("/MSIE [4-6]/", $_SERVER['HTTP_USER_AGENT']);
! 	$ie7     = preg_match("/MSIE 7/",     $_SERVER['HTTP_USER_AGENT']);
! 	$safari  = preg_match("/Safari/",     $_SERVER['HTTP_USER_AGENT']);
! 	$firefox = preg_match("/Firefox/",    $_SERVER['HTTP_USER_AGENT']);
  ?>
  
  /* Begin Typography & Colors */
***************
*** 165,174 ****
  	font-size: 1.4em;
  }
  
- .inline-widgets .widgettitle {
- 	letter-spacing: -.05em;
- }
- 
  .sidebars .widgettitle, #wp-calendar caption, cite {
  	text-decoration: none;
  }
--- 165,170 ----
***************
*** 356,362 ****
  	top: 11px;
  	height: <?php echo (226-($mandigo_options['header_slim'] ? 100 : 0)); ?>px;
  	width: <?php echo ($mandigo_options['layout_width']-63); ?>px;
- 	z-index: 100;
  <?php
  	if (!isset($_GET['noheaderimg'])) {
  ?>
--- 352,357 ----
***************
*** 471,490 ****
  ?>
  
  .sidebars {
  	background: <?php echo $mandigo_options['color_sidebar_background']; ?>;
  	border: 1px solid <?php echo $mandigo_options['color_sidebar_border']; ?>;
  	padding: 5px;
  	overflow: hidden;
  }
  
- #sidebar1 .sidebars {
- 	width: <?php echo $mandigo_options['sidebar_1_width']; ?>px;
- }
- 
- #sidebar2 .sidebars {
- 	width: <?php echo $mandigo_options['sidebar_2_width']; ?>px;
- }
- 
  .pagetitle {
  	text-align: center;
  }
--- 466,478 ----
  ?>
  
  .sidebars {
+ 	width: 210px;
  	background: <?php echo $mandigo_options['color_sidebar_background']; ?>;
  	border: 1px solid <?php echo $mandigo_options['color_sidebar_border']; ?>;
  	padding: 5px;
  	overflow: hidden;
  }
  
  .pagetitle {
  	text-align: center;
  }
***************
*** 593,599 ****
  	margin: 3px 0 3px 10px;
  }
  
! .entry .alignleft  {
  	clear: left;
  	float: left;
  	margin: 3px 10px 3px 0;
--- 581,587 ----
  	margin: 3px 0 3px 10px;
  }
  
! .entry .alignleft {
  	clear: left;
  	float: left;
  	margin: 3px 10px 3px 0;