diff -rc mandigo-1.36/404.php mandigo-1.35/404.php
*** mandigo-1.36/404.php	2008-07-20 16:44:36.000000000 -0400
--- mandigo-1.35/404.php	2008-06-15 12:42:28.000000000 -0400
***************
*** 4,10 ****
  	get_header();
  
  ?>
! 	<td id="content" class="narrowcolumn"<?php if (mandigo_sidebox_conditions()) { ?> rowspan="2"<?php } ?>>
  
  		<div class="four04">
  			<span class="four04-big">404</span><br />
--- 4,10 ----
  	get_header();
  
  ?>
! 	<td id="content" class="narrowcolumn">
  
  		<div class="four04">
  			<span class="four04-big">404</span><br />
***************
*** 16,24 ****
  <?php
  	// if we have at least one sidebar to display
  	if ($mandigo_options['sidebar_count']) {
- 		if (mandigo_sidebox_conditions())
- 			include (TEMPLATEPATH . '/sidebox.php');
- 	
  		include (TEMPLATEPATH . '/sidebar.php');
  
  		// if this is a 3-column layout
--- 16,21 ----
diff -rc mandigo-1.36/README.txt mandigo-1.35/README.txt
*** mandigo-1.36/README.txt	2008-07-20 16:44:36.000000000 -0400
--- mandigo-1.35/README.txt	2008-06-15 12:42:28.000000000 -0400
***************
*** 333,347 ****
  
  === CHANGELOG ==========================================================================
  
- 1.36
- + added a new widget container (sidebox) which spans the two sidebars when they are 
-   aligned on the right side
- + added a new HTML Inserts field for late code (right before the closing </body> tag)
- + added an option to create drop caps
- * silenced a few annoying php warnings
- * fixed image/object resizing again
- * fixed the upgrade system not retroactively applying updates
- 
  1.35
  + added options to set the sidebars width
  + added an option to hide datestamps
--- 333,338 ----
diff -rc mandigo-1.36/archive.php mandigo-1.35/archive.php
*** mandigo-1.36/archive.php	2008-07-20 16:44:36.000000000 -0400
--- mandigo-1.35/archive.php	2008-06-15 12:42:28.000000000 -0400
***************
*** 7,13 ****
  	$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 (mandigo_sidebox_conditions()) { ?> rowspan="2"<?php } ?>>
  
  <?php
  	if (have_posts()) {
--- 7,13 ----
  	$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()) {
***************
*** 191,199 ****
  <?php
  	// if we have at least one sidebar to display
  	if ($mandigo_options['sidebar_count']) {
- 		if (mandigo_sidebox_conditions())
- 			include (TEMPLATEPATH . '/sidebox.php');
- 	
  		include (TEMPLATEPATH . '/sidebar.php');
  
  		// if this is a 3-column layout
--- 191,196 ----
diff -rc mandigo-1.36/archives.php mandigo-1.35/archives.php
*** mandigo-1.36/archives.php	2008-07-20 16:44:36.000000000 -0400
--- mandigo-1.35/archives.php	2008-06-15 12:42:28.000000000 -0400
***************
*** 11,17 ****
  	$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 (mandigo_sidebox_conditions()) { ?> rowspan="2"<?php } ?>>
  		<div class="post">
  <?php
  	// unless we disabled animations, display the buttons
--- 11,17 ----
  	$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
***************
*** 46,54 ****
  <?php
  	// if we have at least one sidebar to display
  	if ($mandigo_options['sidebar_count']) {
- 		if (mandigo_sidebox_conditions())
- 			include (TEMPLATEPATH . '/sidebox.php');
- 	
  		include (TEMPLATEPATH . '/sidebar.php');
  
  		// if this is a 3-column layout
--- 46,51 ----
diff -rc mandigo-1.36/attachment.php mandigo-1.35/attachment.php
*** mandigo-1.36/attachment.php	2008-07-20 16:44:36.000000000 -0400
--- mandigo-1.35/attachment.php	2008-06-15 12:42:28.000000000 -0400
***************
*** 6,12 ****
  	// 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 (mandigo_sidebox_conditions($single = true)) { ?> rowspan="2"<?php } ?>>
  
  <?php
  	// if we have posts
--- 6,12 ----
  	// 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
***************
*** 134,142 ****
  <?php
  	// if we have at least one sidebar to display
  	if ($mandigo_options['sidebar_always_show'] && $mandigo_options['sidebar_count']) {
- 		if (mandigo_sidebox_conditions($single = true))
- 			include (TEMPLATEPATH . '/sidebox.php');
- 	
  		include (TEMPLATEPATH . '/sidebar.php');
  
  		// if this is a 3-column layout
--- 134,139 ----
diff -rc mandigo-1.36/backend/css/options.css mandigo-1.35/backend/css/options.css
*** mandigo-1.36/backend/css/options.css	2008-07-20 16:44:36.000000000 -0400
--- mandigo-1.35/backend/css/options.css	2008-06-15 12:42:28.000000000 -0400
***************
*** 2,20 ****
  	font-size: 125%;
  	font-weight: bold;
  }
- fieldset {
- 	padding: 20px 0;
- 	margin: 20px 0;
- 	border-bottom: 1px solid #CCC;
- }
- label {
- 	margin-top: 10px;
- 	display: block;
- 	font-weight: bold;
- }
- .submit {
- 	border: none;
- }
- #versioncheck, #preview {
- 	margin-top: 20px;
- }
--- 2,4 ----
diff -rc mandigo-1.36/backend/html_inserts.php mandigo-1.35/backend/html_inserts.php
*** mandigo-1.36/backend/html_inserts.php	2008-07-20 16:44:36.000000000 -0400
--- mandigo-1.35/backend/html_inserts.php	2008-06-15 12:42:28.000000000 -0400
***************
*** 19,39 ****
  	// 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' ]);
! 			mandigo_set_insert('veryend', $_POST['veryend']);
  			echo '<div class="updated fade"><p>Options updated.</p></div>';
  		}
  
  	echo '
  		<div class="wrap">
! 		<h2>Mandigo Options <span class="submit" style="border: none;"><input type="submit" value="'. __('Update Options &raquo;') .'"/></span></h2>
  		
  		<form name="mandigo_options_form" method="post" action="?page=HTML%20Inserts">
  		<input type="hidden" name="updated" value="1" />
  		
  		<fieldset class="options">
  		<legend>HTML Inserts</legend>
  
--- 19,40 ----
  	// 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="updated fade"><p>Options updated.</p></div>';
  		}
  
  	echo '
  		<div class="wrap">
! 		<h2>Mandigo Options</h2>
  		
  		<form name="mandigo_options_form" method="post" action="?page=HTML%20Inserts">
  		<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>
  
***************
*** 55,65 ****
  
  		<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><br /><br />
! 
!                 outside the main frame, right before the closing &lt;/body&gt; tag. This is the best place for your Google analytics code and other final sippets.<br />
! 		<textarea name="veryend" rows=7 style="width: 100%">'. str_replace("\\", "", get_option('mandigo_inserts_veryend')) .'</textarea><br /><br />
! 
  		</fieldset>
  					
  		<p class="submit"><input type="submit" name="Submit" value="'.__('Update Inserts &raquo;').'"/></p>
--- 56,62 ----
  
  		<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>
diff -rc mandigo-1.36/backend/theme_options.php mandigo-1.35/backend/theme_options.php
*** mandigo-1.36/backend/theme_options.php	2008-07-20 16:44:36.000000000 -0400
--- mandigo-1.35/backend/theme_options.php	2008-06-15 12:42:28.000000000 -0400
***************
*** 146,152 ****
  					'footer_statistics',
  					'full_search_results',
  					'no_datestamps',
- 					'drop_caps',
  				)
  				as $field
  			) {
--- 146,151 ----
***************
*** 210,216 ****
  					'<input type="checkbox" name="header_navigation_exclude_page_%s" %s /> %s<br />',
  					$page->ID,
  					(
! 						@in_array($page->ID, $mandigo_options['header_navigation_exclude_pages'])
  						? ' checked'
  						: ''
  					),
--- 209,215 ----
  					'<input type="checkbox" name="header_navigation_exclude_page_%s" %s /> %s<br />',
  					$page->ID,
  					(
! 						in_array($page->ID, $mandigo_options['header_navigation_exclude_pages'])
  						? ' checked'
  						: ''
  					),
***************
*** 242,248 ****
  		<div class="wrap">
  		<form name="mandigo_options_form" method="post" action="?page=Theme%20Options">
  		<input type="hidden" name="updated" value="1" />
! 		<h2>Mandigo Options <span class="submit"><input type="submit" value="'. __('Update Options &raquo;') .'"/></span></h2>
  		<div style="padding: 5px 0 20px 0;">
  			<a href="#color_scheme">Color Scheme</a> | 
  			<a href="#layout_opts">Layout</a> | 
--- 241,247 ----
  		<div class="wrap">
  		<form name="mandigo_options_form" method="post" action="?page=Theme%20Options">
  		<input type="hidden" name="updated" value="1" />
! 		<h2>Mandigo Options <span class="submit" style="border: none;"><input type="submit" value="'. __('Update Options &raquo;') .'"/></span></h2>
  		<div style="padding: 5px 0 20px 0;">
  			<a href="#color_scheme">Color Scheme</a> | 
  			<a href="#layout_opts">Layout</a> | 
***************
*** 259,269 ****
  		<fieldset class="options" id="color_scheme">
  		<legend>Color Scheme</legend>
  		'. $list_of_schemes .'
! 		<br />
  
! 		<input type="checkbox" name="scheme_randomize" ' .($mandigo_options['scheme_randomize'] ? 'checked="checked"' : '') .' /> I like them all, change schemes randomly!<br />
  
! 		<label>Background</label>
  		<div id="picker" style="position: absolute; left: 600px;"></div>
  		<script type="text/javascript">
  			jQuery(document).ready(function() {
--- 258,268 ----
  		<fieldset class="options" id="color_scheme">
  		<legend>Color Scheme</legend>
  		'. $list_of_schemes .'
! 		<br /><br />
  
! 		<input type="checkbox" name="scheme_randomize" ' .($mandigo_options['scheme_randomize'] ? '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() {
***************
*** 318,324 ****
  			</tr>
  		</table>
  
! 		<label>Colors</label>
  		<table>
  			<tr>
  				<td align="right" width="180">Posts background color :</td>
--- 317,323 ----
  			</tr>
  		</table>
  
! 		<label><b>Colors</b></label><br />
  		<table>
  			<tr>
  				<td align="right" width="180">Posts background color :</td>
***************
*** 338,343 ****
--- 337,343 ----
  			</tr>
  		</table>
  		</fieldset>
+ 		<br/>
  
  		
  		
***************
*** 350,358 ****
  				<option value="0" '.  ($mandigo_options['sidebar_count'] == 0 ? 'selected="selected"' : '') .'>1 column (no sidebar at all)</option>
  				<option value="1" '.  ($mandigo_options['sidebar_count'] == 1 ? 'selected="selected"' : '') .'>2 columns (1 sidebar, default)</option>
  				<option value="2" '.  ($mandigo_options['sidebar_count'] == 2 ? 'selected="selected"' : '') .'>3 columns (2 sidebars, 1024px must be selected)</option>
! 		</select>
  
! 		<label>Sidebars position</label>
  		<table border="0">
  			<tr>
  				<td align="right">First sidebar :</td>
--- 350,358 ----
  				<option value="0" '.  ($mandigo_options['sidebar_count'] == 0 ? 'selected="selected"' : '') .'>1 column (no sidebar at all)</option>
  				<option value="1" '.  ($mandigo_options['sidebar_count'] == 1 ? 'selected="selected"' : '') .'>2 columns (1 sidebar, default)</option>
  				<option value="2" '.  ($mandigo_options['sidebar_count'] == 2 ? '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>
***************
*** 368,377 ****
  					<input type="radio" name="sidebar_2_position" value="right" '. ($mandigo_options['sidebar_2_position'] != 'left' ? 'checked="checked"' : '') .' />right
  				</td>
  			</tr>
! 		</table>
  		
  
! 		<label>Sidebars width</label>
  		<table border="0">
  			<tr>
  				<td align="right">First sidebar :</td>
--- 368,377 ----
  					<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>
***************
*** 387,392 ****
--- 387,393 ----
  			</tr>
  		</table>
  		</fieldset>
+ 		<br/>
  
  		
  		
***************
*** 394,451 ****
  		<legend>Header</legend>
  		<input type="checkbox" name="header_slim" '. ($mandigo_options['header_slim'] ? 'checked="checked"' : '') .' /> Use slim (100px smaller) headers<br />
  		<input type="checkbox" name="header_random_image" '. ($mandigo_options['header_random_image'] ? 'checked="checked"' : '') .' /> Use random images from the user uploaded files or 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>
  
! 		<label>Blog Name &amp; Description</label>
  		<input type="checkbox" name="header_blogname_smaller_font" '. ($mandigo_options['header_blogname_smaller_font'] ? 'checked="checked"' : '') .' /> Reduce the size font for the blog name (useful for looong titles)<br /> 
  		<input type="checkbox" name="header_blogname_hide" '. ($mandigo_options['header_blogname_hide'] ? 'checked="checked"' : '') .' /> Do not display the blog name<br /> 
  		<input type="checkbox" name="header_blogdesc_hide" '. ($mandigo_options['header_blogdesc_hide'] ? 'checked="checked"' : '') .' /> Do not display the tagline (blog description)<br />
  		<input type="checkbox" name="header_blogname_shadow" '. ($mandigo_options['header_blogname_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="header_blogname_stroke" value="0"  '. ($mandigo_options['header_blogname_stroke'] ? '' : 'checked="checked"') .' /><img src="'. $dirs['www']['backend'] .'/images/options-blogname-stroke-off.jpg" alt="off" /> &nbsp; 
! 		<input type="radio" name="header_blogname_stroke" value="1"  '. ($mandigo_options['header_blogname_stroke'] ? 'checked="checked"' : '') .' /><img src="'. $dirs['www']['backend'] .'/images/options-blogname-stroke-on.jpg"  alt="on"  />
  
! 		<label>Navigation</label>
  		<input type="checkbox" name="header_navigation_no_submenus" '. ($mandigo_options['header_navigation_no_submenus'] ? 'checked="checked"' : '') .' /> Disable submenus<br />
  		Navigation position : <select name="header_navigation_position">
  			<option value="left" '.   ($mandigo_options['header_navigation_position'] == 'left'   ? 'selected="selected"' : '') .'>left</option>
  			<option value="center" '. ($mandigo_options['header_navigation_position'] == 'center' ? 'selected="selected"' : '') .'>center</option>
  			<option value="right" '.  ($mandigo_options['header_navigation_position'] == '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="header_navigation_stripe" value="0"  '. ($mandigo_options['header_navigation_stripe'] ? '' : 'checked="checked"') .' /><img src="'. $dirs['www']['backend'] .'/images/options-navigation-stripe-off.jpg" alt="off" /> &nbsp; 
! 		<input type="radio" name="header_navigation_stripe" value="1"  '. ($mandigo_options['header_navigation_stripe'] ? 'checked="checked"' : '') .' /><img src="'. $dirs['www']['backend'] .'/images/options-navigation-stripe-on.jpg"  alt="on"  />
  
! 		<label>Pages to Exclude from Header Navigation</label>
  		'. $list_of_pages .'<br />
  		</fieldset>
  
  		
  		
  		<fieldset class="options" id="posts_opts">
  		<legend>Posts</legend>
- 		<input type="checkbox" name="drop_caps" '. ($mandigo_options['drop_caps'] ? 'checked="checked"' : '') .' /> Create drop caps<br />
  		<input type="checkbox" name="collapse_posts" '. ($mandigo_options['collapse_posts'] ? 'checked="checked"' : '') .' /> Automatically collapse posts in archives & categories<br />
  		<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
  		
! 		<label>Dates</label>
  		<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>
  		
! 		<label>Images</label>
  		<input type="checkbox" name="clear_all_paragraphs" '. ($mandigo_options['clear_all_paragraphs'] ? 'checked="checked"' : '') .' /> Clear all paragraphs (wraps text of one paragraph at most)<br />
  		<input type="checkbox" name="no_text_wrapping" '. ($mandigo_options['no_text_wrapping'] ? 'checked="checked"' : '') .' /> Do not wrap text around images at all<br />
! 		<input type="checkbox" name="no_image_borders" '. ($mandigo_options['no_image_borders'] ? 'checked="checked"' : '') .' /> Display images without a border
! 		
  		</fieldset>
  
  		
  		
--- 395,451 ----
  		<legend>Header</legend>
  		<input type="checkbox" name="header_slim" '. ($mandigo_options['header_slim'] ? 'checked="checked"' : '') .' /> Use slim (100px smaller) headers<br />
  		<input type="checkbox" name="header_random_image" '. ($mandigo_options['header_random_image'] ? 'checked="checked"' : '') .' /> Use random images from the user uploaded files or 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="header_blogname_smaller_font" '. ($mandigo_options['header_blogname_smaller_font'] ? 'checked="checked"' : '') .' /> Reduce the size font for the blog name (useful for looong titles)<br /> 
  		<input type="checkbox" name="header_blogname_hide" '. ($mandigo_options['header_blogname_hide'] ? 'checked="checked"' : '') .' /> Do not display the blog name<br /> 
  		<input type="checkbox" name="header_blogdesc_hide" '. ($mandigo_options['header_blogdesc_hide'] ? 'checked="checked"' : '') .' /> Do not display the tagline (blog description)<br />
  		<input type="checkbox" name="header_blogname_shadow" '. ($mandigo_options['header_blogname_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="header_blogname_stroke" value="0"  '. ($mandigo_options['header_blogname_stroke'] ? '' : 'checked="checked"') .' /><img src="'. $dirs['www']['backend'] .'/images/options-blogname-stroke-off.jpg" alt="off" /> &nbsp; 
! 		<input type="radio" name="header_blogname_stroke" value="1"  '. ($mandigo_options['header_blogname_stroke'] ? 'checked="checked"' : '') .' /><img src="'. $dirs['www']['backend'] .'/images/options-blogname-stroke-on.jpg"  alt="on"  /><br /><br />
  
! 		<label><b>Navigation</b></label><br />
  		<input type="checkbox" name="header_navigation_no_submenus" '. ($mandigo_options['header_navigation_no_submenus'] ? 'checked="checked"' : '') .' /> Disable submenus<br />
  		Navigation position : <select name="header_navigation_position">
  			<option value="left" '.   ($mandigo_options['header_navigation_position'] == 'left'   ? 'selected="selected"' : '') .'>left</option>
  			<option value="center" '. ($mandigo_options['header_navigation_position'] == 'center' ? 'selected="selected"' : '') .'>center</option>
  			<option value="right" '.  ($mandigo_options['header_navigation_position'] == '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="header_navigation_stripe" value="0"  '. ($mandigo_options['header_navigation_stripe'] ? '' : 'checked="checked"') .' /><img src="'. $dirs['www']['backend'] .'/images/options-navigation-stripe-off.jpg" alt="off" /> &nbsp; 
! 		<input type="radio" name="header_navigation_stripe" value="1"  '. ($mandigo_options['header_navigation_stripe'] ? 'checked="checked"' : '') .' /><img src="'. $dirs['www']['backend'] .'/images/options-navigation-stripe-on.jpg"  alt="on"  /><br /><br />
  
! 		<label><b>Pages to Exclude from Header Navigation</b></label><br />
  		'. $list_of_pages .'<br />
  		</fieldset>
+ 		<br/>
  
  		
  		
  		<fieldset class="options" id="posts_opts">
  		<legend>Posts</legend>
  		<input type="checkbox" name="collapse_posts" '. ($mandigo_options['collapse_posts'] ? 'checked="checked"' : '') .' /> Automatically collapse posts in archives & categories<br />
  		<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 />
  		
! 		<label><b>Images</b></label><br/>
  		<input type="checkbox" name="clear_all_paragraphs" '. ($mandigo_options['clear_all_paragraphs'] ? 'checked="checked"' : '') .' /> Clear all paragraphs (wraps text of one paragraph at most)<br />
  		<input type="checkbox" name="no_text_wrapping" '. ($mandigo_options['no_text_wrapping'] ? 'checked="checked"' : '') .' /> Do not wrap text around images at all<br />
! 		<input type="checkbox" name="no_image_borders" '. ($mandigo_options['no_image_borders'] ? 'checked="checked"' : '') .' /> Display images without a border<br /><br />
! 					
  		</fieldset>
+ 		<br/>
  
  		
  		
***************
*** 460,474 ****
  				<option value="above" '.  ($mandigo_options['trackbacks_position'] == 'above' ? 'selected="selected"' : '') .'>above comments</option>
  				<option value="below" '.  ($mandigo_options['trackbacks_position'] == 'below' ? 'selected="selected"' : '') .'>below comments</option>
  				<option value="none"  '.  ($mandigo_options['trackbacks_position'] == 'none'  ? 'selected="selected"' : '') .'>do not display trackbacks at all</option>
! 		</select>
  		</fieldset>
  
  
  		
  		<fieldset class="options" id="seo_opts">
  		<legend>SEO Options</legend>
  
! 		<label>Custom &lt;title&gt; tags</label>
  		Customize your title tag. Consult the <a href="themes.php?page=README">README page</a> for a list of available variables.
  		<table>
  			<tr>
--- 460,475 ----
  				<option value="above" '.  ($mandigo_options['trackbacks_position'] == 'above' ? 'selected="selected"' : '') .'>above comments</option>
  				<option value="below" '.  ($mandigo_options['trackbacks_position'] == 'below' ? 'selected="selected"' : '') .'>below comments</option>
  				<option value="none"  '.  ($mandigo_options['trackbacks_position'] == '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>
***************
*** 495,503 ****
  				<td style="text-align: right;">Search Results (search.php):</td>
  				<td><input type="text" name="title_scheme_search" size="60" value="'. mandigo_escape($mandigo_options['title_scheme_search']) .'" /></td>
  			</tr>
! 		</table>
  
! 		<label>Custom header levels</label>
  		Customize which tags you want to use for the blog name, blog description, posts title, ... This does not affect styles.
  		<table>
  			<tr>
--- 496,504 ----
  				<td style="text-align: right;">Search Results (search.php):</td>
  				<td><input type="text" name="title_scheme_search" size="60" value="'. mandigo_escape($mandigo_options['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>
***************
*** 586,591 ****
--- 587,593 ----
  			</tr>
  		</table>
  		</fieldset>
+ 		<br/>
  
  		
  		
***************
*** 597,615 ****
  		<input type="checkbox" name="fixes_comments_2" '. ($mandigo_options['fixes_comments_2'] ? 'checked="checked"' : '') .' /> Replace long urls in users comments with "link"<br />
  		<input type="checkbox" name="fixes_touch_content" '. ($mandigo_options['fixes_touch_content'] ? 'checked="checked"' : '') .' /> Force the browser to re-render the content column<br />
  		</fieldset>
  
  		
  		
  		<fieldset class="options" id="misc_opts">
  		<legend>Miscellaneous Options</legend>
  
! 		<label>Animations</label>
! 		<input type="checkbox" name="disable_animations" '. ($mandigo_options['disable_animations'] ? 'checked="checked"' : '') .' /> Disable js animations (also removes show/hide buttons in posts)
  					
! 		<label>Readability</label>
! 		<input type="checkbox" name="bold_links" '. ($mandigo_options['bold_links'] ? 'checked="checked"' : '') .' /> Display all links in bold for better readability
  					
! 		<label>Really miscellaneous options</label>
  		<input type="checkbox" name="full_search_results" '. ($mandigo_options['full_search_results'] ? 'checked="checked"' : '') .' /> Display full search results, not just titles and metadata<br />
  		<input type="checkbox" name="footer_statistics" '. ($mandigo_options['footer_statistics'] ? 'checked="checked"' : '') .' /> Display rendering time and SQL statistics in the footer<br />
  		</fieldset>
--- 599,618 ----
  		<input type="checkbox" name="fixes_comments_2" '. ($mandigo_options['fixes_comments_2'] ? 'checked="checked"' : '') .' /> Replace long urls in users comments with "link"<br />
  		<input type="checkbox" name="fixes_touch_content" '. ($mandigo_options['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="disable_animations" '. ($mandigo_options['disable_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="bold_links" '. ($mandigo_options['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="full_search_results" '. ($mandigo_options['full_search_results'] ? 'checked="checked"' : '') .' /> Display full search results, not just titles and metadata<br />
  		<input type="checkbox" name="footer_statistics" '. ($mandigo_options['footer_statistics'] ? 'checked="checked"' : '') .' /> Display rendering time and SQL statistics in the footer<br />
  		</fieldset>
diff -rc mandigo-1.36/backend/upgrade.php mandigo-1.35/backend/upgrade.php
*** mandigo-1.36/backend/upgrade.php	2008-07-20 16:44:36.000000000 -0400
--- mandigo-1.35/backend/upgrade.php	2008-06-15 12:42:28.000000000 -0400
***************
*** 2,9 ****
  	function mandigo_upgrade($from, $to) {
  		global $mandigo_options, $global;
  		
! 		if (version_compare($from, '1.34') === -1)
! 			mandigo_upgrade_134($from);
  		
  		$mandigo_options['version'] = $to;
  		
--- 2,12 ----
  	function mandigo_upgrade($from, $to) {
  		global $mandigo_options, $global;
  		
! 		switch ($to) {
! 			case 1.34:
! 				mandigo_upgrade_134($from);
! 				break;
! 		}
  		
  		$mandigo_options['version'] = $to;
  		
***************
*** 181,189 ****
  		foreach ($files as $old => $new) {
  			if (file_exists(TEMPLATEPATH . $old)) {
  				if (file_exists(TEMPLATEPATH . $new))
! 					@unlink(TEMPLATEPATH . $old);
  				else
! 					@rename(
  						TEMPLATEPATH . $old,
  						TEMPLATEPATH . $new
  					);
--- 184,192 ----
  		foreach ($files as $old => $new) {
  			if (file_exists(TEMPLATEPATH . $old)) {
  				if (file_exists(TEMPLATEPATH . $new))
! 					unlink(TEMPLATEPATH . $old);
  				else
! 					rename(
  						TEMPLATEPATH . $old,
  						TEMPLATEPATH . $new
  					);
***************
*** 192,204 ****
  
  		// delete files
  		if (file_exists(TEMPLATEPATH .'/js/jquery.dimensions.js'))
! 			@unlink(TEMPLATEPATH .'/js/jquery.dimensions.js');
  
  		// make sure files have been moved/deleted
  		mandigo_post_upgrade_check_134();
  	}
  
  
  	function mandigo_post_upgrade_check_134() {
  		$mandigo_actions = get_option('mandigo_actions');
  		// if any of these files is still in the theme root directory, then something went wrong during the upgrade
--- 195,215 ----
  
  		// delete files
  		if (file_exists(TEMPLATEPATH .'/js/jquery.dimensions.js'))
! 			unlink(TEMPLATEPATH .'/js/jquery.dimensions.js');
  
  		// make sure files have been moved/deleted
  		mandigo_post_upgrade_check_134();
  	}
  
  
+ /*
+ 	function mandigo_upgrade_135($from) {
+ 		if ($from != '1.34') mandigo_upgrade_134($from);
+ 	}
+ */
+ 
+ 
+ 
  	function mandigo_post_upgrade_check_134() {
  		$mandigo_actions = get_option('mandigo_actions');
  		// if any of these files is still in the theme root directory, then something went wrong during the upgrade
diff -rc mandigo-1.36/backend/widgets.php mandigo-1.35/backend/widgets.php
*** mandigo-1.36/backend/widgets.php	2008-07-20 16:44:36.000000000 -0400
--- mandigo-1.35/backend/widgets.php	2008-06-15 12:42:28.000000000 -0400
***************
*** 38,55 ****
  				'name'         => 'Mandigo Bottom',
  			)
  		);
- 		
- 		// sidebox
- 		if (mandigo_sidebox_conditions()) {
- 			register_sidebar(
- 				array(
- 					'before_title' => "<$tag_widget_title class=\"widgettitle\">",
- 					'after_title'  => "</$tag_widget_title>\n",
- 					'name'         => 'Mandigo Sidebox',
- 				)
- 			);
- 		}
- 
  	}
  
  
--- 38,43 ----
diff -rc mandigo-1.36/footer.php mandigo-1.35/footer.php
*** mandigo-1.36/footer.php	2008-07-20 16:44:36.000000000 -0400
--- mandigo-1.35/footer.php	2008-06-15 12:42:28.000000000 -0400
***************
*** 116,121 ****
--- 116,133 ----
  				jQuery('body, .png').ifixpng();
  				jQuery('.commentlist .avatar').height(36);
  			}
+ 			jQuery('.entry object, .entry img').load(function() {
+ 				o = jQuery(this);
+ 				if (o.width() > 300) { // dont bother resizing below this width
+ 					d = parseInt(o.css('padding-left')      )
+ 					  + parseInt(o.css('padding-right')     )
+ 					  + parseInt(o.css('margin-left')       )
+ 					  + parseInt(o.css('margin-right')      )
+ 					  + parseInt(o.css('border-left-width') )
+ 					  + parseInt(o.css('border-right-width'));
+ 					if (o.width() > <?php echo $maxw; ?>-d) o.width(<?php echo $maxw; ?>-d);
+ 				}
+ 			});
  
  <?php
  
***************
*** 129,136 ****
  	}
  ?>
  		}
- 		
- 		jQuery('p:has(.dropcap)').append('<br class="clear"/>');
  
  <?php
  
--- 141,146 ----
***************
*** 275,284 ****
  <?php
  	}
  ?>
! 				ul.css({left:x, top:y}).slideDown();
  			},
  			function() {
! 				jQuery(this).find('ul').slideUp();
  			}
  		);
  <?php
--- 285,294 ----
  <?php
  	}
  ?>
