| Index: branches/fundraising/deployment/payments_1.17/extensions/DonationInterface/gateway_forms/includes/enets_logo2.jpg |
| Cannot display: file marked as a binary type. |
| svn:mime-type = image/jpg |
| Property changes on: branches/fundraising/deployment/payments_1.17/extensions/DonationInterface/gateway_forms/includes/enets_logo2.jpg |
| ___________________________________________________________________ |
| Added: svn:mime-type |
| 1 | 1 | + image/jpg |
| Property changes on: branches/fundraising/deployment/payments_1.17/extensions/DonationInterface/gateway_forms/includes |
| ___________________________________________________________________ |
| Added: svn:mergeinfo |
| 2 | 2 | Merged /branches/fundraising/extensions/DonationInterface/gateway_forms/includes:r95724-100157 |
| 3 | 3 | Merged /trunk/extensions/DonationInterface/gateway_forms/includes:r75657-77440,77442-79147,79149-79286,79288-79296,79298-79299,79301-79303,79305-86440,90286,92825,96120-96121,96125,97945-99042,99045-99408,99503,99555,99568,100119-101026,101060,101063-101064,101073,101076,101335,101441,101501-101502,101549,101553,101557,101561,101638,101700,101719,101757,101785,101823,101826,101837,101846,101852,101870-101872,101882,101890,101910,101917,101929,101947,101949-101951,101955-101960,101964-101966,102030,102032-102033,102047,102050-102052,102054,102056,102058,102065,102076,102081,102085-102087,102118,102120,102124-102125,102127,102134,102140,102147,102151-102152,102155-102156,102185-102186,102188-102241,102261,102308,102318,102332,102338,102341-102342,102345,102424-102425,102445,102463,102467-102468,102470,102476,102479-102480,102549-102550,102576-102581,102590,102594,102596,102611,102639,102664,102681,102685,102689,102698,102700-102703,102707,102711-102712,102714,102729,102736,102752,102763,102805,102809-102810,102812,102819-102824,102826,102828-102833,102835-102836,102841,102872,102936,102938,102943,103009,103023-103024,103026-103027,103032,103036-103038,103040,103044,103070,103105,103219,103223,103229,103235,103237-103239,103243-103247,103253,103255,103259,103281,103371,103397,103399,103401,103411,103413,103434-103435,103481,103500,103503,103515,103519,103537,103541,103548,103591,103607-103608,103633,103636,103680,103775,103784,103837,103839,103863,103866,108780 |
| 4 | 4 | Merged /branches/fundraising/deployment/payments_1.17/extensions/DonationInterface/gateway_forms/includes:r99568 |
| Index: branches/fundraising/deployment/payments_1.17/extensions/DonationInterface/globalcollect_gateway/forms/html/rtbt/rtbt-enets.html |
| — | — | @@ -41,37 +41,21 @@ |
| 42 | 42 | <div id="donate-content"> |
| 43 | 43 | <div id="donate-body" style="padding: 0 1em;"> |
| 44 | 44 | <form method="post" name="paypalcontribution"> |
| 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> |
| 46 | | - <div id="step1wrapper" style="display: none;"> |
| 47 | | - <div id="amtErrorMessages" class="small"></div> |
| 48 | | - <table id="amount-table-white"> |
| 49 | | - <tr> |
| 50 | | - <td><label><input id="amountRadio0" type="radio" name="amountRadio" value="5" /> <span id="amountSpan0">5</span></label></td> |
| 51 | | - <td><label><input id="amountRadio1" type="radio" name="amountRadio" value="10" /> <span id="amountSpan1">10</span></label></td> |
| 52 | | - <td><label><input id="amountRadio2" type="radio" name="amountRadio" value="20" /> <span id="amountSpan2">20</span></label></td> |
| 53 | | - <td><label><input id="amountRadio3" type="radio" name="amountRadio" value="50" /> <span id="amountSpan3">50</span></label></td> |
| 54 | | - </tr> |
| 55 | | - <tr> |
| 56 | | - <td><label><input id="amountRadio4" type="radio" name="amountRadio" value="75" /> <span id="amountSpan4">75</span></label></td> |
| 57 | | - <td><label><input id="amountRadio5" type="radio" name="amountRadio" value="100" /> <span id="amountSpan5">100</span></label></td> |
| 58 | | - <td><label><input id="amountRadio6" type="radio" name="amountRadio" value="250" /> <span id="amountSpan6">250</span></label></td> |
| 59 | | - <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> |
| 60 | | - </tr> |
| 61 | | - </table> |
| 62 | | - </div> |
| | 45 | + <div id="step1header"><h3>%donate_interface-amount-legend% <span id="selected-amount"></span></h3></div> |
| | 46 | + |
| 63 | 47 | <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> |
| 64 | 48 | <div id="step2wrapper"> |
| 65 | 49 | <div id="billing-content" class="gainlayout"> |
| 66 | 50 | <div id="billingErrorMessages" class="small"></div> |
| 67 | 51 | <div id="paymentErrorMessages" class="small"></div> |
| 68 | | - <div class="name-fields"> |
| 69 | | - <span class="name-first"><input class="txt" id="fname" name="fname" title="%donate_interface-donor-fname%" value="@fname" placeholder="%donate_interface-donor-fname%"/></span> |
| 70 | | - <span class="name-last"><input class="txt" id="lname" name="lname" title="%donate_interface-donor-lname%" value="@lname" placeholder="%donate_interface-donor-lname%"/></span> |
| 71 | | - </div> |
| 72 | | - <div class="loc-fields nostate"> |
| 73 | | - <span class="loc-street"><input class="txt" id="street" name="street" title="%donate_interface-donor-street%" value="@street" placeholder="%donate_interface-donor-street%"/></span> |
| 74 | | - <span class="loc-city"><input class="txt" id="city" name="city" title="%donate_interface-donor-city%" value="@city" placeholder="%donate_interface-donor-city%"/></span> |
| 75 | | - <span class="loc-postal"><input class="txt" id="zip" name="zip" title="%donate_interface-donor-postal%" value="@zip" placeholder="%donate_interface-donor-postal%"/></span> |
| | 52 | + <!--<div class="name-fields">--> |
| | 53 | + <!--<span class="name-first"><input class="txt" id="fname" name="fname" title="%donate_interface-donor-fname%" value="@fname" placeholder="%donate_interface-donor-fname%"/></span>--> |
| | 54 | + <!--<span class="name-last"><input class="txt" id="lname" name="lname" title="%donate_interface-donor-lname%" value="@lname" placeholder="%donate_interface-donor-lname%"/></span>--> |
| | 55 | + <!--</div>--> |
| | 56 | + <div class="nostate"> |
| | 57 | + <!--<span class="loc-street"><input class="txt" id="street" name="street" title="%donate_interface-donor-street%" value="@street" placeholder="%donate_interface-donor-street%"/></span>--> |
| | 58 | + <!--<span class="loc-postal"><input class="txt" id="zip" name="zip" title="%donate_interface-donor-postal%" value="@zip" placeholder="%donate_interface-donor-postal%"/></span>--> |
| | 59 | + <!--<span class="loc-city"><input class="txt" id="city" name="city" title="%donate_interface-donor-city%" value="@city" placeholder="%donate_interface-donor-city%"/></span>--> |
| 76 | 60 | <span class="loc-country"> |
| 77 | 61 | <select class="txt" id="country" name="country" value="@country" placeholder="%donate_interface-country%"> |
| 78 | 62 | <option value="">%donate_interface-select-country%</option> |
| — | — | @@ -79,8 +63,14 @@ |
| 80 | 64 | </select> |
| 81 | 65 | </span> |
| 82 | 66 | </div> |
| 83 | | - <p><input class="txt" title="%donate_interface-donor-email%" id="emailAdd" name="emailAdd" value="@emailAdd" placeholder="%donate_interface-donor-email%"/> </p> |
| 84 | | - <div id="bt-continue" style="margin-top: 10px;"> <input class="btn" id="bt-continueBtn" type="button" value="%donate_interface-continue%" /></div> |
| | 67 | + <!--<p><input class="txt" title="%donate_interface-donor-email%" id="emailAdd" name="emailAdd" value="@emailAdd" placeholder="%donate_interface-donor-email%"/> </p>--> |
| | 68 | + <table style="margin-top: 10px;" > |
| | 69 | + <tr><td> |
| | 70 | + <div id="bt-continue" style="margin-top: 7px;"> <input class="btn" id="bt-continueBtn" type="button" value="%donate_interface-continue%" /></div> |
| | 71 | + </td><td> |
| | 72 | + <img style="margin-left: 20px;" src="@script_path/extensions/DonationInterface/gateway_forms/includes/enets_logo2" width="50" alt="eNets"> |
| | 73 | + </td></tr> |
| | 74 | + </table> |
| 85 | 75 | </div> |
| 86 | 76 | </div> |
| 87 | 77 | |
| — | — | @@ -113,7 +103,13 @@ |
| 114 | 104 | <input type="hidden" value="rtbt" name="payment_method"/> |
| 115 | 105 | <input type="hidden" value="rtbt_enets" name="payment_submethod"/> |
| 116 | 106 | <!-- required fields omitted above --> |
| 117 | | - <input type="hidden" value="XX" name="state"/> |
| | 107 | + <input type="hidden" value="John" name="fname" id="fname" /> |
| | 108 | + <input type="hidden" value="Doe" name="lname" id="lname" /> |
| | 109 | + <input type="hidden" value="n/a" name="street" id="street" /> |
| | 110 | + <input type="hidden" value="n/a" name="city" id="city" /> |
| | 111 | + <input type="hidden" value="XX" name="state" id="state" /> |
| | 112 | + <input type="hidden" value="00000" name="zip" id="zip" /> |
| | 113 | + <input type="hidden" value="nobody@wikimedia.org" name="emailAdd" id="emailAdd" /> |
| 118 | 114 | </form> |
| 119 | 115 | <div id="where-content"> |
| 120 | 116 | {{LanguageSwitch|2011FR/core-appeal-whitebox-nodiv|@language}} |
| Property changes on: branches/fundraising/deployment/payments_1.17/extensions/DonationInterface/globalcollect_gateway/forms/html/rtbt/rtbt-enets.html |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 121 | 117 | Merged /trunk/extensions/DonationInterface/globalcollect_gateway/forms/html/rtbt/rtbt-enets.html:r108783 |