]> scripts.mit.edu Git - autoinstalls/wordpress.git/blobdiff - wp-includes/media-template.php
WordPress 4.3-scripts
[autoinstalls/wordpress.git] / wp-includes / media-template.php
index afb690e89f5a48482ae02e5058323627ef15daa6..8edeb62ebf2df5863d388578ce0ec83c8cf3bc8c 100644 (file)
@@ -50,9 +50,14 @@ function wp_underscore_audio_template() {
 function wp_underscore_video_template() {
        $video_types = wp_get_video_extensions();
 ?>
 function wp_underscore_video_template() {
        $video_types = wp_get_video_extensions();
 ?>
-<#  var w_rule = h_rule = '',
+<#  var w_rule = h_rule = '', classes = [],
                w, h, settings = wp.media.view.settings,
                w, h, settings = wp.media.view.settings,
-               isYouTube = ! _.isEmpty( data.model.src ) && data.model.src.match(/youtube|youtu\.be/);
+               isYouTube = isVimeo = false;
+
+       if ( ! _.isEmpty( data.model.src ) ) {
+               isYouTube = data.model.src.match(/youtube|youtu\.be/);
+               isVimeo = -1 !== data.model.src.indexOf('vimeo');
+       }
 
        if ( settings.contentWidth && data.model.width >= settings.contentWidth ) {
                w = settings.contentWidth;
 
        if ( settings.contentWidth && data.model.width >= settings.contentWidth ) {
                w = settings.contentWidth;
@@ -72,10 +77,19 @@ function wp_underscore_video_template() {
        if ( h ) {
                h_rule = 'height: ' + h + 'px;';
        }
        if ( h ) {
                h_rule = 'height: ' + h + 'px;';
        }
+
+       if ( isYouTube ) {
+               classes.push( 'youtube-video' );
+       }
+
+       if ( isVimeo ) {
+               classes.push( 'vimeo-video' );
+       }
+
 #>
 <div style="{{ w_rule }}{{ h_rule }}" class="wp-video">
 <video controls
 #>
 <div style="{{ w_rule }}{{ h_rule }}" class="wp-video">
 <video controls
-       class="wp-video-shortcode{{ isYouTube ? ' youtube-video' : '' }}"
+       class="wp-video-shortcode {{ classes.join( ' ' ) }}"
        <# if ( w ) { #>width="{{ w }}"<# } #>
        <# if ( h ) { #>height="{{ h }}"<# } #>
        <?php
        <# if ( w ) { #>width="{{ w }}"<# } #>
        <# if ( h ) { #>height="{{ h }}"<# } #>
        <?php
@@ -100,6 +114,8 @@ function wp_underscore_video_template() {
        <# if ( ! _.isEmpty( data.model.src ) ) {
                if ( isYouTube ) { #>
                <source src="{{ data.model.src }}" type="video/youtube" />
        <# if ( ! _.isEmpty( data.model.src ) ) {
                if ( isYouTube ) { #>
                <source src="{{ data.model.src }}" type="video/youtube" />
+               <# } else if ( isVimeo ) { #>
+               <source src="{{ data.model.src }}" type="video/vimeo" />
                <# } else { #>
                <source src="{{ data.model.src }}" type="{{ settings.embedMimes[ data.model.src.split('.').pop() ] }}" />
                <# }
                <# } else { #>
                <source src="{{ data.model.src }}" type="{{ settings.embedMimes[ data.model.src.split('.').pop() ] }}" />
                <# }
@@ -120,6 +136,8 @@ function wp_underscore_video_template() {
  * Prints the templates used in the media manager.
  *
  * @since 3.5.0
  * Prints the templates used in the media manager.
  *
  * @since 3.5.0
+ *
+ * @global bool $is_IE
  */
 function wp_print_media_templates() {
        global $is_IE;
  */
 function wp_print_media_templates() {
        global $is_IE;
@@ -148,7 +166,7 @@ function wp_print_media_templates() {
 
        <script type="text/html" id="tmpl-media-modal">
                <div class="<?php echo $class; ?>">
 
        <script type="text/html" id="tmpl-media-modal">
                <div class="<?php echo $class; ?>">
-                       <a class="media-modal-close" href="#"><span class="media-modal-icon"><span class="screen-reader-text"><?php _e( 'Close media panel' ); ?></span></span></a>
+                       <button type="button" class="button-link media-modal-close"><span class="media-modal-icon"><span class="screen-reader-text"><?php _e( 'Close media panel' ); ?></span></span></button>
                        <div class="media-modal-content"></div>
                </div>
                <div class="media-modal-backdrop"></div>
                        <div class="media-modal-content"></div>
                </div>
                <div class="media-modal-backdrop"></div>
@@ -176,7 +194,7 @@ function wp_print_media_templates() {
                        <h3 class="upload-message">{{ data.message }}</h3>
                <# } #>
                <?php if ( ! _device_can_upload() ) : ?>
                        <h3 class="upload-message">{{ data.message }}</h3>
                <# } #>
                <?php if ( ! _device_can_upload() ) : ?>
-                       <h3 class="upload-instructions"><?php printf( __('The web browser on your device cannot be used to upload files. You may be able to use the <a href="%s">native app for your device</a> instead.'), 'http://apps.wordpress.org/' ); ?></h3>
+                       <h3 class="upload-instructions"><?php printf( __('The web browser on your device cannot be used to upload files. You may be able to use the <a href="%s">native app for your device</a> instead.'), 'https://apps.wordpress.org/' ); ?></h3>
                <?php elseif ( is_multisite() && ! is_upload_space_available() ) : ?>
                        <h3 class="upload-instructions"><?php _e( 'Upload Limit Exceeded' ); ?></h3>
                        <?php
                <?php elseif ( is_multisite() && ! is_upload_space_available() ) : ?>
                        <h3 class="upload-instructions"><?php _e( 'Upload Limit Exceeded' ); ?></h3>
                        <?php
@@ -187,7 +205,7 @@ function wp_print_media_templates() {
                        <div class="upload-ui">
                                <h3 class="upload-instructions drop-instructions"><?php _e( 'Drop files anywhere to upload' ); ?></h3>
                                <p class="upload-instructions drop-instructions"><?php _ex( 'or', 'Uploader: Drop files here - or - Select Files' ); ?></p>
                        <div class="upload-ui">
                                <h3 class="upload-instructions drop-instructions"><?php _e( 'Drop files anywhere to upload' ); ?></h3>
                                <p class="upload-instructions drop-instructions"><?php _ex( 'or', 'Uploader: Drop files here - or - Select Files' ); ?></p>
-                               <a href="#" class="browser button button-hero"><?php _e( 'Select Files' ); ?></a>
+                               <button type="button" class="browser button button-hero"><?php _e( 'Select Files' ); ?></button>
                        </div>
 
                        <div class="upload-inline-status"></div>
                        </div>
 
                        <div class="upload-inline-status"></div>
@@ -243,7 +261,7 @@ function wp_print_media_templates() {
 
        <script type="text/html" id="tmpl-uploader-status">
                <h3><?php _e( 'Uploading' ); ?></h3>
 
        <script type="text/html" id="tmpl-uploader-status">
                <h3><?php _e( 'Uploading' ); ?></h3>
-               <a class="upload-dismiss-errors" href="#"><?php _e('Dismiss Errors'); ?></a>
+               <button type="button" class="button-link upload-dismiss-errors"><span class="screen-reader-text"><?php _e( 'Dismiss Errors' ); ?></span></button>
 
                <div class="media-progress-bar"><div></div></div>
                <div class="upload-details">
 
                <div class="media-progress-bar"><div></div></div>
                <div class="upload-details">
@@ -257,7 +275,6 @@ function wp_print_media_templates() {
        </script>
 
        <script type="text/html" id="tmpl-uploader-status-error">
        </script>
 
        <script type="text/html" id="tmpl-uploader-status-error">
-               <span class="upload-error-label"><?php _e('Error'); ?></span>
                <span class="upload-error-filename">{{{ data.filename }}}</span>
                <span class="upload-error-message">{{ data.message }}</span>
        </script>
                <span class="upload-error-filename">{{{ data.filename }}}</span>
                <span class="upload-error-message">{{ data.message }}</span>
        </script>
@@ -281,7 +298,7 @@ function wp_print_media_templates() {
                                <# } else if ( 'image' === data.type && data.sizes && data.sizes.full ) { #>
                                        <img class="details-image" src="{{ data.sizes.full.url }}" draggable="false" />
                                <# } else if ( -1 === jQuery.inArray( data.type, [ 'audio', 'video' ] ) ) { #>
                                <# } else if ( 'image' === data.type && data.sizes && data.sizes.full ) { #>
                                        <img class="details-image" src="{{ data.sizes.full.url }}" draggable="false" />
                                <# } else if ( -1 === jQuery.inArray( data.type, [ 'audio', 'video' ] ) ) { #>
-                                       <img class="details-image" src="{{ data.icon }}" class="icon" draggable="false" />
+                                       <img class="details-image icon" src="{{ data.icon }}" draggable="false" />
                                <# } #>
 
                                <# if ( 'audio' === data.type ) { #>
                                <# } #>
 
                                <# if ( 'audio' === data.type ) { #>
@@ -312,8 +329,8 @@ function wp_print_media_templates() {
                                <# } #>
 
                                <div class="attachment-actions">
                                <# } #>
 
                                <div class="attachment-actions">
-                                       <# if ( 'image' === data.type && ! data.uploading && data.sizes ) { #>
-                                               <a class="button edit-attachment" href="#"><?php _e( 'Edit Image' ); ?></a>
+                                       <# if ( 'image' === data.type && ! data.uploading && data.sizes && data.can.save ) { #>
+                                       <button type="button" class="button edit-attachment"><?php _e( 'Edit Image' ); ?></button>
                                        <# } #>
                                </div>
                        </div>
                                        <# } #>
                                </div>
                        </div>
@@ -361,10 +378,12 @@ function wp_print_media_templates() {
                                        <input type="text" value="{{ data.url }}" readonly />
                                </label>
                                <# var maybeReadOnly = data.can.save || data.allowLocalEdits ? '' : 'readonly'; #>
                                        <input type="text" value="{{ data.url }}" readonly />
                                </label>
                                <# var maybeReadOnly = data.can.save || data.allowLocalEdits ? '' : 'readonly'; #>
+                               <?php if ( post_type_supports( 'attachment', 'title' ) ) : ?>
                                <label class="setting" data-setting="title">
                                        <span class="name"><?php _e('Title'); ?></span>
                                        <input type="text" value="{{ data.title }}" {{ maybeReadOnly }} />
                                </label>
                                <label class="setting" data-setting="title">
                                        <span class="name"><?php _e('Title'); ?></span>
                                        <input type="text" value="{{ data.title }}" {{ maybeReadOnly }} />
                                </label>
+                               <?php endif; ?>
                                <# if ( 'audio' === data.type ) { #>
                                <?php foreach ( array(
                                        'artist' => __( 'Artist' ),
                                <# if ( 'audio' === data.type ) { #>
                                <?php foreach ( array(
                                        'artist' => __( 'Artist' ),
@@ -394,7 +413,7 @@ function wp_print_media_templates() {
                                        <span class="name"><?php _e( 'Uploaded By' ); ?></span>
                                        <span class="value">{{ data.authorName }}</span>
                                </label>
                                        <span class="name"><?php _e( 'Uploaded By' ); ?></span>
                                        <span class="value">{{ data.authorName }}</span>
                                </label>
-                               <# if ( data.uploadedTo ) { #>
+                               <# if ( data.uploadedToTitle ) { #>
                                        <label class="setting">
                                                <span class="name"><?php _e( 'Uploaded To' ); ?></span>
                                                <# if ( data.uploadedToLink ) { #>
                                        <label class="setting">
                                                <span class="name"><?php _e( 'Uploaded To' ); ?></span>
                                                <# if ( data.uploadedToLink ) { #>
@@ -408,19 +427,21 @@ function wp_print_media_templates() {
                        </div>
 
                        <div class="actions">
                        </div>
 
                        <div class="actions">
-                               <a class="view-attachment" href="{{ data.link }}"><?php _e( 'View attachment page' ); ?></a> |
-                               <a href="post.php?post={{ data.id }}&action=edit"><?php _e( 'Edit more details' ); ?></a>
+                               <a class="view-attachment" href="{{ data.link }}"><?php _e( 'View attachment page' ); ?></a>
+                               <# if ( data.can.save ) { #> |
+                                       <a href="post.php?post={{ data.id }}&action=edit"><?php _e( 'Edit more details' ); ?></a>
+                               <# } #>
                                <# if ( ! data.uploading && data.can.remove ) { #> |
                                <# if ( ! data.uploading && data.can.remove ) { #> |
-                                               <?php if ( MEDIA_TRASH ): ?>
+                                       <?php if ( MEDIA_TRASH ): ?>
                                                <# if ( 'trash' === data.status ) { #>
                                                <# if ( 'trash' === data.status ) { #>
-                                                       <a class="untrash-attachment" href="#"><?php _e( 'Untrash' ); ?></a>
+                                                       <button type="button" class="button-link untrash-attachment"><?php _e( 'Untrash' ); ?></button>
                                                <# } else { #>
                                                <# } else { #>
-                                                       <a class="trash-attachment" href="#"><?php _e( 'Trash' ); ?></a>
+                                                       <button type="button" class="button-link trash-attachment"><?php _ex( 'Trash', 'verb' ); ?></button>
                                                <# } #>
                                                <# } #>
-                                               <?php else: ?>
-                                                       <a class="delete-attachment" href="#"><?php _e( 'Delete Permanently' ); ?></a>
-                                               <?php endif; ?>
-                                       <# } #>
+                                       <?php else: ?>
+                                               <button type="button" class="button-link delete-attachment"><?php _e( 'Delete Permanently' ); ?></button>
+                                       <?php endif; ?>
+                               <# } #>
                        </div>
 
                </div>
                        </div>
 
                </div>
@@ -449,11 +470,11 @@ function wp_print_media_templates() {
                                <# } #>
                        </div>
                        <# if ( data.buttons.close ) { #>
                                <# } #>
                        </div>
                        <# if ( data.buttons.close ) { #>
-                               <a class="close media-modal-icon" href="#" title="<?php esc_attr_e('Remove'); ?>"></a>
+                               <button type="button" class="button-link attachment-close media-modal-icon"><span class="screen-reader-text"><?php _e( 'Remove' ); ?></span></button>
                        <# } #>
                </div>
                <# if ( data.buttons.check ) { #>
                        <# } #>
                </div>
                <# if ( data.buttons.check ) { #>
-                       <a class="check" href="#" title="<?php esc_attr_e('Deselect'); ?>" tabindex="-1"><div class="media-modal-icon"></div></a>
+                       <button type="button" class="button-link check" tabindex="-1"><span class="media-modal-icon"></span><span class="screen-reader-text"><?php _e( 'Deselect' ); ?></span></button>
                <# } #>
                <#
                var maybeReadOnly = data.can.save || data.allowLocalEdits ? '' : 'readonly';
                <# } #>
                <#
                var maybeReadOnly = data.can.save || data.allowLocalEdits ? '' : 'readonly';
@@ -505,7 +526,6 @@ function wp_print_media_templates() {
 
                                        <# if ( data.can.save && data.sizes ) { #>
                                                <a class="edit-attachment" href="{{ data.editLink }}&amp;image-editor" target="_blank"><?php _e( 'Edit Image' ); ?></a>
 
                                        <# if ( data.can.save && data.sizes ) { #>
                                                <a class="edit-attachment" href="{{ data.editLink }}&amp;image-editor" target="_blank"><?php _e( 'Edit Image' ); ?></a>
-                                               <a class="refresh-attachment" href="#"><?php _e( 'Refresh' ); ?></a>
                                        <# } #>
                                <# } #>
 
                                        <# } #>
                                <# } #>
 
@@ -516,12 +536,12 @@ function wp_print_media_templates() {
                                <# if ( ! data.uploading && data.can.remove ) { #>
                                        <?php if ( MEDIA_TRASH ): ?>
                                        <# if ( 'trash' === data.status ) { #>
                                <# if ( ! data.uploading && data.can.remove ) { #>
                                        <?php if ( MEDIA_TRASH ): ?>
                                        <# if ( 'trash' === data.status ) { #>
-                                               <a class="untrash-attachment" href="#"><?php _e( 'Untrash' ); ?></a>
+                                               <button type="button" class="button-link untrash-attachment"><?php _e( 'Untrash' ); ?></button>
                                        <# } else { #>
                                        <# } else { #>
-                                               <a class="trash-attachment" href="#"><?php _e( 'Trash' ); ?></a>
+                                               <button type="button" class="button-link trash-attachment"><?php _ex( 'Trash', 'verb' ); ?></button>
                                        <# } #>
                                        <?php else: ?>
                                        <# } #>
                                        <?php else: ?>
-                                               <a class="delete-attachment" href="#"><?php _e( 'Delete Permanently' ); ?></a>
+                                               <button type="button" class="button-link delete-attachment"><?php _e( 'Delete Permanently' ); ?></button>
                                        <?php endif; ?>
                                <# } #>
 
                                        <?php endif; ?>
                                <# } #>
 
@@ -538,10 +558,12 @@ function wp_print_media_templates() {
                        <input type="text" value="{{ data.url }}" readonly />
                </label>
                <# var maybeReadOnly = data.can.save || data.allowLocalEdits ? '' : 'readonly'; #>
                        <input type="text" value="{{ data.url }}" readonly />
                </label>
                <# var maybeReadOnly = data.can.save || data.allowLocalEdits ? '' : 'readonly'; #>
+               <?php if ( post_type_supports( 'attachment', 'title' ) ) : ?>
                <label class="setting" data-setting="title">
                        <span class="name"><?php _e('Title'); ?></span>
                        <input type="text" value="{{ data.title }}" {{ maybeReadOnly }} />
                </label>
                <label class="setting" data-setting="title">
                        <span class="name"><?php _e('Title'); ?></span>
                        <input type="text" value="{{ data.title }}" {{ maybeReadOnly }} />
                </label>
+               <?php endif; ?>
                <# if ( 'audio' === data.type ) { #>
                <?php foreach ( array(
                        'artist' => __( 'Artist' ),
                <# if ( 'audio' === data.type ) { #>
                <?php foreach ( array(
                        'artist' => __( 'Artist' ),
@@ -573,10 +595,10 @@ function wp_print_media_templates() {
                <div class="selection-info">
                        <span class="count"></span>
                        <# if ( data.editable ) { #>
                <div class="selection-info">
                        <span class="count"></span>
                        <# if ( data.editable ) { #>
-                               <a class="edit-selection" href="#"><?php _e('Edit'); ?></a>
+                               <button type="button" class="button-link edit-selection"><?php _e( 'Edit Selection' ); ?></button>
                        <# } #>
                        <# if ( data.clearable ) { #>
                        <# } #>
                        <# if ( data.clearable ) { #>
-                               <a class="clear-selection" href="#"><?php _e('Clear'); ?></a>
+                               <button type="button" class="button-link clear-selection"><?php _e( 'Clear' ); ?></button>
                        <# } #>
                </div>
                <div class="selection-view"></div>
                        <# } #>
                </div>
                <div class="selection-view"></div>
@@ -732,6 +754,31 @@ function wp_print_media_templates() {
                        <span><?php _e( 'Random Order' ); ?></span>
                        <input type="checkbox" data-setting="_orderbyRandom" />
                </label>
                        <span><?php _e( 'Random Order' ); ?></span>
                        <input type="checkbox" data-setting="_orderbyRandom" />
                </label>
+
+               <label class="setting size">
+                       <span><?php _e( 'Size' ); ?></span>
+                       <select class="size" name="size"
+                               data-setting="size"
+                               <# if ( data.userSettings ) { #>
+                                       data-user-setting="imgsize"
+                               <# } #>
+                               >
+                               <?php
+                               // This filter is documented in wp-admin/includes/media.php
+                               $size_names = apply_filters( 'image_size_names_choose', array(
+                                       'thumbnail' => __( 'Thumbnail' ),
+                                       'medium'    => __( 'Medium' ),
+                                       'large'     => __( 'Large' ),
+                                       'full'      => __( 'Full Size' ),
+                               ) );
+
+                               foreach ( $size_names as $size => $label ) : ?>
+                                       <option value="<?php echo esc_attr( $size ); ?>">
+                                               <?php echo esc_html( $label ); ?>
+                                       </option>
+                               <?php endforeach; ?>
+                       </select>
+               </label>
        </script>
 
        <script type="text/html" id="tmpl-playlist-settings">
        </script>
 
        <script type="text/html" id="tmpl-playlist-settings">
@@ -769,9 +816,9 @@ function wp_print_media_templates() {
        </script>
 
        <script type="text/html" id="tmpl-embed-link-settings">
        </script>
 
        <script type="text/html" id="tmpl-embed-link-settings">
-               <label class="setting title">
-                       <span><?php _e( 'Title' ); ?></span>
-                       <input type="text" class="alignment" data-setting="title" />
+               <label class="setting link-text">
+                       <span><?php _e( 'Link Text' ); ?></span>
+                       <input type="text" class="alignment" data-setting="linkText" />
                </label>
                <div class="embed-container" style="display: none;">
                        <div class="embed-preview"></div>
                </label>
                <div class="embed-container" style="display: none;">
                        <div class="embed-preview"></div>
@@ -944,7 +991,7 @@ function wp_print_media_templates() {
                                                <input type="text" class="link-to-custom" data-setting="linkUrl" />
                                        </div>
                                        <div class="advanced-section">
                                                <input type="text" class="link-to-custom" data-setting="linkUrl" />
                                        </div>
                                        <div class="advanced-section">
-                                               <h3><a class="advanced-toggle" href="#"><?php _e('Advanced Options'); ?></a></h3>
+                                               <h3><button type="button" class="button-link advanced-toggle"><?php _e( 'Advanced Options' ); ?></button></h3>
                                                <div class="advanced-settings hidden">
                                                        <div class="advanced-image">
                                                                <label class="setting title-text">
                                                <div class="advanced-settings hidden">
                                                        <div class="advanced-image">
                                                                <label class="setting title-text">
@@ -1001,7 +1048,7 @@ function wp_print_media_templates() {
                                <label class="setting">
                                        <span>SRC</span>
                                        <input type="text" disabled="disabled" data-setting="src" value="{{ data.model.src }}" />
                                <label class="setting">
                                        <span>SRC</span>
                                        <input type="text" disabled="disabled" data-setting="src" value="{{ data.model.src }}" />
-                                       <a class="remove-setting"><?php _e( 'Remove' ); ?></a>
+                                       <button type="button" class="button-link remove-setting"><?php _e( 'Remove audio source' ); ?></button>
                                </label>
                                <# } #>
                                <?php
                                </label>
                                <# } #>
                                <?php
@@ -1015,7 +1062,7 @@ function wp_print_media_templates() {
                                <label class="setting">
                                        <span><?php echo strtoupper( $type ) ?></span>
                                        <input type="text" disabled="disabled" data-setting="<?php echo $type ?>" value="{{ data.model.<?php echo $type ?> }}" />
                                <label class="setting">
                                        <span><?php echo strtoupper( $type ) ?></span>
                                        <input type="text" disabled="disabled" data-setting="<?php echo $type ?>" value="{{ data.model.<?php echo $type ?> }}" />
-                                       <a class="remove-setting"><?php _e( 'Remove' ); ?></a>
+                                       <button type="button" class="button-link remove-setting"><?php _e( 'Remove audio source' ); ?></button>
                                </label>
                                <# } #>
                                <?php endforeach ?>
                                </label>
                                <# } #>
                                <?php endforeach ?>
@@ -1065,8 +1112,7 @@ function wp_print_media_templates() {
                        <div class="embed-media-settings embed-video-settings">
                                <div class="wp-video-holder">
                                <#
                        <div class="embed-media-settings embed-video-settings">
                                <div class="wp-video-holder">
                                <#
-                               var isYouTube = ! _.isEmpty( data.model.src ) && data.model.src.match(/youtube|youtu\.be/);
-                                       w = ! data.model.width || data.model.width > 640 ? 640 : data.model.width,
+                               var w = ! data.model.width || data.model.width > 640 ? 640 : data.model.width,
                                        h = ! data.model.height ? 360 : data.model.height;
 
                                if ( data.model.width && w !== data.model.width ) {
                                        h = ! data.model.height ? 360 : data.model.height;
 
                                if ( data.model.width && w !== data.model.width ) {
@@ -1085,7 +1131,7 @@ function wp_print_media_templates() {
                                <label class="setting">
                                        <span>SRC</span>
                                        <input type="text" disabled="disabled" data-setting="src" value="{{ data.model.src }}" />
                                <label class="setting">
                                        <span>SRC</span>
                                        <input type="text" disabled="disabled" data-setting="src" value="{{ data.model.src }}" />
-                                       <a class="remove-setting"><?php _e( 'Remove' ); ?></a>
+                                       <button type="button" class="button-link remove-setting"><?php _e( 'Remove video source' ); ?></button>
                                </label>
                                <# } #>
                                <?php foreach ( $video_types as $type ):
                                </label>
                                <# } #>
                                <?php foreach ( $video_types as $type ):
@@ -1097,7 +1143,7 @@ function wp_print_media_templates() {
                                <label class="setting">
                                        <span><?php echo strtoupper( $type ) ?></span>
                                        <input type="text" disabled="disabled" data-setting="<?php echo $type ?>" value="{{ data.model.<?php echo $type ?> }}" />
                                <label class="setting">
                                        <span><?php echo strtoupper( $type ) ?></span>
                                        <input type="text" disabled="disabled" data-setting="<?php echo $type ?>" value="{{ data.model.<?php echo $type ?> }}" />
-                                       <a class="remove-setting"><?php _e( 'Remove' ); ?></a>
+                                       <button type="button" class="button-link remove-setting"><?php _e( 'Remove video source' ); ?></button>
                                </label>
                                <# } #>
                                <?php endforeach ?>
                                </label>
                                <# } #>
                                <?php endforeach ?>
@@ -1118,7 +1164,7 @@ function wp_print_media_templates() {
                                <label class="setting">
                                        <span><?php _e( 'Poster Image' ); ?></span>
                                        <input type="text" disabled="disabled" data-setting="poster" value="{{ data.model.poster }}" />
                                <label class="setting">
                                        <span><?php _e( 'Poster Image' ); ?></span>
                                        <input type="text" disabled="disabled" data-setting="poster" value="{{ data.model.poster }}" />
-                                       <a class="remove-setting"><?php _e( 'Remove' ); ?></a>
+                                       <button type="button" class="button-link remove-setting"><?php _e( 'Remove poster image' ); ?></button>
                                </label>
                                <# } #>
                                <div class="setting preload">
                                </label>
                                <# } #>
                                <div class="setting preload">
@@ -1150,7 +1196,7 @@ function wp_print_media_templates() {
                                                        content += track.outerHTML; #>
                                                <p>
                                                        <input class="content-track" type="text" value="{{ track.outerHTML }}" />
                                                        content += track.outerHTML; #>
                                                <p>
                                                        <input class="content-track" type="text" value="{{ track.outerHTML }}" />
-                                                       <a class="remove-setting remove-track"><?php _e( 'Remove' ); ?></a>
+                                                       <button type="button" class="button-link remove-setting remove-track"><?php _ex( 'Remove video track', 'media' ); ?></button>
                                                </p>
                                                <# } ); #>
                                        <# } else { #>
                                                </p>
                                                <# } ); #>
                                        <# } else { #>
@@ -1163,7 +1209,7 @@ function wp_print_media_templates() {
        </script>
 
        <script type="text/html" id="tmpl-editor-gallery">
        </script>
 
        <script type="text/html" id="tmpl-editor-gallery">
-               <# if ( data.attachments ) { #>
+               <# if ( data.attachments.length ) { #>
                        <div class="gallery gallery-columns-{{ data.columns }}">
                                <# _.each( data.attachments, function( attachment, index ) { #>
                                        <dl class="gallery-item">
                        <div class="gallery gallery-columns-{{ data.columns }}">
                                <# _.each( data.attachments, function( attachment, index ) { #>
                                        <dl class="gallery-item">
@@ -1197,6 +1243,24 @@ function wp_print_media_templates() {
                <div class="upload-errors"></div>
        </script>
 
                <div class="upload-errors"></div>
        </script>
 
+       <script type="text/html" id="tmpl-site-icon-preview">
+               <h2><?php _e( 'Preview' ); ?></h2>
+               <strong><?php _e( 'As a browser icon' ); ?></strong>
+               <div class="favicon-preview">
+                       <img src="images/browser.png" class="browser-preview" width="182" height="" alt=""/>
+
+                       <div class="favicon">
+                               <img id="preview-favicon" src="{{ data.url }}" alt="<?php esc_attr_e( 'Preview as a browser icon' ); ?>"/>
+                       </div>
+                       <span class="browser-title"><?php bloginfo( 'name' ); ?></span>
+               </div>
+
+               <strong><?php _e( 'As an app icon' ); ?></strong>
+               <div class="app-icon-preview">
+                       <img id="preview-app-icon" src="{{ data.url }}" alt="<?php esc_attr_e( 'Preview as an app icon' ); ?>"/>
+               </div>
+       </script>
+
        <?php
 
        /**
        <?php
 
        /**