<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[29280] trunk/src: Media Grid: Remove fields from showing in the grid itself.</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://core.trac.wordpress.org/changeset/29280">29280</a></dd>
<dt>Author</dt> <dd>helen</dd>
<dt>Date</dt> <dd>2014-07-24 05:25:28 +0000 (Thu, 24 Jul 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Media Grid: Remove fields from showing in the grid itself.
All details are still available within the modal, and less-distinguishable non-image files still show the filename along with the file type icon.
Reverts <a href="http://core.trac.wordpress.org/changeset/29079">[29079]</a>, <a href="http://core.trac.wordpress.org/changeset/29078">[29078]</a>, <a href="http://core.trac.wordpress.org/changeset/29077">[29077]</a>, and <a href="http://core.trac.wordpress.org/changeset/28995">[28995]</a>. see <a href="http://core.trac.wordpress.org/ticket/24716">#24716</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpadmincsscommoncss">trunk/src/wp-admin/css/common.css</a></li>
<li><a href="#trunksrcwpadminincludesscreenphp">trunk/src/wp-admin/includes/screen.php</a></li>
<li><a href="#trunksrcwpadminjscommonjs">trunk/src/wp-admin/js/common.js</a></li>
<li><a href="#trunksrcwpadminuploadphp">trunk/src/wp-admin/upload.php</a></li>
<li><a href="#trunksrcwpincludescssmediaviewscss">trunk/src/wp-includes/css/media-views.css</a></li>
<li><a href="#trunksrcwpincludesmediatemplatephp">trunk/src/wp-includes/media-template.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpadmincsscommoncss"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-admin/css/common.css (29279 => 29280)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-admin/css/common.css 2014-07-24 01:32:29 UTC (rev 29279)
+++ trunk/src/wp-admin/css/common.css 2014-07-24 05:25:28 UTC (rev 29280)
</span><span class="lines">@@ -1333,7 +1333,6 @@
</span><span class="cx"> display: none;
</span><span class="cx"> margin: 0 20px -1px 0px;
</span><span class="cx"> position: relative;
</span><del>- z-index: 10;
</del><span class="cx"> background-color: #fff;
</span><span class="cx"> border: 1px solid #ddd;
</span><span class="cx"> border-top: none;
</span><span class="lines">@@ -1356,7 +1355,6 @@
</span><span class="cx"> #screen-meta-links .screen-meta-toggle {
</span><span class="cx"> position: relative;
</span><span class="cx"> top: 0;
</span><del>- z-index: 10;
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #screen-meta-links a {
</span></span></pre></div>
<a id="trunksrcwpadminincludesscreenphp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-admin/includes/screen.php (29279 => 29280)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-admin/includes/screen.php 2014-07-24 01:32:29 UTC (rev 29279)
+++ trunk/src/wp-admin/includes/screen.php 2014-07-24 05:25:28 UTC (rev 29280)
</span><span class="lines">@@ -1019,12 +1019,7 @@
</span><span class="cx"> ?>
</span><span class="cx"> <div id="screen-options-wrap" class="hidden" tabindex="-1" aria-label="<?php esc_attr_e('Screen Options Tab'); ?>">
</span><span class="cx"> <form id="adv-settings" action="" method="post">
</span><del>- <?php if (
- isset( $wp_meta_boxes[ $this->id ] )
- || $this->get_option( 'per_page' )
- || $this->get_option( 'misc_screen_options' )
- || ( $columns && empty( $columns['_title'] ) )
- ) : ?>
</del><ins>+ <?php if ( isset( $wp_meta_boxes[ $this->id ] ) || $this->get_option( 'per_page' ) || ( $columns && empty( $columns['_title'] ) ) ) : ?>
</ins><span class="cx"> <h5><?php _e( 'Show on screen' ); ?></h5>
</span><span class="cx"> <?php
</span><span class="cx"> endif;
</span><span class="lines">@@ -1076,28 +1071,6 @@
</span><span class="cx"> ?>
</span><span class="cx"> <br class="clear" />
</span><span class="cx"> </div>
</span><del>- <?php elseif ( $this->get_option( 'misc_screen_options' ) ):
- $misc_options = $this->get_option( 'misc_screen_options' );
- ?>
- <div class="metabox-prefs misc-screen-options" data-id="<?php echo esc_attr( $misc_options['id'] ) ?>">
- <?php
-
- $option = get_user_option( $misc_options['option'] );
- $hidden = array();
- if ( ! empty( $option ) ) {
- $hidden = $option;
- }
- foreach ( $this->_options as $column => $args ) {
- if ( 'misc_screen_options' === $column ) {
- continue;
- }
- $id = "$column-hide";
- echo '<label for="' . $id . '">';
- echo '<input class="hide-column-tog" name="' . $id . '" type="checkbox" id="' . $id . '" value="' . $column . '"' . checked( ! in_array( $column, $hidden ), true, false ) . ' />';
- echo $args['label'] . "</label>\n";
- } ?>
- <br class="clear" />
- </div>
</del><span class="cx"> <?php endif;
</span><span class="cx">
</span><span class="cx"> $this->render_screen_layout();
</span></span></pre></div>
<a id="trunksrcwpadminjscommonjs"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-admin/js/common.js (29279 => 29280)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-admin/js/common.js 2014-07-24 01:32:29 UTC (rev 29279)
+++ trunk/src/wp-admin/js/common.js 2014-07-24 05:25:28 UTC (rev 29280)
</span><span class="lines">@@ -27,31 +27,12 @@
</span><span class="cx"> },
</span><span class="cx">
</span><span class="cx"> saveManageColumnsState : function() {
</span><del>- var hidden, page, opts = $( '.misc-screen-options' );
- if ( opts.length ) {
- hidden = [];
- opts.find( '.hide-column-tog' ).each( function() {
- var $el, field = this.value;
- $el = $( '.data-' + field );
- if ( ! this.checked ) {
- hidden.push( field );
- $el.removeClass( 'data-visible' ).addClass( 'data-hidden' );
- } else {
- $el.removeClass( 'data-hidden' ).addClass( 'data-visible' );
- }
- } );
- page = pagenow + opts.data( 'id' );
- hidden = hidden.join( ',' );
- } else {
- page = pagenow;
- hidden = this.hidden();
- }
-
</del><ins>+ var hidden = this.hidden();
</ins><span class="cx"> $.post(ajaxurl, {
</span><span class="cx"> action: 'hidden-columns',
</span><span class="cx"> hidden: hidden,
</span><span class="cx"> screenoptionnonce: $('#screenoptionnonce').val(),
</span><del>- page: page
</del><ins>+ page: pagenow
</ins><span class="cx"> });
</span><span class="cx"> },
</span><span class="cx">
</span></span></pre></div>
<a id="trunksrcwpadminuploadphp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-admin/upload.php (29279 => 29280)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-admin/upload.php 2014-07-24 01:32:29 UTC (rev 29279)
+++ trunk/src/wp-admin/upload.php 2014-07-24 05:25:28 UTC (rev 29280)
</span><span class="lines">@@ -28,12 +28,6 @@
</span><span class="cx"> 'adminUrl' => parse_url( self_admin_url(), PHP_URL_PATH ),
</span><span class="cx"> ) );
</span><span class="cx">
</span><del>- add_screen_option( 'misc_screen_options', array( 'option' => 'manageuploadgridcolumnshidden', 'id' => 'grid' ) );
- add_screen_option( 'title', array( 'label' => __( 'Name' ) ) );
- add_screen_option( 'uploadedTo', array( 'label' => __( 'Uploaded To' ) ) );
- add_screen_option( 'dateFormatted', array( 'label' => __( 'Date' ) ) );
- add_screen_option( 'mime', array( 'label' => __( 'Mime-type' ) ) );
-
</del><span class="cx"> get_current_screen()->add_help_tab( array(
</span><span class="cx"> 'id' => 'overview',
</span><span class="cx"> 'title' => __( 'Overview' ),
</span></span></pre></div>
<a id="trunksrcwpincludescssmediaviewscss"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-includes/css/media-views.css (29279 => 29280)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-includes/css/media-views.css 2014-07-24 01:32:29 UTC (rev 29279)
+++ trunk/src/wp-includes/css/media-views.css 2014-07-24 05:25:28 UTC (rev 29280)
</span><span class="lines">@@ -961,29 +961,6 @@
</span><span class="cx"> border-radius: 0;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-.attachment .data-fields {
- margin: 5px 0 0;
-}
-
-.attachment .data-field {
- white-space: nowrap;
- text-overflow: ellipsis;
- overflow: hidden;
- line-height: 19px;
- height: 19px;
- text-align: left;
- width: 90%;
- margin: 0 5%;
-}
-
-.attachment .data-hidden {
- display: none;
-}
-
-.attachment .data-visible {
- display: block;
-}
-
</del><span class="cx"> /**
</span><span class="cx"> * Attachments Browser
</span><span class="cx"> */
</span></span></pre></div>
<a id="trunksrcwpincludesmediatemplatephp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-includes/media-template.php (29279 => 29280)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-includes/media-template.php 2014-07-24 01:32:29 UTC (rev 29279)
+++ trunk/src/wp-includes/media-template.php 2014-07-24 05:25:28 UTC (rev 29280)
</span><span class="lines">@@ -443,37 +443,7 @@
</span><span class="cx"> placeholder="<?php esc_attr_e('Describe this media file…'); ?>"
</span><span class="cx"> <# } #> {{ maybeReadOnly }} />
</span><span class="cx"> <# }
</span><del>- }
-
- if ( _.contains( data.controller.options.mode, 'grid' ) ) { #>
- <div class="data-fields">
- <?php
- $option = get_user_option( 'manageuploadgridcolumnshidden' );
- $hidden = array();
- if ( ! empty( $option ) ) {
- $hidden = $option;
- }
- $fields = array( 'title', 'uploadedTo', 'dateFormatted', 'mime' );
- foreach ( $fields as $field ):
- $class_name = in_array( $field, $hidden ) ? 'data-field data-hidden' : 'data-field data-visible';
- ?>
- <div class="<?php echo $class_name ?> data-<?php echo $field ?>"><#
- if ( 'uploadedTo' === '<?php echo $field ?>' ) {
- if ( data[ '<?php echo $field ?>' ] ) {
- #><?php _e( 'Uploaded To: ' ) ?><a href="{{ data.uploadedToLink }}">{{ data.uploadedToTitle }}</a><#
- } else {
- #><?php _e( 'Unattached' ) ?><#
- }
- } else if ( 'title' === '<?php echo $field ?>' && ! data[ '<?php echo $field ?>' ] ) {
- #><?php _e( '(No title)' ) ?><#
- } else if ( data[ '<?php echo $field ?>' ] ) {
- #>{{ data[ '<?php echo $field ?>' ] }}<#
- }
- #></div>
- <?php endforeach ?>
- </div>
- <# } #>
-
</del><ins>+ } #>
</ins><span class="cx"> </script>
</span><span class="cx">
</span><span class="cx"> <script type="text/html" id="tmpl-attachment-details">
</span></span></pre>
</div>
</div>
</body>
</html>