diff -c royale-1.2.2/README.txt royale-1.3/README.txt
*** royale-1.2.2/README.txt	2007-05-27 13:17:08.000000000 -0400
--- royale-1.3/README.txt	2007-06-18 12:21:28.000000000 -0400
***************
*** 61,81 ****
  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!
  
  
  === LOCALIZATION =======================================================================
--- 61,84 ----
  them here: http://automattic.com/code/widgets/
  
  
! === SEO OPTIONS ========================================================================
  
! ** Custom <title> schemes:
! The keywords in <title> tags being the most important factor in search engine ranking,
! it is important that to make these tags as relevant as possible. Mandigo has a feature 
! that lets you customize <title> tags on a per-pagetype basis, which means you can use 
! different naming patterns on the index, posts, pages, archives and search results.
! 
! The following variables are available:
! %blogname% = the blog title
! %tagline%  = the blog description
! %post%     = the title of the current post or page
! %category% = the category for the current archive, or the list of categories for a post
! %date%     = the date for the current archive
! %search%   = the search terms 
  
! Patterns can be a combination of arbitrary text and these variables, i.e. you could
! use "Welcome to %blogname%" for the index or "Archives for %category%" for archives.
  
  
  === LOCALIZATION =======================================================================
***************
*** 91,120 ****
  be loaded automatically, provided it exists.
  
  
  === TRANSLATION CREDITS ================================================================
  
! Chinese:    Charles Low
! Czech:      Milan Tucek
! Danish:     Daniel Noesgaard Rasmussen
! 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
! Russian:    Michael Dolgov
! Serbian:    Aleksandar Duric
! Slovak:     Marek, Marian Trnka
! Spanish:    Juan Luis Perez Perez
! Swedish:    Ulf Wrede, Johan
! Turkish:    Mert Yabul
  
  .po files are available at http://www.onehertz.com/portfolio/wordpress/mandigo/l10n/
  
--- 94,146 ----
  be loaded automatically, provided it exists.
  
  
+ === 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!
+ 
+ 
  === TRANSLATION CREDITS ================================================================
  
! Arabic:                Maxer
! Bahasa Indonesia:      Benny Wu
! Catalan:               Sergi Barroso
! Chinese (Simplified):  Hua Zhou
! Chinese (Traditional): Charles Low
! Czech:                 Milan Tucek
! Danish:                Daniel Noesgaard Rasmussen
! Dutch:                 Ramsy de Vos
! French:                Michel Bibal
! German:                Michael Nickel
! Greek:                 Andrew Kontokanis
! Hebrew:                Omry Yadan
! Hungarian:             Horvath Zoltan
! Icelandic:             Karl Kristjansson
! Italian:               Sebastiano Cannata
! Japanese:              Mitsuhiro Kanda
! Lithuanian:            Simonas Kiela
! Malay:                 Intan Keristina
! Maltese:               James Cauchi
! Norwegian:             Torbjorn Blystad
! Polish:                Mateusz Baran
! Portuguese:            Oscar Nogueira Neto
! Russian:               Michael Dolgov
! Serbian:               Aleksandar Duric
! Slovak:                Marek, Marian Trnka
! Spanish:               Juan Luis Perez Perez
! Swedish:               Ulf Wrede, Johan
! Turkish:               Mert Yabul
  
  .po files are available at http://www.onehertz.com/portfolio/wordpress/mandigo/l10n/
  
***************
*** 133,138 ****
--- 159,188 ----
  
  === CHANGELOG ==========================================================================
  
+ 1.3
+ + language: Arabic (ar)
+ + language: Bahasa Indonesia (id_ID)
+ + language: Catalan (ca_ES)
+ + language: Chinese Simplified (zh_CN)
+ + language: Hebrew (he_IL)
+ + language: Lithuanian (lt_LT)
+ + added support for right-to-left scripts (Hebrew & Arabic)
+ + added options to customize the <title> tag on a per-pagetype basis
+ + added an option to (slightly) highlight comments made by the author of a post
+ + added an option to display full search results
+ + added an option to display/hide sidebars in single post view mode
+ + added a new HTML Insert container which displays before the content area
+ + the name of the author now links to the author archives
+ * columns are now displayed in a table, this should fix a lot of recurrent issues
+ * fixed list bullets in posts which were displayed off stage in IE
+ * fixed the issue with overlapping images in page view
+ * language: renamed zh_CN to zh_TW
+ * restored page templates functionnality
+ * don't call walkondom() unless it is necessary
+ * finally made a decent archives page
+ * images in attachments view mode are not floated anymore
+ * Royale can now be installed in a directory of arbitrary depth
+ 
  1.2.2
  * fixed some nasty bugs in IE7
  
diff -c royale-1.2.2/archive.php royale-1.3/archive.php
*** royale-1.2.2/archive.php	2007-04-28 18:36:14.000000000 -0400
--- royale-1.3/archive.php	2007-06-11 10:13:58.000000000 -0400
***************
*** 1,10 ****
  <?php 
! 	get_header(); 
! 	include (TEMPLATEPATH . '/sidebar.php');
! 	if (get_option('royale_3columns')) { include (TEMPLATEPATH . '/sidebar2.php');	}
  ?>
! 
! 	<div id="content">
  
  		<?php if (have_posts()) : ?>
  
--- 1,14 ----
  <?php 
! 	get_header();
! 	$alwayssidebars = get_option('royale_always_show_sidebars');
! 	if ($alwayssidebars) {
! 		if (get_option('royale_sidebar1_left')) include (TEMPLATEPATH . '/sidebar.php');
! 		if (get_option('royale_3columns') && get_option('royale_sidebar2_left')) {
! 			include (TEMPLATEPATH . '/sidebar2.php');
! 		}
! 	}
  ?>
! 	<td id="content" class="<?php echo ($alwayssidebars ? 'narrow' : 'wide'); ?>column">
  
  		<?php if (have_posts()) : ?>
  
***************
*** 47,53 ****
                                                  <span class="caly"><?php the_time('Y') ?></span>
                                          </div>
                                          <h3 id="post-<?php the_ID(); ?>"><a href="<?php the_permalink() ?>" rel="bookmark" title="<?php printf(__('Permanent Link to %s','royale'),the_title('','',false)); ?>"><?php the_title(); ?></a></h3>
!                                         <small><?php printf(__('Posted by: %s in %s','royale'),get_the_author(),get_the_category_list(', ')) ?><?php edit_post_link(__('Edit','royale'), ' - '. mkicon('page_edit',__('Edit this post','royale')) .' ', ''); ?>  </small>
                                  </div>
  
  				<div class="entry">
--- 51,57 ----
                                                  <span class="caly"><?php the_time('Y') ?></span>
                                          </div>
                                          <h3 id="post-<?php the_ID(); ?>"><a href="<?php the_permalink() ?>" rel="bookmark" title="<?php printf(__('Permanent Link to %s','royale'),the_title('','',false)); ?>"><?php the_title(); ?></a></h3>
!                                         <small><?php printf(__('Posted by: %s in %s','royale'),'<a href="'. get_author_posts_url(get_the_author_ID()) .'" title="'. sprintf(__("Posts by %s"), attribute_escape(get_the_author())).' ">'. get_the_author() .'</a>',get_the_category_list(', ')) ?><?php edit_post_link(__('Edit','royale'), ' - '. mkicon('page_edit',__('Edit this post','royale')) .' ', ''); ?>  </small>
                                  </div>
  
  				<div class="entry">
***************
*** 72,77 ****
  
  	<?php endif; ?>
  
! 	</div>
  
! <?php get_footer(); ?>
--- 76,90 ----
  
  	<?php endif; ?>
  
