Upstream/WordPress
1
0
Fork 0
mirror of https://github.com/WordPress/WordPress.git synced 2024-09-26 22:32:52 +02:00
Code Issues Projects Releases Wiki Activity

Twenty Thirteen: remove all post_format_*() and the_remaining_content() function calls, reverting to the_content(). Simplify functions.php, JS, and CSS files accordingly. Props obenland for starter patch, fixes #24469 and #24407. See #24452.

Browse Source 
git-svn-id: http://core.svn.wordpress.org/trunk@24391 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Lance Willett 2013-05-31 17:45:00 +00:00
parent 222b25db4f
commit ff9e60e3e6
11 changed files with 34 additions and 300 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
wp-content/themes/twentythirteen/content-audio.php
View File

@ -19,15 +19,11 @@
<?php endif; // is_single() ?> <?php endif; // is_single() ?>
</header><!-- .entry-header --> </header><!-- .entry-header -->
<div class="entry-media">
<div class="audio-content">
<?php the_post_format_audio(); ?>
</div><!-- .audio-content -->
</div><!-- .entry-media -->
<div class="entry-content"> <div class="entry-content">
<?php the_remaining_content( __( 'Continue reading <span class="meta-nav">&rarr;</span>', 'twentythirteen' ) ); ?> <div class="audio-content">
<?php wp_link_pages( array( 'before' => '<div class="page-links"><span class="page-links-title">' . __( 'Pages:', 'twentythirteen' ) . '</span>', 'after' => '</div>', 'link_before' => '<span>', 'link_after' => '</span>' ) ); ?> <?php the_content( __( 'Continue reading <span class="meta-nav">&rarr;</span>', 'twentythirteen' ) ); ?>
<?php wp_link_pages( array( 'before' => '<div class="page-links"><span class="page-links-title">' . __( 'Pages:', 'twentythirteen' ) . '</span>', 'after' => '</div>', 'link_before' => '<span>', 'link_after' => '</span>' ) ); ?>
</div><!-- .audio-content -->
</div><!-- .entry-content --> </div><!-- .entry-content -->
<footer class="entry-meta"> <footer class="entry-meta">

2
wp-content/themes/twentythirteen/content-chat.php
View File

@ -20,7 +20,7 @@
</header><!-- .entry-header --> </header><!-- .entry-header -->
<div class="entry-content"> <div class="entry-content">
<?php the_post_format_chat(); ?> <?php the_content(); ?>
<?php wp_link_pages( array( 'before' => '<div class="page-links"><span class="page-links-title">' . __( 'Pages:', 'twentythirteen' ) . '</span>', 'after' => '</div>', 'link_before' => '<span>', 'link_after' => '</span>' ) ); ?> <?php wp_link_pages( array( 'before' => '<div class="page-links"><span class="page-links-title">' . __( 'Pages:', 'twentythirteen' ) . '</span>', 'after' => '</div>', 'link_before' => '<span>', 'link_after' => '</span>' ) ); ?>
</div><!-- .entry-content --> </div><!-- .entry-content -->

2
wp-content/themes/twentythirteen/content-gallery.php
View File

@ -24,7 +24,7 @@
<?php the_content( __( 'Continue reading <span class="meta-nav">&rarr;</span>', 'twentythirteen' ) ); ?> <?php the_content( __( 'Continue reading <span class="meta-nav">&rarr;</span>', 'twentythirteen' ) ); ?>
<?php wp_link_pages( array( 'before' => '<div class="page-links"><span class="page-links-title">' . __( 'Pages:', 'twentythirteen' ) . '</span>', 'after' => '</div>', 'link_before' => '<span>', 'link_after' => '</span>' ) ); ?> <?php wp_link_pages( array( 'before' => '<div class="page-links"><span class="page-links-title">' . __( 'Pages:', 'twentythirteen' ) . '</span>', 'after' => '</div>', 'link_before' => '<span>', 'link_after' => '</span>' ) ); ?>
<?php else : ?> <?php else : ?>
<?php the_post_format_gallery(); ?> <?php echo get_post_gallery(); ?>
<?php endif; // is_single() ?> <?php endif; // is_single() ?>
</div><!-- .entry-content --> </div><!-- .entry-content -->

