r74337 MediaWiki - Code Review archive

Repository:MediaWiki
Revision:< r74336‎ | r74337 | r74338 >
Date:06:03, 6 October 2010
Author:kaldari
Status:deferred (Comments)
Tags:
Comment:
new TwoColumnLetter form design
Modified paths:
  • /trunk/extensions/DonationInterface/payflowpro_gateway/forms/TwoColumn.php (modified) (history)
  • /trunk/extensions/DonationInterface/payflowpro_gateway/forms/TwoColumnLetter.php (modified) (history)
  • /trunk/extensions/DonationInterface/payflowpro_gateway/forms/css/TwoColumnLetter.css (modified) (history)
  • /trunk/extensions/DonationInterface/payflowpro_gateway/payflowpro_gateway.css (modified) (history)
  • /trunk/extensions/DonationInterface/payflowpro_gateway/payflowpro_gateway.i18n.php (modified) (history)
  • /trunk/extensions/DonationInterface/payflowpro_gateway/validate_input.js (modified) (history)

Diff [purge]

Index: trunk/extensions/DonationInterface/payflowpro_gateway/validate_input.js
——@@ -23,6 +23,13 @@
2424 }
2525 }
2626
 27+function clearField( field, defaultValue ) {
 28+ if (field.value == defaultValue) {
 29+ field.value = '';
 30+ field.style.color = 'black';
 31+ }
 32+}
 33+
2734 function validate_form( form ) {
2835 var msg = [ 'EmailAdd', 'Fname', 'Lname', 'Street', 'City', 'State', 'Zip', 'CardNum', 'Cvv', 'Amount' ];
2936
Index: trunk/extensions/DonationInterface/payflowpro_gateway/forms/css/TwoColumnLetter.css
——@@ -1,7 +1,7 @@
22 .payflow-cc-form-section {
33 float: none;
44 margin-right: 0em;
5 - margin-bottom: 3em;
 5+ margin-bottom: 1em;
66 }
77
88 #payflowpro_gateway-cc_form_container {
——@@ -28,6 +28,14 @@
2929 margin-bottom: 1.2em;
3030 }
3131
 32+#payflowpro_gateway-personal-info {
 33+ margin-right:0 !important;
 34+}
 35+
 36+#payflowpro_gateway-form-submit {
 37+ margin-bottom: 5em;
 38+}
 39+