! 	</td>
! 
! <?php
! 	if ($alwayssidebars) {
! 		if (!get_option('royale_sidebar1_left')) include (TEMPLATEPATH . '/sidebar.php');
! 		if (get_option('royale_3columns') && !get_option('royale_sidebar2_left')) {
! 			include (TEMPLATEPATH . '/sidebar2.php');
! 		}
! 	}
  
! 	get_footer(); 
! ?>
diff -c royale-1.2.2/archives.php royale-1.3/archives.php
*** royale-1.2.2/archives.php	2007-04-26 20:02:04.000000000 -0400
--- royale-1.3/archives.php	2007-06-11 17:39:12.000000000 -0400
***************
*** 1,29 ****
  <?php
  /*
! Template Name: Archives
  */
  ?>
! 
! <?php get_header(); ?>
! <?php
! 	include (TEMPLATEPATH . '/sidebar.php');
! 	if (get_option('royale_3columns')) { include (TEMPLATEPATH . '/sidebar2.php'); }
  ?>
! <div id="content">
  
! <h2><?php _e('Search','royale'); ?>:</h2>
! <?php include (TEMPLATEPATH . '/searchform.php'); ?>
  
! <h2><?php _e('Archives by Month','royale'); ?>:</h2>
!   <ul>
!     <?php wp_get_archives('type=monthly'); ?>
!   </ul>
  
! <h2><?php _e('Archives by Subject','royale'); ?>:</h2>
!   <ul>
!      <?php wp_list_cats(); ?>
!   </ul>
  
! </div>
  
! <?php get_footer(); ?>
--- 1,47 ----
  <?php
  /*
! Template Name: Archives Template
  */
  ?>
! <?php 
! 	get_header();
! 	$alwayssidebars = get_option('royale_always_show_sidebars');
! 	if ($alwayssidebars) {
! 		if (get_option('royale_sidebar1_left')) include (TEMPLATEPATH . '/sidebar.php');
! 		if (get_option('royale_3columns') && get_option('royale_sidebar2_left')) {
! 			include (TEMPLATEPATH . '/sidebar2.php');
! 		}
! 	}
  ?>
! 	<td id="content" class="<?php echo ($alwayssidebars ? 'narrow' : 'wide'); ?>column">
  
! 	<div class="post">
! 	<div class="entry">
! 	<h2><?php _e('Search','royale'); ?>:</h2>
! 	<?php include (TEMPLATEPATH . '/searchform.php'); ?>
! 
! 	<h2><?php _e('Archives by Month','royale'); ?>:</h2>
! 	<ul>
! 		<?php wp_get_archives('type=monthly'); ?>
! 	</ul>
! 
! 	<h2><?php _e('Archives by Subject','royale'); ?>:</h2>
! 	<ul>
! 		<?php wp_list_cats(); ?>
! 	</ul>
  
! 	</div>
! 	</div>
  
! 	</td>
  
! <?php
! 	if ($alwayssidebars) {
! 		if (!get_option('royale_sidebar1_left')) include (TEMPLATEPATH . '/sidebar.php');
! 		if (get_option('royale_3columns') && !get_option('royale_sidebar2_left')) {
! 			include (TEMPLATEPATH . '/sidebar2.php');
! 		}
! 	}
  
! 	get_footer(); 
! ?>
diff -c royale-1.2.2/attachment.php royale-1.3/attachment.php
*** royale-1.2.2/attachment.php	2007-04-26 20:02:40.000000000 -0400
--- royale-1.3/attachment.php	2007-06-11 10:15:54.000000000 -0400
***************
*** 1,6 ****
! <?php get_header(); ?>
! 
! 	<div id="content">
  
    <?php if (have_posts()) : while (have_posts()) : the_post(); ?>
  
--- 1,14 ----
! <?php 
! 	get_header();
! 	$alwayssidebars = get_option('royale_always_show_sidebars');
! 	if ($alwayssidebars) {
! 		if (get_option('royale_sidebar1_left')) include (TEMPLATEPATH . '/sidebar.php');
! 		if (get_option('royale_3columns') && get_option('royale_sidebar2_left')) {
! 			include (TEMPLATEPATH . '/sidebar2.php');
! 		}
! 	}
! ?>
! 	<td id="content" class="<?php echo ($alwayssidebars ? 'narrow' : 'wide'); ?>column">
  
    <?php if (have_posts()) : while (have_posts()) : the_post(); ?>
  
***************
*** 24,43 ****
  						<?php printf(__('This entry was posted on %s at %s and is filed under %s.','royale'),get_the_time(__('l, F jS, Y','royale')),get_the_time(),get_the_category_list(', ')); ?>
  						<?php printf(__('You can follow any responses to this entry through the %s feed.','royale'),'<a href="'. comments_rss() .'">RSS 2.0</a>'); ?>
  
! 						<?php if (('open' == $post-> comment_status) && ('open' == $post->ping_status)) {
! 							// Both Comments and Pings are open ?>
  							<?php printf(__('You can <a href="#respond">leave a response</a>, or <a href="%s" rel="trackback">trackback</a> from your own site.','royale'),trackback_url(false)); ?>
  
! 						<?php } elseif (!('open' == $post-> comment_status) && ('open' == $post->ping_status)) {
! 							// Only Pings are Open ?>
  							<?php printf(__('Responses are currently closed, but you can <a href="%s" rel="trackback">trackback</a> from your own site.','royale'),trackback_url(false)); ?>
  
! 						<?php } elseif (('open' == $post-> comment_status) && !('open' == $post->ping_status)) {
! 							// Comments are open, Pings are not ?>
  							<?php _e('You can <a href="#respond">skip to the end</a> and leave a response. Pinging is currently not allowed.','royale'); ?>
  
! 						<?php } elseif (!('open' == $post-> comment_status) && !('open' == $post->ping_status)) {
! 							// Neither Comments, nor Pings are open ?>
  							<?php _e('Both comments and pings are currently closed.','royale'); ?>
  
  						<?php } edit_post_link(__('Edit this entry.','royale'),'',''); ?>
--- 32,47 ----
  						<?php printf(__('This entry was posted on %s at %s and is filed under %s.','royale'),get_the_time(__('l, F jS, Y','royale')),get_the_time(),get_the_category_list(', ')); ?>
  						<?php printf(__('You can follow any responses to this entry through the %s feed.','royale'),'<a href="'. comments_rss() .'">RSS 2.0</a>'); ?>
  
! 						<?php if (('open' == $post-> comment_status) && ('open' == $post->ping_status)) { ?>
  							<?php printf(__('You can <a href="#respond">leave a response</a>, or <a href="%s" rel="trackback">trackback</a> from your own site.','royale'),trackback_url(false)); ?>
  
! 						<?php } elseif (!('open' == $post-> comment_status) && ('open' == $post->ping_status)) { ?>
  							<?php printf(__('Responses are currently closed, but you can <a href="%s" rel="trackback">trackback</a> from your own site.','royale'),trackback_url(false)); ?>
  
! 						<?php } elseif (('open' == $post-> comment_status) && !('open' == $post->ping_status)) { ?>
  							<?php _e('You can <a href="#respond">skip to the end</a> and leave a response. Pinging is currently not allowed.','royale'); ?>
  
! 						<?php } elseif (!('open' == $post-> comment_status) && !('open' == $post->ping_status)) { ?>
  							<?php _e('Both comments and pings are currently closed.','royale'); ?>
  
  						<?php } edit_post_link(__('Edit this entry.','royale'),'',''); ?>
***************
*** 56,61 ****
  
  <?php endif; ?>
  
! 	</div>
  
! <?php get_footer(); ?>
--- 60,74 ----
  
  <?php endif; ?>
  
! 	</td>
! 
! <?php
! 	if ($alwayssidebars) {
! 		if (!get_option('royale_sidebar1_left')) include (TEMPLATEPATH . '/sidebar.php');
! 		if (get_option('royale_3columns') && !get_option('royale_sidebar2_left')) {
! 			include (TEMPLATEPATH . '/sidebar2.php');
! 		}
! 	}
  
