Changeset 44149 for trunk/src/wp-content/themes/twentynineteen/inc/template-tags.php

Timestamp:

12/14/2018 02:32:33 AM (6 years ago)

Author:

pento

Message:

Default Themes: Import Twenty Nineteen from the 5.0 branch.

Merges [43808,43821,43842,43860,43892,43904,43909,43926-43929,43956,43961-43963] from the 5.0 branch to trunk.

Props allancole, karmatosed, kjellr, yingling017, mrasharirfan, milana_cap, fabiankaegy, westonruter, jorbin, netweb, b-07, khleomix, audrasjb, nielslange, mmaumio, richsalvucci, littlebigthing, dimadin, joyously, anevins, peterwilsoncc, dannycooper, iCaleb, siriokun, technosiren, travel_girl, azchughtai, ianbelanger, nadim1992, ismailelkorchi, nativeinside, chetan200891, grapplerulrich, ocean90, joshfeck, frankew, AbdulWahab610, mendezcode, eliorivero, melchoyce, joen, laurelfulford, mdawaffe, kraftbj, dsmart, nao, mayukojpn, enodekciw, ketuchetan, atanasangelovdev, poena, sharaz, artisticasad, mukesh27, burhandodhy, crunnells, aprakasa, themeroots, imonly_ik, tlxo, youthkee, brentswisher, smyoon315, mrahmadawais, desideveloper, Kau-Boy, mor10, mikeyarce, dingo_bastard, xkon, twoabove.

Fixes #45424.

Location:

trunk

Files:

• . (modified) (1 prop)
• src/wp-content/themes/twentynineteen (copied) (copied from branches/5.0/src/wp-content/themes/twentynineteen)
• src/wp-content/themes/twentynineteen/inc/template-tags.php (modified) (11 diffs)

trunk/src/wp-content/themes/twentynineteen/inc/template-tags.php

@@ -5 +5 @@
  * @package WordPress
  * @subpackage Twenty_Nineteen
+ * @since 1.0.0
  */
 