! 				ul.css({left:x, top:y}).show();
  			},
  			function() {
! 				jQuery(this).find('ul').hide();
  			}
  		);
  <?php
***************
*** 294,330 ****
  
  
  
- 	// fix the gap between the sidebox and the sidebars in IE
- 	if (mandigo_sidebox_conditions()) {
- ?>
- 
- 		if (jQuery.browser.msie) {
- 			h = jQuery('#content').height()
- 			  - jQuery('#sidebox .sidebars').height()
- 			  - jQuery('#sidebar1 .sidebars').height()
- 			  - parseInt(jQuery('#sidebox').css('padding-bottom'))
- 			  - parseInt(jQuery('#sidebox .sidebars').css('padding-top'))
- 			  - parseInt(jQuery('#sidebox .sidebars').css('padding-bottom'))
- 			  - parseInt(jQuery('#sidebar1 .sidebars').css('padding-top'))
- 			  - parseInt(jQuery('#sidebar1 .sidebars').css('padding-bottom'));
- 			if (h > 0)
- 				jQuery('#sidebar1').append('<div style="height: '+ h +'px"><\/div>');
- 		}
- <?php
- 	}
- 
- 
- 
  	// alternate coloring of comments
  ?>
  
  		jQuery('.commentlist li:even').addClass('alt');
  });
  // ]]> -->
  </script>