3240 #payflowpro_gateway-donate-addl-info-secure-logos {
3341 float: left;
3442 margin-right: 2em;
Index: trunk/extensions/DonationInterface/payflowpro_gateway/forms/TwoColumn.php
——@@ -121,60 +121,98 @@
122122 }
123123
124124 protected function generatePersonalFields() {
125 - // first name
126 - $form = '<tr>';
127 - $form .= '<td>' . Xml::label( wfMsg( 'payflowpro_gateway-donor-fname' ), 'fname' ) . '</td>';
128 - $form .= '<td>' . Xml::input( 'fname', '30', $this->form_data['fname'], array( 'maxlength' => '15', 'class' => 'required', 'id' => 'fname' ) ) .
129 - '<span class="creditcard-error-msg">' . ' ' . $this->form_errors['fname'] . '</span></td>';
 125+ global $wgScriptPath, $wgPayflowGatewayTest;
 126+ $card_num = ( $wgPayflowGatewayTest ) ? $this->form_data[ 'card_num' ] : '';
 127+ $cvv = ( $wgPayflowGatewayTest ) ? $this->form_data[ 'cvv' ] : '';
 128+ $form = '';
 129+
 130+ // name
 131+ $form .= '<tr>';
 132+ $form .= '<td class="label">' . Xml::label( wfMsg( 'payflowpro_gateway-donor-name' ), 'fname' ) . '</td>';
 133+ $form .= '<td>' . Xml::input( 'fname', '30', $this->form_data['fname'], array( 'type' => 'text', 'onfocus' => 'clearField( this, "First" )', 'maxlength' => '15', 'class' => 'required', 'id' => 'fname' ) ) .
 134+ Xml::input( 'lname', '30', $this->form_data['lname'], array( 'type' => 'text', 'onfocus' => 'clearField( this, "Last" )', 'maxlength' => '15', 'id' => 'lname' ) ) . '<span class="creditcard-error-msg">' . ' ' . $this->form_errors['fname'] . '</span></td>';
130135 $form .= "</tr>";
131 -
132 - // last name
 136+
 137+ // email
133138 $form .= '<tr>';
134 - $form .= '<td>' . Xml::label( wfMsg( 'payflowpro_gateway-donor-lname' ), 'lname' ) . '</td>';
135 - $form .= '<td>' . Xml::input( 'lname', '30', $this->form_data['lname'], array( 'maxlength' => '15', 'id' => 'lname' ) ) .
136 - '<span class="creditcard-error-msg">' . ' ' . $this->form_errors['lname'] . '</span>' . '</td>';
 139+ $form .= '<td class="label">' . Xml::label( wfMsg( 'payflowpro_gateway-donor-email' ), 'emailAdd' ) . '</td>';
 140+ $form .= '<td>' . Xml::input( 'emailAdd', '30', $this->form_data['email'], array( 'type' => 'text', 'maxlength' => '64', 'id' => 'emailAdd', 'class' => 'fullwidth' ) ) .
 141+ '<span class="creditcard-error-msg">' . ' ' . $this->form_errors['emailAdd'] . '</span></td>';
137142 $form .= '</tr>';
138 -
139 - // country
 143+
 144+ // amount
140145 $form .= '<tr>';
141 - $form .= '<td>' . Xml::label( wfMsg( 'payflowpro_gateway-donor-country' ), 'country' ) . '</td>';
142 - $form .= '<td>' . $this->generateCountryDropdown() . '<span class="creditcard-error-msg">' . ' ' . $this->form_errors['country'] . '</span></td>';
143 - $form .= '</tr>';
 146+ $form .= '<td class="label">' . Xml::label(wfMsg( 'payflowpro_gateway-donor-amount' ), 'amount') . '</td>';
 147+ $form .= '<td>' . Xml::input( 'amount', '7', $this->form_data['amount'], array( 'type' => 'text', 'onfocus' => 'clearField( this, "0.00" )', 'maxlength' => '10', 'id' => 'amount' ) ) .
 148+ '<span class="creditcard-error-msg">' . ' ' . $this->form_errors['invalidamount'] . '</span></td>';
 149+ $form .= '</tr>';
 150+
 151+ // currency
 152+ $form .= '<tr>';
 153+ $form .= '<td class="label">' . Xml::label(wfMsg( 'payflowpro_gateway-donor-currency-label' ), 'currency' ) . '</td>';
 154+ $form .= '<td>' . $this->generateCurrencyDropdown() . '</td>';
 155+ $form .= '</tr>';
 156+
 157+ // card logos
 158+ $form .= '<tr>';
 159+ $form .= '<td />';
 160+ $form .= '<td>' . Xml::element( 'img', array( 'src' => $wgScriptPath . "/extensions/DonationInterface/payflowpro_gateway/includes/credit_card_logos.gif" )) . '</td>';
 161+ $form .= '</tr>';
 162+
 163+ // card number
 164+ $form .= '<tr>';
 165+ $form .= '<td class="label">' . Xml::label( wfMsg( 'payflowpro_gateway-donor-card-num' ), 'card_num' ) . '</td>';
 166+ $form .= '<td>' . Xml::input( 'card_num', '30', $card_num, array( 'type' => 'text', 'maxlength' => '100', 'id' => 'card_num', 'class' => 'fullwidth', 'autocomplete' => 'off' ) ) .
 167+ '<span class="creditcard-error-msg">' . ' ' . $this->form_errors['card_num'] . '</span>' .
 168+ '<span class="creditcard-error-msg">' . ' ' . $this->form_errors['card'] . '</span></td>';
 169+ $form .= '</tr>';
 170+
 171+ // cvv
 172+ $form .= '<tr>';
 173+ $form .= '<td class="label">' . Xml::label( wfMsg( 'payflowpro_gateway-donor-security' ), 'cvv' ) . '</td>';
 174+ $form .= '<td>' . Xml::input( 'cvv', '5', $cvv, array( 'type' => 'text', 'maxlength' => '10', 'id' => 'cvv', 'autocomplete' => 'off') ) .
 175+ ' ' . '<a href="javascript:PopupCVV();">' . wfMsg( 'payflowpro_gateway-cvv-link' ) . '</a>' .
 176+ '<span class="creditcard-error-msg">' . ' ' . $this->form_errors['cvv'] . '</span></td>';
 177+ $form .= '</tr>';
 178+
 179+ // expiry
 180+ $form .= '<tr>';
 181+ $form .= '<td class="label">' . Xml::label( wfMsg( 'payflowpro_gateway-donor-expiration' ), 'expiration' ) . '</td>';
 182+ $form .= '<td>' . $this->generateExpiryMonthDropdown() . $this->generateExpiryYearDropdown() . '</td>';
 183+ $form .= '</tr>';
144184
145185 // street
146186 $form .= '<tr>';
147 - $form .= '<td>' . Xml::label( wfMsg( 'payflowpro_gateway-donor-street' ), 'street' ) . '</td>';
148 - $form .= '<td>' . Xml::input( 'street', '30', $this->form_data['street'], array( 'maxlength' => '30', 'id' => 'street' ) ) .
 187+ $form .= '<td class="label">' . Xml::label( wfMsg( 'payflowpro_gateway-donor-street' ), 'street' ) . '</td>';
 188+ $form .= '<td>' . Xml::input( 'street', '30', $this->form_data['street'], array( 'type' => 'text', 'maxlength' => '30', 'id' => 'street', 'class' => 'fullwidth' ) ) .
149189 '<span class="creditcard-error-msg">' . ' ' . $this->form_errors['street'] . '</span></td>';
150190 $form .= '</tr>';
151191
152 -
153192 // city
154193 $form .= '<tr>';
155 - $form .= '<td>' . Xml::label( wfMsg( 'payflowpro_gateway-donor-city' ), 'city' ) . '</td>';
156 - $form .= '<td>' . Xml::input( 'city', '30', $this->form_data['city'], array( 'maxlength' => '20', 'id' => 'city' ) ) .
 194+ $form .= '<td class="label">' . Xml::label( wfMsg( 'payflowpro_gateway-donor-city' ), 'city' ) . '</td>';
 195+ $form .= '<td>' . Xml::input( 'city', '30', $this->form_data['city'], array( 'type' => 'text', 'maxlength' => '20', 'id' => 'city', 'class' => 'fullwidth' ) ) .
157196 '<span class="creditcard-error-msg">' . ' ' . $this->form_errors['city'] . '</span></td>';
158197 $form .= '</tr>';
159198
160199 // state
161200 $form .= '<tr>';
162 - $form .= '<td>' . Xml::label( wfMsg( 'payflowpro_gateway-donor-state' ), 'state' ) . '</td>';
163 - $form .= '<td>' . $this->generateStateDropdown() . '<span class="creditcard-error-msg">' . ' ' . $this->form_errors['state'] . '</span></td>';
 201+ $form .= '<td class="label">' . Xml::label( wfMsg( 'payflowpro_gateway-donor-state' ), 'state' ) . '</td>';
 202+ $form .= '<td>' . $this->generateStateDropdown() . ' ' . wfMsg( 'payflowpro_gateway-state-in-us' ) . '<span class="creditcard-error-msg">' . ' ' . $this->form_errors['state'] . '</span></td>';
164203 $form .= '</tr>';
165204
166205 // zip
167206 $form .= '<tr>';
168 - $form .= '<td>' . Xml::label( wfMsg( 'payflowpro_gateway-donor-postal' ), 'zip' ) . '</td>';
169 - $form .= '<td>' . Xml::input( 'zip', '30', $this->form_data['zip'], array( 'maxlength' => '9', 'id' => 'zip' ) ) .
 207+ $form .= '<td class="label">' . Xml::label( wfMsg( 'payflowpro_gateway-donor-postal' ), 'zip' ) . '</td>';
 208+ $form .= '<td>' . Xml::input( 'zip', '30', $this->form_data['zip'], array( 'type' => 'text', 'maxlength' => '9', 'id' => 'zip', 'class' => 'fullwidth' ) ) .
170209 '<span class="creditcard-error-msg">' . ' ' . $this->form_errors['zip'] . '</span></td>';
171210 $form .= '</tr>';
172 -
173 - // email
 211+
 212+ // country
174213 $form .= '<tr>';
175 - $form .= '<td>' . Xml::label( wfMsg( 'payflowpro_gateway-donor-email' ), 'emailAdd' ) . '</td>';
176 - $form .= '<td>' . Xml::input( 'emailAdd', '30', $this->form_data['email'], array( 'maxlength' => '64', 'id' => 'emailAdd' ) ) .
177 - '<span class="creditcard-error-msg">' . ' ' . $this->form_errors['emailAdd'] . '</span></td>';
178 - $form .= '</tr>';
 214+ $form .= '<td class="label">' . Xml::label( wfMsg( 'payflowpro_gateway-donor-country' ), 'country' ) . '</td>';
 215+ $form .= '<td>' . $this->generateCountryDropdown() . '<span class="creditcard-error-msg">' . ' ' . $this->form_errors['country'] . '</span></td>';
 216+ $form .= '</tr>';
179217
180218 return $form;
181219 }
——@@ -183,7 +221,6 @@
184222 $form = '';
185223 // credit card info
186224 $form .= Xml::openElement( 'div', array( 'id' => 'payflowpro_gateway-payment-info' ));
187 - $form .= Xml::tags( 'h3', array( 'class' => 'payflow-cc-form-header', 'id' => 'payflow-cc-form-header-payment' ), wfMsg( 'payflowpro_gateway-cc-form-header-payment' ));
188225 $form .= Xml::openElement( 'table', array( 'id' => 'payflow-table-cc' ) );
189226
190227 $form .= $this->generatePaymentFields();
——@@ -199,47 +236,7 @@
200237 $card_num = ( $wgPayflowGatewayTest ) ? $this->form_data[ 'card_num' ] : '';
201238 $cvv = ( $wgPayflowGatewayTest ) ? $this->form_data[ 'cvv' ] : '';
202239
203 - // amount
204 - $form = '<tr>';
205 - $form .= '<td>' . Xml::label(wfMsg( 'payflowpro_gateway-amount-legend' ), 'amount', array( 'maxlength' => '10' ) ) . '</td>';
206 - $form .= '<td>' . Xml::input( 'amount', '7', $this->form_data['amount'], array( 'id' => 'amount' ) ) .
207 - '<span class="creditcard-error-msg">' . ' ' . $this->form_errors['invalidamount'] . '</span>';
208 - $form .= $this->generateCurrencyDropdown() . '</td>';
209 - $form .= '</tr>';
210 -
211 - // card logos
212 - $form .= '<tr>';
213 - $form .= '<td />';
214 - $form .= '<td>' . Xml::element( 'img', array( 'src' => $wgScriptPath . "/extensions/DonationInterface/payflowpro_gateway/includes/credit_card_logos.gif" )) . '</td>';
215 - $form .= '</tr>';
216 -
217 - // credit card type
218 - $form .= '<tr>';
219 - $form .= '<td>' . Xml::label( wfMsg( 'payflowpro_gateway-donor-card' ), 'card' ) . '</td>';
220 - $form .= '<td>' . $this->generateCardDropdown() . '</td>';
221 - $form .= '</tr>';
222 -
223 - // card number
224 - $form .= '<tr>';
225 - $form .= '<td>' . Xml::label( wfMsg( 'payflowpro_gateway-donor-card-num' ), 'card_num' ) . '</td>';
226 - $form .= '<td>' . Xml::input( 'card_num', '30', $card_num, array( 'maxlength' => '100', 'id' => 'card_num', 'autocomplete' => 'off' ) ) .
227 - '<span class="creditcard-error-msg">' . ' ' . $this->form_errors['card_num'] . '</span>' .
228 - '<span class="creditcard-error-msg">' . ' ' . $this->form_errors['card'] . '</span></td>';
229 - $form .= '</tr>';
230 -
231 - // expiry
232 - $form .= '<tr>';
233 - $form .= '<td>' . Xml::label( wfMsg( 'payflowpro_gateway-donor-expiration' ), 'expiration' ) . '</td>';
234 - $form .= '<td>' . $this->generateExpiryMonthDropdown() . $this->generateExpiryYearDropdown() . '</td>';
235 - $form .= '</tr>';
236 -
237 - // cvv
238 - $form .= '<tr>';
239 - $form .= '<td>' . Xml::label( wfMsg( 'payflowpro_gateway-donor-security' ), 'cvv' ) . '</td>';
240 - $form .= '<td>' . Xml::input( 'cvv', '5', $cvv, array( 'maxlength' => '10', 'id' => 'cvv', 'autocomplete' => 'off') ) .
241 - '<a href="javascript:PopupCVV();">' . wfMsg( 'word-separator' ) . wfMsg( 'payflowpro_gateway-cvv-link' ) . '</a>' .
242 - '<span class="creditcard-error-msg">' . ' ' . $this->form_errors['cvv'] . '</span></td>';
243 - $form .= '</tr>';
 240+ $form = '';
