r101757 MediaWiki - Code Review archive

Repository:MediaWiki
Revision:< r101756‎ | r101757 | r101758 >
Date:00:16, 3 November 2011
Author:pgehres
Status:ok
Tags:
Comment:
Porting changes to pfp version of webitects_2_3step
Modified paths:
  • /trunk/extensions/DonationInterface/gateway_forms/rapidhtml/RapidHtmlResources.php (modified) (history)
  • /trunk/extensions/DonationInterface/payflowpro_gateway/forms/css/webitects_2_3step.css (added) (history)
  • /trunk/extensions/DonationInterface/payflowpro_gateway/forms/css/webitects_2_3step.ie6.css (added) (history)
  • /trunk/extensions/DonationInterface/payflowpro_gateway/forms/html/webitects_2_3step.html (modified) (history)
  • /trunk/extensions/DonationInterface/payflowpro_gateway/forms/js/webitects_2_3step.js (modified) (history)

Diff [purge]

Index: trunk/extensions/DonationInterface/payflowpro_gateway/forms/html/webitects_2_3step.html
——@@ -1,240 +1,213 @@
22 <script type="text/javascript">
3 - mw.loader.load('pfp.form.rapidhtml.webitects');
4 - var extensionPath = mw.config.get( 'wgServer' ) + mw.config.get( 'wgScriptPath' ) + '/extensions/DonationInterface';
5 - mw.loader.load( extensionPath + '/payflowpro_gateway/forms/js/webitects_2_3step.js', 'text/javascript' );
 3+ mw.loader.load('pfp.form.rapidhtml.webitects_2_3step');
64 // these must go through RapidHTML and thus are inline
7 - var amountErrors = ['#general|escape','#retryMsg|escape','#amount|escape'],
8 - billingErrors = ['#fname|escape','#lname|escape','#city|escape','#country|escape',
9 - '#street|escape','#state|escape','#zip|escape','#emailAdd|escape'],
10 - paymentErrors = ['#card_num|escape','#card_type|escape','#cvv|escape'],
11 - actionURL = "@action",
12 - scriptPath = "@script_path";
13 -
 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";
1410 </script>
15 -<!--[if lt IE 7]><style type="text/css">body{behavior:url("@script_path/skins/vector/csshover.min.htc")}</style><![endif]-->
16 -<!-- start Webitects styles -->
 11+<!--[if lt IE 7]>
 12+<script type="text/javascript">
 13+ mw.loader.load('pfp.form.rapidhtml.webitects_2_3step.ie6');
 14+</script>
1715 <style type="text/css">
18 - #errorMessages { font-size: 0.75em; color: #FF0000; }
19 - /* Force vertical scrollbar
20 - html { overflow-y: scroll; }
21 - */
22 - /* Accordion */
23 - #accordion h3 { background: #FFFFFF; border: none; font-size: 1.1em; margin: 0; padding: 0.5em 0.9em; outline: 0; }
24 - .accordion-content { padding: 0.9em; }
25 - #step2accordion { display:none; }
26 -
27 - /* Callouts */
28 - .call-l, .call-r { width: 270px; }
29 -
30 - /* Layout */
31 - #appeal { float: left; width: 100%; }
32 - #appeal-content { padding-right: 380px; }
33 - .clear { clear: both; }
34 - #donate { float: left; margin-left: -350px; width: 350px; }
35 - #donate-content { background-color: #FFFFFF; border: 1px solid #000000; padding: 1em 0;
36 - font-size: 0.95em;
37 - /* Maybe */ width: 348px;
 16+ body{
 17+ behavior: url("@script_path/skins/vector/csshover.min.htc");
3818 }
39 - #amount-table-white label { font-size: 1.1em; }
40 -
41 - #donate-body h3 { font-size: 17px; }
42 -
43 - #step1wrapper, #step2wrapper, #step3wrapper { width: 325px; }
44 - /* Initially hide steps 2 and 3 */
45 - #step2wrapper, #step2header, #step3wrapper, #step3header { display: none; }
46 - #where-content { font-size: 13px; line-height: 19px; width: 325px; }
47 -
48 - #amtErrorMessages, #billingErrorMessages, #paymentErrorMessages { color: #F00; }
49 -
50 -</style>
51 -<!--[if lt IE 7]><style>
52 -/* style for IE6 + IE5.5 + IE5.0 */
53 -.gainlayout { height: 0; }
5419 </style><![endif]-->
55 -
56 -<!--[if IE 7]><style>
57 -.gainlayout { zoom: 1; height: 1%; }
58 -</style><![endif]-->
 20+<!--[if IE 7]>
 21+<style>
 22+ .gainlayout {
 23+ zoom: 1;
 24+ height: 1%;
 25+ }
 26+</style>
 27+<![endif]-->