- <?php
- 	// HTML Inserts: very end of the page
- 	echo get_option('mandigo_inserts_veryend');
- ?>
  </body>
  </html>
--- 304,316 ----
  
  
  
  	// alternate coloring of comments
  ?>
  
  		jQuery('.commentlist li:even').addClass('alt');
  });
+ 
  // ]]> -->
  </script>
  </body>
  </html>
diff -rc mandigo-1.36/functions.php mandigo-1.35/functions.php
*** mandigo-1.36/functions.php	2008-07-20 16:44:36.000000000 -0400
--- mandigo-1.35/functions.php	2008-06-15 12:42:28.000000000 -0400
***************
*** 186,224 ****
  
  
  
- 	// this one tells if the sidebox may be displayed
- 	function mandigo_sidebox_conditions($single = false) {
- 		global $mandigo_options;
- 		return (
- 			   $mandigo_options['sidebar_count']
- 			&& $mandigo_options['layout_width'] == 1024
- 			&& $mandigo_options['sidebar_count'] == 2
- 			&& $mandigo_options['sidebar_1_position'] == 'right'
- 			&& $mandigo_options['sidebar_1_position'] == $mandigo_options['sidebar_2_position']
- 			&& ($single ? $mandigo_options['sidebar_always_show'] : true)
- 			? true
- 			: false
- 		);
- 	}
- 	
- 
- 
- 	// this one adds drop caps the the_content
- 	function mandigo_drop_caps($data) {
- 		if (preg_match ('/^\s*</', $data)) {
- 			return preg_replace('/^\s*(<[^>]+>[\s\r\n]*)*([a-z])/i', '$1<span class="dropcap">$2</span>', $data);
- 		}
- 		return preg_replace('/^\s*([a-z])/i', '<span class="dropcap">$1</span>', $data);
- 	}
- 	if ($mandigo_options['drop_caps']) {
- 		add_filter('the_content', 'mandigo_drop_caps');
- 	}
- 
- 	
- 	
  	include('backend/widgets.php');
  	include('backend/theme_options.php');
  	include('backend/html_inserts.php');
  	include('backend/readme.php');
