<!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>[2682] sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-payments: WordCamp Budgets: Make Vendor Payment and Payment Method fields required.</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/2682">2682</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/2682","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-03-03 19:33:42 +0000 (Thu, 03 Mar 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: Make Vendor Payment and Payment Method fields required.</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_htmlwpcontentpluginswordcamppaymentsincludeswordcampbudgetsphp">sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-payments/includes/wordcamp-budgets.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_htmlwpcontentpluginswordcamppaymentsjavascriptreimbursementrequestsjs">sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-payments/javascript/reimbursement-requests.js</a></li>
<li><a href="#sitestrunkwordcamporgpublic_htmlwpcontentpluginswordcamppaymentsjavascriptwordcampbudgetsjs">sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-payments/javascript/wordcamp-budgets.js</a></li>
<li><a href="#sitestrunkwordcamporgpublic_htmlwpcontentpluginswordcamppaymentsviewspaymentrequestinputcountryphp">sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-payments/views/payment-request/input-country.php</a></li>
<li><a href="#sitestrunkwordcamporgpublic_htmlwpcontentpluginswordcamppaymentsviewspaymentrequestinputradiophp">sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-payments/views/payment-request/input-radio.php</a></li>
<li><a href="#sitestrunkwordcamporgpublic_htmlwpcontentpluginswordcamppaymentsviewspaymentrequestinputselectphp">sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-payments/views/payment-request/input-select.php</a></li>
<li><a href="#sitestrunkwordcamporgpublic_htmlwpcontentpluginswordcamppaymentsviewspaymentrequestinputtextphp">sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-payments/views/payment-request/input-text.php</a></li>
<li><a href="#sitestrunkwordcamporgpublic_htmlwpcontentpluginswordcamppaymentsviewspaymentrequestinputtextareaphp">sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-payments/views/payment-request/input-textarea.php</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_htmlwpcontentpluginswordcamppaymentsviewspaymentrequestmetaboxpaymentphp">sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-payments/views/payment-request/metabox-payment.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_htmlwpcontentpluginswordcamppaymentsviewspaymentrequestmetaboxvendorphp">sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-payments/views/payment-request/metabox-vendor.php</a></li>
<li><a href="#sitestrunkwordcamporgpublic_htmlwpcontentpluginswordcamppaymentsviewswordcampbudgetsformfieldrequiredindicatorphp">sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-payments/views/wordcamp-budgets/form-field-required-indicator.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-03-03 19:26:13 UTC (rev 2681)
+++ sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-payments/css/wordcamp-budgets.css 2016-03-03 19:33:42 UTC (rev 2682)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -54,6 +54,22 @@
</span><span class="cx" style="display: block; padding: 0 10px"> color: #dc3232;
</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">+/* Make room for the required field indicator (*) */
+body.post-type-wcp_payment_request input.large-text,
+body.post-type-wcp_payment_request input.regular-text,
+body.post-type-wcp_payment_request textarea.large-text,
+body.post-type-wcp_payment_request .meta-box-sortables select {
+ width: 95%;
+}
+
+@media screen and ( max-width: 782px ) {
+ body.post-type-wcp_payment_request .form-table td textarea {
+ display: inline;
+ width: 95%;
+ }
+}
+
+
</ins><span class="cx" style="display: block; padding: 0 10px"> /* margins from above selector aren't applied */
</span><span class="cx" style="display: block; padding: 0 10px"> .wcb-form-input-wrapper {
</span><span class="cx" style="display: block; padding: 0 10px"> padding-left: 1em;
</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-03-03 19:26:13 UTC (rev 2681)
+++ sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-payments/includes/payment-request.php 2016-03-03 19:33:42 UTC (rev 2682)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -179,7 +179,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'payment-requests',
</span><span class="cx" style="display: block; padding: 0 10px"> plugins_url( 'javascript/payment-requests.js', __DIR__ ),
</span><span class="cx" style="display: block; padding: 0 10px"> array( 'wordcamp-budgets', 'wcb-attached-files', 'jquery' ),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 2,
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 3,
</ins><span class="cx" style="display: block; padding: 0 10px"> true
</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">@@ -338,8 +338,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $label
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $name
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $description
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param bool $required
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- protected function render_textarea_input( $post, $label, $name, $description = '' ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ protected function render_textarea_input( $post, $label, $name, $description = '', $required = true ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $text = $this->get_field_value( $name, $post );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> require( dirname( __DIR__ ) . '/views/payment-request/input-textarea.php' );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -351,15 +352,24 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @param WP_Post $post
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $label
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $name
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param bool $required
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- protected function render_select_input( $post, $label, $name ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ protected function render_select_input( $post, $label, $name, $required = true ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $selected = get_post_meta( $post->ID, '_camppayments_' . $name, true );
</span><span class="cx" style="display: block; padding: 0 10px"> $options = $this->get_field_value( $name, $post );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> require( dirname( __DIR__ ) . '/views/payment-request/input-select.php' );
</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">- protected function render_country_input( $post, $label, $name ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /**
+ * Render a select dropdown for countries
+ *
+ * @param WP_Post $post
+ * @param string $label
+ * @param string $name
+ * @param bool $required
+ */
+ protected function render_country_input( $post, $label, $name, $required = true ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $selected = $this->get_field_value( $name, $post );
</span><span class="cx" style="display: block; padding: 0 10px"> $options = WordCamp_Budgets::get_valid_countries_iso3166();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -372,8 +382,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @param WP_Post $post
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $label
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $name
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param bool $required
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- protected function render_radio_input( $post, $label, $name ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ protected function render_radio_input( $post, $label, $name, $required = true ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $selected = get_post_meta( $post->ID, "_{$this->meta_key_prefix}_" . $name, true );
</span><span class="cx" style="display: block; padding: 0 10px"> $options = $this->get_field_value( $name, $post );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -386,8 +397,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @param WP_Post $post
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $label
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $name
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param bool $required
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- protected function render_checkbox_input( $post, $label, $name, $description = '' ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ protected function render_checkbox_input( $post, $label, $name, $description = '', $required = true ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $value = $this->get_field_value( $name, $post );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> require( dirname( __DIR__ ) . '/views/payment-request/input-checkbox.php' );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -399,8 +411,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @param WP_Post $post
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $label
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $name
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param string $description
+ * @param string $variant
+ * @param array $row_classes
+ * @param bool $readonly
+ * @param bool $required
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- protected function render_text_input( $post, $label, $name, $description = '', $variant = 'text', $row_classes = array(), $readonly = false ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ protected function render_text_input( $post, $label, $name, $description = '', $variant = 'text', $row_classes = array(), $readonly = false, $required = true ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $value = $this->get_field_value( $name, $post );
</span><span class="cx" style="display: block; padding: 0 10px"> array_walk( $row_classes, 'sanitize_html_class' );
</span><span class="cx" style="display: block; padding: 0 10px"> $row_classes = implode( ' ', $row_classes );
</span></span></pre></div>
<a id="sitestrunkwordcamporgpublic_htmlwpcontentpluginswordcamppaymentsincludeswordcampbudgetsphp"></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/wordcamp-budgets.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/wordcamp-budgets.php 2016-03-03 19:26:13 UTC (rev 2681)
+++ sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-payments/includes/wordcamp-budgets.php 2016-03-03 19:33:42 UTC (rev 2682)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -128,7 +128,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'wordcamp-budgets',
</span><span class="cx" style="display: block; padding: 0 10px"> plugins_url( 'javascript/wordcamp-budgets.js', __DIR__ ),
</span><span class="cx" style="display: block; padding: 0 10px"> array( 'jquery', 'jquery-ui-datepicker', 'media-upload', 'media-views' ),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 1,
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 2,
</ins><span class="cx" style="display: block; padding: 0 10px"> true
</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">@@ -160,7 +160,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'wordcamp-budgets',
</span><span class="cx" style="display: block; padding: 0 10px"> plugins_url( 'css/wordcamp-budgets.css', __DIR__ ),
</span><span class="cx" style="display: block; padding: 0 10px"> $soft_deps,
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 2
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 3
</ins><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></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-03-03 19:26:13 UTC (rev 2681)
+++ sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-payments/javascript/payment-requests.js 2016-03-03 19:33:42 UTC (rev 2682)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -23,13 +23,18 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> registerEventHandlers : function() {
</span><span class="cx" style="display: block; padding: 0 10px"> var currency = $( '#currency' );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- var paymentCategory = $( '#payment_category' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ var paymentCategory = $( '#payment_category' ),
+ paymentDetails = $( '#wcp_payment_details' );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $( '#wcp_payment_details' ).find( 'input[name=payment_method]' ).change( wcb.togglePaymentMethodFields );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ paymentDetails.find( 'input[name=payment_method]' ).change( wcb.togglePaymentMethodFields );
+ paymentDetails.find( 'input[name=payment_method]:checked' ).trigger( 'change' ); // Set the initial state
+
</ins><span class="cx" style="display: block; padding: 0 10px"> paymentCategory.change( app.toggleOtherCategoryDescription );
</span><span class="cx" style="display: block; padding: 0 10px"> paymentCategory.trigger( 'change' ); // Set the initial state
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> currency.change( wcb.setDefaultPaymentMethod );
</span><span class="cx" style="display: block; padding: 0 10px"> currency.trigger( 'change' ); // Set the initial state
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> $( '#row-files' ).find( 'a.wcb-insert-media' ).click( wcb.showUploadModal );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $('[name="post_status"]').on('change', function() {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -52,8 +57,10 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( 'other' == $( this ).find( 'option:selected' ).val() ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $( otherCategoryDescription ).removeClass( 'hidden' );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $( otherCategoryDescription ).find( ':input' ).prop( 'required', true );
</ins><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> $( otherCategoryDescription ).addClass( 'hidden' );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $( otherCategoryDescription ).find( ':input' ).prop( 'required', false );
</ins><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"> // todo make the transition smoother
</span></span></pre></div>
<a id="sitestrunkwordcamporgpublic_htmlwpcontentpluginswordcamppaymentsjavascriptreimbursementrequestsjs"></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/reimbursement-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/reimbursement-requests.js 2016-03-03 19:26:13 UTC (rev 2681)
+++ sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-payments/javascript/reimbursement-requests.js 2016-03-03 19:33:42 UTC (rev 2682)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -30,7 +30,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> registerEventHandlers : function() {
</span><span class="cx" style="display: block; padding: 0 10px"> var reason = $( '#_wcbrr_reason' ),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- currency = $( '#_wcbrr_currency' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ currency = $( '#_wcbrr_currency' ),
+ paymentMethod = $( '#row-payment-method' );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> reason.change( app.toggleOtherReasonDescription );
</span><span class="cx" style="display: block; padding: 0 10px"> reason.trigger( 'change' ); // Set the initial state
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -38,7 +39,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> currency.change( wcb.setDefaultPaymentMethod );
</span><span class="cx" style="display: block; padding: 0 10px"> currency.trigger( 'change' ); // Set the initial state
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $( '#row-payment-method' ).find( 'input[name=payment_method]' ).change( wcb.togglePaymentMethodFields );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ paymentMethod.find( 'input[name=payment_method]' ).change( wcb.togglePaymentMethodFields );
+ paymentMethod.find( 'input[name=payment_method]:checked' ).trigger( 'change' ); // Set the initial state
+
</ins><span class="cx" style="display: block; padding: 0 10px"> $( '#wcbrr_general_information' ).find( 'a.wcb-insert-media' ).click( wcb.showUploadModal );
</span><span class="cx" style="display: block; padding: 0 10px"> $( '#wcbrr-add-another-expense' ).click( app.addNewExpense );
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="sitestrunkwordcamporgpublic_htmlwpcontentpluginswordcamppaymentsjavascriptwordcampbudgetsjs"></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/wordcamp-budgets.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/wordcamp-budgets.js 2016-03-03 19:26:13 UTC (rev 2681)
+++ sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-payments/javascript/wordcamp-budgets.js 2016-03-03 19:33:42 UTC (rev 2682)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -30,13 +30,35 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> togglePaymentMethodFields : function( event ) {
</span><span class="cx" style="display: block; padding: 0 10px"> var active_fields_container = '#' + $( this ).attr( 'id' ) + '_fields';
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- var payment_method_fields = '.payment_method_fields';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ var payment_method_fields = '.payment_method_fields',
+ optionalFields = [ 'needs_intermediary_bank' ];
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $( payment_method_fields ).removeClass( 'active' );
</span><span class="cx" style="display: block; padding: 0 10px"> $( payment_method_fields ).addClass( 'hidden' );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ $( payment_method_fields ).each( function( containerIndex, fieldContainer ) {
+ $( fieldContainer ).find( ':input' ).each( function( fieldIndex, inputField ) {
+ $( inputField ).prop( 'required', false );
+ } );
+ } );
+
</ins><span class="cx" style="display: block; padding: 0 10px"> $( active_fields_container ).removeClass( 'hidden' );
</span><span class="cx" style="display: block; padding: 0 10px"> $( active_fields_container ).addClass( 'active' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $( active_fields_container ).find( ':input' ).each( function( index, field ) {
+ if ( $.inArray( $( field ).prop( 'id' ), optionalFields ) > -1 ) {
+ return;
+ }
+
+ $( field ).prop( 'required', true );
+ } );
+
+ /*
+ * Also toggle intermediary bank fields, because otherwise switching to Wire from another method
+ * wouldn't remove `required` attributes.
+ */
+ app.toggleIntermediaryBankFields( event );
+
</ins><span class="cx" style="display: block; padding: 0 10px"> // todo make the transition smoother
</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">@@ -54,8 +76,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $( intermediaryBankFieldRows ).each( function( index, row ) {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( isWirePayment && needsIntermediaryBank ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $( row ).removeClass( 'hidden' );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $( row ).find( ':input' ).prop( 'required', true );
</ins><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> $( row ).addClass( 'hidden' );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $( row ).find( ':input' ).prop( 'required', false );
</ins><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"> } catch( exception ) {
</span></span></pre></div>
<a id="sitestrunkwordcamporgpublic_htmlwpcontentpluginswordcamppaymentsviewspaymentrequestinputcountryphp"></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/input-country.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/input-country.php 2016-03-03 19:26:13 UTC (rev 2681)
+++ sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-payments/views/payment-request/input-country.php 2016-03-03 19:33:42 UTC (rev 2682)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -4,8 +4,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <?php echo esc_html( $label ); ?>:
</span><span class="cx" style="display: block; padding: 0 10px"> </label>
</span><span class="cx" style="display: block; padding: 0 10px"> </th>
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> <td>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <select id="<?php echo esc_attr( $name ); ?>" name="<?php echo esc_attr( $name ); ?>">
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <select
+ id="<?php echo esc_attr( $name ); ?>"
+ name="<?php echo esc_attr( $name ); ?>"
+ <?php __checked_selected_helper( $required, true, true, 'required' ); ?>
+ >
</ins><span class="cx" style="display: block; padding: 0 10px"> <option value="">(None)</option>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php foreach ( $options as $value => $option_label ) : ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <option value="<?php echo esc_attr( $value ); ?>" <?php selected( $value, $selected ); ?>><?php
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -13,5 +18,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> ?></option>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php endforeach; ?>
</span><span class="cx" style="display: block; padding: 0 10px"> </select>
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ <?php
+ if ( $required ) {
+ WordCamp_Budgets::render_form_field_required_indicator();
+ }
+ ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> </td>
</span><span class="cx" style="display: block; padding: 0 10px"> </tr>
</span></span></pre></div>
<a id="sitestrunkwordcamporgpublic_htmlwpcontentpluginswordcamppaymentsviewspaymentrequestinputradiophp"></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/input-radio.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/input-radio.php 2016-03-03 19:26:13 UTC (rev 2681)
+++ sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-payments/views/payment-request/input-radio.php 2016-03-03 19:33:42 UTC (rev 2682)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -13,11 +13,18 @@
</span><span class="cx" style="display: block; padding: 0 10px"> name="<?php echo esc_attr( $name ); ?>"
</span><span class="cx" style="display: block; padding: 0 10px"> value="<?php echo esc_attr( $option ); ?>"
</span><span class="cx" style="display: block; padding: 0 10px"> <?php checked( $option, $selected ); ?>
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php __checked_selected_helper( $required, true, true, 'required' ); ?>
</ins><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"> <label for="<?php echo esc_attr( $option_name ); ?>">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php echo esc_html( $option ); ?>:
</span><span class="cx" style="display: block; padding: 0 10px"> </label>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php endforeach; ?>
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ <?php
+ if ( $required ) {
+ WordCamp_Budgets::render_form_field_required_indicator();
+ }
+ ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> </td>
</span><span class="cx" style="display: block; padding: 0 10px"> </tr>
</span></span></pre></div>
<a id="sitestrunkwordcamporgpublic_htmlwpcontentpluginswordcamppaymentsviewspaymentrequestinputselectphp"></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/input-select.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/input-select.php 2016-03-03 19:26:13 UTC (rev 2681)
+++ sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-payments/views/payment-request/input-select.php 2016-03-03 19:33:42 UTC (rev 2682)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -6,7 +6,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> </th>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <td>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <select id="<?php echo esc_attr( $name ); ?>" name="<?php echo esc_attr( $name ); ?>">
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <select
+ id="<?php echo esc_attr( $name ); ?>"
+ name="<?php echo esc_attr( $name ); ?>"
+ <?php __checked_selected_helper( $required, true, true, 'required' ); ?>
+ >
</ins><span class="cx" style="display: block; padding: 0 10px"> <option value="null-select-one">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php printf( __( '-- Select a %s --', 'wordcamporg' ), $label ); ?>
</span><span class="cx" style="display: block; padding: 0 10px"> </option>
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -18,5 +22,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> </option>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php endforeach; ?>
</span><span class="cx" style="display: block; padding: 0 10px"> </select>
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ <?php
+ if ( $required ) {
+ WordCamp_Budgets::render_form_field_required_indicator();
+ }
+ ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> </td>
</span><span class="cx" style="display: block; padding: 0 10px"> </tr>
</span></span></pre></div>
<a id="sitestrunkwordcamporgpublic_htmlwpcontentpluginswordcamppaymentsviewspaymentrequestinputtextphp"></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/input-text.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/input-text.php 2016-03-03 19:26:13 UTC (rev 2681)
+++ sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-payments/views/payment-request/input-text.php 2016-03-03 19:33:42 UTC (rev 2682)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -12,9 +12,16 @@
</span><span class="cx" style="display: block; padding: 0 10px"> name="<?php echo esc_attr( $name ); ?>"
</span><span class="cx" style="display: block; padding: 0 10px"> value="<?php echo esc_attr( $value ); ?>"
</span><span class="cx" style="display: block; padding: 0 10px"> <?php if ( $readonly ) { echo 'readonly="readonly"'; } ?>
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php __checked_selected_helper( $required, true, true, 'required' ); ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> class="regular-text"
</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">+ <?php
+ if ( $required ) {
+ WordCamp_Budgets::render_form_field_required_indicator();
+ }
+ ?>
+
</ins><span class="cx" style="display: block; padding: 0 10px"> <?php if ( ! empty( $description ) ) : ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <label for="<?php echo esc_attr( $name ); ?>">
</span><span class="cx" style="display: block; padding: 0 10px"> <p class="description"><?php echo esc_html( $description ); ?></p>
</span></span></pre></div>
<a id="sitestrunkwordcamporgpublic_htmlwpcontentpluginswordcamppaymentsviewspaymentrequestinputtextareaphp"></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/input-textarea.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/input-textarea.php 2016-03-03 19:26:13 UTC (rev 2681)
+++ sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-payments/views/payment-request/input-textarea.php 2016-03-03 19:33:42 UTC (rev 2682)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -6,10 +6,21 @@
</span><span class="cx" style="display: block; padding: 0 10px"> </th>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <td>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <textarea id="<?php echo esc_attr( $name ); ?>" name="<?php echo esc_attr( $name ); ?>" class="large-text"><?php
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <textarea
+ id="<?php echo esc_attr( $name ); ?>"
+ name="<?php echo esc_attr( $name ); ?>"
+ class="large-text"
+ <?php __checked_selected_helper( $required, true, true, 'required' ); ?>
+ ><?php
</ins><span class="cx" style="display: block; padding: 0 10px"> echo esc_html( $text );
</span><span class="cx" style="display: block; padding: 0 10px"> ?></textarea>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php
+ if ( $required ) {
+ WordCamp_Budgets::render_form_field_required_indicator();
+ }
+ ?>
+
</ins><span class="cx" style="display: block; padding: 0 10px"> <?php if ( ! empty( $description ) ) : ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <label for="<?php echo esc_attr( $name ); ?>">
</span><span class="cx" style="display: block; padding: 0 10px"> <p class="description"><?php echo esc_html( $description ); ?></p>
</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-03-03 19:26:13 UTC (rev 2681)
+++ sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-payments/views/payment-request/metabox-general.php 2016-03-03 19:33:42 UTC (rev 2682)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -23,3 +23,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <?php $this->render_files_input( $post, 'Files', 'files', __( 'Attach supporting documentation including invoices, contracts, or other vendor correspondence. If no supporting documentation is available, please indicate the reason in the notes below.', 'wordcamporg' ) ); ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php $this->render_textarea_input( $post, 'Notes', 'general_notes', 'Any other details you want to share.' ); ?>
</span><span class="cx" style="display: block; padding: 0 10px"> </table>
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+<p class="wcb-form-required">
+ <?php _e( '* required', 'wordcamporg' ); ?>
+</p>
</ins></span></pre></div>
<a id="sitestrunkwordcamporgpublic_htmlwpcontentpluginswordcamppaymentsviewspaymentrequestmetaboxpaymentphp"></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-payment.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-payment.php 2016-03-03 19:26:13 UTC (rev 2681)
+++ sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-payments/views/payment-request/metabox-payment.php 2016-03-03 19:33:42 UTC (rev 2682)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -8,7 +8,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</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 if ( $box['args']['show_vendor_requested_payment_method'] ) : ?>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <?php $this->render_textarea_input( $post, 'Did the vendor request a specific type of payment?', 'vendor_requested_payment_method', 'Add any relevant details' ); ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php $this->render_textarea_input( $post, 'Did the vendor request a specific type of payment?', 'vendor_requested_payment_method', 'Add any relevant details', false ); ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> <?php endif;?>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php $this->render_radio_input( $post, 'Payment Method', 'payment_method' ); ?>
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -76,7 +76,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'needs_intermediary_bank'
</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">- <table>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <table id="intermediary_bank_fields">
</ins><span class="cx" style="display: block; padding: 0 10px"> <?php $this->render_text_input( $post, 'Intermediary Bank Name', 'interm_bank_name' ); ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php $this->render_text_input( $post, 'Intermediary Bank Street Address', 'interm_bank_street_address' ); ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php $this->render_text_input( $post, 'Intermediary Bank City', 'interm_bank_city' ); ?>
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -103,3 +103,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> </table>
</span><span class="cx" style="display: block; padding: 0 10px"> </div>
</span><span class="cx" style="display: block; padding: 0 10px"> </fieldset>
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+<p class="wcb-form-required">
+ <?php _e( '* required', 'wordcamporg' ); ?>
+</p>
</ins></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-03-03 19:26:13 UTC (rev 2681)
+++ sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-payments/views/payment-request/metabox-status.php 2016-03-03 19:33:42 UTC (rev 2682)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -28,7 +28,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php if ( $post->post_status != 'auto-draft' ) : ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <div class="misc-pub-section">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <?php $this->render_text_input( $post, 'Date Vendor was Paid', 'date_vendor_paid', '', 'date', array(), $date_vendor_paid_readonly ); ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php $this->render_text_input( $post, 'Date Vendor was Paid', 'date_vendor_paid', '', 'date', array(), $date_vendor_paid_readonly, false ); ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> </div>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <div class="misc-pub-section misc-pub-post-status">
</span></span></pre></div>
<a id="sitestrunkwordcamporgpublic_htmlwpcontentpluginswordcamppaymentsviewspaymentrequestmetaboxvendorphp"></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-vendor.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-vendor.php 2016-03-03 19:26:13 UTC (rev 2681)
+++ sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-payments/views/payment-request/metabox-vendor.php 2016-03-03 19:33:42 UTC (rev 2682)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -12,3 +12,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->render_country_input( $post, 'Country ISO3166', 'vendor_country_iso3166' );
</span><span class="cx" style="display: block; padding: 0 10px"> ?>
</span><span class="cx" style="display: block; padding: 0 10px"> </table>
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+<p class="wcb-form-required">
+ <?php _e( '* required', 'wordcamporg' ); ?>
+</p>
</ins></span></pre></div>
<a id="sitestrunkwordcamporgpublic_htmlwpcontentpluginswordcamppaymentsviewswordcampbudgetsformfieldrequiredindicatorphp"></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/wordcamp-budgets/form-field-required-indicator.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/wordcamp-budgets/form-field-required-indicator.php 2016-03-03 19:26:13 UTC (rev 2681)
+++ sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-payments/views/wordcamp-budgets/form-field-required-indicator.php 2016-03-03 19:33:42 UTC (rev 2682)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,9 +1,11 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-<span class="wcb-form-required" aria-hidden="true">
- <?php // translators: The symbol to indicate the form field is required ?>
- <?php _e( '*', 'wordcamporg' ); ?>
-</span>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+<span class="wcb-form-required">
+ <span aria-hidden="true">
+ <?php // translators: The symbol to indicate the form field is required ?>
+ <?php _e( '*', 'wordcamporg' ); ?>
+ </span>
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-<span class="screen-reader-text">
- <?php _e( 'required field', 'wordcamporg' ); ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <span class="screen-reader-text">
+ <?php _e( 'required field', 'wordcamporg' ); ?>
+ </span>
</ins><span class="cx" style="display: block; padding: 0 10px"> </span>
</span></span></pre>
</div>
</div>
</body>
</html>