6
wp-content/themes/twentythirteen/content-image.php
View File

@ -9,10 +9,6 @@
?> ?>
<article id="post-<?php the_ID(); ?>" <?php post_class(); ?>> <article id="post-<?php the_ID(); ?>" <?php post_class(); ?>>
<div class="entry-media">
<?php the_post_format_image( 'twentythirteen-image-post' ); ?>
</div><!-- .entry-media -->
<header class="entry-header"> <header class="entry-header">
<?php if ( is_single() ) : ?> <?php if ( is_single() ) : ?>
<h1 class="entry-title"><?php the_title(); ?></h1> <h1 class="entry-title"><?php the_title(); ?></h1>
@ -24,7 +20,7 @@
</header><!-- .entry-header --> </header><!-- .entry-header -->
<div class="entry-content"> <div class="entry-content">
<?php the_remaining_content( __( 'Continue reading <span class="meta-nav">&rarr;</span>', 'twentythirteen' ) ); ?> <?php the_content( __( 'Continue reading <span class="meta-nav">&rarr;</span>', 'twentythirteen' ) ); ?>
<?php wp_link_pages( array( 'before' => '<div class="page-links"><span class="page-links-title">' . __( 'Pages:', 'twentythirteen' ) . '</span>', 'after' => '</div>', 'link_before' => '<span>', 'link_after' => '</span>' ) ); ?> <?php wp_link_pages( array( 'before' => '<div class="page-links"><span class="page-links-title">' . __( 'Pages:', 'twentythirteen' ) . '</span>', 'after' => '</div>', 'link_before' => '<span>', 'link_after' => '</span>' ) ); ?>
</div><!-- .entry-content --> </div><!-- .entry-content -->

6
wp-content/themes/twentythirteen/content-video.php
View File

@ -9,10 +9,6 @@
?> ?>
<article id="post-<?php the_ID(); ?>" <?php post_class(); ?>> <article id="post-<?php the_ID(); ?>" <?php post_class(); ?>>
<div class="entry-media">
<?php the_post_format_video(); ?>
</div><!-- .entry-media -->
<header class="entry-header"> <header class="entry-header">
<?php if ( is_single() ) : ?> <?php if ( is_single() ) : ?>
<h1 class="entry-title"><?php the_title(); ?></h1> <h1 class="entry-title"><?php the_title(); ?></h1>
@ -24,7 +20,7 @@
</header><!-- .entry-header --> </header><!-- .entry-header -->
<div class="entry-content"> <div class="entry-content">
<?php the_remaining_content( __( 'Continue reading <span class="meta-nav">&rarr;</span>', 'twentythirteen' ) ); ?> <?php the_content( __( 'Continue reading <span class="meta-nav">&rarr;</span>', 'twentythirteen' ) ); ?>
<?php wp_link_pages( array( 'before' => '<div class="page-links"><span class="page-links-title">' . __( 'Pages:', 'twentythirteen' ) . '</span>', 'after' => '</div>', 'link_before' => '<span>', 'link_after' => '</span>' ) ); ?> <?php wp_link_pages( array( 'before' => '<div class="page-links"><span class="page-links-title">' . __( 'Pages:', 'twentythirteen' ) . '</span>', 'after' => '</div>', 'link_before' => '<span>', 'link_after' => '</span>' ) ); ?>
</div><!-- .entry-content --> </div><!-- .entry-content -->

150
wp-content/themes/twentythirteen/css/editor-style.css
View File