244241
245242 return $form;
246243 }
Index: trunk/extensions/DonationInterface/payflowpro_gateway/forms/TwoColumnLetter.php
——@@ -23,7 +23,7 @@
2424 $form .= Xml::openElement( 'div', array( 'id' => 'payflowpro_gateway-cc_form_container'));
2525
2626 $form .= Xml::openElement( 'div', array( 'id' => 'payflowpro_gateway-cc_form_form', 'class' => 'payflowpro_gateway-cc_form_column'));
27 - $form .= Xml::Tags( 'p', array( 'id' => 'payflowpro_gateway-cc_otherways' ), wfMsg( 'payflowpro_gateway-otherways' ));
 27+ $form .= Xml::Tags( 'p', array( 'id' => 'payflowpro_gateway-cc_otherways' ), wfMsg( 'payflowpro_gateway-paypal' ));
2828
2929 $form .= Xml::openElement( 'div', array( 'id' => 'mw-creditcard' ) );
3030
——@@ -48,7 +48,6 @@
4949 $form .= Xml::openElement( 'form', array( 'name' => 'payment', 'method' => 'post', 'action' => '', 'onsubmit' => 'return validate_form(this)', 'autocomplete' => 'off' ) );
5050
5151 $form .= parent::generatePersonalContainer();
52 - $form .= parent::generatePaymentContainer();
5352 $form .= $this->generateCommentFields();
5453 return $form;
5554 }
——@@ -86,22 +85,22 @@
8786
8887 //comment
8988 $form .= '<tr>';
90 - $form .= '<td>' . Xml::label( wfMsg('donate_interface-comment-label'), 'comment' ) . '</td>';
91 - $form .= '<td>' . Xml::input( 'comment', '30', $this->form_data[ 'comment' ], array( 'maxlength' => '200' )) . '</td>';
 89+ $form .= '<td class="label">' . Xml::label( wfMsg('payflowpro_gateway-comment'), 'comment' ) . '</td>';
 90+ $form .= '<td class="comment-field">' . Xml::input( 'comment', '30', $this->form_data[ 'comment' ], array( 'type' => 'text', 'maxlength' => '200', 'class' => 'fullwidth' )) . '</td>';