5928
6029 <div class="ltr">
61 - <div id="appeal">
62 - <div id="appeal-content">
63 - <h2 id="appeal-head"> <span class="mw-headline" id="From_Wikipedia_programmer_Brandon_Harris">From Wikipedia programmer Brandon Harris</span></h2>
64 - <div id="appeal-body" class="plainlinks">
65 - <p>I feel like I'm living the first line of my obituary.</p>
66 - <p>I don't think there will be anything else that I do in my life as important as what I do now for Wikipedia. We're not just building an encyclopedia, we're working to make people free. When we have access to free knowledge, we are better people. We understand the world is bigger than us, and we become infected with tolerance and understanding.</p>
67 - <p>Wikipedia is the 5th largest website in the world. I work at the small non-profit that keeps it on the web. We don't run ads because doing so would sacrifice our independence. The site is not and should never be a propaganda tool.</p>
68 - <p>Our work is possible because of donations from our readers. Will you help protect Wikipedia by donating $5, $10, $20 or whatever you can afford?</p>
69 - <p>I work at the Wikimedia Foundation because everything in my soul tells me it's the right thing to do. I've worked at huge tech companies, doing some job to build some crappy thing that's designed to steal money from some kid who doesn't know it. I would come home from work crushed.</p>
70 - <p>You might not know this, but the Wikimedia Foundation operates with a very small staff. Most other top-ten sites have tens of thousands of people and massive budgets. But they produce a fraction of what we pull off with sticks and wire.</p>
71 - <p>When you give to Wikipedia, you're supporting free knowledge around the world. You're not only leaving a legacy for your children and for their children, you're elevating people around the world who have access to this treasure. You're assuring that one day everyone else will too.</p>
72 - <p>Thank you,</p>
73 - <p><strong>Brandon Harris</strong><br /></p>
74 - <p>Programmer, Wikimedia Foundation</p>
75 - </div>
76 - </div>
77 - </div>
 30+ <table id="layouttable">
 31+ <tr>
 32+ <td>
 33+ <div id="appeal">
 34+ <div id="appeal-content">
 35+ <h2 id="appeal-head"> <span class="mw-headline">{{LanguageSwitch|2011FR/@appeal-title|@language}}</span></h2>
 36+ <div id="appeal-body" class="plainlinks">{{LanguageSwitch|2011FR/@appeal|@language}}</div>
 37+ </div>
 38+ </div>
 39+ </td>
7840
79 - <div id="donate">
80 - <div id="donate-content">
81 - <div id="donate-body" style="padding: 0 1em;">
82 - <div id="step1header"><h3>Donation amount <span id="selected-amount"></span> <span class="mute" id="change-amount" style="display: none;">(<a href="#">Change</a>)</span></h3></div>
 41+ <td>
 42+ <div id="donate">
 43+ <div id="donate-content">
 44+ <div id="donate-body" style="padding: 0 1em;">
 45+ <div id="step1header"><h3>%donate_interface-amount-legend% <span id="selected-amount"></span> <span class="mute" id="change-amount" style="display: none;">(<a href="#">%donate_interface-change%</a>)</span></h3></div>