@@ -26 +27 @@
 
         printf(
-            '<span class="posted-on">%1$s<a href="%2$s" rel="bookmark">' . $time_string . '</a></span>',
+            '<span class="posted-on">%1$s<a href="%2$s" rel="bookmark">%3$s</a></span>',
             twentynineteen_get_icon_svg( 'watch', 16 ),
             esc_url( get_permalink() ),
@@ -43 +44 @@
             /* translators: 1: SVG icon. 2: post author, only visible to screen readers. 3: author link. */
             twentynineteen_get_icon_svg( 'person', 16 ),
-            esc_html__( 'Posted by', 'twentynineteen' ),
+            __( 'Posted by', 'twentynineteen' ),
             esc_url( get_author_posts_url( get_the_author_meta( 'ID' ) ) ),
             esc_html( get_the_author() )
@@ -73 +74 @@
     function twentynineteen_entry_footer() {
 
-        // Posted by
-        twentynineteen_posted_by();
-
-        // Hide category and tag text for pages.
+        // Hide author, post date, category and tag text for pages.
         if ( 'post' === get_post_type() ) {
+
+            // Posted by
+            twentynineteen_posted_by();
+
+            // Posted on
+            twentynineteen_posted_on();
+
             /* translators: used between list items, there is a space after the comma. */
-            $categories_list = get_the_category_list( esc_html__( ', ', 'twentynineteen' ) );
+            $categories_list = get_the_category_list( __( ', ', 'twentynineteen' ) );
             if ( $categories_list ) {
                 /* translators: 1: SVG icon. 2: posted in label, only visible to screen readers. 3: list of categories. */
@@ -85 +90 @@
                     '<span class="cat-links">%1$s<span class="screen-reader-text">%2$s</span>%3$s</span>',
                     twentynineteen_get_icon_svg( 'archive', 16 ),
-                    esc_html__( 'Posted in', 'twentynineteen' ),
+                    __( 'Posted in', 'twentynineteen' ),
                     $categories_list
                 ); // WPCS: XSS OK.
@@ -91 +96 @@
 
             /* translators: used between list items, there is a space after the comma. */
-            $tags_list = get_the_tag_list( '', esc_html__( ', ', 'twentynineteen' ) );
+            $tags_list = get_the_tag_list( '', __( ', ', 'twentynineteen' ) );
             if ( $tags_list ) {
                 /* translators: 1: SVG icon. 2: posted in label, only visible to screen readers. 3: list of tags. */
                 printf(
-                    '<span class="cat-links">%1$s<span class="screen-reader-text">%2$s </span>%3$s</span>',
+                    '<span class="tags-links">%1$s<span class="screen-reader-text">%2$s </span>%3$s</span>',
                     twentynineteen_get_icon_svg( 'tag', 16 ),
-                    esc_html__( 'Tags:', 'twentynineteen' ),
+                    __( 'Tags:', 'twentynineteen' ),
                     $tags_list
                 ); // WPCS: XSS OK.
@@ -151 +156 @@
             ?>
 
-            <figure class="post-thumbnail">
-                <a class="post-thumbnail-inner" href="<?php the_permalink(); ?>" aria-hidden="true" tabindex="-1">
-                    <?php
-                    the_post_thumbnail(
-                        'post-thumbnail',
-                        array(
-                            'alt' => the_title_attribute(
-                                array( 'echo' => false )
-                            ),
-                        )
-                    );
-                    ?>
-                </a>
-            </figure><!-- .post-thumbnail -->
+        <figure class="post-thumbnail">
+            <a class="post-thumbnail-inner" href="<?php the_permalink(); ?>" aria-hidden="true" tabindex="-1">
+                <?php
+                the_post_thumbnail( 'post-thumbnail' );
+                ?>
+            </a>
+        </figure>
 
             <?php
@@ -171 +169 @@
 endif;
 
-if ( ! function_exists( 'twentynineteen_header_featured_image_css' ) ) :
-    /**
-     * Returns the CSS for the header featured image background.
-     */
-    function twentynineteen_header_featured_image_css() {
-        $img_url = get_the_post_thumbnail_url( get_the_ID(), 'post-thumbnail' );
-        return sprintf( 'body.singular .site-header.featured-image .site-branding-container:before { background-image: url(%s); }', esc_url( $img_url ) );
-    }
-endif;
-
 if ( ! function_exists( 'twentynineteen_comment_avatar' ) ) :
     /**
@@ -186 +174 @@
      */
     function twentynineteen_get_user_avatar_markup( $id_or_email = null ) {
+
         if ( ! isset( $id_or_email ) ) {
             $id_or_email = get_current_user_id();
         }
 
-        $classes = array( 'comment-author', 'vcard' );
-
         return sprintf( '<div class="comment-user-avatar comment-author vcard">%s</div>', get_avatar( $id_or_email, twentynineteen_get_avatar_size() ) );
     }
@@ -201 +188 @@
      */
     function twentynineteen_discussion_avatars_list( $comment_authors ) {
-        if ( ! empty( $comment_authors ) ) {
-            $out = array( '<ol class="discussion-avatar-list">' );
-            foreach ( $comment_authors as $id_or_email ) {
-                $out[] = sprintf( '<li>%s</li>', twentynineteen_get_user_avatar_markup( $id_or_email ) );
-            }
-            $out[] = '</ol><!-- .discussion-avatar-list -->';
-            echo implode( "\n", $out );
-        }
-        return null;
+        if ( empty( $comment_authors ) ) {
+            return;
+        }
+        echo '<ol class="discussion-avatar-list">', "\n";
+        foreach ( $comment_authors as $id_or_email ) {
+            printf(
+                "<li>%s</li>\n",
+                twentynineteen_get_user_avatar_markup( $id_or_email )
+            );
+        }
+        echo '</ol><!-- .discussion-avatar-list -->', "\n";
     }
 endif;
@@ -219 +208 @@
     function twentynineteen_comment_form( $order ) {
         if ( true === $order || strtolower( $order ) === strtolower( get_option( 'comment_order', 'asc' ) ) ) {
+
             comment_form(
                 array(
-                    'title_reply_before' => twentynineteen_get_user_avatar_markup(),
                     'logged_in_as'       => null,
                     'title_reply'        => null,