| Index: branches/fundraising/deployment/DonationInterface/payflowpro_gateway/forms/TwoColumnLetter2.php |
| — | — | @@ -41,7 +41,7 @@ |
| 42 | 42 | // add noscript tags for javascript disabled browsers |
| 43 | 43 | $form .= $this->getNoScript(); |
| 44 | 44 | |
| 45 | | - $form .= Xml::tags( 'h2', array( 'id' => 'donate-head' ), wfMsg( 'payflowpro_gateway-make-your-donation' )); |
| | 45 | + // $form .= Xml::tags( 'h2', array( 'id' => 'donate-head' ), wfMsg( 'payflowpro_gateway-make-your-donation' )); |
| 46 | 46 | |
| 47 | 47 | // provide a place at the top of the form for displaying general messages |
| 48 | 48 | if ( $this->form_errors['general'] ) { |
| — | — | @@ -90,8 +90,8 @@ |
| 91 | 91 | if ( !$this->paypal ) { |
| 92 | 92 | // PayPal button |
| 93 | 93 | $form .= '<tr>'; |
| 94 | | - $form .= '<td class="label"></td>'; |
| 95 | | - $form .= '<td><a href="#" onclick="document.payment.PaypalRedirect.value=\'true\';document.payment.submit();"><img src="'.$scriptPath.'/donate_with_paypal.gif"/></a></td>'; |
| | 94 | + $form .= '<td style="text-align:center;" colspan="2"><big><b>Donate via PayPal</b></big><br/><a href="#" onclick="document.payment.PaypalRedirect.value=\'true\';document.payment.submit();"><img src="'.$scriptPath.'/paypal.png"/></a><br/>'. |
| | 95 | + '— or —<br/><big><b>Donate on Wikipedia</b></big></td>'; |
| 96 | 96 | $form .= '</tr>'; |
| 97 | 97 | } |
| 98 | 98 | |
| Property changes on: branches/fundraising/deployment/DonationInterface/payflowpro_gateway/forms/TwoColumnLetter2.php |
| ___________________________________________________________________ |
| Added: svn:mergeinfo |
| 99 | 99 | Merged /trunk/extensions/DonationInterface/payflowpro_gateway/forms/TwoColumnLetter2.php:r75105-75166 |
| Index: branches/fundraising/deployment/DonationInterface/payflowpro_gateway/forms/OneStepTwoColumn.php |
| — | — | @@ -19,11 +19,13 @@ |
| 20 | 20 | // form placeholder values |
| 21 | 21 | $first = wfMsg( 'payflowpro_gateway-first' ); |
| 22 | 22 | $last = wfMsg( 'payflowpro_gateway-last' ); |
| | 23 | + $other = wfMsg( 'payflowpro_gateway-other' ); |
| 23 | 24 | $js = <<<EOT |
| 24 | 25 | <script type="text/javascript"> |
| 25 | 26 | function loadPlaceholders() { |
| 26 | 27 | var fname = document.getElementById('fname'); |
| 27 | 28 | var lname = document.getElementById('lname'); |
| | 29 | + var otherRadio = document.getElementById('otherRadio'); |
| 28 | 30 | var amountOther = document.getElementById('amountOther'); |
| 29 | 31 | if (fname.value == '') { |
| 30 | 32 | fname.style.color = '#999999'; |
| — | — | @@ -33,6 +35,10 @@ |
| 34 | 36 | lname.style.color = '#999999'; |
| 35 | 37 | lname.value = '$last'; |
| 36 | 38 | } |
| | 39 | + if (typeof otherRadio != "undefined" && amountOther.value == '') { |
| | 40 | + amountOther.style.color = '#999999'; |
| | 41 | + amountOther.value = '$other'; |
| | 42 | + } |
| 37 | 43 | } |
| 38 | 44 | addEvent( window, 'load', loadPlaceholders ); |
| 39 | 45 | </script> |
| Property changes on: branches/fundraising/deployment/DonationInterface/payflowpro_gateway/forms/OneStepTwoColumn.php |
| ___________________________________________________________________ |
| Added: svn:mergeinfo |
| 40 | 46 | Merged /trunk/extensions/DonationInterface/payflowpro_gateway/forms/OneStepTwoColumn.php:r75105-75166 |
| Index: branches/fundraising/deployment/DonationInterface/payflowpro_gateway/includes/paypal.png |
| Cannot display: file marked as a binary type. |
| svn:mime-type = application/octet-stream |
| Property changes on: branches/fundraising/deployment/DonationInterface/payflowpro_gateway/includes/paypal.png |
| ___________________________________________________________________ |
| Added: svn:mime-type |
| 41 | 47 | + application/octet-stream |
| Property changes on: branches/fundraising/deployment/DonationInterface/payflowpro_gateway/includes |
| ___________________________________________________________________ |
| Added: svn:mergeinfo |
| 42 | 48 | Merged /trunk/extensions/DonationInterface/payflowpro_gateway/includes:r75105-75167 |
| Index: branches/fundraising/deployment/DonationInterface/payflowpro_gateway/payflowpro_gateway.i18n.php |
| — | — | @@ -108,6 +108,7 @@ |
| 109 | 109 | 'payflowpro_gateway-comment' => 'Comment', |
| 110 | 110 | 'payflowpro_gateway-first' => 'First', |
| 111 | 111 | 'payflowpro_gateway-last' => 'Last', |
| | 112 | + 'payflowpro_gateway-other' => 'Other', |
| 112 | 113 | 'payflowpro_gateway-noscript-msg' => 'It appears that you do not have JavaScript enabled, or your browser does not support it. |
| 113 | 114 | In order to provide a safe, secure and pleasant experience, our donation form requires JavaScript.', |
| 114 | 115 | 'payflowpro_gateway-noscript-redirect-msg' => 'If you cannot or do not wish to enable JavaScript, you may still contribute by visiting:', |
| Property changes on: branches/fundraising/deployment/DonationInterface/payflowpro_gateway/payflowpro_gateway.i18n.php |
| ___________________________________________________________________ |
| Added: svn:mergeinfo |
| 115 | 116 | Merged /trunk/extensions/DonationInterface/payflowpro_gateway/payflowpro_gateway.i18n.php:r75105-75166 |