9291 $form .= '</tr>';
9392
9493 // anonymous
9594 $comment_opt_value = ( $this->form_data[ 'numAttempt' ] ) ? $this->form_data[ 'comment-option' ] : true;
9695 $form .= '<tr>';
97 - $form .= '<td>' . Xml::check( 'comment-option', $comment_opt_value ) . '</td>';
98 - $form .= '<td>' . Xml::label( wfMsg( 'donate_interface-anon-message' ), 'comment-option' ) . '</td>';
 96+ $form .= '<td class="check-option" colspan="2">' . Xml::check( 'comment-option', $comment_opt_value );
 97+ $form .= ' ' . Xml::label( wfMsg( 'donate_interface-anon-message' ), 'comment-option' ) . '</td>';
9998 $form .= '</tr>';
10099
101100 // email agreement
102101 $email_opt_value = ( $this->form_data[ 'numAttempt' ]) ? $this->form_data[ 'email-opt' ] : true;
103102 $form .= '<tr>';
104 - $form .= '<td>' . Xml::check( 'email-opt', $email_opt_value ) . '</td>';
105 - $form .= '<td>';
 103+ $form .= '<td class="check-option" colspan="2">' . Xml::check( 'email-opt', $email_opt_value );
 104+ $form .= ' ';
106105 // put the label inside Xml::openElement so any HTML in the msg might get rendered (right, Germany?)
107106 $form .= Xml::openElement( 'label', array( 'for' => 'email-opt' ));
108107 $form .= wfMsg( 'donate_interface-email-agreement' );
——@@ -142,9 +141,22 @@
143142 }
144143
145144 $form .= Xml::closeElement( 'form' ); // close form 'payment'
 145+ $form .= <<<EOT
 146+<script type="text/javascript">
 147+var fname = document.getElementById('fname');
 148+var lname = document.getElementById('lname');
 149+if (fname.value == '') {
 150+ fname.style.color = '#999999';
 151+ fname.value = 'First';
 152+}
 153+if (lname.value == '') {
 154+ lname.style.color = '#999999';
 155+ lname.value = 'Last';
 156+}
 157+</script>
 158+EOT;
 159+ //$form .= $this->generateDonationFooter();
