<!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>[2397] sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-payments: WordCamp Budgets: Move read-only fields to Status metabox.</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" style="font-size: 105%">
<dt style="float: left; width: 6em; font-weight: bold">Revision</dt> <dd><a style="font-weight: bold" href="http://meta.trac.wordpress.org/changeset/2397">2397</a><script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","description":"Review this Commit","action":{"@type":"ViewAction","url":"http://meta.trac.wordpress.org/changeset/2397","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>iandunn</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2016-01-28 16:21:19 +0000 (Thu, 28 Jan 2016)</dd>
</dl>
<pre style='padding-left: 1em; margin: 2em 0; border-left: 2px solid #ccc; line-height: 1.25; font-size: 105%; font-family: sans-serif'>WordCamp Budgets: Move read-only fields to Status metabox.
Organizers can't edit these fields, so they fit better in the Status box than the General Info one.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#sitestrunkwordcamporgpublic_htmlwpcontentpluginswordcamppaymentscsswordcampbudgetscss">sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-payments/css/wordcamp-budgets.css</a></li>
<li><a href="#sitestrunkwordcamporgpublic_htmlwpcontentpluginswordcamppaymentsincludespaymentrequestphp">sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-payments/includes/payment-request.php</a></li>
<li><a href="#sitestrunkwordcamporgpublic_htmlwpcontentpluginswordcamppaymentsjavascriptpaymentrequestsjs">sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-payments/javascript/payment-requests.js</a></li>
<li><a href="#sitestrunkwordcamporgpublic_htmlwpcontentpluginswordcamppaymentsviewspaymentrequestmetaboxgeneralphp">sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-payments/views/payment-request/metabox-general.php</a></li>
<li><a href="#sitestrunkwordcamporgpublic_htmlwpcontentpluginswordcamppaymentsviewspaymentrequestmetaboxstatusphp">sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-payments/views/payment-request/metabox-status.php</a></li>
<li><a href="#sitestrunkwordcamporgpublic_htmlwpcontentpluginswordcamppaymentsviewsreimbursementrequestmetaboxstatusphp">sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-payments/views/reimbursement-request/metabox-status.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="sitestrunkwordcamporgpublic_htmlwpcontentpluginswordcamppaymentscsswordcampbudgetscss"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-payments/css/wordcamp-budgets.css</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-payments/css/wordcamp-budgets.css 2016-01-28 15:59:51 UTC (rev 2396)
+++ sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-payments/css/wordcamp-budgets.css 2016-01-28 16:21:19 UTC (rev 2397)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -5,6 +5,14 @@
</span><span class="cx" style="display: block; padding: 0 10px"> margin-left: 9px;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+#submitpost.wcb .misc-pub-section span {
+ font-weight: bold;
+}
+
+#submitpost.wcb .misc-pub-section input.hasDatepicker {
+ width: 7em;
+}
+
</ins><span class="cx" style="display: block; padding: 0 10px"> /* Forms */
</span><span class="cx" style="display: block; padding: 0 10px"> .wcb-form {
</span><span class="cx" style="display: block; padding: 0 10px"> display: table;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -133,10 +141,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> float: none;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-#submitpost.wcbrr .misc-pub-section span {
- font-weight: bold;
-}
-
</del><span class="cx" style="display: block; padding: 0 10px"> .wcbrr-note {
</span><span class="cx" style="display: block; padding: 0 10px"> margin-bottom: 1em;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre></div>
<a id="sitestrunkwordcamporgpublic_htmlwpcontentpluginswordcamppaymentsincludespaymentrequestphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-payments/includes/payment-request.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-payments/includes/payment-request.php 2016-01-28 15:59:51 UTC (rev 2396)
+++ sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-payments/includes/payment-request.php 2016-01-28 16:21:19 UTC (rev 2397)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -217,6 +217,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $submit_text = 'auto-draft' == $post->post_status ? __( 'Submit Request', 'wordcamporg' ) : __( 'Update Request', 'wordcamporg' );
</span><span class="cx" style="display: block; padding: 0 10px"> $current_user_can_edit_request = 'paid' != $post->post_status || current_user_can( 'manage_network' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $date_vendor_paid = get_post_meta( $post->ID, '_camppayments_date_vendor_paid', true );
+ if ( current_user_can( 'manage_network' ) ) {
+ $date_vendor_paid_readonly = false;
+ } else {
+ $date_vendor_paid_readonly = true;
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> require_once( dirname( __DIR__ ) . '/views/payment-request/metabox-status.php' );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -242,13 +249,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $categories = WordCamp_Budgets::get_payment_categories();
</span><span class="cx" style="display: block; padding: 0 10px"> $assigned_category = get_post_meta( $post->ID, '_camppayments_payment_category', true );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $date_vendor_paid = get_post_meta( $post->ID, '_camppayments_date_vendor_paid', true );
- if ( current_user_can( 'manage_network' ) ) {
- $date_vendor_paid_readonly = false;
- } else {
- $date_vendor_paid_readonly = true;
- }
-
</del><span class="cx" style="display: block; padding: 0 10px"> require_once( dirname( __DIR__ ) . '/views/payment-request/metabox-general.php' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // todo If they select other but don't fill in the explanation, set to draft and display error msg, similar to require_complete_meta_to_publish_wordcamp()
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -422,7 +422,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> break;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> case 'requester':
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $value = WordCamp_Budgets::get_requester_formatted_email( $post->post_author );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $value = WordCamp_Budgets::get_requester_name( $post->post_author );
</ins><span class="cx" style="display: block; padding: 0 10px"> break;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> case 'date_vendor_paid':
</span></span></pre></div>
<a id="sitestrunkwordcamporgpublic_htmlwpcontentpluginswordcamppaymentsjavascriptpaymentrequestsjs"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-payments/javascript/payment-requests.js</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-payments/javascript/payment-requests.js 2016-01-28 15:59:51 UTC (rev 2396)
+++ sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-payments/javascript/payment-requests.js 2016-01-28 16:21:19 UTC (rev 2397)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -12,6 +12,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> app.registerEventHandlers();
</span><span class="cx" style="display: block; padding: 0 10px"> wcb.attachedFilesView = new wcb.AttachedFilesView( { el: $( '#wcp_files' ) } );
</span><span class="cx" style="display: block; padding: 0 10px"> wcb.setupDatePicker( '#wcp_general_info' );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ wcb.setupDatePicker( '#submitpost.wcb' );
</ins><span class="cx" style="display: block; padding: 0 10px"> } catch ( exception ) {
</span><span class="cx" style="display: block; padding: 0 10px"> wcb.log( exception );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre></div>
<a id="sitestrunkwordcamporgpublic_htmlwpcontentpluginswordcamppaymentsviewspaymentrequestmetaboxgeneralphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-payments/views/payment-request/metabox-general.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-payments/views/payment-request/metabox-general.php 2016-01-28 15:59:51 UTC (rev 2396)
+++ sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-payments/views/payment-request/metabox-general.php 2016-01-28 16:21:19 UTC (rev 2397)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,8 +1,5 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <table class="form-table">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->render_text_input( $post, 'Request ID', 'request_id', '', 'text', array(), true );
- $this->render_text_input( $post, 'Requester', 'requester', '', 'text', array(), true );
- $this->render_text_input( $post, 'Date Vendor was Paid', 'date_vendor_paid', '', 'date', array(), $date_vendor_paid_readonly );
</del><span class="cx" style="display: block; padding: 0 10px"> $this->render_textarea_input( $post, 'Description', 'description' );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->render_text_input( $post, 'Requested date for payment/due by', 'due_by', '', 'date' );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->render_text_input( $post, 'Amount', 'payment_amount', 'No commas, thousands separators or currency symbols. Ex. 1234.56' );
</span></span></pre></div>
<a id="sitestrunkwordcamporgpublic_htmlwpcontentpluginswordcamppaymentsviewspaymentrequestmetaboxstatusphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-payments/views/payment-request/metabox-status.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-payments/views/payment-request/metabox-status.php 2016-01-28 15:59:51 UTC (rev 2396)
+++ sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-payments/views/payment-request/metabox-status.php 2016-01-28 16:21:19 UTC (rev 2397)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,6 +1,25 @@
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-<div id="submitpost" class="submitbox">
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+<div id="submitpost" class="wcb submitbox">
</ins><span class="cx" style="display: block; padding: 0 10px"> <div id="minor-publishing">
</span><span class="cx" style="display: block; padding: 0 10px"> <div id="misc-publishing-actions">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ <div class="misc-pub-section">
+ <?php _e( 'ID:', 'wordcamporg' ); ?>
+ <span>
+ <?php echo esc_html( $this->get_field_value( 'request_id', $post ) ); ?>
+ </span>
+ </div>
+
+ <div class="misc-pub-section">
+ <?php _e( 'Requested By:', 'wordcamporg' ); ?>
+ <span>
+ <?php echo esc_html( $this->get_field_value( 'requester', $post ) ); ?>
+ </span>
+ </div>
+
+ <div class="misc-pub-section">
+ <?php $this->render_text_input( $post, 'Date Vendor was Paid', 'date_vendor_paid', '', 'date', array(), $date_vendor_paid_readonly ); ?>
+ </div>
+
</ins><span class="cx" style="display: block; padding: 0 10px"> <div class="misc-pub-section misc-pub-post-status">
</span><span class="cx" style="display: block; padding: 0 10px"> <label for="post_status"><?php _e( 'Status:' ) ?></label>
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="sitestrunkwordcamporgpublic_htmlwpcontentpluginswordcamppaymentsviewsreimbursementrequestmetaboxstatusphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-payments/views/reimbursement-request/metabox-status.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-payments/views/reimbursement-request/metabox-status.php 2016-01-28 15:59:51 UTC (rev 2396)
+++ sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-payments/views/reimbursement-request/metabox-status.php 2016-01-28 16:21:19 UTC (rev 2397)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -5,7 +5,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> ?>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-<div id="submitpost" class="wcbrr submitbox">
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+<div id="submitpost" class="wcb submitbox">
</ins><span class="cx" style="display: block; padding: 0 10px"> <div id="minor-publishing">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php if ( $show_draft_button ) : ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <div id="minor-publishing-actions">
</span></span></pre>
</div>
</div>
</body>
</html>