@ -14,8 +14,7 @@ Description: Used to style the TinyMCE editor.
* 5.0 - Alignment * 5.0 - Alignment
* 6.0 - Tables * 6.0 - Tables
* 7.0 - Images * 7.0 - Images
* 8.0 - Post Formats * 8.0 - RTL
* 9.0 - RTL
* ---------------------------------------------------------------------------- * ----------------------------------------------------------------------------
*/ */
@ -365,154 +364,9 @@ img {
padding: 0; padding: 0;
} }
/**
* 8.0 Post Formats
* ----------------------------------------------------------------------------
*/
/* Aside */
.post-format-aside {
background-color: #f7f5e7;
}
.post-format-aside blockquote {
font-size: 100%;
font-weight: normal;
}
.post-format-aside cite {
font-size: 100%;
text-transform: none;
}
.post-format-aside cite:before {
content: "\2014";
margin-right: 5px;
}
/* Audio */
.post-format-audio {
background-color: #db572f;
}
.post-format-audio a {
color: #fbfaf3;
}
/* Chat */
.post-format-chat {
background-color: #eadaa6;
}
.post-format-chat a {
color: #722d19;
}
/* Gallery */
.post-format-gallery {
background-color: #fbca3c;
}
.post-format-gallery a {
color: #722d19;
}
/* Image: same as Standard/Defaults */
/* Link */
.post-format-link {
background-color: #f7f5e7;
}
/* Quote */
.post-format-quote {
background-color: #210d10;
color: #f7f5e7;
}
.post-format-quote blockquote {
font-size: 28px;
font-style: italic;
font-weight: 300;
margin: 0;
padding-left: 75px;
position: relative;
}
.post-format-quote blockquote:before {
content: '\201C';
font-size: 140px;
font-weight: 400;
line-height: .8;
padding-right: 25px;
position: absolute;
left: -15px;
top: -3px;
}
.post-format-quote a {
color: #e63f2a;
}
.post-format-quote .quote-caption,
.post-format-quote blockquote small,
.post-format-quote blockquote cite {
display: block;
font-size: 16px;
}
/* Status */
.post-format-status {
background-color: #722d19;
color: #f7f5e7;
font-style: italic;
font-weight: 300;
padding: 0;
padding-left: 35px;
}
.post-format-status.mceContentBody {
font-size: 24px;
}
.post-format-status:before {
background-size: 4px 4px;
background: url(../images/dotted-line.png) repeat-y left bottom;
content: "";
display: block;
height: 100%;
position: absolute;
left: 15px;
top: 0;
width: 1px;
}
.post-format-status p:first-child:before {
background-color: rgba(0, 0, 0, 0.65);
content: "";
height: 3px;
width: 13px;
margin-top: 13px;
position: absolute;
left: 9px;
}
.post-format-status a {
color: #eadaa6;
}
/* Video */
.post-format-video {
background-color: #db572f;
}
.post-format-video a {
color: #fbfaf3;
}
/** /**
* 9.0 RTL * 8.0 RTL
* ---------------------------------------------------------------------------- * ----------------------------------------------------------------------------
*/ */

8
wp-content/themes/twentythirteen/css/ie.css
View File

