r76563 MediaWiki - Code Review archive

Repository:MediaWiki
Revision:r76562‎ | r76563 | r76564 >
Date:02:49, 12 November 2010
Author:kaldari
Status:deferred
Tags:
Comment:
fixing 1-step for tomorrow
Modified paths:
  • /trunk/extensions/DonationInterface/payflowpro_gateway/forms/TwoColumnLetter6.php (modified) (history)
  • /trunk/extensions/DonationInterface/payflowpro_gateway/forms/css/TwoColumnLetter6.css (modified) (history)

Diff [purge]

Index: trunk/extensions/DonationInterface/payflowpro_gateway/forms/TwoColumnLetter6.php
@@ -140,7 +140,11 @@
141141
142142 $form .= '</table>';
143143
144 - $form .= Xml::openElement( 'table', array( 'id' => 'payflow-table-cc' ) );
 144+ if ( $this->form_data['card'] == 'cc1' || $this->form_data['card'] == 'cc2' || $this->form_data['card'] == 'cc3' || $this->form_data['card'] == 'cc4' ) {
 145+ $form .= Xml::openElement( 'table', array( 'id' => 'payflow-table-cc' ) );
 146+ } else {
 147+ $form .= Xml::openElement( 'table', array( 'id' => 'payflow-table-cc', 'style' => 'display: none;' ) );
 148+ }
145149
146150 // name
147151 $form .= $this->getNameField();
@@ -196,8 +200,13 @@
197201 }
198202
199203 public function generateFormSubmit() {
 204+
200205 // cc submit button
201 - $form = Xml::openElement( 'div', array( 'id' => 'payflowpro_gateway-form-submit' ) );
 206+ if ( $this->form_data['card'] == 'cc1' || $this->form_data['card'] == 'cc2' || $this->form_data['card'] == 'cc3' || $this->form_data['card'] == 'cc4' ) {
 207+ $form = Xml::openElement( 'div', array( 'id' => 'payflowpro_gateway-form-submit' ) );
 208+ } else {
 209+ $form = Xml::openElement( 'div', array( 'id' => 'payflowpro_gateway-form-submit', 'style' => 'display: none;' ) );
 210+ }
202211 $form .= Xml::openElement( 'div', array( 'id' => 'mw-donate-submit-button' ) );
203212 $form .= Xml::element( 'input', array( 'class' => 'button-plain', 'value' => wfMsg( 'payflowpro_gateway-donor-submit' ), 'onclick' => 'document.payment.PaypalRedirect.value=0;submit_form( this );', 'type' => 'submit' ) );
204213 $form .= Xml::closeElement( 'div' ); // close div#mw-donate-submit-button
@@ -207,13 +216,16 @@
208217 $form .= Xml::closeElement( 'div' ); // close div#payflowpro_gateway-form-submit
209218
210219 // paypal submit button
211 - $form .= Xml::openElement( 'div', array( 'id' => 'payflowpro_gateway-form-submit-paypal' ) );
 220+ if ( $this->form_data['card'] == 'cc1' || $this->form_data['card'] == 'cc2' || $this->form_data['card'] == 'cc3' || $this->form_data['card'] == 'cc4' ) {
 221+ $form .= Xml::openElement( 'div', array( 'id' => 'payflowpro_gateway-form-submit-paypal', 'style' => 'display: none;' ) );
 222+ } else {
 223+ $form .= Xml::openElement( 'div', array( 'id' => 'payflowpro_gateway-form-submit-paypal' ) );
 224+ }
212225 $form .= Xml::openElement( 'div', array( 'id' => 'mw-donate-submit-button' ) );
213226 $form .= Html::hidden( 'PaypalRedirect', 0 );
214227 $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' ) );
215228 $form .= Xml::closeElement( 'div' ); // close div#payflowpro_gateway-donate-submessage
216229 $form .= Xml::closeElement( 'div' ); // close div#payflowpro_gateway-form-submit
217 -
218230 return $form;
219231 }
220232
Index: trunk/extensions/DonationInterface/payflowpro_gateway/forms/css/TwoColumnLetter6.css
@@ -105,16 +105,6 @@
106106 input.fullwidth {
107107 width:300px !important;
108108 }
109 -
110 -div#payflowpro_gateway-form-submit-paypal {
111 - display: block;
112 -}
113 -div#payflowpro_gateway-form-submit {
114 - display: none;
115 -}
116 -table#payflow-table-cc {
117 - display: none;
118 -}
119109 #footer {
120110 background-image: none !important;
121111 }

Follow-up revisions

RevisionCommit summaryAuthorDate
r76564Merging from r76562 thru r76563 of trunkawjrichards02:52, 12 November 2010

Status & tagging log