| Index: trunk/extensions/DonationInterface/payflowpro_gateway/forms/TwoStepTwoColumnLetter3.php |
| — | — | @@ -56,14 +56,19 @@ |
| 57 | 57 | $form .= "<p class='creditcard-error-msg'>" . $this->form_errors['retryMsg'] . "</p>"; |
| 58 | 58 | $form .= Xml::openElement( 'form', array( 'name' => 'payment', 'method' => 'post', 'action' => $this->getNoCacheAction(), 'onsubmit' => 'return validate_form(this)', 'autocomplete' => 'off' ) ); |
| 59 | 59 | |
| 60 | | - $form .= $this->generateBillingContainer(); |
| | 60 | + $form .= Xml::openElement( 'div', array( 'id' => 'payflowpro_gateway-personal-info' ) ); |
| | 61 | + $form .= Xml::openElement( 'table', array( 'id' => 'payflow-table-donor' ) ); |
| | 62 | + $form .= $this->generateBillingFields(); |
| | 63 | + |
| 61 | 64 | return $form; |
| 62 | 65 | } |
| 63 | 66 | |
| 64 | 67 | public function generateFormSubmit() { |
| 65 | 68 | global $wgScriptPath; |
| | 69 | + |
| | 70 | + $form .= '<tr>'; |
| | 71 | + $form .= '<td class="label"> </td>'; |
| 66 | 72 | // submit button |
| 67 | | - $form = Xml::openElement( 'div', array( 'id' => 'payflowpro_gateway-form-submit' ) ); |
| 68 | 73 | $form .= Xml::openElement( 'div', array( 'id' => 'mw-donate-submit-button' ) ); |
| 69 | 74 | // $form .= Xml::submitButton( wfMsg( 'payflowpro_gateway-submit-button' )); |
| 70 | 75 | $form .= Xml::element( 'input', array( 'src' => $wgScriptPath . "/extensions/DonationInterface/payflowpro_gateway/includes/submit-donation-button.png", 'alt' => 'Submit donation', 'onclick' => 'submit_form( this )', 'type' => 'image' ) ); |
| — | — | @@ -71,24 +76,16 @@ |
| 72 | 77 | $form .= Xml::openElement( 'div', array( 'class' => 'mw-donate-submessage', 'id' => 'payflowpro_gateway-donate-submessage' ) ) . |
| 73 | 78 | Xml::element( 'img', array( 'src' => $wgScriptPath . "/extensions/DonationInterface/payflowpro_gateway/includes/padlock.gif", 'style' => 'vertical-align:baseline;margin-right:4px;' ) ) . 'Your credit / debit card will be securely processed.'; |
| 74 | 79 | $form .= Xml::closeElement( 'div' ); // close div#payflowpro_gateway-donate-submessage |
| 75 | | - $form .= Xml::closeElement( 'div' ); // close div#payflowpro_gateway-form-submit |
| | 80 | + |
| | 81 | + $form .= '</tr>'; |
| 76 | 82 | return $form; |
| 77 | 83 | } |
| 78 | 84 | |
| 79 | 85 | public function generateFormEnd() { |
| 80 | 86 | $form = ''; |
| 81 | | - $form .= $this->generateFormClose(); |
| 82 | | - return $form; |
| 83 | | - } |
| 84 | | - |
| 85 | | - protected function generateBillingContainer() { |
| 86 | | - $form = ''; |
| 87 | | - $form .= Xml::openElement( 'div', array( 'id' => 'payflowpro_gateway-personal-info' ) ); |
| 88 | | - $form .= Xml::openElement( 'table', array( 'id' => 'payflow-table-donor' ) ); |
| 89 | | - $form .= $this->generateBillingFields(); |
| 90 | 87 | $form .= Xml::closeElement( 'table' ); // close table#payflow-table-donor |
| 91 | 88 | $form .= Xml::closeElement( 'div' ); // close div#payflowpro_gateway-personal-info |
| 92 | | - |
| | 89 | + $form .= $this->generateFormClose(); |
| 93 | 90 | return $form; |
| 94 | 91 | } |
| 95 | 92 | |
| — | — | @@ -201,7 +198,7 @@ |
| 202 | 199 | $form .= '<td colspan=2><span class="creditcard-error-msg"> </span></td>'; |
| 203 | 200 | $form .= '</tr>'; |
| 204 | 201 | $form .= '<tr>'; |
| 205 | | - $form .= '<td class="label">' . Xml::label( wfMsg( 'payflowpro_gateway-donor-postal' ), 'zip' ) . '</td>'; |
| | 202 | + $form .= '<td class="label"> </td>'; |
| 206 | 203 | $form .= '<td>' . Xml::input( 'zip', '30', $this->form_data['zip'], array( 'type' => 'text', 'maxlength' => '9', 'id' => 'zip', 'class' => 'fullwidth' ) ) . |
| 207 | 204 | '</td>'; |
| 208 | 205 | $form .= '</tr>'; |