8346
84 - <form method="post" name="paypalcontribution">
85 - <div id="step1wrapper">
86 - <div id="amtErrorMessages" class="small"></div>
87 - <table id="amount-table-white">
88 - <tr>
89 - <td><label><input type="radio" name="amountRadio" value="5" /> $5</label></td>
90 - <td><label><input type="radio" name="amountRadio" value="10" /> $10</label></td>
91 - <td><label><input type="radio" name="amountRadio" value="20" /> $20</label></td>
92 - <td><label><input type="radio" name="amountRadio" value="35" /> $35</label></td>
93 - </tr>
94 - <tr>
95 - <td><label><input type="radio" name="amountRadio" value="50" /> $50</label></td>
96 - <td><label><input type="radio" name="amountRadio" value="100" /> $100</label></td>
97 - <td><label><input type="radio" name="amountRadio" value="250" /> $250</label></td>
98 - <td><input type="radio" name="amountRadio" id="input_amount_other" value="other" /> <label>$<input type="text" class="txt-sm hint" name="amountGiven" size="4" id="other-amount" title="Other..." onfocus="this.form.input_amount_other.checked=true;"/></label></td>
99 - </tr>
100 - </table>
 47+ <form method="post" name="paypalcontribution">
 48+ <div id="step1wrapper">
 49+ <div id="amtErrorMessages" class="small"></div>
 50+ <table id="amount-table-white">
 51+ <tr>
 52+ <td><label><input id="amountRadio0" type="radio" name="amountRadio" value="5" /> <span id="amountSpan0">$5</span></label></td>
 53+ <td><label><input id="amountRadio1" type="radio" name="amountRadio" value="10" /> <span id="amountSpan1">$10</span></label></td>
 54+ <td><label><input id="amountRadio2" type="radio" name="amountRadio" value="20" /> <span id="amountSpan2">$20</span></label></td>
 55+ <td><label><input id="amountRadio3" type="radio" name="amountRadio" value="35" /> <span id="amountSpan3">$35</span></label></td>
 56+ </tr>
 57+ <tr>
 58+ <td><label><input id="amountRadio4" type="radio" name="amountRadio" value="50" /> <span id="amountSpan4">$50</span></label></td>
 59+ <td><label><input id="amountRadio5" type="radio" name="amountRadio" value="100" /> <span id="amountSpan5">$100</span></label></td>
 60+ <td><label><input id="amountRadio6" type="radio" name="amountRadio" value="250" /> <span id="amountSpan6">$250</span></label></td>
 61+ <td><input type="radio" name="amountRadio" id="input_amount_other" value="other" /> <label><span id="amountSpanOther">$</span><input type="text" class="txt-sm hint" name="amountGiven" size="4" id="other-amount" title="%donate_interface-other%" placeholder="%donate_interface-other%" onfocus="this.form.input_amount_other.checked=true;"/></label></td>
 62+ </tr>
 63+ </table>
10164
102 - <p class="donate-options">
103 - <input class="btn" id="cc" type="button" value="Donate by Credit Card" /><br />
104 - <input class="btn" id="pp" type="button" value="Donate via PayPal"/><span id='loading'></span>
105 - </p>
106 - </div>
107 - <div id="step2header"><h3>Billing Address <span class="mute" id="change-billing" style="display: none;">(<a href="#">Change</a>)</span></h3></div>
108 - <div id="step2wrapper">
109 - <div id="billing-content" class="gainlayout">
110 - <div id="billingErrorMessages" class="small"></div>
111 - <div class="name-fields">
112 - <span class="name-first"><input class="txt hint" id="fname" name="fname" title="First name" value="@fname" /></span>
113 - <span class="name-last"><input class="txt hint" id="lname" name="lname" title="Last name" value="@lname" /></span>
114 - </div>
115 - <div class="loc-fields">
116 - <span class="loc-street"><input class="txt hint" id="street" name="street" title="Street address" value="@street" /></span>
117 - <span class="loc-city"><input class="txt hint" id="city" name="city" title="City" value="@city" /></span>
118 - <span class="loc-state">
119 - <select id="state" name="state" class="txt" value="@state" >
120 - <option value=""></option>
121 - <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>
122 - </select>
123 - </span>
124 - <span class="loc-postal"><input class="txt hint" id="zip" name="zip" title="Zip" value="@zip"/></span>
125 - </div>
126 - <p><input class="txt hint" title="Email address" id="emailAdd" name="emailAdd" value="@emailAdd"/></p>
 65+ <p class="donate-options">
 66+ <input class="btn" id="cc" type="button" value="%donate_interface-cc-button%" /><br />
 67+ <input class="btn" id="pp" type="button" value="%donate_interface-paypal-button%"/><span id='loading'></span>
 68+ </p>
 69+ </div>
 70+ <div id="step2header"><h3>%donate_interface-billing-address% <span class="mute" id="change-billing" style="display: none;">(<a href="#">%donate_interface-change%</a>)</span></h3></div>
 71+ <div id="step2wrapper">
 72+ <div id="billing-content" class="gainlayout">
 73+ <div id="billingErrorMessages" class="small"></div>
 74+ <div class="name-fields">
 75+ <span class="name-first"><input class="txt" id="fname" name="fname" title="%donate_interface-donor-fname%" value="@fname" placeholder="%donate_interface-donor-fname%"/></span>
 76+ <span class="name-last"><input class="txt" id="lname" name="lname" title="%donate_interface-donor-lname%" value="@lname" placeholder="%donate_interface-donor-lname%"/></span>
 77+ </div>
 78+ <div class="loc-fields">
 79+ <span class="loc-street"><input class="txt" id="street" name="street" title="%donate_interface-donor-street%" value="@street" placeholder="%donate_interface-donor-street%"/></span>
 80+ <span class="loc-city"><input class="txt" id="city" name="city" title="%donate_interface-donor-city%" value="@city" placeholder="%donate_interface-donor-city%"/></span>
 81+ <span class="loc-state">
 82+ <select id="state" name="state" class="txt" value="@state" >
 83+ <option value=""></option>
 84+ <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>
 85+ </select>
 86+ </span>
 87+ <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 -->
 88+ </div>
 89+ <p><input class="txt" title="%donate_interface-donor-email%" id="emailAdd" name="emailAdd" value="@emailAdd" placeholder="%donate_interface-donor-email%"/></p>