! 	get_footer(); 
! ?>
Only in royale-1.3: ca_ES.mo
diff -c royale-1.2.2/comments.php royale-1.3/comments.php
*** royale-1.2.2/comments.php	2007-04-26 20:04:54.000000000 -0400
--- royale-1.3/comments.php	2007-06-18 11:24:46.000000000 -0400
***************
*** 15,20 ****
--- 15,22 ----
  
  		/* This variable is for alternating comment background */
  		$oddcomment = 'alt';
+ 		$authorcomments = get_option('royale_author_comments');
+ 		$the_author = get_the_author();
  ?>
  
  <!-- You can start editing here. -->
***************
*** 26,32 ****
  
  	<?php $i = 0; foreach ($comments as $comment) : $i++; ?>
  
! 		<li class="<?php echo $oddcomment; ?>" id="comment-<?php comment_ID() ?>">
                          <span class="commentid">#<?php echo $i; ?></span>
  			<cite><?php printf(__('%s says:','royale'),comment_author_link()); ?></cite>
  			<?php if ($comment->comment_approved == '0') : ?>
--- 28,34 ----
  
  	<?php $i = 0; foreach ($comments as $comment) : $i++; ?>
  
! 		<li class="<?php echo $oddcomment; ?><?php echo ($authorcomments && get_comment_author() == $the_author ? ' authorcomment' : ''); ?>" id="comment-<?php comment_ID() ?>">
                          <span class="commentid">#<?php echo $i; ?></span>
  			<cite><?php printf(__('%s says:','royale'),comment_author_link()); ?></cite>
  			<?php if ($comment->comment_approved == '0') : ?>
Only in royale-1.3: el.mo
diff -c royale-1.2.2/footer.php royale-1.3/footer.php
*** royale-1.2.2/footer.php	2007-05-24 13:22:24.000000000 -0400
--- royale-1.3/footer.php	2007-06-11 11:40:52.000000000 -0400
***************
*** 14,21 ****
  */
  
    global $wpmu;
-   echo get_option('mandigo_inserts_footer');
  ?>
  <div id="footer">
  	<p>
  <?php if ($wpmu): $current_site = get_current_site(); ?>
--- 14,24 ----
  */
  
    global $wpmu;
  ?>
+ </tr>
+ </table>
+ <?php echo get_option('royale_inserts_footer'); ?>
+ </div>
  <div id="footer">
  	<p>
  <?php if ($wpmu): $current_site = get_current_site(); ?>
***************
*** 32,47 ****
  		<?php endif; ?>
  	</p>
  </div>
- </div>
  
  		<?php wp_footer(); ?>
- <script type="text/javascript">
-   cnt = document.getElementById("content" );
-   sb1 = document.getElementById("sidebar1");
-   sb2 = document.getElementById("sidebar2");
- 
-   heightfix = function() { if (sb1) cnt.style.height = Math.max(sb1.clientHeight,cnt.clientHeight,(sb2?sb2.clientHeight:0))+'px'; }
-   heightfix(); window.onload = heightfix;
- </script>
  </body>
  </html>
--- 35,41 ----
diff -c royale-1.2.2/functions.php royale-1.3/functions.php
*** royale-1.2.2/functions.php	2007-05-17 15:17:32.000000000 -0400
--- royale-1.3/functions.php	2007-06-18 11:31:06.000000000 -0400
***************
*** 14,19 ****
--- 14,26 ----
    if (!get_option('royale_overlay_opacity')) update_option('royale_overlay_opacity', 25                );
    if (!get_option('royale_bgpattern'))       update_option('royale_bgpattern'      , 'default.png'     );
  
+   if (!get_option('royale_title_scheme_index'   )) update_option('royale_title_scheme_index'   ,'%blogname% - %tagline%');
+   if (!get_option('royale_title_scheme_single'  )) update_option('royale_title_scheme_single'  ,'%blogname% &raquo; %post%');
+   if (!get_option('royale_title_scheme_page'    )) update_option('royale_title_scheme_page'    ,'%blogname% &raquo; %post%');
+   if (!get_option('royale_title_scheme_category')) update_option('royale_title_scheme_category','%blogname% &raquo; Archive for %category%');
+   if (!get_option('royale_title_scheme_date'    )) update_option('royale_title_scheme_date'    ,'%blogname% &raquo; Archive for %date%');
+   if (!get_option('royale_title_scheme_search'  )) update_option('royale_title_scheme_search'  ,'%blogname% &raquo; Search Results for &quot;%search%&quot;');
+ 
  
  
    // some global vars
***************
*** 88,93 ****
--- 95,105 ----
  
    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_escape($string)      {
+     $string = str_replace('\\"','&#34;',$string);
+     $string = str_replace("\\'",'&#39;',$string);
+     return $string;
+   }
  
    function royale_options_page() {
      global $ie, $ie7;
***************
*** 103,121 ****
          }
  
          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'));
--- 115,142 ----
          }
  
          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']        );
!         royale_set_var('full_search_results' ,$_POST['fullsearchresults']);
!         royale_set_var('always_show_sidebars',$_POST['alwayssidebars']   );
!         royale_set_var('author_comments'     ,$_POST['authorcomments']   );
!         royale_set_var('title_scheme_index'   ,royale_escape($_POST['title_scheme_index']   ));
!         royale_set_var('title_scheme_single'  ,royale_escape($_POST['title_scheme_single']  ));
!         royale_set_var('title_scheme_page'    ,royale_escape($_POST['title_scheme_page']    ));
!         royale_set_var('title_scheme_category',royale_escape($_POST['title_scheme_category']));
!         royale_set_var('title_scheme_date'    ,royale_escape($_POST['title_scheme_date']    ));
!         royale_set_var('title_scheme_search'  ,royale_escape($_POST['title_scheme_search']  ));
        }
        $dates           = get_option('royale_dates'          );
        $exclude         = split(",",get_option('royale_exclude_pages'));
***************
*** 144,160 ****
  		
  		<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 />
! 		Second sidebar position: 
! 		<input type="radio" name="sidebar2" value="1"  '. ($sidebar2 ? 'checked="checked"' : '') .' />left &nbsp; 
! 		<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 />
--- 165,196 ----
  		
  		<form name="royale_options_form" method="post" action="?page=functions.php">
  		<input type="hidden" name="updated" value="1" />
+ 		<p class="submit"><input type="submit" name="Submit" value="'.__('Update Options &raquo;').'"/></p>
+ 
  		
  		<fieldset class="options">
  		<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 />
! 		<input type="checkbox" name="alwayssidebars" '. (get_option('royale_always_show_sidebars') ? 'checked="checked"' : '') .' /> Show sidebars even in single post view<br /><br />
! 		<label><b>Sidebars position</b></label><br/>
! 		<table border=0>
! 			<tr>
! 				<td align="right">First sidebar :</td>
! 				<td>
! 					<input type="radio" name="sidebar1" value="1"  '. ($sidebar1 ? 'checked="checked"' : '') .' />left &nbsp; 
! 					<input type="radio" name="sidebar1" value="0"  '. ($sidebar1 ? '' : 'checked="checked"') .' />right
! 				</td>
! 			</tr>
! 			<tr>
! 				<td align="right">Second sidebar :</td>
! 				<td>
! 					<input type="radio" name="sidebar2" value="1"  '. ($sidebar2 ? 'checked="checked"' : '') .' />left &nbsp; 
! 					<input type="radio" name="sidebar2" value="0"  '. ($sidebar2 ? '' : 'checked="checked"') .' />right
! 				</td>
! 			</tr>
! 		</table>
! 		<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 />
***************
*** 170,175 ****
--- 206,246 ----
  		'. $patterns .'
  		</fieldset>
  
