<!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>[28995] trunk/src/wp-includes: Make media grid text fields (data) toggle-able.</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/28995">28995</a></dd>
<dt>Author</dt> <dd>wonderboymusic</dd>
<dt>Date</dt> <dd>2014-07-04 04:47:40 +0000 (Fri, 04 Jul 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Make media grid text fields (data) toggle-able. Checking/unchecking is saved in user settings cookie.
See <a href="http://core.trac.wordpress.org/ticket/24716">#24716</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<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="trunksrcwpincludescssmediaviewscss"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-includes/css/media-views.css (28994 => 28995)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-includes/css/media-views.css 2014-07-04 03:58:20 UTC (rev 28994)
+++ trunk/src/wp-includes/css/media-views.css 2014-07-04 04:47:40 UTC (rev 28995)
</span><span class="lines">@@ -941,7 +941,6 @@
</span><span class="cx"> white-space: nowrap;
</span><span class="cx"> text-overflow: ellipsis;
</span><span class="cx"> overflow: hidden;
</span><del>- display: block;
</del><span class="cx"> line-height: 19px;
</span><span class="cx"> height: 19px;
</span><span class="cx"> text-align: left;
</span><span class="lines">@@ -949,6 +948,14 @@
</span><span class="cx"> margin: 0 5%;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+.attachment .data-hidden {
+ display: none;
+}
+
+.attachment .data-visible {
+ display: block;
+}
+
</ins><span class="cx"> /**
</span><span class="cx"> * Attachments Browser
</span><span class="cx"> */
</span><span class="lines">@@ -2518,13 +2525,22 @@
</span><span class="cx"> line-height: 29px;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-.media-grid-view .view-switch {
</del><ins>+.media-grid-view .view-switch,
+.media-grid-field-options {
</ins><span class="cx"> display: inline-block;
</span><span class="cx"> float: none;
</span><span class="cx"> margin-top: 13px;
</span><span class="cx"> vertical-align: middle;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+.media-grid-field-options span {
+ padding-right: 5px;
+}
+
+.media-grid-field-options label {
+ margin-right: 10px;
+}
+
</ins><span class="cx"> /**
</span><span class="cx"> * Position both the frame and the uploader window into the content
</span><span class="cx"> * area of the screen.
</span></span></pre></div>
<a id="trunksrcwpincludesjsmediagridjs"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-includes/js/media-grid.js (28994 => 28995)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-includes/js/media-grid.js 2014-07-04 03:58:20 UTC (rev 28994)
+++ trunk/src/wp-includes/js/media-grid.js 2014-07-04 04:47:40 UTC (rev 28995)
</span><span class="lines">@@ -485,4 +485,32 @@
</span><span class="cx">
</span><span class="cx"> });
</span><span class="cx">
</span><ins>+ 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();
+ }
+ }
+ });
+
</ins><span class="cx"> }(jQuery, _, Backbone, wp));
</span><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="trunksrcwpincludesjsmediaviewsjs"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-includes/js/media-views.js (28994 => 28995)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-includes/js/media-views.js 2014-07-04 03:58:20 UTC (rev 28994)
+++ trunk/src/wp-includes/js/media-views.js 2014-07-04 04:47:40 UTC (rev 28995)
</span><span class="lines">@@ -5551,7 +5551,10 @@
</span><span class="cx"> },
</span><span class="cx">
</span><span class="cx"> createToolbar: function() {
</span><del>- var filters, FiltersConstructor, screenReaderText;
</del><ins>+ var filters,
+ LibraryViewSwitcher,
+ FiltersConstructor,
+ screenReaderText;
</ins><span class="cx">
</span><span class="cx"> /**
</span><span class="cx"> * @member {wp.media.view.Toolbar}
</span><span class="lines">@@ -5566,14 +5569,19 @@
</span><span class="cx"> // browser view. Is this a use case for doAction( 'add:toolbar-items:attachments-browser', this.toolbar );
</span><span class="cx"> // which the controller can tap into and add this view?
</span><span class="cx"> if ( _.contains( this.controller.options.mode, 'grid' ) ) {
</span><del>- var libraryViewSwitcherConstructor = media.View.extend({
</del><ins>+ LibraryViewSwitcher = media.View.extend({
</ins><span class="cx"> className: 'view-switch media-grid-view-switch',
</span><span class="cx"> template: media.template( 'media-library-view-switcher')
</span><span class="cx"> });
</span><del>- this.toolbar.set( 'libraryViewSwitcher', new libraryViewSwitcherConstructor({
</del><ins>+ this.toolbar.set( 'libraryViewSwitcher', new LibraryViewSwitcher({
</ins><span class="cx"> controller: this.controller,
</span><span class="cx"> priority: -90
</span><span class="cx"> }).render() );
</span><ins>+
+ this.toolbar.set( 'gridFieldOptions', new media.view.GridFieldOptions({
+ controller: this.controller,
+ priority: -50
+ }).render() );
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> filters = this.options.filters;
</span></span></pre></div>
<a id="trunksrcwpincludesmediatemplatephp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-includes/media-template.php (28994 => 28995)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-includes/media-template.php 2014-07-04 03:58:20 UTC (rev 28994)
+++ trunk/src/wp-includes/media-template.php 2014-07-04 04:47:40 UTC (rev 28995)
</span><span class="lines">@@ -229,6 +229,25 @@
</span><span class="cx"> </a>
</span><span class="cx"> </script>
</span><span class="cx">
</span><ins>+ <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( 'Attached 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>
+
</ins><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">@@ -418,11 +437,16 @@
</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 ) { #>
- <div class="data-field data-{{ field }}"><#
</del><ins>+ <# _.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 }}"><#
</ins><span class="cx"> if ( 'uploadedTo' === field ) {
</span><span class="cx"> if ( data[field] ) {
</span><del>- #><?php _e( 'Uploaded To:' ) ?><#
</del><ins>+ #><?php _e( 'Uploaded To: ' ) ?><#
</ins><span class="cx"> } else {
</span><span class="cx"> #><?php _e( 'Unattached' ) ?><#
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>