<!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>[5773] sites/trunk/wordcamp.org/public_html/wp-content/plugins: WordCamp Sponsors: Integrate multi-event agreements in sponsor posts</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/5773">5773</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/5773","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>coreymckrill</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2017-08-08 01:24:41 +0000 (Tue, 08 Aug 2017)</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 Sponsors: Integrate multi-event agreements in sponsor posts
Multi-event sponsors get copied to individual WC sites, but they
don't need to have a separate sponsor agreement for each camp.
Instead, this links to the multi-event agreement if one is available.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#sitestrunkwordcamporgpublic_htmlwpcontentpluginsmultieventsponsorsclassesmessponsorphp">sites/trunk/wordcamp.org/public_html/wp-content/plugins/multi-event-sponsors/classes/mes-sponsor.php</a></li>
<li><a href="#sitestrunkwordcamporgpublic_htmlwpcontentpluginswcposttypesjswcbsponjs">sites/trunk/wordcamp.org/public_html/wp-content/plugins/wc-post-types/js/wcb-spon.js</a></li>
<li><a href="#sitestrunkwordcamporgpublic_htmlwpcontentpluginswcposttypesviewssponsorsmetaboxsponsoragreementphp">sites/trunk/wordcamp.org/public_html/wp-content/plugins/wc-post-types/views/sponsors/metabox-sponsor-agreement.php</a></li>
<li><a href="#sitestrunkwordcamporgpublic_htmlwpcontentpluginswcposttypeswcposttypesphp">sites/trunk/wordcamp.org/public_html/wp-content/plugins/wc-post-types/wc-post-types.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="sitestrunkwordcamporgpublic_htmlwpcontentpluginsmultieventsponsorsclassesmessponsorphp"></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/multi-event-sponsors/classes/mes-sponsor.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/multi-event-sponsors/classes/mes-sponsor.php 2017-08-08 01:24:36 UTC (rev 5772)
+++ sites/trunk/wordcamp.org/public_html/wp-content/plugins/multi-event-sponsors/classes/mes-sponsor.php 2017-08-08 01:24:41 UTC (rev 5773)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -138,6 +138,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> case 'sponsor-agreement':
</span><span class="cx" style="display: block; padding: 0 10px"> $agreement_id = get_post_meta( $post->ID, 'mes_sponsor_agreement', true );
</span><span class="cx" style="display: block; padding: 0 10px"> $agreement_url = wp_get_attachment_url( $agreement_id );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $mes_id = false;
</ins><span class="cx" style="display: block; padding: 0 10px"> $view = 'metabox-sponsor-agreement.php';
</span><span class="cx" style="display: block; padding: 0 10px"> break;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre></div>
<a id="sitestrunkwordcamporgpublic_htmlwpcontentpluginswcposttypesjswcbsponjs"></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/wc-post-types/js/wcb-spon.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/wc-post-types/js/wcb-spon.js 2017-08-08 01:24:36 UTC (rev 5772)
+++ sites/trunk/wordcamp.org/public_html/wp-content/plugins/wc-post-types/js/wcb-spon.js 2017-08-08 01:24:41 UTC (rev 5773)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -31,7 +31,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> var attachment = self.frame.state().get( 'selection' ).first().toJSON();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> self.$input.val( attachment.id );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- self.elements.$view.find( 'a' ).first().attr( 'href', attachment.url );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ self.elements.$view.find( 'a' ).first().attr( 'href', attachment.url ).removeClass( 'hidden' );
</ins><span class="cx" style="display: block; padding: 0 10px"> self.toggleElements();
</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">@@ -62,15 +62,23 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * Toggle the visibility of metabox elements based on the value of the hidden field.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * If the hidden field is disabled, it means the sponsor is a multi-event sponsor, so a
+ * camp-specific agreement should not be added.
+ *
</ins><span class="cx" style="display: block; padding: 0 10px"> * @returns {wcbSponsors.view.Agreement}
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> toggleElements: function() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- var agreementId = this.$input.val(),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ var isMES = this.$input.is( ':disabled' ),
+ agreementId = this.$input.val(),
</ins><span class="cx" style="display: block; padding: 0 10px"> $uiWithoutAgreement = this.elements.$upload.add( this.elements.$description ),
</span><span class="cx" style="display: block; padding: 0 10px"> $uiWithAgreement = this.elements.$view.add( this.elements.$remove );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( agreementId ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( isMES ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $uiWithoutAgreement.hide();
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ this.elements.$remove.hide();
+ this.elements.$view.show();
+ } else if ( agreementId ) {
+ $uiWithoutAgreement.hide();
</ins><span class="cx" style="display: block; padding: 0 10px"> $uiWithAgreement.show();
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> $uiWithoutAgreement.show();
</span></span></pre></div>
<a id="sitestrunkwordcamporgpublic_htmlwpcontentpluginswcposttypesviewssponsorsmetaboxsponsoragreementphp"></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/wc-post-types/views/sponsors/metabox-sponsor-agreement.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/wc-post-types/views/sponsors/metabox-sponsor-agreement.php 2017-08-08 01:24:36 UTC (rev 5772)
+++ sites/trunk/wordcamp.org/public_html/wp-content/plugins/wc-post-types/views/sponsors/metabox-sponsor-agreement.php 2017-08-08 01:24:41 UTC (rev 5773)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,8 +1,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><span class="cx" style="display: block; padding: 0 10px"> /* @var int $agreement_id */
</span><span class="cx" style="display: block; padding: 0 10px"> /* @var string $agreement_url */
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+/* @var int $mes_id */
</ins><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 ( $mes_id ) : ?>
+ <p class="description"><?php _e( 'This sponsor has a multi-event agreement.', 'wordcamporg' ); ?></p>
+<?php endif; ?>
+
</ins><span class="cx" style="display: block; padding: 0 10px"> <p id="sponsor-agreement-description-container" class="description hidden">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><span class="cx" style="display: block; padding: 0 10px"> printf(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -22,10 +27,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> </p>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <p id="sponsor-agreement-view-container" class="hidden">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <a id="sponsor-agreement-view" class="button secondary" href="<?php echo esc_url( $agreement_url ); ?>" target="sponsor-agreement"><?php esc_html_e( 'View Agreement', 'wordcamporg' ); ?></a>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <a id="sponsor-agreement-view" class="button secondary<?php if ( ! $agreement_url ) echo ' hidden'; ?>" href="<?php echo esc_url( $agreement_url ); ?>" target="sponsor-agreement"><?php esc_html_e( 'View Agreement', 'wordcamporg' ); ?></a>
</ins><span class="cx" style="display: block; padding: 0 10px"> </p>
</span><span class="cx" style="display: block; padding: 0 10px"> <p id="sponsor-agreement-remove-container" class="hidden">
</span><span class="cx" style="display: block; padding: 0 10px"> <a id="sponsor-agreement-remove" href="#"><?php esc_html_e( 'Remove Agreement', 'wordcamporg' ); ?></a>
</span><span class="cx" style="display: block; padding: 0 10px"> </p>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-<input id="sponsor-agreement-id" name="_wcpt_sponsor_agreement" type="hidden" value="<?php echo esc_attr( $agreement_id ); ?>" />
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+<input id="sponsor-agreement-id" name="_wcpt_sponsor_agreement" type="hidden" value="<?php echo esc_attr( $agreement_id ); ?>" <?php disabled( $mes_id > 0 ); ?> />
</ins></span></pre></div>
<a id="sitestrunkwordcamporgpublic_htmlwpcontentpluginswcposttypeswcposttypesphp"></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/wc-post-types/wc-post-types.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/wc-post-types/wc-post-types.php 2017-08-08 01:24:36 UTC (rev 5772)
+++ sites/trunk/wordcamp.org/public_html/wp-content/plugins/wc-post-types/wc-post-types.php 2017-08-08 01:24:41 UTC (rev 5773)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1696,6 +1696,21 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $agreement_id = get_post_meta( $sponsor->ID, '_wcpt_sponsor_agreement', true );
</span><span class="cx" style="display: block; padding: 0 10px"> $agreement_url = wp_get_attachment_url( $agreement_id );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $mes_id = get_post_meta( $sponsor->ID, '_mes_id', true );
+
+ if ( $mes_id ) {
+ switch_to_blog( BLOG_ID_CURRENT_SITE ); // central.wordcamp.org
+
+ $mes_agreement_id = get_post_meta( $mes_id, 'mes_sponsor_agreement', true );
+ if ( $mes_agreement_id ) {
+ $agreement_url = wp_get_attachment_url( $mes_agreement_id );
+ } else {
+ $agreement_url = '';
+ }
+
+ restore_current_blog();
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> require_once( __DIR__ . '/views/sponsors/metabox-sponsor-agreement.php' );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre>
</div>
</div>
</body>
</html>