+ 
+ 		<fieldset class="options">
+ 		<legend>SEO Options</legend>
+ 
+ 		<label><b>Custom &lt;title&gt; tags</b></label><br/>
+ 		Customize your title tag. Consult the <a href="themes.php?page=README">README page</a> for a list of available variables.
+ 		<table>
+ 			<tr>
+ 				<td style="text-align: right;">Default (index.php):</td>
+ 				<td><input type="text" name="title_scheme_index" size="60" value="'. get_option('royale_title_scheme_index') .'" /></td>
+ 			</tr>
+ 			<tr>
+ 				<td style="text-align: right;">Single posts (single.php):</td>
+ 				<td><input type="text" name="title_scheme_single" size="60" value="'. get_option('royale_title_scheme_single') .'" /></td>
+ 			</tr>
+ 			<tr>
+ 				<td style="text-align: right;">Pages (page.php):</td>
+ 				<td><input type="text" name="title_scheme_page" size="60" value="'. get_option('royale_title_scheme_page') .'" /></td>
+ 			</tr>
+ 			<tr>
+ 				<td style="text-align: right;">Category Archive (archive.php):</td>
+ 				<td><input type="text" name="title_scheme_category" size="60" value="'. get_option('royale_title_scheme_category') .'" /></td>
+ 			</tr>
+ 			<tr>
+ 				<td style="text-align: right;">Date Archive (archive.php):</td>
+ 				<td><input type="text" name="title_scheme_date" size="60" value="'. get_option('royale_title_scheme_date') .'" /></td>
+ 			</tr>
+ 			<tr>
+ 				<td style="text-align: right;">Search Results (search.php):</td>
+ 				<td><input type="text" name="title_scheme_search" size="60" value="'. get_option('royale_title_scheme_search') .'" /></td>
+ 			</tr>
+ 		</table>
+ 		</fieldset>
+ 
+ 
  		<fieldset class="options">
  		<legend>Miscellaneous Options</legend>
  		<label><b>Pages to Exclude from Header Navigation</b></label><br />
***************
*** 183,189 ****
  		<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>
--- 254,262 ----
  		<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="fullsearchresults" '. (get_option('royale_full_search_results') ? 'checked="checked"' : '') .' /> Display full search results, not just titles and metadata<br />
! 		<input type="checkbox" name="authorcomments" '. (get_option('royale_author_comments') ? 'checked="checked"' : '') .' /> Highlight comments made by the author of the current post<br />
! 		<input type="checkbox" name="nofloat" '. (get_option('royale_nofloat') ? 'checked="checked"' : '') .' /> Do not wrap text around 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>
***************
*** 286,291 ****
--- 359,365 ----
      if (isset($_POST['updated'])) {
        royale_set_insert('header',$_POST['header']);
        royale_set_insert('body'  ,$_POST['body']  );
+       royale_set_insert('top'   ,$_POST['top']   );
        royale_set_insert('footer',$_POST['footer']);
      }
  
***************
*** 311,318 ****
  		<textarea name="body" rows=1 style="width: 100%">'. str_replace("\\","",get_option('royale_inserts_body')) .'</textarea><br />
  		<small>NOTE: if you are using the link color-cycling feature, you must place a call to royale_init() in your onload event</small><br /><br />
  
  		<label><b>footer.php</b></label><br/>
!                 before the "Powered by WordPress" credits, still inside the #main div:<br />
  		<textarea name="footer" rows=7 style="width: 100%">'. str_replace("\\","",get_option('royale_inserts_footer')) .'</textarea>
  		</fieldset>
  					
--- 385,395 ----
  		<textarea name="body" rows=1 style="width: 100%">'. str_replace("\\","",get_option('royale_inserts_body')) .'</textarea><br />
  		<small>NOTE: if you are using the link color-cycling feature, you must place a call to royale_init() in your onload event</small><br /><br />
  
+                 right before the content and sidebars area. This differs from the top widget container in that it displays on all pages, and it spans the whole layout width.<br />
+ 		<textarea name="top" rows=7 style="width: 100%">'. str_replace("\\","",get_option('royale_inserts_top')) .'</textarea><br /><br />
+ 
  		<label><b>footer.php</b></label><br/>
!                 before the "Powered by WordPress" credits, still inside the #main div. This differs from the bottom widget container in that it displays on all pages, and it spans the whole layout width.<br />
  		<textarea name="footer" rows=7 style="width: 100%">'. str_replace("\\","",get_option('royale_inserts_footer')) .'</textarea>
  		</fieldset>
  					
Only in royale-1.3: he_IL.mo
diff -c royale-1.2.2/header.php royale-1.3/header.php
*** royale-1.2.2/header.php	2007-05-17 16:09:50.000000000 -0400
--- royale-1.3/header.php	2007-06-18 11:39:50.000000000 -0400
***************
*** 4,10 ****
  <head profile="http://gmpg.org/xfn/11">
  <meta http-equiv="Content-Type" content="<?php bloginfo('html_type'); ?>; charset=<?php bloginfo('charset'); ?>" />
  
! <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']; ?>" />
--- 4,35 ----
  <head profile="http://gmpg.org/xfn/11">
  <meta http-equiv="Content-Type" content="<?php bloginfo('html_type'); ?>; charset=<?php bloginfo('charset'); ?>" />
  
! <title><?php
!   $title = '';
! 
!       if (is_single() ) $title = get_option('royale_title_scheme_single');
!   elseif (is_page()   ) $title = get_option('royale_title_scheme_page');
!   elseif (is_archive()) {
!     if (is_day() || is_month() || is_year()) $title = get_option('royale_title_scheme_date');
!     else                                     $title = get_option('royale_title_scheme_category');
!   }
!   elseif (is_search() ) $title = get_option('royale_title_scheme_search');
!   else                  $title = get_option('royale_title_scheme_index');
! 
!   $title = str_replace('%blogname%',get_bloginfo('name')       ,$title);
!   $title = str_replace('%tagline%' ,get_bloginfo('description'),$title);
!   $title = str_replace('%post%'    ,get_the_title()            ,$title);
!   $title = str_replace('%search%'  ,$s                         ,$title);
! 
!   if (single_cat_title('',false)) $title = str_replace('%category%',single_cat_title('',false) ,$title);
!   else                            $title = preg_replace("/<[^>]+>/","",str_replace('%category%',get_the_category_list(', '),$title));
! 
!   if     (is_day()  ) $title = str_replace('%date%',get_the_time(__('l, F jS, Y','royale')),$title);
!   elseif (is_month()) $title = str_replace('%date%',get_the_time(__('F, Y','royale'))      ,$title);
!   elseif (is_year() ) $title = str_replace('%date%',get_the_time('Y')                       ,$title);
! 
!   echo $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']; ?>" />
***************
*** 102,109 ****
    }
  }
  function royale_init() {
-   walkondom();
  <?php if (get_option('royale_hue_cycle')): ?>
    huecycle();
  <?php endif; ?>
  }
--- 127,134 ----
    }
  }
  function royale_init() {
  <?php if (get_option('royale_hue_cycle')): ?>
+   walkondom();
    huecycle();
  <?php endif; ?>
  }
***************
*** 125,127 ****
--- 150,155 ----
  	</ul>
  </div>
  <div id="page">
+ <?php echo get_option('royale_inserts_top'); ?>
+ <table>
+ <tr>
Only in royale-1.3: id_ID.mo
Common subdirectories: royale-1.2.2/images and royale-1.3/images
diff -c royale-1.2.2/index.php royale-1.3/index.php
*** royale-1.2.2/index.php	2007-05-25 22:53:42.000000000 -0400
--- royale-1.3/index.php	2007-06-06 18:54:28.000000000 -0400
***************
*** 1,9 ****
  <?php 
! 	get_header(); 
! 	include (TEMPLATEPATH . '/sidebar.php');
! 	if (get_option('royale_3columns')) { include (TEMPLATEPATH . '/sidebar2.php'); }
  ?>