12790
128 - <dl class="">
129 - <dt><span class="label">Select credit card</span></dt>
130 - <dd class="field" style="margin-bottom: 0;">
131 - <ul class="options-h" id="cards" style="margin: 0;">
132 - <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>
133 - <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>
134 - <li><input id="cc-amex" name="cardtype" type="radio" value="American Express" class="cardradio" /> <label for="cc-amex"><img alt="American Express" src="@script_path/extensions/DonationInterface/gateway_forms/includes/card-amex.png" /></label></li>
135 - <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>
136 - </ul>
137 - <div id="paymentContinue" style="margin-top: 10px; display: none;"> <input class="btn" id="paymentContinueBtn" type="button" value="Continue" /></div>
138 - </dd>
139 - </dl>
140 - </div>
141 - </div>
142 - <div id="step3header"><h3>Payment Information <span class="mute" id="change-payment" style="display: none;">(<a href="#">Change</a>)</span></h3></div>
143 - <div id="step3wrapper" style="display: none;">
144 - <div id="payment" class="gainlayout">
145 - <div id="paymentErrorMessages" class="small"></div>
146 - <dl class="form">
147 - <dt><span class="label"><label for="card_num">Card number</label></span></dt>
148 - <dd class="field"><input class="txt" id="card_num" name="card_num" value="@card_num"/></dd>
14991
150 - <dt></dt>
151 - <dd class="field">
152 - <div class="l" style="margin-right: 5%;">
153 - <span class="label">Expiration date</span>
154 - <select id="mos" name="mos">
155 - <option value="">Month</option>
156 - <option value="01">01 - January</option>
157 - <option value="02">02 - February</option>
158 - <option value="03">03 - March</option>
159 - <option value="04">04 - April</option>
160 - <option value="05">05 - May</option>
161 - <option value="06">06 - June</option>
162 - <option value="07">07 - July</option>
163 - <option value="08">08 - August</option>
164 - <option value="09">09 - September</option>
165 - <option value="10">10 - October</option>
166 - <option value="11">11 - November</option>
167 - <option value="12">12 - December</option>
168 - </select>
 92+ <dl class="">
 93+ <dt><span class="label">Select credit card</span></dt>
 94+ <dd class="field" style="margin-bottom: 0;">
 95+ <ul class="options-h" id="cards" style="margin: 0;">
 96+ <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>
 97+ <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>
 98+ <li><input id="cc-amex" name="cardtype" type="radio" value="American Express" class="cardradio" /> <label for="cc-amex"><img alt="American Express" src="@script_path/extensions/DonationInterface/gateway_forms/includes/card-amex.png" /></label></li>
 99+ <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>
 100+ </ul>
 101+ <div id="paymentContinue" style="margin-top: 10px; display: none;"> <input class="btn" id="paymentContinueBtn" type="button" value="Continue" /></div>
 102+ </dd>
 103+ </dl>
 104+ </div>
 105+ </div>
 106+ <div id="step3header"><h3>Payment Information <span class="mute" id="change-payment" style="display: none;">(<a href="#">Change</a>)</span></h3></div>
 107+ <div id="step3wrapper" style="display: none;">
 108+ <div id="payment" class="gainlayout">
 109+ <div id="paymentErrorMessages" class="small"></div>
 110+ <dl class="form">
 111+ <dt><span class="label"><label for="card_num">Card number</label></span></dt>
 112+ <dd class="field"><input class="txt" id="card_num" name="card_num" value="@card_num"/></dd>
