diff -rc mandigo-1.33.1/README.txt mandigo-1.33/README.txt
*** mandigo-1.33.1/README.txt	2008-04-28 08:56:54.000000000 -0400
--- mandigo-1.33/README.txt	2008-04-27 17:20:08.000000000 -0400
***************
*** 62,68 ****
  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 
--- 62,68 ----
  If you did modify some PHP files, you will have to reapply the same modifications to 
  new theme files. Please note that most modifications, such as including some javascript
  or some style rules can be done using the HTML Inserts feature (see the tab next to 
! "Theme Options" in you WP dashboard).
  
  Remember it's always a good thing to backup your files prior to updating. Even if you 
  don't remember changing a file, just download the full theme folder from your hosting 
***************
*** 168,176 ****
  
  === 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.
--- 168,173 ----
***************
*** 183,197 ****
  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
! aligned to the center, you will have to apply the "alignnone" class to them, and wrap 
! them in a centered container, i.e.
! <div style="text-align: center">
! 	<img class="alignnone" />
! 	<img class="alignnone" />
! </div>
  
  If you want text to wrap around SOME images, let text wrapping enabled, and add 
  class="nowrap" to the img tags around which you don't want text to wrap, i.e. 
--- 180,187 ----
  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 "centered" class instead, but this will only 
! work with non-floating images, i.e. the kind around which text does not wrap.
  
  If you want text to wrap around SOME images, let text wrapping enabled, and add 
  class="nowrap" to the img tags around which you don't want text to wrap, i.e. 
***************
*** 351,360 ****
  
  === CHANGELOG ==========================================================================
  
- 1.33.1
- * added an option to wrap one paragraph at most
- * moved image control options from misc to posts
- 
  1.33
  + language: Slovenian (sl_SI)
  + added an option to disable submenus in header navigation
--- 341,346 ----
diff -rc mandigo-1.33.1/functions.php mandigo-1.33/functions.php
*** mandigo-1.33.1/functions.php	2008-04-28 08:56:54.000000000 -0400
--- mandigo-1.33/functions.php	2008-04-27 17:20:08.000000000 -0400
***************
*** 405,411 ****
  			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)
--- 405,410 ----
***************
*** 666,678 ****
  			<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/>
  
--- 665,670 ----
***************
*** 835,840 ****
--- 827,837 ----
  		<fieldset class="options" id="misc_opts">
  		<legend>Miscellaneous Options</legend>
  
+ 		<label><b>Images</b></label><br/>
+ 		<input type="checkbox" name="nofloat" '. (get_option('mandigo_nofloat') ? 'checked="checked"' : '') .' /> Do not wrap text around images<br />
+ 		<input type="checkbox" name="floatright" '. (get_option('mandigo_floatright') ? 'checked="checked"' : '') .' /> Float 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 />
+ 					
  		<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 />
  					
diff -rc mandigo-1.33.1/style.css mandigo-1.33/style.css
*** mandigo-1.33.1/style.css	2008-04-28 08:56:54.000000000 -0400
--- mandigo-1.33/style.css	2008-04-27 17:20:08.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.33.1
  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.33
  Author: t0mmmmmmm
  Author URI: http://www.onehertz.com/portfolio/wordpress/
  */
diff -rc mandigo-1.33.1/style.css.php mandigo-1.33/style.css.php
*** mandigo-1.33.1/style.css.php	2008-04-28 08:56:54.000000000 -0400
--- mandigo-1.33/style.css.php	2008-04-27 17:20:08.000000000 -0400
***************
*** 26,32 ****
  	if (defined('DB_USER')) {
  		$dbh = @mysql_connect(DB_HOST, DB_USER, DB_PASSWORD);
  		@mysql_select_db(DB_NAME,$dbh);
! 		$r = @mysql_query("SELECT option_name,option_value FROM ". $table_prefix ."options WHERE option_name REGEXP '^mandigo_(1024|sidebar[12]_left|3columns|wp(_(fixed|repeat|position))?|em_italics|bgcolor|no(float|border)|headnav_alignment|scheme|slim_header|small_title|number_comments|(posts|sidebars)_b[dg]color|floatright|nojustify|clear_all_paragraphs)|stylesheet|siteurl';",$dbh);
  		while ($a = @mysql_fetch_row($r)) {
  			if ($a[1] == 'on' ) $a[1] = 1;
  			if ($a[1] == 'off') $a[1] = 0;
--- 26,32 ----
  	if (defined('DB_USER')) {
  		$dbh = @mysql_connect(DB_HOST, DB_USER, DB_PASSWORD);
  		@mysql_select_db(DB_NAME,$dbh);
! 		$r = @mysql_query("SELECT option_name,option_value FROM ". $table_prefix ."options WHERE option_name REGEXP '^mandigo_(1024|sidebar[12]_left|3columns|wp(_(fixed|repeat|position))?|em_italics|bgcolor|no(float|border)|headnav_alignment|scheme|slim_header|small_title|number_comments|(posts|sidebars)_b[dg]color|floatright|nojustify)|stylesheet|siteurl';",$dbh);
  		while ($a = @mysql_fetch_row($r)) {
  			if ($a[1] == 'on' ) $a[1] = 1;
  			if ($a[1] == 'off') $a[1] = 0;
***************
*** 65,89 ****
  		$mandigo_floatright        = get_option('mandigo_floatright');
  		$mandigo_nojustify         = get_option('mandigo_nojustify');
  		$stylesheet_directory      = get_bloginfo('stylesheet_directory');
! 		foreach (
! 			array(
! 				'em_italics',
! 				'3columns',
! 				'sidebar1_left',
! 				'sidebar2_left',
! 				'1024',
! 				'nofloat',
! 				'slim_header',
! 				'noborder',
! 				'small_title',
! 				'wp_fixed',
! 				'wp_repeat',
! 				'wp_position',
! 				'number_comments',
! 				'clear_all_paragraphs',
! 			)
! 			as $a
! 		) {
  			$a = 'mandigo_'. $a;
  			if ($$a == 'on')  $$a = 1;
  			if ($$a == 'off') $$a = 0;
--- 65,71 ----
  		$mandigo_floatright        = get_option('mandigo_floatright');
  		$mandigo_nojustify         = get_option('mandigo_nojustify');
  		$stylesheet_directory      = get_bloginfo('stylesheet_directory');
! 		foreach (array('em_italics','3columns','sidebar1_left','sidebar2_left','1024','nofloat','slim_header','noborder','small_title','wp_fixed','wp_repeat','wp_position','number_comments') as $a) {
  			$a = 'mandigo_'. $a;
  			if ($$a == 'on')  $$a = 1;
  			if ($$a == 'off') $$a = 0;
***************
*** 454,468 ****
  	clear: both;
  }
  
- <?php
- 	if ($mandigo_clear_all_paragraphs) {
- ?>
  .entry p {
  	clear: both;
  }
- <?php
- 	}
- ?>
  
  #footer {
  	margin: 0 auto;
--- 436,444 ----