! 	<div id="content">
  
  	<?php if (function_exists('dynamic_sidebar')): ?>
  	<ul class="inline-widgets">
--- 1,11 ----
  <?php 
! 	get_header();
! 	if (get_option('royale_sidebar1_left')) include (TEMPLATEPATH . '/sidebar.php');
! 	if (get_option('royale_3columns') && get_option('royale_sidebar2_left')) {
! 		include (TEMPLATEPATH . '/sidebar2.php');
! 	}
  ?>
! 	<td id="content">
  
  	<?php if (function_exists('dynamic_sidebar')): ?>
  	<ul class="inline-widgets">
***************
*** 23,29 ****
                                                  <span class="caly"><?php the_time('Y') ?></span>
                                          </div>
                                          <h2><a href="<?php the_permalink() ?>" rel="bookmark" title="<?php printf(__('Permanent Link to %s','royale'),the_title('','',false)); ?>"><?php the_title(); ?></a></h2>
!                                         <small><?php printf(__('Posted by: %s in %s','royale'),get_the_author(),get_the_category_list(', ')) ?><?php edit_post_link(__('Edit','royale'), ' - '. mkicon('page_edit',__('Edit this post','royale')) .' ', ''); ?>  </small>
                                  </div>
  
  				<div class="entry">
--- 25,31 ----
                                                  <span class="caly"><?php the_time('Y') ?></span>
                                          </div>
                                          <h2><a href="<?php the_permalink() ?>" rel="bookmark" title="<?php printf(__('Permanent Link to %s','royale'),the_title('','',false)); ?>"><?php the_title(); ?></a></h2>
!                                         <small><?php printf(__('Posted by: %s in %s','royale'),'<a href="'. get_author_posts_url(get_the_author_ID()) .'" title="'. sprintf(__("Posts by %s"), attribute_escape(get_the_author())).' ">'. get_the_author() .'</a>',get_the_category_list(', ')) ?><?php edit_post_link(__('Edit','royale'), ' - '. mkicon('page_edit',__('Edit this post','royale')) .' ', ''); ?>  </small>
                                  </div>
  
  				<div class="entry">
***************
*** 58,63 ****
  		<?php dynamic_sidebar('Royale Bottom'); ?>
  	</ul>
  	<?php endif; ?>
! 	</div>
  
! <?php get_footer(); ?>
--- 60,72 ----
  		<?php dynamic_sidebar('Royale Bottom'); ?>
  	</ul>
  	<?php endif; ?>
! 	</td>
  
! <?php
! 	if (!get_option('royale_sidebar1_left')) include (TEMPLATEPATH . '/sidebar.php');
! 	if (get_option('royale_3columns') && !get_option('royale_sidebar2_left')) {
! 		include (TEMPLATEPATH . '/sidebar2.php');
! 	}
! 
! 	get_footer(); 
! ?>
diff -c royale-1.2.2/links.php royale-1.3/links.php
*** royale-1.2.2/links.php	2007-04-26 20:10:00.000000000 -0400
--- royale-1.3/links.php	2007-06-11 17:39:16.000000000 -0400
***************
*** 1,12 ****
! <?php get_header(); ?>
  
! <div id="content">
  
! <h2><?php _e('Links','royale'); ?>:</h2>
! <ul>
! <?php get_links_list(); ?>
! </ul>
  
! </div>
  
! <?php get_footer(); ?>
--- 1,34 ----
! <?php
! /*
! Template Name: Links Template
! */
! ?>
! <?php 
! 	get_header();
! 	$alwayssidebars = get_option('royale_always_show_sidebars');
! 	if ($alwayssidebars) {
! 		if (get_option('royale_sidebar1_left')) include (TEMPLATEPATH . '/sidebar.php');
! 		if (get_option('royale_3columns') && get_option('royale_sidebar2_left')) {
! 			include (TEMPLATEPATH . '/sidebar2.php');
! 		}
! 	}
! ?>
! 	<td id="content" class="<?php echo ($alwayssidebars ? 'narrow' : 'wide'); ?>column">
  
! 		<h2><?php _e('Links','royale'); ?>:</h2>
! 		<ul>
! 		<?php get_links_list(); ?>
! 		</ul>
  
! 	</td>
  
! <?php
! 	if ($alwayssidebars) {
! 		if (!get_option('royale_sidebar1_left')) include (TEMPLATEPATH . '/sidebar.php');
! 		if (get_option('royale_3columns') && !get_option('royale_sidebar2_left')) {
! 			include (TEMPLATEPATH . '/sidebar2.php');
! 		}
! 	}
  
! 	get_footer(); 
! ?>
Only in royale-1.3: lt_LT.mo
Only in royale-1.3: ms.mo
Binary files royale-1.2.2/mt_MT.mo and royale-1.3/mt_MT.mo differ
diff -c royale-1.2.2/page.php royale-1.3/page.php
*** royale-1.2.2/page.php	2007-05-24 13:24:28.000000000 -0400
--- royale-1.3/page.php	2007-06-11 10:15:24.000000000 -0400
***************
*** 1,10 ****
  <?php 
! 	get_header(); 
! 	include (TEMPLATEPATH . '/sidebar.php');
! 	if (get_option('royale_3columns')) { include (TEMPLATEPATH . '/sidebar2.php'); }
  ?>
! 
! 	<div id="content">
  
      <?php if (have_posts()) : while (have_posts()) : the_post(); ?>
  		<div class="post" id="post-<?php the_ID(); ?>">
--- 1,14 ----
  <?php 
! 	get_header();
! 	$alwayssidebars = get_option('royale_always_show_sidebars');
! 	if ($alwayssidebars) {
! 		if (get_option('royale_sidebar1_left')) include (TEMPLATEPATH . '/sidebar.php');
! 		if (get_option('royale_3columns') && get_option('royale_sidebar2_left')) {
! 			include (TEMPLATEPATH . '/sidebar2.php');
! 		}
! 	}
  ?>
! 	<td id="content" class="<?php echo ($alwayssidebars ? 'narrow' : 'wide'); ?>column">
  
      <?php if (have_posts()) : while (have_posts()) : the_post(); ?>
  		<div class="post" id="post-<?php the_ID(); ?>">
***************
*** 19,24 ****
  		</div>
  	  <?php endwhile; endif; ?>
  	<?php edit_post_link(__('Edit this page','royale'), '<p>', '</p>'); ?>
- 	</div>
  
! <?php get_footer(); ?>
\ No newline at end of file
--- 23,38 ----
  		</div>
  	  <?php endwhile; endif; ?>
  	<?php edit_post_link(__('Edit this page','royale'), '<p>', '</p>'); ?>
  
! 	</td>
! 
! <?php
! 	if ($alwayssidebars) {
! 		if (!get_option('royale_sidebar1_left')) include (TEMPLATEPATH . '/sidebar.php');
! 		if (get_option('royale_3columns') && !get_option('royale_sidebar2_left')) {
! 			include (TEMPLATEPATH . '/sidebar2.php');
! 		}
! 	}
! 
! 	get_footer(); 
! ?>
diff -c royale-1.2.2/search.php royale-1.3/search.php
*** royale-1.2.2/search.php	2007-04-26 20:10:44.000000000 -0400
--- royale-1.3/search.php	2007-06-11 10:14:40.000000000 -0400
***************
*** 1,10 ****
  <?php 
! 	get_header(); 
! 	include (TEMPLATEPATH . '/sidebar.php');
! 	if (get_option('royale_3columns')) { include (TEMPLATEPATH . '/sidebar2.php'); }
  ?>
! 
! 	<div id="content">
  
  	<?php if (have_posts()) : ?>
  
--- 1,14 ----
  <?php 
