diff -c royale-1.1/README.txt royale-1.2/README.txt
*** royale-1.1/README.txt	2007-05-10 09:22:14.000000000 -0400
--- royale-1.2/README.txt	2007-05-22 14:05:24.000000000 -0400
***************
*** 45,57 ****
  
  === ABOUT ROYALE =======================================================================
  
! Images classes:
  - Images in posts are surrounded by a border by default. To override this behaviour, 
    simply add the 'noborder' class to your img tags. 
  - Images are also left-floated by default. To override this, add the 'nofloat' class to 
    your img tags.
  
! Widgets support:
  Royale supports up to four widgets bars: two on the sides, one at the top and one at 
  the bottom. The sidebars can be displayed on either side of the reading area. The 
  top/bottom bars are most useful to display some kind of static content (using text 
--- 45,57 ----
  
  === ABOUT ROYALE =======================================================================
  
! ** Images classes:
  - Images in posts are surrounded by a border by default. To override this behaviour, 
    simply add the 'noborder' class to your img tags. 
  - Images are also left-floated by default. To override this, add the 'nofloat' class to 
    your img tags.
  
! ** Widgets support:
  Royale supports up to four widgets bars: two on the sides, one at the top and one at 
  the bottom. The sidebars can be displayed on either side of the reading area. The 
  top/bottom bars are most useful to display some kind of static content (using text 
***************
*** 60,71 ****
  If you're still not using widgets (you should!), you can find more information about 
  them here: http://automattic.com/code/widgets/
  
  If you enjoy this theme, please consider doing some (all) of the following things:
  - let me know and send an email to tom@onehertz.com
  - leave a comment on the Theme Viewer:
!   http://themes.wordpress.net/columns/2-columns/1378/
  - bookmark it on del.icio.us:
!   http://del.icio.us/search/?p=royale+theme
  
  Thank you for choosing Royale!
  
--- 60,79 ----
  If you're still not using widgets (you should!), you can find more information about 
  them here: http://automattic.com/code/widgets/
  
+ 
+ === SHOW YOUR SUPPORT ==================================================================
+ 
  If you enjoy this theme, please consider doing some (all) of the following things:
+ 
  - 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
+ 
  - leave a comment on the Theme Viewer:
!   http://themes.wordpress.net/columns/2-columns/2850/
! 
  - bookmark it on del.icio.us:
!   http://del.icio.us/url/ed1be75ee2bef47cf976eae4903fb2a9
  
  Thank you for choosing Royale!
  
***************
*** 91,100 ****
--- 99,111 ----
  Dutch:      Ramsy de Vos
  French:     Michel Bibal
  German:     Michael Nickel
+ Greek:      Andrew Kontokanis
  Hungarian:  Horvath Zoltan
  Icelandic:  Karl Kristjansson
  Italian:    Sebastiano Cannata
  Japanese:   Mitsuhiro Kanda
+ Malay:      Intan Keristina
+ Maltese:    James Cauchi
  Norwegian:  Torbjorn Blystad
  Polish:     Mateusz Baran
  Portuguese: Oscar Nogueira Neto
***************
*** 105,110 ****
--- 116,123 ----
  Swedish:    Ulf Wrede, Johan
  Turkish:    Mert Yabul
  
+ .po files are available at http://www.onehertz.com/portfolio/wordpress/mandigo/l10n/
+ 
  Do not see your language listed here? If you are interested in helping with translation,
  please let me know by sending an email to tom@onehertz.com
  
***************
*** 120,125 ****
--- 133,149 ----
  
  === CHANGELOG ==========================================================================
  
+ 1.2
+ * tested successfully with WordPress 2.2
+ * fixed a bug that would break the color cycling feature when a third-party stylesheet
+ uses @import rules
+ * donation link now links to our NICE donation page *hint* *hint*
+ * grammar fixes: Spanish (es_ES)
+ * grammar fixes: Swedish (sv_SE)
+ * WPMU friendly
+ * fixed a bug that would cause the translation for "Pages" to not show up correctly
+ * more Event Calendar alignment issues fixed
+ 
  1.1
  + three new background patterns
  + added an option to select the background pattern
Binary files royale-1.1/es_ES.mo and royale-1.2/es_ES.mo differ
diff -c royale-1.1/footer.php royale-1.2/footer.php
*** royale-1.1/footer.php	2007-04-28 18:28:30.000000000 -0400
--- royale-1.2/footer.php	2007-05-17 14:59:38.000000000 -0400
***************
*** 11,22 ****
  
    tom
  
! */?>
! <?php echo get_option('royale_inserts_footer'); ?>
  <div id="footer">
- <!-- If you'd like to support WordPress, having the "powered by" link someone on your blog is the best way, it's our only promotion or advertising. -->
  	<p>
! 		<?php _e('Powered by <a href="http://wordpress.org/">WordPress</a>','royale'); ?>, <a href="http://www.onehertz.com/portfolio/wordpress/" target="_blank" title="conception de sites Internet">Royale theme</a> by tom.
  		<br /><?php echo mkicon('rss',''); ?> <a href="feed:<?php bloginfo('rss2_url'); ?>"><?php _e('Entries (RSS)','royale'); ?></a>
  		<?php _e('and','royale'); ?> <?php echo mkicon('rss',''); ?> <a href="feed:<?php bloginfo('comments_rss2_url'); ?>"><?php _e('Comments (RSS)','royale'); ?></a>.
  		<?php if (get_option('royale_footer_stats')): ?>
--- 11,30 ----
  
    tom
  
! */
! 
!   global $wpmu;
!   echo get_option('mandigo_inserts_footer');
! ?>
  <div id="footer">
  	<p>
! <?php if ($wpmu): $current_site = get_current_site(); ?>
! 		<?php _e('Powered by <a href="http://mu.wordpress.org/">WordPress MU</a>','royale'); ?> &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">Royale theme</a> by tom.
! 
! <?php else: ?>
! 		<?php _e('Powered by <a href="http://wordpress.org/">WordPress</a>','royale'); ?>, <a href="http://www.onehertz.com/portfolio/wordpress/" target="_blank" title="WordPress themes">Royale theme</a> by tom.
! 
! <?php endif; ?>
  		<br /><?php echo mkicon('rss',''); ?> <a href="feed:<?php bloginfo('rss2_url'); ?>"><?php _e('Entries (RSS)','royale'); ?></a>
  		<?php _e('and','royale'); ?> <?php echo mkicon('rss',''); ?> <a href="feed:<?php bloginfo('comments_rss2_url'); ?>"><?php _e('Comments (RSS)','royale'); ?></a>.
  		<?php if (get_option('royale_footer_stats')): ?>
diff -c royale-1.1/functions.php royale-1.2/functions.php
*** royale-1.1/functions.php	2007-05-10 09:05:54.000000000 -0400
--- royale-1.2/functions.php	2007-05-17 15:17:32.000000000 -0400
***************
*** 1,75 ****
  <?php
! if (function_exists('register_sidebar')) {
! 	register_sidebar();
! 	register_sidebar();
! 	register_sidebar(array('name'=>'Royale Top'));
! 	register_sidebar(array('name'=>'Royale Bottom'));
! }
! load_theme_textdomain('royale');
! 
! // Set default values
! if (get_option('royale_hue')) { $hue = get_option('royale_hue'); }
! else { $hue = 201; update_option('royale_hue', $hue); }
! 
! if (get_option('royale_rgb1')) { $rgb1 = get_option('royale_rgb1'); }
! else { $rgb1 = "rgb(21,159,233)"; update_option('royale_rgb1', $rgb1); }
! if (get_option('royale_rgb2')) { $rgb2 = get_option('royale_rgb2'); }
! else { $rgb2 = "rgb(128,210,255)"; update_option('royale_rgb2', $rgb2); }
! 
! if (get_option('royale_dates')) { $dates = get_option('royale_dates'); }
! else { $dates = 0; update_option('royale_dates', $dates); }
! 
! if (get_option('royale_overlay_opacity')) { $overlay_opacity = get_option('royale_overlay_opacity'); }
! else { $overlay_opacity = 25; update_option('royale_overlay_opacity', $overlay_opacity); }
  
! if (get_option('royale_bgpattern')) { $bgpattern = get_option('royale_bgpattern'); }
! else { $bgpattern = "default.png"; update_option('royale_bgpattern', $bgpattern); }
  
  
  
! // some global vars
! $ie     = preg_match("/MSIE [4-6]/",$_SERVER['HTTP_USER_AGENT']);
! $ie7    = preg_match("/MSIE 7/",    $_SERVER['HTTP_USER_AGENT']);
  
  
  
! // 
! function mkicon($class,$alt) {
!   return '<img src="'. get_bloginfo('stylesheet_directory') .'/images/1x1.gif" class="icon '. $class .'" alt="'. $alt .'" />';
! }
  
  
  
! // SEARCH WIDGET
! function widget_royale_search() {
  ?>
  			<li><h2><?php _e('Search','royale'); ?></h2>
  				<?php include (TEMPLATEPATH . '/searchform.php'); ?>
  			</li>
  <?php
! }
! if (function_exists('register_sidebar_widget')) register_sidebar_widget('Search','widget_royale_search');
  
  
  
  
! // CALENDAR WIDGET
! function widget_royale_calendar() {
  ?>
  			<li><h2>&nbsp;</h2>
  				<?php get_calendar(); ?>
  			</li>
  <?php
! }
! if (function_exists('register_sidebar_widget')) register_sidebar_widget('Calendar','widget_royale_calendar');
  
  
  
  
! // META WIDGET
! function widget_royale_meta() {
! 	$options = get_option('widget_meta');
! 	$title = empty($options['title']) ? __('Meta','royale') : $options['title'];
  ?>
  				<li><h2><?php echo $title; ?></h2>
  				<ul>
--- 1,64 ----
  <?php
!   if (function_exists('register_sidebar')) {
!     register_sidebar();
!     register_sidebar();
!     register_sidebar(array('name'=>'Royale Top'));
!     register_sidebar(array('name'=>'Royale Bottom'));
!   }
!   load_theme_textdomain('royale');
  
!   // Set default values
!   if (!get_option('royale_hue'))             update_option('royale_hue'            , 201               );
!   if (!get_option('royale_rgb1'))            update_option('royale_rgb1'           , 'rgb(21,159,233)' );
!   if (!get_option('royale_rgb2'))            update_option('royale_rgb2'           , 'rgb(128,210,255)');
!   if (!get_option('royale_overlay_opacity')) update_option('royale_overlay_opacity', 25                );
!   if (!get_option('royale_bgpattern'))       update_option('royale_bgpattern'      , 'default.png'     );
  
  
  
!   // 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');
  
  
  
!   function mkicon($class,$alt) {
!     return '<img src="'. get_bloginfo('stylesheet_directory') .'/images/1x1.gif" class="icon '. $class .'" alt="'. $alt .'" />';
!   }
  
  
  
!   // SEARCH WIDGET
!   function widget_royale_search() {
  ?>
  			<li><h2><?php _e('Search','royale'); ?></h2>
  				<?php include (TEMPLATEPATH . '/searchform.php'); ?>
  			</li>
  <?php
!   }
!   if (function_exists('register_sidebar_widget')) register_sidebar_widget('Search','widget_royale_search');
  
  
  
  
!   // CALENDAR WIDGET
!   function widget_royale_calendar() {
  ?>
  			<li><h2>&nbsp;</h2>
  				<?php get_calendar(); ?>
  			</li>
  <?php
!   }
!   if (function_exists('register_sidebar_widget')) register_sidebar_widget('Calendar','widget_royale_calendar');
  
  
  
  
!   // META WIDGET
!   function widget_royale_meta() {
!     $options = get_option('widget_meta');
!     $title = empty($options['title']) ? __('Meta','royale') : $options['title'];
  ?>
  				<li><h2><?php echo $title; ?></h2>
  				<ul>
***************
*** 82,177 ****
  				</ul>
  				</li>
  <?php
! }
! if (function_exists('register_sidebar_widget')) register_sidebar_widget('Meta','widget_royale_meta');
! 
  
  
  
- // ADMIN
- add_action('admin_menu', 'add_royale_options_page');
- add_action('admin_menu', 'add_royale_inserts_page');
- add_action('admin_menu', 'add_royale_readme_page');
- function add_royale_options_page() { add_theme_page('Theme Options', '<img src="'. get_bloginfo('template_directory') .'/images/attention_catcher.png" /> Theme Options', 'edit_themes', basename(__FILE__), 'royale_options_page'); }
- function add_royale_inserts_page() { add_theme_page('HTML Inserts', '<img src="'. get_bloginfo('template_directory') .'/images/attention_catcher.png" /> HTML Inserts', 'edit_themes', 'Inserts', 'royale_inserts_page'); }
- function add_royale_readme_page()  { add_theme_page('README', 'README', 'switch_themes', 'README', 'royale_readme_page'); }
  
! function royale_set_bool($var,$value)     { update_option($var,                   $value); }
! function royale_set_dates($value)         { update_option('royale_dates',         $value); }
! function royale_set_exclude_pages($value) { update_option('royale_exclude_pages', $value); }
  
! function royale_options_page() {
! 	global $ie, $ie7;
! 	if ( $_GET['page'] == basename(__FILE__) ) {
! 		$ct = current_theme_info();
! 		
! 		if (isset($_POST['changedoptions'])) {
! 			royale_set_dates($_POST['dates']);
! 			$exclude[] = '';
! 			foreach ( $_POST as $field => $value ) {
! 				if ( preg_match("/exclude_(\d+)/",$field,$id) ) { $exclude[] = $id[1]; }
! 			}
! 			royale_set_exclude_pages(implode(",",$exclude));
! 			royale_set_bool('royale_bold_links'   ,$_POST['boldlinks']  );
! 			royale_set_bool('royale_1024'         ,$_POST['wide']       );
! 			royale_set_bool('royale_nofloat'      ,$_POST['nofloat']    );
! 			royale_set_bool('royale_footer_stats' ,$_POST['footstats']  );
! 			royale_set_bool('royale_3columns'     ,$_POST['col3']       );
! 			royale_set_bool('royale_sidebar1_left',$_POST['sidebar1']   );
! 			royale_set_bool('royale_sidebar2_left',$_POST['sidebar2']   );
! 			royale_set_bool('royale_hue_cycle'    ,$_POST['cycle']      );
! 			royale_set_bool('royale_em_italics'   ,$_POST['em']         );
! 			update_option('royale_hue'            ,$_POST['hue']            );
! 			update_option('royale_rgb1'           ,$_POST['rgb1']           );
! 			update_option('royale_rgb2'           ,$_POST['rgb2']           );
! 			update_option('royale_overlay_opacity',$_POST['overlay_opacity']);
! 			update_option('royale_bgpattern'      ,$_POST['bgpattern']      );
! 		}
! 		$dates           = get_option('royale_dates'          );
! 		$exclude         = split(",",get_option('royale_exclude_pages'));
! 		$boldlinks       = get_option('royale_bold_links'     );
! 		$nofloat         = get_option('royale_nofloat'        );
! 		$footstats       = get_option('royale_footer_stats'   );
! 		$col3            = get_option('royale_3columns'       );
! 		$sidebar1        = get_option('royale_sidebar1_left'  );
! 		$sidebar2        = get_option('royale_sidebar2_left'  );
!                 $cycle           = get_option('royale_hue_cycle'      );
! 		$em              = get_option('royale_em_italics'     );
!                 $hue             = get_option('royale_hue'            );
!                 $rgb1            = get_option('royale_rgb1'           );
!                 $rgb2            = get_option('royale_rgb2'           );
! 		$overlay_opacity = get_option('royale_overlay_opacity');
! 		$bgpattern       = get_option('royale_bgpattern'      );
! 
! 		$pages = & get_pages('sort_column=menu_order');
! 		foreach ( $pages as $page ) {
! 			if (!$page->post_parent) { $pages_select .= '<input type="checkbox" name="exclude_'. $page->ID .'"'. (array_search($page->ID, $exclude) ? ' checked' : '') .' /> '. $page->post_title . '<br />'; }
! 		}
! 
! 		$patterns_dir = opendir(TEMPLATEPATH .'/images/patterns/');
! 		while (false !== ($pattern = readdir($patterns_dir))) {
! 			if (preg_match("/\.(?:jpe?g|gif|png|bmp)$/i",$pattern)) {
! 				$patterns .= '<input type="radio" name="bgpattern" value="'.$pattern.'"'. ($bgpattern == $pattern ? ' checked="checked"' : '') .' /><img src="'. get_bloginfo('stylesheet_directory').'/images/patterns/'.$pattern.'" title="'. $pattern .'" style="width: 100px; height: 100px" /> ';
! 			}
! 		}
! 
! 		echo '
! 		<form action="https://www.paypal.com/cgi-bin/webscr" method="post" name="paypal">
! 		<input type="hidden" name="cmd" value="_s-xclick" />
! 		<p align="center"><a href="#versioncheck">Are you using the latest version?</a> - <a href="#" onclick="javascript:document.forms.paypal.submit();" title="Show your support">Enjoy Royale? Please consider making a donation.</a>
! 		<input type="hidden" name="encrypted" value="-----BEGIN PKCS7-----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-----END PKCS7-----" />
! 		</form>
! 		</p>
  		<div class="wrap">
  		<h2>Royale Options</h2>
  		
  		<form name="royale_options_form" method="post" action="?page=functions.php">
! 		<input type="hidden" name="changedoptions" value="1" />
  		
  		<fieldset class="options">
  		<legend>Layout Options</legend>
  		<label><b>Columns</b></label><br />
! 		<input type="checkbox" name="col3" '. ($col3 ? 'checked="checked"' : '') .' /> Use the 3-column layout<br />
  		First sidebar position: 
  		<input type="radio" name="sidebar1" value="1"  '. ($sidebar1 ? 'checked="checked"' : '') .' />left &nbsp; 
  		<input type="radio" name="sidebar1" value="0"  '. ($sidebar1 ? '' : 'checked="checked"') .' />right<br />
--- 71,154 ----
  				</ul>
  				</li>
  <?php
!   }
!   if (function_exists('register_sidebar_widget')) register_sidebar_widget('Meta','widget_royale_meta');
  
  
  
  
!   // ADMIN
!   add_action('admin_menu', 'add_royale_options_page');
!   add_action('admin_menu', 'add_royale_inserts_page');
!   add_action('admin_menu', 'add_royale_readme_page');
! 
!   function add_royale_options_page() { add_theme_page('Theme Options', '<img src="'. get_bloginfo('template_directory') .'/images/attention_catcher.png" /> Theme Options', 'edit_themes', basename(__FILE__), 'royale_options_page'); }
!   function add_royale_inserts_page() { add_theme_page('HTML Inserts', '<img src="'. get_bloginfo('template_directory') .'/images/attention_catcher.png" /> HTML Inserts', 'edit_themes', 'Inserts', 'royale_inserts_page'); }
!   function add_royale_readme_page()  { add_theme_page('README', 'README', 'switch_themes', 'README', 'royale_readme_page'); }
! 
!   function royale_set_var($var,$value)      { update_option('royale_'.$var,         $value); }
!   function royale_set_exclude_pages($value) { update_option('royale_exclude_pages', $value); }
! 
!   function royale_options_page() {
!     global $ie, $ie7;
!     if ($_GET['page'] == basename(__FILE__)) {
!       $ct = current_theme_info();
! 
!       if (isset($_POST['updated'])) {
!         royale_set_var('dates',$_POST['dates']);
! 
!         $exclude[] = '';
!         foreach ($_POST as $field => $value) {
!           if (preg_match("/exclude_(\d+)/",$field,$id)) { $exclude[] = $id[1]; }
!         }
! 
!         royale_set_exclude_pages(implode(",",$exclude));
!         royale_set_var('bold_links'     ,$_POST['boldlinks']      );
!         royale_set_var('nofloat'        ,$_POST['nofloat']        );
!         royale_set_var('footer_stats'   ,$_POST['footstats']      );
!         royale_set_var('3columns'       ,$_POST['col3']           );
!         royale_set_var('sidebar1_left'  ,$_POST['sidebar1']       );
!         royale_set_var('sidebar2_left'  ,$_POST['sidebar2']       );
!         royale_set_var('hue_cycle'      ,$_POST['cycle']          );
!         royale_set_var('em_italics'     ,$_POST['em']             );
!         royale_set_var('hue'            ,$_POST['hue']            );
!         royale_set_var('rgb1'           ,$_POST['rgb1']           );
!         royale_set_var('rgb2'           ,$_POST['rgb2']           );
!         royale_set_var('overlay_opacity',$_POST['overlay_opacity']);
!         royale_set_var('bgpattern'      ,$_POST['bgpattern']      );
!       }
!       $dates           = get_option('royale_dates'          );
!       $exclude         = split(",",get_option('royale_exclude_pages'));
!       $sidebar1        = get_option('royale_sidebar1_left'  );
!       $sidebar2        = get_option('royale_sidebar2_left'  );
!       $hue             = get_option('royale_hue'            );
!       $overlay_opacity = get_option('royale_overlay_opacity');
!       $bgpattern       = get_option('royale_bgpattern'      );
! 
!       $pages = & get_pages('sort_column=menu_order');
!       foreach ($pages as $page) {
!         if (!$page->post_parent) { $pages_select .= '<input type="checkbox" name="exclude_'. $page->ID .'"'. (array_search($page->ID, $exclude) ? ' checked' : '') .' /> '. $page->post_title . '<br />'; }
!       }
! 
!       $patterns_dir = opendir(TEMPLATEPATH .'/images/patterns/');
!       while (false !== ($pattern = readdir($patterns_dir))) {
!         if (preg_match("/\.(?:jpe?g|gif|png|bmp)$/i",$pattern)) {
!           $patterns .= '<input type="radio" name="bgpattern" value="'.$pattern.'"'. ($bgpattern == $pattern ? ' checked="checked"' : '') .' /><img src="'. get_bloginfo('stylesheet_directory').'/images/patterns/'.$pattern.'" title="'. $pattern .'" style="width: 100px; height: 100px" /> ';
!         }
!       }
  
!       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">Enjoy Royale? Please consider making a donation.</a></p>
  		<div class="wrap">
  		<h2>Royale Options</h2>
  		
  		<form name="royale_options_form" method="post" action="?page=functions.php">
! 		<input type="hidden" name="updated" value="1" />
  		
  		<fieldset class="options">
  		<legend>Layout Options</legend>
  		<label><b>Columns</b></label><br />
! 		<input type="checkbox" name="col3" '. (get_option('royale_3columns') ? 'checked="checked"' : '') .' /> Use the 3-column layout<br />
  		First sidebar position: 
  		<input type="radio" name="sidebar1" value="1"  '. ($sidebar1 ? 'checked="checked"' : '') .' />left &nbsp; 
  		<input type="radio" name="sidebar1" value="0"  '. ($sidebar1 ? '' : 'checked="checked"') .' />right<br />
***************
*** 180,188 ****
  		<input type="radio" name="sidebar2" value="0"  '. ($sidebar2 ? '' : 'checked="checked"') .' />right<br /><br />
  					
  		<label><b>Colors</b></label><br />
! 		Hue: <img src="'. get_bloginfo('template_directory') .'/images/hue.jpg" alt="" id="hues" style="width: 360px; height: 8px;" /><img src="'. get_bloginfo('template_directory') .'/images/handle.gif" alt="" id="handle" style="width: 9px; height: 8px; cursor: pointer;" /> <input type="text" id="huev" name="huev" value="'.$hue.'" size="3" disabled style="textalign: center; font-weight: bold;" />&deg;<br />
! 		<input type="hidden" name="hue" value="'.$hue.'" /> <input type="hidden" name="rgb1" value="'.$rgb1.'" /><input type="hidden" name="rgb2" value="'.$rgb2.'" />
! 		<input type="checkbox" name="cycle" '. ($cycle ? 'checked="checked"' : '') .' /> I can\'t decide, cycle colors automatically<br /><br />
  
  		<label><b>Background Opacity</b></label><br />
  		Black background opacity: 
--- 157,165 ----
  		<input type="radio" name="sidebar2" value="0"  '. ($sidebar2 ? '' : 'checked="checked"') .' />right<br /><br />
  					
  		<label><b>Colors</b></label><br />
! 		Hue: <img src="'. get_bloginfo('template_directory') .'/images/hue.jpg" alt="" id="hues" style="width: 360px; height: 8px;" /><img src="'. get_bloginfo('template_directory') .'/images/handle.gif" alt="" id="handle" style="width: 9px; height: 8px; cursor: pointer;" /> <input type="text" id="huev" name="huev" value="'. $hue .'" size="3" disabled style="textalign: center; font-weight: bold;" />&deg;<br />
! 		<input type="hidden" name="hue" value="'.$hue.'" /> <input type="hidden" name="rgb1" value="'. get_option('royale_rgb1') .'" /><input type="hidden" name="rgb2" value="'. get_option('royale_rgb2') .'" />
! 		<input type="checkbox" name="cycle" '. (get_option('royale_hue_cycle') ? 'checked="checked"' : '') .' /> I can\'t decide, cycle colors automatically<br /><br />
  
  		<label><b>Background Opacity</b></label><br />
  		Black background opacity: 
***************
*** 190,196 ****
  		<input type="radio" name="overlay_opacity" value="50"  '. ($overlay_opacity == 50 ? 'checked="checked"' : '') .' />50%<br /><br />
  
  		<label><b>Background Pattern</b></label><br />
! 		'.$patterns.'
  		</fieldset>
  
  		<fieldset class="options">
--- 167,173 ----
  		<input type="radio" name="overlay_opacity" value="50"  '. ($overlay_opacity == 50 ? 'checked="checked"' : '') .' />50%<br /><br />
  
  		<label><b>Background Pattern</b></label><br />
! 		'. $patterns .'
  		</fieldset>
  
  		<fieldset class="options">
***************
*** 199,214 ****
  		'. $pages_select .'<br />
  
  		<label><b>Readability</b></label><br/>
! 		<input type="checkbox" name="boldlinks" '. ($boldlinks ? 'checked="checked"' : '') .' /> Display all links in bold for better readability<br /><br /> 
  					
  		<label><b>Date Format</b></label><br/>
  		<input type="radio" name="dates" value="0"  '. ($dates ? '' : 'checked="checked"') .' />dd/mm/yyyy &nbsp; 
  		<input type="radio" name="dates" value="1"  '. ($dates ? 'checked="checked"' : '') .' />month/dd/yyyy<br /><br />
  
  		<label><b>Really miscellaneous options</b></label><br/>
! 		<input type="checkbox" name="nofloat" '. ($nofloat ? 'checked="checked"' : '') .' /> Do not float images<br />
! 		<input type="checkbox" name="footstats" '. ($footstats ? 'checked="checked"' : '') .' /> Display rendering time and SQL statistics in the footer<br />
! 		<input type="checkbox" name="em" '. ($em ? 'checked="checked"' : '') .' /> Display &lt;em&gt; tags as italics
  		</fieldset>
  
  		<p class="submit"><input type="submit" name="Submit" value="'.__('Update Options &raquo;').'"/></p>
--- 176,191 ----
  		'. $pages_select .'<br />
  
  		<label><b>Readability</b></label><br/>
! 		<input type="checkbox" name="boldlinks" '. (get_option('royale_bold_links') ? 'checked="checked"' : '') .' /> Display all links in bold for better readability<br /><br /> 
  					
  		<label><b>Date Format</b></label><br/>
  		<input type="radio" name="dates" value="0"  '. ($dates ? '' : 'checked="checked"') .' />dd/mm/yyyy &nbsp; 
  		<input type="radio" name="dates" value="1"  '. ($dates ? 'checked="checked"' : '') .' />month/dd/yyyy<br /><br />
  
  		<label><b>Really miscellaneous options</b></label><br/>
! 		<input type="checkbox" name="nofloat" '. (get_option('royale_nofloat') ? 'checked="checked"' : '') .' /> Do not float images<br />
! 		<input type="checkbox" name="footstats" '. (get_option('royale_footer_stats') ? 'checked="checked"' : '') .' /> Display rendering time and SQL statistics in the footer<br />
! 		<input type="checkbox" name="em" '. (get_option('royale_em_italics') ? 'checked="checked"' : '') .' /> Display &lt;em&gt; tags as italics
  		</fieldset>
  
  		<p class="submit"><input type="submit" name="Submit" value="'.__('Update Options &raquo;').'"/></p>
***************
*** 218,230 ****
  		<iframe src="http://www.onehertz.com/cgi-bin/wordpress:versioncheck.pl?theme=Royale&amp;version='. $ct->version .'" width="100%" height="90" scrolling="auto" frameborder="0"></iframe>
  
  		</div>
! 		';
! 		
! 		echo '
  		<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>
  <script type="text/javascript">
  function hsv2rgb(h,s,v) {
    hi = Math.floor(h/60) % 6;
--- 195,206 ----
  		<iframe src="http://www.onehertz.com/cgi-bin/wordpress:versioncheck.pl?theme=Royale&amp;version='. $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>
+ 
  <script type="text/javascript">
  function hsv2rgb(h,s,v) {
    hi = Math.floor(h/60) % 6;
***************
*** 301,324 ****
  document.onmouseup   = mup;
  updatehue('.$hue.');
  </script>
! 		';
! 	}	
! }
  
! function royale_set_insert($key,$value)  { update_option('royale_inserts_'.$key,str_replace("\\","",$value)); }
! function royale_inserts_page() {
! 		if (isset($_POST['changedinserts'])) {
! 			royale_set_insert('header',$_POST['header']);
! 			royale_set_insert('body'  ,$_POST['body']  );
! 			royale_set_insert('footer',$_POST['footer']);
! 		}
  
! 	echo '
  		<div class="wrap">
  		<h2>Royale Options</h2>
  		
  		<form name="royale_options_form" method="post" action="?page=Inserts">
! 		<input type="hidden" name="changedinserts" value="1" />
  		
  		<fieldset class="options">
  		<legend>HTML Inserts</legend>
--- 277,300 ----
  document.onmouseup   = mup;
  updatehue('.$hue.');
  </script>
!       ';
!     }	
!   }
  
!   function royale_set_insert($key,$value)  { update_option('royale_inserts_'.$key,str_replace("\\","",$value)); }
!   function royale_inserts_page() {
!     if (isset($_POST['updated'])) {
!       royale_set_insert('header',$_POST['header']);
!       royale_set_insert('body'  ,$_POST['body']  );
!       royale_set_insert('footer',$_POST['footer']);
!     }
  
!     echo '
  		<div class="wrap">
  		<h2>Royale Options</h2>
  		
  		<form name="royale_options_form" method="post" action="?page=Inserts">
! 		<input type="hidden" name="updated" value="1" />
  		
  		<fieldset class="options">
  		<legend>HTML Inserts</legend>
***************
*** 343,356 ****
  		<p class="submit"><input type="submit" name="Submit" value="'.__('Update Inserts &raquo;').'"/></p>
  		</form>
  		</div>
! ';
! }
  
! function royale_readme_page() {
! 	echo '<div class="wrap">';
! 	echo '<pre>';
! 	include("README.txt");
! 	echo '</pre>';
! 	echo '</div>';
! }
  ?>
--- 319,332 ----
  		<p class="submit"><input type="submit" name="Submit" value="'.__('Update Inserts &raquo;').'"/></p>
  		</form>
  		</div>
!     ';
!   }
  
!   function royale_readme_page() {
!     echo '<div class="wrap">';
!     echo '<pre>';
!     include("README.txt");
!     echo '</pre>';
!     echo '</div>';
!   }
  ?>
diff -c royale-1.1/header.php royale-1.2/header.php
*** royale-1.1/header.php	2007-04-28 19:04:56.000000000 -0400
--- royale-1.2/header.php	2007-05-17 16:09:50.000000000 -0400
***************
*** 7,12 ****
--- 7,13 ----
  <title><?php bloginfo('name'); ?> <?php if ( is_single() ) { ?> &raquo; Blog Archive <?php } ?> <?php wp_title(); ?></title>
  
  <meta name="generator" content="WordPress <?php bloginfo('version'); ?>" /> <!-- leave this for stats -->
+ <meta name="theme"     content="Royale <?php $themes = get_themes(); echo $themes['Royale']['Version']; ?>" />
  
  <link rel="stylesheet" href="<?php echo get_bloginfo('stylesheet_url'); ?>.php" type="text/css" media="screen" />
  <link rel="alternate" type="application/rss+xml" title="<?php bloginfo('name'); ?> RSS Feed" href="<?php bloginfo('rss2_url'); ?>" />
***************
*** 85,97 ****
    re2 = /<?php echo ereg_replace(',',',\\s*',ereg_replace('([\(\)])','\\\\1',$rgb20)); ?>/i;
    for (i=0;i<document.styleSheets.length;i++) {
      for (j=0;j<document.styleSheets[i][rules].length;j++) {
!       if (document.styleSheets[i][rules][j].style['marks']) {
!         for (k=0;k<props.length;k++) {
!           if (re1.test(document.styleSheets[i][rules][j].style[props[k]])) {
!             elements[elements.length++] = new Array(i,j,k,document.styleSheets[i][rules][j].style[props[k]].replace(re1,'RGB1'));
!           }
!           if (re2.test(document.styleSheets[i][rules][j].style[props[k]])) {
!             elements[elements.length++] = new Array(i,j,k,document.styleSheets[i][rules][j].style[props[k]].replace(re2,'RGB2'));
            }
          }
        }
--- 86,100 ----
    re2 = /<?php echo ereg_replace(',',',\\s*',ereg_replace('([\(\)])','\\\\1',$rgb20)); ?>/i;
    for (i=0;i<document.styleSheets.length;i++) {
      for (j=0;j<document.styleSheets[i][rules].length;j++) {
!       if (document.styleSheets[i][rules][j].type == 1) {
!         if (document.styleSheets[i][rules][j].style['marks']) {
!           for (k=0;k<props.length;k++) {
!             if (re1.test(document.styleSheets[i][rules][j].style[props[k]])) {
!               elements[elements.length++] = new Array(i,j,k,document.styleSheets[i][rules][j].style[props[k]].replace(re1,'RGB1'));
!             }
!             if (re2.test(document.styleSheets[i][rules][j].style[props[k]])) {
!               elements[elements.length++] = new Array(i,j,k,document.styleSheets[i][rules][j].style[props[k]].replace(re2,'RGB2'));
!             }
            }
          }
        }
***************
*** 114,123 ****
  ?>
  
  <div id="header">
! 	<h1><a href="<?php echo get_settings('home'); ?>/"><?php bloginfo('name'); ?></a></h1>
  	<div class="description"><?php bloginfo('description'); ?></div>
  	<ul class="pages">
! 		<li class="page_item"><a href="<?php echo get_settings('home'); ?>/"><?php _e('Home','royale'); ?></a></li>
  		<?php wp_list_pages('sort_column=menu_order&depth=1&title_li=&exclude='.get_option('royale_exclude_pages')); ?>
  	</ul>
  </div>
--- 117,126 ----
  ?>
  
  <div id="header">
! 	<h1><a href="<?php echo get_option('home'); ?>/"><?php bloginfo('name'); ?></a></h1>
  	<div class="description"><?php bloginfo('description'); ?></div>
  	<ul class="pages">
! 		<li class="page_item"><a href="<?php echo get_option('home'); ?>/"><?php _e('Home','royale'); ?></a></li>
  		<?php wp_list_pages('sort_column=menu_order&depth=1&title_li=&exclude='.get_option('royale_exclude_pages')); ?>
  	</ul>
  </div>
Common subdirectories: royale-1.1/images and royale-1.2/images
diff -c royale-1.1/sidebar.php royale-1.2/sidebar.php
*** royale-1.1/sidebar.php	2007-04-26 20:11:18.000000000 -0400
--- royale-1.2/sidebar.php	2007-05-17 16:06:58.000000000 -0400
***************
*** 25,31 ****
  
  			<?php } ?>
  
! 			<?php wp_list_pages(array('title_li' => '<h2>'. __('Pages','royale') .'</h2>','sort_column' => 'menu_order')); ?>
  
  			<li><h2><?php _e('Categories','royale'); ?></h2>
  				<ul>
--- 25,31 ----
  
  			<?php } ?>
  
! 			<?php wp_list_pages(array('title_li' => '<h2>'. str_replace('&','%26',__('Pages','royale')) .'</h2>','sort_column' => 'menu_order')); ?>
  
  			<li><h2><?php _e('Categories','royale'); ?></h2>
  				<ul>
diff -c royale-1.1/style.css royale-1.2/style.css
*** royale-1.1/style.css	2007-04-28 16:33:48.000000000 -0400
--- royale-1.2/style.css	2007-05-10 11:49:30.000000000 -0400
***************
*** 2,8 ****
  Theme Name: Royale
  Theme URI: http://www.onehertz.com/portfolio/wordpress/
  Description: An elegant 4x widget-ready two/three-column fluid-width WordPress theme with customizable colors. Royale also has an option to make link color cycle smoothly, and has been translated to 22 languages!
! Version: 1.1
  Author: t0mmmmmmm
! Author URI: http://www.onehertz.com/portfolio/
  */
--- 2,8 ----
  Theme Name: Royale
  Theme URI: http://www.onehertz.com/portfolio/wordpress/
  Description: An elegant 4x widget-ready two/three-column fluid-width WordPress theme with customizable colors. Royale also has an option to make link color cycle smoothly, and has been translated to 22 languages!
! Version: 1.2
  Author: t0mmmmmmm
! Author URI: http://www.onehertz.com/portfolio/wordpress/
  */