146160
147 - $form .= $this->generateDonationFooter();
148 -
149161 $form .= Xml::closeElement( 'div' ); //close div#mw-creditcard
150162 $form .= Xml::closeElement( 'div' ); //close div#payflowpro_gateway-cc_form_form
151163 $form .= Xml::closeElement( 'div' ); //close div#payflowpro_gateway-cc_form_container
Index: trunk/extensions/DonationInterface/payflowpro_gateway/payflowpro_gateway.i18n.php
——@@ -10,7 +10,7 @@
1111
1212 /** English */
1313 $messages['en'] = array(
14 - 'payflowprogateway' => 'Support Wikimedia',
 14+ 'payflowprogateway' => 'Support Wikipedia with your secure donation',
1515 'payflowpro_gateway-desc' => 'PayPal Payflow Pro credit card processing',
1616 'payflowpro_gateway-accessible' => 'This page is only accessible from the donation page.',
1717 'payflowpro_gateway-form-message' => 'Use the form below to donate with a credit card, or ',
——@@ -18,26 +18,26 @@
1919 'payflowpro_gateway-form-message-2' => 'To change amount or currency, return to <a href="https://www.mediawiki.org/index.php?title=Donate">the donation page</a>',
2020 'payflowpro_gateway-donor-legend' => 'Donor information',
2121 'payflowpro_gateway-card-legend' => 'Credit card information',
22 - 'payflowpro_gateway-amount-legend' => 'Donation amount:',
23 - 'payflowpro_gateway-cvv-link' => 'Example',
 22+ 'payflowpro_gateway-amount-legend' => 'Donation amount',
 23+ 'payflowpro_gateway-cvv-link' => 'Where is this?',
2424 'payflowpro_gateway-donor-legend' => 'Donor information',
25 - 'payflowpro_gateway-donor-amount' => 'Amount:',
26 - 'payflowpro_gateway-donor-currency-label' => 'Currency:',
27 - 'payflowpro_gateway-donor-email' => 'E-mail address:',
28 - 'payflowpro_gateway-donor-fname' => 'First name:',
29 - 'payflowpro_gateway-donor-mname' => 'Middle name:',
30 - 'payflowpro_gateway-donor-lname' => 'Last name:',
31 - 'payflowpro_gateway-donor-name' => 'Name:',
32 - 'payflowpro_gateway-donor-street' => 'Street:',
33 - 'payflowpro_gateway-donor-city' => 'City:',
34 - 'payflowpro_gateway-donor-state' => 'State:',
35 - 'payflowpro_gateway-donor-postal' => 'Postal code:',
36 - 'payflowpro_gateway-donor-country' => 'Country/Region:',
37 - 'payflowpro_gateway-donor-address'=> 'Address:',
38 - 'payflowpro_gateway-donor-card' => 'Credit card:',
39 - 'payflowpro_gateway-donor-card-num' => 'Card number:',
40 - 'payflowpro_gateway-donor-expiration' => 'Expiration date:',
41 - 'payflowpro_gateway-donor-security' => 'Security code:',
 25+ 'payflowpro_gateway-donor-amount' => 'Amount',
 26+ 'payflowpro_gateway-donor-currency-label' => 'Currency',
 27+ 'payflowpro_gateway-donor-email' => 'Email address',
 28+ 'payflowpro_gateway-donor-name' => 'Name',
 29+ 'payflowpro_gateway-donor-fname' => 'First name',
 30+ 'payflowpro_gateway-donor-mname' => 'Middle name',
 31+ 'payflowpro_gateway-donor-lname' => 'Last name',
 32+ 'payflowpro_gateway-donor-street' => 'Street',
 33+ 'payflowpro_gateway-donor-city' => 'City',
 34+ 'payflowpro_gateway-donor-state' => 'State',
 35+ 'payflowpro_gateway-donor-postal' => 'Postal code',
 36+ 'payflowpro_gateway-donor-country' => 'Country/Region',
 37+ 'payflowpro_gateway-donor-address'=> 'Address',
 38+ 'payflowpro_gateway-donor-card' => 'Credit card',
 39+ 'payflowpro_gateway-donor-card-num' => 'Card number',
 40+ 'payflowpro_gateway-donor-expiration' => 'Expiration date',
 41+ 'payflowpro_gateway-donor-security' => 'Security code',
4242 'payflowpro_gateway-donor-submit' => 'Donate',
4343 'payflowpro_gateway-donor-currency-msg' => 'This donation is being made in $1',
4444 'payflow_gateway-card-name-amex' => 'American Express',
——@@ -94,12 +94,15 @@
9595 <p>The code is <i>always</i> located <i>above</i> the embossed (raised) account number on the face of the card.
9696 In some instances, the code is located on the left side of the card, but is always above the account number.</p><br />',
9797 'payflowpro_gateway-question-comment' => 'Questions or comments? Contact: <a href="mailto:donate@wikimedia.org">donate@wikimedia.org</a>',
98 - 'payflowpro_gateway-donate-click' => 'After clicking "{{int:payflowpro_gateway-donor-submit}}", your credit card information will be processed.',
 98+ 'payflowpro_gateway-donate-click' => 'Your credit card will be securely processed.',
9999 'payflowpro_gateway-otherways' => 'There are <a href="http://wikimediafoundation.org/wiki/Ways_to_Give/en">other ways to give, including PayPal, check, or mail</a>.',
 100+ 'payflowpro_gateway-paypal' => 'Have a PayPal account? <a href="http://wikimediafoundation.org/wiki/2010_Paypal">Donate with PayPal</a>.',
100101 'payflowpro_gateway-credit-storage-processing' => 'We do not store your credit card information, and your personal data is subject to our <a href="http://wikimediafoundation.org/wiki/Donor_Privacy_Policy">privacy policy</a>.',
101102 'payflowpro_gateway-token-mismatch' => 'Your session has expired. Please try filling out and submitting the form again.',
102103 'payflowpro_gateway-cc-form-header-personal' => 'Billing information',
103104 'payflowpro_gateway-cc-form-header-payment' => 'Payment information',
 105+ 'payflowpro_gateway-state-in-us' => 'if inside the US',
 106+ 'payflowpro_gateway-comment' => 'Comment',
104107 );
105108
106109 /** Message documentation (Message documentation)
Index: trunk/extensions/DonationInterface/payflowpro_gateway/payflowpro_gateway.css
——@@ -7,7 +7,7 @@
88 }
99
1010 .mw-donate-submessage {
11 - padding-top: 10px;
 11+/* padding-top: 10px; */
