Changeset 44149 for trunk/src/wp-content/themes/twentynineteen/template-parts/content/content-single.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/template-parts/content/content-single.php (modified) (4 diffs)

trunk/src/wp-content/themes/twentynineteen/template-parts/content/content-single.php

@@ -7 +7 @@
  * @package WordPress
  * @subpackage Twenty_Nineteen
+ * @since 1.0.0
  */
 
@@ -12 +13 @@
 
 <article id="post-<?php the_ID(); ?>" <?php post_class(); ?>>
-<?php if ( ! twentynineteen_can_show_post_thumbnail() ) : ?>
+    <?php if ( ! twentynineteen_can_show_post_thumbnail() ) : ?>
     <header class="entry-header">
-        <?php if ( ! is_page() ) : ?>
-        <?php $discussion = twentynineteen_can_show_post_thumbnail() ? twentynineteen_get_discussion_data() : null; ?>
-        <?php endif; ?>
-        <?php the_title( '<h1 class="entry-title">', '</h1>' ); ?>
-        <?php if ( ! is_page() ) : ?>
-        <div class="<?php echo ( ! empty( $discussion ) && count( $discussion->authors ) > 0 ) ? 'entry-meta has-discussion' : 'entry-meta'; ?>">
-            <?php twentynineteen_posted_by(); ?>
-            <?php twentynineteen_posted_on(); ?>
-            <span class="comment-count">
-                <?php
-                if ( ! empty( $discussion ) ) {
-                twentynineteen_discussion_avatars_list( $discussion->authors );}
-                ?>
-                <?php twentynineteen_comment_count(); ?>
-            </span>
-            <?php
-            // Edit post link.
-                edit_post_link(
-                    sprintf(
-                        wp_kses(
-                            /* translators: %s: Name of current post. Only visible to screen readers. */
-                            __( 'Edit <span class="screen-reader-text">%s</span>', 'twentynineteen' ),
-                            array(
-                                'span' => array(
-                                    'class' => array(),
-                                ),
-                            )
-                        ),
-                        get_the_title()
-                    ),
-                    '<span class="edit-link">' . twentynineteen_get_icon_svg( 'edit', 16 ),
-                    '</span>'
-                );
-            ?>
-        </div><!-- .meta-info -->
-        <?php endif; ?>
+        <?php get_template_part( 'template-parts/header/entry', 'header' ); ?>
     </header>
-<?php endif; ?>
+    <?php endif; ?>
 
     <div class="entry-content">
@@ -72 +38 @@
         wp_link_pages(
             array(
-                'before' => '<div class="page-links">' . esc_html__( 'Pages:', 'twentynineteen' ),
+                'before' => '<div class="page-links">' . __( 'Pages:', 'twentynineteen' ),
                 'after'  => '</div>',
             )
@@ -83 +49 @@
     </footer><!-- .entry-footer -->
 
-    <?php get_template_part( 'template-parts/post/author', 'info' ); ?>
+    <?php if ( ! is_singular( 'attachment' ) ) : ?>
+    <?php get_template_part( 'template-parts/post/author', 'bio' ); ?>
+    <?php endif; ?>
 
 </article><!-- #post-${ID} -->