diff --git a/wp-content/themes/twentyeleven/content-aside.php b/wp-content/themes/twentyeleven/content-aside.php index f6df40bdb13e45b4b81da2653700e9fd23488799..66f06037e13e0674a5410d511de7dd1ca86d3b0d 100644 --- a/wp-content/themes/twentyeleven/content-aside.php +++ b/wp-content/themes/twentyeleven/content-aside.php @@ -13,7 +13,7 @@ <article id="post-<?php the_ID(); ?>" <?php post_class(); ?>> <header class="entry-header"> <hgroup> - <h2 class="entry-title"><a href="<?php the_permalink(); ?>" title="<?php echo esc_attr( sprintf( __( 'Permalink to %s', 'twentyeleven' ), 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> <h3 class="entry-format"><?php _e( 'Aside', 'twentyeleven' ); ?></h3> </hgroup> diff --git a/wp-content/themes/twentyeleven/content-featured.php b/wp-content/themes/twentyeleven/content-featured.php index 7144a491fd3b31f37374235ac3c2a2c9ca347d9c..e1a0bf0b85e20247cdff821b9420e715518c9959 100644 --- a/wp-content/themes/twentyeleven/content-featured.php +++ b/wp-content/themes/twentyeleven/content-featured.php @@ -11,7 +11,7 @@ global $feature_class; ?> <article id="post-<?php the_ID(); ?>" <?php post_class( $feature_class ); ?>> <header class="entry-header"> - <h2 class="entry-title"><a href="<?php the_permalink(); ?>" title="<?php echo esc_attr( sprintf( __( 'Permalink to %s', 'twentyeleven' ), 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 twentyeleven_posted_on(); ?> diff --git a/wp-content/themes/twentyeleven/content-gallery.php b/wp-content/themes/twentyeleven/content-gallery.php index 9976cf10eab0df195e3537be8dfd8f978d0572d9..fb7b1058b1046335131e89f175ae5583fd53da10 100644 --- a/wp-content/themes/twentyeleven/content-gallery.php +++ b/wp-content/themes/twentyeleven/content-gallery.php @@ -13,7 +13,7 @@ <article id="post-<?php the_ID(); ?>" <?php post_class(); ?>> <header class="entry-header"> <hgroup> - <h2 class="entry-title"><a href="<?php the_permalink(); ?>" title="<?php echo esc_attr( sprintf( __( 'Permalink to %s', 'twentyeleven' ), 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> <h3 class="entry-format"><?php _e( 'Gallery', 'twentyeleven' ); ?></h3> </hgroup> @@ -30,25 +30,21 @@ <div class="entry-content"> <?php if ( post_password_required() ) : ?> <?php the_content( __( 'Continue reading <span class="meta-nav">→</span>', 'twentyeleven' ) ); ?> - - <?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 ) ); - if ( $images ) : - $total_images = count( $images ); - $image = array_shift( $images ); - $image_img_tag = wp_get_attachment_image( $image->ID, 'thumbnail' ); - ?> - + <?php else : + $images = twentyeleven_get_gallery_images(); + if ( $images ) : + $total_images = count( $images ); + $image = array_shift( $images ); + ?> <figure class="gallery-thumb"> - <a href="<?php the_permalink(); ?>"><?php echo $image_img_tag; ?></a> + <a href="<?php the_permalink(); ?>"><?php echo wp_get_attachment_image( $image, 'thumbnail' ); ?></a> </figure><!-- .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, 'twentyeleven' ), 'href="' . esc_url( get_permalink() ) . '" title="' . esc_attr( sprintf( __( 'Permalink to %s', 'twentyeleven' ), the_title_attribute( 'echo=0' ) ) ) . '" rel="bookmark"', number_format_i18n( $total_images ) ); ?></em></p> - <?php endif; ?> + <?php endif; // end twentyeleven_get_gallery_images() check ?> <?php the_excerpt(); ?> <?php endif; ?> <?php wp_link_pages( array( 'before' => '<div class="page-link"><span>' . __( 'Pages:', 'twentyeleven' ) . '</span>', 'after' => '</div>' ) ); ?> diff --git a/wp-content/themes/twentyeleven/content-image.php b/wp-content/themes/twentyeleven/content-image.php index e5973f98e89d3365261035609bdb5aa76ec93be0..4d2cbaf0c5037c6447eb5e3fac8471f531f243ec 100644 --- a/wp-content/themes/twentyeleven/content-image.php +++ b/wp-content/themes/twentyeleven/content-image.php @@ -12,7 +12,7 @@ <article id="post-<?php the_ID(); ?>" <?php post_class( 'indexed' ); ?>> <header class="entry-header"> <hgroup> - <h2 class="entry-title"><a href="<?php the_permalink(); ?>" title="<?php echo esc_attr( sprintf( __( 'Permalink to %s', 'twentyeleven' ), 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> <h3 class="entry-format"><?php _e( 'Image', 'twentyeleven' ); ?></h3> </hgroup> diff --git a/wp-content/themes/twentyeleven/content-link.php b/wp-content/themes/twentyeleven/content-link.php index 2e447ce810849b3a1b6aebe7b0884d4645a9984d..f03099e52cf42f92c425c98f0b635cf8e526308b 100644 --- a/wp-content/themes/twentyeleven/content-link.php +++ b/wp-content/themes/twentyeleven/content-link.php @@ -13,7 +13,7 @@ <article id="post-<?php the_ID(); ?>" <?php post_class(); ?>> <header class="entry-header"> <hgroup> - <h2 class="entry-title"><a href="<?php the_permalink(); ?>" title="<?php echo esc_attr( sprintf( __( 'Permalink to %s', 'twentyeleven' ), 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> <h3 class="entry-format"><?php _e( 'Link', 'twentyeleven' ); ?></h3> </hgroup> diff --git a/wp-content/themes/twentyeleven/content-quote.php b/wp-content/themes/twentyeleven/content-quote.php index 89a0c2947e051e271bdc97c6ed03d0e3fba18907..c74e0069328e9507e3e8627d5ecd62ada35a8fe5 100644 --- a/wp-content/themes/twentyeleven/content-quote.php +++ b/wp-content/themes/twentyeleven/content-quote.php @@ -11,7 +11,7 @@ <article id="post-<?php the_ID(); ?>" <?php post_class(); ?>> <header class="entry-header"> <hgroup> - <h2 class="entry-title"><a href="<?php the_permalink(); ?>" title="<?php echo esc_attr( sprintf( __( 'Permalink to %s', 'twentyeleven' ), 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> <h3 class="entry-format"><?php _e( 'Quote', 'twentyeleven' ); ?></h3> </hgroup> diff --git a/wp-content/themes/twentyeleven/content-status.php b/wp-content/themes/twentyeleven/content-status.php index 6cd0bad08043929d32f6a5c3d19c533c0b747108..144d12262db735117ddf181d1c222c2dbca66d75 100644 --- a/wp-content/themes/twentyeleven/content-status.php +++ b/wp-content/themes/twentyeleven/content-status.php @@ -12,7 +12,7 @@ <article id="post-<?php the_ID(); ?>" <?php post_class(); ?>> <header class="entry-header"> <hgroup> - <h2 class="entry-title"><a href="<?php the_permalink(); ?>" title="<?php echo esc_attr( sprintf( __( 'Permalink to %s', 'twentyeleven' ), 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> <h3 class="entry-format"><?php _e( 'Status', 'twentyeleven' ); ?></h3> </hgroup> diff --git a/wp-content/themes/twentyeleven/content.php b/wp-content/themes/twentyeleven/content.php index f245ebf5bffd14647cd69f0bf37699ac2faa8a60..cc8532c998a48e0f45cdd50581cbafb57aa04a22 100644 --- a/wp-content/themes/twentyeleven/content.php +++ b/wp-content/themes/twentyeleven/content.php @@ -12,11 +12,11 @@ <header class="entry-header"> <?php if ( is_sticky() ) : ?> <hgroup> - <h2 class="entry-title"><a href="<?php the_permalink(); ?>" title="<?php echo esc_attr( sprintf( __( 'Permalink to %s', 'twentyeleven' ), 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> <h3 class="entry-format"><?php _e( 'Featured', 'twentyeleven' ); ?></h3> </hgroup> <?php else : ?> - <h1 class="entry-title"><a href="<?php the_permalink(); ?>" title="<?php echo esc_attr( sprintf( __( 'Permalink to %s', 'twentyeleven' ), the_title_attribute( 'echo=0' ) ) ); ?>" rel="bookmark"><?php the_title(); ?></a></h1> + <h1 class="entry-title"><a href="<?php the_permalink(); ?>" rel="bookmark"><?php the_title(); ?></a></h1> <?php endif; ?> <?php if ( 'post' == get_post_type() ) : ?> diff --git a/wp-content/themes/twentyeleven/functions.php b/wp-content/themes/twentyeleven/functions.php index 1fc8e659e7840dc4a8a1769558a2dff7bbf33d15..3d269676c9837a4cc91feea8d4fdd9947fd583f3 100644 --- a/wp-content/themes/twentyeleven/functions.php +++ b/wp-content/themes/twentyeleven/functions.php @@ -224,7 +224,7 @@ function twentyeleven_header_style() { // If we get this far, we have custom styles. Let's do this. ?> - <style type="text/css"> + <style type="text/css" id="twentyeleven-header-css"> <?php // Has the text been hidden? if ( 'blank' == $text_color ) : @@ -259,7 +259,7 @@ if ( ! function_exists( 'twentyeleven_admin_header_style' ) ) : */ function twentyeleven_admin_header_style() { ?> - <style type="text/css"> + <style type="text/css" id="twentyeleven-admin-header-css"> .appearance_page_custom-header #headimg { border: none; } @@ -317,8 +317,8 @@ function twentyeleven_admin_header_image() { ?> else $style = ' style="display:none"'; ?> - <h1><a id="name"<?php echo $style; ?> onclick="return false;" href="<?php echo esc_url( home_url( '/' ) ); ?>"><?php bloginfo( 'name' ); ?></a></h1> - <div id="desc"<?php echo $style; ?>><?php bloginfo( 'description' ); ?></div> + <h1 class="displaying-header-text"><a id="name"<?php echo $style; ?> onclick="return false;" href="<?php echo esc_url( home_url( '/' ) ); ?>"><?php bloginfo( 'name' ); ?></a></h1> + <div id="desc" class="displaying-header-text"<?php echo $style; ?>><?php bloginfo( 'description' ); ?></div> <?php if ( $image ) : ?> <img src="<?php echo esc_url( $image ); ?>" alt="" /> <?php endif; ?> @@ -458,6 +458,24 @@ function twentyeleven_content_nav( $html_id ) { } endif; // twentyeleven_content_nav +/** + * Return the first link from the post content. If none found, the + * post permalink is used as a fallback. + * + * @uses get_url_in_content() to get the first URL from the post content. + * + * @return string + */ +function twentyeleven_get_first_url() { + $content = get_the_content(); + $has_url = function_exists( 'get_url_in_content' ) ? get_url_in_content( $content ) : false; + + if ( ! $has_url ) + $has_url = twentyeleven_url_grabber(); + + return ( $has_url ) ? $has_url : apply_filters( 'the_permalink', get_permalink() ); +} + /** * Return the URL for the first link found in the post content. * @@ -612,3 +630,42 @@ function twentyeleven_body_classes( $classes ) { } add_filter( 'body_class', 'twentyeleven_body_classes' ); +/** + * 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 Eleven 1.6. + * + * @return array List of image IDs from the post gallery. + */ +function twentyeleven_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/twentyeleven/inc/images/content-sidebar.png b/wp-content/themes/twentyeleven/inc/images/content-sidebar.png index 71a23f7347ba91b13ea9ce724f35fbca5c57e5fa..25ca6cb2ec3de83562eeb98cc737a51b93cb7141 100644 Binary files a/wp-content/themes/twentyeleven/inc/images/content-sidebar.png and b/wp-content/themes/twentyeleven/inc/images/content-sidebar.png differ diff --git a/wp-content/themes/twentyeleven/inc/theme-customizer.js b/wp-content/themes/twentyeleven/inc/theme-customizer.js index ca63fdad4248ac934ec63d2f3eba29399ce13b62..ea19f4993285a287489b1da50198ae022638d56d 100644 --- a/wp-content/themes/twentyeleven/inc/theme-customizer.js +++ b/wp-content/themes/twentyeleven/inc/theme-customizer.js @@ -1,12 +1,12 @@ ( function( $ ){ wp.customize( 'blogname', function( value ) { value.bind( function( to ) { - $( '#site-title a' ).html( to ); + $( '#site-title a' ).text( to ); } ); } ); wp.customize( 'blogdescription', function( value ) { value.bind( function( to ) { - $( '#site-description' ).html( to ); + $( '#site-description' ).text( to ); } ); } ); } )( jQuery ); \ No newline at end of file diff --git a/wp-content/themes/twentyeleven/inc/widgets.php b/wp-content/themes/twentyeleven/inc/widgets.php index b39fc729b324d2c8618da522cb0168af71c0e5a1..2571274f6c3cb897b88b3141d05409999063b0f9 100644 --- a/wp-content/themes/twentyeleven/inc/widgets.php +++ b/wp-content/themes/twentyeleven/inc/widgets.php @@ -30,7 +30,7 @@ class Twenty_Eleven_Ephemera_Widget extends WP_Widget { * * @param array An array of standard parameters for widgets in this theme * @param array An array of settings for this widget instance - * @return void Echoes it's output + * @return void Echoes its output **/ function widget( $args, $instance ) { $cache = wp_cache_get( 'widget_twentyeleven_ephemera', 'widget' ); @@ -86,7 +86,7 @@ class Twenty_Eleven_Ephemera_Widget extends WP_Widget { <?php if ( 'link' != get_post_format() ) : ?> <li class="widget-entry-title"> - <a href="<?php echo esc_url( get_permalink() ); ?>" title="<?php echo esc_attr( sprintf( __( 'Permalink to %s', 'twentyeleven' ), the_title_attribute( 'echo=0' ) ) ); ?>" rel="bookmark"><?php the_title(); ?></a> + <a href="<?php echo esc_url( get_permalink() ); ?>" rel="bookmark"><?php the_title(); ?></a> <span class="comments-link"> <?php comments_popup_link( __( '0 <span class="reply">comments →</span>', 'twentyeleven' ), __( '1 <span class="reply">comment →</span>', 'twentyeleven' ), __( '% <span class="reply">comments →</span>', 'twentyeleven' ) ); ?> </span> @@ -95,14 +95,7 @@ class Twenty_Eleven_Ephemera_Widget extends WP_Widget { <?php else : ?> <li class="widget-entry-title"> - <?php - // Grab first link from the post content. If none found, use the post permalink as fallback. - $link_url = twentyeleven_url_grabber(); - - if ( empty( $link_url ) ) - $link_url = get_permalink(); - ?> - <a href="<?php echo esc_url( $link_url ); ?>" title="<?php echo esc_attr( sprintf( __( 'Link to %s', 'twentyeleven' ), the_title_attribute( 'echo=0' ) ) ); ?>" rel="bookmark"><?php the_title(); ?> <span>→</span></a> + <a href="<?php echo esc_url( twentyeleven_get_first_url() ); ?>" rel="bookmark"><?php the_title(); ?> <span>→</span></a> <span class="comments-link"> <?php comments_popup_link( __( '0 <span class="reply">comments →</span>', 'twentyeleven' ), __( '1 <span class="reply">comment →</span>', 'twentyeleven' ), __( '% <span class="reply">comments →</span>', 'twentyeleven' ) ); ?> </span> diff --git a/wp-content/themes/twentyeleven/languages/twentyeleven.pot b/wp-content/themes/twentyeleven/languages/twentyeleven.pot index 2d85b58242c456afb54976a9e418571fa59a6db7..d9fd039a7efdaf1accebf8f5031d4ad1967f05a9 100644 --- a/wp-content/themes/twentyeleven/languages/twentyeleven.pot +++ b/wp-content/themes/twentyeleven/languages/twentyeleven.pot @@ -2,9 +2,9 @@ # This file is distributed under the GNU General Public License v2 or later. msgid "" msgstr "" -"Project-Id-Version: Twenty Eleven 1.5\n" +"Project-Id-Version: Twenty Eleven 1.6\n" "Report-Msgid-Bugs-To: http://wordpress.org/tags/twentyeleven\n" -"POT-Creation-Date: 2013-04-26 13:58:43+00:00\n" +"POT-Creation-Date: 2013-06-18 22:14:12+00:00\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -107,13 +107,6 @@ msgstr "" msgid "Comments are closed." msgstr "" -#: content-aside.php:16 content-featured.php:14 content-gallery.php:16 -#: content-gallery.php:48 content-image.php:15 content-link.php:16 -#: content-quote.php:14 content-status.php:15 content.php:15 content.php:19 -#: inc/widgets.php:89 showcase.php:120 showcase.php:199 -msgid "Permalink to %s" -msgstr "" - #: content-aside.php:17 msgid "Aside" msgstr "" @@ -141,42 +134,42 @@ msgstr "" msgid "Continue reading <span class=\"meta-nav\">→</span>" msgstr "" -#: content-aside.php:34 content-featured.php:23 content-gallery.php:54 +#: content-aside.php:34 content-featured.php:23 content-gallery.php:50 #: content-image.php:28 content-intro.php:18 content-link.php:34 #: content-page.php:18 content-quote.php:36 content-single.php:24 #: content-status.php:35 content.php:42 image.php:90 msgid "Pages:" msgstr "" -#: content-aside.php:42 content-gallery.php:87 content-image.php:64 +#: content-aside.php:42 content-gallery.php:83 content-image.php:64 #: content-link.php:42 content-quote.php:69 content-status.php:43 #: content.php:79 showcase.php:201 msgid "Leave a reply" msgstr "" -#: content-aside.php:42 content-gallery.php:87 content-image.php:64 +#: content-aside.php:42 content-gallery.php:83 content-image.php:64 #: content-link.php:42 content-quote.php:69 content-status.php:43 #: content.php:79 showcase.php:201 msgid "<b>1</b> Reply" msgstr "" -#: content-aside.php:42 content-gallery.php:87 content-image.php:64 +#: content-aside.php:42 content-gallery.php:83 content-image.php:64 #: content-link.php:42 content-quote.php:69 content-status.php:43 #: content.php:79 showcase.php:201 msgid "<b>%</b> Replies" msgstr "" -#: content-aside.php:44 content-featured.php:45 content-gallery.php:90 +#: content-aside.php:44 content-featured.php:45 content-gallery.php:86 #: content-image.php:68 content-intro.php:19 content-link.php:44 #: content-page.php:21 content-quote.php:72 content-single.php:52 -#: content-status.php:45 content.php:82 functions.php:525 functions.php:553 +#: content-status.php:45 content.php:82 functions.php:543 functions.php:571 #: image.php:41 msgid "Edit" msgstr "" #. translators: used between list items, there is a space after the comma -#: content-featured.php:29 content-featured.php:38 content-gallery.php:62 -#: content-gallery.php:72 content-image.php:47 content-image.php:56 +#: content-featured.php:29 content-featured.php:38 content-gallery.php:58 +#: content-gallery.php:68 content-image.php:47 content-image.php:56 #: content-quote.php:44 content-quote.php:54 content-single.php:30 #: content-single.php:33 content.php:51 content.php:63 msgid ", " @@ -198,18 +191,22 @@ msgstr "" msgid "Gallery" msgstr "" -#: content-gallery.php:47 +#: content-gallery.php:43 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] "" -#: content-gallery.php:66 content-image.php:51 content-quote.php:48 +#: content-gallery.php:44 showcase.php:120 +msgid "Permalink to %s" +msgstr "" + +#: content-gallery.php:62 content-image.php:51 content-quote.php:48 #: content.php:55 msgid "<span class=\"%1$s\">Posted in</span> %2$s" msgstr "" -#: content-gallery.php:78 content-image.php:59 content-quote.php:60 +#: content-gallery.php:74 content-image.php:59 content-quote.php:60 #: content.php:69 msgid "<span class=\"%1$s\">Tagged</span> %2$s" msgstr "" @@ -226,7 +223,7 @@ msgid "" "\" rel=\"author\">%6$s</a></span></span>" msgstr "" -#: content-image.php:39 functions.php:590 +#: content-image.php:39 functions.php:608 msgid "View all posts by %s" msgstr "" @@ -269,7 +266,7 @@ msgstr "" msgid "Featured" msgstr "" -#. #-#-#-#-# twentyeleven.pot (Twenty Eleven 1.5) #-#-#-#-# +#. #-#-#-#-# twentyeleven.pot (Twenty Eleven 1.6) #-#-#-#-# #. Author URI of the plugin/theme #: footer.php:27 msgid "http://wordpress.org/" @@ -367,29 +364,29 @@ msgstr "" msgid "Newer posts <span class=\"meta-nav\">→</span>" msgstr "" -#: functions.php:525 +#: functions.php:543 msgid "Pingback:" msgstr "" #. translators: 1: comment author, 2: date and time -#: functions.php:542 +#: functions.php:560 msgid "%1$s on %2$s <span class=\"says\">said:</span>" msgstr "" #. translators: 1: date, 2: time -#: functions.php:548 +#: functions.php:566 msgid "%1$s at %2$s" msgstr "" -#: functions.php:557 +#: functions.php:575 msgid "Your comment is awaiting moderation." msgstr "" -#: functions.php:566 +#: functions.php:584 msgid "Reply <span>↓</span>" msgstr "" -#: functions.php:584 +#: functions.php:602 msgid "" "<span class=\"sep\">Posted on </span><a href=\"%1$s\" title=\"%2$s\" rel=" "\"bookmark\"><time class=\"entry-date\" datetime=\"%3$s\">%4$s</time></" @@ -554,27 +551,23 @@ msgstr "" msgid "Ephemera" msgstr "" -#: inc/widgets.php:91 inc/widgets.php:107 +#: inc/widgets.php:91 inc/widgets.php:100 msgid "0 <span class=\"reply\">comments →</span>" msgstr "" -#: inc/widgets.php:91 inc/widgets.php:107 +#: inc/widgets.php:91 inc/widgets.php:100 msgid "1 <span class=\"reply\">comment →</span>" msgstr "" -#: inc/widgets.php:91 inc/widgets.php:107 +#: inc/widgets.php:91 inc/widgets.php:100 msgid "% <span class=\"reply\">comments →</span>" msgstr "" -#: inc/widgets.php:105 -msgid "Link to %s" -msgstr "" - -#: inc/widgets.php:157 +#: inc/widgets.php:150 msgid "Title:" msgstr "" -#: inc/widgets.php:160 +#: inc/widgets.php:153 msgid "Number of posts to show:" msgstr "" @@ -629,7 +622,7 @@ msgid "Twenty Eleven" msgstr "" #. Theme URI of the plugin/theme -msgid "http://wordpress.org/extend/themes/twentyeleven" +msgid "http://wordpress.org/themes/twentyeleven" msgstr "" #. Description of the plugin/theme diff --git a/wp-content/themes/twentyeleven/rtl.css b/wp-content/themes/twentyeleven/rtl.css index 19ac828adb368100f522c5dde2b37f2054687f78..376e5437ed0cf970d6f3dc9c46d4aa169bdcd3a2 100644 --- a/wp-content/themes/twentyeleven/rtl.css +++ b/wp-content/themes/twentyeleven/rtl.css @@ -105,7 +105,6 @@ input#s { } /* Assistive text */ -#access a.assistive-text:active, #access a.assistive-text:focus { left: auto; right: 7.6%; diff --git a/wp-content/themes/twentyeleven/showcase.php b/wp-content/themes/twentyeleven/showcase.php index 9bc57fc3b7930fada9686c829119ec0b160a1f8e..e5142318982edc70930270b340a2fe05b13865b7 100644 --- a/wp-content/themes/twentyeleven/showcase.php +++ b/wp-content/themes/twentyeleven/showcase.php @@ -196,7 +196,7 @@ get_header(); ?> while ( $recent->have_posts() ) : $recent->the_post(); ?> <li class="entry-title"> - <a href="<?php the_permalink(); ?>" title="<?php echo esc_attr( sprintf( __( 'Permalink to %s', 'twentyeleven' ), the_title_attribute( 'echo=0' ) ) ); ?>" rel="bookmark"><?php the_title(); ?></a> + <a href="<?php the_permalink(); ?>" rel="bookmark"><?php the_title(); ?></a> <span class="comments-link"> <?php comments_popup_link( '<span class="leave-reply">' . __( 'Leave a reply', 'twentyeleven' ) . '</span>', __( '<b>1</b> Reply', 'twentyeleven' ), __( '<b>%</b> Replies', 'twentyeleven' ) ); ?> </span> diff --git a/wp-content/themes/twentyeleven/style.css b/wp-content/themes/twentyeleven/style.css index 62091805015d47523e1f3722742c2d7880b3f6ee..9eee8c5e9193cd21f75d85bfe02c2e9d1bfa836c 100644 --- a/wp-content/themes/twentyeleven/style.css +++ b/wp-content/themes/twentyeleven/style.css @@ -1,10 +1,10 @@ /* Theme Name: Twenty Eleven -Theme URI: http://wordpress.org/extend/themes/twentyeleven +Theme URI: http://wordpress.org/themes/twentyeleven Author: the WordPress team Author URI: http://wordpress.org/ Description: The 2011 theme for WordPress is sophisticated, lightweight, and adaptable. Make it yours with a custom menu, header image, and background -- then go further with available theme options for light or dark color scheme, custom link colors, and three layout choices. Twenty Eleven comes equipped with a Showcase page template that transforms your front page into a showcase to show off your best content, widget support galore (sidebar, three footer areas, and a Showcase page widget area), and a custom "Ephemera" widget to display your Aside, Link, Quote, or Status posts. Included are styles for print and for the admin editor, support for featured images (as custom header images on posts and pages and as large images on featured "sticky" posts), and special styles for six different post formats. -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: dark, light, white, black, gray, one-column, two-columns, left-sidebar, right-sidebar, fixed-width, flexible-width, custom-background, custom-colors, custom-header, custom-menu, editor-style, featured-image-header, featured-images, flexible-header, full-width-template, microformats, post-formats, rtl-language-support, sticky-post, theme-options, translation-ready @@ -498,7 +498,6 @@ a:hover { clip: rect(1px 1px 1px 1px); /* IE6, IE7 */ clip: rect(1px, 1px, 1px, 1px); } -#access a.assistive-text:active, #access a.assistive-text:focus { background: #eee; border-bottom: 1px solid #ddd; @@ -867,7 +866,7 @@ dl.gallery-item { .entry-content img, .comment-content img, .widget img { - max-width: 97.5%; /* Fluid images for posts, comments, and widgets */ + max-width: 100%; /* Fluid images for posts, comments, and widgets */ } img[class*="align"], img[class*="wp-image-"], @@ -903,7 +902,7 @@ p img, } .wp-caption img { display: block; - margin: 0 auto; + margin: -2px 0 0 -2px; max-width: 98%; } .wp-caption .wp-caption-text, @@ -953,6 +952,7 @@ img[class*="wp-image-"], #content .gallery .gallery-icon img {/* Add fancy borders to all WordPress-added images but not things like badges and icons and the like */ border: 1px solid #ddd; padding: 6px; + max-width: 97.5%; } .wp-caption img { border-color: #eee; @@ -2394,7 +2394,6 @@ p.comment-form-comment { margin-right: 0; width: auto; } - } @media (max-width: 650px) { /* @media (max-width: 650px) Reduce font-sizes for better readability on smaller devices */ @@ -2496,7 +2495,6 @@ p.comment-form-comment { width: 100%; height: auto; } - } @media (max-width: 450px) { #content .gallery-columns-2 .gallery-item { @@ -2507,7 +2505,6 @@ p.comment-form-comment { width: 100%; height: auto; } - } @media only screen and (min-device-width: 320px) and (max-device-width: 480px) { body { @@ -2519,7 +2516,6 @@ p.comment-form-comment { #branding { border-top: none; } - } @@ -2688,7 +2684,6 @@ p.comment-form-comment { .commentlist .children > li.bypostauthor > article .comment-meta { color: #666; } - } @@ -2702,18 +2697,25 @@ p.comment-form-comment { padding-right: -7.6%; max-width: 1000px; } -#ie7 section.featured-post { - margin-left: -7.6%; - margin-right: -7.6%; - max-width: 850px; +#ie7 .featured-posts { + margin: 0 -7.6%; +} +#ie7 .featured-post { + margin-left: 0; + margin-right: 0; + max-width: 100%; } #ie7 section.recent-posts { margin-right: 7.6%; } + /* =IE8 ----------------------------------------------- */ #ie8 section.feature-image.large img { - width: 100%; + width: auto; +} +#ie8 section.featured-post .attachment-small-feature { + max-width: none; } \ No newline at end of file