r106719 MediaWiki - Code Review archive

Repository:MediaWiki
Revision:< r106718‎ | r106719 | r106720 >
Date:22:55, 19 December 2011
Author:pgehres
Status:ok
Tags:
Comment:
Updates to personal_information for default/US/CA/AU. CSS fixes for new cc form templates.
Modified paths:
  • /trunk/extensions/DonationInterface/globalcollect_gateway/forms/css/gc.cc.css (modified) (history)
  • /trunk/extensions/DonationInterface/globalcollect_gateway/forms/html/_personal-information/AU.html (modified) (history)
  • /trunk/extensions/DonationInterface/globalcollect_gateway/forms/html/_personal-information/CA.html (modified) (history)
  • /trunk/extensions/DonationInterface/globalcollect_gateway/forms/html/_personal-information/US.html (modified) (history)
  • /trunk/extensions/DonationInterface/globalcollect_gateway/forms/html/_personal-information/default.html (modified) (history)

Diff [purge]

Index: trunk/extensions/DonationInterface/globalcollect_gateway/forms/html/_personal-information/US.html
——@@ -1,70 +1,95 @@
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>
13 - <option value="AL">AL</option>
14 - <option value="AR">AR</option>
15 - <option value="AZ">AZ</option>
16 - <option value="CA">CA</option>
17 - <option value="CO">CO</option>
18 - <option value="CT">CT</option>
19 - <option value="DC">DC</option>
20 - <option value="DE">DE</option>
21 - <option value="FL">FL</option>
22 - <option value="GA">GA</option>
23 - <option value="HI">HI</option>
24 - <option value="IA">IA</option>
25 - <option value="ID">ID</option>
26 - <option value="IL">IL</option>
27 - <option value="IN">IN</option>
28 - <option value="KS">KS</option>
29 - <option value="KY">KY</option>
30 - <option value="LA">LA</option>
31 - <option value="MA">MA</option>
32 - <option value="MD">MD</option>
33 - <option value="ME">ME</option>
34 - <option value="MI">MI</option>
35 - <option value="MN">MN</option>
36 - <option value="MO">MO</option>
37 - <option value="MS">MS</option>
38 - <option value="MT">MT</option>
39 - <option value="NC">NC</option>
40 - <option value="ND">ND</option>
41 - <option value="NE">NE</option>
42 - <option value="NH">NH</option>
43 - <option value="NJ">NJ</option>
44 - <option value="NM">NM</option>
45 - <option value="NV">NV</option>
46 - <option value="NY">NY</option>
47 - <option value="OH">OH</option>
48 - <option value="OK">OK</option>
49 - <option value="OR">OR</option>
50 - <option value="PA">PA</option>
51 - <option value="PR">PR</option>
52 - <option value="RI">RI</option>
53 - <option value="SC">SC</option>
54 - <option value="SD">SD</option>
55 - <option value="TN">TN</option>
56 - <option value="TX">TX</option>
57 - <option value="UT">UT</option>
58 - <option value="VA">VA</option>
59 - <option value="VT">VT</option>
60 - <option value="WA">WA</option>
61 - <option value="WI">WI</option>
62 - <option value="WV">WV</option>
63 - <option value="WY">WY</option>
64 - <option value="AA">AA</option>
65 - <option value="AE">AE</option>
66 - <option value="AP">AP</option>
67 - </select>
68 - </span>
69 - <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 -->
70 -</div>
71 -<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">
 4+ <h3 class="cc_header">%donate_interface-cc-form-header-personal%<img src="@script_path/extensions/DonationInterface/gateway_forms/includes/padlock.gif" style="vertical-align:baseline;margin-left:8px;"></h3>
 5+ </td>
 6+</tr>
 7+<tr>
 8+ <td colspan="2">
 9+ <input class="halfwidth" name="fname" value="@fname" type="text" placeholder="%donate_interface-donor-fname%" id="fname"><input class="halfwidth leftmar" name="lname" value="@lname" type="text" placeholder="%donate_interface-donor-lname%" id="lname">
 10+ </td>
 11+</tr>
 12+<tr>
 13+ <td colspan="2"><span class="creditcard-error-msg"></span></td>
 14+</tr>
 15+<tr>
 16+ <td colspan="2">
 17+ <input class="fullwidth" name="street" value="@street" type="text" title="%donate_interface-donor-street%" placeholder="%donate_interface-donor-street%" id="street">
 18+ </td>
 19+</tr>
 20+<tr>
 21+ <td colspan="2"><span class="creditcard-error-msg"></span></td>
 22+</tr>
 23+<tr>
 24+ <td colspan="2" style="white-space: nowrap;">
 25+ <input class="halfwidth state" name="city" value="@city" type="text" title="%donate_interface-donor-city%" placeholder="%donate_interface-donor-city%" id="city">
 26+ <select id="state" name="state" class="txt" value="@state" >
 27+ <option value=""></option>
 28+ <option value="AK">AK</option>
 29+ <option value="AL">AL</option>
 30+ <option value="AR">AR</option>
 31+ <option value="AZ">AZ</option>
 32+ <option value="CA">CA</option>
 33+ <option value="CO">CO</option>
 34+ <option value="CT">CT</option>
 35+ <option value="DC">DC</option>
 36+ <option value="DE">DE</option>
 37+ <option value="FL">FL</option>
 38+ <option value="GA">GA</option>
 39+ <option value="HI">HI</option>
 40+ <option value="IA">IA</option>
 41+ <option value="ID">ID</option>
 42+ <option value="IL">IL</option>
 43+ <option value="IN">IN</option>
 44+ <option value="KS">KS</option>
 45+ <option value="KY">KY</option>
 46+ <option value="LA">LA</option>
 47+ <option value="MA">MA</option>
 48+ <option value="MD">MD</option>
 49+ <option value="ME">ME</option>
 50+ <option value="MI">MI</option>
 51+ <option value="MN">MN</option>
 52+ <option value="MO">MO</option>
 53+ <option value="MS">MS</option>
 54+ <option value="MT">MT</option>
 55+ <option value="NC">NC</option>
 56+ <option value="ND">ND</option>
 57+ <option value="NE">NE</option>
 58+ <option value="NH">NH</option>
 59+ <option value="NJ">NJ</option>
 60+ <option value="NM">NM</option>
 61+ <option value="NV">NV</option>
 62+ <option value="NY">NY</option>
 63+ <option value="OH">OH</option>
 64+ <option value="OK">OK</option>
 65+ <option value="OR">OR</option>
 66+ <option value="PA">PA</option>
 67+ <option value="PR">PR</option>
 68+ <option value="RI">RI</option>
 69+ <option value="SC">SC</option>
 70+ <option value="SD">SD</option>
 71+ <option value="TN">TN</option>
 72+ <option value="TX">TX</option>
 73+ <option value="UT">UT</option>
 74+ <option value="VA">VA</option>
 75+ <option value="VT">VT</option>
 76+ <option value="WA">WA</option>
 77+ <option value="WI">WI</option>
 78+ <option value="WV">WV</option>
 79+ <option value="WY">WY</option>
 80+ <option value="AA">AA</option>
 81+ <option value="AE">AE</option>
 82+ <option value="AP">AP</option>
 83+ </select>
 84+ <input name="zip" class="halfwidth leftmar state" value="@zip" type="text" title="%donate_interface-postal%" placeholder="%donate_interface-donor-postal%" id="zip">
 85+ </td>
 86+</tr>
 87+<tr style="display: none;">
 88+ <td colspan="2">
 89+ <input type="hidden" value="US" name="country" id="country" />
 90+ </td>
 91+</tr>
 92+<tr>
 93+ <td colspan="2">
 94+ <input class="fullwidth" name="emailAdd" value="@emailAdd" type="text" title="%donate_interface-donor-email%" placeholder="%donate_interface-donor-email%" id="emailAdd">
 95+ </td>
 96+</tr>