! 	get_header();
! 	$alwayssidebars = get_option('royale_always_show_sidebars');
! 	if ($alwayssidebars) {
! 		if (get_option('royale_sidebar1_left')) include (TEMPLATEPATH . '/sidebar.php');
! 		if (get_option('royale_3columns') && get_option('royale_sidebar2_left')) {
! 			include (TEMPLATEPATH . '/sidebar2.php');
! 		}
! 	}
  ?>
! 	<td id="content" class="<?php echo ($alwayssidebars ? 'narrow' : 'wide'); ?>column">
  
  	<?php if (have_posts()) : ?>
  
***************
*** 22,28 ****
  				<h3 id="post-<?php the_ID(); ?>"><a href="<?php the_permalink() ?>" rel="bookmark" title="<?php printf(__('Permanent Link to %s','royale'),the_title('','',false)); ?>"><?php the_title(); ?></a></h3>
  				<small><?php the_time('l, F jS, Y') ?></small>
  
! 				<p class="postmetadata"><?php printf(__('Posted by: %s in %s','royale'),get_the_author(),get_the_category_list(', ')) ?> | <?php edit_post_link(__('Edit','royale'), '', ' | '); ?>  <?php comments_popup_link(__('No Comments','royale'). ' &#187;', __('1 Comment','royale'). ' &#187;', __('% Comments','royale'). ' &#187;'); ?></p>
  			</div>
  
  		<?php endwhile; ?>
--- 26,39 ----
  				<h3 id="post-<?php the_ID(); ?>"><a href="<?php the_permalink() ?>" rel="bookmark" title="<?php printf(__('Permanent Link to %s','royale'),the_title('','',false)); ?>"><?php the_title(); ?></a></h3>
  				<small><?php the_time('l, F jS, Y') ?></small>
  
! 			<?php if (get_option('royale_full_search_results')): ?>
! 				<div class="entry">
! 					<?php the_content(__('Read the rest of this entry','royale') .' &raquo;'); ?>
! 				</div>
! 				<div style="clear: both"></div>
! 
! 			<?php endif; ?>
! 				<p class="postmetadata"><?php printf(__('Posted by: %s in %s','royale'),'<a href="'. get_author_posts_url(get_the_author_ID()) .'" title="'. sprintf(__("Posts by %s"), attribute_escape(get_the_author())).' ">'. get_the_author() .'</a>',get_the_category_list(', ')) ?> | <?php edit_post_link(__('Edit','royale'), '', ' | '); ?>  <?php comments_popup_link(__('No Comments','royale'). ' &#187;', __('1 Comment','royale'). ' &#187;', __('% Comments','royale'). ' &#187;'); ?></p>
  			</div>
  
  		<?php endwhile; ?>
***************
*** 39,44 ****
  
  	<?php endif; ?>
  
! 	</div>
  
! <?php get_footer(); ?>
\ No newline at end of file
--- 50,64 ----
  
  	<?php endif; ?>
  
! 	</td>
  
! <?php
! 	if ($alwayssidebars) {
! 		if (!get_option('royale_sidebar1_left')) include (TEMPLATEPATH . '/sidebar.php');
! 		if (get_option('royale_3columns') && !get_option('royale_sidebar2_left')) {
! 			include (TEMPLATEPATH . '/sidebar2.php');
! 		}
! 	}
! 
! 	get_footer(); 
! ?>
diff -c royale-1.2.2/sidebar.php royale-1.3/sidebar.php
*** royale-1.2.2/sidebar.php	2007-05-24 14:35:58.000000000 -0400
--- royale-1.3/sidebar.php	2007-06-06 18:53:04.000000000 -0400
***************
*** 1,4 ****
! 	<ul class="sidebars" id="sidebar1">
  <?php if (!function_exists('dynamic_sidebar') || !dynamic_sidebar('Sidebar 1')) : ?>
  			<?php widget_royale_search(); ?>
  
--- 1,5 ----
! 	<td id="sidebar1">
! 	<ul class="sidebars">
  <?php if (!function_exists('dynamic_sidebar') || !dynamic_sidebar('Sidebar 1')) : ?>
  			<?php widget_royale_search(); ?>
  
***************
*** 41,43 ****
--- 42,45 ----
  
  <?php endif; ?>
  	</ul>
+ 	</td>
diff -c royale-1.2.2/sidebar2.php royale-1.3/sidebar2.php
*** royale-1.2.2/sidebar2.php	2007-03-13 21:44:36.000000000 -0400
--- royale-1.3/sidebar2.php	2007-06-06 18:53:28.000000000 -0400
***************
*** 1,6 ****
! 	<ul class="sidebars" id="sidebar2">
  <?php if (!function_exists('dynamic_sidebar') || !dynamic_sidebar('Sidebar 2')) : ?>
  			<?php widget_royale_meta(); ?>
  
  <?php endif; ?>
  	</ul>
--- 1,8 ----
! 	<td id="sidebar2">
! 	<ul class="sidebars">
  <?php if (!function_exists('dynamic_sidebar') || !dynamic_sidebar('Sidebar 2')) : ?>
  			<?php widget_royale_meta(); ?>
  
  <?php endif; ?>
  	</ul>
+ 	</td>
diff -c royale-1.2.2/single.php royale-1.3/single.php
*** royale-1.2.2/single.php	2007-04-28 17:31:12.000000000 -0400
--- royale-1.3/single.php	2007-06-11 10:04:42.000000000 -0400
***************
*** 1,12 ****
  <?php 
! 	get_header(); 
! 	include (TEMPLATEPATH . '/sidebar.php');
! 	if (get_option('royale_3columns')) {
! 		include (TEMPLATEPATH . '/sidebar2.php');
  	}
  ?>
! 
! 	<div id="content">
  
  <?php if (have_posts()) : while (have_posts()) : the_post(); ?>
  
--- 1,14 ----
  <?php 
! 	get_header();
! 	$alwayssidebars = get_option('royale_always_show_sidebars');
! 	if ($alwayssidebars) {
! 		if (get_option('royale_sidebar1_left')) include (TEMPLATEPATH . '/sidebar.php');
! 		if (get_option('royale_3columns') && get_option('royale_sidebar2_left')) {
! 			include (TEMPLATEPATH . '/sidebar2.php');
! 		}
  	}
  ?>
! 	<td id="content" class="<?php echo ($alwayssidebars ? 'narrow' : 'wide'); ?>column">
  
  <?php if (have_posts()) : while (have_posts()) : the_post(); ?>
  
***************
*** 23,29 ****
                                                  <span class="caly"><?php the_time('Y') ?></span>
                                          </div>
                                          <h2><a href="<?php echo get_permalink() ?>" rel="bookmark" title="Permanent Link: <?php the_title(); ?>"><?php the_title(); ?></a></h2>
!                                         <small><?php printf(__('Posted by: %s in %s','royale'),get_the_author(),get_the_category_list(', ')) ?></small>
                                  </div>
  
  			<div class="entry">
--- 25,31 ----
                                                  <span class="caly"><?php the_time('Y') ?></span>
                                          </div>
                                          <h2><a href="<?php echo get_permalink() ?>" rel="bookmark" title="Permanent Link: <?php the_title(); ?>"><?php the_title(); ?></a></h2>
!                                         <small><?php printf(__('Posted by: %s in %s','royale'),'<a href="'. get_author_posts_url(get_the_author_ID()) .'" title="'. sprintf(__("Posts by %s"), attribute_escape(get_the_author())).' ">'. get_the_author() .'</a>',get_the_category_list(', ')) ?></small>
                                  </div>
  
  			<div class="entry">
***************
*** 69,74 ****
  
  <?php endif; ?>
  
! 	</div>
  
! <?php get_footer(); ?>
--- 71,85 ----
  
  <?php endif; ?>
  
