| Index: trunk/extensions/DonationInterface/globalcollect_gateway/forms/html/cc/cc.html |
| — | — | @@ -18,7 +18,11 @@ |
| 19 | 19 | <div id="greenBackground" class=""> |
| 20 | 20 | <noscript> |
| 21 | 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> |
| | 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> |
| 23 | 27 | </div> |
| 24 | 28 | </noscript> |
| 25 | 29 | <p id="topError" class="creditcard-error-msg"></p> |
| — | — | @@ -30,7 +34,7 @@ |
| 31 | 35 | <tr> |
| 32 | 36 | <td colspan="2"> |
| 33 | 37 | <div id="step1header"> |
| 34 | | - <h3 class="amount_header">Donation amount: <span id="selected-amount">@amount @currency_code</span></h3> |
| | 38 | + <h3 class="amount_header">%donate_interface-amount-legend%: <span id="selected-amount">{% block donation-amount currency_code %}</span></h3> |
| 35 | 39 | </div> |
| 36 | 40 | </td> |
| 37 | 41 | </tr> |
| — | — | @@ -44,7 +48,7 @@ |
| 45 | 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> |
| 46 | 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>--> |
| 47 | 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>--> |
| 48 | | - </ul> |
| | 52 | + <!--<li><input id="cc-jcb" name="cardtype" type="radio" value="discover" class="cardradio" /> <label for="cc-discover"><img alt="Discover" src="@script_path/extensions/DonationInterface/gateway_forms/includes/card-jcb.png" /></label></li>--> </ul> |
| 49 | 53 | <div id="paymentContinue" style="margin-top: 10px; display: none;"> <input class="btn" id="paymentContinueBtn" type="button" value="%donate_interface-continue%" /></div> |
| 50 | 54 | </dd> |
| 51 | 55 | </dl> |
| — | — | @@ -58,7 +62,7 @@ |
| 59 | 63 | <tr> |
| 60 | 64 | <td> |
| 61 | 65 | <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. |
| | 66 | + <img src="@script_path/extensions/DonationInterface/gateway_forms/includes/padlock.gif" style="vertical-align:baseline;margin-right:4px;"> %donate_interface-donate-click% |
| 63 | 67 | </div> |
| 64 | 68 | </td> |
| 65 | 69 | </tr> |
| — | — | @@ -69,9 +73,10 @@ |
| 70 | 74 | <input type="hidden" name="returnto" value="Thank_You/en" /> |
| 71 | 75 | <input type="hidden" value="0" name="PaypalRedirect" id="PaypalRedirect"> |
| 72 | 76 | <input type="hidden" value="@amount" name="amount"> |
| 73 | | - <input type="hidden" value="US" name="country" id="country" /> |
| | 77 | + <!-- This should be included in the personal_information templates --> |
| | 78 | + <!--<input type="hidden" value="@country" name="country" id="country" />--> |
| 74 | 79 | <input type="hidden" value="@expiration" name="expiration" id="expiration"/> |
| 75 | | - <input type="hidden" value="USD" name="currency_code" /> |
| | 80 | + <input type="hidden" value="@currency_code" name="currency_code" /> |
| 76 | 81 | <input type="hidden" value="@utm_source" name="utm_source"/> |
| 77 | 82 | <input type="hidden" value="@utm_medium" name="utm_medium"/> |
| 78 | 83 | <input type="hidden" value="@utm_campaign" name="utm_campaign"/> |
| Index: trunk/extensions/DonationInterface/globalcollect_gateway/forms/html/_personal-information/JP.html |
| — | — | @@ -0,0 +1,107 @@ |
| | 2 | + |
| | 3 | +<tr> |
| | 4 | + <td colspan="2"> |
| | 5 | + <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> |
| | 6 | + </td> |
| | 7 | +</tr> |
| | 8 | +<tr> |
| | 9 | + <td colspan="2" style="white-space: nowrap;">〒 <input name="zip" class="fullwidth ja" value="@zip" type="text" title="%donate_interface-postal%" placeholder="%donate_interface-donor-postal%" id="zip"></td> |
| | 10 | +</tr> |
| | 11 | +<tr> |
| | 12 | + <td colspan="2"><span class="creditcard-error-msg"></span></td> |
| | 13 | +</tr> |
| | 14 | +<tr> |
| | 15 | + <td colspan="2"> |
| | 16 | + <select id="state" name="state" class="ja" value="@state" > |
| | 17 | + <option value=""></option> |
| | 18 | + <option value="">愛知県 - Aichi</option> |
| | 19 | + <option value="">秋田県 - Akita</option> |
| | 20 | + <option value="">青森県 - Aomori</option> |
| | 21 | + <option value="">千葉県 - Chiba</option> |
| | 22 | + <option value="">愛媛県 - Ehime</option> |
| | 23 | + <option value="">福井県 - Fukui</option> |
| | 24 | + <option value="">福岡県 - Fukuoka</option> |
| | 25 | + <option value="">福島県 - Fukushima</option> |
| | 26 | + <option value="">岐阜県 - Gifu</option> |
| | 27 | + <option value="">群馬県 - Gunma</option> |
| | 28 | + <option value="">広島県 - Hiroshima</option> |
| | 29 | + <option value="">北海道 - Hokkaido</option> |
| | 30 | + <option value="">兵庫県 - Hyogo</option> |
| | 31 | + <option value="">茨城県 - Ibaraki</option> |
| | 32 | + <option value="">石川県 - Ishikawa</option> |
| | 33 | + <option value="">岩手県 - Iwate</option> |
| | 34 | + <option value="">香川県 - Kagawa</option> |
| | 35 | + <option value="">鹿児島県 - Kagoshima</option> |
| | 36 | + <option value="">神奈川県 - Kanagawa</option> |
| | 37 | + <option value="">高知県 - Kochi</option> |
| | 38 | + <option value="">熊本県 -Kumamoto</option> |
| | 39 | + <option value="">京都府 - Kyoto</option> |
| | 40 | + <option value="">三重県 - Mie</option> |
| | 41 | + <option value="">宮城県 - Miyagi</option> |
| | 42 | + <option value="">宮崎県 - Miyazaki</option> |
| | 43 | + <option value="">長野県 - Nagano</option> |
| | 44 | + <option value="">長崎県 - Nagasaki</option> |
| | 45 | + <option value="">奈良県 - Nara</option> |
| | 46 | + <option value="">新潟県 - Niigata</option> |
| | 47 | + <option value="">大分県 - Oita</option> |
| | 48 | + <option value="">岡山県 - Okayama</option> |
| | 49 | + <option value="">沖縄県 - Okinawa</option> |
| | 50 | + <option value="">大阪府 - Osaka</option> |
| | 51 | + <option value="">佐賀県 - Saga</option> |
| | 52 | + <option value="">埼玉県 - Saitama</option> |
| | 53 | + <option value="">滋賀県 - Shiga</option> |
| | 54 | + <option value="">島根県 - Shimane</option> |
| | 55 | + <option value="">静岡県 - Shizuoka</option> |
| | 56 | + <option value="">栃木県 - Tochigi</option> |
| | 57 | + <option value="">徳島県 - Tokushima</option> |
| | 58 | + <option value="">東京都 - Tokyo</option> |
| | 59 | + <option value="">鳥取県 - Tottori</option> |
| | 60 | + <option value="">富山県 - Toyama</option> |
| | 61 | + <option value="">和歌山県 - Wakayama</option> |
| | 62 | + <option value="">山形県 - Yamagata</option> |
| | 63 | + <option value="">山口県 - Yamaguchi</option> |
| | 64 | + <option value="">山梨県 - Yamanashi</option> |
| | 65 | + </select> |
| | 66 | + </td> |
| | 67 | +</tr> |
| | 68 | +<tr> |
| | 69 | + <td colspan="2"><span class="creditcard-error-msg"></span></td> |
| | 70 | +</tr> |
| | 71 | +<tr> |
| | 72 | + <td colspan="2"> |
| | 73 | + <input class="fullwidth" name="city" value="@city" type="text" title="%donate_interface-donor-city%" placeholder="%donate_interface-donor-city%" id="city"> |
| | 74 | + </td> |
| | 75 | +</tr> |
| | 76 | +<tr> |
| | 77 | + <td colspan="2"><span class="creditcard-error-msg"></span></td> |
| | 78 | +</tr> |
| | 79 | +<tr> |
| | 80 | + <td colspan="2"> |
| | 81 | + <input class="fullwidth" name="street" value="@street" type="text" title="%donate_interface-donor-street%" placeholder="%donate_interface-donor-street%" id="street"> |
| | 82 | + </td> |
| | 83 | +</tr> |
| | 84 | +<tr> |
| | 85 | + <td colspan="2"><span class="creditcard-error-msg"></span></td> |
| | 86 | +</tr> |
| | 87 | +<tr> |
| | 88 | + <td colspan="2"> |
| | 89 | + <input class="halfwidth" name="lname" value="@lname" type="text" placeholder="%donate_interface-donor-lname%" id="lname"><input class="halfwidth leftmar" name="fname" value="@fname" type="text" placeholder="%donate_interface-donor-fname%" id="fname"> |
| | 90 | + </td> |
| | 91 | +</tr> |
| | 92 | +<tr> |
| | 93 | + <td colspan="2"><span class="creditcard-error-msg"></span></td> |
| | 94 | +</tr> |
| | 95 | +<tr style="display: none;"> |
| | 96 | + <td colspan="2"> |
| | 97 | + <input type="hidden" value="JP" name="country" id="country" /> |
| | 98 | + </td> |
| | 99 | +</tr> |
| | 100 | +<tr> |
| | 101 | + <td colspan="2"> |
| | 102 | + <input class="fullwidth" name="emailAdd" value="@emailAdd" type="text" title="%donate_interface-donor-email%" placeholder="%donate_interface-donor-email%" id="emailAdd"> |
| | 103 | + </td> |
| | 104 | +</tr> |
| | 105 | +<tr> |
| | 106 | + <td colspan="2"><span class="creditcard-error-msg"></span></td> |
| | 107 | +</tr> |
| | 108 | + |
| Property changes on: trunk/extensions/DonationInterface/globalcollect_gateway/forms/html/_personal-information/JP.html |
| ___________________________________________________________________ |
| Added: svn:eol-style |
| 1 | 109 | + native |
| Added: svn:executable |
| 2 | 110 | + * |
| Index: trunk/extensions/DonationInterface/globalcollect_gateway/forms/css/gc.cc.css |
| — | — | @@ -146,7 +146,7 @@ |
| 147 | 147 | /* NEW STUFF */ |
| 148 | 148 | #greenBackground{ |
| 149 | 149 | padding:16px 24px; |
| 150 | | - width:301px; |
| | 150 | + width:300px; |
| 151 | 151 | background-color:#CCE7CD; |
| 152 | 152 | border:1px solid #5EAC58; |
| 153 | 153 | } |
| — | — | @@ -183,15 +183,26 @@ |
| 184 | 184 | margin-left: 4px; |
| 185 | 185 | } |
| 186 | 186 | |
| 187 | | -input#city.halfwidth.state{ |
| | 187 | +input#city.halfwidth.state { |
| 188 | 188 | width:134px; |
| 189 | 189 | } |
| 190 | | -input#zip.halfwidth.state{ |
| | 190 | +input#zip.halfwidth.state { |
| 191 | 191 | width:84px; |
| 192 | 192 | margin-left: 0; |
| 193 | 193 | } |
| | 194 | +select#state { |
| | 195 | + width: 50px; |
| | 196 | +} |
| 194 | 197 | |
| 195 | 198 | |
| | 199 | +/* Specific element overrides */ |
| | 200 | +input#zip.ja { |
| | 201 | + width: 268px; |
| | 202 | +} |
| | 203 | +select#state.ja { |
| | 204 | + width:100%; |
| | 205 | +} |
| | 206 | + |
| 196 | 207 | /* From Webitects */ |
| 197 | 208 | /* Options */ |
| 198 | 209 | .form .options-h, .form .options-v { margin: 0; } |