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. --- 74,114 ---- them here: http://automattic.com/code/widgets/ + + === IMAGES IN POSTS ==================================================================== + + ** Alignment: + Text is set to wrap around images by default, however if you want to override this + behaviour, there is an option ("Do not wrap text around images") to disable it. + + If you want text to be wrapped around images but have problems with short paragraphs + messing up your posts, try adding the "clear" class to your p tag, i.e. + <p class="clear">. If you don't use <p>s, adding <br class="clear" /> between paragraphs + will do the trick as well. + + If you want to have an image float to the right, simply give it the "alignright" class, + i.e. <img src="..." alt="..." class="alignright" /> + + If you want to center an image, use the "centered" class instead, but this will only + work with non-floating images, i.e. the kind around which text does not wrap. + + If you want text to wrap around SOME images, let text wrapping enabled, and add + class="nowrap" to the img tags around which you don't want text to wrap, i.e. + <img class="nowrap" />. Adding this class to a block container will make all its child + images inherit this behaviour (useful for galleries). + + ** Border: + Images in posts are surrounded by a border by default. While it is possible to disable + them throughout the theme using the appropriate option, you can also override this + behaviour on certain images by adding the "noborder" class to the img tag. + + + === 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. Royale 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. *************** *** 80,85 **** --- 123,141 ---- 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. + ** Custom HTML tags + Another important factor to popular search engines is the use of keywords in headings, + particulary the h1 and h2 elements, so wrapping relevant content in them is a good idea. + + Since the title and description of your blog may or may not be relevant to your content, + Royale let's you choose which heading level you want to use for these elements. You can + also do the same thing to the title of posts in single and multiple views, and to the + title of some pages ('Search results', 'Archives', ..). + + Note that using a different kind of tag does not (should not, please report bugs) affect + the look and feel at all. + + === LOCALIZATION ======================================================================= *************** *** 93,128 **** Once you have the WordPress interface set in your language, the Royale .mo file will 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 --- 149,176 ---- Once you have the WordPress interface set in your language, the Royale .mo file will be loaded automatically, provided it exists. + If Royale has not been translated in your language and you are interested in helping + with translation, please let me know by sending an email to tom@onehertz.com ! .po files are available at http://www.onehertz.com/portfolio/wordpress/mandigo/l10n/ ! === CREDITS ============================================================================ + ** Translation Credits Arabic: Maxer Bahasa Indonesia: Benny Wu + Bulgarian: Canko Balkanski Catalan: Sergi Barroso Chinese (Simplified): Hua Zhou Chinese (Traditional): Charles Low + Croatian: Ivana Pavic Czech: Milan Tucek Danish: Daniel Noesgaard Rasmussen Dutch: Ramsy de Vos ! French: Michel Bibal, David Sahli ! German: Michael Nickel, Ted Box Greek: Andrew Kontokanis Hebrew: Omry Yadan Hungarian: Horvath Zoltan *************** *** 134,164 **** 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/ ! ! 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 ! ! ! === IMAGE CREDITS ====================================================================== ! ! Icons by famfamfam: http://www.famfamfam.com/lab/icons/silk/ ! Background patters: - default: enspia, http://enspia.deviantart.com/ - asphalt: oonerspism, http://oonerspism.deviantart.com/ - bricks, kafeleczki: PoProstuBono, http://poprostubono.deviantart.com/ === CHANGELOG ========================================================================== 1.3 + language: Arabic (ar) + language: Bahasa Indonesia (id_ID) --- 182,231 ---- Maltese: James Cauchi Norwegian: Torbjorn Blystad Polish: Mateusz Baran ! Portuguese (PT): Rodrigo Neves ! Portuguese (BR): 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 + Ukrainian: Gabriel Korzhos ! ** Image Credits ! Icons by Mark James: http://www.famfamfam.com/lab/icons/silk/ ! Background patterns: - default: enspia, http://enspia.deviantart.com/ - asphalt: oonerspism, http://oonerspism.deviantart.com/ - bricks, kafeleczki: PoProstuBono, http://poprostubono.deviantart.com/ + ** Other Credits + "IE5.5+ PNG Alpha Fix" by Angus Turnbull: http://www.twinhelix.com + "jQuery" by John Resig: http://www.jquery.com + + === CHANGELOG ========================================================================== + 1.4 + + language: Bulgarian (bg_BG) + + language: Croatian (hr) + + language: Portuguese (pt_PT) + + language: Ukrainian (ua_UA) + + added support for WP 2.3 tags + + added options to select the heading level (h1-h6, div) of some important elements + like the blog name & desc, title of posts, ... + + added an option to display allowed XHTML tags above the comment field + + automatically load favicon.ico if it exists in the theme directory + * grammar fixes: French (fr_FR) + * language: switched to formal German, now using 'Sie' instead of 'Du' + * sidebars now appear after the content in the HTML code (better SEO) + * PNG transparency in IE is now handled by iepngfix.htc + * fixed RSS feed links + * fixed the README page not showing up correctly + * fixed empty uls validation errors on the front page (WP2.2+) + * fixed duplicate ids validation errors in archives and search results + 1.3 + language: Arabic (ar) + language: Bahasa Indonesia (id_ID) Only in royale-1.4: ar.mo diff -c royale-1.3/archive.php royale-1.4/archive.php *** royale-1.3/archive.php 2007-06-11 10:13:57.000000000 -0400 --- royale-1.4/archive.php 2007-11-04 16:43:21.000000000 -0500 *************** *** 1,38 **** <?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()) : ?> ! <?php $post = $posts[0]; // Hack. Set $post so that the_date() works. ?> ! <?php /* If this is a category archive */ if (is_category()) { ?> ! <h2 class="pagetitle"><?php printf(__('Archive for the %s Category','royale'),single_cat_title('',false)); ?></h2> ! <?php /* If this is a daily archive */ } elseif (is_day()) { ?> ! <h2 class="pagetitle"><?php printf(__('Archive for %s','royale'),get_the_time(__('F jS, Y','royale'))); ?></h2> ! <?php /* If this is a monthly archive */ } elseif (is_month()) { ?> ! <h2 class="pagetitle"><?php printf(__('Archive for %s','royale'),get_the_time(__('F, Y','royale'))); ?></h2> ! <?php /* If this is a yearly archive */ } elseif (is_year()) { ?> ! <h2 class="pagetitle"><?php printf(__('Archive for %s','royale'),get_the_time('Y')); ?></h2> ! <?php /* If this is a search */ } elseif (is_search()) { ?> ! <h2 class="pagetitle"><?php _e('Search Results','royale'); ?></h2> ! <?php /* If this is an author archive */ } elseif (is_author()) { ?> ! <h2 class="pagetitle"><?php _e('Author Archive','royale'); ?></h2> ! <?php /* If this is a paged archive */ } elseif (isset($_GET['paged']) && !empty($_GET['paged'])) { ?> ! <h2 class="pagetitle"><?php _e('Blog Archives','royale'); ?></h2> <?php } ?> --- 1,39 ---- <?php + global $dirs; + get_header(); ! ! $tag_posttitle_multi = get_option('royale_tag_posttitle_multi'); ! $tag_pagetitle = get_option('royale_tag_pagetitle' ); ?> <td id="content" class="<?php echo ($alwayssidebars ? 'narrow' : 'wide'); ?>column"> <?php if (have_posts()) : ?> ! <?php $post = $posts[0]; // Hack. Set $post so that the_date() works. ?> ! <?php if (is_category()) { ?> ! <<?php echo $tag_pagetitle; ?> class="pagetitle"><?php printf(__('Archive for the %s Category','royale'),single_cat_title('',false)); ?></<?php echo $tag_pagetitle; ?>> ! ! <?php } elseif(function_exists(is_tag) && is_tag() ) { ?> ! <<?php echo $tag_pagetitle; ?> class="pagetitle"><?php printf(__('Posts Tagged %s','royale'),'“'. single_tag_title('',false) .'”'); ?></<?php echo $tag_pagetitle; ?>> ! <?php } elseif (is_day()) { ?> ! <<?php echo $tag_pagetitle; ?> class="pagetitle"><?php printf(__('Archive for %s','royale'),get_the_time(__('F jS, Y','royale'))); ?></<?php echo $tag_pagetitle; ?>> ! <?php } elseif (is_month()) { ?> ! <<?php echo $tag_pagetitle; ?> class="pagetitle"><?php printf(__('Archive for %s','royale'),get_the_time(__('F, Y','royale'))); ?></<?php echo $tag_pagetitle; ?>> ! <?php } elseif (is_year()) { ?> ! <<?php echo $tag_pagetitle; ?> class="pagetitle"><?php printf(__('Archive for %s','royale'),get_the_time('Y')); ?></<?php echo $tag_pagetitle; ?>> ! <?php } elseif (is_search()) { ?> ! <<?php echo $tag_pagetitle; ?> class="pagetitle"><?php _e('Search Results','royale'); ?></<?php echo $tag_pagetitle; ?>> ! <?php } elseif (is_author()) { ?> ! <<?php echo $tag_pagetitle; ?> class="pagetitle"><?php _e('Author Archive','royale'); ?></<?php echo $tag_pagetitle; ?>> ! <?php } elseif (isset($_GET['paged']) && !empty($_GET['paged'])) { ?> ! <<?php echo $tag_pagetitle; ?> class="pagetitle"><?php _e('Blog Archives','royale'); ?></<?php echo $tag_pagetitle; ?>> <?php } ?> *************** *** 50,64 **** <span class="calm"><?php the_time((get_option('royale_dates') ? 'd' : 'm')) ?></span> <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"> <?php the_content() ?> </div> ! <p class="postmetadata"><?php echo mkicon('comments','Comments'); ?> <?php comments_popup_link(__('No Comments','royale'). ' »', __('1 Comment','royale'). ' »', __('% Comments','royale'). ' »'); ?></p> </div> --- 51,71 ---- <span class="calm"><?php the_time((get_option('royale_dates') ? 'd' : 'm')) ?></span> <span class="caly"><?php the_time('Y') ?></span> </div> ! <?php if (!get_option('royale_no_animations')): ?> ! <span class="switch-post"> ! <a href="javascript:toggleSidebars();" class="switch-sidebars"><img src="<?php echo $dirs['www']['icons']; ?>bullet_sidebars_hide.png" alt="" class="png" /></a><a href="javascript:togglePost(<?php the_ID(); ?>);" id="switch-post-<?php the_ID(); ?>"><img src="<?php echo $dirs['www']['icons']; ?>bullet_toggle_minus.png" alt="" class="png" /></a> ! </span> ! <?php endif; ?> ! <<?php echo $tag_posttitle_multi; ?> class="posttitle posttitle-archive"><a href="<?php the_permalink() ?>" rel="bookmark" title="<?php printf(__('Permanent Link to %s','royale'),the_title('','',false)); ?>"><?php the_title(); ?></a></<?php echo $tag_posttitle_multi; ?>> ! <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 if (function_exists('the_tags') && !get_option('royale_tags_after')) the_tags(', '. __('tags','royale') .': '); ?><?php edit_post_link(__('Edit','royale'), ' - <img src="'. $dirs['www']['images'] .'page_edit.png" class="png" alt="" /> ', ''); ?> </small> </div> <div class="entry"> <?php the_content() ?> + <?php if (function_exists('the_tags') && get_option('royale_tags_after')) the_tags(); ?> </div> ! <p class="postmetadata"><img src="<?php echo $dirs['www']['images']; ?>comments.png" class="png" alt="" /> <?php comments_popup_link(__('No Comments','royale'). ' »', __('1 Comment','royale'). ' »', __('% Comments','royale'). ' »'); ?></p> </div> *************** *** 71,89 **** <?php else : ?> ! <h2 class="center"><?php _e('Not Found','royale'); ?></h2> ! <p class="center"><?php _e('Sorry, but you are looking for something that isn\'t here','royale'); ?>.</p> <?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(); --- 78,94 ---- <?php else : ?> ! <<?php echo $tag_pagetitle; ?> class="pagetitle"><?php _e('Not Found','royale'); ?></<?php echo $tag_pagetitle; ?>> ! <p><?php _e('Sorry, but you are looking for something that isn\'t here','royale'); ?>.</p> <?php endif; ?> </td> <?php ! if (get_option('royale_always_show_sidebars')) { ! include (TEMPLATEPATH . '/sidebar.php'); ! if (get_option('royale_3columns')) { include (TEMPLATEPATH . '/sidebar2.php'); } } get_footer(); diff -c royale-1.3/archives.php royale-1.4/archives.php *** royale-1.3/archives.php 2007-06-11 17:39:11.000000000 -0400 --- royale-1.4/archives.php 2007-11-04 16:17:48.000000000 -0500 *************** *** 5,46 **** ?> <?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(); --- 5,38 ---- ?> <?php get_header(); + $tag_pagetitle = get_option('royale_tag_pagetitle' ); + ?> + <td id="content" class="narrowcolumn"> <div class="post"> <div class="entry"> ! ! <<?php echo $tag_pagetitle; ?> class="posttitle"><?php _e('Search','royale'); ?></<?php echo $tag_pagetitle; ?>> <?php include (TEMPLATEPATH . '/searchform.php'); ?> ! <<?php echo $tag_pagetitle; ?> class="posttitle"><?php _e('Archives by Month','royale'); ?></<?php echo $tag_pagetitle; ?>> <ul> <?php wp_get_archives('type=monthly'); ?> </ul> ! <<?php echo $tag_pagetitle; ?> class="posttitle"><?php _e('Archives by Subject','royale'); ?></<?php echo $tag_pagetitle; ?>> <ul> <?php wp_list_cats(); ?> </ul> </div> </div> </td> <?php ! if (get_option('royale_always_show_sidebars')) { ! include (TEMPLATEPATH . '/sidebar.php'); ! if (get_option('royale_3columns')) { include (TEMPLATEPATH . '/sidebar2.php'); } } get_footer(); diff -c royale-1.3/attachment.php royale-1.4/attachment.php *** royale-1.3/attachment.php 2007-06-11 10:15:54.000000000 -0400 --- royale-1.4/attachment.php 2007-11-04 16:18:00.000000000 -0500 *************** *** 1,25 **** <?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="navigation"> ! <div class="alignleft"> </div> ! <div class="alignright"> </div> ! </div> ! <?php $attachment_link = get_the_attachment_link($post->ID, true, array(450, 800)); // This also populates the iconsize for the next line ?> ! <?php $_post = &get_post($post->ID); $classname = ($_post->iconsize[0] <= 128 ? 'small' : '') . 'attachment'; // This lets us style narrow icons specially ?> <div class="post" id="post-<?php the_ID(); ?>"> ! <h2><a href="<?php echo get_permalink($post->post_parent); ?>" rev="attachment"><?php echo get_the_title($post->post_parent); ?></a> » <a href="<?php echo get_permalink() ?>" rel="bookmark" title="Permanent Link: <?php the_title(); ?>"><?php the_title(); ?></a></h2> <div class="entry"> <p class="<?php echo $classname; ?>"><?php echo $attachment_link; ?><br /><?php echo basename($post->guid); ?></p> --- 1,16 ---- <?php get_header(); ! ! $tag_pagetitle = get_option('royale_tag_pagetitle' ); ?> <td id="content" class="<?php echo ($alwayssidebars ? 'narrow' : 'wide'); ?>column"> ! <?php if (have_posts()) : while (have_posts()) : the_post(); ?> ! <?php $attachment_link = get_the_attachment_link($post->ID, true, array(450, 800)); // This also populates the iconsize for the next line ?> ! <?php $_post = &get_post($post->ID); $classname = ($_post->iconsize[0] <= 128 ? 'small' : '') . 'attachment'; // This lets us style narrow icons specially ?> <div class="post" id="post-<?php the_ID(); ?>"> ! <<?php echo $tag_pagetitle; ?> class="pagetitle"><a href="<?php echo get_permalink($post->post_parent); ?>" rev="attachment"><?php echo get_the_title($post->post_parent); ?></a> » <a href="<?php echo get_permalink() ?>" rel="bookmark" title="Permanent Link: <?php the_title(); ?>"><?php the_title(); ?></a></<?php echo $tag_pagetitle; ?>> <div class="entry"> <p class="<?php echo $classname; ?>"><?php echo $attachment_link; ?><br /><?php echo basename($post->guid); ?></p> *************** *** 63,73 **** </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(); --- 54,62 ---- </td> <?php ! if (get_option('royale_always_show_sidebars')) { ! include (TEMPLATEPATH . '/sidebar.php'); ! if (get_option('royale_3columns')) { include (TEMPLATEPATH . '/sidebar2.php'); } } get_footer(); Only in royale-1.4: bg_BG.mo Binary files royale-1.3/ca_ES.mo and royale-1.4/ca_ES.mo differ diff -c royale-1.3/comments.php royale-1.4/comments.php *** royale-1.3/comments.php 2007-06-18 11:24:46.000000000 -0400 --- royale-1.4/comments.php 2007-11-04 15:27:10.000000000 -0500 *************** *** 22,72 ****  <?php if ($comments) : ?> ! <h3 id="comments"><?php comments_number(__('No Responses to ','royale'), __('One Response to ','royale'), __('% Responses to ','royale')); ?> “<?php the_title(); ?>”</h3> ! <ol class="commentlist"> ! ! <?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') : ?> ! <em><?php _e('Your comment is awaiting moderation.','royale'); ?></em> ! <?php endif; ?> ! <br /> ! <small class="commentmetadata"><a href="#comment-<?php comment_ID() ?>" title=""><?php printf(__('%s at %s','royale'),get_comment_date('F jS, Y'),get_comment_time()); ?></a> <?php edit_comment_link('e','',''); ?></small> ! <?php comment_text() ?> ! </li> ! ! <?php /* Changes every other comment to a different class */ ! if ('alt' == $oddcomment) $oddcomment = ''; ! else $oddcomment = 'alt'; ! ?> ! ! <?php endforeach; /* end for each comment */ ?> </ol> ! <?php else : // this is displayed if there are no comments so far ?> ! <?php if ('open' == $post->comment_status) : ?> !  ! ! <?php else : // comments are closed ?> !  <p class="nocomments"><?php _e('Comments are closed.','royale'); ?></p> ! <?php endif; ?> ! <?php endif; ?> ! ! <?php if ('open' == $post->comment_status) : ?> ! <h3 id="respond"><?php _e('Leave a Reply','royale'); ?></h3> <?php if ( get_option('comment_registration') && !$user_ID ) : ?> <p><?php _e('You must be logged in to post a comment.','royale'); ?> <a href="<?php echo get_option('siteurl'); ?>/wp-login.php?redirect_to=<?php the_permalink(); ?>"><?php _e('Login','royale'); ?> »</a></p> --- 22,91 ----  <?php if ($comments) : ?> ! <div id="comments"><?php comments_number(__('No Responses to ','royale'), __('One Response to ','royale'), __('% Responses to ','royale')); ?> “<?php the_title(); ?>”</div> ! <?php ! foreach ($comments as $comment): ! $comment_list_item = sprintf(' ! <li class="%s%s" id="comment-%s"> ! <cite>%s</cite> ! %s<br /> ! <small class="commentmetadata"><a href="#comment-%s" title="">%s</a> %s</small> ! %s ! </li>', ! $oddcomment, ! ($authorcomments && get_comment_author() == $the_author ? ' authorcomment' : ''), ! get_comment_ID(), ! sprintf(__('%s says:','royale'),get_comment_author_link()), ! ($comment->comment_approved == '0' ? '<em>'. __('Your comment is awaiting moderation.','royale') .'</em>' : ''), ! get_comment_ID(), ! sprintf(__('%s at %s','royale'),get_comment_date(__('F jS, Y','royale')),get_comment_time()), ! ' - '. apply_filters('edit_comment_link', '<a href="'. get_edit_comment_link() .'">'. __('Edit','royale') .'</a>', $comment->comment_ID), ! apply_filters('comment_text', get_comment_text()) ! ); ! ! if (get_option('royale_trackbacks_after') && $comment->comment_type == 'trackback'): ! $trackback_list .= $comment_list_item; ! else: ! $comment_list .= $comment_list_item; ! endif; ! if ('alt' == $oddcomment) $oddcomment = ''; ! else $oddcomment = 'alt'; ! endforeach; ! ?> + <ol class="commentlist"> + <?php echo $comment_list; ?> </ol> ! <?php ! if (get_option('royale_trackbacks_after') && $trackback_list): ! ?> ! <div id="trackbacks"><?php _e('Trackbacks','royale'); ?></div> ! <ol class="commentlist"> ! <?php echo $trackback_list; ?> ! </ol> ! <?php ! endif; ! else: // this is displayed if there are no comments so far ! ! if ('open' == $post->comment_status): // If comments are open, but there are no comments. ! else : // if comments are closed ! ?> <p class="nocomments"><?php _e('Comments are closed.','royale'); ?></p> ! <?php ! endif; ! endif; ! if ('open' == $post->comment_status): ! ?> ! <div id="respond"><?php _e('Leave a Reply','royale'); ?></div> <?php if ( get_option('comment_registration') && !$user_ID ) : ?> <p><?php _e('You must be logged in to post a comment.','royale'); ?> <a href="<?php echo get_option('siteurl'); ?>/wp-login.php?redirect_to=<?php the_permalink(); ?>"><?php _e('Login','royale'); ?> »</a></p> *************** *** 91,97 **** <?php endif; ?> !  <p><textarea name="comment" id="comment" cols="100%" rows="10" tabindex="4"></textarea></p> --- 110,118 ---- <?php endif; ?> ! <?php if (get_option('royale_xhtml_comments')): ?> ! <p><small><strong>XHTML:</strong> <?php _e('You can use these tags:','royale'); ?> <?php echo allowed_tags(); ?></small></p> ! <?php endif; ?> <p><textarea name="comment" id="comment" cols="100%" rows="10" tabindex="4"></textarea></p> Binary files royale-1.3/de_DE.mo and royale-1.4/de_DE.mo differ diff -c royale-1.3/footer.php royale-1.4/footer.php *** royale-1.3/footer.php 2007-06-11 11:40:52.000000000 -0400 --- royale-1.4/footer.php 2007-11-04 16:29:04.000000000 -0500 *************** *** 13,19 **** */ ! global $wpmu; ?> </tr> </table> --- 13,19 ---- */ ! global $dirs, $wpmu; ?> </tr> </table> *************** *** 28,40 **** <?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')): ?> <br /><?php echo get_num_queries(); ?> queries. <?php timer_stop(1); ?> seconds. <?php endif; ?> </p> </div> <?php wp_footer(); ?> </body> --- 28,127 ---- <?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 /><img src="<?php echo $dirs['www']['images']; ?>rss.png" class="png" alt="" /> <a href="<?php bloginfo('rss2_url'); ?>"><?php _e('Entries (RSS)','royale'); ?></a> ! <?php _e('and','royale'); ?> <img src="<?php echo $dirs['www']['images']; ?>rss.png" class="png" alt="" /> <a href="<?php bloginfo('comments_rss2_url'); ?>"><?php _e('Comments (RSS)','royale'); ?></a>. <?php if (get_option('royale_footer_stats')): ?> <br /><?php echo get_num_queries(); ?> queries. <?php timer_stop(1); ?> seconds. <?php endif; ?> </p> </div> + <script type="text/javascript"> +  + </script> <?php wp_footer(); ?> </body> Binary files royale-1.3/fr_FR.mo and royale-1.4/fr_FR.mo differ diff -c royale-1.3/functions.php royale-1.4/functions.php *** royale-1.3/functions.php 2007-06-18 12:38:44.000000000 -0400 --- royale-1.4/functions.php 2007-11-04 16:25:20.000000000 -0500 *************** *** 1,12 **** <?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)' ); --- 1,17 ---- <?php load_theme_textdomain('royale'); + // directories + $dirs = array(); + $dirs['loc']['theme'] = TEMPLATEPATH ."/"; + $dirs['www']['theme'] = get_bloginfo('template_directory') ."/"; + + foreach(array('loc','www') as $i) { + foreach(array('images','js','images/patterns','images/icons') as $j) { + $dirs[$i][preg_replace('/.+\//','',$j)] = $dirs[$i]['theme'].$j.'/'; + } + } + // 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)' ); *************** *** 21,26 **** --- 26,38 ---- if (!get_option('royale_title_scheme_date' )) update_option('royale_title_scheme_date' ,'%blogname% » Archive for %date%'); if (!get_option('royale_title_scheme_search' )) update_option('royale_title_scheme_search' ,'%blogname% » Search Results for "%search%"'); + if (!get_option('royale_tag_blogname' )) update_option('royale_tag_blogname' ,'h1'); + if (!get_option('royale_tag_blogdesc' )) update_option('royale_tag_blogdesc' ,'h6'); + if (!get_option('royale_tag_posttitle_multi' )) update_option('royale_tag_posttitle_multi' ,'h2'); + if (!get_option('royale_tag_posttitle_single' )) update_option('royale_tag_posttitle_single' ,'h2'); + if (!get_option('royale_tag_pagetitle' )) update_option('royale_tag_pagetitle' ,'h2'); + if (!get_option('royale_tag_sidebar' )) update_option('royale_tag_sidebar' ,'h2'); + // some global vars *************** *** 29,42 **** $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> --- 41,60 ---- $wpmu = function_exists('is_site_admin'); ! // Register sidebars ! $tag_sidebar = get_option('royale_tag_sidebar'); ! if (function_exists('register_sidebar')) { ! register_sidebar(array('before_title' => "<$tag_sidebar class=\"widgettitle\">", 'after_title' => "</$tag_sidebar>\n")); ! register_sidebar(array('before_title' => "<$tag_sidebar class=\"widgettitle\">", 'after_title' => "</$tag_sidebar>\n")); ! register_sidebar(array('before_title' => "<$tag_sidebar class=\"widgettitle\">", 'after_title' => "</$tag_sidebar>\n", 'name' => 'Royale Top')); ! register_sidebar(array('before_title' => "<$tag_sidebar class=\"widgettitle\">", 'after_title' => "</$tag_sidebar>\n", 'name' => 'Royale Bottom')); } ! /* ------------------------------------------------- ! SEARCH WIDGET ! -------------------------------------------------- */ function widget_royale_search() { ?> <li><h2><?php _e('Search','royale'); ?></h2> *************** *** 49,55 **** ! // CALENDAR WIDGET function widget_royale_calendar() { ?> <li><h2> </h2> --- 67,76 ---- ! ! /* ------------------------------------------------- ! CALENDAR WIDGET ! -------------------------------------------------- */ function widget_royale_calendar() { ?> <li><h2> </h2> *************** *** 62,69 **** ! // META WIDGET function widget_royale_meta() { $options = get_option('widget_meta'); $title = empty($options['title']) ? __('Meta','royale') : $options['title']; ?> --- 83,94 ---- ! ! /* ------------------------------------------------- ! META WIDGET ! -------------------------------------------------- */ function widget_royale_meta() { + global $dirs; $options = get_option('widget_meta'); $title = empty($options['title']) ? __('Meta','royale') : $options['title']; ?> *************** *** 71,77 **** <ul> <?php wp_register(); ?> <li><?php wp_loginout(); ?></li> ! <li><a href="feed:<?php bloginfo('rss2_url'); ?>" title="RSS feed for <?php bloginfo('name'); ?>">Entries</a> <?php echo mkicon('rss absolute',''); ?></li> <li><a href="http://wordpress.org/" title="Powered by WordPress, state-of-the-art semantic personal publishing platform.">WordPress</a></li> <li><a href="http://www.onehertz.com/portfolio/wordpress/" title="Other Wordpress themes by the same author" target="_blank">Royale theme</a></li> <?php wp_meta(); ?> --- 96,102 ---- <ul> <?php wp_register(); ?> <li><?php wp_loginout(); ?></li> ! <li><a href="feed:<?php bloginfo('rss2_url'); ?>" title="RSS feed for <?php bloginfo('name'); ?>">Entries</a> <img src="<?php echo $dirs['www']['images']; ?>rss.png" class="png absolute" alt="" /></li> <li><a href="http://wordpress.org/" title="Powered by WordPress, state-of-the-art semantic personal publishing platform.">WordPress</a></li> <li><a href="http://www.onehertz.com/portfolio/wordpress/" title="Other Wordpress themes by the same author" target="_blank">Royale theme</a></li> <?php wp_meta(); ?> *************** *** 84,97 **** ! // 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); } --- 109,150 ---- ! /* ------------------------------------------------- ! THEME OPTIONS PAGES ! -------------------------------------------------- */ 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() { ! global $dirs; ! add_theme_page( ! 'Theme Options', ! '<img src="'. $dirs['www']['images'] .'/attention_catcher.png" alt="" /> Theme Options', ! 'edit_themes', ! basename(__FILE__), ! 'royale_options_page' ! ); ! } ! function add_royale_inserts_page() { ! global $dirs; ! add_theme_page( ! 'HTML Inserts', ! '<img src="'. $dirs['www']['images'] .'/attention_catcher.png" alt="" /> 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); } *************** *** 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')); --- 168,204 ---- } 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('xhtml_comments' ,$_POST['xhtmlcomments'] ); ! 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'] )); ! royale_set_var('tag_blogname' ,$_POST['tag_blogname'] ); ! royale_set_var('tag_blogdesc' ,$_POST['tag_blogdesc'] ); ! royale_set_var('tag_posttitle_multi' ,$_POST['tag_posttitle_multi'] ); ! royale_set_var('tag_posttitle_single' ,$_POST['tag_posttitle_single'] ); ! royale_set_var('tag_pagetitle' ,$_POST['tag_pagetitle'] ); ! royale_set_var('tag_sidebar' ,$_POST['tag_sidebar'] ); ! royale_set_var('tags_after' ,$_POST['tags_after'] ); ! royale_set_var('trackbacks_after' ,$_POST['trackbacksafter'] ); } $dates = get_option('royale_dates' ); $exclude = split(",",get_option('royale_exclude_pages')); *************** *** 146,151 **** --- 208,220 ---- $overlay_opacity = get_option('royale_overlay_opacity'); $bgpattern = get_option('royale_bgpattern' ); + $tag_blogname = get_option('royale_tag_blogname' ); + $tag_blogdesc = get_option('royale_tag_blogdesc' ); + $tag_posttitle_multi = get_option('royale_tag_posttitle_multi' ); + $tag_posttitle_single = get_option('royale_tag_posttitle_single' ); + $tag_pagetitle = get_option('royale_tag_pagetitle' ); + $tag_sidebar = get_option('royale_tag_sidebar' ); + $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 />'; } *************** *** 159,165 **** } 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> --- 228,234 ---- } 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 '. (rand(0,1) ? '<strong>making a donation</strong>' : 'making a donation') .'.</a></p> <div class="wrap"> <h2>Royale Options</h2> *************** *** 206,211 **** --- 275,281 ---- '. $patterns .' </fieldset> + <br/> <fieldset class="options"> <legend>SEO Options</legend> *************** *** 238,243 **** --- 308,403 ---- <td><input type="text" name="title_scheme_search" size="60" value="'. get_option('royale_title_scheme_search') .'" /></td> </tr> </table> + <br /> + + <label><b>Custom header levels</b></label><br/> + Customize which tags you want to use for the blog name, blog description, posts title, ... This does not affect styles. + <table> + <tr> + <td style="text-align: right;">Blog name:</td> + <td> + <select name="tag_blogname"> + <option value="h1"'. ($tag_blogname == 'h1' ? ' selected="selected"' : '') .'>h1</option> + <option value="h2"'. ($tag_blogname == 'h2' ? ' selected="selected"' : '') .'>h2</option> + <option value="h3"'. ($tag_blogname == 'h3' ? ' selected="selected"' : '') .'>h3</option> + <option value="h4"'. ($tag_blogname == 'h4' ? ' selected="selected"' : '') .'>h4</option> + <option value="h5"'. ($tag_blogname == 'h5' ? ' selected="selected"' : '') .'>h5</option> + <option value="h6"'. ($tag_blogname == 'h6' ? ' selected="selected"' : '') .'>h6</option> + <option value="div"'. ($tag_blogname == 'div' ? ' selected="selected"' : '') .'>div</option> + </select> + </td> + </tr> + <tr> + <td style="text-align: right;">Blog description (tagline):</td> + <td> + <select name="tag_blogdesc"> + <option value="h1"'. ($tag_blogdesc == 'h1' ? ' selected="selected"' : '') .'>h1</option> + <option value="h2"'. ($tag_blogdesc == 'h2' ? ' selected="selected"' : '') .'>h2</option> + <option value="h3"'. ($tag_blogdesc == 'h3' ? ' selected="selected"' : '') .'>h3</option> + <option value="h4"'. ($tag_blogdesc == 'h4' ? ' selected="selected"' : '') .'>h4</option> + <option value="h5"'. ($tag_blogdesc == 'h5' ? ' selected="selected"' : '') .'>h5</option> + <option value="h6"'. ($tag_blogdesc == 'h6' ? ' selected="selected"' : '') .'>h6</option> + <option value="div"'. ($tag_blogdesc == 'div' ? ' selected="selected"' : '') .'>div</option> + </select> + </td> + </tr> + <tr> + <td style="text-align: right;">Post title (when showing multiple posts):</td> + <td> + <select name="tag_posttitle_multi"> + <option value="h1"'. ($tag_posttitle_multi == 'h1' ? ' selected="selected"' : '') .'>h1</option> + <option value="h2"'. ($tag_posttitle_multi == 'h2' ? ' selected="selected"' : '') .'>h2</option> + <option value="h3"'. ($tag_posttitle_multi == 'h3' ? ' selected="selected"' : '') .'>h3</option> + <option value="h4"'. ($tag_posttitle_multi == 'h4' ? ' selected="selected"' : '') .'>h4</option> + <option value="h5"'. ($tag_posttitle_multi == 'h5' ? ' selected="selected"' : '') .'>h5</option> + <option value="h6"'. ($tag_posttitle_multi == 'h6' ? ' selected="selected"' : '') .'>h6</option> + <option value="div"'. ($tag_posttitle_multi == 'div' ? ' selected="selected"' : '') .'>div</option> + </select> + </td> + </tr> + <tr> + <td style="text-align: right;">Post title (single post view):</td> + <td> + <select name="tag_posttitle_single"> + <option value="h1"'. ($tag_posttitle_single == 'h1' ? ' selected="selected"' : '') .'>h1</option> + <option value="h2"'. ($tag_posttitle_single == 'h2' ? ' selected="selected"' : '') .'>h2</option> + <option value="h3"'. ($tag_posttitle_single == 'h3' ? ' selected="selected"' : '') .'>h3</option> + <option value="h4"'. ($tag_posttitle_single == 'h4' ? ' selected="selected"' : '') .'>h4</option> + <option value="h5"'. ($tag_posttitle_single == 'h5' ? ' selected="selected"' : '') .'>h5</option> + <option value="h6"'. ($tag_posttitle_single == 'h6' ? ' selected="selected"' : '') .'>h6</option> + <option value="div"'. ($tag_posttitle_single == 'div' ? ' selected="selected"' : '') .'>div</option> + </select> + </td> + </tr> + <tr> + <td style="text-align: right;">Page title (\'Archives\', \'Search Results\'):</td> + <td> + <select name="tag_pagetitle"> + <option value="h1"'. ($tag_pagetitle == 'h1' ? ' selected="selected"' : '') .'>h1</option> + <option value="h2"'. ($tag_pagetitle == 'h2' ? ' selected="selected"' : '') .'>h2</option> + <option value="h3"'. ($tag_pagetitle == 'h3' ? ' selected="selected"' : '') .'>h3</option> + <option value="h4"'. ($tag_pagetitle == 'h4' ? ' selected="selected"' : '') .'>h4</option> + <option value="h5"'. ($tag_pagetitle == 'h5' ? ' selected="selected"' : '') .'>h5</option> + <option value="h6"'. ($tag_pagetitle == 'h6' ? ' selected="selected"' : '') .'>h6</option> + <option value="div"'. ($tag_pagetitle == 'div' ? ' selected="selected"' : '') .'>div</option> + </select> + </td> + </tr> + <tr> + <td style="text-align: right;">Widget title:</td> + <td> + <select name="tag_sidebar"> + <option value="h1"'. ($tag_sidebar == 'h1' ? ' selected="selected"' : '') .'>h1</option> + <option value="h2"'. ($tag_sidebar == 'h2' ? ' selected="selected"' : '') .'>h2</option> + <option value="h3"'. ($tag_sidebar == 'h3' ? ' selected="selected"' : '') .'>h3</option> + <option value="h4"'. ($tag_sidebar == 'h4' ? ' selected="selected"' : '') .'>h4</option> + <option value="h5"'. ($tag_sidebar == 'h5' ? ' selected="selected"' : '') .'>h5</option> + <option value="h6"'. ($tag_sidebar == 'h6' ? ' selected="selected"' : '') .'>h6</option> + <option value="div"'. ($tag_sidebar == 'div' ? ' selected="selected"' : '') .'>div</option> + </select> + </td> + </tr> + </table> </fieldset> *************** *** 253,261 **** <input type="radio" name="dates" value="0" '. ($dates ? '' : 'checked="checked"') .' />dd/mm/yyyy <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 <em> tags as italics --- 413,425 ---- <input type="radio" name="dates" value="0" '. ($dates ? '' : 'checked="checked"') .' />dd/mm/yyyy <input type="radio" name="dates" value="1" '. ($dates ? 'checked="checked"' : '') .' />month/dd/yyyy<br /><br /> + <label><b>Comments</b></label><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="xhtmlcomments" '. (get_option('royale_xhtml_comments') ? 'checked="checked"' : '') .' /> Display allowed XHTML tags above the comment field<br /> + <input type="checkbox" name="trackbacksafter" '. (get_option('royale_trackbacks_after') ? 'checked="checked"' : '') .' /> Display trackbacks after the comments<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="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 <em> tags as italics *************** *** 402,408 **** function royale_readme_page() { echo '<div class="wrap">'; echo '<pre>'; ! include("README.txt"); echo '</pre>'; echo '</div>'; } --- 566,572 ---- function royale_readme_page() { echo '<div class="wrap">'; echo '<pre>'; ! echo htmlspecialchars(file_get_contents(TEMPLATEPATH.'/README.txt')); echo '</pre>'; echo '</div>'; } Binary files royale-1.3/he_IL.mo and royale-1.4/he_IL.mo differ diff -c royale-1.3/header.php royale-1.4/header.php *** royale-1.3/header.php 2007-06-18 11:39:49.000000000 -0400 --- royale-1.4/header.php 2007-11-04 15:11:23.000000000 -0500 *************** *** 34,44 **** --- 34,56 ---- <meta name="generator" content="WordPress <?php bloginfo('version'); ?>" />  <meta name="theme" content="Royale <?php $themes = get_themes(); echo $themes['Royale']['Version']; ?>" /> + <?php + global $dirs; + + if (file_exists($dirs['loc']['theme']."favicon.ico")) $favicon = $dirs['www']['theme']."favicon.ico"; + + if ($favicon): + ?> + <link rel="shortcut icon" href="<?php echo $favicon; ?>" type="image/x-icon" /> + <?php endif; ?> + <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'); ?>" /> <link rel="pingback" href="<?php bloginfo('pingback_url'); ?>" /> + <script type="text/javascript" src="<?php echo $dirs['www']['js']; ?>jquery.js"></script> <?php wp_head(); + if (get_option('royale_bold_links')) { $lastminutecss .= " a { font-weight: bold; }\n"; }; if ($lastminutecss) { echo "<style type=\"text/css\">\n$lastminutecss</style>\n"; } *************** *** 47,149 **** $rgb10 = get_option('royale_rgb1'); $rgb20 = get_option('royale_rgb2'); ?> ! ! <script type="text/javascript"> ! var h, s, v, r, g, b, hi, f, p, q, t; ! ! function dec2hex(n) { ! var str = ""; ! while (n) { str = "0123456789ABCDEF".charAt(n&0xf) + str; n>>>=4; } ! return (str.length ? str : 0); ! } ! ! function hsv2rgb(h,s,v) { ! hi = Math.floor(h/60) % 6; ! f = h/60-hi; ! p = v*(1-s); ! q = v*(1-f*s); ! t = v*(1-(1-f)*s); ! switch (hi) { ! case 0: ! r = v; g = t; b = p; ! break; ! case 1: ! r = q; g = v; b = p; ! break; ! case 2: ! r = p; g = v; b = t; ! break; ! case 3: ! r = p; g = q; b = v; ! break; ! case 4: ! r = t; g = p; b = v; ! break; ! case 5: ! r = v; g = p; b = q; ! break; ! } ! return 'rgb('+Math.round(r*256)+','+Math.round(g*256)+','+Math.round(b*256)+')'; ! } ! ! var hue = <?php echo $hue0; ?>; ! function huecycle() { ! hueshift(); ! if (!hue--) { hue += 360; } ! setTimeout("huecycle()",1000); ! } ! ! elements = new Array(); ! props = new Array('color','borderBottom','borderTop'); ! rules = (/MSIE/i.test(navigator.userAgent) ? 'rules' : 'cssRules'); ! ! function hueshift() { ! var nrgb1 = hsv2rgb(hue,0.91,0.91); ! var nrgb2 = hsv2rgb(hue,0.25,0.95); ! for (i=0;i<elements.length;i++) { ! if (/RGB1/.test(elements[i][3])) { document.styleSheets[elements[i][0]][rules][elements[i][1]].style[props[elements[i][2]]] = elements[i][3].replace(/RGB1/,nrgb1); } ! if (/RGB2/.test(elements[i][3])) { document.styleSheets[elements[i][0]][rules][elements[i][1]].style[props[elements[i][2]]] = elements[i][3].replace(/RGB2/,nrgb2); } ! } ! } ! ! function walkondom() { ! re1 = /<?php echo ereg_replace(',',',\\s*',ereg_replace('([])','\\\\1',$rgb10)); ?>/i; ! 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')); ! } ! } ! } ! } ! } ! } ! } ! function royale_init() { ! <?php if (get_option('royale_hue_cycle')): ?> ! walkondom(); ! huecycle(); ! <?php endif; ?> ! } ! </script> <?php echo get_option('royale_inserts_header'); ?> </head> <?php ! $bodytag = get_option('royale_inserts_body'); ! echo (preg_match("/<body/i",$bodytag) ? $bodytag : "<body onload=\"royale_init()\">"); ?> ! <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')); ?> --- 59,80 ---- $rgb10 = get_option('royale_rgb1'); $rgb20 = get_option('royale_rgb2'); ?> ! <style type="text/css" id="cycle"> ! </style> <?php echo get_option('royale_inserts_header'); ?> </head> <?php ! $bodytag = get_option('royale_inserts_body'); ! echo (preg_match("/<body/i",$bodytag) ? $bodytag : "<body onload=\"royale_init()\">"); ! ! $tag_blogname = get_option('royale_tag_blogname'); ! $tag_blogdesc = get_option('royale_tag_blogdesc'); ?> ! <div id="header" class="png"> ! <<?php echo $tag_blogname; ?> id="blogname"><a href="<?php echo get_option('home'); ?>/"><?php bloginfo('name'); ?></a></<?php echo $tag_blogname; ?>> ! <<?php echo $tag_blogdesc; ?> id="blogdesc"><?php bloginfo('description'); ?></<?php echo $tag_blogdesc; ?>> <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')); ?> Only in royale-1.4: hr.mo Common subdirectories: royale-1.3/images and royale-1.4/images diff -c royale-1.3/index.php royale-1.4/index.php *** royale-1.3/index.php 2007-06-06 18:54:28.000000000 -0400 --- royale-1.4/index.php 2007-11-04 16:43:45.000000000 -0500 *************** *** 1,13 **** ! <?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"> <?php dynamic_sidebar('Royale Top'); ?> </ul> --- 1,23 ---- ! <?php ! global $dirs; ! get_header(); ! ! $tag_posttitle_multi = get_option('royale_tag_posttitle_multi'); ! $tag_pagetitle = get_option('royale_tag_pagetitle' ); ! ! global $wp_registered_sidebars; ! if ($wp_registered_sidebars) { ! foreach ($wp_registered_sidebars as $key => $value) { ! if ($value['name'] == 'Royale Top') { $index_royale_top = $key; } ! if ($value['name'] == 'Royale Bottom') { $index_royale_bottom = $key; } ! } } ! if (function_exists(wp_get_sidebars_widgets)) $sidebars_widgets = wp_get_sidebars_widgets(); ! ?> ! <td id="content" class="narrowcolumn"> ! <?php if (function_exists('dynamic_sidebar') && $sidebars_widgets[$index_royale_top]): ?> <ul class="inline-widgets"> <?php dynamic_sidebar('Royale Top'); ?> </ul> *************** *** 24,38 **** <span class="calm"><?php the_time((get_option('royale_dates') ? 'd' : 'm')) ?></span> <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"> <?php the_content(__('Read the rest of this entry','royale') .' »'); ?> </div> ! <p class="postmetadata"><?php echo mkicon('comments','Comments'); ?> <?php comments_popup_link(__('No Comments','royale'). ' »', __('1 Comment','royale'). ' »', __('% Comments','royale'). ' »'); ?></p> </div> <?php endwhile; ?> --- 34,54 ---- <span class="calm"><?php the_time((get_option('royale_dates') ? 'd' : 'm')) ?></span> <span class="caly"><?php the_time('Y') ?></span> </div> ! <?php if (!get_option('mandigo_no_animations')): ?> ! <span class="switch-post"> ! <a href="javascript:toggleSidebars();" class="switch-sidebars"><img src="<?php echo $dirs['www']['icons']; ?>bullet_sidebars_hide.png" alt="" class="png" /></a><a href="javascript:togglePost(<?php the_ID(); ?>);" id="switch-post-<?php the_ID(); ?>"><img src="<?php echo $dirs['www']['icons']; ?>bullet_toggle_minus.png" alt="" class="png" /></a> ! </span> ! <?php endif; ?> ! <<?php echo $tag_posttitle_multi; ?> class="posttitle"><a href="<?php the_permalink() ?>" rel="bookmark" title="<?php printf(__('Permanent Link to %s','royale'),the_title('','',false)); ?>"><?php the_title(); ?></a></<?php echo $tag_posttitle_multi; ?>> ! <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 if (function_exists('the_tags') && !get_option('royale_tags_after')) the_tags(', '. __('tags','royale') .': '); ?><?php edit_post_link(__('Edit','royale'), ' - <img src="'. $dirs['www']['images'] .'page_edit.png" class="png" alt="" /> ', ''); ?> </small> </div> <div class="entry"> <?php the_content(__('Read the rest of this entry','royale') .' »'); ?> + <?php if (function_exists('the_tags') && get_option('royale_tags_after')) the_tags(); ?> </div> ! <p class="postmetadata"><img src="<?php echo $dirs['www']['images']; ?>comments.png" class="png" alt="" /> <?php comments_popup_link(__('No Comments','royale'). ' »', __('1 Comment','royale'). ' »', __('% Comments','royale'). ' »'); ?></p> </div> <?php endwhile; ?> *************** *** 50,61 **** <?php else : ?> ! <h2 class="center"><?php _e('Not Found','royale'); ?></h2> <p class="center"><?php _e('Sorry, but you are looking for something that isn\'t here.','royale'); ?></p> <?php endif; ?> ! <?php if (function_exists('dynamic_sidebar')): ?> <ul class="inline-widgets"> <?php dynamic_sidebar('Royale Bottom'); ?> </ul> --- 66,77 ---- <?php else : ?> ! <<?php echo $tag_pagetitle; ?> class="center"><?php _e('Not Found','royale'); ?></<?php echo $tag_pagetitle; ?>> <p class="center"><?php _e('Sorry, but you are looking for something that isn\'t here.','royale'); ?></p> <?php endif; ?> ! <?php if (function_exists('dynamic_sidebar') && $sidebars_widgets[$index_royale_bottom]): ?> <ul class="inline-widgets"> <?php dynamic_sidebar('Royale Bottom'); ?> </ul> *************** *** 63,72 **** </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(); ?> --- 79,86 ---- </td> <?php ! include (TEMPLATEPATH . '/sidebar.php'); ! if (get_option('royale_3columns')) { include (TEMPLATEPATH . '/sidebar2.php'); } get_footer(); ?> Only in royale-1.4: js diff -c royale-1.3/links.php royale-1.4/links.php *** royale-1.3/links.php 2007-06-11 17:39:15.000000000 -0400 --- royale-1.4/links.php 2007-11-04 16:18:10.000000000 -0500 *************** *** 5,33 **** ?> <?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(); --- 5,30 ---- ?> <?php get_header(); ! ! $tag_pagetitle = get_option('royale_tag_pagetitle' ); ?> ! <td id="content" class="narrowcolumn"> ! <div class="post"> ! <div class="entry"> ! <<?php echo $tag_pagetitle; ?> class="posttitle"><?php _e('Links','royale'); ?></<?php echo $tag_pagetitle; ?>> ! <ul> ! <?php get_links_list(); ?> ! </ul> + </div> + </div> </td> <?php ! if (get_option('royale_always_show_sidebars')) { ! include (TEMPLATEPATH . '/sidebar.php'); ! if (get_option('royale_3columns')) { include (TEMPLATEPATH . '/sidebar2.php'); } } get_footer(); diff -c royale-1.3/page.php royale-1.4/page.php *** royale-1.3/page.php 2007-06-11 10:15:24.000000000 -0400 --- royale-1.4/page.php 2007-11-04 15:59:03.000000000 -0500 *************** *** 1,37 **** ! <?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(); ?>"> ! <h2><?php the_title(); ?></h2> <div class="entry"> <?php the_content('<p class="serif">'. __('Read the rest of this page','royale') .' »</p>'); ?> <?php link_pages('<p><strong>'. __('Pages','royale') .':</strong> ', '</p>', 'number'); ?> </div> - <div style="clear: both;"></div> </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(); --- 1,36 ---- ! <?php ! global $dirs; ! get_header(); ! ! $tag_posttitle_single = get_option('royale_tag_posttitle_single'); ?> ! <td id="content" class="narrowcolumn"> ! <?php if (have_posts()) : while (have_posts()) : the_post(); ?> <div class="post" id="post-<?php the_ID(); ?>"> ! <?php if (!get_option('royale_no_animations')): ?> ! <span class="switch-post"> ! <a href="javascript:toggleSidebars();" class="switch-sidebars"><img src="<?php echo $dirs['www']['icons']; ?>bullet_sidebars_hide.png" alt="" class="png" /></a><a href="javascript:togglePost(<?php the_ID(); ?>);" id="switch-post-<?php the_ID(); ?>"><img src="<?php echo $dirs['www']['icons']; ?>bullet_toggle_minus.png" alt="" class="png" /></a> ! </span> ! <?php endif; ?> ! <<?php echo $tag_posttitle_single; ?> class="posttitle"><?php the_title(); ?></<?php echo $tag_posttitle_single; ?>> <div class="entry"> <?php the_content('<p class="serif">'. __('Read the rest of this page','royale') .' »</p>'); ?> <?php link_pages('<p><strong>'. __('Pages','royale') .':</strong> ', '</p>', 'number'); ?> + <div class="clear"></div> </div> </div> ! <?php edit_post_link('<img src="'. $dirs['www']['scheme'] .'images/edit.gif" alt="" /> '. __('Edit this page','royale'), '<p>', '</p>'); ?> ! <?php endwhile; endif; ?> </td> <?php ! if (get_option('royale_always_show_sidebars')) { ! include (TEMPLATEPATH . '/sidebar.php'); ! if (get_option('royale_3columns')) { include (TEMPLATEPATH . '/sidebar2.php'); } } get_footer(); Only in royale-1.4: pt_PT.mo diff -c royale-1.3/search.php royale-1.4/search.php *** royale-1.3/search.php 2007-06-11 10:14:39.000000000 -0400 --- royale-1.4/search.php 2007-11-04 16:18:18.000000000 -0500 *************** *** 1,18 **** <?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()) : ?> ! <h2 class="pagetitle"><?php _e('Search Results','royale'); ?></h2> <div class="navigation"> <div class="alignleft"><?php next_posts_link('« '. __('Previous Entries','royale')) ?></div> --- 1,16 ---- <?php get_header(); ! ! $tag_posttitle_multi = get_option('royale_tag_posttitle_multi'); ! $tag_pagetitle = get_option('royale_tag_pagetitle' ); ! ! global $dirs; ?> ! <td id="content" class="narrowcolumn"> <?php if (have_posts()) : ?> ! <<?php echo $tag_pagetitle; ?> class="pagetitle"><?php _e('Search Results','royale'); ?></<?php echo $tag_pagetitle; ?>> <div class="navigation"> <div class="alignleft"><?php next_posts_link('« '. __('Previous Entries','royale')) ?></div> *************** *** 22,29 **** <?php while (have_posts()) : the_post(); ?> ! <div class="post"> ! <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')): ?> --- 20,32 ---- <?php while (have_posts()) : the_post(); ?> ! <div class="post" id="post-<?php the_ID(); ?>"> ! <?php if (!get_option('royale_no_animations')): ?> ! <span class="switch-post"> ! <a href="javascript:toggleSidebars();" class="switch-sidebars"><img src="<?php echo $dirs['www']['icons']; ?>bullet_sidebars_hide.png" alt="" class="png" /></a><a href="javascript:togglePost(<?php the_ID(); ?>);" id="switch-post-<?php the_ID(); ?>"><img src="<?php echo $dirs['www']['icons']; ?>bullet_toggle_minus.png" alt="" class="png" /></a> ! </span> ! <?php endif; ?> ! <<?php echo $tag_posttitle_multi; ?> class="posttitle posttitle-search""><a href="<?php the_permalink() ?>" rel="bookmark" title="<?php printf(__('Permanent Link to %s','royale'),the_title('','',false)); ?>"><?php the_title(); ?></a></<?php echo $tag_posttitle_multi; ?>> <small><?php the_time('l, F jS, Y') ?></small> <?php if (get_option('royale_full_search_results')): ?> *************** *** 45,51 **** <?php else : ?> ! <h2 class="center"><?php _e('No posts found. Try a different search?','royale'); ?></h2> <p class="center"><?php _e('Sorry, no posts matched your search criteria. Please try and search again.','royale'); ?></p> <?php endif; ?> --- 48,54 ---- <?php else : ?> ! <<?php echo $tag_pagetitle; ?> class="center"><?php _e('No posts found. Try a different search?','royale'); ?></<?php echo $tag_pagetitle; ?>> <p class="center"><?php _e('Sorry, no posts matched your search criteria. Please try and search again.','royale'); ?></p> <?php endif; ?> *************** *** 53,63 **** </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(); --- 56,64 ---- </td> <?php ! if (get_option('royale_always_show_sidebars')) { ! include (TEMPLATEPATH . '/sidebar.php'); ! if (get_option('royale_3columns')) { include (TEMPLATEPATH . '/sidebar2.php'); } } get_footer(); diff -c royale-1.3/searchform.php royale-1.4/searchform.php *** royale-1.3/searchform.php 2007-04-28 18:40:41.000000000 -0400 --- royale-1.4/searchform.php 2007-11-04 10:08:44.000000000 -0500 *************** *** 1,5 **** <form method="get" id="searchform" action="<?php bloginfo('home'); ?>/"> <div><input type="text" value="<?php echo wp_specialchars($s, 1); ?>" name="s" id="s" /> ! <input type="image" id="searchsubmit" src="<?php echo get_bloginfo('stylesheet_directory'); ?>/images/1x1.gif" class="icon magnifier" /> </div> </form> --- 1,6 ---- + <?php global $dirs; ?> <form method="get" id="searchform" action="<?php bloginfo('home'); ?>/"> <div><input type="text" value="<?php echo wp_specialchars($s, 1); ?>" name="s" id="s" /> ! <input type="image" id="searchsubmit" src="<?php echo $dirs['www']['images']; ?>magnifier.png" class="png" /> </div> </form> diff -c royale-1.3/sidebar.php royale-1.4/sidebar.php *** royale-1.3/sidebar.php 2007-06-06 18:53:04.000000000 -0400 --- royale-1.4/sidebar.php 2007-11-04 16:16:40.000000000 -0500 *************** *** 1,5 **** <td id="sidebar1"> ! <ul class="sidebars"> <?php if (!function_exists('dynamic_sidebar') || !dynamic_sidebar('Sidebar 1')) : ?> <?php widget_royale_search(); ?> --- 1,8 ---- + <?php + $tag_sidebar = get_option('royale_tag_sidebar'); + ?> <td id="sidebar1"> ! <ul class="sidebars png"> <?php if (!function_exists('dynamic_sidebar') || !dynamic_sidebar('Sidebar 1')) : ?> <?php widget_royale_search(); ?> *************** *** 26,39 **** <?php } ?> ! <?php wp_list_pages('title_li=<h2>'. str_replace('&','%26',__('Pages','royale')) .'</h2>&sort_column=menu_order'); ?> ! <li><h2><?php _e('Categories','royale'); ?></h2> <ul> <?php wp_list_cats('sort_column=name&optioncount=1&hide_empty=0&hierarchical=1'); ?> </ul> </li> <?php /* If this is the frontpage */ if ( is_home() || is_page() ) { ?> <?php get_links_list(); ?> <?php } ?> --- 29,48 ---- <?php } ?> ! <?php wp_list_pages(array('title_li' => "<$tag_sidebar class=\"widgettitle\">". str_replace('&','%26',__('Pages','royale')) ."</$tag_sidebar>",'sort_column' => "menu_order")); ?> ! <li><<?php echo $tag_sidebar; ?> class="widgettitle"><?php _e('Categories','royale'); ?></<?php echo $tag_sidebar; ?>> <ul> <?php wp_list_cats('sort_column=name&optioncount=1&hide_empty=0&hierarchical=1'); ?> </ul> </li> + <?php if (function_exists('wp_tag_cloud')) { ?> + <li><<?php echo $tag_sidebar; ?> class="widgettitle"><?php _e('Tags','royale'); ?></<?php echo $tag_sidebar; ?>> + <?php wp_tag_cloud(); ?> + </li> + <?php } ?> + <?php /* If this is the frontpage */ if ( is_home() || is_page() ) { ?> <?php get_links_list(); ?> <?php } ?> diff -c royale-1.3/sidebar2.php royale-1.4/sidebar2.php *** royale-1.3/sidebar2.php 2007-06-06 18:53:27.000000000 -0400 --- royale-1.4/sidebar2.php 2007-11-04 10:33:27.000000000 -0500 *************** *** 1,5 **** <td id="sidebar2"> ! <ul class="sidebars"> <?php if (!function_exists('dynamic_sidebar') || !dynamic_sidebar('Sidebar 2')) : ?> <?php widget_royale_meta(); ?> --- 1,5 ---- <td id="sidebar2"> ! <ul class="sidebars png"> <?php if (!function_exists('dynamic_sidebar') || !dynamic_sidebar('Sidebar 2')) : ?> <?php widget_royale_meta(); ?> diff -c royale-1.3/single.php royale-1.4/single.php *** royale-1.3/single.php 2007-06-11 10:04:42.000000000 -0400 --- royale-1.4/single.php 2007-11-04 16:43:32.000000000 -0500 *************** *** 1,20 **** <?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="navigation"> ! <div class="alignleft"><?php previous_post_link(mkicon('book_previous','previous') .' %link'); ?></div> ! <div class="alignright"><?php next_post_link('%link '. mkicon('book_next','next')); ?></div> </div> <div class="post" id="post-<?php the_ID(); ?>"> --- 1,18 ---- <?php get_header(); ! ! $tag_posttitle_single = get_option('royale_tag_posttitle_single'); ! $tag_pagetitle = get_option('royale_tag_pagetitle' ); ! ! global $dirs; ?> <td id="content" class="<?php echo ($alwayssidebars ? 'narrow' : 'wide'); ?>column"> <?php if (have_posts()) : while (have_posts()) : the_post(); ?> <div class="navigation"> ! <div class="alignleft"><?php previous_post_link('<img src="'. $dirs['www']['images'] .'book_previous.png" class="png" alt="" /> %link'); ?></div> ! <div class="alignright"><?php next_post_link('%link <img src="'. $dirs['www']['images'] .'book_next.png" class="png" alt="" />'); ?></div> </div> <div class="post" id="post-<?php the_ID(); ?>"> *************** *** 24,35 **** <span class="calm"><?php the_time((get_option('royale_dates') ? 'd' : 'm')) ?></span> <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"> <?php the_content('<p class="serif">'. __('Read the rest of this entry','royale') .' »</p>'); ?> <?php link_pages('<p><strong>'. __('Pages','royale') .':</strong> ', '</p>', 'number'); ?> --- 22,39 ---- <span class="calm"><?php the_time((get_option('royale_dates') ? 'd' : 'm')) ?></span> <span class="caly"><?php the_time('Y') ?></span> </div> ! <?php if (!get_option('royale_no_animations')): ?> ! <span class="switch-post"> ! <a href="javascript:toggleSidebars();" class="switch-sidebars"><img src="<?php echo $dirs['www']['icons']; ?>bullet_sidebars_hide.png" alt="" class="png" /></a><a href="javascript:togglePost(<?php the_ID(); ?>);" id="switch-post-<?php the_ID(); ?>"><img src="<?php echo $dirs['www']['icons']; ?>bullet_toggle_minus.png" alt="" class="png" /></a> ! </span> ! <?php endif; ?> ! <<?php echo $tag_posttitle_single; ?> class="posttitle"><a href="<?php echo get_permalink() ?>" rel="bookmark" title="Permanent Link: <?php the_title(); ?>"><?php the_title(); ?></a></<?php echo $tag_posttitle_single; ?>> ! <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 if (function_exists('the_tags') && !get_option('royale_tags_after')) the_tags(', '. __('tags','royale') .': '); ?></small> </div> <div class="entry"> <?php the_content('<p class="serif">'. __('Read the rest of this entry','royale') .' »</p>'); ?> + <?php if (function_exists('the_tags') && get_option('royale_tags_after')) the_tags(); ?> <?php link_pages('<p><strong>'. __('Pages','royale') .':</strong> ', '</p>', 'number'); ?> *************** *** 74,84 **** </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(); --- 78,86 ---- </td> <?php ! if (get_option('royale_always_show_sidebars')) { ! include (TEMPLATEPATH . '/sidebar.php'); ! if (get_option('royale_3columns')) { include (TEMPLATEPATH . '/sidebar2.php'); } } get_footer(); diff -c royale-1.3/style.css royale-1.4/style.css *** royale-1.3/style.css 2007-06-18 12:25:19.000000000 -0400 --- royale-1.4/style.css 2007-11-04 10:10:08.000000000 -0500 *************** *** 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 28 languages! ! Version: 1.3 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 31 languages! ! Version: 1.4 Author: t0mmmmmmm Author URI: http://www.onehertz.com/portfolio/wordpress/ */ diff -c royale-1.3/style.css.php royale-1.4/style.css.php *** royale-1.3/style.css.php 2007-06-18 12:19:50.000000000 -0400 --- royale-1.4/style.css.php 2007-11-04 16:23:25.000000000 -0500 *************** *** 14,20 **** 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; --- 14,20 ---- 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_(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; *************** *** 28,34 **** 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'); $royale_sidebar2_left = get_option('royale_sidebar2_left'); $royale_nofloat = get_option('royale_nofloat'); --- 28,33 ---- *************** *** 38,44 **** $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; --- 37,43 ---- $royale_bgpattern = get_option('royale_bgpattern'); $royale_number_comments = get_option('royale_number_comments'); $stylesheet_directory = get_bloginfo('stylesheet_directory'); ! foreach (array('em_italics','nofloat','number_comments') as $a) { $a = 'royale_'. $a; if ($$a == 'on') $$a = 1; if ($$a == 'off') $$a = 0; *************** *** 52,60 **** $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); - $overlay = 'black_overlay_'. $royale_overlay_opacity .'.png'; ?> --- 51,56 ---- *************** *** 94,131 **** line-height: 1.5em; } ! h1, h2, h3, .inline-widgets h2, .inline-widgets #wp-calendar caption { font-family: 'Trebuchet MS', 'Lucida Grande', Verdana, Arial, Sans-Serif; font-weight: bold; font-size: 1.4em; } ! h1 { font-size: 4em; letter-spacing: -.05em; } ! h2, h3 { font-size: 1.6em; } ! .description { font-size: 1.2em; } ! .sidebars h2 { font-family: 'Lucida Grande', Verdana, Sans-Serif; font-size: 1.2em; } ! h1, h1 a, h1 a:hover, h1 a:visited, h2, h2 a, h2 a:visited, h3, h3 a, h3 a:visited, .description { text-decoration: none; color: #fff; border: none; } ! h2, h2 a, h2 a:hover, h2 a:visited, h3, h3 a, h3 a:hover, h3 a:visited, .sidebars h2, #wp-calendar caption, cite { ! text-decoration: none; ! border: none; ! } ! ! h2 a:hover { color: <?php echo $royale_rgb2; ?>; marks: none; } --- 90,128 ---- line-height: 1.5em; } ! h1, h2, h3, h4, h5, h6 { ! font-family: 'Trebuchet MS', 'Lucida Grande', Verdana, Arial, Sans-Serif; ! font-weight: bold; ! } ! ! #blogname, .posttitle, .inline-widgets h2, .inline-widgets #wp-calendar caption { font-family: 'Trebuchet MS', 'Lucida Grande', Verdana, Arial, Sans-Serif; font-weight: bold; font-size: 1.4em; } ! #blogname { font-size: 4em; letter-spacing: -.05em; } ! .posttitle, .pagetitle { font-size: 1.6em; } ! #blogdesc { font-size: 1.2em; } ! .widgettitle, .sidebars h2 { font-family: 'Lucida Grande', Verdana, Sans-Serif; font-size: 1.2em; } ! #blogname, #blogname a, #blogname a:hover, #blogname a:visited, #blogdesc, .pagetitle, .posttitle, .posttitle a, .posttitle a:hover, .posttitle a:visited, .widgettitle, .widgettitle a, .sidebars h2, #wp-calendar caption, cite { text-decoration: none; color: #fff; border: none; + font-weight: bold; } ! .posttitle a:hover { color: <?php echo $royale_rgb2; ?>; marks: none; } *************** *** 180,186 **** letter-spacing: .07em; } ! a, h2 a:hover, h3 a:hover { text-decoration: none; } #wp-calendar #prev a, #wp-calendar #next a { font-size: 9pt; } --- 177,183 ---- letter-spacing: .07em; } ! a, .posttitle a:hover { text-decoration: none; } #wp-calendar #prev a, #wp-calendar #next a { font-size: 9pt; } *************** *** 221,227 **** .pages a:hover { color: #fff; } ! .postinfo h2, .postinfo h3 { font-size: 1.7em; line-height: .9em; } --- 218,224 ---- .pages a:hover { color: #fff; } ! .posttitle { font-size: 1.7em; line-height: .9em; } *************** *** 259,274 **** text-align: left; width: 100%; 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; ?> height: 140px; position: relative; margin-bottom: 20px; } ! h1, .description { padding-left: 30px; } #page { margin-bottom: 20px; --- 256,267 ---- text-align: left; width: 100%; background: url(images/<?php echo $overlay; ?>); height: 140px; position: relative; margin-bottom: 20px; } ! #blogname, #blogdesc { padding-left: 30px; } #page { margin-bottom: 20px; *************** *** 293,316 **** .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); - 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; --- 286,302 ---- .sidebars { width: 210px; background: url(images/<?php echo $overlay; ?>); border: none; border-top: 2px solid #eee; border-bottom: 1px solid #eee; } .post { + position: relative; text-align: left; padding: 5px 15px; margin-bottom: 30px; background: url(images/<?php echo $overlay; ?>); border: none; border-top: 2px solid #eee; border-bottom: 1px solid #eee; *************** *** 332,338 **** margin: 5px 0px; } ! .postmetadata, .entry { clear: both; } #footer { margin: 0 auto; --- 318,324 ---- margin: 5px 0px; } ! .postmetadata, .entry, .clear { clear: both; } #footer { margin: 0 auto; *************** *** 346,367 **** padding: 10px 0 0 0; text-align: center; } /* End Structure */ /* Begin Headers */ ! h1 { padding-top: 15px; } ! h2.pagetitle { margin-top: 30px; text-align: center; } .sidebars h2 { margin: 5px 0 0 0; } ! h3#comments, h3#respond { font-size: 1.5em; margin: 40px auto 20px auto; } .commentlist li, .alt { --- 332,363 ---- padding: 10px 0 0 0; text-align: center; } + + .switch-post, .switch-post a, .switch-post a:hover, .switch-post a:visited { + width: 16px; + float: right; + position: relative; + right: -5px; + border: none; + } /* End Structure */ /* Begin Headers */ ! #blogname { padding-top: 15px; } ! .pagetitle { margin-top: 30px; text-align: center; } .sidebars h2 { margin: 5px 0 0 0; } ! #comments, #respond, #trackbacks { ! color: #fff; font-size: 1.5em; margin: 40px auto 20px auto; + font-weight: bold; } .commentlist li, .alt { *************** *** 374,379 **** --- 370,377 ---- /* Begin Images */ + .png, .post { behavior: url(<?php echo $stylesheet_directory; ?>/js/iepngfix.htc.php?blank=<?php echo $stylesheet_directory; ?>/images/1x1.gif); } + p img { max-width: 95%; } .entry img { *************** *** 624,630 **** .cal { display: inline; - padding: 1px; float: left; margin-right: 1em; } --- 622,627 ---- *************** *** 715,724 **** } .book_previous { filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='<?php echo $stylesheet_directory; ?>/images/book_previous.png', sizingMethod='scale'); } .book_next { filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='<?php echo $stylesheet_directory; ?>/images/book_next.png', sizingMethod='scale'); } - .comments { filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='<?php echo $stylesheet_directory; ?>/images/comments.png', sizingMethod='scale'); } - .magnifier { filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='<?php echo $stylesheet_directory; ?>/images/magnifier.png', sizingMethod='scale'); } - .page_edit { filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='<?php echo $stylesheet_directory; ?>/images/page_edit.png', sizingMethod='scale'); } - .rss { filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='<?php echo $stylesheet_directory; ?>/images/rss.png', sizingMethod='scale'); } <?php else: ?> .icon { width: 16px; --- 712,717 ---- *************** *** 743,751 **** /* 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; --- 736,744 ---- /* RTL scripts support */ .pages, #content, .sidebars, #footer { direction: rtl; } ! #blogname, #blogdesc, .pages, .postinfo, .entry, .postmetadata, #content #searchform, #respond, #commentform p, .sidebars, #wp-calendar caption { text-align: right; } ! #blogname, #blogdesc { padding-right: 30px; } .cal { float: right; *************** *** 754,760 **** } .entry img { ! float: <?php echo ($mandigo_nofloat ? 'none' : 'right'); ?>; margin: 3px 0 3px 10px; } --- 747,753 ---- } .entry img { ! float: <?php echo ($royale_nofloat ? 'none' : 'right'); ?>; margin: 3px 0 3px 10px; } *************** *** 801,804 **** margin: 3px 0 0 0; padding: 2px 0; } ! <?php endif; ?> --- 794,805 ---- margin: 3px 0 0 0; padding: 2px 0; } ! ! .switch-post { ! float: left; ! } ! <?php ! endif; ! // end of rtl scripts specific rules ! ?> ! Only in royale-1.3: style.css~ Only in royale-1.4: ua