1212 }
1313
1414 #mw-donate-submit-button {
——@@ -21,11 +21,13 @@
2222 }
2323
2424 #payflowpro_gateway-personal-info {
25 - margin-right: 5em;
 25+ margin-right: 4em;
 26+ margin-bottom: 1em;
2627 }
2728
2829 #payflowpro_gateway-form-submit {
29 - margin-top: 2em;
 30+ margin-top: 1em;
 31+ text-align: center;
3032 }
3133
3234 #payflowpro_gateway-donate-addl-info {
——@@ -39,11 +41,21 @@
4042 #payflow-table-donor {
4143 }
4244
43 -#payflow-table-donor label {
44 - text-align: left;
 45+#payflow-table-donor td.label, #payflow-table-comment td.label {
 46+ text-align: right;
4547 display: block;
 48+ padding-right: 1em;
 49+ width: 90px;
4650 }
4751
 52+#payflow-table-comment td.comment-field {
 53+ width: 99%;
 54+}
 55+
 56+#payflow-table-comment td.check-option {
 57+ padding-left: 3em;
 58+}
 59+
4860 #payflow-table-donor td {
4961 text-align: left;
5062 }
——@@ -52,10 +64,6 @@
5365 clear: both;
5466 }
5567
56 -.payflow-cc-form-section #payflowpro_gateway-form-submit {
57 - text-align: left;
58 -}
59 -
6068 #payflowpro_gateway-donate-addl-info-secure-logos {
6169 float: left;
6270 margin-right: 2em;
——@@ -83,3 +91,12 @@
8492 #ca-special {
8593 display: none;
8694 }
 95+
 96+#bodyContent input[type="text"], textarea {
 97+ border: 1px solid #C0C0C0;
 98+ padding: 3px;
 99+}
 100+
 101+input#fname { width: 110px; margin-right: 4px; }
 102+input#lname { width: 132px; }
 103+input.fullwidth { width: 254px; }

Comments

#Comment by Raymond (talk | contribs)   11:44, 6 October 2010

Two questions: 

-	'payflowprogateway' => 'Support Wikimedia',
+	'payflowprogateway' => 'Support Wikipedia with your secure donation',

Donors from Wikisource & co. see "Wikipedia" too. Is this your intention?

2. You have removed the colon from all labels. Should Translatewiki do this for all languages? Even the colon is proven practise in all MediaWiki forms.

#Comment by Kaldari (talk | contribs)   16:36, 6 October 2010

Yes, the fundraising trial this week will only be on Wikipedia and I have been instructed to make all of the landing pages Wikipedia branded for this week. The logo will change as well.

The colons were removed per the design I was given.

Status & tagging log