Index: trunk/extensions/DonationInterface/globalcollect_gateway/forms/html/_personal-information/CA.html
——@@ -38,12 +38,9 @@
3939 <input name="zip" class="halfwidth leftmar state" value="@zip" type="text" title="%donate_interface-postal%" placeholder="%donate_interface-donor-postal%" id="zip">
4040 </td>
4141 </tr>
42 -<tr>
 42+<tr style="display: none;">
4343 <td colspan="2">
44 - <select class="txt" id="country" name="country" value="@country" placeholder="%donate_interface-country%">
45 - <option value="">%donate_interface-select-country%</option>
46 - <option value="CA">%donate_interface-country-dropdown-CA%</option>
47 - </select>
 44+ <input type="hidden" value="US" name="country" id="country" />
4845 </td>
4946 </tr>
5047 <tr>
Index: trunk/extensions/DonationInterface/globalcollect_gateway/forms/html/_personal-information/default.html
——@@ -1,21 +1,34 @@
 2+
 3+
 4+
 5+
 6+
 7+
28 <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>
 9+ <td colspan="2">
 10+ <h3 class="cc_header">%donate_interface-cc-form-header-personal%<img src="@script_path/extensions/DonationInterface/gateway_forms/includes/padlock.gif" style="vertical-align:baseline;margin-left:8px;"></h3>
 11+ </td>