169113
170 - <select id="year" name="year">
171 - <option value="">Year</option>
172 - <option value="2011">2011</option>
173 - <option value="2012">2012</option>
174 - <option value="2013">2013</option>
175 - <option value="2014">2014</option>
176 - <option value="2015">2015</option>
177 - <option value="2016">2016</option>
178 - <option value="2017">2017</option>
179 - <option value="2018">2018</option>
180 - <option value="2019">2019</option>
181 - <option value="2020">2020</option>
182 - </select>
183 - </div>
184 - <div class="l">
185 - <label class="label" for="cvv">Security code</label>
186 - <input class="txt-sm" id="cvv" name="cvv" value="@cvv"/>
187 - <a class="mute" href="#" id="where">Where?</a>
188 - </div>
 114+ <dt></dt>
 115+ <dd class="field">
 116+ <div class="l" style="margin-right: 5%;">
 117+ <span class="label">Expiration date</span>
 118+ <select id="mos" name="mos">
 119+ <option value="">Month</option>
 120+ <option value="01">01 - January</option>
 121+ <option value="02">02 - February</option>
 122+ <option value="03">03 - March</option>
 123+ <option value="04">04 - April</option>
 124+ <option value="05">05 - May</option>
 125+ <option value="06">06 - June</option>
 126+ <option value="07">07 - July</option>
 127+ <option value="08">08 - August</option>
 128+ <option value="09">09 - September</option>
 129+ <option value="10">10 - October</option>
 130+ <option value="11">11 - November</option>
 131+ <option value="12">12 - December</option>
 132+ </select>
189133
190 - <div class="clear" id="codes" style="display: none;"><img alt="Security codes" src="@script_path/extensions/DonationInterface/gateway_forms/includes/security-code.png" /></div>
191 - </dd>
 134+ <select id="year" name="year">
 135+ <option value="">Year</option>
 136+ <option value="2011">2011</option>
 137+ <option value="2012">2012</option>
 138+ <option value="2013">2013</option>
 139+ <option value="2014">2014</option>
 140+ <option value="2015">2015</option>
 141+ <option value="2016">2016</option>
 142+ <option value="2017">2017</option>
 143+ <option value="2018">2018</option>
 144+ <option value="2019">2019</option>
 145+ <option value="2020">2020</option>
 146+ </select>
 147+ </div>
 148+ <div class="l">
 149+ <label class="label" for="cvv">Security code</label>
 150+ <input class="txt-sm" id="cvv" name="cvv" value="@cvv"/>
 151+ <a class="mute" href="#" id="where">Where?</a>
 152+ </div>
192153
193 - <dt></dt>
194 - <dd class="field">
195 - <input id="submitcreditcard" class="btn" type="button" value="Submit donation" />
196 - <p class="mute"><img alt="" src="@script_path/extensions/DonationInterface/gateway_forms/includes/padlock.gif" /> Your credit card will be securely processed.</p>
197 - </dd>
198 - </dl>
199 - </div>
200 - </div>
 154+ <div class="clear" id="codes" style="display: none;"><img alt="Security codes" src="@script_path/extensions/DonationInterface/gateway_forms/includes/security-code.png" /></div>
 155+ </dd>
