<!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>[29077] trunk/src: Media Grid: Move toggling of visible fields to Screen Options.</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/29077">29077</a></dd>
<dt>Author</dt> <dd>wonderboymusic</dd>
<dt>Date</dt> <dd>2014-07-10 20:59:12 +0000 (Thu, 10 Jul 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Media Grid: Move toggling of visible fields to Screen Options. This moves us in a better direction... but this will probably need to be massaged again.
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="#trunksrcwpincludesjsmediagridjs">trunk/src/wp-includes/js/media-grid.js</a></li>
<li><a href="#trunksrcwpincludesjsmediaviewsjs">trunk/src/wp-includes/js/media-views.js</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 (29076 => 29077)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-admin/css/common.css 2014-07-10 19:38:56 UTC (rev 29076)
+++ trunk/src/wp-admin/css/common.css 2014-07-10 20:59:12 UTC (rev 29077)
</span><span class="lines">@@ -1025,6 +1025,7 @@
</span><span class="cx"> display: none;
</span><span class="cx"> margin: 0 20px -1px 0px;
</span><span class="cx"> position: relative;
</span><ins>+ z-index: 10;
</ins><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">@@ -1047,6 +1048,7 @@
</span><span class="cx"> #screen-meta-links .screen-meta-toggle {
</span><span class="cx"> position: relative;
</span><span class="cx"> top: 0;
</span><ins>+ z-index: 10;
</ins><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 (29076 => 29077)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-admin/includes/screen.php 2014-07-10 19:38:56 UTC (rev 29076)
+++ trunk/src/wp-admin/includes/screen.php 2014-07-10 20:59:12 UTC (rev 29077)
</span><span class="lines">@@ -1019,7 +1019,12 @@
</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' ) || ( $columns && empty( $columns['_title'] ) ) ) : ?>
</del><ins>+ <?php if (
+ isset( $wp_meta_boxes[ $this->id ] )
+ || $this->get_option( 'per_page' )
+ || $this->get_option( 'media_grid_title' )
+ || ( $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">@@ -1071,6 +1076,17 @@
</span><span class="cx"> ?>
</span><span class="cx"> <br class="clear" />
</span><span class="cx"> </div>
</span><ins>+ <?php elseif ( $this->get_option( 'media_grid_title' ) ): ?>
+ <div class="metabox-prefs media-grid-prefs">
+ <?php foreach ( $this->_options as $column => $args ) {
+ $id = "$column-hide";
+ echo '<label for="' . $id . '">';
+ $saved = str_replace( 'media_grid_', '', $column );
+ echo '<input class="hide-column-tog" name="' . $id . '" type="checkbox" id="' . $id . '" value="' . $column . '"' . checked( ! in_array( $saved, $hidden ), true, false ) . ' />';
+ echo $args['label'] . "</label>\n";
+ } ?>
+ <br class="clear" />
+ </div>
</ins><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 (29076 => 29077)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-admin/js/common.js 2014-07-10 19:38:56 UTC (rev 29076)
+++ trunk/src/wp-admin/js/common.js 2014-07-10 20:59:12 UTC (rev 29077)
</span><span class="lines">@@ -28,6 +28,20 @@
</span><span class="cx">
</span><span class="cx"> saveManageColumnsState : function() {
</span><span class="cx"> var hidden = this.hidden();
</span><ins>+ if ( $( '#media_grid_title-hide' ).length ) {
+ hidden = [];
+ $( '.hide-column-tog', '.media-grid-prefs' ).each( function() {
+ var $el, field = this.value.replace( 'media_grid_', '' );
+ $el = $( '.data-' + field );
+ if ( ! this.checked ) {
+ hidden.push( field );
+ $el.removeClass( 'data-visible' ).addClass( 'data-hidden' );
+ } else {
+ $el.removeClass( 'data-hidden' ).addClass( 'data-visible' );
+ }
+ } );
+ hidden = hidden.join( ',' );
+ }
</ins><span class="cx"> $.post(ajaxurl, {
</span><span class="cx"> action: 'hidden-columns',
</span><span class="cx"> hidden: hidden,
</span></span></pre></div>
<a id="trunksrcwpadminuploadphp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-admin/upload.php (29076 => 29077)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-admin/upload.php 2014-07-10 19:38:56 UTC (rev 29076)
+++ trunk/src/wp-admin/upload.php 2014-07-10 20:59:12 UTC (rev 29077)
</span><span class="lines">@@ -26,6 +26,11 @@
</span><span class="cx"> wp_enqueue_script( 'media' );
</span><span class="cx"> wp_localize_script( 'media-grid', 'mediaGridSettings', array( 'adminUrl' => parse_url( self_admin_url(), PHP_URL_PATH ) ) );
</span><span class="cx">
</span><ins>+ add_screen_option( 'media_grid_title', array( 'label' => __( 'Name' ) ) );
+ add_screen_option( 'media_grid_uploadedTo', array( 'label' => __( 'Uploaded To' ) ) );
+ add_screen_option( 'media_grid_dateFormatted', array( 'label' => __( 'Date' ) ) );
+ add_screen_option( 'media_grid_mime', array( 'label' => __( 'Mime-type' ) ) );
+
</ins><span class="cx"> require_once( ABSPATH . 'wp-admin/admin-header.php' );
</span><span class="cx"> include( ABSPATH . 'wp-admin/admin-footer.php' );
</span><span class="cx"> exit;
</span></span></pre></div>
<a id="trunksrcwpincludescssmediaviewscss"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-includes/css/media-views.css (29076 => 29077)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-includes/css/media-views.css 2014-07-10 19:38:56 UTC (rev 29076)
+++ trunk/src/wp-includes/css/media-views.css 2014-07-10 20:59:12 UTC (rev 29077)
</span><span class="lines">@@ -2575,6 +2575,7 @@
</span><span class="cx"> * area of the screen.
</span><span class="cx"> */
</span><span class="cx"> .media-grid-view {
</span><ins>+ z-index: 1;
</ins><span class="cx"> position: fixed;
</span><span class="cx"> bottom: 0;
</span><span class="cx"> left: 160px;
</span></span></pre></div>
<a id="trunksrcwpincludesjsmediagridjs"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-includes/js/media-grid.js (29076 => 29077)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-includes/js/media-grid.js 2014-07-10 19:38:56 UTC (rev 29076)
+++ trunk/src/wp-includes/js/media-grid.js 2014-07-10 20:59:12 UTC (rev 29077)
</span><span class="lines">@@ -597,34 +597,6 @@
</span><span class="cx"> }
</span><span class="cx"> });
</span><span class="cx">
</span><del>- media.view.GridFieldOptions = media.View.extend({
- className: 'media-grid-field-options',
- template: media.template( 'media-grid-field-options' ),
-
- events: {
- 'change input': 'toggleFields'
- },
-
- toggleFields: function(e) {
- var $el = $( e.currentTarget ), fields, setting;
- setting = $el.data( 'setting' );
- fields = $( '.data-' + setting, '.data-fields' );
- if ( $el.is( ':checked' ) ) {
- fields.show();
- deleteUserSetting( 'hidegrid' + setting );
- } else {
- fields.hide();
- setUserSetting( 'hidegrid' + setting, 1 );
- }
-
- if ( $( ':checked', this.$el ).length ) {
- fields.parent().show();
- } else {
- fields.parent().hide();
- }
- }
- });
-
</del><span class="cx"> media.view.BulkSelectionToggleButton = media.view.Button.extend({
</span><span class="cx"> initialize: function() {
</span><span class="cx"> media.view.Button.prototype.initialize.apply( this, arguments );
</span></span></pre></div>
<a id="trunksrcwpincludesjsmediaviewsjs"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-includes/js/media-views.js (29076 => 29077)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-includes/js/media-views.js 2014-07-10 19:38:56 UTC (rev 29076)
+++ trunk/src/wp-includes/js/media-views.js 2014-07-10 20:59:12 UTC (rev 29077)
</span><span class="lines">@@ -5228,8 +5228,7 @@
</span><span class="cx"> controller: this.controller,
</span><span class="cx"> model: attachment,
</span><span class="cx"> collection: this.collection,
</span><del>- selection: this.options.selection,
- showAttachmentFields: this.options.showAttachmentFields
</del><ins>+ selection: this.options.selection
</ins><span class="cx"> });
</span><span class="cx">
</span><span class="cx"> return this._viewsByCid[ attachment.cid ] = view;
</span><span class="lines">@@ -5544,7 +5543,6 @@
</span><span class="cx"> search: true,
</span><span class="cx"> display: false,
</span><span class="cx"> sidebar: true,
</span><del>- showAttachmentFields: getUserSetting( 'showAttachmentFields', [ 'title', 'uploadedTo', 'dateFormatted', 'mime' ] ),
</del><span class="cx"> AttachmentView: media.view.Attachment.Library
</span><span class="cx"> });
</span><span class="cx">
</span><span class="lines">@@ -5609,11 +5607,6 @@
</span><span class="cx"> controller: this.controller,
</span><span class="cx"> priority: -69
</span><span class="cx"> }).render() );
</span><del>-
- this.toolbar.set( 'gridFieldOptions', new media.view.GridFieldOptions({
- controller: this.controller,
- priority: -50
- }).render() );
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> filters = this.options.filters;
</span><span class="lines">@@ -5705,7 +5698,6 @@
</span><span class="cx"> selection: this.options.selection,
</span><span class="cx"> model: this.model,
</span><span class="cx"> sortable: this.options.sortable,
</span><del>- showAttachmentFields: this.options.showAttachmentFields,
</del><span class="cx">
</span><span class="cx"> // The single `Attachment` view to be used in the `Attachments` view.
</span><span class="cx"> AttachmentView: this.options.AttachmentView
</span></span></pre></div>
<a id="trunksrcwpincludesmediatemplatephp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-includes/media-template.php (29076 => 29077)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-includes/media-template.php 2014-07-10 19:38:56 UTC (rev 29076)
+++ trunk/src/wp-includes/media-template.php 2014-07-10 20:59:12 UTC (rev 29077)
</span><span class="lines">@@ -229,25 +229,6 @@
</span><span class="cx"> </a>
</span><span class="cx"> </script>
</span><span class="cx">
</span><del>- <script type="text/html" id="tmpl-media-grid-field-options">
- <label class="setting">
- <span><?php _e( 'Name' ); ?></span>
- <input type="checkbox" data-setting="title" {{ '' === getUserSetting( 'hidegridtitle' ) && 'checked' }} />
- </label>
- <label class="setting">
- <span><?php _e( 'Uploaded to' ); ?></span>
- <input type="checkbox" data-setting="uploadedTo" {{ '' === getUserSetting( 'hidegriduploadedTo' ) && 'checked' }} />
- </label>
- <label class="setting">
- <span><?php _e( 'Date' ); ?></span>
- <input type="checkbox" data-setting="dateFormatted" {{ '' === getUserSetting( 'hidegriddateFormatted' ) && 'checked' }} />
- </label>
- <label class="setting">
- <span><?php _e( 'Mime-type' ); ?></span>
- <input type="checkbox" data-setting="mime" {{ '' === getUserSetting( 'hidegridmime' ) && 'checked' }} />
- </label>
- </script>
-
</del><span class="cx"> <script type="text/html" id="tmpl-uploader-status">
</span><span class="cx"> <h3><?php _e( 'Uploading' ); ?></h3>
</span><span class="cx"> <a class="upload-dismiss-errors" href="#"><?php _e('Dismiss Errors'); ?></a>
</span><span class="lines">@@ -437,26 +418,26 @@
</span><span class="cx">
</span><span class="cx"> if ( _.contains( data.controller.options.mode, 'grid' ) ) { #>
</span><span class="cx"> <div class="data-fields">
</span><del>- <# _.each( data.showAttachmentFields, function( field ) {
- var className = 'data-field data-hidden';
- if ( '' === getUserSetting( 'hidegrid' + field ) ) {
- className = 'data-field data-visible';
- }
- #>
- <div class="{{ className }} data-{{ field }}"><#
- if ( 'uploadedTo' === field ) {
- if ( data[ field ] ) {
</del><ins>+ <?php
+ $hidden = get_hidden_columns( get_current_screen() );
+ $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 ?>' ] ) {
</ins><span class="cx"> #><?php _e( 'Uploaded To: ' ) ?><a href="{{ data.uploadedToLink }}">{{ data.uploadedToTitle }}</a><#
</span><span class="cx"> } else {
</span><span class="cx"> #><?php _e( 'Unattached' ) ?><#
</span><span class="cx"> }
</span><del>- } else if ( 'title' === field && ! data[ field ] ) {
</del><ins>+ } else if ( 'title' === '<?php echo $field ?>' && ! data[ '<?php echo $field ?>' ] ) {
</ins><span class="cx"> #><?php _e( '(No title)' ) ?><#
</span><del>- } else if ( data[ field ] ) {
- #>{{ data[ field ] }}<#
</del><ins>+ } else if ( data[ '<?php echo $field ?>' ] ) {
+ #>{{ data[ '<?php echo $field ?>' ] }}<#
</ins><span class="cx"> }
</span><span class="cx"> #></div>
</span><del>- <# }); #>
</del><ins>+ <?php endforeach ?>
</ins><span class="cx"> </div>
</span><span class="cx"> <# } #>
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>