WordPress.org

Make WordPress Themes

Changes from twentyten/1.5 at r83071 to twentyten/1.6 at r83071


Ignore:
Location:
twentyten/1.6
Files:
23 edited

Legend:

Unmodified
Added
Removed
  • twentyten/1.6/functions.php

    r83071 r83071  
    201201function twentyten_admin_header_style() { 
    202202?> 
    203 <style type="text/css"> 
     203<style type="text/css" id="twentyten-admin-header-css"> 
    204204/* Shows the same border as on front end */ 
    205205#headimg { 
     
    384384        'name' => __( 'Primary Widget Area', 'twentyten' ), 
    385385        'id' => 'primary-widget-area', 
    386         'description' => __( 'The primary widget area', 'twentyten' ), 
     386        'description' => __( 'Add widgets here to appear in your sidebar.', 'twentyten' ), 
    387387        'before_widget' => '<li id="%1$s" class="widget-container %2$s">', 
    388388        'after_widget' => '</li>', 
     
    395395        'name' => __( 'Secondary Widget Area', 'twentyten' ), 
    396396        'id' => 'secondary-widget-area', 
    397         'description' => __( 'The secondary widget area', 'twentyten' ), 
     397        'description' => __( 'An optional secondary widget area, displays below the primary widget area in your sidebar.', 'twentyten' ), 
    398398        'before_widget' => '<li id="%1$s" class="widget-container %2$s">', 
    399399        'after_widget' => '</li>', 
     
    406406        'name' => __( 'First Footer Widget Area', 'twentyten' ), 
    407407        'id' => 'first-footer-widget-area', 
    408         'description' => __( 'The first footer widget area', 'twentyten' ), 
     408        'description' => __( 'An optional widget area for your site footer.', 'twentyten' ), 
    409409        'before_widget' => '<li id="%1$s" class="widget-container %2$s">', 
    410410        'after_widget' => '</li>', 
     
    417417        'name' => __( 'Second Footer Widget Area', 'twentyten' ), 
    418418        'id' => 'second-footer-widget-area', 
    419         'description' => __( 'The second footer widget area', 'twentyten' ), 
     419        'description' => __( 'An optional widget area for your site footer.', 'twentyten' ), 
    420420        'before_widget' => '<li id="%1$s" class="widget-container %2$s">', 
    421421        'after_widget' => '</li>', 
     
    428428        'name' => __( 'Third Footer Widget Area', 'twentyten' ), 
    429429        'id' => 'third-footer-widget-area', 
    430         'description' => __( 'The third footer widget area', 'twentyten' ), 
     430        'description' => __( 'An optional widget area for your site footer.', 'twentyten' ), 
    431431        'before_widget' => '<li id="%1$s" class="widget-container %2$s">', 
    432432        'after_widget' => '</li>', 
     
    439439        'name' => __( 'Fourth Footer Widget Area', 'twentyten' ), 
    440440        'id' => 'fourth-footer-widget-area', 
    441         'description' => __( 'The fourth footer widget area', 'twentyten' ), 
     441        'description' => __( 'An optional widget area for your site footer.', 'twentyten' ), 
    442442        'before_widget' => '<li id="%1$s" class="widget-container %2$s">', 
    443443        'after_widget' => '</li>', 
     
    515515} 
    516516endif; 
     517 
     518/** 
     519 * Retrieves the IDs for images in a gallery. 
     520 * 
     521 * @uses get_post_galleries() first, if available. Falls back to shortcode parsing, 
     522 * then as last option uses a get_posts() call. 
     523 * 
     524 * @since Twenty Ten 1.6. 
     525 * 
     526 * @return array List of image IDs from the post gallery. 
     527 */ 
     528function twentyten_get_gallery_images() { 
     529    $images = array(); 
     530 
     531    if ( function_exists( 'get_post_galleries' ) ) { 
     532        $galleries = get_post_galleries( get_the_ID(), false ); 
     533        if ( isset( $galleries[0]['ids'] ) ) 
     534            $images = explode( ',', $galleries[0]['ids'] ); 
     535    } else { 
     536        $pattern = get_shortcode_regex(); 
     537        preg_match( "/$pattern/s", get_the_content(), $match ); 
     538        $atts = shortcode_parse_atts( $match[3] ); 
     539        if ( isset( $atts['ids'] ) ) 
     540            $images = explode( ',', $atts['ids'] ); 
     541    } 
     542 
     543    if ( ! $images ) { 
     544        $images = get_posts( array( 
     545            'fields'         => 'ids', 
     546            'numberposts'    => 999, 
     547            'order'          => 'ASC', 
     548            'orderby'        => 'menu_order', 
     549            'post_mime_type' => 'image', 
     550            'post_parent'    => get_the_ID(), 
     551            'post_type'      => 'attachment', 
     552        ) ); 
     553    } 
     554 
     555    return $images; 
     556} 
  • twentyten/1.6/languages/twentyten.pot

    r83071 r83071  
    1 # Copyright (C) 2012 the WordPress team 
     1# Copyright (C) 2013 the WordPress team 
    22# This file is distributed under the GNU General Public License v2 or later. 
    33msgid "" 
    44msgstr "" 
    5 "Project-Id-Version: Twenty Ten 1.4\n" 
     5"Project-Id-Version: Twenty Ten 1.6\n" 
    66"Report-Msgid-Bugs-To: http://wordpress.org/tags/twentyten\n" 
    7 "POT-Creation-Date: 2012-11-16 22:18:49+00:00\n" 
     7"POT-Creation-Date: 2013-05-22 21:14:02+00:00\n" 
    88"MIME-Version: 1.0\n" 
    99"Content-Type: text/plain; charset=UTF-8\n" 
    1010"Content-Transfer-Encoding: 8bit\n" 
    11 "PO-Revision-Date: 2012-MO-DA HO:MI+ZONE\n" 
     11"PO-Revision-Date: 2013-MO-DA HO:MI+ZONE\n" 
    1212"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" 
    1313"Language-Team: LANGUAGE <LL@li.org>\n" 
     
    8484msgstr "" 
    8585 
    86 #. #-#-#-#-#  twentyten.pot (Twenty Ten 1.4)  #-#-#-#-# 
     86#. #-#-#-#-#  twentyten.pot (Twenty Ten 1.6)  #-#-#-#-# 
    8787#. Author URI of the plugin/theme 
    8888#: footer.php:33 
     
    142142msgstr "" 
    143143 
    144 #: functions.php:255 loop-attachment.php:104 loop.php:115 loop.php:143 
     144#: functions.php:255 loop-attachment.php:104 loop.php:114 loop.php:142 
    145145msgid "Continue reading <span class=\"meta-nav\">&rarr;</span>" 
    146146msgstr "" 
     
    172172 
    173173#: functions.php:386 
    174 msgid "The primary widget area" 
     174msgid "Add widgets here to appear in your sidebar." 
    175175msgstr "" 
    176176 
     
    180180 
    181181#: functions.php:397 
    182 msgid "The secondary widget area" 
     182msgid "" 
     183"An optional secondary widget area, displays below the primary widget area in " 
     184"your sidebar." 
    183185msgstr "" 
    184186 
     
    187189msgstr "" 
    188190 
    189 #: functions.php:408 
    190 msgid "The first footer widget area" 
     191#: functions.php:408 functions.php:419 functions.php:430 functions.php:441 
     192msgid "An optional widget area for your site footer." 
    191193msgstr "" 
    192194 
     
    195197msgstr "" 
    196198 
    197 #: functions.php:419 
    198 msgid "The second footer widget area" 
    199 msgstr "" 
    200  
    201199#: functions.php:428 
    202200msgid "Third Footer Widget Area" 
    203201msgstr "" 
    204202 
    205 #: functions.php:430 
    206 msgid "The third footer widget area" 
    207 msgstr "" 
    208  
    209203#: functions.php:439 
    210204msgid "Fourth Footer Widget Area" 
    211 msgstr "" 
    212  
    213 #: functions.php:441 
    214 msgid "The fourth footer widget area" 
    215205msgstr "" 
    216206 
     
    277267 
    278268#: loop-attachment.php:63 loop-attachment.php:111 loop-page.php:30 
    279 #: loop-single.php:56 loop.php:100 loop.php:123 loop.php:165 
     269#: loop-single.php:56 loop.php:99 loop.php:122 loop.php:164 
    280270msgid "Edit" 
    281271msgstr "" 
    282272 
    283 #: loop-attachment.php:105 loop-page.php:29 loop-single.php:34 loop.php:144 
     273#: loop-attachment.php:105 loop-page.php:29 loop-single.php:34 loop.php:143 
    284274msgid "Pages:" 
    285275msgstr "" 
     
    299289msgstr "" 
    300290 
    301 #: loop.php:25 loop.php:178 
     291#: loop.php:25 loop.php:177 
    302292msgid "<span class=\"meta-nav\">&larr;</span> Older posts" 
    303293msgstr "" 
    304294 
    305 #: loop.php:26 loop.php:179 
     295#: loop.php:26 loop.php:178 
    306296msgid "Newer posts <span class=\"meta-nav\">&rarr;</span>" 
    307297msgstr "" 
     
    313303msgstr "" 
    314304 
    315 #: loop.php:60 loop.php:95 loop.php:96 
     305#: loop.php:60 loop.php:94 
    316306msgctxt "gallery category slug" 
    317307msgid "gallery" 
    318308msgstr "" 
    319309 
    320 #: loop.php:62 loop.php:83 loop.php:131 
    321 msgid "Permalink to %s" 
    322 msgstr "" 
    323  
    324 #: loop.php:82 
     310#: loop.php:81 
    325311msgid "This gallery contains <a %1$s>%2$s photo</a>." 
    326312msgid_plural "This gallery contains <a %1$s>%2$s photos</a>." 
     
    328314msgstr[1] "" 
    329315 
    330 #: loop.php:93 
     316#: loop.php:82 
     317msgid "Permalink to %s" 
     318msgstr "" 
     319 
     320#: loop.php:92 
    331321msgid "View Galleries" 
    332322msgstr "" 
    333323 
    334 #: loop.php:93 loop.php:96 
     324#: loop.php:92 loop.php:95 
    335325msgid "More Galleries" 
    336326msgstr "" 
    337327 
    338 #: loop.php:96 
     328#: loop.php:95 
    339329msgid "View posts in the Gallery category" 
    340330msgstr "" 
    341331 
    342 #: loop.php:99 loop.php:122 loop.php:164 
     332#: loop.php:98 loop.php:121 loop.php:163 
    343333msgid "Leave a comment" 
    344334msgstr "" 
    345335 
    346 #: loop.php:99 loop.php:122 loop.php:164 
     336#: loop.php:98 loop.php:121 loop.php:163 
    347337msgid "1 Comment" 
    348338msgstr "" 
    349339 
    350 #: loop.php:99 loop.php:122 loop.php:164 
     340#: loop.php:98 loop.php:121 loop.php:163 
    351341msgid "% Comments" 
    352342msgstr "" 
    353343 
    354 #: loop.php:106 
     344#: loop.php:105 
    355345msgctxt "asides category slug" 
    356346msgid "asides" 
    357347msgstr "" 
    358348 
    359 #: loop.php:151 
     349#: loop.php:150 
    360350msgid "<span class=\"%1$s\">Posted in</span> %2$s" 
    361351msgstr "" 
    362352 
    363 #: loop.php:160 
     353#: loop.php:159 
    364354msgid "<span class=\"%1$s\">Tagged</span> %2$s" 
    365355msgstr "" 
     
    396386 
    397387#. Theme URI of the plugin/theme 
    398 msgid "http://wordpress.org/extend/themes/twentyten" 
     388msgid "http://wordpress.org/themes/twentyten" 
    399389msgstr "" 
    400390 
  • twentyten/1.6/loop.php

    r83071 r83071  
    6060    <?php if ( ( function_exists( 'get_post_format' ) && 'gallery' == get_post_format( $post->ID ) ) || in_category( _x( 'gallery', 'gallery category slug', 'twentyten' ) ) ) : ?> 
    6161        <div id="post-<?php the_ID(); ?>" <?php post_class(); ?>> 
    62             <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> 
     62            <h2 class="entry-title"><a href="<?php the_permalink(); ?>" rel="bookmark"><?php the_title(); ?></a></h2> 
    6363 
    6464            <div class="entry-meta"> 
     
    7171<?php else : ?> 
    7272                <?php 
    73                     $images = get_children( array( 'post_parent' => $post->ID, 'post_type' => 'attachment', 'post_mime_type' => 'image', 'orderby' => 'menu_order', 'order' => 'ASC', 'numberposts' => 999 ) ); 
     73                    $images = twentyten_get_gallery_images(); 
    7474                    if ( $images ) : 
    7575                        $total_images = count( $images ); 
    7676                        $image = array_shift( $images ); 
    77                         $image_img_tag = wp_get_attachment_image( $image->ID, 'thumbnail' ); 
    7877                ?> 
    7978                        <div class="gallery-thumb"> 
    80                             <a class="size-thumbnail" href="<?php the_permalink(); ?>"><?php echo $image_img_tag; ?></a> 
     79                            <a class="size-thumbnail" href="<?php the_permalink(); ?>"><?php echo wp_get_attachment_image( $image, 'thumbnail' ); ?></a> 
    8180                        </div><!-- .gallery-thumb --> 
    8281                        <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' ), 
     
    8483                                number_format_i18n( $total_images ) 
    8584                            ); ?></em></p> 
    86                 <?php endif; ?> 
     85                <?php endif; // end twentyten_get_gallery_images() check ?> 
    8786                        <?php the_excerpt(); ?> 
    8887<?php endif; ?> 
     
    9392                <a href="<?php echo get_post_format_link( 'gallery' ); ?>" title="<?php esc_attr_e( 'View Galleries', 'twentyten' ); ?>"><?php _e( 'More Galleries', 'twentyten' ); ?></a> 
    9493                <span class="meta-sep">|</span> 
    95             <?php elseif ( in_category( _x( 'gallery', 'gallery category slug', 'twentyten' ) ) ) : ?> 
    96                 <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> 
     94            <?php elseif ( $gallery = get_term_by( 'slug', _x( 'gallery', 'gallery category slug', 'twentyten' ), 'category' ) && in_category( $gallery->term_id ) ) : ?> 
     95                <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> 
    9796                <span class="meta-sep">|</span> 
    9897            <?php endif; ?> 
     
    129128    <?php else : ?> 
    130129        <div id="post-<?php the_ID(); ?>" <?php post_class(); ?>> 
    131             <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> 
     130            <h2 class="entry-title"><a href="<?php the_permalink(); ?>" rel="bookmark"><?php the_title(); ?></a></h2> 
    132131 
    133132            <div class="entry-meta"> 
  • twentyten/1.6/rtl.css

    r83071 r83071  
    134134#access .menu-header, 
    135135div.menu { 
    136     margin-right: 12px; 
    137     margin-left: 0; 
     136    margin-right: 12px; 
     137    margin-left: 0; 
    138138} 
    139139 
     
    202202.category-gallery .gallery-thumb { 
    203203    float: right; 
    204     margin-left:20px; 
     204    margin-left:20px; 
    205205    margin-right:0; 
    206206} 
  • twentyten/1.6/style.css

    r83071 r83071  
    11/* 
    22Theme Name: Twenty Ten 
    3 Theme URI: http://wordpress.org/extend/themes/twentyten 
     3Theme URI: http://wordpress.org/themes/twentyten 
    44Description: 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. 
    55Author: the WordPress team 
    66Author URI: http://wordpress.org/ 
    7 Version: 1.5 
     7Version: 1.6 
    88License: GNU General Public License v2 or later 
    99License URI: http://www.gnu.org/licenses/gpl-2.0.html 
     
    526526#content tr th, 
    527527#content thead th { 
    528     color: #888; 
     528    color: #777; 
    529529    font-size: 12px; 
    530530    font-weight: bold; 
     
    566566.page-title a:link, 
    567567.page-title a:visited { 
    568     color: #888; 
     568    color: #777; 
    569569    text-decoration: none; 
    570570} 
     
    590590} 
    591591.entry-meta { 
    592     color: #888; 
     592    color: #777; 
    593593    font-size: 12px; 
    594594} 
     
    628628} 
    629629.entry-content label { 
    630     color: #888; 
     630    color: #777; 
    631631    font-size: 12px; 
    632632} 
     
    708708.entry-utility { 
    709709    clear: both; 
    710     color: #888; 
     710    color: #777; 
    711711    font-size: 12px; 
    712712    line-height: 18px; 
     
    714714.entry-meta a, 
    715715.entry-utility a { 
    716     color: #888; 
     716    color: #777; 
    717717} 
    718718.entry-meta a:hover, 
     
    833833.wp-caption img { 
    834834    margin: 5px 5px 0; 
     835    max-width: 622px; /* caption width - 10px */ 
    835836} 
    836837.wp-caption p.wp-caption-text { 
    837     color: #888; 
     838    color: #777; 
    838839    font-size: 12px; 
    839840    margin: 5px; 
     
    869870} 
    870871.gallery .gallery-caption { 
    871     color: #888; 
     872    color: #777; 
    872873    font-size: 12px; 
    873874    margin: 0 0 12px; 
     
    892893 
    893894.navigation { 
    894     color: #888; 
     895    color: #777; 
    895896    font-size: 12px; 
    896897    line-height: 18px; 
     
    899900.navigation a:link, 
    900901.navigation a:visited { 
    901     color: #888; 
     902    color: #777; 
    902903    text-decoration: none; 
    903904} 
     
    997998.comment-meta a:link, 
    998999.comment-meta a:visited { 
    999     color: #888; 
     1000    color: #777; 
    10001001    text-decoration: none; 
    10011002} 
     
    10141015.reply a, 
    10151016a.comment-edit-link { 
    1016     color: #888; 
     1017    color: #777; 
    10171018} 
    10181019.reply a:hover, 
     
    10411042} 
    10421043#comments .pingback p { 
    1043     color: #888; 
     1044    color: #777; 
    10441045    display: block; 
    10451046    font-size: 12px; 
     
    10931094} 
    10941095#respond label { 
    1095     color: #888; 
     1096    color: #777; 
    10961097    font-size: 12px; 
    10971098} 
     
    11041105} 
    11051106#respond .form-allowed-tags { 
    1106     color: #888; 
     1107    color: #777; 
    11071108    font-size: 12px; 
    11081109    line-height: 18px; 
Note: See TracChangeset for help on using the changeset viewer.