201156
202 - <input type="hidden" name="gateway" value="payflowpro" id="gateway" />
203 - <input type="hidden" name="returnto" value="Thank_You/en" />
204 - <input type="hidden" value="0" name="PaypalRedirect" id="PaypalRedirect">
205 - <input type="hidden" value="@card" name="card" id="card">
 157+ <dt></dt>
 158+ <dd class="field">
 159+ <input id="submitcreditcard" class="btn" type="button" value="Submit donation" />
 160+ <p class="mute"><img alt="" src="@script_path/extensions/DonationInterface/gateway_forms/includes/padlock.gif" /> Your credit card will be securely processed.</p>
 161+ </dd>
 162+ </dl>
 163+ </div>
 164+ </div>
206165
207 - <input type="hidden" value="@amount" name="amount" />
208 - <input type="hidden" value="US" name="country" id="country" />
209 - <input type="hidden" value="@expiration" name="expiration" id="expiration"/>
210 - <input type="hidden" value="@currency_code" name="currency_code" />
211 - <input type="hidden" value="@utm_source" name="utm_source"/>
212 - <input type="hidden" value="@utm_medium" name="utm_medium"/>
213 - <input type="hidden" value="@utm_campaign" name="utm_campaign"/>
214 - <input type="hidden" value="@language" name="language"/>
215 - <input type="hidden" value="@referrer" name="referrer"/>
216 - <input type="hidden" value="@comment" name="comment"/>
217 - <input type="hidden" value="@comment-option" name="comment-option"/>
218 - <input type="hidden" value="@email-opt" name="email-opt"/>
219 - <input type="hidden" value="processed" name="payment_method"/>
220 - <input type="hidden" value="@token" name="token"/>
221 - <input type="hidden" value="@order_id" name="order_id"/>
222 - <input type="hidden" value="@numAttempt" name="numAttempt"/>
223 - <input type="hidden" value="@contribution_tracking_id" name="contribution_tracking_id"/>
224 - <input type="hidden" value="@data_hash" name="data_hash"/>
225 - <input type="hidden" value="@owa_session" name="owa_session"/>
226 - <input type="hidden" value="@owa_ref" name="owa_ref"/>
227 - </form>
228 - <div id="where-content">
229 - <hr />
230 - <h3>Where your donation goes</h3>
231 - <p><strong>Technology:</strong> Servers, bandwidth, maintenance, development. Wikipedia is the #5 website in the world and it runs on a fraction of what other top websites spend.</p>
232 - <p><strong>People:</strong> The other top 10 website have thousands of employees. We have fewer than 100, making your donation a great investment in a highly-efficient not-for-profit organization.</p>
233 - </div>
234 - </div>
235 - </div>
236 - <p>We do not store your credit card information, and your personal data is subject to our <a target="_blank" href="https://www.mediawiki.org//wikimediafoundation.org/wiki/Donor_policy"> donor privacy policy</a>.</p>
237 - <p><a target="_blank" href="https://www.mediawiki.org//wikimediafoundation.org/wiki/Ways_to_Give/en">More information or other ways to give</a><br /><a target="_blank" href="https://www.mediawiki.org//wikimediafoundation.org/wiki/FAQ/en">Answers to frequently asked questions</a></p>
238 - </div>
 166+ <input type="hidden" name="gateway" value="payflowpro" id="gateway" />
 167+ <input type="hidden" name="returnto" value="Thank_You/en" />
 168+ <input type="hidden" value="0" name="PaypalRedirect" id="PaypalRedirect">
 169+ <input type="hidden" value="@card" name="card" id="card">
 170+
 171+ <input type="hidden" value="@amount" name="amount" />
 172+ <input type="hidden" value="US" name="country" id="country" />
 173+ <input type="hidden" value="@expiration" name="expiration" id="expiration"/>
 174+ <input type="hidden" value="@currency_code" name="currency_code" />
 175+ <input type="hidden" value="@utm_source" name="utm_source"/>
 176+ <input type="hidden" value="@utm_medium" name="utm_medium"/>
 177+ <input type="hidden" value="@utm_campaign" name="utm_campaign"/>
 178+ <input type="hidden" value="@language" name="language"/>
 179+ <input type="hidden" value="@referrer" name="referrer"/>
 180+ <input type="hidden" value="@comment" name="comment"/>
 181+ <input type="hidden" value="@comment-option" name="comment-option"/>
 182+ <input type="hidden" value="@email-opt" name="email-opt"/>
 183+ <input type="hidden" value="processed" name="payment_method"/>
 184+ <input type="hidden" value="@token" name="token"/>
 185+ <input type="hidden" value="@order_id" name="order_id"/>
 186+ <input type="hidden" value="@numAttempt" name="numAttempt"/>
 187+ <input type="hidden" value="@contribution_tracking_id" name="contribution_tracking_id"/>
 188+ <input type="hidden" value="@data_hash" name="data_hash"/>
 189+ <input type="hidden" value="@owa_session" name="owa_session"/>
 190+ <input type="hidden" value="@owa_ref" name="owa_ref"/>
 191+ <!-- new required fields -->
 192+ <input type="hidden" value="@gateway" name="gateway"/>
 193+ <input type="hidden" value="@payment_method" name="payment_method"/>
 194+ </form>
 195+ <div id="where-content">
 196+ {{LanguageSwitch|2011FR/core-appeal-whitebox-nodiv|@language}}
 197+ </div>
 198+ </div>
 199+ </div>
 200+ <p id="informationsharing">%donate_interface-informationsharing%</p>
 201+ <!-- TODO: links inside the message or not? -->
 202+ <ul id="moreinfolinks">
 203+ <li><a href="http://wikimediafoundation.org/wiki/Monthly_donations/en/US">%donate_interface-monthly-donation%</a></li><!-- TODO: localize the link -->
 204+ <li>%donate_interface-otherways-short%</li><!-- TODO: localize the link -->
 205+ <li><a href="http://wikimediafoundation.org/wiki/FAQ/en">%donate_interface-faqs%</a></li><!-- TODO: localize the link -->
 206+ <!--<li><a href="">%donate_interface-tax-info%</a></li>--><!-- TODO: localize the link -->
 207+ </ul>
 208+ </div>
 209+ </td>
 210+ </tr>
 211+ </table>
