r106999 MediaWiki - Code Review archive

Repository:MediaWiki
Revision:r106998‎ | r106999 | r107000 >
Date:22:45, 21 December 2011
Author:pgehres
Status:ok
Tags:
Comment:
Adding Discover forms, removing old country-specific forms
Modified paths:
  • /trunk/extensions/DonationInterface/globalcollect_gateway/forms/html/cc/cc-CA.html (deleted) (history)
  • /trunk/extensions/DonationInterface/globalcollect_gateway/forms/html/cc/cc-US.html (deleted) (history)
  • /trunk/extensions/DonationInterface/globalcollect_gateway/forms/html/cc/cc-vmad.html (added) (history)
  • /trunk/extensions/DonationInterface/globalcollect_gateway/forms/html/cc/cc-vmd.html (added) (history)

Diff [purge]

Index: trunk/extensions/DonationInterface/globalcollect_gateway/forms/html/cc/cc-CA.html
@@ -1,146 +0,0 @@
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="https://wikimediafoundation.org/wiki/DonateNonJS/en">https://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 (CAD)</span></h3>
35 - </div>
36 - </td>
37 - </tr>
38 - <tr>
39 - <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>
40 - </tr>
41 - <tr>
42 - <td colspan="2"><input name="fname" value="@fname" type="text" placeholder="First name" id="fname"><input name="lname" value="@lname" type="text" placeholder="Last name" id="lname"></td>
43 - </tr>
44 - <tr>
45 - <td colspan="2"><span class="creditcard-error-msg"></span></td>
46 - </tr>
47 - <tr>
48 - <td colspan="2"><input name="street" value="@street" type="text" placeholder="Street" id="street"></td>
49 - </tr>
50 - <tr>
51 - <td colspan="2"><span class="creditcard-error-msg"></span></td>
52 - </tr>
53 - <tr>
54 - <td colspan="2"><input name="city" value="@city" type="text" placeholder="City" id="city">
55 - <select id="state" name="state" class="txt" value="@state" >
56 - <option value=""></option>
57 - <option value="AB">AB</option>
58 - <option value="BC">BC</option>
59 - <option value="MB">MB</option>
60 - <option value="NB">NB</option>
61 - <option value="NL">NL</option>
62 - <option value="NS">NS</option>
63 - <option value="ON">ON</option>
64 - <option value="PE">PE</option>
65 - <option value="QC">QC</option>
66 - <option value="SK">SK</option>
67 - </select>
68 - <input name="zip" value="@zip" type="text" placeholder="Zip code" id="zip">
69 - </td>
70 - </tr>
71 - <tr>
72 - <td colspan="2"><input name="emailAdd" value="@emailAdd" type="text" placeholder="Email address" id="emailAdd"></td>
73 - </tr>
74 - <tr>
75 - <td>
76 - <dl class="">
77 - <dd class="field" style="margin-bottom: 0; margin-left: 0;">
78 - <ul class="options-h" id="cards" style="margin: 0;">
79 - <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>
80 - <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>
81 - <!--<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>-->
82 - <!--<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>-->
83 - </ul>
84 - <div id="paymentContinue" style="margin-top: 10px; display: none;"> <input class="btn" id="paymentContinueBtn" type="button" value="%donate_interface-continue%" /></div>
85 - </dd>
86 - </dl>
87 - </td>
88 - </tr>
89 - <tr>
90 - <td>
91 - <div id="payment" class="gainlayout" style="height:0px;text-align:center;"></div>
92 - </td>
93 - </tr>
94 - <tr>
95 - <td>
96 - <div class="mw-donate-submessage" id="payflowpro_gateway-donate-submessage">
97 - <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.
98 - </div>
99 - </td>
100 - </tr>
101 - </tbody>
102 - </table>
103 - </div>
104 - <input type="hidden" name="gateway" value="payflowpro" id="gateway" />
105 - <input type="hidden" name="returnto" value="Thank_You/en" />
106 - <input type="hidden" value="0" name="PaypalRedirect" id="PaypalRedirect">
107 - <input type="hidden" value="@amount" name="amount">
108 - <input type="hidden" value="CA" name="country" id="country" />
109 - <input type="hidden" value="@expiration" name="expiration" id="expiration"/>
110 - <input type="hidden" value="CAD" name="currency_code" />
111 - <input type="hidden" value="@utm_source" name="utm_source"/>
112 - <input type="hidden" value="@utm_medium" name="utm_medium"/>
113 - <input type="hidden" value="@utm_campaign" name="utm_campaign"/>
114 - <input type="hidden" value="@language" name="language"/>
115 - <input type="hidden" value="@referrer" name="referrer"/>
116 - <input type="hidden" value="@comment" name="comment"/>
117 - <input type="hidden" value="@comment-option" name="comment-option"/>
118 - <input type="hidden" value="1" name="email-opt"/>
119 - <input type="hidden" value="@token" name="token"/>
120 - <input type="hidden" value="@order_id" name="order_id"/>
121 - <input type="hidden" value="@numAttempt" name="numAttempt"/>
122 - <input type="hidden" value="@contribution_tracking_id" name="contribution_tracking_id"/>
123 - <input type="hidden" value="@data_hash" name="data_hash"/>
124 - <input type="hidden" value="@owa_session" name="owa_session"/>
125 - <input type="hidden" value="@owa_ref" name="owa_ref"/>
126 - <input type="hidden" value="@gateway" name="gateway"/>
127 - <input type="hidden" value="cc" name="payment_method"/>
128 - </form>
129 - </div>
130 - <p id="informationsharing">%donate_interface-informationsharing|url%</p>
131 - <table>
132 - <tr>
133 - <td>
134 - <ul id="moreinfolinks">
135 - <li><a href="https://wikimediafoundation.org/wiki/Special:LandingCheck?basic=true&landing_page=Monthly_donations&language=@language&uselang=@language&country=@country">%donate_interface-monthly-donation%</a></li>
136 - <li><a href="https://wikimediafoundation.org/wiki/Special:LandingCheck?basic=true&landing_page=Ways_to_Give&language=@language&uselang=@language&country=@country">%donate_interface-otherways-short%</a></li>
137 - <li><a href="https://wikimediafoundation.org/wiki/Special:LandingCheck?basic=true&landing_page=FAQ&language=@language&uselang=@language&country=@country">%donate_interface-faqs%</a></li>
138 - <li><a href="https://wikimediafoundation.org/wiki/Special:LandingCheck?basic=true&landing_page=Tax_Deductibility&language=@language&uselang=@language&country=@country">%donate_interface-tax-info%</a></li>
139 - </ul>
140 - </td>
141 - <td>@verisign_logo</td>
142 - </tr>
143 - </table>
144 - </td>
145 - </tr>
146 - </tbody>
147 -</table>
Index: trunk/extensions/DonationInterface/globalcollect_gateway/forms/html/cc/cc-US.html
@@ -1,137 +0,0 @@
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="https://wikimediafoundation.org/wiki/DonateNonJS/en">https://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</span></h3>
35 - </div>
36 - </td>
37 - </tr>
38 - <tr>
39 - <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>
40 - </tr>
41 - <tr>
42 - <td colspan="2"><input name="fname" value="@fname" type="text" placeholder="First name" id="fname"><input name="lname" value="@lname" type="text" placeholder="Last name" id="lname"></td>
43 - </tr>
44 - <tr>
45 - <td colspan="2"><span class="creditcard-error-msg"></span></td>
46 - </tr>
47 - <tr>
48 - <td colspan="2"><input name="street" value="@street" type="text" placeholder="Street" id="street"></td>
49 - </tr>
50 - <tr>
51 - <td colspan="2"><span class="creditcard-error-msg"></span></td>
52 - </tr>
53 - <tr>
54 - <td colspan="2"><input name="city" value="@city" type="text" placeholder="City" id="city">
55 - <select id="state" name="state" value="@state" >
56 - <option value=""></option>
57 - <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>
58 - </select>
59 - <input name="zip" value="@zip" type="text" placeholder="Zip code" id="zip">
60 - </td>
61 - </tr>
62 - <tr>
63 - <td colspan="2"><input name="emailAdd" value="@emailAdd" type="text" placeholder="Email address" id="emailAdd"></td>
64 - </tr>
65 - <tr>
66 - <td>
67 - <dl class="">
68 - <dd class="field" style="margin-bottom: 0; margin-left: 0;">
69 - <ul class="options-h" id="cards" style="margin: 0;">
70 - <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>
71 - <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>
72 - <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>
73 - <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>
74 - </ul>
75 - <div id="paymentContinue" style="margin-top: 10px; display: none;"> <input class="btn" id="paymentContinueBtn" type="button" value="%donate_interface-continue%" /></div>
76 - </dd>
77 - </dl>
78 - </td>
79 - </tr>
80 - <tr>
81 - <td>
82 - <div id="payment" class="gainlayout" style="height:0px;text-align:center;"></div>
83 - </td>
84 - </tr>
85 - <tr>
86 - <td>
87 - <div class="mw-donate-submessage" id="payflowpro_gateway-donate-submessage">
88 - <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.
89 - </div>
90 - </td>
91 - </tr>
92 - </tbody>
93 - </table>
94 - </div>
95 - <input type="hidden" name="gateway" value="payflowpro" id="gateway" />
96 - <input type="hidden" name="returnto" value="Thank_You/en" />
97 - <input type="hidden" value="0" name="PaypalRedirect" id="PaypalRedirect">
98 - <input type="hidden" value="@amount" name="amount">
99 - <input type="hidden" value="US" name="country" id="country" />
100 - <input type="hidden" value="@expiration" name="expiration" id="expiration"/>
101 - <input type="hidden" value="USD" name="currency_code" />
102 - <input type="hidden" value="@utm_source" name="utm_source"/>
103 - <input type="hidden" value="@utm_medium" name="utm_medium"/>
104 - <input type="hidden" value="@utm_campaign" name="utm_campaign"/>
105 - <input type="hidden" value="@language" name="language"/>
106 - <input type="hidden" value="@referrer" name="referrer"/>
107 - <input type="hidden" value="@comment" name="comment"/>
108 - <input type="hidden" value="@comment-option" name="comment-option"/>
109 - <input type="hidden" value="1" name="email-opt"/>
110 - <input type="hidden" value="@token" name="token"/>
111 - <input type="hidden" value="@order_id" name="order_id"/>
112 - <input type="hidden" value="@numAttempt" name="numAttempt"/>
113 - <input type="hidden" value="@contribution_tracking_id" name="contribution_tracking_id"/>
114 - <input type="hidden" value="@data_hash" name="data_hash"/>
115 - <input type="hidden" value="@owa_session" name="owa_session"/>
116 - <input type="hidden" value="@owa_ref" name="owa_ref"/>
117 - <input type="hidden" value="@gateway" name="gateway"/>
118 - <input type="hidden" value="cc" name="payment_method"/>
119 - </form>
120 - </div>
121 - <p id="informationsharing">%donate_interface-informationsharing|url%</p>
122 - <table>
123 - <tr>
124 - <td>
125 - <ul id="moreinfolinks">
126 - <li><a href="https://wikimediafoundation.org/wiki/Special:LandingCheck?basic=true&landing_page=Monthly_donations&language=@language&uselang=@language&country=@country">%donate_interface-monthly-donation%</a></li>
127 - <li><a href="https://wikimediafoundation.org/wiki/Special:LandingCheck?basic=true&landing_page=Ways_to_Give&language=@language&uselang=@language&country=@country">%donate_interface-otherways-short%</a></li>
128 - <li><a href="https://wikimediafoundation.org/wiki/Special:LandingCheck?basic=true&landing_page=FAQ&language=@language&uselang=@language&country=@country">%donate_interface-faqs%</a></li>
129 - <li><a href="https://wikimediafoundation.org/wiki/Special:LandingCheck?basic=true&landing_page=Tax_Deductibility&language=@language&uselang=@language&country=@country">%donate_interface-tax-info%</a></li>
130 - </ul>
131 - </td>
132 - <td>@verisign_logo</td>
133 - </tr>
134 - </table>
135 - </td>
136 - </tr>
137 - </tbody>
138 -</table>
Index: trunk/extensions/DonationInterface/globalcollect_gateway/forms/html/cc/cc-vmd.html
@@ -0,0 +1,117 @@
 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">%donate_interface-noscript-msg%</p>
 23+ <p id="noscript-redirect-msg">%donate_interface-noscript-redirect-msg%</p>
 24+ <p id="noscript-redirect-link">
 25+ <a href="https://wikimediafoundation.org/wiki/Special:LandingCheck?basic=true&landing_page=DonateNonJS&language=@language&uselang=@language&country=@country">https://wikimediafoundation.org/wiki/Special:LandingCheck?basic=true&landing_page=DonateNonJS&language=@language&uselang=@language&country=@country</a>
 26+ </p>
 27+ </div>
 28+ </noscript>
 29+ <p id="topError" class="creditcard-error-msg"></p>
 30+
 31+ <form name="payment" method="post" action="@action">
 32+ <div id="payflowpro_gateway-personal-info">
 33+ <table id="payflow-table-donor">
 34+ <tbody>
 35+ <tr>
 36+ <td colspan="2">
 37+ <div id="step1header">
 38+ <h3 class="amount_header">%donate_interface-amount-legend%: <span id="selected-amount">{% block donation-amount currency_code %}</span></h3>
 39+ </div>
 40+ </td>
 41+ </tr>
 42+ {% block personal-information country %}
 43+ <tr>
 44+ <td>
 45+ <dl class="">
 46+ <dd class="field" style="margin-bottom: 0; margin-left: 0;">
 47+ <ul class="options-h" id="cards" style="margin: 0;">
 48+ <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>
 49+ <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>
 50+ <!--<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>-->
 51+ <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>
 52+ <!--<li><input id="cc-jcb" name="cardtype" type="radio" value="jcb" class="cardradio" /> <label for="cc-jcb"><img alt="JCB" src="@script_path/extensions/DonationInterface/gateway_forms/includes/card-jcb.png" /></label></li>-->
 53+ </ul>
 54+ <div id="paymentContinue" style="margin-top: 10px; display: none;"> <input class="btn" id="paymentContinueBtn" type="button" value="%donate_interface-continue%" /></div>
 55+ </dd>
 56+ </dl>
 57+ </td>
 58+ </tr>
 59+ <tr>
 60+ <td>
 61+ <div id="payment" class="gainlayout" style="height:0px;text-align:center;"></div>
 62+ </td>
 63+ </tr>
 64+ <tr>
 65+ <td>
 66+ <div class="mw-donate-submessage" id="payflowpro_gateway-donate-submessage">
 67+ <img src="@script_path/extensions/DonationInterface/gateway_forms/includes/padlock.gif" style="vertical-align:baseline;margin-right:4px;"> %donate_interface-donate-click%
 68+ </div>
 69+ </td>
 70+ </tr>
 71+ </tbody>
 72+ </table>
 73+ </div>
 74+ <input type="hidden" name="gateway" value="payflowpro" id="gateway" />
 75+ <input type="hidden" name="returnto" value="Thank_You/en" />
 76+ <input type="hidden" value="0" name="PaypalRedirect" id="PaypalRedirect">
 77+ <input type="hidden" value="@amount" name="amount">
 78+ <!-- This should be included in the personal_information templates -->
 79+ <!--<input type="hidden" value="@country" name="country" id="country" />-->
 80+ <input type="hidden" value="@expiration" name="expiration" id="expiration"/>
 81+ <input type="hidden" value="@currency_code" name="currency_code" />
 82+ <input type="hidden" value="@utm_source" name="utm_source"/>
 83+ <input type="hidden" value="@utm_medium" name="utm_medium"/>
 84+ <input type="hidden" value="@utm_campaign" name="utm_campaign"/>
 85+ <input type="hidden" value="@language" name="language"/>
 86+ <input type="hidden" value="@referrer" name="referrer"/>
 87+ <input type="hidden" value="@comment" name="comment"/>
 88+ <input type="hidden" value="@comment-option" name="comment-option"/>
 89+ <input type="hidden" value="1" name="email-opt"/>
 90+ <input type="hidden" value="@token" name="token"/>
 91+ <input type="hidden" value="@order_id" name="order_id"/>
 92+ <input type="hidden" value="@numAttempt" name="numAttempt"/>
 93+ <input type="hidden" value="@contribution_tracking_id" name="contribution_tracking_id"/>
 94+ <input type="hidden" value="@data_hash" name="data_hash"/>
 95+ <input type="hidden" value="@owa_session" name="owa_session"/>
 96+ <input type="hidden" value="@owa_ref" name="owa_ref"/>
 97+ <input type="hidden" value="@gateway" name="gateway"/>
 98+ <input type="hidden" value="cc" name="payment_method"/>
 99+ </form>
 100+ </div>
 101+ <p id="informationsharing">%donate_interface-informationsharing|url%</p>
 102+ <table>
 103+ <tr>
 104+ <td>
 105+ <ul id="moreinfolinks">
 106+ <li><a href="https://wikimediafoundation.org/wiki/Special:LandingCheck?basic=true&landing_page=Monthly_donations&language=@language&uselang=@language&country=@country">%donate_interface-monthly-donation%</a></li>
 107+ <li><a href="https://wikimediafoundation.org/wiki/Special:LandingCheck?basic=true&landing_page=Ways_to_Give&language=@language&uselang=@language&country=@country">%donate_interface-otherways-short%</a></li>
 108+ <li><a href="https://wikimediafoundation.org/wiki/Special:LandingCheck?basic=true&landing_page=FAQ&language=@language&uselang=@language&country=@country">%donate_interface-faqs%</a></li>
 109+ <li><a href="https://wikimediafoundation.org/wiki/Special:LandingCheck?basic=true&landing_page=Tax_Deductibility&language=@language&uselang=@language&country=@country">%donate_interface-tax-info%</a></li>
 110+ </ul>
 111+ </td>
 112+ <td>@verisign_logo</td>
 113+ </tr>
 114+ </table>
 115+ </td>
 116+ </tr>
 117+ </tbody>
 118+</table>
