r104989 MediaWiki - Code Review archive

Repository:MediaWiki
Revision:< r104988‎ | r104989 | r104990 >
Date:19:02, 2 December 2011
Author:pgehres
Status:ok (Comments)
Tags:
Comment:
Fixing inclusion of default template for RapidHtml blocks. Adding base cc template for world.
Modified paths:
  • /trunk/extensions/DonationInterface/gateway_forms/RapidHtml.php (modified) (history)
  • /trunk/extensions/DonationInterface/globalcollect_gateway/forms/css/gc.cc.css (modified) (history)
  • /trunk/extensions/DonationInterface/globalcollect_gateway/forms/html/_personal-information/default.html (modified) (history)
  • /trunk/extensions/DonationInterface/globalcollect_gateway/forms/html/cc/cc.html (added) (history)

Diff [purge]

Index: trunk/extensions/DonationInterface/gateway_forms/RapidHtml.php
——@@ -287,7 +287,7 @@
288288 # doing this before transclusion so that tokens can be used in the templates
289289 $matches = array();
290290 preg_match_all( "/
291 - {%\ block\ ([a-zA-Z0-9_-]+)\ ([a-zA-Z0-9_-]*)%} # look for the start block and switching variable
 291+ {%\ block\ ([a-zA-Z0-9_-]+)\ ([a-zA-Z0-9_-]*)([\ ]*)%} # look for the start block and switching variable
292292 /xis", $html, $matches ); # flags to ignore whitespace in regex and match \n with . (s)
293293
294294 foreach( $matches[ 1 ] as $i => $key ){
——@@ -308,6 +308,10 @@
309309 # replace the template block with the actual template
310310 $template = file_get_contents( $filepath . $var . '.html' );
311311 $html = str_replace( $matches[ 0 ][ $i ], $template, $html );
 312+ } elseif( file_exists( $filepath . 'default.html' ) ){
 313+ # replace the template block with the default template
 314+ $template = file_get_contents( $filepath . 'default.html' );
 315+ $html = str_replace( $matches[ 0 ][ $i ], $template, $html );
312316 } else {
313317 # replace the template call with nothing at all
314318 $html = str_replace( $matches[ 0 ][ $i ], '', $html );
Index: trunk/extensions/DonationInterface/globalcollect_gateway/forms/html/cc/cc.html
——@@ -0,0 +1,111 @@
 2+<script type="text/javascript">
 3+ mw.loader.load('gc.form.rapidhtml.cc');
 4+ // these must go through RapidHTML and thus are inline
 5+ var amountErrors = ['#general|escape','#retryMsg|escape','#amount|escape'];
 6+ var billingErrors = ['#fname|escape','#lname|escape','#city|escape','#country|escape','#street|escape','#state|escape','#zip|escape','#emailAdd|escape'];
 7+ var paymentErrors = ['#card_num|escape','#card_type|escape','#cvv|escape'];
 8+ var actionURL = "@action";
 9+ var scriptPath = "@script_path";
 10+</script>
 11+
 12+<table width="100%" cellspacing="0" cellpadding="0" border="0">
 13+ <tbody>
 14+ <tr>
 15+ <td id="appeal" valign="top">
 16+ {{LanguageSwitch|2011FR/@appeal/text|@language}}
 17+ </td>
 18+ <td id="donate" valign="top">
 19+ <div id="greenBackground" class="">
 20+ <noscript>
 21+ <div id="noscript">
 22+ <p id="noscript-msg">It appears that you do not have JavaScript enabled, or your browser does not support it. In order to provide a safe, secure and pleasant experience, our donation form requires JavaScript.</p><p id="noscript-redirect-msg">If you cannot or do not wish to enable JavaScript, you may still contribute by visiting:</p><p id="noscript-redirect-link"><a href="http://wikimediafoundation.org/wiki/DonateNonJS/en">http://wikimediafoundation.org/wiki/DonateNonJS/en</a></p>
 23+ </div>
 24+ </noscript>
 25+ <p id="topError" class="creditcard-error-msg"></p>
 26+
 27+ <form name="payment" method="post" action="@action">
 28+ <div id="payflowpro_gateway-personal-info">
 29+ <table id="payflow-table-donor">
 30+ <tbody>
 31+ <tr>
 32+ <td colspan="2">
 33+ <div id="step1header">
 34+ <h3 class="amount_header">Donation amount: <span id="selected-amount">@amount @currency_code</span></h3>
 35+ </div>
 36+ </td>
 37+ </tr>
 38+ {% block personal-information country %}
 39+ <tr>
 40+ <td>
 41+ <dl class="">
 42+ <dd class="field" style="margin-bottom: 0; margin-left: 0;">
 43+ <ul class="options-h" id="cards" style="margin: 0;">
 44+ <li><input id="cc-visa" name="cardtype" type="radio" value="visa" class="cardradio" /> <label for="cc-visa"><img alt="Visa" src="@script_path/extensions/DonationInterface/gateway_forms/includes/card-visa.png" /></label></li>
 45+ <li><input id="cc-mastercard" name="cardtype" type="radio" value="mastercard" class="cardradio" /> <label for="cc-mastercard"><img alt="MasterCard" src="@script_path/extensions/DonationInterface/gateway_forms/includes/card-mastercard.png" /></label></li>
 46+ <!--<li><input id="cc-amex" name="cardtype" type="radio" value="american" class="cardradio" /> <label for="cc-amex"><img alt="American Express" src="@script_path/extensions/DonationInterface/gateway_forms/includes/card-amex.png" /></label></li>-->
 47+ <!--<li><input id="cc-discover" name="cardtype" type="radio" value="discover" class="cardradio" /> <label for="cc-discover"><img alt="Discover" src="@script_path/extensions/DonationInterface/gateway_forms/includes/card-discover.png" /></label></li>-->
 48+ </ul>
 49+ <div id="paymentContinue" style="margin-top: 10px; display: none;"> <input class="btn" id="paymentContinueBtn" type="button" value="%donate_interface-continue%" /></div>
 50+ </dd>
 51+ </dl>
 52+ </td>
 53+ </tr>
 54+ <tr>
 55+ <td>
 56+ <div id="payment" class="gainlayout" style="height:0px;text-align:center;"></div>
 57+ </td>
 58+ </tr>
 59+ <tr>
 60+ <td>
 61+ <div class="mw-donate-submessage" id="payflowpro_gateway-donate-submessage">
 62+ <img src="@script_path/extensions/DonationInterface/gateway_forms/includes/padlock.gif" style="vertical-align:baseline;margin-right:4px;">Your credit / debit card will be securely processed.
 63+ </div>
 64+ </td>
 65+ </tr>
 66+ </tbody>
 67+ </table>
 68+ </div>
 69+ <input type="hidden" name="gateway" value="payflowpro" id="gateway" />
 70+ <input type="hidden" name="returnto" value="Thank_You/en" />
 71+ <input type="hidden" value="0" name="PaypalRedirect" id="PaypalRedirect">
 72+ <input type="hidden" value="@amount" name="amount">
 73+ <input type="hidden" value="US" name="country" id="country" />
 74+ <input type="hidden" value="@expiration" name="expiration" id="expiration"/>
 75+ <input type="hidden" value="USD" name="currency_code" />
 76+ <input type="hidden" value="@utm_source" name="utm_source"/>
 77+ <input type="hidden" value="@utm_medium" name="utm_medium"/>
 78+ <input type="hidden" value="@utm_campaign" name="utm_campaign"/>
 79+ <input type="hidden" value="@language" name="language"/>
 80+ <input type="hidden" value="@referrer" name="referrer"/>
 81+ <input type="hidden" value="@comment" name="comment"/>
 82+ <input type="hidden" value="@comment-option" name="comment-option"/>
 83+ <input type="hidden" value="1" name="email-opt"/>
 84+ <input type="hidden" value="@token" name="token"/>
 85+ <input type="hidden" value="@order_id" name="order_id"/>
 86+ <input type="hidden" value="@numAttempt" name="numAttempt"/>
 87+ <input type="hidden" value="@contribution_tracking_id" name="contribution_tracking_id"/>
 88+ <input type="hidden" value="@data_hash" name="data_hash"/>
 89+ <input type="hidden" value="@owa_session" name="owa_session"/>
 90+ <input type="hidden" value="@owa_ref" name="owa_ref"/>
 91+ <input type="hidden" value="@gateway" name="gateway"/>
 92+ <input type="hidden" value="cc" name="payment_method"/>
 93+ </form>
 94+ </div>
 95+ <p id="informationsharing">%donate_interface-informationsharing|url%</p>
 96+ <table>
 97+ <tr>
 98+ <td>
 99+ <ul id="moreinfolinks">
 100+ <li><a href="http://wikimediafoundation.org/wiki/Special:LandingCheck?landing_page=Monthly_donations&language=@language&uselang=@language&country=@country">%donate_interface-monthly-donation%</a></li>
 101+ <li><a href="http://wikimediafoundation.org/wiki/Special:LandingCheck?landing_page=Ways_to_Give&language=@language&uselang=@language&country=@country">%donate_interface-otherways-short%</a></li>
 102+ <li><a href="http://wikimediafoundation.org/wiki/Special:LandingCheck?landing_page=FAQ&language=@language&uselang=@language&country=@country">%donate_interface-faqs%</a></li>
 103+ <li><a href="http://wikimediafoundation.org/wiki/Special:LandingCheck?landing_page=Tax_Deductibility&language=@language&uselang=@language&country=@country">%donate_interface-tax-info%</a></li>
 104+ </ul>
 105+ </td>
 106+ <td>@verisign_logo</td>
 107+ </tr>
 108+ </table>
 109+ </td>
 110+ </tr>
 111+ </tbody>
 112+</table>
Property changes on: trunk/extensions/DonationInterface/globalcollect_gateway/forms/html/cc/cc.html
___________________________________________________________________
Added: svn:eol-style
1113 + native
Index: trunk/extensions/DonationInterface/globalcollect_gateway/forms/html/_personal-information/default.html
——@@ -1,16 +1,39 @@
2 -<div class="name-fields">
3 - <span class="name-first"><input class="txt" id="fname" name="fname" title="%donate_interface-donor-fname%" value="@fname" placeholder="%donate_interface-donor-fname%"/></span>
4 - <span class="name-last"><input class="txt" id="lname" name="lname" title="%donate_interface-donor-lname%" value="@lname" placeholder="%donate_interface-donor-lname%"/></span>
5 -</div>
6 -<div class="loc-fields">
7 - <span class="loc-street"><input class="txt" id="street" name="street" title="%donate_interface-donor-street%" value="@street" placeholder="%donate_interface-donor-street%"/></span>
8 - <span class="loc-city"><input class="txt" id="city" name="city" title="%donate_interface-donor-city%" value="@city" placeholder="%donate_interface-donor-city%"/></span>
9 - <span class="loc-state">
10 - <select id="state" name="state" class="txt" value="@state" >
11 - <option value=""></option>
12 - <option value="AK">AK</option><option value="AL">AL</option><option value="AR">AR</option><option value="AZ">AZ</option><option value="CA">CA</option><option value="CO">CO</option><option value="CT">CT</option><option value="DC">DC</option><option value="DE">DE</option><option value="FL">FL</option><option value="GA">GA</option><option value="HI">HI</option><option value="IA">IA</option><option value="ID">ID</option><option value="IL">IL</option><option value="IN">IN</option><option value="KS">KS</option><option value="KY">KY</option><option value="LA">LA</option><option value="MA">MA</option><option value="MD">MD</option><option value="ME">ME</option><option value="MI">MI</option><option value="MN">MN</option><option value="MO">MO</option><option value="MS">MS</option><option value="MT">MT</option><option value="NC">NC</option><option value="ND">ND</option><option value="NE">NE</option><option value="NH">NH</option><option value="NJ">NJ</option><option value="NM">NM</option><option value="NV">NV</option><option value="NY">NY</option><option value="OH">OH</option><option value="OK">OK</option><option value="OR">OR</option><option value="PA">PA</option><option value="PR">PR</option><option value="RI">RI</option><option value="SC">SC</option><option value="SD">SD</option><option value="TN">TN</option><option value="TX">TX</option><option value="UT">UT</option><option value="VA">VA</option><option value="VT">VT</option><option value="WA">WA</option><option value="WI">WI</option><option value="WV">WV</option><option value="WY">WY</option><option value="AA">AA</option><option value="AE">AE</option><option value="AP">AP</option>
13 - </select>
14 - </span>
15 - <span class="loc-postal"><input class="txt" id="zip" name="zip" title="%donate_interface-zip%" value="@zip" placeholder="%donate_interface-donor-zip%"/></span> <!-- TODO: use postal code on non-US -->
16 -</div>
17 -<p><input class="txt" title="%donate_interface-donor-email%" id="emailAdd" name="emailAdd" value="@emailAdd" placeholder="%donate_interface-donor-email%"/></p>
\ No newline at end of file
 2+<tr>
 3+ <td colspan="2"><h3 class="cc_header">Billing information<img src="@script_path/extensions/DonationInterface/gateway_forms/includes/padlock.gif" style="vertical-align:baseline;margin-left:8px;"></h3></td>
 4+</tr>
 5+<tr>
 6+ <td colspan="2"><input name="fname" value="@fname" type="text" placeholder="%donate_interface-donor-fname%" id="fname"><input name="lname" value="@lname" type="text" placeholder="%donate_interface-donor-lname%" id="lname"></td>
 7+</tr>
 8+<tr>
 9+ <td colspan="2"><span class="creditcard-error-msg"></span></td>
 10+</tr>
 11+<tr>
 12+ <td colspan="2"><input name="street" value="@street" type="text" title="%donate_interface-donor-street%" placeholder="%donate_interface-donor-street%" id="street"></td>
 13+</tr>
 14+<tr>
 15+ <td colspan="2"><span class="creditcard-error-msg"></span></td>
 16+</tr>
 17+<tr>
 18+ <td colspan="2"><input name="city" value="@city" type="text" title="%donate_interface-donor-city%" placeholder="%donate_interface-donor-city%" id="city"><input name="zip" class="nostate" value="@zip" type="text" title="%donate_interface-postal%" placeholder="%donate_interface-donor-postal%" id="zip">
 19+ </td>
 20+</tr>
 21+<tr>
 22+ <td colspan="2">
 23+ <select class="txt" id="country" name="country" value="@country" placeholder="%donate_interface-country%">
 24+ <option value="">%donate_interface-select-country%</option>
 25+ <option value="AF">%donate_interface-country-dropdown-AF%</option><option value="AL">%donate_interface-country-dropdown-AL%</option><option value="DZ">%donate_interface-country-dropdown-DZ%</option><option value="AS">%donate_interface-country-dropdown-AS%</option><option value="AD">%donate_interface-country-dropdown-AD%</option><option value="AO">%donate_interface-country-dropdown-AO%</option><option value="AI">%donate_interface-country-dropdown-AI%</option><option value="AQ">%donate_interface-country-dropdown-AQ%</option><option value="AG">%donate_interface-country-dropdown-AG%</option><option value="AR">%donate_interface-country-dropdown-AR%</option><option value="AM">%donate_interface-country-dropdown-AM%</option><option value="AW">%donate_interface-country-dropdown-AW%</option><option value="AU">%donate_interface-country-dropdown-AU%</option><option value="AT">%donate_interface-country-dropdown-AT%</option><option value="AZ">%donate_interface-country-dropdown-AZ%</option><option value="BS">%donate_interface-country-dropdown-BS%</option><option value="BH">%donate_interface-country-dropdown-BH%</option><option value="BD">%donate_interface-country-dropdown-BD%</option><option value="BB">%donate_interface-country-dropdown-BB%</option><option value="BY">%donate_interface-country-dropdown-BY%</option><option value="BE">%donate_interface-country-dropdown-BE%</option><option value="BZ">%donate_interface-country-dropdown-BZ%</option><option value="BJ">%donate_interface-country-dropdown-BJ%</option><option value="BM">%donate_interface-country-dropdown-BM%</option><option value="BT">%donate_interface-country-dropdown-BT%</option>
 26+ <option value="BO">%donate_interface-country-dropdown-BO%</option><option value="BA">%donate_interface-country-dropdown-BA%</option><option value="BW">%donate_interface-country-dropdown-BW%</option><option value="BV">%donate_interface-country-dropdown-BV%</option><option value="BR">%donate_interface-country-dropdown-BR%</option><option value="IN">%donate_interface-country-dropdown-IN%</option><option value="BN">%donate_interface-country-dropdown-BN%</option><option value="BG">%donate_interface-country-dropdown-BG%</option><option value="BF">%donate_interface-country-dropdown-BF%</option><option value="BI">%donate_interface-country-dropdown-BI%</option><option value="KH">%donate_interface-country-dropdown-KH%</option><option value="CM">%donate_interface-country-dropdown-CM%</option><option value="CA">%donate_interface-country-dropdown-CA%</option><option value="CV">%donate_interface-country-dropdown-CV%</option><option value="KY">%donate_interface-country-dropdown-KY%</option><option value="CF">%donate_interface-country-dropdown-CF%</option><option value="TD">%donate_interface-country-dropdown-TD%</option><option value="CL">%donate_interface-country-dropdown-CL%</option><option value="CN">%donate_interface-country-dropdown-CN%</option><option value="CX">%donate_interface-country-dropdown-CX%</option><option value="CC">%donate_interface-country-dropdown-CC%</option><option value="CO">%donate_interface-country-dropdown-CO%</option><option value="KM">%donate_interface-country-dropdown-KM%</option><option value="CG">%donate_interface-country-dropdown-CG%</option><option value="CD">%donate_interface-country-dropdown-CD%</option>
 27+ <option value="CK">%donate_interface-country-dropdown-CK%</option><option value="CR">%donate_interface-country-dropdown-CR%</option><option value="HR">%donate_interface-country-dropdown-HR%</option><option value="CY">%donate_interface-country-dropdown-CY%</option><option value="CZ">%donate_interface-country-dropdown-CZ%</option><option value="CI">%donate_interface-country-dropdown-CI%</option><option value="DK">%donate_interface-country-dropdown-DK%</option><option value="DJ">%donate_interface-country-dropdown-DJ%</option><option value="DM">%donate_interface-country-dropdown-DM%</option><option value="DO">%donate_interface-country-dropdown-DO%</option><option value="EC">%donate_interface-country-dropdown-EC%</option><option value="EG">%donate_interface-country-dropdown-EG%</option><option value="SV">%donate_interface-country-dropdown-SV%</option><option value="GQ">%donate_interface-country-dropdown-GQ%</option><option value="ER">%donate_interface-country-dropdown-ER%</option><option value="EE">%donate_interface-country-dropdown-EE%</option><option value="ET">%donate_interface-country-dropdown-ET%</option><option value="FK">%donate_interface-country-dropdown-FK%</option><option value="FO">%donate_interface-country-dropdown-FO%</option><option value="FJ">%donate_interface-country-dropdown-FJ%</option><option value="FI">%donate_interface-country-dropdown-FI%</option><option value="FR">%donate_interface-country-dropdown-FR%</option><option value="GF">%donate_interface-country-dropdown-GF%</option><option value="PF">%donate_interface-country-dropdown-PF%</option><option value="TF">%donate_interface-country-dropdown-TF%</option>
 28+ <option value="GA">%donate_interface-country-dropdown-GA%</option><option value="GM">%donate_interface-country-dropdown-GM%</option><option value="GE">%donate_interface-country-dropdown-GE%</option><option value="DE">%donate_interface-country-dropdown-DE%</option><option value="GH">%donate_interface-country-dropdown-GH%</option><option value="GI">%donate_interface-country-dropdown-GI%</option><option value="GR">%donate_interface-country-dropdown-GR%</option><option value="GL">%donate_interface-country-dropdown-GL%</option><option value="GD">%donate_interface-country-dropdown-GD%</option><option value="GP">%donate_interface-country-dropdown-GP%</option><option value="GU">%donate_interface-country-dropdown-GU%</option><option value="GT">%donate_interface-country-dropdown-GT%</option><option value="GN">%donate_interface-country-dropdown-GN%</option><option value="GW">%donate_interface-country-dropdown-GW%</option><option value="GY">%donate_interface-country-dropdown-GY%</option><option value="HT">%donate_interface-country-dropdown-HT%</option><option value="HM">%donate_interface-country-dropdown-HM%</option><option value="VA">%donate_interface-country-dropdown-VA%</option><option value="HN">%donate_interface-country-dropdown-HN%</option><option value="HK">%donate_interface-country-dropdown-HK%</option><option value="HU">%donate_interface-country-dropdown-HU%</option><option value="IS">%donate_interface-country-dropdown-IS%</option><option value="IN">%donate_interface-country-dropdown-IN%</option><option value="ID">%donate_interface-country-dropdown-ID%</option><option value="IQ">%donate_interface-country-dropdown-IQ%</option>
 29+ <option value="IE">%donate_interface-country-dropdown-IE%</option><option value="IL">%donate_interface-country-dropdown-IL%</option><option value="IT">%donate_interface-country-dropdown-IT%</option><option value="JM">%donate_interface-country-dropdown-JM%</option><option value="JP">%donate_interface-country-dropdown-JP%</option><option value="JO">%donate_interface-country-dropdown-JO%</option><option value="KZ">%donate_interface-country-dropdown-KZ%</option><option value="KE">%donate_interface-country-dropdown-KE%</option><option value="KI">%donate_interface-country-dropdown-KI%</option><option value="KW">%donate_interface-country-dropdown-KW%</option><option value="KG">%donate_interface-country-dropdown-KG%</option><option value="LA">%donate_interface-country-dropdown-LA%</option><option value="LV">%donate_interface-country-dropdown-LV%</option><option value="LB">%donate_interface-country-dropdown-LB%</option><option value="LS">%donate_interface-country-dropdown-LS%</option><option value="LR">%donate_interface-country-dropdown-LR%</option><option value="LY">%donate_interface-country-dropdown-LY%</option><option value="LI">%donate_interface-country-dropdown-LI%</option><option value="LT">%donate_interface-country-dropdown-LT%</option><option value="LU">%donate_interface-country-dropdown-LU%</option><option value="MO">%donate_interface-country-dropdown-MO%</option><option value="MK">%donate_interface-country-dropdown-MK%</option><option value="MG">%donate_interface-country-dropdown-MG%</option><option value="MW">%donate_interface-country-dropdown-MW%</option><option value="MY">%donate_interface-country-dropdown-MY%</option>
 30+ <option value="MV">%donate_interface-country-dropdown-MV%</option><option value="ML">%donate_interface-country-dropdown-ML%</option><option value="MT">%donate_interface-country-dropdown-MT%</option><option value="MH">%donate_interface-country-dropdown-MH%</option><option value="MQ">%donate_interface-country-dropdown-MQ%</option><option value="MR">%donate_interface-country-dropdown-MR%</option><option value="MU">%donate_interface-country-dropdown-MU%</option><option value="YT">%donate_interface-country-dropdown-YT%</option><option value="MX">%donate_interface-country-dropdown-MX%</option><option value="FM">%donate_interface-country-dropdown-FM%</option><option value="MC">%donate_interface-country-dropdown-MC%</option><option value="MD">%donate_interface-country-dropdown-MD%</option><option value="MN">%donate_interface-country-dropdown-MN%</option><option value="ME">%donate_interface-country-dropdown-ME%</option><option value="MS">%donate_interface-country-dropdown-MS%</option><option value="MA">%donate_interface-country-dropdown-MA%</option><option value="MZ">%donate_interface-country-dropdown-MZ%</option><option value="MM">%donate_interface-country-dropdown-MM%</option><option value="NA">%donate_interface-country-dropdown-NA%</option><option value="NR">%donate_interface-country-dropdown-NR%</option><option value="NP">%donate_interface-country-dropdown-NP%</option><option value="NL">%donate_interface-country-dropdown-NL%</option><option value="AN">%donate_interface-country-dropdown-AN%</option><option value="NC">%donate_interface-country-dropdown-NC%</option><option value="NZ">%donate_interface-country-dropdown-NZ%</option><option value="NI">%donate_interface-country-dropdown-NI%</option>
 31+ <option value="NE">%donate_interface-country-dropdown-NE%</option><option value="NG">%donate_interface-country-dropdown-NG%</option><option value="NU">%donate_interface-country-dropdown-NU%</option><option value="NF">%donate_interface-country-dropdown-NF%</option><option value="KP">%donate_interface-country-dropdown-KP%</option><option value="MP">%donate_interface-country-dropdown-MP%</option><option value="NO">%donate_interface-country-dropdown-NO%</option><option value="OM">%donate_interface-country-dropdown-OM%</option><option value="PK">%donate_interface-country-dropdown-PK%</option><option value="PW">%donate_interface-country-dropdown-PW%</option><option value="PS">%donate_interface-country-dropdown-PS%</option><option value="PA">%donate_interface-country-dropdown-PA%</option><option value="PG">%donate_interface-country-dropdown-PG%</option><option value="PY">%donate_interface-country-dropdown-PY%</option><option value="PE">%donate_interface-country-dropdown-PE%</option><option value="PH">%donate_interface-country-dropdown-PH%</option><option value="PN">%donate_interface-country-dropdown-PN%</option><option value="PL">%donate_interface-country-dropdown-PL%</option><option value="PT">%donate_interface-country-dropdown-PT%</option><option value="PR">%donate_interface-country-dropdown-PR%</option><option value="QA">%donate_interface-country-dropdown-QA%</option><option value="RE">%donate_interface-country-dropdown-RE%</option><option value="RO">%donate_interface-country-dropdown-RO%</option><option value="RU">%donate_interface-country-dropdown-RU%</option><option value="RW">%donate_interface-country-dropdown-RW%</option>
 32+ <option value="SH">%donate_interface-country-dropdown-SH%</option><option value="KN">%donate_interface-country-dropdown-KN%</option><option value="LC">%donate_interface-country-dropdown-LC%</option><option value="PM">%donate_interface-country-dropdown-PM%</option><option value="VC">%donate_interface-country-dropdown-VC%</option><option value="WS">%donate_interface-country-dropdown-WS%</option><option value="SM">%donate_interface-country-dropdown-SM%</option><option value="ST">%donate_interface-country-dropdown-ST%</option><option value="SA">%donate_interface-country-dropdown-SA%</option><option value="SN">%donate_interface-country-dropdown-SN%</option><option value="RS">%donate_interface-country-dropdown-RS%</option><option value="SC">%donate_interface-country-dropdown-SC%</option><option value="SL">%donate_interface-country-dropdown-SL%</option><option value="SG">%donate_interface-country-dropdown-SG%</option><option value="SK">%donate_interface-country-dropdown-SK%</option><option value="SI">%donate_interface-country-dropdown-SI%</option><option value="SB">%donate_interface-country-dropdown-SB%</option><option value="SO">%donate_interface-country-dropdown-SO%</option><option value="ZA">%donate_interface-country-dropdown-ZA%</option><option value="KR">%donate_interface-country-dropdown-KR%</option><option value="ES">%donate_interface-country-dropdown-ES%</option><option value="LK">%donate_interface-country-dropdown-LK%</option><option value="SD">%donate_interface-country-dropdown-SD%</option><option value="SR">%donate_interface-country-dropdown-SR%</option><option value="SJ">%donate_interface-country-dropdown-SJ%</option>
 33+ <option value="SZ">%donate_interface-country-dropdown-SZ%</option><option value="SE">%donate_interface-country-dropdown-SE%</option><option value="CH">%donate_interface-country-dropdown-CH%</option><option value="TW">%donate_interface-country-dropdown-TW%</option><option value="TJ">%donate_interface-country-dropdown-TJ%</option><option value="TZ">%donate_interface-country-dropdown-TZ%</option><option value="TH">%donate_interface-country-dropdown-TH%</option><option value="TL">%donate_interface-country-dropdown-TL%</option><option value="TG">%donate_interface-country-dropdown-TG%</option><option value="TK">%donate_interface-country-dropdown-TK%</option><option value="TO">%donate_interface-country-dropdown-TO%</option><option value="TT">%donate_interface-country-dropdown-TT%</option><option value="TN">%donate_interface-country-dropdown-TN%</option><option value="TR">%donate_interface-country-dropdown-TR%</option><option value="TM">%donate_interface-country-dropdown-TM%</option><option value="TC">%donate_interface-country-dropdown-TC%</option><option value="TV">%donate_interface-country-dropdown-TV%</option><option value="UG">%donate_interface-country-dropdown-UG%</option><option value="UA">%donate_interface-country-dropdown-UA%</option><option value="AE">%donate_interface-country-dropdown-AE%</option><option value="GB">%donate_interface-country-dropdown-GB%</option><option value="US">%donate_interface-country-dropdown-US%</option><option value="UM">%donate_interface-country-dropdown-UM%</option><option value="UY">%donate_interface-country-dropdown-UY%</option><option value="UZ">%donate_interface-country-dropdown-UZ%</option>
 34+ <option value="VU">%donate_interface-country-dropdown-VU%</option><option value="VE">%donate_interface-country-dropdown-VE%</option><option value="VN">%donate_interface-country-dropdown-VN%</option><option value="VG">%donate_interface-country-dropdown-VG%</option><option value="VI">%donate_interface-country-dropdown-VI%</option><option value="WF">%donate_interface-country-dropdown-WF%</option><option value="EH">%donate_interface-country-dropdown-EH%</option><option value="YE">%donate_interface-country-dropdown-YE%</option><option value="ZM">%donate_interface-country-dropdown-ZM%</option><option value="ZW">%donate_interface-country-dropdown-ZW%</option>
 35+ </select>
 36+ </td>
 37+</tr>
 38+<tr>
 39+ <td colspan="2"><input name="emailAdd" value="@emailAdd" type="text" title="%donate_interface-donor-email%" placeholder="%donate_interface-donor-email%" id="emailAdd"></td>
 40+</tr>
Index: trunk/extensions/DonationInterface/globalcollect_gateway/forms/css/gc.cc.css
——@@ -183,6 +183,10 @@
184184 input#zip {
185185 width: 65px;
186186 }
 187+input#zip.nostate {
 188+ width: 125px;
 189+ margin-left: 4px;
 190+}
187191
188192 /* From Webitects */
189193 /* Options */

Follow-up revisions

RevisionCommit summaryAuthorDate
r105223follow-up to r104989 - easier to read regexkaldari20:51, 5 December 2011
r105350MFT r104225, r104471, r104503, r104539, r104588, r104600, r104607, r104648, ...khorn21:12, 6 December 2011
r105351MFT r104225, r104471, r104503, r104539, r104588, r104600, r104607, r104648, ...khorn21:12, 6 December 2011

Comments

#Comment by Kaldari (talk | contribs)   21:02, 5 December 2011

Looks good, although those US and CA templates need some layout love.

Status & tagging log