! 	</td>
! 
! <?php
! 	if ($alwayssidebars) {
! 		if (!get_option('royale_sidebar1_left')) include (TEMPLATEPATH . '/sidebar.php');
! 		if (get_option('royale_3columns') && !get_option('royale_sidebar2_left')) {
! 			include (TEMPLATEPATH . '/sidebar2.php');
! 		}
! 	}
  
! 	get_footer(); 
! ?>
diff -c royale-1.2.2/style.css royale-1.3/style.css
*** royale-1.2.2/style.css	2007-05-26 09:21:18.000000000 -0400
--- royale-1.3/style.css	2007-06-06 17:34:38.000000000 -0400
***************
*** 1,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.2
  Author: t0mmmmmmm
  Author URI: http://www.onehertz.com/portfolio/wordpress/
  */
--- 1,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 23 languages!
! Version: 1.3
  Author: t0mmmmmmm
  Author URI: http://www.onehertz.com/portfolio/wordpress/
  */
diff -c royale-1.2.2/style.css.php royale-1.3/style.css.php
*** royale-1.2.2/style.css.php	2007-05-26 09:15:16.000000000 -0400
--- royale-1.3/style.css.php	2007-06-18 12:19:50.000000000 -0400
***************
*** 1,13 ****
  <?php
!   if (file_exists('../../../wpmu-settings.php')) $fb++;
    else
!     if (file_exists('../../../wp-config.php'))
!       eval(preg_replace('/((require|include)(_once)?|define[^\n]+ABSPATH)[^\n]+|<\?php|\?>/','',file_get_contents('../../../wp-config.php')));
  
    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 '^royale_(sidebar[12]_left|3columns|em_italics|nofloat|overlay|rgb[12]|bgpattern)|stylesheet|siteurl';",$dbh);
      while ($a = @mysql_fetch_row($r)) {
        if ($a[1] == 'on')  $a[1] = 1;
        if ($a[1] == 'off') $a[1] = 0;
--- 1,20 ----
  <?php
!   error_reporting(0);
!   $fb = 0;
! 
!   $d = 0;
!   while (!file_exists(str_repeat('../',$d).'wp-config.php')) { if (++$d > 99) exit; }
!   $wpconfig = str_repeat('../',$d).'wp-config.php';
! 
!   if (file_exists(str_repeat('../',$d).'wpmu-settings.php')) $fb++;
    else
!     if (file_exists($wpconfig))
!       eval(preg_replace('/((require|include)(_once)?|define[^\n]+ABSPATH)[^\n]+|<\?php|\?>/','',file_get_contents($wpconfig)));
  
    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 '^royale_(sidebar[12]_left|3columns|em_italics|nofloat|overlay|rgb[12]|bgpattern|number_comments)|stylesheet|siteurl';",$dbh);
      while ($a = @mysql_fetch_row($r)) {
        if ($a[1] == 'on')  $a[1] = 1;
        if ($a[1] == 'off') $a[1] = 0;
***************
*** 19,26 ****
    else $fb++;
  
    if ($fb) {
!     if (is_file('wp-blog-header.php')) { require('./wp-blog-header.php'); }
!     else                               { require('../../../wp-blog-header.php'); }
      $royale_em_italics      = get_option('royale_em_italics');
      $royale_3columns        = get_option('royale_3columns');
      $royale_sidebar1_left   = get_option('royale_sidebar1_left');
--- 26,32 ----
    else $fb++;
  
    if ($fb) {
!     require($wpconfig);
      $royale_em_italics      = get_option('royale_em_italics');
      $royale_3columns        = get_option('royale_3columns');
      $royale_sidebar1_left   = get_option('royale_sidebar1_left');
***************
*** 30,37 ****
      $royale_rgb1            = get_option('royale_rgb1');
      $royale_rgb2            = get_option('royale_rgb2');
      $royale_bgpattern       = get_option('royale_bgpattern');
      $stylesheet_directory   = get_bloginfo('stylesheet_directory');
!     foreach (array('em_italics','3columns','sidebar1_left','sidebar2_left','nofloat') as $a) {
        $a = 'royale_'. $a;
        if ($$a == 'on')  $$a = 1;
        if ($$a == 'off') $$a = 0;
--- 36,44 ----
      $royale_rgb1            = get_option('royale_rgb1');
      $royale_rgb2            = get_option('royale_rgb2');
      $royale_bgpattern       = get_option('royale_bgpattern');
+     $royale_number_comments = get_option('royale_number_comments');
      $stylesheet_directory   = get_bloginfo('stylesheet_directory');
!     foreach (array('em_italics','3columns','sidebar1_left','sidebar2_left','nofloat','number_comments') as $a) {
        $a = 'royale_'. $a;
        if ($$a == 'on')  $$a = 1;
        if ($$a == 'off') $$a = 0;
***************
*** 40,48 ****
    }
    header('Content-type: text/css');
  
!   $ie     = preg_match("/MSIE [4-6]/",$_SERVER['HTTP_USER_AGENT']);
!   $ie7    = preg_match("/MSIE 7/",    $_SERVER['HTTP_USER_AGENT']);
!   $safari = preg_match("/Safari/",    $_SERVER['HTTP_USER_AGENT']);
  
    $royale_sidebar1_left = $royale_sidebar1_left;
    $royale_sidebar2_left = ($royale_3columns ? $royale_sidebar2_left : 0);
--- 47,56 ----
    }
    header('Content-type: text/css');
  
!   $ie      = preg_match("/MSIE [4-6]/",$_SERVER['HTTP_USER_AGENT']);
!   $ie7     = preg_match("/MSIE 7/"    ,$_SERVER['HTTP_USER_AGENT']);
!   $safari  = preg_match("/Safari/"    ,$_SERVER['HTTP_USER_AGENT']);
!   $firefox = preg_match("/Firefox/"   ,$_SERVER['HTTP_USER_AGENT']);
  
    $royale_sidebar1_left = $royale_sidebar1_left;
    $royale_sidebar2_left = ($royale_3columns ? $royale_sidebar2_left : 0);
***************
*** 247,257 ****
    margin: 0 0 20px 0;
  }
  
- #page {
-   margin: 0 auto 20px auto;
-   width: 100%;
- }
- 
  #header {
    text-align: left;
    width: 100%;
--- 255,260 ----
***************
*** 267,276 ****
  
  h1, .description { padding-left: 30px; }
  
  .post {
    text-align: left;
    padding: 5px 15px;
!   margin: 0 -15px 30px -15px;
    background: url(images/<?php echo $overlay; ?>);
  <?php if ($ie||$ie7): ?>
    background: url(images/1x1.gif);
--- 270,311 ----
  
  h1, .description { padding-left: 30px; }
  
+ #page {
+   margin-bottom: 20px;
+   width: 100%;
+ }
+ 
+ #page table {
+   width: 100%;
+   padding: 0 10px;
+ }
+ 
+ #page td {
+   vertical-align: top;
+   padding: 5px;
+ }
+ 
+ #content {
+   min-width: 300px;
+   width: 100%;
+ }
+ 
+ .sidebars {
+   width: 210px;
+   background: url(images/<?php echo $overlay; ?>);
+ <?php if ($ie||$ie7): ?>
+   background: url(images/1x1.gif);
+   filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='<?php echo $stylesheet_directory; ?>/images/<?php echo $overlay; ?>', sizingMethod='scale');
+ <?php endif; ?>
+   border: none;
+   border-top:    2px solid #eee; 
+   border-bottom: 1px solid #eee; 
+ }
+ 
  .post {
    text-align: left;
    padding: 5px 15px;
!   margin-bottom: 30px;
    background: url(images/<?php echo $overlay; ?>);
  <?php if ($ie||$ie7): ?>
    background: url(images/1x1.gif);
***************
*** 281,287 ****
    border-bottom: 1px solid #eee; 
    <?php if ($ie): ?>height: 1%; /* peekaboo */<?php endif; ?>
    clear: both;
-   width: 100%;
  }
  
  .postdata { padding-top: 5px; }
