| Index: branches/fundraising/deployment/DonationInterface/payflowpro_gateway/forms/TwoColumnLetter2.php |
| — | — | @@ -163,7 +163,7 @@ |
| 164 | 164 | $form .= Xml::openElement( 'div', array( 'id' => 'mw-donate-submit-button' ) ); |
| 165 | 165 | if ( $this->paypal ) { |
| 166 | 166 | $form .= Html::hidden( 'PaypalRedirect', false ); |
| 167 | | - $form .= Xml::element( 'input', array( 'class' => 'button-plain', 'value' => wfMsg( 'payflowpro_gateway-paypal-button' ), 'onclick' => 'document.payment.PaypalRedirect.value=\'true\';document.payment.submit();', 'type' => 'submit' ) ); |
| | 167 | + $form .= Xml::element( 'input', array( 'class' => 'button-plain', 'value' => wfMsg( 'payflowpro_gateway-paypal-button' ), 'onclick' => 'document.payment.PaypalRedirect.value=\'true\';return true;', 'type' => 'submit' ) ); |
| 168 | 168 | } else { |
| 169 | 169 | $form .= Xml::element( 'input', array( 'class' => 'button-plain', 'value' => wfMsg( 'payflowpro_gateway-donor-submit' ), 'type' => 'submit' ) ); |
| 170 | 170 | $form .= Xml::closeElement( 'div' ); // close div#mw-donate-submit-button |
| Index: branches/fundraising/deployment/DonationInterface/payflowpro_gateway/forms/TwoColumnLetter3.php |
| — | — | @@ -163,7 +163,7 @@ |
| 164 | 164 | $form .= Xml::openElement( 'div', array( 'id' => 'mw-donate-submit-button' ) ); |
| 165 | 165 | if ( $this->paypal ) { |
| 166 | 166 | $form .= Html::hidden( 'PaypalRedirect', false ); |
| 167 | | - $form .= Xml::element( 'input', array( 'class' => 'button-plain', 'value' => wfMsg( 'payflowpro_gateway-paypal-button' ), 'onclick' => 'document.payment.PaypalRedirect.value=\'true\';document.payment.submit();', 'type' => 'submit' ) ); |
| | 167 | + $form .= Xml::element( 'input', array( 'class' => 'button-plain', 'value' => wfMsg( 'payflowpro_gateway-paypal-button' ), 'onclick' => 'document.payment.PaypalRedirect.value=\'true\';return true;', 'type' => 'submit' ) ); |
| 168 | 168 | } else { |
| 169 | 169 | $form .= Xml::element( 'input', array( 'class' => 'button-plain', 'value' => wfMsg( 'payflowpro_gateway-donor-submit' ), 'type' => 'submit' ) ); |
| 170 | 170 | $form .= Xml::closeElement( 'div' ); // close div#mw-donate-submit-button |
| Index: branches/fundraising/deployment/DonationInterface/payflowpro_gateway/forms/TwoColumnLetter4.php |
| — | — | @@ -163,7 +163,7 @@ |
| 164 | 164 | $form .= Xml::openElement( 'div', array( 'id' => 'mw-donate-submit-button' ) ); |
| 165 | 165 | if ( $this->paypal ) { |
| 166 | 166 | $form .= Html::hidden( 'PaypalRedirect', false ); |
| 167 | | - $form .= Xml::element( 'input', array( 'class' => 'button-plain', 'value' => wfMsg( 'payflowpro_gateway-paypal-button' ), 'onclick' => 'document.payment.PaypalRedirect.value=\'true\';document.payment.submit();', 'type' => 'submit' ) ); |
| | 167 | + $form .= Xml::element( 'input', array( 'class' => 'button-plain', 'value' => wfMsg( 'payflowpro_gateway-paypal-button' ), 'onclick' => 'document.payment.PaypalRedirect.value=\'true\';return true;', 'type' => 'submit' ) ); |
| 168 | 168 | } else { |
| 169 | 169 | $form .= Xml::element( 'input', array( 'class' => 'button-plain', 'value' => wfMsg( 'payflowpro_gateway-donor-submit' ), 'type' => 'submit' ) ); |
| 170 | 170 | $form .= Xml::closeElement( 'div' ); // close div#mw-donate-submit-button |
| Index: branches/fundraising/deployment/DonationInterface/payflowpro_gateway/forms/TwoColumnLetter5.php |
| — | — | @@ -195,7 +195,7 @@ |
| 196 | 196 | // cc submit button |
| 197 | 197 | $form = Xml::openElement( 'div', array( 'id' => 'payflowpro_gateway-form-submit' ) ); |
| 198 | 198 | $form .= Xml::openElement( 'div', array( 'id' => 'mw-donate-submit-button' ) ); |
| 199 | | - $form .= Xml::element( 'input', array( 'class' => 'button-plain', 'value' => wfMsg( 'payflowpro_gateway-donor-submit' ), 'onclick' => 'document.payment.PaypalRedirect.value=0;document.payment.submit();', 'type' => 'submit' ) ); |
| | 199 | + $form .= Xml::element( 'input', array( 'class' => 'button-plain', 'value' => wfMsg( 'payflowpro_gateway-donor-submit' ), 'onclick' => 'document.payment.PaypalRedirect.value=0;return true;', 'type' => 'submit' ) ); |
| 200 | 200 | $form .= Xml::closeElement( 'div' ); // close div#mw-donate-submit-button |
| 201 | 201 | $form .= Xml::openElement( 'div', array( 'class' => 'mw-donate-submessage', 'id' => 'payflowpro_gateway-donate-submessage' ) ) . |
| 202 | 202 | wfMsg( 'payflowpro_gateway-donate-click' ); |
| — | — | @@ -206,7 +206,7 @@ |
| 207 | 207 | $form .= Xml::openElement( 'div', array( 'id' => 'payflowpro_gateway-form-submit-paypal' ) ); |
| 208 | 208 | $form .= Xml::openElement( 'div', array( 'id' => 'mw-donate-submit-button' ) ); |
| 209 | 209 | $form .= Html::hidden( 'PaypalRedirect', 0 ); |
| 210 | | - $form .= Xml::element( 'input', array( 'class' => 'button-plain', 'value' => wfMsg( 'payflowpro_gateway-paypal-button' ), 'onclick' => 'document.payment.PaypalRedirect.value=1;document.payment.submit();', 'type' => 'submit' ) ); |
| | 210 | + $form .= Xml::element( 'input', array( 'class' => 'button-plain', 'value' => wfMsg( 'payflowpro_gateway-paypal-button' ), 'onclick' => 'document.payment.PaypalRedirect.value=1;return true;', 'type' => 'submit' ) ); |
| 211 | 211 | $form .= Xml::closeElement( 'div' ); // close div#payflowpro_gateway-donate-submessage |
| 212 | 212 | $form .= Xml::closeElement( 'div' ); // close div#payflowpro_gateway-form-submit |
| 213 | 213 | |
| Index: branches/fundraising/deployment/DonationInterface/payflowpro_gateway/forms/TwoColumnLetter6.php |
| — | — | @@ -208,7 +208,7 @@ |
| 209 | 209 | $form = Xml::openElement( 'div', array( 'id' => 'payflowpro_gateway-form-submit', 'style' => 'display: none;' ) ); |
| 210 | 210 | } |
| 211 | 211 | $form .= Xml::openElement( 'div', array( 'id' => 'mw-donate-submit-button' ) ); |
| 212 | | - $form .= Xml::element( 'input', array( 'class' => 'button-plain', 'value' => wfMsg( 'payflowpro_gateway-donor-submit' ), 'onclick' => 'document.payment.PaypalRedirect.value=0;document.payment.submit();', 'type' => 'submit' ) ); |
| | 212 | + $form .= Xml::element( 'input', array( 'class' => 'button-plain', 'value' => wfMsg( 'payflowpro_gateway-donor-submit' ), 'onclick' => 'document.payment.PaypalRedirect.value=0;return true;', 'type' => 'submit' ) ); |
| 213 | 213 | $form .= Xml::closeElement( 'div' ); // close div#mw-donate-submit-button |
| 214 | 214 | $form .= Xml::openElement( 'div', array( 'class' => 'mw-donate-submessage', 'id' => 'payflowpro_gateway-donate-submessage' ) ) . |
| 215 | 215 | wfMsg( 'payflowpro_gateway-donate-click' ); |
| — | — | @@ -223,7 +223,7 @@ |
| 224 | 224 | } |
| 225 | 225 | $form .= Xml::openElement( 'div', array( 'id' => 'mw-donate-submit-button' ) ); |
| 226 | 226 | $form .= Html::hidden( 'PaypalRedirect', 0 ); |
| 227 | | - $form .= Xml::element( 'input', array( 'class' => 'button-plain', 'value' => wfMsg( 'payflowpro_gateway-donor-submit' ), 'onclick' => 'document.payment.PaypalRedirect.value=1;document.payment.submit();', 'type' => 'submit' ) ); |
| | 227 | + $form .= Xml::element( 'input', array( 'class' => 'button-plain', 'value' => wfMsg( 'payflowpro_gateway-donor-submit' ), 'onclick' => 'document.payment.PaypalRedirect.value=1;return true;', 'type' => 'submit' ) ); |
| 228 | 228 | $form .= Xml::closeElement( 'div' ); // close div#payflowpro_gateway-donate-submessage |
| 229 | 229 | $form .= Xml::closeElement( 'div' ); // close div#payflowpro_gateway-form-submit |
| 230 | 230 | return $form; |
| Index: branches/fundraising/deployment/DonationInterface/payflowpro_gateway/forms/TwoColumnLetter.php |
| — | — | @@ -118,7 +118,7 @@ |
| 119 | 119 | $form .= Html::hidden( 'PaypalRedirect', false ); |
| 120 | 120 | $form .= Xml::tags( 'div', |
| 121 | 121 | array(), |
| 122 | | - Xml::element( 'img', array( 'src' => $wgScriptPath . "/extensions/DonationInterface/payflowpro_gateway/includes/credit_card_logos2.gif" ) ) . ' <a href="#" onclick="document.payment.PaypalRedirect.value=\'true\';document.payment.submit();"><img src="' . $scriptPath . '/donate_with_paypal.gif"/></a>' |
| | 122 | + Xml::element( 'img', array( 'src' => $wgScriptPath . "/extensions/DonationInterface/payflowpro_gateway/includes/credit_card_logos2.gif" ) ) . ' <a href="#" onclick="document.payment.PaypalRedirect.value=\'true\';return true;"><img src="' . $scriptPath . '/donate_with_paypal.gif"/></a>' |
| 123 | 123 | ); |
| 124 | 124 | $form .= '</td>'; |
| 125 | 125 | $form .= '</tr>'; |
| Property changes on: branches/fundraising/deployment/DonationInterface |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 126 | 126 | Merged /trunk/extensions/DonationInterface:r77002-77022 |