239212 </div>
240213
241214 <!-- Wikimedia Project logo
Index: trunk/extensions/DonationInterface/payflowpro_gateway/forms/css/webitects_2_3step.css
——@@ -0,0 +1,90 @@
 2+#errorMessages {
 3+ font-size: 0.75em;
 4+ color: #FF0000;
 5+}
 6+/* Force vertical scrollbar
 7+ html { overflow-y: scroll; }
 8+ */
 9+/* Accordion */
 10+#accordion h3 {
 11+ background: #FFFFFF;
 12+ border: none;
 13+ font-size: 1.1em;
 14+ margin: 0;
 15+ padding: 0.5em 0.9em;
 16+ outline: 0;
 17+}
 18+.accordion-content {
 19+ padding: 0.9em;
 20+}
 21+#step2accordion {
 22+ display: none;
 23+}
 24+
 25+/* Layout */
 26+table#layouttable tr td {
 27+ vertical-align: top;
 28+}
 29+
 30+#appeal {
 31+ /*width: 100%;*/
 32+ padding-right: 25px;
 33+}
 34+#appeal-content {
 35+ /*padding-right: 380px;*/
 36+}
 37+.clear {
 38+ clear: both;
 39+}
 40+#donate {
 41+ /*float: left;*/
 42+ /*margin-left: -350px;*/
 43+ width: 350px;
 44+}
 45+#donate-content {
 46+ background-color: #FFFFFF;
 47+ border: 1px solid #000000;
 48+ padding: 1em 0;
 49+ font-size: 0.95em;
 50+ /* Maybe */
 51+ width: 348px;
 52+}
 53+#amount-table-white label {
 54+ font-size: 1.1em;
 55+}
 56+
 57+#donate-body h3 {
 58+ font-size: 17px;
 59+}
 60+
 61+#step1wrapper, #step2wrapper, #step3wrapper {
 62+ width: 325px;
 63+}
 64+/* Initially hide steps 2 and 3 */
 65+#step2wrapper, #step2header, #step3wrapper, #step3header {
 66+ display: none;
 67+}
 68+#where-content {
 69+ font-size: 13px;
 70+ line-height: 19px;
 71+ width: 325px;
 72+}
 73+
 74+#amtErrorMessages, #billingErrorMessages, #paymentErrorMessages {
 75+ color: #F00;
 76+}
 77+.txt{
 78+ margin: 0 !important;
 79+}
 80+#billingContent span {
 81+ margin: 0 !important;
 82+}
 83+p#informationsharing {
 84+ padding: 0 15px;
 85+ line-height: 14px;
 86+ font-size: 11px;
 87+}
 88+ul#moreinfolinks li{
 89+ list-style: none !important;
 90+ list-style-image: none !important;
 91+}