diff -c royale-1.3/README.txt royale-1.4/README.txt *** royale-1.3/README.txt 2007-06-18 12:40:46.000000000 -0400 --- royale-1.4/README.txt 2007-11-04 16:49:20.000000000 -0500 *************** *** 29,34 **** --- 29,35 ---- Customize the theme at will, but please do not modify the credits in the footer. + === INSTALLATION ======================================================================= To add Royale to your WordPress installation, follow these basic steps: *************** *** 38,57 **** your theme in the wp-content/themes directory provided by WordPress (ie wp-content/themes/royale). 3. Upload the theme files to the new directory on your host server. ! 4. Follow the instructions below for selecting the new theme. ! 5. Log in to the WordPress Administration Panels. ! 6. Select the Presentation subpanel and click on the Royale screenshot. - === 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 --- 39,70 ---- your theme in the wp-content/themes directory provided by WordPress (ie wp-content/themes/royale). 3. Upload the theme files to the new directory on your host server. ! 4. Log in to the WordPress Administration Panels. ! 5. Select the Presentation subpanel and click on the Royale screenshot. ! ! ! ! === 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: ! http://www.onehertz.com/portfolio/wordpress/donate/ ! ! - 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! ! === 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 *************** *** 61,71 **** them here: http://automattic.com/code/widgets/ === SEO OPTIONS ======================================================================== ** Custom 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. --- 74,114 ---- them here: http://automattic.com/code/widgets/ + + === IMAGES IN POSTS ==================================================================== + + ** Alignment: + Text is set to wrap around images by default, however if you want to override this + behaviour, there is an option ("Do not wrap text around images") to disable it. + + If you want text to be wrapped around images but have problems with short paragraphs + messing up your posts, try adding the "clear" class to your p tag, i.e. + <p class="clear">. If you don't use <p>s, adding <br class="clear" /> between paragraphs + will do the trick as well. + + If you want to have an image float to the right, simply give it the "alignright" class, + i.e. <img src="..." alt="..." class="alignright" /> + + If you want to center an image, use the "centered" class instead, but this will only + work with non-floating images, i.e. the kind around which text does not wrap. + + If you want text to wrap around SOME images, let text wrapping enabled, and add + class="nowrap" to the img tags around which you don't want text to wrap, i.e. + <img class="nowrap" />. Adding this class to a block container will make all its child + images inherit this behaviour (useful for galleries). + + ** Border: + Images in posts are surrounded by a border by default. While it is possible to disable + them throughout the theme using the appropriate option, you can also override this + behaviour on certain images by adding the "noborder" class to the img tag. + + + === 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. Royale 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. *************** *** 80,85 **** --- 123,141 ---- 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. + ** Custom HTML tags + Another important factor to popular search engines is the use of keywords in headings, + particulary the h1 and h2 elements, so wrapping relevant content in them is a good idea. + + Since the title and description of your blog may or may not be relevant to your content, + Royale let's you choose which heading level you want to use for these elements. You can + also do the same thing to the title of posts in single and multiple views, and to the + title of some pages ('Search results', 'Archives', ..). + + Note that using a different kind of tag does not (should not, please report bugs) affect + the look and feel at all. + + === LOCALIZATION ======================================================================= *************** *** 93,128 **** Once you have the WordPress interface set in your language, the Royale .mo file will 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 --- 149,176 ---- Once you have the WordPress interface set in your language, the Royale .mo file will be loaded automatically, provided it exists. + If Royale has not been translated in your language and you are interested in helping + with translation, please let me know by sending an email to tom@onehertz.com ! .po files are available at http://www.onehertz.com/portfolio/wordpress/mandigo/l10n/ ! === CREDITS ============================================================================ + ** Translation Credits Arabic: Maxer Bahasa Indonesia: Benny Wu + Bulgarian: Canko Balkanski Catalan: Sergi Barroso Chinese (Simplified): Hua Zhou Chinese (Traditional): Charles Low + Croatian: Ivana Pavic Czech: Milan Tucek Danish: Daniel Noesgaard Rasmussen Dutch: Ramsy de Vos ! French: Michel Bibal, David Sahli ! German: Michael Nickel, Ted Box Greek: Andrew Kontokanis Hebrew: Omry Yadan Hungarian: Horvath Zoltan *************** *** 134,164 **** 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/ ! ! 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 ! ! ! === IMAGE CREDITS ====================================================================== ! ! Icons by famfamfam: http://www.famfamfam.com/lab/icons/silk/ ! Background patters: - default: enspia, http://enspia.deviantart.com/ - asphalt: oonerspism, http://oonerspism.deviantart.com/ - bricks, kafeleczki: PoProstuBono, http://poprostubono.deviantart.com/ === CHANGELOG ========================================================================== 1.3 + language: Arabic (ar) + language: Bahasa Indonesia (id_ID) --- 182,231 ---- Maltese: James Cauchi Norwegian: Torbjorn Blystad Polish: Mateusz Baran ! Portuguese (PT): Rodrigo Neves ! Portuguese (BR): 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 + Ukrainian: Gabriel Korzhos ! ** Image Credits ! Icons by Mark James: http://www.famfamfam.com/lab/icons/silk/ ! Background patterns: - default: enspia, http://enspia.deviantart.com/ - asphalt: oonerspism, http://oonerspism.deviantart.com/ - bricks, kafeleczki: PoProstuBono, http://poprostubono.deviantart.com/ + ** Other Credits + "IE5.5+ PNG Alpha Fix" by Angus Turnbull: http://www.twinhelix.com + "jQuery" by John Resig: http://www.jquery.com + + === CHANGELOG ========================================================================== + 1.4 + + language: Bulgarian (bg_BG) + + language: Croatian (hr) + + language: Portuguese (pt_PT) + + language: Ukrainian (ua_UA) + + added support for WP 2.3 tags + + added options to select the heading level (h1-h6, div) of some important elements + like the blog name & desc, title of posts, ... + + added an option to display allowed XHTML tags above the comment field + + automatically load favicon.ico if it exists in the theme directory + * grammar fixes: French (fr_FR) + * language: switched to formal German, now using 'Sie' instead of 'Du' + * sidebars now appear after the content in the HTML code (better SEO) + * PNG transparency in IE is now handled by iepngfix.htc + * fixed RSS feed links + * fixed the README page not showing up correctly + * fixed empty uls validation errors on the front page (WP2.2+) + * fixed duplicate ids validation errors in archives and search results + 1.3 + language: Arabic (ar) + language: Bahasa Indonesia (id_ID) Only in royale-1.4: ar.mo diff -c royale-1.3/archive.php royale-1.4/archive.php *** royale-1.3/archive.php 2007-06-11 10:13:57.000000000 -0400 --- royale-1.4/archive.php 2007-11-04 16:43:21.000000000 -0500 *************** *** 1,38 **** <?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()) : ?> ! <?php $post = $posts[0]; // Hack. Set $post so that the_date() works. ?> ! <?php /* If this is a category archive */ if (is_category()) { ?> ! <h2 class="pagetitle"><?php printf(__('Archive for the %s Category','royale'),single_cat_title('',false)); ?></h2> ! <?php /* If this is a daily archive */ } elseif (is_day()) { ?> ! <h2 class="pagetitle"><?php printf(__('Archive for %s','royale'),get_the_time(__('F jS, Y','royale'))); ?></h2> ! <?php /* If this is a monthly archive */ } elseif (is_month()) { ?> ! <h2 class="pagetitle"><?php printf(__('Archive for %s','royale'),get_the_time(__('F, Y','royale'))); ?></h2> ! <?php /* If this is a yearly archive */ } elseif (is_year()) { ?> ! <h2 class="pagetitle"><?php printf(__('Archive for %s','royale'),get_the_time('Y')); ?></h2> ! <?php /* If this is a search */ } elseif (is_search()) { ?> ! <h2 class="pagetitle"><?php _e('Search Results','royale'); ?></h2> ! <?php /* If this is an author archive */ } elseif (is_author()) { ?> ! <h2 class="pagetitle"><?php _e('Author Archive','royale'); ?></h2> ! <?php /* If this is a paged archive */ } elseif (isset($_GET['paged']) && !empty($_GET['paged'])) { ?> ! <h2 class="pagetitle"><?php _e('Blog Archives','royale'); ?></h2> <?php } ?> --- 1,39 ---- <?php + global $dirs; + get_header(); ! ! $tag_posttitle_multi = get_option('royale_tag_posttitle_multi'); ! $tag_pagetitle = get_option('royale_tag_pagetitle' ); ?> <td id="content" class="<?php echo ($alwayssidebars ? 'narrow' : 'wide'); ?>column"> <?php if (have_posts()) : ?> ! <?php $post = $posts[0]; // Hack. Set $post so that the_date() works. ?> ! <?php if (is_category()) { ?> ! <<?php echo $tag_pagetitle; ?> class="pagetitle"><?php printf(__('Archive for the %s Category','royale'),single_cat_title('',false)); ?></<?php echo $tag_pagetitle; ?>> ! ! <?php } elseif(function_exists(is_tag) && is_tag() ) { ?> ! <<?php echo $tag_pagetitle; ?> class="pagetitle"><?php printf(__('Posts Tagged %s','royale'),'“'. single_tag_title('',false) .'”'); ?></<?php echo $tag_pagetitle; ?>> ! <?php } elseif (is_day()) { ?> ! <<?php echo $tag_pagetitle; ?> class="pagetitle"><?php printf(__('Archive for %s','royale'),get_the_time(__('F jS, Y','royale'))); ?></<?php echo $tag_pagetitle; ?>> ! <?php } elseif (is_month()) { ?> ! <<?php echo $tag_pagetitle; ?> class="pagetitle"><?php printf(__('Archive for %s','royale'),get_the_time(__('F, Y','royale'))); ?></<?php echo $tag_pagetitle; ?>> ! <?php } elseif (is_year()) { ?> ! <<?php echo $tag_pagetitle; ?> class="pagetitle"><?php printf(__('Archive for %s','royale'),get_the_time('Y')); ?></<?php echo $tag_pagetitle; ?>> ! <?php } elseif (is_search()) { ?> ! <<?php echo $tag_pagetitle; ?> class="pagetitle"><?php _e('Search Results','royale'); ?></<?php echo $tag_pagetitle; ?>> ! <?php } elseif (is_author()) { ?> ! <<?php echo $tag_pagetitle; ?> class="pagetitle"><?php _e('Author Archive','royale'); ?></<?php echo $tag_pagetitle; ?>> ! <?php } elseif (isset($_GET['paged']) && !empty($_GET['paged'])) { ?> ! <<?php echo $tag_pagetitle; ?> class="pagetitle"><?php _e('Blog Archives','royale'); ?></<?php echo $tag_pagetitle; ?>> <?php } ?> *************** *** 50,64 **** <span class="calm"><?php the_time((get_option('royale_dates') ? 'd' : 'm')) ?></span> <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"> <?php the_content() ?> </div> ! <p class="postmetadata"><?php echo mkicon('comments','Comments'); ?> <?php comments_popup_link(__('No Comments','royale'). ' »', __('1 Comment','royale'). ' »', __('% Comments','royale'). ' »'); ?></p> </div> --- 51,71 ---- <span class="calm"><?php the_time((get_option('royale_dates') ? 'd' : 'm')) ?></span> <span class="caly"><?php the_time('Y') ?></span> </div> ! <?php if (!get_option('royale_no_animations')): ?> ! <span class="switch-post"> ! <a href="javascript:toggleSidebars();" class="switch-sidebars"><img src="<?php echo $dirs['www']['icons']; ?>bullet_sidebars_hide.png" alt="" class="png" /></a><a href="javascript:togglePost(<?php the_ID(); ?>);" id="switch-post-<?php the_ID(); ?>"><img src="<?php echo $dirs['www']['icons']; ?>bullet_toggle_minus.png" alt="" class="png" /></a> ! </span> ! <?php endif; ?> ! <<?php echo $tag_posttitle_multi; ?> class="posttitle posttitle-archive"><a href="<?php the_permalink() ?>" rel="bookmark" title="<?php printf(__('Permanent Link to %s','royale'),the_title('','',false)); ?>"><?php the_title(); ?></a></<?php echo $tag_posttitle_multi; ?>> ! <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 if (function_exists('the_tags') && !get_option('royale_tags_after')) the_tags(', '. __('tags','royale') .': '); ?><?php edit_post_link(__('Edit','royale'), ' - <img src="'. $dirs['www']['images'] .'page_edit.png" class="png" alt="" /> ', ''); ?> </small> </div> <div class="entry"> <?php the_content() ?> + <?php if (function_exists('the_tags') && get_option('royale_tags_after')) the_tags(); ?> </div> ! <p class="postmetadata"><img src="<?php echo $dirs['www']['images']; ?>comments.png" class="png" alt="" /> <?php comments_popup_link(__('No Comments','royale'). ' »', __('1 Comment','royale'). ' »', __('% Comments','royale'). ' »'); ?></p> </div> *************** *** 71,89 **** <?php else : ?> ! <h2 class="center"><?php _e('Not Found','royale'); ?></h2> ! <p class="center"><?php _e('Sorry, but you are looking for something that isn\'t here','royale'); ?>.</p> <?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(); --- 78,94 ---- <?php else : ?> ! <<?php echo $tag_pagetitle; ?> class="pagetitle"><?php _e('Not Found','royale'); ?></<?php echo $tag_pagetitle; ?>> ! <p><?php _e('Sorry, but you are looking for something that isn\'t here','royale'); ?>.</p> <?php endif; ?> </td> <?php ! if (get_option('royale_always_show_sidebars')) { ! include (TEMPLATEPATH . '/sidebar.php'); ! if (get_option('royale_3columns')) { include (TEMPLATEPATH . '/sidebar2.php'); } } get_footer(); diff -c royale-1.3/archives.php royale-1.4/archives.php *** royale-1.3/archives.php 2007-06-11 17:39:11.000000000 -0400 --- royale-1.4/archives.php 2007-11-04 16:17:48.000000000 -0500 *************** *** 5,46 **** ?> <?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(); --- 5,38 ---- ?> <?php get_header(); + $tag_pagetitle = get_option('royale_tag_pagetitle' ); + ?> + <td id="content" class="narrowcolumn"> <div class="post"> <div class="entry"> ! ! <<?php echo $tag_pagetitle; ?> class="posttitle"><?php _e('Search','royale'); ?></<?php echo $tag_pagetitle; ?>> <?php include (TEMPLATEPATH . '/searchform.php'); ?> ! <<?php echo $tag_pagetitle; ?> class="posttitle"><?php _e('Archives by Month','royale'); ?></<?php echo $tag_pagetitle; ?>> <ul> <?php wp_get_archives('type=monthly'); ?> </ul> ! <<?php echo $tag_pagetitle; ?> class="posttitle"><?php _e('Archives by Subject','royale'); ?></<?php echo $tag_pagetitle; ?>> <ul> <?php wp_list_cats(); ?> </ul> </div> </div> </td> <?php ! if (get_option('royale_always_show_sidebars')) { ! include (TEMPLATEPATH . '/sidebar.php'); ! if (get_option('royale_3columns')) { include (TEMPLATEPATH . '/sidebar2.php'); } } get_footer(); diff -c royale-1.3/attachment.php royale-1.4/attachment.php *** royale-1.3/attachment.php 2007-06-11 10:15:54.000000000 -0400 --- royale-1.4/attachment.php 2007-11-04 16:18:00.000000000 -0500 *************** *** 1,25 **** <?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="navigation"> ! <div class="alignleft"> </div> ! <div class="alignright"> </div> ! </div> ! <?php $attachment_link = get_the_attachment_link($post->ID, true, array(450, 800)); // This also populates the iconsize for the next line ?> ! <?php $_post = &get_post($post->ID); $classname = ($_post->iconsize[0] <= 128 ? 'small' : '') . 'attachment'; // This lets us style narrow icons specially ?> <div class="post" id="post-<?php the_ID(); ?>"> ! <h2><a href="<?php echo get_permalink($post->post_parent); ?>" rev="attachment"><?php echo get_the_title($post->post_parent); ?></a> » <a href="<?php echo get_permalink() ?>" rel="bookmark" title="Permanent Link: <?php the_title(); ?>"><?php the_title(); ?></a></h2> <div class="entry"> <p class="<?php echo $classname; ?>"><?php echo $attachment_link; ?><br /><?php echo basename($post->guid); ?></p> --- 1,16 ---- <?php get_header(); ! ! $tag_pagetitle = get_option('royale_tag_pagetitle' ); ?> <td id="content" class="<?php echo ($alwayssidebars ? 'narrow' : 'wide'); ?>column"> ! <?php if (have_posts()) : while (have_posts()) : the_post(); ?> ! <?php $attachment_link = get_the_attachment_link($post->ID, true, array(450, 800)); // This also populates the iconsize for the next line ?> ! <?php $_post = &get_post($post->ID); $classname = ($_post->iconsize[0] <= 128 ? 'small' : '') . 'attachment'; // This lets us style narrow icons specially ?> <div class="post" id="post-<?php the_ID(); ?>"> ! <<?php echo $tag_pagetitle; ?> class="pagetitle"><a href="<?php echo get_permalink($post->post_parent); ?>" rev="attachment"><?php echo get_the_title($post->post_parent); ?></a> » <a href="<?php echo get_permalink() ?>" rel="bookmark" title="Permanent Link: <?php the_title(); ?>"><?php the_title(); ?></a></<?php echo $tag_pagetitle; ?>> <div class="entry"> <p class="<?php echo $classname; ?>"><?php echo $attachment_link; ?><br /><?php echo basename($post->guid); ?></p> *************** *** 63,73 **** </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(); --- 54,62 ---- </td> <?php ! if (get_option('royale_always_show_sidebars')) { ! include (TEMPLATEPATH . '/sidebar.php'); ! if (get_option('royale_3columns')) { include (TEMPLATEPATH . '/sidebar2.php'); } } get_footer(); Only in royale-1.4: bg_BG.mo Binary files royale-1.3/ca_ES.mo and royale-1.4/ca_ES.mo differ diff -c royale-1.3/comments.php royale-1.4/comments.php *** royale-1.3/comments.php 2007-06-18 11:24:46.000000000 -0400 --- royale-1.4/comments.php 2007-11-04 15:27:10.000000000 -0500 *************** *** 22,72 ****  <?php if ($comments) : ?> ! <h3 id="comments"><?php comments_number(__('No Responses to ','royale'), __('One Response to ','royale'), __('% Responses to ','royale')); ?> “<?php the_title(); ?>”</h3> ! <ol class="commentlist"> ! ! <?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') : ?> ! <em><?php _e('Your comment is awaiting moderation.','royale'); ?></em> ! <?php endif; ?> ! <br /> ! <small class="commentmetadata"><a href="#comment-<?php comment_ID() ?>" title=""><?php printf(__('%s at %s','royale'),get_comment_date('F jS, Y'),get_comment_time()); ?></a> <?php edit_comment_link('e','',''); ?></small> ! <?php comment_text() ?> ! </li> ! ! <?php /* Changes every other comment to a different class */ ! if ('alt' == $oddcomment) $oddcomment = ''; ! else $oddcomment = 'alt'; ! ?> ! ! <?php endforeach; /* end for each comment */ ?> </ol> ! <?php else : // this is displayed if there are no comments so far ?> ! <?php if ('open' == $post->comment_status) : ?> !  ! ! <?php else : // comments are closed ?> !  <p class="nocomments"><?php _e('Comments are closed.','royale'); ?></p> ! <?php endif; ?> ! <?php endif; ?> ! ! <?php if ('open' == $post->comment_status) : ?> ! <h3 id="respond"><?php _e('Leave a Reply','royale'); ?></h3> <?php if ( get_option('comment_registration') && !$user_ID ) : ?> <p><?php _e('You must be logged in to post a comment.','royale'); ?> <a href="<?php echo get_option('siteurl'); ?>/wp-login.php?redirect_to=<?php the_permalink(); ?>"><?php _e('Login','royale'); ?> »</a></p> --- 22,91 ----  <?php if ($comments) : ?> ! <div id="comments"><?php comments_number(__('No Responses to ','royale'), __('One Response to ','royale'), __('% Responses to ','royale')); ?> “<?php the_title(); ?>”</div> ! <?php ! foreach ($comments as $comment): ! $comment_list_item = sprintf(' ! <li class="%s%s" id="comment-%s"> ! <cite>%s</cite> ! %s<br /> ! <small class="commentmetadata"><a href="#comment-%s" title="">%s</a> %s</small> ! %s ! </li>', ! $oddcomment, ! ($authorcomments && get_comment_author() == $the_author ? ' authorcomment' : ''), ! get_comment_ID(), ! sprintf(__('%s says:','royale'),get_comment_author_link()), ! ($comment->comment_approved == '0' ? '<em>'. __('Your comment is awaiting moderation.','royale') .'</em>' : ''), ! get_comment_ID(), ! sprintf(__('%s at %s','royale'),get_comment_date(__('F jS, Y','royale')),get_comment_time()), ! ' - '. apply_filters('edit_comment_link', '<a href="'. get_edit_comment_link() .'">'. __('Edit','royale') .'</a>', $comment->comment_ID), ! apply_filters('comment_text', get_comment_text()) ! ); ! ! if (get_option('royale_trackbacks_after') && $comment->comment_type == 'trackback'): ! $trackback_list .= $comment_list_item; ! else: ! $comment_list .= $comment_list_item; ! endif; ! if ('alt' == $oddcomment) $oddcomment = ''; ! else $oddcomment = 'alt'; ! endforeach; ! ?> + <ol class="commentlist"> + <?php echo $comment_list; ?> </ol> ! <?php ! if (get_option('royale_trackbacks_after') && $trackback_list): ! ?> ! <div id="trackbacks"><?php _e('Trackbacks','royale'); ?></div> ! <ol class="commentlist"> ! <?php echo $trackback_list; ?> ! </ol> ! <?php ! endif; ! else: // this is displayed if there are no comments so far ! ! if ('open' == $post->comment_status): // If comments are open, but there are no comments. ! else : // if comments are closed ! ?> <p class="nocomments"><?php _e('Comments are closed.','royale'); ?></p> ! <?php ! endif; ! endif; ! if ('open' == $post->comment_status): ! ?> ! <div id="respond"><?php _e('Leave a Reply','royale'); ?></div> <?php if ( get_option('comment_registration') && !$user_ID ) : ?> <p><?php _e('You must be logged in to post a comment.','royale'); ?> <a href="<?php echo get_option('siteurl'); ?>/wp-login.php?redirect_to=<?php the_permalink(); ?>"><?php _e('Login','royale'); ?> »</a></p> *************** *** 91,97 **** <?php endif; ?> !  <p><textarea name="comment" id="comment" cols="100%" rows="10" tabindex="4"></textarea></p> --- 110,118 ---- <?php endif; ?> ! <?php if (get_option('royale_xhtml_comments')): ?> ! <p><small><strong>XHTML:</strong> <?php _e('You can use these tags:','royale'); ?> <?php echo allowed_tags(); ?></small></p> ! <?php endif; ?> <p><textarea name="comment" id="comment" cols="100%" rows="10" tabindex="4"></textarea></p> Binary files royale-1.3/de_DE.mo and royale-1.4/de_DE.mo differ diff -c royale-1.3/footer.php royale-1.4/footer.php *** royale-1.3/footer.php 2007-06-11 11:40:52.000000000 -0400 --- royale-1.4/footer.php 2007-11-04 16:29:04.000000000 -0500 *************** *** 13,19 **** */ ! global $wpmu; ?> </tr> </table> --- 13,19 ---- */ ! global $dirs, $wpmu; ?> </tr> </table> *************** *** 28,40 **** <?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')): ?> <br /><?php echo get_num_queries(); ?> queries. <?php timer_stop(1); ?> seconds. <?php endif; ?> </p> </div> <?php wp_footer(); ?> </body> --- 28,127 ---- <?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 /><img src="<?php echo $dirs['www']['images']; ?>rss.png" class="png" alt="" /> <a href="<?php bloginfo('rss2_url'); ?>"><?php _e('Entries (RSS)','royale'); ?></a> ! <?php _e('and','royale'); ?> <img src="<?php echo $dirs['www']['images']; ?>rss.png" class="png" alt="" /> <a href="<?php bloginfo('comments_rss2_url'); ?>"><?php _e('Comments (RSS)','royale'); ?></a>. <?php if (get_option('royale_footer_stats')): ?> <br /><?php echo get_num_queries(); ?> queries. <?php timer_stop(1); ?> seconds. <?php endif; ?> </p> </div> + <script type="text/javascript"> +  + </script> <?php wp_footer(); ?> </body> Binary files royale-1.3/fr_FR.mo and royale-1.4/fr_FR.mo differ diff -c royale-1.3/functions.php royale-1.4/functions.php *** royale-1.3/functions.php 2007-06-18 12:38:44.000000000 -0400 --- royale-1.4/functions.php 2007-11-04 16:25:20.000000000 -0500 *************** *** 1,12 **** <?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)' ); --- 1,17 ---- <?php load_theme_textdomain('royale'); + // directories + $dirs = array(); + $dirs['loc']['theme'] = TEMPLATEPATH ."/"; + $dirs['www']['theme'] = get_bloginfo('template_directory') ."/"; + + foreach(array('loc','www') as $i) { + foreach(array('images','js','images/patterns','images/icons') as $j) { + $dirs[$i][preg_replace('/.+\//','',$j)] = $dirs[$i]['theme'].$j.'/'; + } + } + // 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)' ); *************** *** 21,26 **** --- 26,38 ---- if (!get_option('royale_title_scheme_date' )) update_option('royale_title_scheme_date' ,'%blogname% » Archive for %date%'); if (!get_option('royale_title_scheme_search' )) update_option('royale_title_scheme_search' ,'%blogname% » Search Results for "%search%"'); + if (!get_option('royale_tag_blogname' )) update_option('royale_tag_blogname' ,'h1'); + if (!get_option('royale_tag_blogdesc' )) update_option('royale_tag_blogdesc' ,'h6'); + if (!get_option('royale_tag_posttitle_multi' )) update_option('royale_tag_posttitle_multi' ,'h2'); + if (!get_option('royale_tag_posttitle_single' )) update_option('royale_tag_posttitle_single' ,'h2'); + if (!get_option('royale_tag_pagetitle' )) update_option('royale_tag_pagetitle' ,'h2'); + if (!get_option('royale_tag_sidebar' )) update_option('royale_tag_sidebar' ,'h2'); + // some global vars *************** *** 29,42 **** $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> --- 41,60 ---- $wpmu = function_exists('is_site_admin'); ! // Register sidebars ! $tag_sidebar = get_option('royale_tag_sidebar'); ! if (function_exists('register_sidebar')) { ! register_sidebar(array('before_title' => "<$tag_sidebar class=\"widgettitle\">", 'after_title' => "</$tag_sidebar>\n")); ! register_sidebar(array('before_title' => "<$tag_sidebar class=\"widgettitle\">", 'after_title' => "</$tag_sidebar>\n")); ! register_sidebar(array('before_title' => "<$tag_sidebar class=\"widgettitle\">", 'after_title' => "</$tag_sidebar>\n", 'name' => 'Royale Top')); ! register_sidebar(array('before_title' => "<$tag_sidebar class=\"widgettitle\">", 'after_title' => "</$tag_sidebar>\n", 'name' => 'Royale Bottom')); } ! /* ------------------------------------------------- ! SEARCH WIDGET ! -------------------------------------------------- */ function widget_royale_search() { ?> <li><h2><?php _e('Search','royale'); ?></h2> *************** *** 49,55 **** ! // CALENDAR WIDGET function widget_royale_calendar() { ?> <li><h2> </h2> --- 67,76 ---- ! ! /* ------------------------------------------------- ! CALENDAR WIDGET ! -------------------------------------------------- */ function widget_royale_calendar() { ?> <li><h2> </h2> *************** *** 62,69 **** ! // META WIDGET function widget_royale_meta() { $options = get_option('widget_meta'); $title = empty($options['title']) ? __('Meta','royale') : $options['title']; ?> --- 83,94 ---- ! ! /* ------------------------------------------------- ! META WIDGET ! -------------------------------------------------- */ function widget_royale_meta() { + global $dirs; $options = get_option('widget_meta'); $title = empty($options['title']) ? __('Meta','royale') : $options['title']; ?> *************** *** 71,77 **** <ul> <?php wp_register(); ?> <li><?php wp_loginout(); ?></li> ! <li><a href="feed:<?php bloginfo('rss2_url'); ?>" title="RSS feed for <?php bloginfo('name'); ?>">Entries</a> <?php echo mkicon('rss absolute',''); ?></li> <li><a href="http://wordpress.org/" title="Powered by WordPress, state-of-the-art semantic personal publishing platform.">WordPress</a></li> <li><a href="http://www.onehertz.com/portfolio/wordpress/" title="Other Wordpress themes by the same author" target="_blank">Royale theme</a></li> <?php wp_meta(); ?> --- 96,102 ---- <ul> <?php wp_register(); ?> <li><?php wp_loginout(); ?></li> ! <li><a href="feed:<?php bloginfo('rss2_url'); ?>" title="RSS feed for <?php bloginfo('name'); ?>">Entries</a> <img src="<?php echo $dirs['www']['images']; ?>rss.png" class="png absolute" alt="" /></li> <li><a href="http://wordpress.org/" title="Powered by WordPress, state-of-the-art semantic personal publishing platform.">WordPress</a></li> <li><a href="http://www.onehertz.com/portfolio/wordpress/" title="Other Wordpress themes by the same author" target="_blank">Royale theme</a></li> <?php wp_meta(); ?> *************** *** 84,97 **** ! // 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); } --- 109,150 ---- ! /* ------------------------------------------------- ! THEME OPTIONS PAGES ! -------------------------------------------------- */ 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() { ! global $dirs; ! add_theme_page( ! 'Theme Options', ! '<img src="'. $dirs['www']['images'] .'/attention_catcher.png" alt="" /> Theme Options', ! 'edit_themes', ! basename(__FILE__), ! 'royale_options_page' ! ); ! } ! function add_royale_inserts_page() { ! global $dirs; ! add_theme_page( ! 'HTML Inserts', ! '<img src="'. $dirs['www']['images'] .'/attention_catcher.png" alt="" /> 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); } *************** *** 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')); --- 168,204 ---- } 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('xhtml_comments' ,$_POST['xhtmlcomments'] ); ! 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'] )); ! royale_set_var('tag_blogname' ,$_POST['tag_blogname'] ); ! royale_set_var('tag_blogdesc' ,$_POST['tag_blogdesc'] ); ! royale_set_var('tag_posttitle_multi' ,$_POST['tag_posttitle_multi'] ); ! royale_set_var('tag_posttitle_single' ,$_POST['tag_posttitle_single'] ); ! royale_set_var('tag_pagetitle' ,$_POST['tag_pagetitle'] ); ! royale_set_var('tag_sidebar' ,$_POST['tag_sidebar'] ); ! royale_set_var('tags_after' ,$_POST['tags_after'] ); ! royale_set_var('trackbacks_after' ,$_POST['trackbacksafter'] ); } $dates = get_option('royale_dates' ); $exclude = split(",",get_option('royale_exclude_pages')); *************** *** 146,151 **** --- 208,220 ---- $overlay_opacity = get_option('royale_overlay_opacity'); $bgpattern = get_option('royale_bgpattern' ); + $tag_blogname = get_option('royale_tag_blogname' ); + $tag_blogdesc = get_option('royale_tag_blogdesc' ); + $tag_posttitle_multi = get_option('royale_tag_posttitle_multi' ); + $tag_posttitle_single = get_option('royale_tag_posttitle_single' ); + $tag_pagetitle = get_option('royale_tag_pagetitle' ); + $tag_sidebar = get_option('royale_tag_sidebar' ); + $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 />'; } *************** *** 159,165 **** } 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> --- 228,234 ---- } 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 '. (rand(0,1) ? '<strong>making a donation</strong>' : 'making a donation') .'.</a></p> <div class="wrap"> <h2>Royale Options</h2> *************** *** 206,211 **** --- 275,281 ---- '. $patterns .' </fieldset> + <br/> <fieldset class="options"> <legend>SEO Options</legend> *************** *** 238,243 **** --- 308,403 ---- <td><input type="text" name="title_scheme_search" size="60" value="'. get_option('royale_title_scheme_search') .'" /></td> </tr> </table> + <br /> + + <label><b>Custom header levels</b></label><br/> + Customize which tags you want to use for the blog name, blog description, posts title, ... This does not affect styles. + <table> + <tr> + <td style="text-align: right;">Blog name:</td> + <td> + <select name="tag_blogname"> + <option value="h1"'. ($tag_blogname == 'h1' ? ' selected="selected"' : '') .'>h1</option> + <option value="h2"'. ($tag_blogname == 'h2' ? ' selected="selected"' : '') .'>h2</option> + <option value="h3"'. ($tag_blogname == 'h3' ? ' selected="selected"' : '') .'>h3</option> + <option value="h4"'. ($tag_blogname == 'h4' ? ' selected="selected"' : '') .'>h4</option> + <option value="h5"'. ($tag_blogname == 'h5' ? ' selected="selected"' : '') .'>h5</option> + <option value="h6"'. ($tag_blogname == 'h6' ? ' selected="selected"' : '') .'>h6</option> + <option value="div"'. ($tag_blogname == 'div' ? ' selected="selected"' : '') .'>div</option> + </select> + </td> + </tr> + <tr> + <td style="text-align: right;">Blog description (tagline):</td> + <td> + <select name="tag_blogdesc"> + <option value="h1"'. ($tag_blogdesc == 'h1' ? ' selected="selected"' : '') .'>h1</option> + <option value="h2"'. ($tag_blogdesc == 'h2' ? ' selected="selected"' : '') .'>h2</option> + <option value="h3"'. ($tag_blogdesc == 'h3' ? ' selected="selected"' : '') .'>h3</option> + <option value="h4"'. ($tag_blogdesc == 'h4' ? ' selected="selected"' : '') .'>h4</option> + <option value="h5"'. ($tag_blogdesc == 'h5' ? ' selected="selected"' : '') .'>h5</option> + <option value="h6"'. ($tag_blogdesc == 'h6' ? ' selected="selected"' : '') .'>h6</option> + <option value="div"'. ($tag_blogdesc == 'div' ? ' selected="selected"' : '') .'>div</option> + </select> + </td> + </tr> + <tr> + <td style="text-align: right;">Post title (when showing multiple posts):</td> + <td> + <select name="tag_posttitle_multi"> + <option value="h1"'. ($tag_posttitle_multi == 'h1' ? ' selected="selected"' : '') .'>h1</option> + <option value="h2"'. ($tag_posttitle_multi == 'h2' ? ' selected="selected"' : '') .'>h2</option> + <option value="h3"'. ($tag_posttitle_multi == 'h3' ? ' selected="selected"' : '') .'>h3</option> + <option value="h4"'. ($tag_posttitle_multi == 'h4' ? ' selected="selected"' : '') .'>h4</option> + <option value="h5"'. ($tag_posttitle_multi == 'h5' ? ' selected="selected"' : '') .'>h5</option> + <option value="h6"'. ($tag_posttitle_multi == 'h6' ? ' selected="selected"' : '') .'>h6</option> + <option value="div"'. ($tag_posttitle_multi == 'div' ? ' selected="selected"' : '') .'>div</option> + </select> + </td> + </tr> + <tr> + <td style="text-align: right;">Post title (single post view):</td> + <td> + <select name="tag_posttitle_single"> + <option value="h1"'. ($tag_posttitle_single == 'h1' ? ' selected="selected"' : '') .'>h1</option> + <option value="h2"'. ($tag_posttitle_single == 'h2' ? ' selected="selected"' : '') .'>h2</option> + <option value="h3"'. ($tag_posttitle_single == 'h3' ? ' selected="selected"' : '') .'>h3</option> + <option value="h4"'. ($tag_posttitle_single == 'h4' ? ' selected="selected"' : '') .'>h4</option> + <option value="h5"'. ($tag_posttitle_single == 'h5' ? ' selected="selected"' : '') .'>h5</option> + <option value="h6"'. ($tag_posttitle_single == 'h6' ? ' selected="selected"' : '') .'>h6</option> + <option value="div"'. ($tag_posttitle_single == 'div' ? ' selected="selected"' : '') .'>div</option> + </select> + </td> + </tr> + <tr> + <td style="text-align: right;">Page title (\'Archives\', \'Search Results\'):</td> + <td> + <select name="tag_pagetitle"> + <option value="h1"'. ($tag_pagetitle == 'h1' ? ' selected="selected"' : '') .'>h1</option> + <option value="h2"'. ($tag_pagetitle == 'h2' ? ' selected="selected"' : '') .'>h2</option> + <option value="h3"'. ($tag_pagetitle == 'h3' ? ' selected="selected"' : '') .'>h3</option> + <option value="h4"'. ($tag_pagetitle == 'h4' ? ' selected="selected"' : '') .'>h4</option> + <option value="h5"'. ($tag_pagetitle == 'h5' ? ' selected="selected"' : '') .'>h5</option> + <option value="h6"'. ($tag_pagetitle == 'h6' ? ' selected="selected"' : '') .'>h6</option> + <option value="div"'. ($tag_pagetitle == 'div' ? ' selected="selected"' : '') .'>div</option> + </select> + </td> + </tr> + <tr> + <td style="text-align: right;">Widget title:</td> + <td> + <select name="tag_sidebar"> + <option value="h1"'. ($tag_sidebar == 'h1' ? ' selected="selected"' : '') .'>h1</option> + <option value="h2"'. ($tag_sidebar == 'h2' ? ' selected="selected"' : '') .'>h2</option> + <option value="h3"'. ($tag_sidebar == 'h3' ? ' selected="selected"' : '') .'>h3</option> + <option value="h4"'. ($tag_sidebar == 'h4' ? ' selected="selected"' : '') .'>h4</option> + <option value="h5"'. ($tag_sidebar == 'h5' ? ' selected="selected"' : '') .'>h5</option> + <option value="h6"'. ($tag_sidebar == 'h6' ? ' selected="selected"' : '') .'>h6</option> + <option value="div"'. ($tag_sidebar == 'div' ? ' selected="selected"' : '') .'>div</option> + </select> + </td> + </tr> + </table> </fieldset> *************** *** 253,261 **** <input type="radio" name="dates" value="0" '. ($dates ? '' : 'checked="checked"') .' />dd/mm/yyyy <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 <em> tags as italics --- 413,425 ---- <input type="radio" name="dates" value="0" '. ($dates ? '' : 'checked="checked"') .' />dd/mm/yyyy <input type="radio" name="dates" value="1" '. ($dates ? 'checked="checked"' : '') .' />month/dd/yyyy<br /><br /> + <label><b>Comments</b></label><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="xhtmlcomments" '. (get_option('royale_xhtml_comments') ? 'checked="checked"' : '') .' /> Display allowed XHTML tags above the comment field<br /> + <input type="checkbox" name="trackbacksafter" '. (get_option('royale_trackbacks_after') ? 'checked="checked"' : '') .' /> Display trackbacks after the comments<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="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 <em> tags as italics *************** *** 402,408 **** function royale_readme_page() { echo '<div class="wrap">'; echo '<pre>'; ! include("README.txt"); echo '</pre>'; echo '</div>'; } --- 566,572 ---- function royale_readme_page() { echo '<div class="wrap">'; echo '<pre>'; ! echo htmlspecialchars(file_get_contents(TEMPLATEPATH.'/README.txt')); echo '</pre>'; echo '</div>'; } Binary files royale-1.3/he_IL.mo and royale-1.4/he_IL.mo differ diff -c royale-1.3/header.php royale-1.4/header.php *** royale-1.3/header.php 2007-06-18 11:39:49.000000000 -0400 --- royale-1.4/header.php 2007-11-04 15:11:23.000000000 -0500 *************** *** 34,44 **** --- 34,56 ---- <meta name="generator" content="WordPress <?php bloginfo('version'); ?>" />  <meta name="theme" content="Royale <?php $themes = get_themes(); echo $themes['Royale']['Version']; ?>" /> + <?php + global $dirs; + + if (file_exists($dirs['loc']['theme']."favicon.ico")) $favicon = $dirs['www']['theme']."favicon.ico"; + + if ($favicon): + ?> + <link rel="shortcut icon" href="<?php echo $favicon; ?>" type="image/x-icon" /> + <?php endif; ?> + <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'); ?>" /> <link rel="pingback" href="<?php bloginfo('pingback_url'); ?>" /> + <script type="text/javascript" src="<?php echo $dirs['www']['js']; ?>jquery.js"></script> <?php wp_head(); + if (get_option('royale_bold_links')) { $lastminutecss .= " a { font-weight: bold; }\n"; }; if ($lastminutecss) { echo "<style type=\"text/css\">\n$lastminutecss</style>\n"; } *************** *** 47,149 **** $rgb10 = get_option('royale_rgb1'); $rgb20 = get_option('royale_rgb2'); ?> ! ! <script type="text/javascript"> ! var h, s, v, r, g, b, hi, f, p, q, t; ! ! function dec2hex(n) { ! var str = ""; ! while (n) { str = "0123456789ABCDEF".charAt(n&0xf) + str; n>>>=4; } ! return (str.length ? str : 0); ! } ! ! function hsv2rgb(h,s,v) { ! hi = Math.floor(h/60) % 6; ! f = h/60-hi; ! p = v*(1-s); ! q = v*(1-f*s); ! t = v*(1-(1-f)*s); ! switch (hi) { ! case 0: ! r = v; g = t; b = p; ! break; ! case 1: ! r = q; g = v; b = p; ! break; ! case 2: ! r = p; g = v; b = t; ! break; ! case 3: ! r = p; g = q; b = v; ! break; ! case 4: ! r = t; g = p; b = v; ! break; ! case 5: ! r = v; g = p; b = q; ! break; ! } ! return 'rgb('+Math.round(r*256)+','+Math.round(g*256)+','+Math.round(b*256)+')'; ! } ! ! var hue = <?php echo $hue0; ?>; ! function huecycle() { ! hueshift(); ! if (!hue--) { hue += 360; } ! setTimeout("huecycle()",1000); ! } ! ! elements = new Array(); ! props = new Array('color','borderBottom','borderTop'); ! rules = (/MSIE/i.test(navigator.userAgent) ? 'rules' : 'cssRules'); ! ! function hueshift() { ! var nrgb1 = hsv2rgb(hue,0.91,0.91); ! var nrgb2 = hsv2rgb(hue,0.25,0.95); ! for (i=0;i<elements.length;i++) { ! if (/RGB1/.test(elements[i][3])) { document.styleSheets[elements[i][0]][rules][elements[i][1]].style[props[elements[i][2]]] = elements[i][3].replace(/RGB1/,nrgb1); } ! if (/RGB2/.test(elements[i][3])) { document.styleSheets[elements[i][0]][rules][elements[i][1]].style[props[elements[i][2]]] = elements[i][3].replace(/RGB2/,nrgb2); } ! } ! } ! ! function walkondom() { ! re1 = /<?php echo ereg_replace(',',',\\s*',ereg_replace('([])','\\\\1',$rgb10)); ?>/i; ! 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')); ! } ! } ! } ! } ! } ! } ! } ! function royale_init() { ! <?php if (get_option('royale_hue_cycle')): ?> ! walkondom(); ! huecycle(); ! <?php endif; ?> ! } ! </script> <?php echo get_option('royale_inserts_header'); ?> </head> <?php ! $bodytag = get_option('royale_inserts_body'); ! echo (preg_match("/<body/i",$bodytag) ? $bodytag : "<body onload=\"royale_init()\">"); ?> ! <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')); ?> --- 59,80 ---- $rgb10 = get_option('royale_rgb1'); $rgb20 = get_option('royale_rgb2'); ?> ! <style type="text/css" id="cycle"> ! </style> <?php echo get_option('royale_inserts_header'); ?> </head> <?php ! $bodytag = get_option('royale_inserts_body'); ! echo (preg_match("/<body/i",$bodytag) ? $bodytag : "<body onload=\"royale_init()\">"); ! ! $tag_blogname = get_option('royale_tag_blogname'); ! $tag_blogdesc = get_option('royale_tag_blogdesc'); ?> ! <div id="header" class="png"> ! <<?php echo $tag_blogname; ?> id="blogname"><a href="<?php echo get_option('home'); ?>/"><?php bloginfo('name'); ?></a></<?php echo $tag_blogname; ?>> ! <<?php echo $tag_blogdesc; ?> id="blogdesc"><?php bloginfo('description'); ?></<?php echo $tag_blogdesc; ?>> <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')); ?> Only in royale-1.4: hr.mo Common subdirectories: royale-1.3/images and royale-1.4/images diff -c royale-1.3/index.php royale-1.4/index.php *** royale-1.3/index.php 2007-06-06 18:54:28.000000000 -0400 --- royale-1.4/index.php 2007-11-04 16:43:45.000000000 -0500 *************** *** 1,13 **** ! <?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"> <?php dynamic_sidebar('Royale Top'); ?> </ul> --- 1,23 ---- ! <?php ! global $dirs; ! get_header(); ! ! $tag_posttitle_multi = get_option('royale_tag_posttitle_multi'); ! $tag_pagetitle = get_option('royale_tag_pagetitle' ); ! ! global $wp_registered_sidebars; ! if ($wp_registered_sidebars) { ! foreach ($wp_registered_sidebars as $key => $value) { ! if ($value['name'] == 'Royale Top') { $index_royale_top = $key; } ! if ($value['name'] == 'Royale Bottom') { $index_royale_bottom = $key; } ! } } ! if (function_exists(wp_get_sidebars_widgets)) $sidebars_widgets = wp_get_sidebars_widgets(); ! ?> ! <td id="content" class="narrowcolumn"> ! <?php if (function_exists('dynamic_sidebar') && $sidebars_widgets[$index_royale_top]): ?> <ul class="inline-widgets"> <?php dynamic_sidebar('Royale Top'); ?> </ul> *************** *** 24,38 **** <span class="calm"><?php the_time((get_option('royale_dates') ? 'd' : 'm')) ?></span> <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"> <?php the_content(__('Read the rest of this entry','royale') .' »'); ?> </div> ! <p class="postmetadata"><?php echo mkicon('comments','Comments'); ?> <?php comments_popup_link(__('No Comments','royale'). ' »', __('1 Comment','royale'). ' »', __('% Comments','royale'). ' »'); ?></p> </div> <?php endwhile; ?> --- 34,54 ---- <span class="calm"><?php the_time((get_option('royale_dates') ? 'd' : 'm')) ?></span> <span class="caly"><?php the_time('Y') ?></span> </div> ! <?php if (!get_option('mandigo_no_animations')): ?> ! <span class="switch-post"> ! <a href="javascript:toggleSidebars();" class="switch-sidebars"><img src="<?php echo $dirs['www']['icons']; ?>bullet_sidebars_hide.png" alt="" class="png" /></a><a href="javascript:togglePost(<?php the_ID(); ?>);" id="switch-post-<?php the_ID(); ?>"><img src="<?php echo $dirs['www']['icons']; ?>bullet_toggle_minus.png" alt="" class="png" /></a> ! </span> ! <?php endif; ?> ! <<?php echo $tag_posttitle_multi; ?> class="posttitle"><a href="<?php the_permalink() ?>" rel="bookmark" title="<?php printf(__('Permanent Link to %s','royale'),the_title('','',false)); ?>"><?php the_title(); ?></a></<?php echo $tag_posttitle_multi; ?>> ! <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 if (function_exists('the_tags') && !get_option('royale_tags_after')) the_tags(', '. __('tags','royale') .': '); ?><?php edit_post_link(__('Edit','royale'), ' - <img src="'. $dirs['www']['images'] .'page_edit.png" class="png" alt="" /> ', ''); ?> </small> </div> <div class="entry"> <?php the_content(__('Read the rest of this entry','royale') .' »'); ?> + <?php if (function_exists('the_tags') && get_option('royale_tags_after')) the_tags(); ?> </div> ! <p class="postmetadata"><img src="<?php echo $dirs['www']['images']; ?>comments.png" class="png" alt="" /> <?php comments_popup_link(__('No Comments','royale'). ' »', __('1 Comment','royale'). ' »', __('% Comments','royale'). ' »'); ?></p> </div> <?php endwhile; ?> *************** *** 50,61 **** <?php else : ?> ! <h2 class="center"><?php _e('Not Found','royale'); ?></h2> <p class="center"><?php _e('Sorry, but you are looking for something that isn\'t here.','royale'); ?></p> <?php endif; ?> ! <?php if (function_exists('dynamic_sidebar')): ?> <ul class="inline-widgets"> <?php dynamic_sidebar('Royale Bottom'); ?> </ul> --- 66,77 ---- <?php else : ?> ! <<?php echo $tag_pagetitle; ?> class="center"><?php _e('Not Found','royale'); ?></<?php echo $tag_pagetitle; ?>> <p class="center"><?php _e('Sorry, but you are looking for something that isn\'t here.','royale'); ?></p> <?php endif; ?> ! <?php if (function_exists('dynamic_sidebar') && $sidebars_widgets[$index_royale_bottom]): ?> <ul class="inline-widgets"> <?php dynamic_sidebar('Royale Bottom'); ?> </ul> *************** *** 63,72 **** </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(); ?> --- 79,86 ---- </td> <?php ! include (TEMPLATEPATH . '/sidebar.php'); ! if (get_option('royale_3columns')) { include (TEMPLATEPATH . '/sidebar2.php'); } get_footer(); ?> Only in royale-1.4: js diff -c royale-1.3/links.php royale-1.4/links.php *** royale-1.3/links.php 2007-06-11 17:39:15.000000000 -0400 --- royale-1.4/links.php 2007-11-04 16:18:10.000000000 -0500 *************** *** 5,33 **** ?> <?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(); --- 5,30 ---- ?> <?php get_header(); ! ! $tag_pagetitle = get_option('royale_tag_pagetitle' ); ?> ! <td id="content" class="narrowcolumn"> ! <div class="post"> ! <div class="entry"> ! <<?php echo $tag_pagetitle; ?> class="posttitle"><?php _e('Links','royale'); ?></<?php echo $tag_pagetitle; ?>> ! <ul> ! <?php get_links_list(); ?> ! </ul> + </div> + </div> </td> <?php ! if (get_option('royale_always_show_sidebars')) { ! include (TEMPLATEPATH . '/sidebar.php'); ! if (get_option('royale_3columns')) { include (TEMPLATEPATH . '/sidebar2.php'); } } get_footer(); diff -c royale-1.3/page.php royale-1.4/page.php *** royale-1.3/page.php 2007-06-11 10:15:24.000000000 -0400 --- royale-1.4/page.php 2007-11-04 15:59:03.000000000 -0500 *************** *** 1,37 **** ! <?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(); ?>"> ! <h2><?php the_title(); ?></h2> <div class="entry"> <?php the_content('<p class="serif">'. __('Read the rest of this page','royale') .' »</p>'); ?> <?php link_pages('<p><strong>'. __('Pages','royale') .':</strong> ', '</p>', 'number'); ?> </div> - <div style="clear: both;"></div> </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(); --- 1,36 ---- ! <?php ! global $dirs; ! get_header(); ! ! $tag_posttitle_single = get_option('royale_tag_posttitle_single'); ?> ! <td id="content" class="narrowcolumn"> ! <?php if (have_posts()) : while (have_posts()) : the_post(); ?> <div class="post" id="post-<?php the_ID(); ?>"> ! <?php if (!get_option('royale_no_animations')): ?> ! <span class="switch-post"> ! <a href="javascript:toggleSidebars();" class="switch-sidebars"><img src="<?php echo $dirs['www']['icons']; ?>bullet_sidebars_hide.png" alt="" class="png" /></a><a href="javascript:togglePost(<?php the_ID(); ?>);" id="switch-post-<?php the_ID(); ?>"><img src="<?php echo $dirs['www']['icons']; ?>bullet_toggle_minus.png" alt="" class="png" /></a> ! </span> ! <?php endif; ?> ! <<?php echo $tag_posttitle_single; ?> class="posttitle"><?php the_title(); ?></<?php echo $tag_posttitle_single; ?>> <div class="entry"> <?php the_content('<p class="serif">'. __('Read the rest of this page','royale') .' »</p>'); ?> <?php link_pages('<p><strong>'. __('Pages','royale') .':</strong> ', '</p>', 'number'); ?> + <div class="clear"></div> </div> </div> ! <?php edit_post_link('<img src="'. $dirs['www']['scheme'] .'images/edit.gif" alt="" /> '. __('Edit this page','royale'), '<p>', '</p>'); ?> ! <?php endwhile; endif; ?> </td> <?php ! if (get_option('royale_always_show_sidebars')) { ! include (TEMPLATEPATH . '/sidebar.php'); ! if (get_option('royale_3columns')) { include (TEMPLATEPATH . '/sidebar2.php'); } } get_footer(); Only in royale-1.4: pt_PT.mo diff -c royale-1.3/search.php royale-1.4/search.php *** royale-1.3/search.php 2007-06-11 10:14:39.000000000 -0400 --- royale-1.4/search.php 2007-11-04 16:18:18.000000000 -0500 *************** *** 1,18 **** <?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()) : ?> ! <h2 class="pagetitle"><?php _e('Search Results','royale'); ?></h2> <div class="navigation"> <div class="alignleft"><?php next_posts_link('« '. __('Previous Entries','royale')) ?></div> --- 1,16 ---- <?php get_header(); ! ! $tag_posttitle_multi = get_option('royale_tag_posttitle_multi'); ! $tag_pagetitle = get_option('royale_tag_pagetitle' ); ! ! global $dirs; ?> ! <td id="content" class="narrowcolumn"> <?php if (have_posts()) : ?> ! <<?php echo $tag_pagetitle; ?> class="pagetitle"><?php _e('Search Results','royale'); ?></<?php echo $tag_pagetitle; ?>> <div class="navigation"> <div class="alignleft"><?php next_posts_link('« '. __('Previous Entries','royale')) ?></div> *************** *** 22,29 **** <?php while (have_posts()) : the_post(); ?> ! <div class="post"> ! <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')): ?> --- 20,32 ---- <?php while (have_posts()) : the_post(); ?> ! <div class="post" id="post-<?php the_ID(); ?>"> ! <?php if (!get_option('royale_no_animations')): ?> ! <span class="switch-post"> ! <a href="javascript:toggleSidebars();" class="switch-sidebars"><img src="<?php echo $dirs['www']['icons']; ?>bullet_sidebars_hide.png" alt="" class="png" /></a><a href="javascript:togglePost(<?php the_ID(); ?>);" id="switch-post-<?php the_ID(); ?>"><img src="<?php echo $dirs['www']['icons']; ?>bullet_toggle_minus.png" alt="" class="png" /></a> ! </span> ! <?php endif; ?> ! <<?php echo $tag_posttitle_multi; ?> class="posttitle posttitle-search""><a href="<?php the_permalink() ?>" rel="bookmark" title="<?php printf(__('Permanent Link to %s','royale'),the_title('','',false)); ?>"><?php the_title(); ?></a></<?php echo $tag_posttitle_multi; ?>> <small><?php the_time('l, F jS, Y') ?></small> <?php if (get_option('royale_full_search_results')): ?> *************** *** 45,51 **** <?php else : ?> ! <h2 class="center"><?php _e('No posts found. Try a different search?','royale'); ?></h2> <p class="center"><?php _e('Sorry, no posts matched your search criteria. Please try and search again.','royale'); ?></p> <?php endif; ?> --- 48,54 ---- <?php else : ?> ! <<?php echo $tag_pagetitle; ?> class="center"><?php _e('No posts found. Try a different search?','royale'); ?></<?php echo $tag_pagetitle; ?>> <p class="center"><?php _e('Sorry, no posts matched your search criteria. Please try and search again.','royale'); ?></p> <?php endif; ?> *************** *** 53,63 **** </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(); --- 56,64 ---- </td> <?php ! if (get_option('royale_always_show_sidebars')) { ! include (TEMPLATEPATH . '/sidebar.php'); ! if (get_option('royale_3columns')) { include (TEMPLATEPATH . '/sidebar2.php'); } } get_footer(); diff -c royale-1.3/searchform.php royale-1.4/searchform.php *** royale-1.3/searchform.php 2007-04-28 18:40:41.000000000 -0400 --- royale-1.4/searchform.php 2007-11-04 10:08:44.000000000 -0500 *************** *** 1,5 **** <form method="get" id="searchform" action="<?php bloginfo('home'); ?>/"> <div><input type="text" value="<?php echo wp_specialchars($s, 1); ?>" name="s" id="s" /> ! <input type="image" id="searchsubmit" src="<?php echo get_bloginfo('stylesheet_directory'); ?>/images/1x1.gif" class="icon magnifier" /> </div> </form> --- 1,6 ---- + <?php global $dirs; ?> <form method="get" id="searchform" action="<?php bloginfo('home'); ?>/"> <div><input type="text" value="<?php echo wp_specialchars($s, 1); ?>" name="s" id="s" /> ! <input type="image" id="searchsubmit" src="<?php echo $dirs['www']['images']; ?>magnifier.png" class="png" /> </div> </form> diff -c royale-1.3/sidebar.php royale-1.4/sidebar.php *** royale-1.3/sidebar.php 2007-06-06 18:53:04.000000000 -0400 --- royale-1.4/sidebar.php 2007-11-04 16:16:40.000000000 -0500 *************** *** 1,5 **** <td id="sidebar1"> ! <ul class="sidebars"> <?php if (!function_exists('dynamic_sidebar') || !dynamic_sidebar('Sidebar 1')) : ?> <?php widget_royale_search(); ?> --- 1,8 ---- + <?php + $tag_sidebar = get_option('royale_tag_sidebar'); + ?> <td id="sidebar1"> ! <ul class="sidebars png"> <?php if (!function_exists('dynamic_sidebar') || !dynamic_sidebar('Sidebar 1')) : ?> <?php widget_royale_search(); ?> *************** *** 26,39 **** <?php } ?> ! <?php wp_list_pages('title_li=<h2>'. str_replace('&','%26',__('Pages','royale')) .'</h2>&sort_column=menu_order'); ?> ! <li><h2><?php _e('Categories','royale'); ?></h2> <ul> <?php wp_list_cats('sort_column=name&optioncount=1&hide_empty=0&hierarchical=1'); ?> </ul> </li> <?php /* If this is the frontpage */ if ( is_home() || is_page() ) { ?> <?php get_links_list(); ?> <?php } ?> --- 29,48 ---- <?php } ?> ! <?php wp_list_pages(array('title_li' => "<$tag_sidebar class=\"widgettitle\">". str_replace('&','%26',__('Pages','royale')) ."</$tag_sidebar>",'sort_column' => "menu_order")); ?> ! <li><<?php echo $tag_sidebar; ?> class="widgettitle"><?php _e('Categories','royale'); ?></<?php echo $tag_sidebar; ?>> <ul> <?php wp_list_cats('sort_column=name&optioncount=1&hide_empty=0&hierarchical=1'); ?> </ul> </li> + <?php if (function_exists('wp_tag_cloud')) { ?> + <li><<?php echo $tag_sidebar; ?> class="widgettitle"><?php _e('Tags','royale'); ?></<?php echo $tag_sidebar; ?>> + <?php wp_tag_cloud(); ?> + </li> + <?php } ?> + <?php /* If this is the frontpage */ if ( is_home() || is_page() ) { ?> <?php get_links_list(); ?> <?php } ?> diff -c royale-1.3/sidebar2.php royale-1.4/sidebar2.php *** royale-1.3/sidebar2.php 2007-06-06 18:53:27.000000000 -0400 --- royale-1.4/sidebar2.php 2007-11-04 10:33:27.000000000 -0500 *************** *** 1,5 **** <td id="sidebar2"> ! <ul class="sidebars"> <?php if (!function_exists('dynamic_sidebar') || !dynamic_sidebar('Sidebar 2')) : ?> <?php widget_royale_meta(); ?> --- 1,5 ---- <td id="sidebar2"> ! <ul class="sidebars png"> <?php if (!function_exists('dynamic_sidebar') || !dynamic_sidebar('Sidebar 2')) : ?> <?php widget_royale_meta(); ?> diff -c royale-1.3/single.php royale-1.4/single.php *** royale-1.3/single.php 2007-06-11 10:04:42.000000000 -0400 --- royale-1.4/single.php 2007-11-04 16:43:32.000000000 -0500 *************** *** 1,20 **** <?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="navigation"> ! <div class="alignleft"><?php previous_post_link(mkicon('book_previous','previous') .' %link'); ?></div> ! <div class="alignright"><?php next_post_link('%link '. mkicon('book_next','next')); ?></div> </div> <div class="post" id="post-<?php the_ID(); ?>"> --- 1,18 ---- <?php get_header(); ! ! $tag_posttitle_single = get_option('royale_tag_posttitle_single'); ! $tag_pagetitle = get_option('royale_tag_pagetitle' ); ! ! global $dirs; ?> <td id="content" class="<?php echo ($alwayssidebars ? 'narrow' : 'wide'); ?>column"> <?php if (have_posts()) : while (have_posts()) : the_post(); ?> <div class="navigation"> ! <div class="alignleft"><?php previous_post_link('<img src="'. $dirs['www']['images'] .'book_previous.png" class="png" alt="" /> %link'); ?></div> ! <div class="alignright"><?php next_post_link('%link <img src="'. $dirs['www']['images'] .'book_next.png" class="png" alt="" />'); ?></div> </div> <div class="post" id="post-<?php the_ID(); ?>"> *************** *** 24,35 **** <span class="calm"><?php the_time((get_option('royale_dates') ? 'd' : 'm')) ?></span> <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"> <?php the_content('<p class="serif">'. __('Read the rest of this entry','royale') .' »</p>'); ?> <?php link_pages('<p><strong>'. __('Pages','royale') .':</strong> ', '</p>', 'number'); ?> --- 22,39 ---- <span class="calm"><?php the_time((get_option('royale_dates') ? 'd' : 'm')) ?></span> <span class="caly"><?php the_time('Y') ?></span> </div> ! <?php if (!get_option('royale_no_animations')): ?> ! <span class="switch-post"> ! <a href="javascript:toggleSidebars();" class="switch-sidebars"><img src="<?php echo $dirs['www']['icons']; ?>bullet_sidebars_hide.png" alt="" class="png" /></a><a href="javascript:togglePost(<?php the_ID(); ?>);" id="switch-post-<?php the_ID(); ?>"><img src="<?php echo $dirs['www']['icons']; ?>bullet_toggle_minus.png" alt="" class="png" /></a> ! </span> ! <?php endif; ?> ! <<?php echo $tag_posttitle_single; ?> class="posttitle"><a href="<?php echo get_permalink() ?>" rel="bookmark" title="Permanent Link: <?php the_title(); ?>"><?php the_title(); ?></a></<?php echo $tag_posttitle_single; ?>> ! <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 if (function_exists('the_tags') && !get_option('royale_tags_after')) the_tags(', '. __('tags','royale') .': '); ?></small> </div> <div class="entry"> <?php the_content('<p class="serif">'. __('Read the rest of this entry','royale') .' »</p>'); ?> + <?php if (function_exists('the_tags') && get_option('royale_tags_after')) the_tags(); ?> <?php link_pages('<p><strong>'. __('Pages','royale') .':</strong> ', '</p>', 'number'); ?> *************** *** 74,84 **** </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(); --- 78,86 ---- </td> <?php ! if (get_option('royale_always_show_sidebars')) { ! include (TEMPLATEPATH . '/sidebar.php'); ! if (get_option('royale_3columns')) { include (TEMPLATEPATH . '/sidebar2.php'); } } get_footer(); diff -c royale-1.3/style.css royale-1.4/style.css *** royale-1.3/style.css 2007-06-18 12:25:19.000000000 -0400 --- royale-1.4/style.css 2007-11-04 10:10:08.000000000 -0500 *************** *** 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 28 languages! ! Version: 1.3 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 31 languages! ! Version: 1.4 Author: t0mmmmmmm Author URI: http://www.onehertz.com/portfolio/wordpress/ */ diff -c royale-1.3/style.css.php royale-1.4/style.css.php *** royale-1.3/style.css.php 2007-06-18 12:19:50.000000000 -0400 --- royale-1.4/style.css.php 2007-11-04 16:23:25.000000000 -0500 *************** *** 14,20 **** 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; --- 14,20 ---- 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_(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; *************** *** 28,34 **** 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'); $royale_sidebar2_left = get_option('royale_sidebar2_left'); $royale_nofloat = get_option('royale_nofloat'); --- 28,33 ---- *************** *** 38,44 **** $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; --- 37,43 ---- $royale_bgpattern = get_option('royale_bgpattern'); $royale_number_comments = get_option('royale_number_comments'); $stylesheet_directory = get_bloginfo('stylesheet_directory'); ! foreach (array('em_italics','nofloat','number_comments') as $a) { $a = 'royale_'. $a; if ($$a == 'on') $$a = 1; if ($$a == 'off') $$a = 0; *************** *** 52,60 **** $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); - $overlay = 'black_overlay_'. $royale_overlay_opacity .'.png'; ?> --- 51,56 ---- *************** *** 94,131 **** line-height: 1.5em; } ! h1, h2, h3, .inline-widgets h2, .inline-widgets #wp-calendar caption { font-family: 'Trebuchet MS', 'Lucida Grande', Verdana, Arial, Sans-Serif; font-weight: bold; font-size: 1.4em; } ! h1 { font-size: 4em; letter-spacing: -.05em; } ! h2, h3 { font-size: 1.6em; } ! .description { font-size: 1.2em; } ! .sidebars h2 { font-family: 'Lucida Grande', Verdana, Sans-Serif; font-size: 1.2em; } ! h1, h1 a, h1 a:hover, h1 a:visited, h2, h2 a, h2 a:visited, h3, h3 a, h3 a:visited, .description { text-decoration: none; color: #fff; border: none; } ! h2, h2 a, h2 a:hover, h2 a:visited, h3, h3 a, h3 a:hover, h3 a:visited, .sidebars h2, #wp-calendar caption, cite { ! text-decoration: none; ! border: none; ! } ! ! h2 a:hover { color: <?php echo $royale_rgb2; ?>; marks: none; } --- 90,128 ---- line-height: 1.5em; } ! h1, h2, h3, h4, h5, h6 { ! font-family: 'Trebuchet MS', 'Lucida Grande', Verdana, Arial, Sans-Serif; ! font-weight: bold; ! } ! ! #blogname, .posttitle, .inline-widgets h2, .inline-widgets #wp-calendar caption { font-family: 'Trebuchet MS', 'Lucida Grande', Verdana, Arial, Sans-Serif; font-weight: bold; font-size: 1.4em; } ! #blogname { font-size: 4em; letter-spacing: -.05em; } ! .posttitle, .pagetitle { font-size: 1.6em; } ! #blogdesc { font-size: 1.2em; } ! .widgettitle, .sidebars h2 { font-family: 'Lucida Grande', Verdana, Sans-Serif; font-size: 1.2em; } ! #blogname, #blogname a, #blogname a:hover, #blogname a:visited, #blogdesc, .pagetitle, .posttitle, .posttitle a, .posttitle a:hover, .posttitle a:visited, .widgettitle, .widgettitle a, .sidebars h2, #wp-calendar caption, cite { text-decoration: none; color: #fff; border: none; + font-weight: bold; } ! .posttitle a:hover { color: <?php echo $royale_rgb2; ?>; marks: none; } *************** *** 180,186 **** letter-spacing: .07em; } ! a, h2 a:hover, h3 a:hover { text-decoration: none; } #wp-calendar #prev a, #wp-calendar #next a { font-size: 9pt; } --- 177,183 ---- letter-spacing: .07em; } ! a, .posttitle a:hover { text-decoration: none; } #wp-calendar #prev a, #wp-calendar #next a { font-size: 9pt; } *************** *** 221,227 **** .pages a:hover { color: #fff; } ! .postinfo h2, .postinfo h3 { font-size: 1.7em; line-height: .9em; } --- 218,224 ---- .pages a:hover { color: #fff; } ! .posttitle { font-size: 1.7em; line-height: .9em; } *************** *** 259,274 **** text-align: left; width: 100%; 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; ?> height: 140px; position: relative; margin-bottom: 20px; } ! h1, .description { padding-left: 30px; } #page { margin-bottom: 20px; --- 256,267 ---- text-align: left; width: 100%; background: url(images/<?php echo $overlay; ?>); height: 140px; position: relative; margin-bottom: 20px; } ! #blogname, #blogdesc { padding-left: 30px; } #page { margin-bottom: 20px; *************** *** 293,316 **** .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); - 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; --- 286,302 ---- .sidebars { width: 210px; background: url(images/<?php echo $overlay; ?>); border: none; border-top: 2px solid #eee; border-bottom: 1px solid #eee; } .post { + position: relative; text-align: left; padding: 5px 15px; margin-bottom: 30px; background: url(images/<?php echo $overlay; ?>); border: none; border-top: 2px solid #eee; border-bottom: 1px solid #eee; *************** *** 332,338 **** margin: 5px 0px; } ! .postmetadata, .entry { clear: both; } #footer { margin: 0 auto; --- 318,324 ---- margin: 5px 0px; } ! .postmetadata, .entry, .clear { clear: both; } #footer { margin: 0 auto; *************** *** 346,367 **** padding: 10px 0 0 0; text-align: center; } /* End Structure */ /* Begin Headers */ ! h1 { padding-top: 15px; } ! h2.pagetitle { margin-top: 30px; text-align: center; } .sidebars h2 { margin: 5px 0 0 0; } ! h3#comments, h3#respond { font-size: 1.5em; margin: 40px auto 20px auto; } .commentlist li, .alt { --- 332,363 ---- padding: 10px 0 0 0; text-align: center; } + + .switch-post, .switch-post a, .switch-post a:hover, .switch-post a:visited { + width: 16px; + float: right; + position: relative; + right: -5px; + border: none; + } /* End Structure */ /* Begin Headers */ ! #blogname { padding-top: 15px; } ! .pagetitle { margin-top: 30px; text-align: center; } .sidebars h2 { margin: 5px 0 0 0; } ! #comments, #respond, #trackbacks { ! color: #fff; font-size: 1.5em; margin: 40px auto 20px auto; + font-weight: bold; } .commentlist li, .alt { *************** *** 374,379 **** --- 370,377 ---- /* Begin Images */ + .png, .post { behavior: url(<?php echo $stylesheet_directory; ?>/js/iepngfix.htc.php?blank=<?php echo $stylesheet_directory; ?>/images/1x1.gif); } + p img { max-width: 95%; } .entry img { *************** *** 624,630 **** .cal { display: inline; - padding: 1px; float: left; margin-right: 1em; } --- 622,627 ---- *************** *** 715,724 **** } .book_previous { filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='<?php echo $stylesheet_directory; ?>/images/book_previous.png', sizingMethod='scale'); } .book_next { filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='<?php echo $stylesheet_directory; ?>/images/book_next.png', sizingMethod='scale'); } - .comments { filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='<?php echo $stylesheet_directory; ?>/images/comments.png', sizingMethod='scale'); } - .magnifier { filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='<?php echo $stylesheet_directory; ?>/images/magnifier.png', sizingMethod='scale'); } - .page_edit { filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='<?php echo $stylesheet_directory; ?>/images/page_edit.png', sizingMethod='scale'); } - .rss { filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='<?php echo $stylesheet_directory; ?>/images/rss.png', sizingMethod='scale'); } <?php else: ?> .icon { width: 16px; --- 712,717 ---- *************** *** 743,751 **** /* 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; --- 736,744 ---- /* RTL scripts support */ .pages, #content, .sidebars, #footer { direction: rtl; } ! #blogname, #blogdesc, .pages, .postinfo, .entry, .postmetadata, #content #searchform, #respond, #commentform p, .sidebars, #wp-calendar caption { text-align: right; } ! #blogname, #blogdesc { padding-right: 30px; } .cal { float: right; *************** *** 754,760 **** } .entry img { ! float: <?php echo ($mandigo_nofloat ? 'none' : 'right'); ?>; margin: 3px 0 3px 10px; } --- 747,753 ---- } .entry img { ! float: <?php echo ($royale_nofloat ? 'none' : 'right'); ?>; margin: 3px 0 3px 10px; } *************** *** 801,804 **** margin: 3px 0 0 0; padding: 2px 0; } ! <?php endif; ?> --- 794,805 ---- margin: 3px 0 0 0; padding: 2px 0; } ! ! .switch-post { ! float: left; ! } ! <?php ! endif; ! // end of rtl scripts specific rules ! ?> ! Only in royale-1.3: style.css~ Only in royale-1.4: ua_UA.mo