412 </tr>
513 <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>
 14+ <td colspan="2">
 15+ <input class="halfwidth" name="fname" value="@fname" type="text" placeholder="%donate_interface-donor-fname%" id="fname"><input class="halfwidth leftmar" name="lname" value="@lname" type="text" placeholder="%donate_interface-donor-lname%" id="lname">
 16+ </td>
717 </tr>
818 <tr>
9 - <td colspan="2"><span class="creditcard-error-msg"></span></td>
 19+ <td colspan="2"><span class="creditcard-error-msg"></span></td>
1020 </tr>
1121 <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>
 22+ <td colspan="2">
 23+ <input class="fullwidth" name="street" value="@street" type="text" title="%donate_interface-donor-street%" placeholder="%donate_interface-donor-street%" id="street">
 24+ </td>
1325 </tr>
1426 <tr>
15 - <td colspan="2"><span class="creditcard-error-msg"></span></td>
 27+ <td colspan="2"><span class="creditcard-error-msg"></span></td>
1628 </tr>
1729 <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>
 30+ <td colspan="2">
 31+ <input name="zip" class="halfwidth" value="@zip" type="text" title="%donate_interface-postal%" placeholder="%donate_interface-donor-postal%" id="zip"><input class="halfwidth leftmar" name="city" value="@city" type="text" title="%donate_interface-donor-city%" placeholder="%donate_interface-donor-city%" id="city">
 32+ </td>
2033 </tr>
2134 <tr>
2235 <td colspan="2">
——@@ -35,5 +48,7 @@
3649 </td>
3750 </tr>
3851 <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>
 52+ <td colspan="2">
 53+ <input class="fullwidth" name="emailAdd" value="@emailAdd" type="text" title="%donate_interface-donor-email%" placeholder="%donate_interface-donor-email%" id="emailAdd">
 54+ </td>