\ No newline at end of file
Property changes on: trunk/extensions/DonationInterface/payflowpro_gateway/forms/css/webitects_2_3step.css
___________________________________________________________________
Added: svn:eol-style
192 + native
Index: trunk/extensions/DonationInterface/payflowpro_gateway/forms/css/webitects_2_3step.ie6.css
——@@ -0,0 +1,35 @@
 2+/* style for IE6 + IE5.5 + IE5.0 */
 3+.gainlayout {
 4+ height: 0 !important;
 5+}
 6+
 7+/* fix the input sizes on the billing address form */
 8+span.name-first input{
 9+ width: 140px !important;
 10+}
 11+span.name-last input{
 12+ width: 140px !important;
 13+}
 14+span.loc-street input{
 15+ width: 305px !important;
 16+}
 17+span.loc-city input{
 18+ width: 140px !important;
 19+}
 20+span.loc-postal input{
 21+ width: 48px !important;
 22+}
 23+#emailAdd{
 24+ width: 305px !important;
 25+}
 26+#select-credit-card{
 27+ margin-bottom: 10px;
 28+}
 29+
 30+#donate, #donate-content{
 31+ width: 340px !important;
 32+}
 33+
 34+#where-content, #step1wrapper, #step2wrapper, #step3wrapper{
 35+ width: 330px !important;
 36+}
\ No newline at end of file
Property changes on: trunk/extensions/DonationInterface/payflowpro_gateway/forms/css/webitects_2_3step.ie6.css
___________________________________________________________________
Added: svn:eol-style
137 + native
Index: trunk/extensions/DonationInterface/payflowpro_gateway/forms/js/webitects_2_3step.js
——@@ -56,8 +56,6 @@
5757 }
5858 showAmount( $( 'input[name="amount"]' ) ); // lets go ahead and assume there is something to show
5959 }
60 - // Init inline labels
61 - $( ".hint" ).ezpz_hint();
6260
6361 $( "#cc" ).click( function() {
6462 if ( validateAmount() ) {
Index: trunk/extensions/DonationInterface/gateway_forms/rapidhtml/RapidHtmlResources.php
——@@ -84,6 +84,30 @@
8585 'remoteExtPath' => $wgGlobalCollectRapidHtmlRemoteExtPath,
8686 );
8787
 88+$wgResourceModules[ 'pfp.form.rapidhtml.webitects_2_3step' ] = array(
 89+ 'styles' => array(
 90+ 'css/webitects_2_3step.css',
 91+ ),
 92+ 'scripts' => array(
 93+ 'js/webitects_2_3step.js',
 94+ ),
 95+ 'dependencies' => array(
 96+ 'pfp.form.rapidhtml.webitects'
 97+ ),
 98+ 'localBasePath' => dirname( __FILE__ ).'/../../payflowpro_gateway/forms',
 99+ 'remoteExtPath' => $wgPayflowRapidHtmlRemoteExtPath,
 100+);
 101+$wgResourceModules[ 'pfp.form.rapidhtml.webitects_2_3step.ie6' ] = array(
 102+ 'styles' => array(
 103+ 'css/webitects_2_3step.ie6.css',
 104+ ),
 105+ 'dependencies' => array(
 106+ 'pfp.form.rapidhtml.webitects_2_3step'
 107+ ),
 108+ 'localBasePath' => dirname( __FILE__ ).'/../../payflowpro_gateway/forms',
 109+ 'remoteExtPath' => $wgPayflowRapidHtmlRemoteExtPath,
 110+);
 111+
88112 /**
89113 * globalcollect_test
90114 */

Follow-up revisions

RevisionCommit summaryAuthorDate
r101763MFT r101757awjrichards00:27, 3 November 2011
r101939MFT r101757, r101852, r101917, r101929awjrichards01:12, 4 November 2011

Status & tagging log