! 	
  ?>
--- 186,194 ----
  
  
  
  	include('backend/widgets.php');
  	include('backend/theme_options.php');
  	include('backend/html_inserts.php');
  	include('backend/readme.php');
! 
  ?>
diff -rc mandigo-1.36/header.php mandigo-1.35/header.php
*** mandigo-1.36/header.php	2008-07-20 16:44:36.000000000 -0400
--- mandigo-1.35/header.php	2008-06-15 12:42:28.000000000 -0400
***************
*** 164,191 ****
  
  
  	
- 	// image & object max-width rules
- 	$maxwidth = $mandigo_options['layout_width']
- 		- 144
- 		- (
- 			$mandigo_options['sidebar_count'] > 0 && ($mandigo_options['sidebar_always_show'] || (!is_single() && !is_page()))
- 			? (
- 				$mandigo_options['sidebar_1_width']+12
- 				+
- 				(
- 					$mandigo_options['layout_width'] == 1024 && $mandigo_options['sidebar_count'] == 2
- 					? $mandigo_options['sidebar_2_width']+12
- 					: 0
- 				)
- 			)
- 			: 0
- 		)
- 	;
- 	$lastminutecss[] = sprintf(
- 		'.entry img, .entry object { max-width: %spx; width: expression(this.clientWidth > %s ? "%spx": "auto"); }',
- 		$maxwidth, $maxwidth, $maxwidth
- 	);
- 	
  ?>
  <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" />
