diff --git a/wp-content/themes/twentyten/functions.php b/wp-content/themes/twentyten/functions.php
index 67be12ccd595e2f5fd0b9f6d9034bd60b1ebdbc4..adc7e7a97dcaf991a03a035f9528d41f848e769c 100644
--- a/wp-content/themes/twentyten/functions.php
+++ b/wp-content/themes/twentyten/functions.php
@@ -200,7 +200,7 @@ if ( ! function_exists( 'twentyten_admin_header_style' ) ) :
*/
function twentyten_admin_header_style() {
?>
-<style type="text/css">
+<style type="text/css" id="twentyten-admin-header-css">
/* Shows the same border as on front end */
#headimg {
border-bottom: 1px solid #000;
@@ -383,7 +383,7 @@ function twentyten_widgets_init() {
register_sidebar( array(
'name' => __( 'Primary Widget Area', 'twentyten' ),
'id' => 'primary-widget-area',
- 'description' => __( 'The primary widget area', 'twentyten' ),
+ 'description' => __( 'Add widgets here to appear in your sidebar.', 'twentyten' ),
'before_widget' => '<li id="%1$s" class="widget-container %2$s">',
'after_widget' => '</li>',
'before_title' => '<h3 class="widget-title">',
@@ -394,7 +394,7 @@ function twentyten_widgets_init() {
register_sidebar( array(
'name' => __( 'Secondary Widget Area', 'twentyten' ),
'id' => 'secondary-widget-area',
- 'description' => __( 'The secondary widget area', 'twentyten' ),
+ 'description' => __( 'An optional secondary widget area, displays below the primary widget area in your sidebar.', 'twentyten' ),
'before_widget' => '<li id="%1$s" class="widget-container %2$s">',
'after_widget' => '</li>',
'before_title' => '<h3 class="widget-title">',
@@ -405,7 +405,7 @@ function twentyten_widgets_init() {
register_sidebar( array(
'name' => __( 'First Footer Widget Area', 'twentyten' ),
'id' => 'first-footer-widget-area',
- 'description' => __( 'The first footer widget area', 'twentyten' ),
+ 'description' => __( 'An optional widget area for your site footer.', 'twentyten' ),
'before_widget' => '<li id="%1$s" class="widget-container %2$s">',
'after_widget' => '</li>',
'before_title' => '<h3 class="widget-title">',
@@ -416,7 +416,7 @@ function twentyten_widgets_init() {
register_sidebar( array(
'name' => __( 'Second Footer Widget Area', 'twentyten' ),
'id' => 'second-footer-widget-area',
- 'description' => __( 'The second footer widget area', 'twentyten' ),
+ 'description' => __( 'An optional widget area for your site footer.', 'twentyten' ),
'before_widget' => '<li id="%1$s" class="widget-container %2$s">',
'after_widget' => '</li>',
'before_title' => '<h3 class="widget-title">',
@@ -427,7 +427,7 @@ function twentyten_widgets_init() {
register_sidebar( array(
'name' => __( 'Third Footer Widget Area', 'twentyten' ),
'id' => 'third-footer-widget-area',
- 'description' => __( 'The third footer widget area', 'twentyten' ),
+ 'description' => __( 'An optional widget area for your site footer.', 'twentyten' ),
'before_widget' => '<li id="%1$s" class="widget-container %2$s">',
'after_widget' => '</li>',
'before_title' => '<h3 class="widget-title">',
@@ -438,7 +438,7 @@ function twentyten_widgets_init() {
register_sidebar( array(
'name' => __( 'Fourth Footer Widget Area', 'twentyten' ),
'id' => 'fourth-footer-widget-area',
- 'description' => __( 'The fourth footer widget area', 'twentyten' ),
+ 'description' => __( 'An optional widget area for your site footer.', 'twentyten' ),
'before_widget' => '<li id="%1$s" class="widget-container %2$s">',
'after_widget' => '</li>',
'before_title' => '<h3 class="widget-title">',
@@ -514,3 +514,43 @@ function twentyten_posted_in() {
);
}
endif;
+
+/**
+ * Retrieves the IDs for images in a gallery.
+ *
+ * @uses get_post_galleries() first, if available. Falls back to shortcode parsing,
+ * then as last option uses a get_posts() call.
+ *
+ * @since Twenty Ten 1.6.
+ *
+ * @return array List of image IDs from the post gallery.
+ */
+function twentyten_get_gallery_images() {
+ $images = array();
+
+ if ( function_exists( 'get_post_galleries' ) ) {
+ $galleries = get_post_galleries( get_the_ID(), false );
+ if ( isset( $galleries[0]['ids'] ) )
+ $images = explode( ',', $galleries[0]['ids'] );
+ } else {
+ $pattern = get_shortcode_regex();
+ preg_match( "/$pattern/s", get_the_content(), $match );
+ $atts = shortcode_parse_atts( $match[3] );
+ if ( isset( $atts['ids'] ) )
+ $images = explode( ',', $atts['ids'] );
+ }
+
+ if ( ! $images ) {
+ $images = get_posts( array(
+ 'fields' => 'ids',
+ 'numberposts' => 999,
+ 'order' => 'ASC',
+ 'orderby' => 'menu_order',
+ 'post_mime_type' => 'image',
+ 'post_parent' => get_the_ID(),
+ 'post_type' => 'attachment',
+ ) );
+ }
+
+ return $images;
+}
diff --git a/wp-content/themes/twentyten/languages/twentyten.pot b/wp-content/themes/twentyten/languages/twentyten.pot
index c2ea97d264cff50d305af552d79a540950f446e8..b802e557be573268e3fc05f67f3b96d3b4dc5820 100644
--- a/wp-content/themes/twentyten/languages/twentyten.pot
+++ b/wp-content/themes/twentyten/languages/twentyten.pot
@@ -1,14 +1,14 @@
-# Copyright (C) 2012 the WordPress team
+# Copyright (C) 2013 the WordPress team
# This file is distributed under the GNU General Public License v2 or later.
msgid ""
msgstr ""
-"Project-Id-Version: Twenty Ten 1.4\n"
+"Project-Id-Version: Twenty Ten 1.6\n"
"Report-Msgid-Bugs-To: http://wordpress.org/tags/twentyten\n"
-"POT-Creation-Date: 2012-11-16 22:18:49+00:00\n"
+"POT-Creation-Date: 2013-05-22 21:14:02+00:00\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"PO-Revision-Date: 2012-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2013-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -83,7 +83,7 @@ msgstr ""
msgid "Comments are closed."
msgstr ""
-#. #-#-#-#-# twentyten.pot (Twenty Ten 1.4) #-#-#-#-#
+#. #-#-#-#-# twentyten.pot (Twenty Ten 1.6) #-#-#-#-#
#. Author URI of the plugin/theme
#: footer.php:33
msgid "http://wordpress.org/"
@@ -141,7 +141,7 @@ msgstr ""
msgid "Sunset"
msgstr ""
-#: functions.php:255 loop-attachment.php:104 loop.php:115 loop.php:143
+#: functions.php:255 loop-attachment.php:104 loop.php:114 loop.php:142
msgid "Continue reading <span class=\"meta-nav\">→</span>"
msgstr ""
@@ -171,7 +171,7 @@ msgid "Primary Widget Area"
msgstr ""
#: functions.php:386
-msgid "The primary widget area"
+msgid "Add widgets here to appear in your sidebar."
msgstr ""
#: functions.php:395
@@ -179,41 +179,31 @@ msgid "Secondary Widget Area"
msgstr ""
#: functions.php:397
-msgid "The secondary widget area"
+msgid ""
+"An optional secondary widget area, displays below the primary widget area in "
+"your sidebar."
msgstr ""
#: functions.php:406
msgid "First Footer Widget Area"
msgstr ""
-#: functions.php:408
-msgid "The first footer widget area"
+#: functions.php:408 functions.php:419 functions.php:430 functions.php:441
+msgid "An optional widget area for your site footer."
msgstr ""
#: functions.php:417
msgid "Second Footer Widget Area"
msgstr ""
-#: functions.php:419
-msgid "The second footer widget area"
-msgstr ""
-
#: functions.php:428
msgid "Third Footer Widget Area"
msgstr ""
-#: functions.php:430
-msgid "The third footer widget area"
-msgstr ""
-
#: functions.php:439
msgid "Fourth Footer Widget Area"
msgstr ""
-#: functions.php:441
-msgid "The fourth footer widget area"
-msgstr ""
-
#: functions.php:475
msgid ""
"<span class=\"%1$s\">Posted on</span> %2$s <span class=\"meta-sep\">by</"
@@ -276,11 +266,11 @@ msgid "Link to full-size image"
msgstr ""
#: loop-attachment.php:63 loop-attachment.php:111 loop-page.php:30
-#: loop-single.php:56 loop.php:100 loop.php:123 loop.php:165
+#: loop-single.php:56 loop.php:99 loop.php:122 loop.php:164
msgid "Edit"
msgstr ""
-#: loop-attachment.php:105 loop-page.php:29 loop-single.php:34 loop.php:144
+#: loop-attachment.php:105 loop-page.php:29 loop-single.php:34 loop.php:143
msgid "Pages:"
msgstr ""
@@ -298,11 +288,11 @@ msgstr ""
msgid "View all posts by %s <span class=\"meta-nav\">→</span>"
msgstr ""
-#: loop.php:25 loop.php:178
+#: loop.php:25 loop.php:177
msgid "<span class=\"meta-nav\">←</span> Older posts"
msgstr ""
-#: loop.php:26 loop.php:179
+#: loop.php:26 loop.php:178
msgid "Newer posts <span class=\"meta-nav\">→</span>"
msgstr ""
@@ -312,55 +302,55 @@ msgid ""
"searching will help find a related post."
msgstr ""
-#: loop.php:60 loop.php:95 loop.php:96
+#: loop.php:60 loop.php:94
msgctxt "gallery category slug"
msgid "gallery"
msgstr ""
-#: loop.php:62 loop.php:83 loop.php:131
-msgid "Permalink to %s"
-msgstr ""
-
-#: loop.php:82
+#: loop.php:81
msgid "This gallery contains <a %1$s>%2$s photo</a>."
msgid_plural "This gallery contains <a %1$s>%2$s photos</a>."
msgstr[0] ""
msgstr[1] ""
-#: loop.php:93
+#: loop.php:82
+msgid "Permalink to %s"
+msgstr ""
+
+#: loop.php:92
msgid "View Galleries"
msgstr ""
-#: loop.php:93 loop.php:96
+#: loop.php:92 loop.php:95
msgid "More Galleries"
msgstr ""
-#: loop.php:96
+#: loop.php:95
msgid "View posts in the Gallery category"
msgstr ""
-#: loop.php:99 loop.php:122 loop.php:164
+#: loop.php:98 loop.php:121 loop.php:163
msgid "Leave a comment"
msgstr ""
-#: loop.php:99 loop.php:122 loop.php:164
+#: loop.php:98 loop.php:121 loop.php:163
msgid "1 Comment"
msgstr ""
-#: loop.php:99 loop.php:122 loop.php:164
+#: loop.php:98 loop.php:121 loop.php:163
msgid "% Comments"
msgstr ""
-#: loop.php:106
+#: loop.php:105
msgctxt "asides category slug"
msgid "asides"
msgstr ""
-#: loop.php:151
+#: loop.php:150
msgid "<span class=\"%1$s\">Posted in</span> %2$s"
msgstr ""
-#: loop.php:160
+#: loop.php:159
msgid "<span class=\"%1$s\">Tagged</span> %2$s"
msgstr ""
@@ -395,7 +385,7 @@ msgid "Twenty Ten"
msgstr ""
#. Theme URI of the plugin/theme
-msgid "http://wordpress.org/extend/themes/twentyten"
+msgid "http://wordpress.org/themes/twentyten"
msgstr ""
#. Description of the plugin/theme
diff --git a/wp-content/themes/twentyten/loop.php b/wp-content/themes/twentyten/loop.php
index 044e14f12bcd3bed6f8d22fd88e6b1a7d38aad6c..a2d7f2ed135d939e9fbe052dd68a54b6555f8376 100644
--- a/wp-content/themes/twentyten/loop.php
+++ b/wp-content/themes/twentyten/loop.php
@@ -59,7 +59,7 @@
<?php if ( ( function_exists( 'get_post_format' ) && 'gallery' == get_post_format( $post->ID ) ) || in_category( _x( 'gallery', 'gallery category slug', 'twentyten' ) ) ) : ?>
<div id="post-<?php the_ID(); ?>" <?php post_class(); ?>>
- <h2 class="entry-title"><a href="<?php the_permalink(); ?>" title="<?php echo esc_attr( sprintf( __( 'Permalink to %s', 'twentyten' ), the_title_attribute( 'echo=0' ) ) ); ?>" rel="bookmark"><?php the_title(); ?></a></h2>
+ <h2 class="entry-title"><a href="<?php the_permalink(); ?>" rel="bookmark"><?php the_title(); ?></a></h2>
<div class="entry-meta">
<?php twentyten_posted_on(); ?>
@@ -70,20 +70,19 @@
<?php the_content(); ?>
<?php else : ?>
<?php
- $images = get_children( array( 'post_parent' => $post->ID, 'post_type' => 'attachment', 'post_mime_type' => 'image', 'orderby' => 'menu_order', 'order' => 'ASC', 'numberposts' => 999 ) );
+ $images = twentyten_get_gallery_images();
if ( $images ) :
$total_images = count( $images );
$image = array_shift( $images );
- $image_img_tag = wp_get_attachment_image( $image->ID, 'thumbnail' );
?>
<div class="gallery-thumb">
- <a class="size-thumbnail" href="<?php the_permalink(); ?>"><?php echo $image_img_tag; ?></a>
+ <a class="size-thumbnail" href="<?php the_permalink(); ?>"><?php echo wp_get_attachment_image( $image, 'thumbnail' ); ?></a>
</div><!-- .gallery-thumb -->
<p><em><?php printf( _n( 'This gallery contains <a %1$s>%2$s photo</a>.', 'This gallery contains <a %1$s>%2$s photos</a>.', $total_images, 'twentyten' ),
'href="' . get_permalink() . '" title="' . esc_attr( sprintf( __( 'Permalink to %s', 'twentyten' ), the_title_attribute( 'echo=0' ) ) ) . '" rel="bookmark"',
number_format_i18n( $total_images )
); ?></em></p>
- <?php endif; ?>
+ <?php endif; // end twentyten_get_gallery_images() check ?>
<?php the_excerpt(); ?>
<?php endif; ?>
</div><!-- .entry-content -->
@@ -92,8 +91,8 @@
<?php if ( function_exists( 'get_post_format' ) && 'gallery' == get_post_format( $post->ID ) ) : ?>
<a href="<?php echo get_post_format_link( 'gallery' ); ?>" title="<?php esc_attr_e( 'View Galleries', 'twentyten' ); ?>"><?php _e( 'More Galleries', 'twentyten' ); ?></a>
<span class="meta-sep">|</span>
- <?php elseif ( in_category( _x( 'gallery', 'gallery category slug', 'twentyten' ) ) ) : ?>
- <a href="<?php echo get_term_link( _x( 'gallery', 'gallery category slug', 'twentyten' ), 'category' ); ?>" title="<?php esc_attr_e( 'View posts in the Gallery category', 'twentyten' ); ?>"><?php _e( 'More Galleries', 'twentyten' ); ?></a>
+ <?php elseif ( $gallery = get_term_by( 'slug', _x( 'gallery', 'gallery category slug', 'twentyten' ), 'category' ) && in_category( $gallery->term_id ) ) : ?>
+ <a href="<?php echo get_category_link( $gallery ); ?>" title="<?php esc_attr_e( 'View posts in the Gallery category', 'twentyten' ); ?>"><?php _e( 'More Galleries', 'twentyten' ); ?></a>
<span class="meta-sep">|</span>
<?php endif; ?>
<span class="comments-link"><?php comments_popup_link( __( 'Leave a comment', 'twentyten' ), __( '1 Comment', 'twentyten' ), __( '% Comments', 'twentyten' ) ); ?></span>
@@ -128,7 +127,7 @@
<?php else : ?>
<div id="post-<?php the_ID(); ?>" <?php post_class(); ?>>
- <h2 class="entry-title"><a href="<?php the_permalink(); ?>" title="<?php echo esc_attr( sprintf( __( 'Permalink to %s', 'twentyten' ), the_title_attribute( 'echo=0' ) ) ); ?>" rel="bookmark"><?php the_title(); ?></a></h2>
+ <h2 class="entry-title"><a href="<?php the_permalink(); ?>" rel="bookmark"><?php the_title(); ?></a></h2>
<div class="entry-meta">
<?php twentyten_posted_on(); ?>
diff --git a/wp-content/themes/twentyten/rtl.css b/wp-content/themes/twentyten/rtl.css
index fd79cd83b6dddbefdaa3679bae7531a32edf336e..93a7605017aa0dde5eb1bbcf1abda795dee72558 100644
--- a/wp-content/themes/twentyten/rtl.css
+++ b/wp-content/themes/twentyten/rtl.css
@@ -133,8 +133,8 @@ blockquote {
#access .menu-header,
div.menu {
- margin-right: 12px;
- margin-left: 0;
+ margin-right: 12px;
+ margin-left: 0;
}
#access .menu-header li,
@@ -201,7 +201,7 @@ div.menu li{
.category-gallery .gallery-thumb {
float: right;
- margin-left:20px;
+ margin-left:20px;
margin-right:0;
}
diff --git a/wp-content/themes/twentyten/style.css b/wp-content/themes/twentyten/style.css
index 390e0fed5fce1350f72bd639ba3037f903da205d..5016922d9a35b6de99944c1f0a06bde4c65dba28 100644
--- a/wp-content/themes/twentyten/style.css
+++ b/wp-content/themes/twentyten/style.css
@@ -1,10 +1,10 @@
/*
Theme Name: Twenty Ten
-Theme URI: http://wordpress.org/extend/themes/twentyten
+Theme URI: http://wordpress.org/themes/twentyten
Description: The 2010 theme for WordPress is stylish, customizable, simple, and readable -- make it yours with a custom menu, header image, and background. Twenty Ten supports six widgetized areas (two in the sidebar, four in the footer) and featured images (thumbnails for gallery posts and custom header images for posts and pages). It includes stylesheets for print and the admin Visual Editor, special styles for posts in the "Asides" and "Gallery" categories, and has an optional one-column page template that removes the sidebar.
Author: the WordPress team
Author URI: http://wordpress.org/
-Version: 1.5
+Version: 1.6
License: GNU General Public License v2 or later
License URI: http://www.gnu.org/licenses/gpl-2.0.html
Tags: black, blue, white, two-columns, fixed-width, custom-header, custom-background, threaded-comments, sticky-post, translation-ready, microformats, rtl-language-support, editor-style, custom-menu, flexible-header
@@ -525,7 +525,7 @@ div.menu li {
}
#content tr th,
#content thead th {
- color: #888;
+ color: #777;
font-size: 12px;
font-weight: bold;
line-height: 18px;
@@ -565,7 +565,7 @@ div.menu li {
}
.page-title a:link,
.page-title a:visited {
- color: #888;
+ color: #777;
text-decoration: none;
}
.page-title a:active,
@@ -589,7 +589,7 @@ div.menu li {
color: #ff4b33;
}
.entry-meta {
- color: #888;
+ color: #777;
font-size: 12px;
}
.entry-meta abbr,
@@ -627,7 +627,7 @@ div.menu li {
margin-right: 24px;
}
.entry-content label {
- color: #888;
+ color: #777;
font-size: 12px;
}
.entry-content select {
@@ -707,13 +707,13 @@ body.page .edit-link {
}
.entry-utility {
clear: both;
- color: #888;
+ color: #777;
font-size: 12px;
line-height: 18px;
}
.entry-meta a,
.entry-utility a {
- color: #888;
+ color: #777;
}
.entry-meta a:hover,
.entry-utility a:hover {
@@ -832,9 +832,10 @@ img.aligncenter {
}
.wp-caption img {
margin: 5px 5px 0;
+ max-width: 622px; /* caption width - 10px */
}
.wp-caption p.wp-caption-text {
- color: #888;
+ color: #777;
font-size: 12px;
margin: 5px;
}
@@ -868,7 +869,7 @@ img.aligncenter {
height: auto;
}
.gallery .gallery-caption {
- color: #888;
+ color: #777;
font-size: 12px;
margin: 0 0 12px;
}
@@ -891,14 +892,14 @@ img.aligncenter {
-------------------------------------------------------------- */
.navigation {
- color: #888;
+ color: #777;
font-size: 12px;
line-height: 18px;
overflow: hidden;
}
.navigation a:link,
.navigation a:visited {
- color: #888;
+ color: #777;
text-decoration: none;
}
.navigation a:active,
@@ -996,7 +997,7 @@ h3#comments-title {
}
.comment-meta a:link,
.comment-meta a:visited {
- color: #888;
+ color: #777;
text-decoration: none;
}
.comment-meta a:active,
@@ -1013,7 +1014,7 @@ h3#comments-title {
}
.reply a,
a.comment-edit-link {
- color: #888;
+ color: #777;
}
.reply a:hover,
a.comment-edit-link:hover {
@@ -1040,7 +1041,7 @@ a.comment-edit-link:hover {
margin-top: -6px;
}
#comments .pingback p {
- color: #888;
+ color: #777;
display: block;
font-size: 12px;
line-height: 18px;
@@ -1092,7 +1093,7 @@ h3#reply-title {
font-weight: bold;
}
#respond label {
- color: #888;
+ color: #777;
font-size: 12px;
}
#respond input {
@@ -1103,7 +1104,7 @@ h3#reply-title {
width: 98%;
}
#respond .form-allowed-tags {
- color: #888;
+ color: #777;
font-size: 12px;
line-height: 18px;
}