r79441 MediaWiki - Code Review archive

Repository:MediaWiki
Revision:r79440‎ | r79441 | r79442 >
Date:21:22, 1 January 2011
Author:kaldari
Status:deferred
Tags:
Comment:
US specific form tweaks
Modified paths:
  • /trunk/extensions/DonationInterface/payflowpro_gateway/forms/TwoStepTwoColumnPremiumUS.php (modified) (history)
  • /trunk/extensions/DonationInterface/payflowpro_gateway/forms/css/TwoStepTwoColumnPremiumUS.css (modified) (history)
  • /trunk/extensions/DonationInterface/payflowpro_gateway/payflowpro_gateway.i18n.php (modified) (history)

Diff [purge]

Index: trunk/extensions/DonationInterface/payflowpro_gateway/forms/css/TwoStepTwoColumnPremiumUS.css
@@ -9,7 +9,7 @@
1010 font-size:90%;
1111 }
1212 table#donation_amount td.amount_data {
13 - background-color:#daf2db;
 13+ background-color:#e8e8e8;
1414 }
1515 h3.cc_header {
1616 padding-bottom: 0;
Index: trunk/extensions/DonationInterface/payflowpro_gateway/forms/TwoStepTwoColumnPremiumUS.php
@@ -6,7 +6,7 @@
77
88 // set the path to css, before the parent constructor is called, checking to make sure some child class hasn't already set this
99 if ( !strlen( $this->getStylePath() ) ) {
10 - $this->setStylePath( $wgScriptPath . '/extensions/DonationInterface/payflowpro_gateway/forms/css/TwoStepTwoColumnPremium.css' );
 10+ $this->setStylePath( $wgScriptPath . '/extensions/DonationInterface/payflowpro_gateway/forms/css/TwoStepTwoColumnPremiumUS.css' );
1111 }
1212
1313 parent::__construct( $form_data, $form_errors );
@@ -319,4 +319,45 @@
320320 $form .= Xml::closeElement( 'table' );
321321 return $form;
322322 }
 323+
 324+ public function generateDonationFooter() {
 325+ global $wgScriptPath;
 326+ $form = '';
 327+ $form .= Xml::openElement( 'div', array( 'class' => 'payflow-cc-form-section', 'id' => 'payflowpro_gateway-donate-addl-info' ) );
 328+ $form .= Xml::openElement( 'div', array( 'id' => 'payflowpro_gateway-donate-addl-info-text' ) );
 329+ $form .= Xml::tags( 'div', array( 'style' => 'text-align:center;' ), '* * *' );
 330+ $form .= Xml::tags( 'div', array( 'class' => '' ), wfMsg( 'payflowpro_gateway-credit-storage-processing' ) );
 331+ $form .= Xml::tags( 'div', array( 'class' => '' ), wfMsg( 'payflowpro_gateway-otherways-alt' ) );
 332+ $form .= Xml::tags( 'div', array( 'class' => '' ), wfMsg( 'payflowpro_gateway-question-comment' ) );
 333+ $form .= Xml::closeElement( 'div' ); // close div#payflowpro_gateway-donate-addl-info-text
 334+ $form .= Xml::closeElement( 'div' ); // close div#payflowpro_gateway-donate-addl-info
 335+ return $form;
 336+ }
 337+
 338+ public function generateStateDropdown() {
 339+ require_once( dirname( __FILE__ ) . '/../includes/stateAbbreviations.inc' );
 340+
 341+ $states = statesMenuXML();
 342+
 343+ $state_opts = Xml::option( '', '' );
 344+
 345+ // generate dropdown of state opts
 346+ foreach ( $states as $value => $state_name ) {
 347+ if ( $value !== 'YY' && $value !== 'XX' ) {
 348+ $selected = ( $this->form_data[ 'state' ] == $value ) ? true : false;
 349+ $state_opts .= Xml::option( $value, $value, $selected );
 350+ }
 351+ }
 352+
 353+ $state_menu = Xml::openElement(
 354+ 'select',
 355+ array(
 356+ 'name' => 'state',
 357+ 'id' => 'state'
 358+ ) );
 359+ $state_menu .= $state_opts;
 360+ $state_menu .= Xml::closeElement( 'select' );
 361+
 362+ return $state_menu;
 363+ }
323364 }
Index: trunk/extensions/DonationInterface/payflowpro_gateway/payflowpro_gateway.i18n.php
@@ -218,6 +218,7 @@
219219 'payflowpro_gateway-wikipedia-translation' => 'Please note: "Wikipedia" on the shirt sleeve will be the "Wikipedia 10" graphic, which is not translated.',
220220 'payflowpro_gateway-on-the-back' => 'With this on the back:',
221221 'payflowpro_gateway-tshirt-confirmation' => 'Your t-shirt will be shipped in the size and language below:',
 222+ 'payflowpro_gateway-donation-tshirt' => 'Donation (t-shirt offer)',
222223
223224 // For more USA states, see payflowpro_gateway.us-states.i18n.php.
224225 'payflowpro_gateway-state-dropdown-YY' => 'Select a state',

Status & tagging log