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

Media: Only show the alignment setting when viewing an image. fixes #21836, see #21390. 

git-svn-id: http://core.svn.wordpress.org/trunk@22671 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Daryl Koopersmith 2012-11-19 07:24:47 +00:00
parent 479d27013a
commit 549b5f61ae
2 changed files with 24 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
wp-includes/js/media-views.js
View File

@ -1354,6 +1354,7 @@
model: display[ single.cid ], model: display[ single.cid ],
sizes: single.get('sizes'), sizes: single.get('sizes'),
priority: 160, priority: 160,
type: single.get('type'),
userSettings: state.get('displayUserSettings') userSettings: state.get('displayUserSettings')
}).render() }).render()
}, options ); }, options );

44
wp-includes/media.php
View File

@ -1548,28 +1548,30 @@ function wp_print_media_templates( $attachment ) {
<script type="text/html" id="tmpl-attachment-display-settings"> <script type="text/html" id="tmpl-attachment-display-settings">
<h3><?php _e('Attachment Display Settings'); ?></h3> <h3><?php _e('Attachment Display Settings'); ?></h3>
<label class="setting"> <# if ( 'image' === data.type ) { #>
<span><?php _e('Alignment'); ?></span> <label class="setting">
<select class="alignment" <span><?php _e('Alignment'); ?></span>
data-setting="align" <select class="alignment"
<# if ( data.userSettings ) { #> data-setting="align"
data-user-setting="align" <# if ( data.userSettings ) { #>
<# } #>> data-user-setting="align"
<# } #>>
<option value="left"> <option value="left">
<?php esc_attr_e('Left'); ?> <?php esc_attr_e('Left'); ?>
</option> </option>
<option value="center"> <option value="center">
<?php esc_attr_e('Center'); ?> <?php esc_attr_e('Center'); ?>
</option> </option>
<option value="right"> <option value="right">
<?php esc_attr_e('Right'); ?> <?php esc_attr_e('Right'); ?>
</option> </option>
<option value="none" selected> <option value="none" selected>
<?php esc_attr_e('None'); ?> <?php esc_attr_e('None'); ?>
</option> </option>
</select> </select>
</label> </label>
<# } #>
<div class="setting"> <div class="setting">
<label> <label>