r77441 MediaWiki - Code Review archive

Repository:MediaWiki
Revision:r77440‎ | r77441 | r77442 >
Date:22:24, 29 November 2010
Author:awjrichards
Status:deferred
Tags:
Comment:
Merging from r77426 through r77440 of trunk
Modified paths:
  • /branches/fundraising/deployment/DonationInterface (modified) (history)
  • /branches/fundraising/deployment/DonationInterface/payflowpro_gateway/forms/TwoColumnLetter7.php (modified) (history)
  • /branches/fundraising/deployment/DonationInterface/payflowpro_gateway/forms/css/TwoColumnLetter7.css (modified) (history)

Diff [purge]

Index: branches/fundraising/deployment/DonationInterface/payflowpro_gateway/forms/TwoColumnLetter7.php
@@ -248,13 +248,13 @@
249249 $form .= '<tr>';
250250 $form .= '<td class="label""><div style="padding-top:9px;">' . wfMsg( 'payflowpro_gateway-payment-type' ) . '</div></td>';
251251 $form .= '<td>' .
252 - '<p style="border: 1px solid rgb(187, 187, 187); float: left; -moz-border-radius: 5px 5px 5px 5px; margin: 0 8px 0 0; padding: 5px 5px 5px 3px;">'.
 252+ '<p style="border: 1px solid rgb(187, 187, 187); float: left; -moz-border-radius: 5px 5px 5px 5px; margin: 0 8px 0 0; padding: 5px 5px 5px 3px; white-space: nowrap;">'.
253253 Xml::radio( 'card', 'cc1', $this->form_data['card'] == 'cc1', array( 'id' => 'cc1radio', 'onclick' => 'switchToCreditCard()' ) ) . '<label for="cc1radio">' . Xml::element( 'img', array( 'src' => $wgScriptPath . "/extensions/DonationInterface/payflowpro_gateway/includes/card-visa.png" ) ). '</label>' .
254254 '&nbsp;<label for="cc1radio">' . Xml::element( 'img', array( 'src' => $wgScriptPath . "/extensions/DonationInterface/payflowpro_gateway/includes/card-mastercard.png" ) ). '</label>' .
255255 '&nbsp;<label for="cc1radio">' . Xml::element( 'img', array( 'src' => $wgScriptPath . "/extensions/DonationInterface/payflowpro_gateway/includes/card-amex.png" ) ). '</label>' .
256256 '&nbsp;<label for="cc1radio">' . Xml::element( 'img', array( 'src' => $wgScriptPath . "/extensions/DonationInterface/payflowpro_gateway/includes/card-discover.png" ) ). '</label>' .
257257 '</p>'.
258 - '<p style="border: 1px solid transparent; float: left; -moz-border-radius: 5px 5px 5px 5px; margin: 0; padding: 5px 5px 5px 3px;">'.
 258+ '<p style="border: 1px solid transparent; float: left; -moz-border-radius: 5px 5px 5px 5px; margin: 0; padding: 5px 5px 5px 3px; white-space: nowrap;">'.
259259 Xml::radio( 'card', 'pp', $this->form_data['card'] == 'pp', array( 'id' => 'ppradio', 'onclick' => 'switchToPayPal()' ) ) . '<label for="ppradio">' . Xml::element( 'img', array( 'src' => $wgScriptPath . "/extensions/DonationInterface/payflowpro_gateway/includes/card-paypal.png" ) ) . '</label>' .
260260 '</p>'.
261261 '</td>';
Index: branches/fundraising/deployment/DonationInterface/payflowpro_gateway/forms/css/TwoColumnLetter7.css
@@ -98,7 +98,7 @@
9999 background-color:#cce7cd;
100100 border:1px solid #5EAC58;
101101 padding:16px 24px 24px;
102 - width:440px;
 102+ width:430px;
103103 }
104104 #donate-head {
105105 border:none;
Property changes on: branches/fundraising/deployment/DonationInterface
___________________________________________________________________
Modified: svn:mergeinfo
106106 Merged /trunk/extensions/DonationInterface:r77426-77440

Past revisions this follows-up on

RevisionCommit summaryAuthorDate
r77426Merging from r77254 through r77425 of trunkawjrichards18:47, 29 November 2010
r77440regex tweakjeroendedauw21:40, 29 November 2010

Status & tagging log