@ -10,7 +10,7 @@ Styles for older IE versions (previous to IE9).
.menu-toggle:after:hover, .menu-toggle:after:hover,
.date a:before:hover, .date a:before:hover,
.entry-meta .author a:before:hover, .entry-meta .author a:before:hover,
.format-audio .entry-media:before:hover, .format-audio .entry-content:before:hover,
.comments-link a:before:hover, .comments-link a:before:hover,
.tags-links a:first-child:before:hover, .tags-links a:first-child:before:hover,
.categories-links a:first-child:before:hover, .categories-links a:first-child:before:hover,
@ -280,12 +280,8 @@ img.alignleft {
left: auto; left: auto;
} }
.ie7 .format-quote .quote {
padding: 0;
}
/* RTL for Internet Explorer 7 & 8 */ /* RTL for Internet Explorer 7 & 8 */
.rtl .format-audio .entry-media:before, .rtl .format-audio .entry-content:before,
.rtl .comment-reply-link:before, .rtl .comment-reply-link:before,
.rtl .comment-reply-login:before { .rtl .comment-reply-login:before {
-ms-filter: "FlipH"; -ms-filter: "FlipH";

34
wp-content/themes/twentythirteen/functions.php
View File

@ -95,9 +95,6 @@ function twentythirteen_setup() {
add_theme_support( 'post-thumbnails' ); add_theme_support( 'post-thumbnails' );
set_post_thumbnail_size( 604, 270, true ); set_post_thumbnail_size( 604, 270, true );
// Register custom image size for image post formats.
add_image_size( 'twentythirteen-image-post', 724, 1288 );
// This theme uses its own gallery styles. // This theme uses its own gallery styles.
add_filter( 'use_default_gallery_style', '__return_false' ); add_filter( 'use_default_gallery_style', '__return_false' );
} }
@ -436,7 +433,8 @@ endif;
* @return string The Link format URL. * @return string The Link format URL.
*/ */
function twentythirteen_get_link_url() { function twentythirteen_get_link_url() {
$has_url = get_the_post_format_url(); $content = get_the_content();
$has_url = get_content_url( $content );
return ( $has_url ) ? $has_url : apply_filters( 'the_permalink', get_permalink() ); return ( $has_url ) ? $has_url : apply_filters( 'the_permalink', get_permalink() );
} }
@ -492,33 +490,15 @@ add_filter( 'body_class', 'twentythirteen_body_class' );
* @return void * @return void
*/ */
function twentythirteen_content_width() { function twentythirteen_content_width() {
if ( has_post_format( 'video' ) || is_attachment() ) { global $content_width;
global $content_width;
if ( is_attachment() )
$content_width = 724; $content_width = 724;
} elseif ( has_post_format( 'audio' ) )
$content_width = 484;
} }
add_action( 'template_redirect', 'twentythirteen_content_width' ); add_action( 'template_redirect', 'twentythirteen_content_width' );
/**
* Adjusts content_width value for video shortcodes in video post formats.
*
* @since Twenty Thirteen 1.0
*
* @param array $atts The attribute list.
* @return array The filtered attribute list.
*/
function twentythirteen_video_width( $atts ) {
if ( ! is_admin() && has_post_format( 'video' ) ) {
$new_width = 724;
$atts['height'] = round( ( $atts['height'] * $new_width ) / $atts['width'] );
$atts['width'] = $new_width;
}
return $atts;
}
add_action( 'embed_defaults', 'twentythirteen_video_width' );
add_action( 'shortcode_atts_video', 'twentythirteen_video_width' );
/** /**
* Switches default core markup for search form to output valid HTML5. * Switches default core markup for search form to output valid HTML5.
* *

7
wp-content/themes/twentythirteen/js/functions.js
View File

@ -8,7 +8,6 @@
var html = $( 'html' ), var html = $( 'html' ),
body = $( 'body' ), body = $( 'body' ),
_window = $( window ), _window = $( window ),
captions = $( '.quote-caption' ),
adjustFooter, adjustFooter,
/** /**
@ -71,12 +70,6 @@
} }
} ); } );
/** Better styles for Quote post formats with a linked source.
*
*/
if ( captions )
captions.has( 'a' ).addClass( 'linked' );
/** /**
* Arranges footer widgets vertically. * Arranges footer widgets vertically.
*/ */

32
wp-content/themes/twentythirteen/rtl.css
View File

@ -151,11 +151,6 @@ div.nav-menu > ul {
* ---------------------------------------------------------------------------- * ----------------------------------------------------------------------------
*/ */
.sidebar .entry-media {
padding-left: 316px;
padding-right: 0;
}
.sidebar .entry-header, .sidebar .entry-header,
.sidebar .entry-content, .sidebar .entry-content,
.sidebar .entry-summary, .sidebar .entry-summary,
@ -245,7 +240,6 @@ div.nav-menu > ul {
* ---------------------------------------------------------------------------- * ----------------------------------------------------------------------------
*/ */
.entry-media a,
.entry-content a { .entry-content a {
display: inline; display: inline;
} }
@ -260,7 +254,7 @@ div.nav-menu > ul {
margin-left: 5px; margin-left: 5px;
} }
.format-audio .entry-media:before { .format-audio .entry-content:before {
float: right; float: right;
-webkit-transform: scaleX(-1); -webkit-transform: scaleX(-1);
-moz-transform: scaleX(-1); -moz-transform: scaleX(-1);
@ -269,12 +263,6 @@ div.nav-menu > ul {
transform: scaleX(-1); transform: scaleX(-1);
} }
.format-audio .entry-media,
.sidebar .format-audio .entry-media {
padding-left: 374px;
padding-right: 60px;
}
.format-audio .audio-content { .format-audio .audio-content {
background-position: right top; background-position: right top;
float: left; float: left;
@ -343,12 +331,12 @@ div.nav-menu > ul {
right: 64px; right: 64px;
} }
.format-quote .quote { .format-quote blockquote {
padding-left: 0; padding-left: 0;
padding-right: 75px; padding-right: 75px;
} }
.format-quote .quote:before { .format-quote blockquote:before {
content: '\201D'; content: '\201D';
padding-left: 25px; padding-left: 25px;
padding-right: 0; padding-right: 0;
@ -608,13 +596,6 @@ div.nav-menu > ul {
*/ */
@media (max-width: 1069px) { @media (max-width: 1069px) {
.sidebar .entry-media,
.format-audio .entry-media,
.sidebar .format-audio .entry-media {
padding-left: 376px;
padding-right: 60px;
}
ul.nav-menu, ul.nav-menu,
div.nav-menu > ul { div.nav-menu > ul {
margin-left: auto; margin-left: auto;
@ -656,13 +637,6 @@ div.nav-menu > ul {
padding-right: 0; padding-right: 0;
} }
.sidebar .entry-media,
.format-audio .entry-media,
.sidebar .format-audio .entry-media {
padding-left: 0;
padding-right: 0;
}
.site-main .widget-area { .site-main .widget-area {
float: none; float: none;
margin-left: auto; margin-left: auto;

75
wp-content/themes/twentythirteen/style.css
View File

@ -257,8 +257,7 @@ blockquote blockquote {
} }
blockquote cite, blockquote cite,
blockquote small, blockquote small {
.quote-caption {
font-size: 14px; font-size: 14px;
font-weight: normal; font-weight: normal;
text-transform: uppercase; text-transform: uppercase;
@ -480,7 +479,7 @@ hr {
.featured-post:before, .featured-post:before,
.date a:before, .date a:before,
.entry-meta .author a:before, .entry-meta .author a:before,
.format-audio .entry-media:before, .format-audio .entry-content:before,
.comments-link a:before, .comments-link a:before,
.tags-links a:first-child:before, .tags-links a:first-child:before,
.categories-links a:first-child:before, .categories-links a:first-child:before,
@ -502,7 +501,6 @@ hr {
/* Clearing floats */ /* Clearing floats */
.clear:after, .clear:after,
.entry-media:after,
.attachment .entry-header:after, .attachment .entry-header:after,
.site-footer .widget-area:after, .site-footer .widget-area:after,
.entry-content:after, .entry-content:after,
@ -516,8 +514,6 @@ hr {
.clear:before, .clear:before,
.clear:after, .clear:after,
.entry-media:before,
.entry-media:after,
.attachment .entry-header:before, .attachment .entry-header:before,
.attachment .entry-header:after, .attachment .entry-header:after,
.site-footer .widget-area:before, .site-footer .widget-area:before,
@ -676,7 +672,6 @@ img[class*="attachment-"] {
height: auto; height: auto;
} }
.entry-media img,
img.size-full, img.size-full,
img.size-large, img.size-large,
img.wp-post-image { img.wp-post-image {
@ -1126,8 +1121,7 @@ ul.nav-menu li:hover > ul,
} }
.entry-content blockquote cite, .entry-content blockquote cite,
.entry-content blockquote small, .entry-content blockquote small {
.entry-content .quote-caption {
font-size: 16px; font-size: 16px;
} }
@ -1365,23 +1359,6 @@ footer.entry-meta {
* ---------------------------------------------------------------------------- * ----------------------------------------------------------------------------
*/ */
.entry-media {
margin: 0 auto 24px;
max-width: 724px;
width: 100%;
}
.sidebar .entry-media {
max-width: 1040px;
padding: 0 316px 0 0;
}
.entry-media .wp-caption,
.entry-media .wp-caption-text,
.entry-media [class*="align"] {
margin: 0 auto;
}
/* Aside */ /* Aside */
.format-aside { .format-aside {
background-color: #f7f5e7; background-color: #f7f5e7;
@ -1424,16 +1401,7 @@ footer.entry-meta {
font-weight: bold; font-weight: bold;
} }
.format-audio .entry-media { .format-audio .entry-content:before {
max-width: 604px;
}
.sidebar .format-audio .entry-media {
max-width: 1040px;
padding: 0 374px 0 60px;
}
.format-audio .entry-media:before {
content: "\f109"; content: "\f109";
float: left; float: left;
font-size: 64px; font-size: 64px;
@ -1682,21 +1650,20 @@ footer.entry-meta {
text-decoration: none; text-decoration: none;
} }
.format-quote .quote-caption,
.format-quote blockquote small, .format-quote blockquote small,
.format-quote blockquote cite { .format-quote blockquote cite {
display: block; display: block;
font-size: 16px; font-size: 16px;
} }
.format-quote .quote { .format-quote blockquote {
font-style: italic; font-style: italic;
font-weight: 300; font-weight: 300;
padding-left: 75px; padding-left: 75px;
position: relative; position: relative;
} }
.format-quote .quote:before { .format-quote blockquote:before {
content: '\201C'; content: '\201C';
font-size: 140px; font-size: 140px;
font-weight: 400; font-weight: 400;
@ -2711,10 +2678,6 @@ footer.entry-meta {
} }
@media (max-width: 1069px) { @media (max-width: 1069px) {
.sidebar .entry-media {
padding: 0 376px 0 60px;
}
.sidebar img.alignleft, .sidebar img.alignleft,
.sidebar .wp-caption.alignleft { .sidebar .wp-caption.alignleft {
margin-left: 0; margin-left: 0;
@ -2781,9 +2744,7 @@ footer.entry-meta {
.sidebar #respond #commentform, .sidebar #respond #commentform,
.sidebar .featured-gallery, .sidebar .featured-gallery,
.sidebar .post-navigation .nav-links, .sidebar .post-navigation .nav-links,
.author.sidebar .author-info, .author.sidebar .author-info {
.format-audio .entry-media,
.sidebar .format-audio .entry-media {
max-width: 604px; max-width: 604px;
padding-left: 0; padding-left: 0;
padding-right: 0; padding-right: 0;
@ -2801,11 +2762,6 @@ footer.entry-meta {
max-width: 604px; max-width: 604px;
} }
.sidebar .entry-media {
max-width: 724px;
}
.sidebar .entry-media,
.sidebar .archive-meta, .sidebar .archive-meta,
.attachment .entry-header, .attachment .entry-header,
.search.sidebar .page-content, .search.sidebar .page-content,
@ -2886,11 +2842,6 @@ footer.entry-meta {
margin-right: 0; margin-right: 0;
} }
.entry-media,
.sidebar .entry-media {
max-width: 604px;
}
.attachment .image-navigation, .attachment .image-navigation,
.attachment .entry-attachment .attachment { .attachment .entry-attachment .attachment {
max-width: 604px; max-width: 604px;
@ -2908,7 +2859,6 @@ footer.entry-meta {
font-size: 30px; font-size: 30px;
} }
#content .entry-media,
#content .entry-header, #content .entry-header,
#content .entry-content, #content .entry-content,
#content .entry-summary, #content .entry-summary,
@ -3024,8 +2974,7 @@ footer.entry-meta {
} }
.format-quote blockquote small, .format-quote blockquote small,
.format-quote blockquote cite, .format-quote blockquote cite {
.format-quote .quote-caption {
font-size: 13px; font-size: 13px;
} }
@ -3066,16 +3015,16 @@ footer.entry-meta {
} }
/* Audio */ /* Audio */
.format-audio .entry-content:before {
display: none;
}
.format-audio .audio-content { .format-audio .audio-content {
background-image: none; background-image: none;
float: none; float: none;
padding-left: 0; padding-left: 0;
width: auto; width: auto;
} }
.format-audio .entry-media:before {
display: none;
}
} }
/* Mobile devices */ /* Mobile devices */