summaryrefslogtreecommitdiffstats
path: root/wp-content
diff options
context:
space:
mode:
authordonncha <donncha@7be80a69-a1ef-0310-a953-fb0f7c49ff36>2007-10-12 16:21:15 +0000
committerdonncha <donncha@7be80a69-a1ef-0310-a953-fb0f7c49ff36>2007-10-12 16:21:15 +0000
commit3a4570b0fc8b3d6339bef71d17d7701554e0bbf7 (patch)
tree2a06e5261263c68d8afd95a6328879dc289cb909 /wp-content
parentb83c34a7010faee0223f6037025c350da12e05e6 (diff)
downloadwordpress-mu-3a4570b0fc8b3d6339bef71d17d7701554e0bbf7.tar.gz
wordpress-mu-3a4570b0fc8b3d6339bef71d17d7701554e0bbf7.tar.xz
wordpress-mu-3a4570b0fc8b3d6339bef71d17d7701554e0bbf7.zip
Merge with WP 2.3 - testing use only!
Move pluggable functions out of wpmu-functions and into pluggable.php, fixes #439 git-svn-id: http://svn.automattic.com/wordpress-mu/trunk@1069 7be80a69-a1ef-0310-a953-fb0f7c49ff36
Diffstat (limited to 'wp-content')
-rw-r--r--wp-content/themes/classic/comments-popup.php6
-rw-r--r--wp-content/themes/classic/comments.php14
-rw-r--r--wp-content/themes/classic/index.php4
-rw-r--r--wp-content/themes/classic/rtl.css82
-rw-r--r--wp-content/themes/classic/style.css20
-rw-r--r--wp-content/themes/default/archive.php34
-rw-r--r--wp-content/themes/default/attachment.php10
-rw-r--r--wp-content/themes/default/comments.php2
-rw-r--r--wp-content/themes/default/index.php6
-rw-r--r--wp-content/themes/default/rtl.css39
-rw-r--r--wp-content/themes/default/search.php12
-rw-r--r--wp-content/themes/default/sidebar.php14
-rw-r--r--wp-content/themes/default/single.php7
-rw-r--r--wp-content/themes/home/archive.php17
-rw-r--r--wp-content/themes/home/attachment.php10
-rw-r--r--wp-content/themes/home/comments.php2
-rw-r--r--wp-content/themes/home/functions.php2
-rw-r--r--wp-content/themes/home/index.php6
-rw-r--r--wp-content/themes/home/rtl.css39
-rw-r--r--wp-content/themes/home/search.php12
-rw-r--r--wp-content/themes/home/sidebar.php14
-rw-r--r--wp-content/themes/home/single.php7
22 files changed, 235 insertions, 124 deletions
diff --git a/wp-content/themes/classic/comments-popup.php b/wp-content/themes/classic/comments-popup.php
index bded9b4..e7f6876 100644
--- a/wp-content/themes/classic/comments-popup.php
+++ b/wp-content/themes/classic/comments-popup.php
@@ -56,9 +56,9 @@ if (!empty($commentstatus->post_password) && $_COOKIE['wp-postpass_'. COOKIEHASH
<p><?php _e("Line and paragraph breaks automatic, e-mail address never displayed, <acronym title=\"Hypertext Markup Language\">HTML</acronym> allowed:"); ?> <code><?php echo allowed_tags(); ?></code></p>
<form action="<?php echo get_option('siteurl'); ?>/wp-comments-post.php" method="post" id="commentform">
-<?php if ( $user_ID ) : ?>
- <p>Logged in as <a href="<?php echo get_option('siteurl'); ?>/wp-admin/profile.php"><?php echo $user_identity; ?></a>. <a href="<?php echo get_option('siteurl'); ?>/wp-login.php?action=logout" title="Log out of this account">Logout &raquo;</a></p>
-<?php else : ?>
+<?php if ( $user_ID ) : ?>
+<p><?php printf(__('Logged in as %s.'), '<a href="'.get_option('siteurl').'/wp-admin/profile.php">'.$user_identity.'</a>'); ?> <a href="<?php echo get_option('siteurl'); ?>/wp-login.php?action=logout" title="<?php echo attribute_escape(__('Log out of this account')); ?>"><?php _e('Logout &raquo;'); ?></a></p>
+<?php else : ?>
<p>
<input type="text" name="author" id="author" class="textarea" value="<?php echo $comment_author; ?>" size="28" tabindex="1" />
<label for="author"><?php _e("Name"); ?></label>
diff --git a/wp-content/themes/classic/comments.php b/wp-content/themes/classic/comments.php
index 6154aed..ddb7543 100644
--- a/wp-content/themes/classic/comments.php
+++ b/wp-content/themes/classic/comments.php
@@ -35,33 +35,33 @@
<h2 id="postcomment"><?php _e('Leave a comment'); ?></h2>
<?php if ( get_option('comment_registration') && !$user_ID ) : ?>
-<p>You must be <a href="<?php echo get_option('siteurl'); ?>/wp-login.php?redirect_to=<?php the_permalink(); ?>">logged in</a> to post a comment.</p>
+<p><?php printf(__('You must be <a href="%s">logged in</a> to post a comment.'), get_option('siteurl')."/wp-login.php?redirect_to=".urlencode(get_permalink()));?></p>
<?php else : ?>
<form action="<?php echo get_option('siteurl'); ?>/wp-comments-post.php" method="post" id="commentform">
<?php if ( $user_ID ) : ?>
-<p>Logged in as <a href="<?php echo get_option('siteurl'); ?>/wp-admin/profile.php"><?php echo $user_identity; ?></a>. <a href="<?php echo get_option('siteurl'); ?>/wp-login.php?action=logout" title="<?php _e('Log out of this account') ?>">Logout &raquo;</a></p>
+<p><?php printf(__('Logged in as %s.'), '<a href="'.get_option('siteurl').'/wp-admin/profile.php">'.$user_identity.'</a>'); ?> <a href="<?php echo get_option('siteurl'); ?>/wp-login.php?action=logout" title="<?php _e('Log out of this account') ?>"><?php _e('Logout &raquo;'); ?></a></p>
<?php else : ?>
<p><input type="text" name="author" id="author" value="<?php echo $comment_author; ?>" size="22" tabindex="1" />
-<label for="author"><small>Name <?php if ($req) _e('(required)'); ?></small></label></p>
+<label for="author"><small><?php _e('Name'); ?> <?php if ($req) _e('(required)'); ?></small></label></p>
<p><input type="text" name="email" id="email" value="<?php echo $comment_author_email; ?>" size="22" tabindex="2" />
-<label for="email"><small>Mail (will not be published) <?php if ($req) _e('(required)'); ?></small></label></p>
+<label for="email"><small><?php _e('Mail (will not be published)');?> <?php if ($req) _e('(required)'); ?></small></label></p>
<p><input type="text" name="url" id="url" value="<?php echo $comment_author_url; ?>" size="22" tabindex="3" />
-<label for="url"><small>Website</small></label></p>
+<label for="url"><small><?php _e('Website'); ?></small></label></p>
<?php endif; ?>
-<!--<p><small><strong>XHTML:</strong> You can use these tags: <?php echo allowed_tags(); ?></small></p>-->
+<!--<p><small><strong>XHTML:</strong> <?php printf(__('You can use these tags: %s'), allowed_tags()); ?></small></p>-->
<p><textarea name="comment" id="comment" cols="100%" rows="10" tabindex="4"></textarea></p>
-<p><input name="submit" type="submit" id="submit" tabindex="5" value="Submit Comment" />
+<p><input name="submit" type="submit" id="submit" tabindex="5" value="<?php echo attribute_escape(__('Submit Comment')); ?>" />
<input type="hidden" name="comment_post_ID" value="<?php echo $id; ?>" />
</p>
<?php do_action('comment_form', $post->ID); ?>
diff --git a/wp-content/themes/classic/index.php b/wp-content/themes/classic/index.php
index ce02040..5965562 100644
--- a/wp-content/themes/classic/index.php
+++ b/wp-content/themes/classic/index.php
@@ -8,7 +8,7 @@ get_header();
<div class="post" id="post-<?php the_ID(); ?>">
<h3 class="storytitle"><a href="<?php the_permalink() ?>" rel="bookmark"><?php the_title(); ?></a></h3>
- <div class="meta"><?php _e("Filed under:"); ?> <?php the_category(',') ?> &#8212; <?php the_author() ?> @ <?php the_time() ?> <?php edit_post_link(__('Edit This')); ?></div>
+ <div class="meta"><?php _e("Filed under:"); ?> <?php the_category(',') ?> &#8212; <?php the_tags(__('Tags: '), ', ', ' &#8212; '); ?> <?php the_author() ?> @ <?php the_time() ?> <?php edit_post_link(__('Edit This')); ?></div>
<div class="storycontent">
<?php the_content(__('(more...)')); ?>
@@ -27,6 +27,6 @@ get_header();
<p><?php _e('Sorry, no posts matched your criteria.'); ?></p>
<?php endif; ?>
-<?php posts_nav_link(' &#8212; ', __('&laquo; Previous Page'), __('Next Page &raquo;')); ?>
+<?php posts_nav_link(' &#8212; ', __('&laquo; Older Posts'), __('Newer Posts &raquo;')); ?>
<?php get_footer(); ?>
diff --git a/wp-content/themes/classic/rtl.css b/wp-content/themes/classic/rtl.css
new file mode 100644
index 0000000..a038b64
--- /dev/null
+++ b/wp-content/themes/classic/rtl.css
@@ -0,0 +1,82 @@
+/* Based on Arabic (RTL) version of WordPress Classic theme, converted by Serdal (Serdal.com) */
+
+#menu ul ul, #wp-calendar caption, #wp-calendar #prev a { text-align: right; }
+#wp-calendar #next a, .feedback { text-align: left; }
+
+blockquote {
+ border-left: 0;
+ border-right: 5px solid #ccc;
+ margin-left: auto;
+ margin-right: 1.5em;
+ padding-left: 0;
+ padding-right: 5px;
+}
+
+body { font-family: 'Geeza Pro', Tahoma, 'Lucida Grande', 'Lucida Sans Unicode', Verdana, sans-serif; }
+
+h2 { font: 95% 'Al Bayan', 'Traditional Arabic', "Times New Roman", Times, serif; }
+
+p, li, .feedback {
+ font: 90%/175% 'Geeza Pro', Tahoma, 'Lucida Grande', 'Lucida Sans Unicode', Verdana, sans-serif;
+ text-align: justify;
+}
+
+acronym, abbr, span.caps, h2, p, li, #header, #menu ul li, #menu ul ul li, #wp-calendar td, .feedback, .meta, .meta a { letter-spacing: normal; }
+
+#commentlist li ul {
+ border-left: 0;
+ border-right: 1px solid #ddd;
+}
+
+#content {
+ margin: 30px 3em 0 13em;
+ padding-right: 0;
+ padding-left: 60px;
+}
+
+#header {
+ border-left: solid 1px #9a9;
+ border-right: solid 1px #565;
+ font: normal normal 230% 'Al Bayan', 'Traditional Arabic', 'Times New Roman', Times, serif;
+ padding: 15px 60px 15px 10px;
+}
+
+#menu {
+ border-left: 0;
+ border-right: 1px dotted #ccc;
+ padding: 20px 30px 10px 0;
+ right: auto;
+ left: 2px;
+}
+
+#menu form { margin: 0 13px 0 0; }
+
+#menu ul {
+ padding-left: 0;
+ padding-right: 3px;
+}
+
+#menu ul li { font: normal normal 110% 'Geeza Pro', Tahoma, 'Times New Roman', Times, serif; }
+
+#menu ul ul li {
+ font: normal normal 12px/115% 'Geeza Pro', Tahoma, 'Lucida Grande', 'Lucida Sans Unicode', Verdana, sans-serif;
+ padding-left: 0;
+ padding-right: 12px;
+}
+
+#menu ul ul ul.children {
+ padding-left: 0;
+ padding-right: 4px;
+}
+
+#wp-calendar #next a {
+ padding-right: 0;
+ padding-left: 10px;
+}
+
+#wp-calendar #prev a {
+ padding-left: 0;
+ padding-right: 10px;
+}
+
+#wp-calendar td { font: normal normal 12px 'Geeza Pro', Tahoma, 'Lucida Grande', 'Lucida Sans Unicode', Verdana, sans-serif; }
diff --git a/wp-content/themes/classic/style.css b/wp-content/themes/classic/style.css
index e09122d..f5436b2 100644
--- a/wp-content/themes/classic/style.css
+++ b/wp-content/themes/classic/style.css
@@ -48,9 +48,9 @@ blockquote {
body {
background: #fff;
- border: solid 2px #565;
- border-bottom: solid 1px #565;
- border-top: solid 3px #565;
+ border: 2px solid #565;
+ border-bottom: 1px solid #565;
+ border-top: 3px solid #565;
color: #000;
font-family: 'Lucida Grande', 'Lucida Sans Unicode', Verdana, sans-serif;
margin: 0;
@@ -71,7 +71,7 @@ h2 {
}
h3 {
- border-bottom: dotted 1px #eee;
+ border-bottom: 1px dotted #eee;
font-family: "Times New Roman", Times, serif;
margin-top: 0;
}
@@ -96,7 +96,7 @@ ul.post-meta span.post-meta-key {
.credit {
background: #90a090;
- border-top: double 3px #aba;
+ border-top: 3px double #aba;
color: #fff;
font-size: 11px;
margin: 10px 0 0 0;
@@ -166,10 +166,10 @@ ul.post-meta span.post-meta-key {
#header {
background: #90a090;
- border-bottom: double 3px #aba;
- border-left: solid 1px #9a9;
- border-right: solid 1px #565;
- border-top: solid 1px #9a9;
+ border-bottom: 3px double #aba;
+ border-left: 1px solid #9a9;
+ border-right: 1px solid #565;
+ border-top: 1px solid #9a9;
font: italic normal 230% 'Times New Roman', Times, serif;
letter-spacing: 0.2em;
margin: 0;
@@ -188,7 +188,7 @@ ul.post-meta span.post-meta-key {
#menu {
background: #fff;
border-left: 1px dotted #ccc;
- border-top: solid 3px #e0e6e0;
+ border-top: 3px solid #e0e6e0;
padding: 20px 0 10px 30px;
position: absolute;
right: 2px;
diff --git a/wp-content/themes/default/archive.php b/wp-content/themes/default/archive.php
index 1d2b1de..769f9ab 100644
--- a/wp-content/themes/default/archive.php
+++ b/wp-content/themes/default/archive.php
@@ -1,54 +1,50 @@
<?php get_header(); ?>
<div id="content" class="narrowcolumn">
-
+<?php is_tag(); ?>
<?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()) { ?>
+ <?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">Archive for the &#8216;<?php single_cat_title(); ?>&#8217; Category</h2>
-
+ <?php /* If this is a tag archive */ } elseif( is_tag() ) { ?>
+ <h2 class="pagetitle">Posts Tagged &#8216;<?php single_tag_title(); ?>&#8217;</h2>
<?php /* If this is a daily archive */ } elseif (is_day()) { ?>
<h2 class="pagetitle">Archive for <?php the_time('F jS, Y'); ?></h2>
-
- <?php /* If this is a monthly archive */ } elseif (is_month()) { ?>
+ <?php /* If this is a monthly archive */ } elseif (is_month()) { ?>
<h2 class="pagetitle">Archive for <?php the_time('F, Y'); ?></h2>
-
- <?php /* If this is a yearly archive */ } elseif (is_year()) { ?>
+ <?php /* If this is a yearly archive */ } elseif (is_year()) { ?>
<h2 class="pagetitle">Archive for <?php the_time('Y'); ?></h2>
-
<?php /* If this is an author archive */ } elseif (is_author()) { ?>
<h2 class="pagetitle">Author Archive</h2>
-
- <?php /* If this is a paged archive */ } elseif (isset($_GET['paged']) && !empty($_GET['paged'])) { ?>
+ <?php /* If this is a paged archive */ } elseif (isset($_GET['paged']) && !empty($_GET['paged'])) { ?>
<h2 class="pagetitle">Blog Archives</h2>
-
- <?php } ?>
+ <?php } ?>
<div class="navigation">
- <div class="alignleft"><?php next_posts_link('&laquo; Previous Entries') ?></div>
- <div class="alignright"><?php previous_posts_link('Next Entries &raquo;') ?></div>
+ <div class="alignleft"><?php next_posts_link('&laquo; Older Entries') ?></div>
+ <div class="alignright"><?php previous_posts_link('Newer Entries &raquo;') ?></div>
</div>
<?php while (have_posts()) : the_post(); ?>
<div class="post">
- <h3 id="post-<?php the_ID(); ?>"><a href="<?php the_permalink() ?>" rel="bookmark" title="Permanent Link to <?php the_title(); ?>"><?php the_title(); ?></a></h3>
+ <h3 id="post-<?php the_ID(); ?>"><a href="<?php the_permalink() ?>" rel="bookmark" title="Permanent Link to <?php the_title_attribute(); ?>"><?php the_title(); ?></a></h3>
<small><?php the_time('l, F jS, Y') ?></small>
<div class="entry">
<?php the_content() ?>
</div>
- <p class="postmetadata">Posted in <?php the_category(', ') ?> | <?php edit_post_link('Edit', '', ' | '); ?> <?php comments_popup_link('No Comments &#187;', '1 Comment &#187;', '% Comments &#187;'); ?></p>
+ <p class="postmetadata"><?php the_tags('Tags: ', ', ', '<br />'); ?> Posted in <?php the_category(', ') ?> | <?php edit_post_link('Edit', '', ' | '); ?> <?php comments_popup_link('No Comments &#187;', '1 Comment &#187;', '% Comments &#187;'); ?></p>
</div>
<?php endwhile; ?>
<div class="navigation">
- <div class="alignleft"><?php next_posts_link('&laquo; Previous Entries') ?></div>
- <div class="alignright"><?php previous_posts_link('Next Entries &raquo;') ?></div>
+ <div class="alignleft"><?php next_posts_link('&laquo; Older Entries') ?></div>
+ <div class="alignright"><?php previous_posts_link('Newer Entries &raquo;') ?></div>
</div>
<?php else : ?>
diff --git a/wp-content/themes/default/attachment.php b/wp-content/themes/default/attachment.php
index 7839b6c..779af0d 100644
--- a/wp-content/themes/default/attachment.php
+++ b/wp-content/themes/default/attachment.php
@@ -11,7 +11,7 @@
<?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> &raquo; <a href="<?php echo get_permalink() ?>" rel="bookmark" title="Permanent Link: <?php the_title(); ?>"><?php the_title(); ?></a></h2>
+ <h2><a href="<?php echo get_permalink($post->post_parent); ?>" rev="attachment"><?php echo get_the_title($post->post_parent); ?></a> &raquo; <a href="<?php echo get_permalink() ?>" rel="bookmark" title="Permanent Link: <?php the_title_attribute(); ?>"><?php the_title(); ?></a></h2>
<div class="entry">
<p class="<?php echo $classname; ?>"><?php echo $attachment_link; ?><br /><?php echo basename($post->guid); ?></p>
@@ -25,18 +25,18 @@
<?php /* This is commented, because it requires a little adjusting sometimes.
You'll need to download this plugin, and follow the instructions:
http://binarybonsai.com/archives/2004/08/17/time-since-plugin/ */
- /* $entry_datetime = abs(strtotime($post->post_date) - (60*120)); echo time_since($entry_datetime); echo ' ago'; */ ?>
+ /* $entry_datetime = abs(strtotime($post->post_date) - (60*120)); echo time_since($entry_datetime); echo ' ago'; */ ?>
on <?php the_time('l, F jS, Y') ?> at <?php the_time() ?>
and is filed under <?php the_category(', ') ?>.
- You can follow any responses to this entry through the <?php comments_rss_link('RSS 2.0'); ?> feed.
+ You can follow any responses to this entry through the <?php comments_rss_link('RSS 2.0'); ?> feed.
<?php if (('open' == $post-> comment_status) && ('open' == $post->ping_status)) {
// Both Comments and Pings are open ?>
- You can <a href="#respond">leave a response</a>, or <a href="<?php trackback_url(true); ?>" rel="trackback">trackback</a> from your own site.
+ You can <a href="#respond">leave a response</a>, or <a href="<?php trackback_url(); ?>" rel="trackback">trackback</a> from your own site.
<?php } elseif (!('open' == $post-> comment_status) && ('open' == $post->ping_status)) {
// Only Pings are Open ?>
- Responses are currently closed, but you can <a href="<?php trackback_url(true); ?> " rel="trackback">trackback</a> from your own site.
+ Responses are currently closed, but you can <a href="<?php trackback_url(); ?> " rel="trackback">trackback</a> from your own site.
<?php } elseif (('open' == $post-> comment_status) && !('open' == $post->ping_status)) {
// Comments are open, Pings are not ?>
diff --git a/wp-content/themes/default/comments.php b/wp-content/themes/default/comments.php
index a9f1f39..33534ff 100644
--- a/wp-content/themes/default/comments.php
+++ b/wp-content/themes/default/comments.php
@@ -66,7 +66,7 @@
<h3 id="respond">Leave a Reply</h3>
<?php if ( get_option('comment_registration') && !$user_ID ) : ?>
-<p>You must be <a href="<?php echo get_option('siteurl'); ?>/wp-login.php?redirect_to=<?php the_permalink(); ?>">logged in</a> to post a comment.</p>
+<p>You must be <a href="<?php echo get_option('siteurl'); ?>/wp-login.php?redirect_to=<?php echo urlencode(get_permalink()); ?>">logged in</a> to post a comment.</p>
<?php else : ?>
<form action="<?php echo get_option('siteurl'); ?>/wp-comments-post.php" method="post" id="commentform">
diff --git a/wp-content/themes/default/index.php b/wp-content/themes/default/index.php
index 9aa2c16..e56746e 100644
--- a/wp-content/themes/default/index.php
+++ b/wp-content/themes/default/index.php
@@ -14,14 +14,14 @@
<?php the_content('Read the rest of this entry &raquo;'); ?>
</div>
- <p class="postmetadata">Posted in <?php the_category(', ') ?> | <?php edit_post_link('Edit', '', ' | '); ?> <?php comments_popup_link('No Comments &#187;', '1 Comment &#187;', '% Comments &#187;'); ?></p>
+ <p class="postmetadata"><?php the_tags('Tags: ', ', ', '<br />'); ?> Posted in <?php the_category(', ') ?> | <?php edit_post_link('Edit', '', ' | '); ?> <?php comments_popup_link('No Comments &#187;', '1 Comment &#187;', '% Comments &#187;'); ?></p>
</div>
<?php endwhile; ?>
<div class="navigation">
- <div class="alignleft"><?php next_posts_link('&laquo; Previous Entries') ?></div>
- <div class="alignright"><?php previous_posts_link('Next Entries &raquo;') ?></div>
+ <div class="alignleft"><?php next_posts_link('&laquo; Older Entries') ?></div>
+ <div class="alignright"><?php previous_posts_link('Newer Entries &raquo;') ?></div>
</div>
<?php else : ?>
diff --git a/wp-content/themes/default/rtl.css b/wp-content/themes/default/rtl.css
index 3dc1c29..daa5bba 100644
--- a/wp-content/themes/default/rtl.css
+++ b/wp-content/themes/default/rtl.css
@@ -3,18 +3,23 @@
.narrowcolumn, .alignleft, .widecolumn .smallattachment { float: right; }
.alignright, #commentform #submit { float: left; }
-#page, #wp-calendar #prev a { text-align: right; }
+#page, .post, #wp-calendar #prev a { text-align: right; }
+body, #commentform p { font-family: 'Geeza Pro', Tahoma, 'Lucida Grande', Verdana, Arial, Sans-Serif; }
-body, #commentform p { font-family: Tahoma, 'Lucida Grande', Verdana, Arial, Sans-Serif; }
+small { font-family: 'Geeza Pro', Tahoma, Arial, Helvetica, Sans-Serif; }
-small { font-family: Tahoma, Arial, Helvetica, Sans-Serif; }
+h1, h2, h3 { font-family: 'Al Bayan', 'Traditional Arabic', 'Trebuchet MS', 'Lucida Grande', Verdana, Arial, Sans-Serif; }
-.commentlist li, #commentform input, #commentform textarea { font: 0.9em Tahoma, 'Lucida Grande', Verdana, Arial, Sans-Serif; }
+#sidebar h2 { font-family: 'Al Bayan', 'Traditional Arabic', 'Lucida Grande', Verdana, Sans-Serif; }
-#sidebar { font: 1em Tahoma, 'Lucida Grande', Verdana, Arial, Sans-Serif; }
+.commentlist li, #commentform input, #commentform textarea { font-family: 'Geeza Pro', Tahoma, 'Lucida Grande', Verdana, Arial, Sans-Serif; }
-#wp-calendar caption { font: bold 1.3em Tahoma, 'Lucida Grande', Verdana, Arial, Sans-Serif; }
+#sidebar { font-family: 'Geeza Pro', Tahoma, 'Lucida Grande', Verdana, Arial, Sans-Serif; }
+
+#wp-calendar caption { font-family: 'Geeza Pro', Tahoma, 'Lucida Grande', Verdana, Arial, Sans-Serif; }
+
+acronym, abbr, span.caps { letter-spacing: normal; }
#header { margin: 0 1px 0 0; }
@@ -40,24 +45,34 @@ img.alignleft { margin: 0 0 2px 7px; }
.commentlist p { margin: 10px 0 10px 5px; }
-#sidebar { margin-right: 545px; }
-
-#wp-calendar #prev a, html>body .entry ul { padding-right: 10px; }
-
html>body .entry li { margin: 7px 10px 8px 0; }
html>body .entry ul {
+ margin-left: auto;
margin-right: 0px;
padding: 0 30px 0 0;
}
+#sidebar {
+ margin-left: auto;
+ margin-right: 545px;
+}
+
+#wp-calendar #prev a, html>body .entry ul {
+ padding-left: 0;
+ padding-right: 10px;
+}
+
blockquote {
- margin: 15px 10px 0 30px;
- padding-right: 20px;
+ border-left: 0;
border-right: 5px solid #ddd;
+ padding-left: 0;
+ padding-right: 20px;
+ margin: 15px 10px 0 30px;
}
#wp-calendar #next a {
+ padding-right: 0;
padding-left: 10px;
text-align: left;
}
diff --git a/wp-content/themes/default/search.php b/wp-content/themes/default/search.php
index 3fafd0a..7f4c69c 100644
--- a/wp-content/themes/default/search.php
+++ b/wp-content/themes/default/search.php
@@ -7,25 +7,25 @@
<h2 class="pagetitle">Search Results</h2>
<div class="navigation">
- <div class="alignleft"><?php next_posts_link('&laquo; Previous Entries') ?></div>
- <div class="alignright"><?php previous_posts_link('Next Entries &raquo;') ?></div>
+ <div class="alignleft"><?php next_posts_link('&laquo; Older Entries') ?></div>
+ <div class="alignright"><?php previous_posts_link('Newer Entries &raquo;') ?></div>
</div>
<?php while (have_posts()) : the_post(); ?>
<div class="post">
- <h3 id="post-<?php the_ID(); ?>"><a href="<?php the_permalink() ?>" rel="bookmark" title="Permanent Link to <?php the_title(); ?>"><?php the_title(); ?></a></h3>
+ <h3 id="post-<?php the_ID(); ?>"><a href="<?php the_permalink() ?>" rel="bookmark" title="Permanent Link to <?php the_title_attribute(); ?>"><?php the_title(); ?></a></h3>
<small><?php the_time('l, F jS, Y') ?></small>
- <p class="postmetadata">Posted in <?php the_category(', ') ?> | <?php edit_post_link('Edit', '', ' | '); ?> <?php comments_popup_link('No Comments &#187;', '1 Comment &#187;', '% Comments &#187;'); ?></p>
+ <p class="postmetadata"><?php the_tags('Tags: ', ', ', '<br />'); ?> Posted in <?php the_category(', ') ?> | <?php edit_post_link('Edit', '', ' | '); ?> <?php comments_popup_link('No Comments &#187;', '1 Comment &#187;', '% Comments &#187;'); ?></p>
</div>
<?php endwhile; ?>
<div class="navigation">
- <div class="alignleft"><?php next_posts_link('&laquo; Previous Entries') ?></div>
- <div class="alignright"><?php previous_posts_link('Next Entries &raquo;') ?></div>
+ <div class="alignleft"><?php next_posts_link('&laquo; Older Entries') ?></div>
+ <div class="alignright"><?php previous_posts_link('Newer Entries &raquo;') ?></div>
</div>
<?php else : ?>
diff --git a/wp-content/themes/default/sidebar.php b/wp-content/themes/default/sidebar.php
index 1cb2dea..6f45298 100644
--- a/wp-content/themes/default/sidebar.php
+++ b/wp-content/themes/default/sidebar.php
@@ -21,26 +21,26 @@
<p>You are currently browsing the archives for the <?php single_cat_title(''); ?> category.</p>
<?php /* If this is a yearly archive */ } elseif (is_day()) { ?>
- <p>You are currently browsing the <a href="<?php bloginfo('url'); ?>/"><?php echo bloginfo('name'); ?></a> weblog archives
+ <p>You are currently browsing the <a href="<?php bloginfo('url'); ?>/"><?php echo bloginfo('name'); ?></a> blog archives
for the day <?php the_time('l, F jS, Y'); ?>.</p>
<?php /* If this is a monthly archive */ } elseif (is_month()) { ?>
- <p>You are currently browsing the <a href="<?php bloginfo('url'); ?>/"><?php echo bloginfo('name'); ?></a> weblog archives
+ <p>You are currently browsing the <a href="<?php bloginfo('url'); ?>/"><?php echo bloginfo('name'); ?></a> blog archives
for <?php the_time('F, Y'); ?>.</p>
<?php /* If this is a yearly archive */ } elseif (is_year()) { ?>
- <p>You are currently browsing the <a href="<?php bloginfo('url'); ?>/"><?php echo bloginfo('name'); ?></a> weblog archives
+ <p>You are currently browsing the <a href="<?php bloginfo('url'); ?>/"><?php echo bloginfo('name'); ?></a> blog archives
for the year <?php the_time('Y'); ?>.</p>
<?php /* If this is a monthly archive */ } elseif (is_search()) { ?>
- <p>You have searched the <a href="<?php echo bloginfo('url'); ?>/"><?php echo bloginfo('name'); ?></a> weblog archives
+ <p>You have searched the <a href="<?php echo bloginfo('url'); ?>/"><?php echo bloginfo('name'); ?></a> blog archives
for <strong>'<?php the_search_query(); ?>'</strong>. If you are unable to find anything in these search results, you can try one of these links.</p>
<?php /* If this is a monthly archive */ } elseif (isset($_GET['paged']) && !empty($_GET['paged'])) { ?>
- <p>You are currently browsing the <a href="<?php echo bloginfo('url'); ?>/"><?php echo bloginfo('name'); ?></a> weblog archives.</p>
+ <p>You are currently browsing the <a href="<?php echo bloginfo('url'); ?>/"><?php echo bloginfo('name'); ?></a> blog archives.</p>
<?php } ?>
-
+
</li> <?php }?>
<?php wp_list_pages('title_li=<h2>Pages</h2>' ); ?>
@@ -70,7 +70,7 @@
</ul>
</li>
<?php } ?>
-
+
<?php endif; ?>
</ul>
</div>
diff --git a/wp-content/themes/default/single.php b/wp-content/themes/default/single.php
index 967a065..d270c05 100644
--- a/wp-content/themes/default/single.php
+++ b/wp-content/themes/default/single.php
@@ -10,12 +10,13 @@
</div>
<div class="post" id="post-<?php the_ID(); ?>">
- <h2><a href="<?php echo get_permalink() ?>" rel="bookmark" title="Permanent Link: <?php the_title(); ?>"><?php the_title(); ?></a></h2>
+ <h2><a href="<?php echo get_permalink() ?>" rel="bookmark" title="Permanent Link: <?php the_title_attribute(); ?>"><?php the_title(); ?></a></h2>
<div class="entry">
<?php the_content('<p class="serif">Read the rest of this entry &raquo;</p>'); ?>
<?php wp_link_pages(array('before' => '<p><strong>Pages:</strong> ', 'after' => '</p>', 'next_or_number' => 'number')); ?>
+ <?php the_tags( '<p>Tags: ', ', ', '</p>'); ?>
<p class="postmetadata alt">
<small>
@@ -30,11 +31,11 @@
<?php if (('open' == $post-> comment_status) && ('open' == $post->ping_status)) {
// Both Comments and Pings are open ?>
- You can <a href="#respond">leave a response</a>, or <a href="<?php trackback_url(true); ?>" rel="trackback">trackback</a> from your own site.
+ You can <a href="#respond">leave a response</a>, or <a href="<?php trackback_url(); ?>" rel="trackback">trackback</a> from your own site.
<?php } elseif (!('open' == $post-> comment_status) && ('open' == $post->ping_status)) {
// Only Pings are Open ?>
- Responses are currently closed, but you can <a href="<?php trackback_url(true); ?> " rel="trackback">trackback</a> from your own site.
+ Responses are currently closed, but you can <a href="<?php trackback_url(); ?> " rel="trackback">trackback</a> from your own site.
<?php } elseif (('open' == $post-> comment_status) && !('open' == $post->ping_status)) {
// Comments are open, Pings are not ?>
diff --git a/wp-content/themes/home/archive.php b/wp-content/themes/home/archive.php
index db6db4c..769f9ab 100644
--- a/wp-content/themes/home/archive.php
+++ b/wp-content/themes/home/archive.php
@@ -1,13 +1,14 @@
<?php get_header(); ?>
<div id="content" class="narrowcolumn">
-
+<?php is_tag(); ?>
<?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">Archive for the &#8216;<?php single_cat_title(); ?>&#8217; Category</h2>
-
+ <?php /* If this is a tag archive */ } elseif( is_tag() ) { ?>
+ <h2 class="pagetitle">Posts Tagged &#8216;<?php single_tag_title(); ?>&#8217;</h2>
<?php /* If this is a daily archive */ } elseif (is_day()) { ?>
<h2 class="pagetitle">Archive for <?php the_time('F jS, Y'); ?></h2>
<?php /* If this is a monthly archive */ } elseif (is_month()) { ?>
@@ -22,28 +23,28 @@
<div class="navigation">
- <div class="alignleft"><?php next_posts_link('&laquo; Previous Entries') ?></div>
- <div class="alignright"><?php previous_posts_link('Next Entries &raquo;') ?></div>
+ <div class="alignleft"><?php next_posts_link('&laquo; Older Entries') ?></div>
+ <div class="alignright"><?php previous_posts_link('Newer Entries &raquo;') ?></div>
</div>
<?php while (have_posts()) : the_post(); ?>
<div class="post">
- <h3 id="post-<?php the_ID(); ?>"><a href="<?php the_permalink() ?>" rel="bookmark" title="Permanent Link to <?php the_title(); ?>"><?php the_title(); ?></a></h3>
+ <h3 id="post-<?php the_ID(); ?>"><a href="<?php the_permalink() ?>" rel="bookmark" title="Permanent Link to <?php the_title_attribute(); ?>"><?php the_title(); ?></a></h3>
<small><?php the_time('l, F jS, Y') ?></small>
<div class="entry">
<?php the_content() ?>
</div>
- <p class="postmetadata">Posted in <?php the_category(', ') ?> | <?php edit_post_link('Edit', '', ' | '); ?> <?php comments_popup_link('No Comments &#187;', '1 Comment &#187;', '% Comments &#187;'); ?></p>
+ <p class="postmetadata"><?php the_tags('Tags: ', ', ', '<br />'); ?> Posted in <?php the_category(', ') ?> | <?php edit_post_link('Edit', '', ' | '); ?> <?php comments_popup_link('No Comments &#187;', '1 Comment &#187;', '% Comments &#187;'); ?></p>
</div>
<?php endwhile; ?>
<div class="navigation">
- <div class="alignleft"><?php next_posts_link('&laquo; Previous Entries') ?></div>
- <div class="alignright"><?php previous_posts_link('Next Entries &raquo;') ?></div>
+ <div class="alignleft"><?php next_posts_link('&laquo; Older Entries') ?></div>
+ <div class="alignright"><?php previous_posts_link('Newer Entries &raquo;') ?></div>
</div>
<?php else : ?>
diff --git a/wp-content/themes/home/attachment.php b/wp-content/themes/home/attachment.php
index 7839b6c..779af0d 100644
--- a/wp-content/themes/home/attachment.php
+++ b/wp-content/themes/home/attachment.php
@@ -11,7 +11,7 @@
<?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> &raquo; <a href="<?php echo get_permalink() ?>" rel="bookmark" title="Permanent Link: <?php the_title(); ?>"><?php the_title(); ?></a></h2>
+ <h2><a href="<?php echo get_permalink($post->post_parent); ?>" rev="attachment"><?php echo get_the_title($post->post_parent); ?></a> &raquo; <a href="<?php echo get_permalink() ?>" rel="bookmark" title="Permanent Link: <?php the_title_attribute(); ?>"><?php the_title(); ?></a></h2>
<div class="entry">
<p class="<?php echo $classname; ?>"><?php echo $attachment_link; ?><br /><?php echo basename($post->guid); ?></p>
@@ -25,18 +25,18 @@
<?php /* This is commented, because it requires a little adjusting sometimes.
You'll need to download this plugin, and follow the instructions:
http://binarybonsai.com/archives/2004/08/17/time-since-plugin/ */
- /* $entry_datetime = abs(strtotime($post->post_date) - (60*120)); echo time_since($entry_datetime); echo ' ago'; */ ?>
+ /* $entry_datetime = abs(strtotime($post->post_date) - (60*120)); echo time_since($entry_datetime); echo ' ago'; */ ?>
on <?php the_time('l, F jS, Y') ?> at <?php the_time() ?>
and is filed under <?php the_category(', ') ?>.
- You can follow any responses to this entry through the <?php comments_rss_link('RSS 2.0'); ?> feed.
+ You can follow any responses to this entry through the <?php comments_rss_link('RSS 2.0'); ?> feed.
<?php if (('open' == $post-> comment_status) && ('open' == $post->ping_status)) {
// Both Comments and Pings are open ?>
- You can <a href="#respond">leave a response</a>, or <a href="<?php trackback_url(true); ?>" rel="trackback">trackback</a> from your own site.
+ You can <a href="#respond">leave a response</a>, or <a href="<?php trackback_url(); ?>" rel="trackback">trackback</a> from your own site.
<?php } elseif (!('open' == $post-> comment_status) && ('open' == $post->ping_status)) {
// Only Pings are Open ?>
- Responses are currently closed, but you can <a href="<?php trackback_url(true); ?> " rel="trackback">trackback</a> from your own site.
+ Responses are currently closed, but you can <a href="<?php trackback_url(); ?> " rel="trackback">trackback</a> from your own site.
<?php } elseif (('open' == $post-> comment_status) && !('open' == $post->ping_status)) {
// Comments are open, Pings are not ?>
diff --git a/wp-content/themes/home/comments.php b/wp-content/themes/home/comments.php
index a9f1f39..33534ff 100644
--- a/wp-content/themes/home/comments.php
+++ b/wp-content/themes/home/comments.php
@@ -66,7 +66,7 @@
<h3 id="respond">Leave a Reply</h3>
<?php if ( get_option('comment_registration') && !$user_ID ) : ?>
-<p>You must be <a href="<?php echo get_option('siteurl'); ?>/wp-login.php?redirect_to=<?php the_permalink(); ?>">logged in</a> to post a comment.</p>
+<p>You must be <a href="<?php echo get_option('siteurl'); ?>/wp-login.php?redirect_to=<?php echo urlencode(get_permalink()); ?>">logged in</a> to post a comment.</p>
<?php else : ?>
<form action="<?php echo get_option('siteurl'); ?>/wp-comments-post.php" method="post" id="commentform">
diff --git a/wp-content/themes/home/functions.php b/wp-content/themes/home/functions.php
index faf85ad..456ed69 100644
--- a/wp-content/themes/home/functions.php
+++ b/wp-content/themes/home/functions.php
@@ -384,7 +384,7 @@ function kubrick_theme_page() {
</form>
</div>
<div id="jsForm">
- <form style="display:inline;" method="post" name="hicolor" id="hicolor" action="<?php echo $_SERVER['REQUEST_URI']; ?>">
+ <form style="display:inline;" method="post" name="hicolor" id="hicolor" action="<?php echo attribute_escape($_SERVER['REQUEST_URI']); ?>">
<?php wp_nonce_field('kubrick-header'); ?>
<input type="button" onclick="tgt=document.getElementById('fontcolor');colorSelect(tgt,'pick1');return false;" name="pick1" id="pick1" value="<?php echo attribute_escape(__('Font Color')); ?>"></input>
<input type="button" onclick="tgt=document.getElementById('uppercolor');colorSelect(tgt,'pick2');return false;" name="pick2" id="pick2" value="<?php echo attribute_escape(__('Upper Color')); ?>"></input>
diff --git a/wp-content/themes/home/index.php b/wp-content/themes/home/index.php
index 9aa2c16..e56746e 100644
--- a/wp-content/themes/home/index.php
+++ b/wp-content/themes/home/index.php
@@ -14,14 +14,14 @@
<?php the_content('Read the rest of this entry &raquo;'); ?>
</div>
- <p class="postmetadata">Posted in <?php the_category(', ') ?> | <?php edit_post_link('Edit', '', ' | '); ?> <?php comments_popup_link('No Comments &#187;', '1 Comment &#187;', '% Comments &#187;'); ?></p>
+ <p class="postmetadata"><?php the_tags('Tags: ', ', ', '<br />'); ?> Posted in <?php the_category(', ') ?> | <?php edit_post_link('Edit', '', ' | '); ?> <?php comments_popup_link('No Comments &#187;', '1 Comment &#187;', '% Comments &#187;'); ?></p>
</div>
<?php endwhile; ?>
<div class="navigation">
- <div class="alignleft"><?php next_posts_link('&laquo; Previous Entries') ?></div>
- <div class="alignright"><?php previous_posts_link('Next Entries &raquo;') ?></div>
+ <div class="alignleft"><?php next_posts_link('&laquo; Older Entries') ?></div>
+ <div class="alignright"><?php previous_posts_link('Newer Entries &raquo;') ?></div>
</div>
<?php else : ?>
diff --git a/wp-content/themes/home/rtl.css b/wp-content/themes/home/rtl.css
index 3dc1c29..daa5bba 100644
--- a/wp-content/themes/home/rtl.css
+++ b/wp-content/themes/home/rtl.css
@@ -3,18 +3,23 @@
.narrowcolumn, .alignleft, .widecolumn .smallattachment { float: right; }
.alignright, #commentform #submit { float: left; }
-#page, #wp-calendar #prev a { text-align: right; }
+#page, .post, #wp-calendar #prev a { text-align: right; }
+body, #commentform p { font-family: 'Geeza Pro', Tahoma, 'Lucida Grande', Verdana, Arial, Sans-Serif; }
-body, #commentform p { font-family: Tahoma, 'Lucida Grande', Verdana, Arial, Sans-Serif; }
+small { font-family: 'Geeza Pro', Tahoma, Arial, Helvetica, Sans-Serif; }
-small { font-family: Tahoma, Arial, Helvetica, Sans-Serif; }
+h1, h2, h3 { font-family: 'Al Bayan', 'Traditional Arabic', 'Trebuchet MS', 'Lucida Grande', Verdana, Arial, Sans-Serif; }
-.commentlist li, #commentform input, #commentform textarea { font: 0.9em Tahoma, 'Lucida Grande', Verdana, Arial, Sans-Serif; }
+#sidebar h2 { font-family: 'Al Bayan', 'Traditional Arabic', 'Lucida Grande', Verdana, Sans-Serif; }
-#sidebar { font: 1em Tahoma, 'Lucida Grande', Verdana, Arial, Sans-Serif; }
+.commentlist li, #commentform input, #commentform textarea { font-family: 'Geeza Pro', Tahoma, 'Lucida Grande', Verdana, Arial, Sans-Serif; }
-#wp-calendar caption { font: bold 1.3em Tahoma, 'Lucida Grande', Verdana, Arial, Sans-Serif; }
+#sidebar { font-family: 'Geeza Pro', Tahoma, 'Lucida Grande', Verdana, Arial, Sans-Serif; }
+
+#wp-calendar caption { font-family: 'Geeza Pro', Tahoma, 'Lucida Grande', Verdana, Arial, Sans-Serif; }
+
+acronym, abbr, span.caps { letter-spacing: normal; }
#header { margin: 0 1px 0 0; }
@@ -40,24 +45,34 @@ img.alignleft { margin: 0 0 2px 7px; }
.commentlist p { margin: 10px 0 10px 5px; }
-#sidebar { margin-right: 545px; }
-
-#wp-calendar #prev a, html>body .entry ul { padding-right: 10px; }
-
html>body .entry li { margin: 7px 10px 8px 0; }
html>body .entry ul {
+ margin-left: auto;
margin-right: 0px;
padding: 0 30px 0 0;
}
+#sidebar {
+ margin-left: auto;
+ margin-right: 545px;
+}
+
+#wp-calendar #prev a, html>body .entry ul {
+ padding-left: 0;
+ padding-right: 10px;
+}
+
blockquote {
- margin: 15px 10px 0 30px;
- padding-right: 20px;
+ border-left: 0;
border-right: 5px solid #ddd;
+ padding-left: 0;
+ padding-right: 20px;
+ margin: 15px 10px 0 30px;
}
#wp-calendar #next a {
+ padding-right: 0;
padding-left: 10px;
text-align: left;
}
diff --git a/wp-content/themes/home/search.php b/wp-content/themes/home/search.php
index 3fafd0a..7f4c69c 100644
--- a/wp-content/themes/home/search.php
+++ b/wp-content/themes/home/search.php
@@ -7,25 +7,25 @@
<h2 class="pagetitle">Search Results</h2>
<div class="navigation">
- <div class="alignleft"><?php next_posts_link('&laquo; Previous Entries') ?></div>
- <div class="alignright"><?php previous_posts_link('Next Entries &raquo;') ?></div>
+ <div class="alignleft"><?php next_posts_link('&laquo; Older Entries') ?></div>
+ <div class="alignright"><?php previous_posts_link('Newer Entries &raquo;') ?></div>
</div>
<?php while (have_posts()) : the_post(); ?>
<div class="post">
- <h3 id="post-<?php the_ID(); ?>"><a href="<?php the_permalink() ?>" rel="bookmark" title="Permanent Link to <?php the_title(); ?>"><?php the_title(); ?></a></h3>
+ <h3 id="post-<?php the_ID(); ?>"><a href="<?php the_permalink() ?>" rel="bookmark" title="Permanent Link to <?php the_title_attribute(); ?>"><?php the_title(); ?></a></h3>
<small><?php the_time('l, F jS, Y') ?></small>
- <p class="postmetadata">Posted in <?php the_category(', ') ?> | <?php edit_post_link('Edit', '', ' | '); ?> <?php comments_popup_link('No Comments &#187;', '1 Comment &#187;', '% Comments &#187;'); ?></p>
+ <p class="postmetadata"><?php the_tags('Tags: ', ', ', '<br />'); ?> Posted in <?php the_category(', ') ?> | <?php edit_post_link('Edit', '', ' | '); ?> <?php comments_popup_link('No Comments &#187;', '1 Comment &#187;', '% Comments &#187;'); ?></p>
</div>
<?php endwhile; ?>
<div class="navigation">
- <div class="alignleft"><?php next_posts_link('&laquo; Previous Entries') ?></div>
- <div class="alignright"><?php previous_posts_link('Next Entries &raquo;') ?></div>
+ <div class="alignleft"><?php next_posts_link('&laquo; Older Entries') ?></div>
+ <div class="alignright"><?php previous_posts_link('Newer Entries &raquo;') ?></div>
</div>
<?php else : ?>
diff --git a/wp-content/themes/home/sidebar.php b/wp-content/themes/home/sidebar.php
index 0fdccda..72a015a 100644
--- a/wp-content/themes/home/sidebar.php
+++ b/wp-content/themes/home/sidebar.php
@@ -29,26 +29,26 @@
<p>You are currently browsing the archives for the <?php single_cat_title(''); ?> category.</p>
<?php /* If this is a yearly archive */ } elseif (is_day()) { ?>
- <p>You are currently browsing the <a href="<?php bloginfo('url'); ?>/"><?php echo bloginfo('name'); ?></a> weblog archives
+ <p>You are currently browsing the <a href="<?php bloginfo('url'); ?>/"><?php echo bloginfo('name'); ?></a> blog archives
for the day <?php the_time('l, F jS, Y'); ?>.</p>
<?php /* If this is a monthly archive */ } elseif (is_month()) { ?>
- <p>You are currently browsing the <a href="<?php bloginfo('url'); ?>/"><?php echo bloginfo('name'); ?></a> weblog archives
+ <p>You are currently browsing the <a href="<?php bloginfo('url'); ?>/"><?php echo bloginfo('name'); ?></a> blog archives
for <?php the_time('F, Y'); ?>.</p>
<?php /* If this is a yearly archive */ } elseif (is_year()) { ?>
- <p>You are currently browsing the <a href="<?php bloginfo('url'); ?>/"><?php echo bloginfo('name'); ?></a> weblog archives
+ <p>You are currently browsing the <a href="<?php bloginfo('url'); ?>/"><?php echo bloginfo('name'); ?></a> blog archives
for the year <?php the_time('Y'); ?>.</p>
<?php /* If this is a monthly archive */ } elseif (is_search()) { ?>
- <p>You have searched the <a href="<?php echo bloginfo('url'); ?>/"><?php echo bloginfo('name'); ?></a> weblog archives
+ <p>You have searched the <a href="<?php echo bloginfo('url'); ?>/"><?php echo bloginfo('name'); ?></a> blog archives
for <strong>'<?php the_search_query(); ?>'</strong>. If you are unable to find anything in these search results, you can try one of these links.</p>
<?php /* If this is a monthly archive */ } elseif (isset($_GET['paged']) && !empty($_GET['paged'])) { ?>
- <p>You are currently browsing the <a href="<?php echo bloginfo('url'); ?>/"><?php echo bloginfo('name'); ?></a> weblog archives.</p>
+ <p>You are currently browsing the <a href="<?php echo bloginfo('url'); ?>/"><?php echo bloginfo('name'); ?></a> blog archives.</p>
<?php } ?>
-
+
</li> <?php }?>
<?php wp_list_pages('title_li=<h2>Pages</h2>' ); ?>
@@ -78,7 +78,7 @@
</ul>
</li>
<?php } ?>
-
+
<?php endif; ?>
</ul>
</div>
diff --git a/wp-content/themes/home/single.php b/wp-content/themes/home/single.php
index 967a065..d270c05 100644
--- a/wp-content/themes/home/single.php
+++ b/wp-content/themes/home/single.php
@@ -10,12 +10,13 @@
</div>
<div class="post" id="post-<?php the_ID(); ?>">
- <h2><a href="<?php echo get_permalink() ?>" rel="bookmark" title="Permanent Link: <?php the_title(); ?>"><?php the_title(); ?></a></h2>
+ <h2><a href="<?php echo get_permalink() ?>" rel="bookmark" title="Permanent Link: <?php the_title_attribute(); ?>"><?php the_title(); ?></a></h2>
<div class="entry">
<?php the_content('<p class="serif">Read the rest of this entry &raquo;</p>'); ?>
<?php wp_link_pages(array('before' => '<p><strong>Pages:</strong> ', 'after' => '</p>', 'next_or_number' => 'number')); ?>
+ <?php the_tags( '<p>Tags: ', ', ', '</p>'); ?>
<p class="postmetadata alt">
<small>
@@ -30,11 +31,11 @@
<?php if (('open' == $post-> comment_status) && ('open' == $post->ping_status)) {
// Both Comments and Pings are open ?>
- You can <a href="#respond">leave a response</a>, or <a href="<?php trackback_url(true); ?>" rel="trackback">trackback</a> from your own site.
+ You can <a href="#respond">leave a response</a>, or <a href="<?php trackback_url(); ?>" rel="trackback">trackback</a> from your own site.
<?php } elseif (!('open' == $post-> comment_status) && ('open' == $post->ping_status)) {
// Only Pings are Open ?>
- Responses are currently closed, but you can <a href="<?php trackback_url(true); ?> " rel="trackback">trackback</a> from your own site.
+ Responses are currently closed, but you can <a href="<?php trackback_url(); ?> " rel="trackback">trackback</a> from your own site.
<?php } elseif (('open' == $post-> comment_status) && !('open' == $post->ping_status)) {
// Comments are open, Pings are not ?>