<!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>[2727] sites/trunk/wordcamp.org/public_html/wp-content/plugins/multi-event-sponsors: Multi Event Sponsors: Add new contact information fields.</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/2727">2727</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/2727","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-10 19:09:10 +0000 (Thu, 10 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'>Multi Event Sponsors: Add new contact information fields.</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_htmlwpcontentpluginsmultieventsponsorsviewsmetaboxcontactinformationphp">sites/trunk/wordcamp.org/public_html/wp-content/plugins/multi-event-sponsors/views/metabox-contact-information.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 2016-03-10 19:04:54 UTC (rev 2726)
+++ sites/trunk/wordcamp.org/public_html/wp-content/plugins/multi-event-sponsors/classes/mes-sponsor.php 2016-03-10 19:09:10 UTC (rev 2727)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -106,9 +106,23 @@
</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 'mes_contact_information':
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $company_name = get_post_meta( $post->ID, 'mes_company_name', true );
+ $website = get_post_meta( $post->ID, 'mes_website', true );
</ins><span class="cx" style="display: block; padding: 0 10px"> $first_name = get_post_meta( $post->ID, 'mes_first_name', true );
</span><span class="cx" style="display: block; padding: 0 10px"> $last_name = get_post_meta( $post->ID, 'mes_last_name', true );
</span><span class="cx" style="display: block; padding: 0 10px"> $email_address = get_post_meta( $post->ID, 'mes_email_address', true );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $phone_number = get_post_meta( $post->ID, 'mes_phone_number', true );
+
+ $street_address1 = get_post_meta( $post->ID, 'mes_street_address1', true );
+ $street_address2 = get_post_meta( $post->ID, 'mes_street_address2', true );
+ $city = get_post_meta( $post->ID, 'mes_city', true );
+ $state = get_post_meta( $post->ID, 'mes_state', true );
+ $zip_code = get_post_meta( $post->ID, 'mes_zip_code', true );
+ $country = get_post_meta( $post->ID, 'mes_country', true );
+
+ $available_countries = array( 'Abkhazia', 'Afghanistan', 'Aland', 'Albania', 'Algeria', 'American Samoa', 'Andorra', 'Angola', 'Anguilla', 'Antigua and Barbuda', 'Argentina', 'Armenia', 'Aruba', 'Ascension', 'Ashmore and Cartier Islands', 'Australia', 'Australian Antarctic Territory', 'Austria', 'Azerbaijan', 'Bahamas, The', 'Bahrain', 'Baker Island', 'Bangladesh', 'Barbados', 'Belarus', 'Belgium', 'Belize', 'Benin', 'Bermuda', 'Bhutan', 'Bolivia', 'Bosnia and Herzegovina', 'Botswana', 'Bouvet Island', 'Brazil', 'British Antarctic Territory', 'British Indian Ocean Territory', 'British Sovereign Base Areas', 'British Virgin Islands', 'Brunei', 'Bulgaria', 'Burkina Faso', 'Burundi', 'Cambodia', 'Cameroon', 'Canada', 'Cape Verde', 'Cayman Islands', 'Central African Republic', 'Chad', 'Chile', "China, People's Republic of", 'China, Republic of (Taiwan)', 'Christmas Island', 'Clipperton Island', 'Cocos (Keeling) Islands', 'Colombia', 'Comoros', 'Congo, (Congo Brazzaville
)', 'Congo, (Congo Kinshasa)', 'Cook Islands', 'Coral Sea Islands', 'Costa Rica', "Cote d'Ivoire (Ivory Coast)", 'Croatia', 'Cuba', 'Cyprus', 'Czech Republic', 'Denmark', 'Djibouti', 'Dominica', 'Dominican Republic', 'Ecuador', 'Egypt', 'El Salvador', 'Equatorial Guinea', 'Eritrea', 'Estonia', 'Ethiopia', 'Falkland Islands (Islas Malvinas)', 'Faroe Islands', 'Fiji', 'Finland', 'France', 'French Guiana', 'French Polynesia', 'French Southern and Antarctic Lands', 'Gabon', 'Gambia, The', 'Georgia', 'Germany', 'Ghana', 'Gibraltar', 'Greece', 'Greenland', 'Grenada', 'Guadeloupe', 'Guam', 'Guatemala', 'Guernsey', 'Guinea', 'Guinea-Bissau', 'Guyana', 'Haiti', 'Heard Island and McDonald Islands', 'Honduras', 'Hong Kong', 'Howland Island', 'Hungary', 'Iceland', 'India', 'Indonesia', 'Iran', 'Iraq', 'Ireland', 'Isle of Man', 'Israel', 'Italy', 'Jamaica', 'Japan', 'Jarvis Island', 'Jersey', 'Johnston Atoll', 'Jordan', 'Kazakhstan', 'Kenya', 'Kingman Reef', 'Kiribati', 'Korea, Nort
h', 'Korea, South', 'Kuwait', 'Kyrgyzstan', 'Laos', 'Latvia', 'Lebanon', 'Lesotho', 'Liberia', 'Libya', 'Liechtenstein', 'Lithuania', 'Luxembourg', 'Macau', 'Macedonia', 'Madagascar', 'Malawi', 'Malaysia', 'Maldives', 'Mali', 'Malta', 'Marshall Islands', 'Martinique', 'Mauritania', 'Mauritius', 'Mayotte', 'Mexico', 'Micronesia', 'Midway Islands', 'Moldova', 'Monaco', 'Mongolia', 'Montenegro', 'Montserrat', 'Morocco', 'Mozambique', 'Myanmar (Burma)', 'Nagorno-Karabakh', 'Namibia', 'Nauru', 'Navassa Island', 'Nepal', 'Netherlands', 'Netherlands Antilles', 'New Caledonia', 'New Zealand', 'Nicaragua', 'Niger', 'Nigeria', 'Niue', 'Norfolk Island', 'Northern Cyprus', 'Northern Mariana Islands', 'Norway', 'Oman', 'Pakistan', 'Palau', 'Palmyra Atoll', 'Panama', 'Papua New Guinea', 'Paraguay', 'Peru', 'Peter I Island', 'Philippines', 'Pitcairn Islands', 'Poland', 'Portugal', 'Pridnestrovie (Transnistria)', 'Puerto Rico', 'Qatar', 'Queen Maud Land', 'Reunion', 'Romania', 'Ross Dependency', 'R
ussia', 'Rwanda', 'Saint Barthelemy', 'Saint Helena', 'Saint Kitts and Nevis', 'Saint Lucia', 'Saint Martin', 'Saint Pierre and Miquelon', 'Saint Vincent and the Grenadines', 'Samoa', 'San Marino', 'Sao Tome and Principe', 'Saudi Arabia', 'Senegal', 'Serbia', 'Seychelles', 'Sierra Leone', 'Singapore', 'Slovakia', 'Slovenia', 'Solomon Islands', 'Somalia', 'Somaliland', 'South Africa', 'South Georgia & South Sandwich Islands', 'South Ossetia', 'Spain', 'Sri Lanka', 'Sudan', 'Suriname', 'Svalbard', 'Swaziland', 'Sweden', 'Switzerland', 'Syria', 'Tajikistan', 'Tanzania', 'Thailand', 'Timor-Leste (East Timor)', 'Togo', 'Tokelau', 'Tonga', 'Trinidad and Tobago', 'Tristan da Cunha', 'Tunisia', 'Turkey', 'Turkmenistan', 'Turks and Caicos Islands', 'Tuvalu', 'U.S. Virgin Islands', 'Uganda', 'Ukraine', 'United Arab Emirates', 'United Kingdom', 'United States', 'Uruguay', 'Uzbekistan', 'Vanuatu', 'Vatican City', 'Venezuela', 'Vietnam', 'Wake Island', 'Wallis and Futuna', 'Yemen', 'Zambia',
'Zimbabwe' );
+ // todo use WordCamp_Budgets::get_valid_countries_iso3166() instead. have to convert wc-post-types::metabox_sponsor_info() at same time
+
</ins><span class="cx" style="display: block; padding: 0 10px"> $view = 'metabox-contact-information.php';
</span><span class="cx" style="display: block; padding: 0 10px"> break;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -181,7 +195,8 @@
</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"> $text_fields = array(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'first_name', 'last_name', 'email_address',
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'company_name', 'website', 'first_name', 'last_name', 'email_address', 'phone_number',
+ 'street_address1', 'street_address2', 'city', 'state', 'zip_code', 'country'
</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"> foreach ( $text_fields as $field ) {
</span></span></pre></div>
<a id="sitestrunkwordcamporgpublic_htmlwpcontentpluginsmultieventsponsorsviewsmetaboxcontactinformationphp"></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/views/metabox-contact-information.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/views/metabox-contact-information.php 2016-03-10 19:04:54 UTC (rev 2726)
+++ sites/trunk/wordcamp.org/public_html/wp-content/plugins/multi-event-sponsors/views/metabox-contact-information.php 2016-03-10 19:09:10 UTC (rev 2727)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,10 +1,24 @@
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-<?php /** @var $first_name string */ ?>
-<?php /** @var $last_name string */ ?>
-<?php /** @var $email_address string */ ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+<h4><?php _e( 'Contact Information', 'wordcamporg' ); ?></h4>
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <table>
</span><span class="cx" style="display: block; padding: 0 10px"> <tbody>
</span><span class="cx" style="display: block; padding: 0 10px"> <tr>
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <th><label for="mes_company_name"><?php _e( 'Company Name:', 'wordcamporg' ); ?></label></th>
+
+ <td>
+ <input id="mes_company_name" name="mes_company_name" type="text" value="<?php echo esc_attr( $company_name ); ?>" required class="regular-text" />
+ </td>
+ </tr>
+
+ <tr>
+ <th><label for="mes_website"><?php _e( 'Website:', 'wordcamporg' ); ?></label></th>
+
+ <td>
+ <input id="mes_website" name="mes_website" type="url" value="<?php echo esc_attr( $website ); ?>" required class="regular-text" />
+ </td>
+ </tr>
+
+ <tr>
</ins><span class="cx" style="display: block; padding: 0 10px"> <th><label for="mes_first_name"><?php _e( 'First Name:', 'wordcamporg' ); ?></label></th>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <td>
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -27,5 +41,77 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <input id="mes_email_address" name="mes_email_address" type="email" value="<?php echo esc_attr( $email_address ); ?>" class="regular-text" />
</span><span class="cx" style="display: block; padding: 0 10px"> </td>
</span><span class="cx" style="display: block; padding: 0 10px"> </tr>
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ <tr>
+ <th><label for="mes_phone_number"><?php _e( 'Phone Number:', 'wordcamporg' ); ?></label></th>
+
+ <td>
+ <input id="mes_phone_number" name="mes_phone_number" type="text" value="<?php echo esc_attr( $phone_number ); ?>" required class="regular-text" />
+ </td>
+ </tr>
</ins><span class="cx" style="display: block; padding: 0 10px"> </tbody>
</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">+
+<h4><?php _e( 'Address', 'wordcamporg' ); ?></h4>
+
+<table>
+ <tbody>
+ <tr>
+ <th><label for="mes_street_address1"><?php _e( 'Street Address 1:', 'wordcamporg' ); ?></label></th>
+
+ <td>
+ <input id="mes_street_address1" name="mes_street_address1" type="text" value="<?php echo esc_attr( $street_address1 ); ?>" required class="regular-text" />
+ </td>
+ </tr>
+
+ <tr>
+ <th><label for="mes_street_address2"><?php _e( 'Street Address 2:', 'wordcamporg' ); ?></label></th>
+
+ <td>
+ <input id="mes_street_address2" name="mes_street_address2" type="text" value="<?php echo esc_attr( $street_address2 ); ?>" class="regular-text" />
+ </td>
+ </tr>
+
+ <tr>
+ <th><label for="mes_city"><?php _e( 'City:', 'wordcamporg' ); ?></label></th>
+
+ <td>
+ <input id="mes_city" name="mes_city" type="text" value="<?php echo esc_attr( $city ); ?>" required class="regular-text" />
+ </td>
+ </tr>
+
+ <tr>
+ <th><label for="mes_state"><?php _e( 'State:', 'wordcamporg' ); ?></label></th>
+
+ <td>
+ <input id="mes_state" name="mes_state" type="text" value="<?php echo esc_attr( $state ); ?>" required class="regular-text" />
+ </td>
+ </tr>
+
+ <tr>
+ <th><label for="mes_zip_code"><?php _e( 'Zip Code:', 'wordcamporg' ); ?></label></th>
+
+ <td>
+ <input id="mes_zip_code" name="mes_zip_code" type="text" value="<?php echo esc_attr( $zip_code ); ?>" required class="regular-text" />
+ </td>
+ </tr>
+
+ <tr>
+ <th><label for="mes_country"><?php _e( 'Country:', 'wordcamporg' ); ?></label></th>
+
+ <td>
+ <select id="mes_country" name="mes_country">
+ <option value="" <?php selected( $country, '' ); ?>>
+ <?php _e( '-- Select a Country --', 'wordcamporg' ); ?>
+ </option>
+
+ <?php foreach ( $available_countries as $available_country ) : ?>
+ <option value="<?php echo esc_attr( $available_country ); ?>" <?php selected( $available_country, $country ); ?>>
+ <?php echo esc_html( $available_country ); ?>
+ </option>
+ <?php endforeach; ?>
+ </select>
+ </td>
+ </tr>
+ </tbody>
+</table>
</ins></span></pre>
</div>
</div>
</body>
</html>