--- 316,321 ----
***************
*** 351,364 ****
  }
  
  .entry img.wp-smiley {
-   float: none;
    margin: 0;
    background: transparent;
    border: 0;
    padding: 0;
  }
  
! img.nofloat { float: none; }
  
  img.noborder {
    background: inherit;
--- 385,397 ----
  }
  
  .entry img.wp-smiley {
    margin: 0;
    background: transparent;
    border: 0;
    padding: 0;
  }
  
! img.nofloat, .smallattachment img, .attachment img, .entry img.wp-smiley { float: none; }
  
  img.noborder {
    background: inherit;
***************
*** 390,402 ****
  
  
  /* Begin Lists */
! html>body .entry ul {
    padding: 0 0 0 20px;
    list-style: none;
    list-style-type: circle;
  } 
  
! html>body .entry li { margin: 7px 0 8px 5px; }
  
  .entry ol { padding: 0 0 0 20px; }
  
--- 423,435 ----
  
  
  /* Begin Lists */
! .entry ul {
    padding: 0 0 0 20px;
    list-style: none;
    list-style-type: circle;
  } 
  
! .entry li { margin: 7px 0 8px 5px; }
  
  .entry ol { padding: 0 0 0 20px; }
  
***************
*** 408,414 ****
  
  .sidebars li {
    list-style-type: none;
!   margin: 0 5px 20px 5px;
  }
  
  .sidebars ul li {
--- 441,447 ----
  
  .sidebars li {
    list-style-type: none;
!   margin: 0 10px 20px 10px;
  }
  
  .sidebars ul li {
***************
*** 418,431 ****
  
  .sidebars p, .sidebars select { margin: 5px 0 8px; }
  
! .sidebars ul, .sidebars ol { margin: 5px 0 0 15px; }
  
  .sidebars ul ul { margin: 0 0 0 15px; }
  
  ol li, .sidebars ol li { list-style: decimal outside; }
  
  .sidebars ul li, .sidebars ol li {
!   margin: 3px 0 0;
    padding: 2px 0;
  }
  
--- 451,466 ----
  
  .sidebars p, .sidebars select { margin: 5px 0 8px; }
  
! .sidebars ul { margin: 5px 0 0 15px; }
! 
! .sidebars ol { margin: 5px 0 0 25px; }
  
  .sidebars ul ul { margin: 0 0 0 15px; }
  
  ol li, .sidebars ol li { list-style: decimal outside; }
  
  .sidebars ul li, .sidebars ol li {
!   margin: 3px 0 0 0;
    padding: 2px 0;
  }
  
***************
*** 472,478 ****
  }
  
  #commentform textarea {
!   width: 100%;
    padding: 2px;
  }
  
--- 507,513 ----
  }
  
  #commentform textarea {
!   width: 99%;
    padding: 2px;
  }
  
***************
*** 502,542 ****
  .nocomments { text-align: center; }
  
  .commentmetadata { display: block; }
- /* End Comments */
- 
  
! /* Begin Sidebar */
! #content {
!   min-width: 300px;
!   width: auto;
!   margin-left:  <?php echo (20+($royale_sidebar1_left+($royale_3columns ? $royale_sidebar2_left : 0))*240); ?>px;
!   margin-right: <?php echo (20+(1-$royale_sidebar1_left+($royale_3columns ? 1-$royale_sidebar2_left : 0))*240); ?>px;
!   padding: 0 17px 20px 17px;
! }
! 
! #sidebar1, #sidebar2 {
!   width: 210px;
!   background: url(images/<?php echo $overlay; ?>);
! <?php if ($ie||$ie7): ?>
!   background: url(images/1x1.gif);
!   filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='<?php echo $stylesheet_directory; ?>/images/<?php echo $overlay; ?>', sizingMethod='scale');
! <?php endif; ?>
!   border: none;
!   border-top:    2px solid #eee; 
!   border-bottom: 1px solid #eee; 
!   padding: 5px;
!   position: absolute;
!   top: 160px;
  }
  
! #sidebar1 {
!   <?php echo ($royale_sidebar1_left ? 'left' : 'right'); ?>: 20px;
! }
  
- #sidebar2 {
-   <?php echo ($royale_sidebar2_left ? 'left' : 'right'); ?>: <?php echo (20+($royale_sidebar1_left == $royale_sidebar2_left ? 240 : 0)); ?>px;
- }
- /* End Sidebar */
  
  
  /* Begin Calendar */
--- 537,552 ----
  .nocomments { text-align: center; }
  
  .commentmetadata { display: block; }
  
! .authorcomment {
!   background-color: #111 !important;
!   color: #FFF;
!   border-top:    1px dashed #CCC !important;
!   border-bottom: 1px dashed #CCC;
  }
  
! /* End Comments */
  
  
  
  /* Begin Calendar */
***************
*** 590,596 ****
  
  blockquote {
    margin: 15px 10px 0 10px;
!   padding: 0 20px 0 20px;
    border-left: 5px solid #ddd;
    border: 1px dashed #ddd;
    border-left: 0;
--- 600,606 ----
  
  blockquote {
    margin: 15px 10px 0 10px;
!   padding: 0 20px;
    border-left: 5px solid #ddd;
    border: 1px dashed #ddd;
    border-left: 0;
***************
*** 724,726 ****
--- 734,804 ----
  <?php endif; ?>
  
  .absolute { position: absolute; }
+ 
+ 
+ <?php 
+   // the following set of rules are loaded only if a right-to-left script (eg. Hebrew, Arabic) is being used.
+   if (preg_match("/^(ar|he_IL)$/",WPLANG)):
+ ?>
+ /* RTL scripts support */
+ .pages, #content, .sidebars, #footer { direction: rtl; }
+ 
+ #header h1, #header .description, .pages, .postinfo, .entry, .postmetadata, #content #searchform, #respond, #commentform p, .sidebars, #wp-calendar caption { text-align: right; }
+ 
+ h1, .description { padding-right: 30px; }
+ 
+ .cal {
+   float: right;
+   margin-right: 0;
+   margin-left:  1em;
+ }
+ 
+ .entry img { 
+   float: <?php echo ($mandigo_nofloat ? 'none' : 'right'); ?>;
+   margin: 3px 0 3px 10px;
+ }
+ 
+ .commentid { 
+   float: right;
+   margin-right: 0;
+   margin-left: .5em;
+ }
+ 
+ #commentform input { margin: 5px 0 1px 5px; }
+ 
+ #commentform #submit { margin: 0 0 0 1em; }
+ 
+ #commentform #submit, #rss { float: left; }
+ 
+ .pages { padding: 30px 20px 5px 0; }
+ 
+ <?php if ($firefox): ?>
+ .pages li {
+   display: table-cell;
+   padding: 0 2px;
+ }
+ <?php endif; ?>
+ 
+ .entry ol, .entry ul { padding: 0 20px 0 0; }
+ 
+ .entry ol ol, .entry ol ul, .entry ul ul, .entry ul ol { padding: 0 10px 0 0; }
+ 
+ ul { margin-left: 0; } 
+ 
+ li { margin: 3px 5px 4px 0; }
+ 
+ .sidebars p, .sidebars select { margin: 5px 0 8px 0; }
+ 
+ .sidebars ul { margin: 5px 15px 0 5px; }
+ 
+ .sidebars ol { margin: 5px 25px 0 5px; }
+ 
+ .sidebars ul ul { margin: 0 15px 0 0; }
+ 
+ ol li, .sidebars ol li { list-style: decimal outside; }
+ 
+ .sidebars ul li, .sidebars ol li {
+   margin: 3px 0 0 0;
+   padding: 2px 0;
+ }
+ <?php endif; ?>
Binary files royale-1.2.2/zh_CN.mo and royale-1.3/zh_CN.mo differ
Only in royale-1.3: zh_TW.mo