--- 164,169 ----
***************
*** 265,271 ****
  ?>
  
  		<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(
--- 243,249 ----
  ?>
  
  		<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(
***************
*** 273,279 ****
  			'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
--- 251,257 ----
  			'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
diff -rc mandigo-1.36/index.php mandigo-1.35/index.php
*** mandigo-1.36/index.php	2008-07-20 16:44:36.000000000 -0400
--- mandigo-1.35/index.php	2008-06-15 12:42:28.000000000 -0400
***************
*** 24,30 ****
  		$sidebars_widgets = wp_get_sidebars_widgets();
  
  ?>
! 	<td id="content" class="narrowcolumn"<?php if (mandigo_sidebox_conditions()) { ?> rowspan="2"<?php } ?>>
  <?php
  	// if we have widgets in the 'Mandigo Top' sidebar
  	if ($sidebars_widgets[$index_mandigo_top]) {
--- 24,30 ----
  		$sidebars_widgets = wp_get_sidebars_widgets();
  
  ?>
! 	<td id="content" class="narrowcolumn">
  <?php
  	// if we have widgets in the 'Mandigo Top' sidebar
  	if ($sidebars_widgets[$index_mandigo_top]) {
***************
*** 151,159 ****
  <?php
  	// if we have at least one sidebar to display
  	if ($mandigo_options['sidebar_count']) {
- 		if (mandigo_sidebox_conditions())
- 			include (TEMPLATEPATH . '/sidebox.php');
- 	
  		include (TEMPLATEPATH . '/sidebar.php');
  
  		// if this is a 3-column layout
--- 151,156 ----
diff -rc mandigo-1.36/links.php mandigo-1.35/links.php
*** mandigo-1.36/links.php	2008-07-20 16:44:36.000000000 -0400
--- mandigo-1.35/links.php	2008-06-15 12:42:28.000000000 -0400
***************
*** 10,16 ****
  	// heading level for page title (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 (mandigo_sidebox_conditions($single = true)) { ?> rowspan="2"<?php } ?>>
  		<div class="post">
  <?php
  	// unless we disabled animations, display the buttons
--- 10,16 ----
  	// heading level for page title (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">
  		<div class="post">
  <?php
  	// unless we disabled animations, display the buttons
***************
*** 35,43 ****
  <?php
  	// if we have at least one sidebar to display
  	if ($mandigo_options['sidebar_always_show'] && $mandigo_options['sidebar_count']) {
- 		if (mandigo_sidebox_conditions($single = true))
- 			include (TEMPLATEPATH . '/sidebox.php');
- 	
  		include (TEMPLATEPATH . '/sidebar.php');
  
  		// if this is a 3-column layout
--- 35,40 ----
diff -rc mandigo-1.36/page.php mandigo-1.35/page.php
*** mandigo-1.36/page.php	2008-07-20 16:44:36.000000000 -0400
--- mandigo-1.35/page.php	2008-06-15 12:42:28.000000000 -0400
***************
*** 6,12 ****
  	// heading level for page title (h1, h2, div, ...)
  	$tag_post_title_single = $mandigo_options['heading_level_post_title_single'];
  ?>
! 	<td id="content" class="<?php echo ($mandigo_options['sidebar_always_show'] ? 'narrow' : 'wide'); ?>column"<?php if (mandigo_sidebox_conditions($single = true)) { ?> rowspan="2"<?php } ?>>
  
  <?php
  	// if we have posts
--- 6,12 ----
  	// heading level for page title (h1, h2, div, ...)
  	$tag_post_title_single = $mandigo_options['heading_level_post_title_single'];
  ?>
! 	<td id="content" class="<?php echo ($mandigo_options['sidebar_always_show'] ? 'narrow' : 'wide'); ?>column">
  
  <?php
  	// if we have posts
***************
*** 64,72 ****
  <?php
  	// if we have at least one sidebar to display
  	if ($mandigo_options['sidebar_always_show'] && $mandigo_options['sidebar_count']) {
- 		if (mandigo_sidebox_conditions($single = true))
- 			include (TEMPLATEPATH . '/sidebox.php');
- 	
  		include (TEMPLATEPATH . '/sidebar.php');
  
  		// if this is a 3-column layout
--- 64,69 ----
diff -rc mandigo-1.36/search.php mandigo-1.35/search.php
*** mandigo-1.36/search.php	2008-07-20 16:44:36.000000000 -0400
--- mandigo-1.35/search.php	2008-06-15 12:42:28.000000000 -0400
***************
*** 7,13 ****
  	$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 (mandigo_sidebox_conditions()) { ?> rowspan="2"<?php } ?>>
  
  <?php
  	if (have_posts()) {
--- 7,13 ----
  	$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()) {
***************
*** 117,125 ****
  <?php
  	// if we have at least one sidebar to display
  	if ($mandigo_options['sidebar_count']) {
- 		if (mandigo_sidebox_conditions())
- 			include (TEMPLATEPATH . '/sidebox.php');
- 	
  		include (TEMPLATEPATH . '/sidebar.php');
  
  		// if this is a 3-column layout
--- 117,122 ----
Only in mandigo-1.36: sidebox.php
diff -rc mandigo-1.36/single.php mandigo-1.35/single.php
*** mandigo-1.36/single.php	2008-07-20 16:44:36.000000000 -0400
--- mandigo-1.35/single.php	2008-06-15 12:42:28.000000000 -0400
***************
*** 7,13 ****
  	$tag_post_title_single = $mandigo_options['heading_level_post_title_single'];
  	$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 (mandigo_sidebox_conditions($single = true)) { ?> rowspan="2"<?php } ?>>
  
  <?php
  	// if we have posts
--- 7,13 ----
  	$tag_post_title_single = $mandigo_options['heading_level_post_title_single'];
  	$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
***************
*** 148,156 ****
  <?php
  	// if we have at least one sidebar to display
  	if ($mandigo_options['sidebar_always_show'] && $mandigo_options['sidebar_count']) {
- 		if (mandigo_sidebox_conditions())
- 			include (TEMPLATEPATH . '/sidebox.php');
- 	
  		include (TEMPLATEPATH . '/sidebar.php');
  
  		// if this is a 3-column layout
--- 148,153 ----
diff -rc mandigo-1.36/style.css mandigo-1.35/style.css
*** mandigo-1.36/style.css	2008-07-20 16:44:36.000000000 -0400
--- mandigo-1.35/style.css	2008-06-15 12:42:28.000000000 -0400
***************
*** 2,25 ****
  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.36
  Author: t0mmmmmmm
  Author URI: http://www.onehertz.com/portfolio/wordpress/
- Tags: fixed width, widgets, custom header, options page, SEO friendly, header rotation, valid XHTML, valid CSS, one column, two columns, three columns, easy customization, custom colors, color schemes, blue, red, green, orange, pink, purple, teal, internationalized, arabic, bahasa indonesia, basque, bulgarian, catalan, chinese, croatian, czech, danish, dutch, finnish, french, german, greek, hebrew, hungarian, icelandic, italian, japanese, lithuanian, malay, maltese, norwegian, polish, portuguese, romanian, russian, serbian, slovak, slovenian, spanish, swedish, turkish, ukrainian
  */
- /*
- The rules below are not used, they are here for wordpress.org to accept the theme upload. The actual stylesheet is style.css.php
- */
- .aligncenter {
- 	display: block;
- 	margin-left: auto;
- 	margin-right: auto;
- }
- 
- .alignleft {
- 	float: left;
- }
- 
- .alignright {
- 	float: right;
- }
\ No newline at end of file
--- 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/
  */
diff -rc mandigo-1.36/style.css.php mandigo-1.35/style.css.php
*** mandigo-1.36/style.css.php	2008-07-20 16:44:36.000000000 -0400
--- mandigo-1.35/style.css.php	2008-06-15 12:42:28.000000000 -0400
***************
*** 306,322 ****
  	line-height: .6em;
  	margin-top: .3em;
  }
- 
- .dropcap {
- 	float: left;
- 	font-size: 3em;
- 	color: #666;
- 	line-height: 0.93em;
- 	margin-right: 3px;
- }
  /* End Typography & Colors */
  
  
  /* Begin Structure */
  * {
  	padding: 0; 
--- 306,315 ----
  	line-height: .6em;
  	margin-top: .3em;
  }
  /* End Typography & Colors */
  
  
+ 
  /* Begin Structure */
  * {
  	padding: 0; 
***************
*** 385,391 ****
  
  .narrowcolumn, .widecolumn { width: 100%; }
  
! .narrowcolumn, .widecolumn, #sidebar1, #sidebar2, #sidebox {
  	vertical-align: top;
  	padding: 0 3px;
  }
--- 378,384 ----
  
  .narrowcolumn, .widecolumn { width: 100%; }
  
! .narrowcolumn, .widecolumn, #sidebar1, #sidebar2 {
  	vertical-align: top;
  	padding: 0 3px;
  }
***************
*** 492,502 ****
  	width: <?php echo $mandigo_options['sidebar_2_width']; ?>px;
  }
  
- #sidebox {
- 	height: 1%;
- 	padding-bottom: 6px;
- }
- 
  .pagetitle {
  	text-align: center;
  }
--- 485,490 ----
***************
*** 553,558 ****
--- 541,550 ----
  
  
  /* Begin Images */
+ p img {
+ 	max-width: 95%;
+ }
+ 
  .entry img {
  	float: <?php echo ($mandigo_options['no_text_wrapping'] ? 'none' : 'left'); ?>;
  	margin: 3px 10px 3px 0;
***************
*** 986,999 ****
  
  .pages ul li {
  	display: block;
- 	padding: 3px 0;
  	margin: 3px 10px;
! 	border-top: 1px solid #333;
! 	font-size: 85%;
! }
! 
! .pages ul li a {
! 	color: #CCC;
  }
  
  .postinfo {
--- 978,985 ----
  
  .pages ul li {
  	display: block;
  	margin: 3px 10px;
! 	font-size: 90%;
  }
  
  .postinfo {
diff -rc mandigo-1.36/tagcloud.php mandigo-1.35/tagcloud.php
*** mandigo-1.36/tagcloud.php	2008-07-20 16:44:36.000000000 -0400
--- mandigo-1.35/tagcloud.php	2008-06-15 12:42:28.000000000 -0400
***************
*** 11,17 ****
  	$tag_page_title = $mandigo_options['heading_level_page_title'];
  ?>
  
! 	<td id="content" class="narrowcolumn"<?php if (mandigo_sidebox_conditions()) { ?> rowspan="2"<?php } ?>>
  
  <?php
  	if (have_posts()) {
--- 11,17 ----
  	$tag_page_title = $mandigo_options['heading_level_page_title'];
  ?>
  
! 	<td id="content" class="narrowcolumn">
  
  <?php
  	if (have_posts()) {
***************
*** 58,66 ****
  <?php
  	// if we have at least one sidebar to display
  	if ($mandigo_options['sidebar_count']) {
- 		if (mandigo_sidebox_conditions())
- 			include (TEMPLATEPATH . '/sidebox.php');
- 	
  		include (TEMPLATEPATH . '/sidebar.php');
  
  		// if this is a 3-column layout
--- 58,63 ----