4055 </tr>
Index: trunk/extensions/DonationInterface/globalcollect_gateway/forms/html/_personal-information/AU.html
——@@ -1,25 +1,50 @@
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 - <!-- TODO: add locality to translation -->
8 - <span class="loc-street"><input class="txt" id="street" name="street" title="Locality" value="@street" placeholder="Locality"/></span>
9 - <span class="loc-city"><input class="txt" id="city" name="city" title="%donate_interface-donor-city%" value="@city" placeholder="%donate_interface-donor-city%"/></span>
10 - <span class="loc-state">
11 - <select id="state" name="state" class="txt" value="@state" >
12 - <option value="">%donate_interface-donor-state%</option>
13 - <option value="ACT">ACT</option>
14 - <option value="JBT">JBT</option>
15 - <option value="NSW">NSW</option>
16 - <option value="NT">NT</option>
17 - <option value="QLD">QLD</option>
18 - <option value="SA">SA</option>
19 - <option value="TAS">TAS</option>
20 - <option value="VIC">VIC</option>
21 - <option value="WA">WA</option>
22 - </select>
23 - </span>
24 - <span class="loc-postal"><input class="txt" id="zip" name="zip" title="%donate_interface-postal%" value="@zip" placeholder="%donate_interface-donor-postal%"/></span>
25 -</div>
26 -<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">
 4+ <h3 class="cc_header">%donate_interface-cc-form-header-personal%<img src="@script_path/extensions/DonationInterface/gateway_forms/includes/padlock.gif" style="vertical-align:baseline;margin-left:8px;"></h3>
 5+ </td>
 6+</tr>
 7+<tr>
 8+ <td colspan="2">
 9+ <input class="halfwidth" name="fname" value="@fname" type="text" placeholder="%donate_interface-donor-fname%" id="fname"><input class="halfwidth leftmar" name="lname" value="@lname" type="text" placeholder="%donate_interface-donor-lname%" id="lname">
 10+ </td>
 11+</tr>
 12+<tr>
 13+ <td colspan="2"><span class="creditcard-error-msg"></span></td>
 14+</tr>
 15+<tr>
 16+ <td colspan="2">
 17+ <input class="fullwidth" name="street" value="@street" type="text" title="%donate_interface-donor-street%" placeholder="%donate_interface-donor-street%" id="street">
 18+ </td>
 19+</tr>
 20+<tr>
 21+ <td colspan="2"><span class="creditcard-error-msg"></span></td>
 22+</tr>
 23+<tr>
 24+ <td colspan="2" style="white-space: nowrap;">
 25+ <!-- TODO: get locality into translation and then use the message -->
 26+ <input class="halfwidth state" name="city" value="@city" type="text" title="Locality" placeholder="Locality" id="city">
 27+ <select id="state" name="state" class="txt" value="@state" >
 28+ <option value=""></option>
 29+ <option value="ACT">ACT</option>
 30+ <option value="JBT">JBT</option>
 31+ <option value="NSW">NSW</option>
 32+ <option value="NT">NT</option>
 33+ <option value="QLD">QLD</option>
 34+ <option value="SA">SA</option>
 35+ <option value="TAS">TAS</option>
 36+ <option value="VIC">VIC</option>
 37+ <option value="WA">WA</option>
 38+ </select>
 39+ <input name="zip" class="halfwidth leftmar state" value="@zip" type="text" title="%donate_interface-postal%" placeholder="%donate_interface-donor-postal%" id="zip">
 40+ </td>
 41+</tr>
 42+<tr style="display: none;">
 43+ <td colspan="2">
 44+ <input type="hidden" value="AU" name="country" id="country" />
 45+ </td>
 46+</tr>
 47+<tr>
 48+ <td colspan="2">
 49+ <input class="fullwidth" name="emailAdd" value="@emailAdd" type="text" title="%donate_interface-donor-email%" placeholder="%donate_interface-donor-email%" id="emailAdd">
 50+ </td>
 51+</tr>
Index: trunk/extensions/DonationInterface/globalcollect_gateway/forms/css/gc.cc.css
——@@ -146,7 +146,7 @@
147147 /* NEW STUFF */
148148 #greenBackground{
149149 padding:16px 24px;
150 - width:300px;
 150+ width:301px;
151151 background-color:#CCE7CD;
152152 border:1px solid #5EAC58;
153153 }
——@@ -170,24 +170,28 @@
171171 /*margin-left: 10px;*/
172172 }
173173
174 -/* Form inputs */
175 -input#fname, input#lname {
176 - width: 130px;
 174+/* Form Inputs */
 175+
 176+input.halfwidth {
 177+ width: 137px;
177178 }
178 -input#street, input#card_num, input#emailAdd {
179 - width: 271px;
 179+input.fullwidth {
 180+ width: 285px;
180181 }
181 -input#city {
182 - width: 135px;
 182+
 183+input.leftmar {
 184+ margin-left: 4px;
183185 }
184 -input#zip {
185 - width: 65px;
 186+
 187+input#city.halfwidth.state{
 188+ width:134px;
186189 }
187 -input#zip.nostate {
188 - width: 125px;
189 - margin-left: 4px;
 190+input#zip.halfwidth.state{
 191+ width:84px;
 192+ margin-left: 0;
190193 }
191194
 195+
192196 /* From Webitects */
193197 /* Options */
194198 .form .options-h, .form .options-v { margin: 0; }

Follow-up revisions

RevisionCommit summaryAuthorDate
r106885MFT r106598, r106683, r106689, r106690, r106719, r106742, r106745, r106858khorn22:53, 20 December 2011

Status & tagging log