WordPress-C
/
WordPress
mirror of https://github.com/WordPress/WordPress.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Show title, album, and artist info for audio files displayed in `WP_Customize_Upload_Control()`. 

See #21483.

Built from https://develop.svn.wordpress.org/trunk@30737


git-svn-id: http://core.svn.wordpress.org/trunk@30727 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Scott Taylor 2014-12-04 01:59:22 +00:00
parent 8b1b1a10ed
commit 82188f74aa
6 changed files with 37 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
wp-admin/css/customize-controls-rtl.css
View File

@ -430,6 +430,18 @@ p.customize-section-description {
padding: 5px 10px; padding: 5px 10px;
} }
.customize-control .attachment-meta {
white-space: nowrap;
overflow: hidden;
text-overflow: ellipsis;
margin: 0;
padding: 5px 10px 0;
}
.customize-control .attachment-meta-title {
padding-top: 7px;
}
.customize-control .thumbnail-image { .customize-control .thumbnail-image {
line-height: 0; line-height: 0;
} }

2
wp-admin/css/customize-controls-rtl.min.css vendored
View File

File diff suppressed because one or more lines are too long

12
wp-admin/css/customize-controls.css
View File

@ -430,6 +430,18 @@ p.customize-section-description {
padding: 5px 10px; padding: 5px 10px;
} }
.customize-control .attachment-meta {
white-space: nowrap;
overflow: hidden;
text-overflow: ellipsis;
margin: 0;
padding: 5px 10px 0;
}
.customize-control .attachment-meta-title {
padding-top: 7px;
}
.customize-control .thumbnail-image { .customize-control .thumbnail-image {
line-height: 0; line-height: 0;
} }

2
wp-admin/css/customize-controls.min.css vendored
View File

File diff suppressed because one or more lines are too long

11
wp-includes/class-wp-customize-control.php
View File

@ -749,12 +749,21 @@ class WP_Customize_Upload_Control extends WP_Customize_Control {
if ( data.attachment && data.attachment.id ) { #> if ( data.attachment && data.attachment.id ) { #>
<div class="current"> <div class="current">
<div class="container"> <div class="container">
<div class="attachment-media-view {{ data.attachment.orientation }}"> <div class="attachment-media-view attachment-media-view-{{ data.attachment.type }} {{ data.attachment.orientation }}">
<div class="thumbnail thumbnail-{{ data.attachment.type }}"> <div class="thumbnail thumbnail-{{ data.attachment.type }}">
<# if ( 'image' === data.attachment.type && data.attachment.sizes && data.attachment.sizes.medium ) { #> <# if ( 'image' === data.attachment.type && data.attachment.sizes && data.attachment.sizes.medium ) { #>
<img class="attachment-thumb" src="{{ data.attachment.sizes.medium.url }}" draggable="false" /> <img class="attachment-thumb" src="{{ data.attachment.sizes.medium.url }}" draggable="false" />
<# } else if ( 'image' === data.attachment.type && data.attachment.sizes && data.attachment.sizes.full ) { #> <# } else if ( 'image' === data.attachment.type && data.attachment.sizes && data.attachment.sizes.full ) { #>
<img class="attachment-thumb" src="{{ data.attachment.sizes.full.url }}" draggable="false" /> <img class="attachment-thumb" src="{{ data.attachment.sizes.full.url }}" draggable="false" />
<# } else if ( 'audio' === data.attachment.type ) { #>
<img class="attachment-thumb type-icon" src="{{ data.attachment.icon }}" class="icon" draggable="false" />
<p class="attachment-meta attachment-meta-title">&#8220;{{ data.attachment.title }}&#8221;</p>
<# if ( data.attachment.album || data.attachment.meta.album ) { #>
<p class="attachment-meta"><em>{{ data.attachment.album || data.attachment.meta.album }}</em></p>
<# } #>
<# if ( data.attachment.artist || data.attachment.meta.artist ) { #>
<p class="attachment-meta">{{ data.attachment.artist || data.attachment.meta.artist }}</p>
<# } #>
<# } else { #> <# } else { #>
<img class="attachment-thumb type-icon" src="{{ data.attachment.icon }}" class="icon" draggable="false" /> <img class="attachment-thumb type-icon" src="{{ data.attachment.icon }}" class="icon" draggable="false" />
<p class="attachment-title">{{ data.attachment.title }}</p> <p class="attachment-title">{{ data.attachment.title }}</p>

2
wp-includes/version.php
View File

@ -4,7 +4,7 @@
* *
* @global string $wp_version * @global string $wp_version
*/ */
$wp_version = '4.1-beta2-30736'; $wp_version = '4.1-beta2-30737';
/** /**
* Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema. * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.