Property changes on: trunk/extensions/DonationInterface/globalcollect_gateway/forms/html/cc/cc-vmd.html
___________________________________________________________________
Added: svn:eol-style
1119 + native
Index: trunk/extensions/DonationInterface/globalcollect_gateway/forms/html/cc/cc-vmad.html
@@ -0,0 +1,117 @@
 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">%donate_interface-noscript-msg%</p>
 23+ <p id="noscript-redirect-msg">%donate_interface-noscript-redirect-msg%</p>
 24+ <p id="noscript-redirect-link">
 25+ <a href="https://wikimediafoundation.org/wiki/Special:LandingCheck?basic=true&landing_page=DonateNonJS&language=@language&uselang=@language&country=@country">https://wikimediafoundation.org/wiki/Special:LandingCheck?basic=true&landing_page=DonateNonJS&language=@language&uselang=@language&country=@country</a>
 26+ </p>
 27+ </div>
 28+ </noscript>
 29+ <p id="topError" class="creditcard-error-msg"></p>
 30+
 31+ <form name="payment" method="post" action="@action">
 32+ <div id="payflowpro_gateway-personal-info">
 33+ <table id="payflow-table-donor">
 34+ <tbody>
 35+ <tr>
 36+ <td colspan="2">
 37+ <div id="step1header">
 38+ <h3 class="amount_header">%donate_interface-amount-legend%: <span id="selected-amount">{% block donation-amount currency_code %}</span></h3>
 39+ </div>
 40+ </td>
 41+ </tr>
 42+ {% block personal-information country %}
 43+ <tr>
 44+ <td>
 45+ <dl class="">
 46+ <dd class="field" style="margin-bottom: 0; margin-left: 0;">
 47+ <ul class="options-h" id="cards" style="margin: 0;">
 48+ <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>
 49+ <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>
 50+ <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>
 51+ <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>
 52+ <!--<li><input id="cc-jcb" name="cardtype" type="radio" value="jcb" class="cardradio" /> <label for="cc-jcb"><img alt="JCB" src="@script_path/extensions/DonationInterface/gateway_forms/includes/card-jcb.png" /></label></li>-->
 53+ </ul>
 54+ <div id="paymentContinue" style="margin-top: 10px; display: none;"> <input class="btn" id="paymentContinueBtn" type="button" value="%donate_interface-continue%" /></div>
 55+ </dd>
 56+ </dl>
 57+ </td>
 58+ </tr>
 59+ <tr>
 60+ <td>
 61+ <div id="payment" class="gainlayout" style="height:0px;text-align:center;"></div>
 62+ </td>
 63+ </tr>
 64+ <tr>
 65+ <td>
 66+ <div class="mw-donate-submessage" id="payflowpro_gateway-donate-submessage">
 67+ <img src="@script_path/extensions/DonationInterface/gateway_forms/includes/padlock.gif" style="vertical-align:baseline;margin-right:4px;"> %donate_interface-donate-click%
 68+ </div>
 69+ </td>
 70+ </tr>
 71+ </tbody>
 72+ </table>
 73+ </div>
 74+ <input type="hidden" name="gateway" value="payflowpro" id="gateway" />
 75+ <input type="hidden" name="returnto" value="Thank_You/en" />
 76+ <input type="hidden" value="0" name="PaypalRedirect" id="PaypalRedirect">
 77+ <input type="hidden" value="@amount" name="amount">
 78+ <!-- This should be included in the personal_information templates -->
 79+ <!--<input type="hidden" value="@country" name="country" id="country" />-->
 80+ <input type="hidden" value="@expiration" name="expiration" id="expiration"/>
 81+ <input type="hidden" value="@currency_code" name="currency_code" />
 82+ <input type="hidden" value="@utm_source" name="utm_source"/>
 83+ <input type="hidden" value="@utm_medium" name="utm_medium"/>
 84+ <input type="hidden" value="@utm_campaign" name="utm_campaign"/>
 85+ <input type="hidden" value="@language" name="language"/>
 86+ <input type="hidden" value="@referrer" name="referrer"/>
 87+ <input type="hidden" value="@comment" name="comment"/>
 88+ <input type="hidden" value="@comment-option" name="comment-option"/>
 89+ <input type="hidden" value="1" name="email-opt"/>
 90+ <input type="hidden" value="@token" name="token"/>
 91+ <input type="hidden" value="@order_id" name="order_id"/>
 92+ <input type="hidden" value="@numAttempt" name="numAttempt"/>
 93+ <input type="hidden" value="@contribution_tracking_id" name="contribution_tracking_id"/>
 94+ <input type="hidden" value="@data_hash" name="data_hash"/>
 95+ <input type="hidden" value="@owa_session" name="owa_session"/>
 96+ <input type="hidden" value="@owa_ref" name="owa_ref"/>
 97+ <input type="hidden" value="@gateway" name="gateway"/>
 98+ <input type="hidden" value="cc" name="payment_method"/>
 99+ </form>
 100+ </div>
 101+ <p id="informationsharing">%donate_interface-informationsharing|url%</p>
 102+ <table>
 103+ <tr>
 104+ <td>
 105+ <ul id="moreinfolinks">
 106+ <li><a href="https://wikimediafoundation.org/wiki/Special:LandingCheck?basic=true&landing_page=Monthly_donations&language=@language&uselang=@language&country=@country">%donate_interface-monthly-donation%</a></li>
 107+ <li><a href="https://wikimediafoundation.org/wiki/Special:LandingCheck?basic=true&landing_page=Ways_to_Give&language=@language&uselang=@language&country=@country">%donate_interface-otherways-short%</a></li>
 108+ <li><a href="https://wikimediafoundation.org/wiki/Special:LandingCheck?basic=true&landing_page=FAQ&language=@language&uselang=@language&country=@country">%donate_interface-faqs%</a></li>
 109+ <li><a href="https://wikimediafoundation.org/wiki/Special:LandingCheck?basic=true&landing_page=Tax_Deductibility&language=@language&uselang=@language&country=@country">%donate_interface-tax-info%</a></li>
 110+ </ul>
 111+ </td>
 112+ <td>@verisign_logo</td>
 113+ </tr>
 114+ </table>
 115+ </td>
 116+ </tr>
 117+ </tbody>
 118+</table>
Property changes on: trunk/extensions/DonationInterface/globalcollect_gateway/forms/html/cc/cc-vmad.html
___________________________________________________________________
Added: svn:eol-style
1119 + native

Follow-up revisions

RevisionCommit summaryAuthorDate
r107009MFT r106136, r106968, r106970, r106979, r106994, r106996, r106998, r106999, ...khorn23:45, 21 December 2011

Status & tagging log