$post->ID, 'post_type' => 'attachment', 'post_mime_type' => 'image', 'orderby' => 'menu_order', 'order' => 'ASC' ) );
- if ( $images ) :
- $total_images = count( $images );
- if ( empty( $featured_image ) ) {
- $image = array_shift( $images );
- $featured_image = wp_get_attachment_image( $image->ID, 'featured-thumbnail-formatted' );
- }
+ if ( has_post_format( 'gallery' ) ) :
+ if ( has_post_thumbnail() ) :
+ $featured_image = get_the_post_thumbnail( get_the_ID(), 'featured-thumbnail-formatted' );
+ elseif ( $total_images > 0 ) :
+ $image = array_shift( $images );
+ $featured_image = wp_get_attachment_image( $image, 'featured-thumbnail-formatted' );
?>
-
-
%2$s photo.', 'This gallery contains %2$s photos.', $total_images, 'twentyfourteen' ),
- 'href="' . get_permalink() . '" title="' . esc_attr( sprintf( __( 'Permalink to %s', 'twentyfourteen' ), the_title_attribute( 'echo=0' ) ) ) . '" rel="bookmark"',
+
+
+ %2$s photo.', 'This gallery contains %2$s photos.', $total_images, 'twentyfourteen' ),
+ esc_url( get_permalink() ),
number_format_i18n( $total_images )
- ); ?>
+
+
', '' );
+ if ( ! has_post_format( 'link' ) ) :
+ the_title( '
' );
endif;
+
+ twentyfourteen_posted_on();
+
+ if ( ! post_password_required() && ( comments_open() || get_comments_number() ) ) :
?>
-
-
-
\ No newline at end of file
+
diff --git a/src/wp-content/themes/twentyfourteen/content-single.php b/src/wp-content/themes/twentyfourteen/content-single.php
index 6be2984c8f..073f9211ef 100644
--- a/src/wp-content/themes/twentyfourteen/content-single.php
+++ b/src/wp-content/themes/twentyfourteen/content-single.php
@@ -3,40 +3,31 @@
* @package WordPress
* @subpackage Twenty_Fourteen
*/
-$format = get_post_format();
-if ( false === $format )
- $format = 'standard';
+has_post_format()
?>
>
-
+
-
+
-
-
+
'
' . __( 'Pages:', 'twentyfourteen' ) . '',
'after' => '
',
'link_before' => '
',
- 'link_after' => ''
+ 'link_after' => '',
) );
?>
-
+
diff --git a/src/wp-content/themes/twentyfourteen/content.php b/src/wp-content/themes/twentyfourteen/content.php
index 02e214bfd9..62e1a9ea01 100644
--- a/src/wp-content/themes/twentyfourteen/content.php
+++ b/src/wp-content/themes/twentyfourteen/content.php
@@ -3,74 +3,66 @@
* @package WordPress
* @subpackage Twenty_Fourteen
*/
-$format = get_post_format();
+
?>
-
>
+>
-
+
-
+
-
- →', 'twentyfourteen' ) ); ?>
+
→', 'twentyfourteen' ) );
wp_link_pages( array(
'before' => '
' . __( 'Pages:', 'twentyfourteen' ) . '',
'after' => '
',
'link_before' => '
',
- 'link_after' => ''
+ 'link_after' => '',
) );
?>
-
-
-
-
\ No newline at end of file
+
+
+
+
diff --git a/src/wp-content/themes/twentyfourteen/featured-content.php b/src/wp-content/themes/twentyfourteen/featured-content.php
index 79bb599f40..726f21c7c5 100644
--- a/src/wp-content/themes/twentyfourteen/featured-content.php
+++ b/src/wp-content/themes/twentyfourteen/featured-content.php
@@ -1,5 +1,5 @@
-
+
$post ) :
setup_postdata( $post );
+
get_template_part( 'content', 'featured-post' );
endforeach;
diff --git a/src/wp-content/themes/twentyfourteen/footer.php b/src/wp-content/themes/twentyfourteen/footer.php
index 4d7a05b184..a5108b8ffe 100644
--- a/src/wp-content/themes/twentyfourteen/footer.php
+++ b/src/wp-content/themes/twentyfourteen/footer.php
@@ -2,26 +2,25 @@
/**
* The template for displaying the footer.
*
- * Contains the closing of the id=main div and all content after
+ * Contains footer content and the closing of the #main and #page div elements.
*
* @package WordPress
* @subpackage Twenty_Fourteen
*/
?>
-
+
-
+
-
-
-
-
+
+
+
- ' . get_the_title() . '' ); - ?> -
- 1 && get_option( 'page_comments' ) ) : // are there comments to navigate through ?> - - ++ +
-- 'twentyfourteen_comment' ) ); - ?> -
+ 1 && get_option( 'page_comments' ) ) : ?> + + - 1 && get_option( 'page_comments' ) ) : // are there comments to navigate through ?> - - ++ 'ol', + 'short_ping' => true, + + // TODO: Remove callback and update styles. + 'callback'=>'twentyfourteen_comment', + ) ); + ?> +
+ + 1 && get_option( 'page_comments' ) ) : ?> + + + + + + - - - - -