r101939 MediaWiki - Code Review archive

Repository:MediaWiki
Revision:r101938‎ | r101939 | r101940 >
Date:01:12, 4 November 2011
Author:awjrichards
Status:deferred
Tags:
Comment:
Modified paths:
  • /branches/fundraising/deployment/payments_1.17/extensions/DonationInterface (modified) (history)
  • /branches/fundraising/deployment/payments_1.17/extensions/DonationInterface/gateway_forms (modified) (history)
  • /branches/fundraising/deployment/payments_1.17/extensions/DonationInterface/gateway_forms/RapidHtml.php (modified) (history)
  • /branches/fundraising/deployment/payments_1.17/extensions/DonationInterface/gateway_forms/rapidhtml/RapidHtmlResources.php (modified) (history)
  • /branches/fundraising/deployment/payments_1.17/extensions/DonationInterface/gateway_forms/rapidhtml/css/Webitects.css (deleted) (history)
  • /branches/fundraising/deployment/payments_1.17/extensions/DonationInterface/gateway_forms/rapidhtml/css/webitects.css (added) (history)
  • /branches/fundraising/deployment/payments_1.17/extensions/DonationInterface/gateway_forms/rapidhtml/css/webitects.ie6.css (added) (history)
  • /branches/fundraising/deployment/payments_1.17/extensions/DonationInterface/gateway_forms/rapidhtml/js/jquery.ezpz_hint.js (deleted) (history)
  • /branches/fundraising/deployment/payments_1.17/extensions/DonationInterface/gateway_forms/rapidhtml/js/webitects.js (deleted) (history)
  • /branches/fundraising/deployment/payments_1.17/extensions/DonationInterface/globalcollect_gateway/forms/css/webitects_2_3step.css (deleted) (history)
  • /branches/fundraising/deployment/payments_1.17/extensions/DonationInterface/globalcollect_gateway/forms/css/webitects_2_3step.ie6.css (deleted) (history)
  • /branches/fundraising/deployment/payments_1.17/extensions/DonationInterface/globalcollect_gateway/forms/html/webitects_2_3step-CA.html (added) (history)
  • /branches/fundraising/deployment/payments_1.17/extensions/DonationInterface/globalcollect_gateway/forms/html/webitects_2_3step.html (modified) (history)
  • /branches/fundraising/deployment/payments_1.17/extensions/DonationInterface/payflowpro_gateway (modified) (history)
  • /branches/fundraising/deployment/payments_1.17/extensions/DonationInterface/payflowpro_gateway/forms (modified) (history)
  • /branches/fundraising/deployment/payments_1.17/extensions/DonationInterface/payflowpro_gateway/forms/css/webitects_2_3step.css (deleted) (history)
  • /branches/fundraising/deployment/payments_1.17/extensions/DonationInterface/payflowpro_gateway/forms/css/webitects_2_3step.ie6.css (deleted) (history)
  • /branches/fundraising/deployment/payments_1.17/extensions/DonationInterface/payflowpro_gateway/forms/html/webitects_2_3step-CA.html (added) (history)
  • /branches/fundraising/deployment/payments_1.17/extensions/DonationInterface/payflowpro_gateway/forms/html/webitects_2_3step.html (modified) (history)

Diff [purge]

Index: branches/fundraising/deployment/payments_1.17/extensions/DonationInterface/payflowpro_gateway/forms/html/webitects_2_3step.html
@@ -1,5 +1,5 @@
22 <script type="text/javascript">
3 - mw.loader.load('pfp.form.rapidhtml.webitects_2_3step');
 3+ mw.loader.load('pfp.form.rapidhtml.webitects');
44 // these must go through RapidHTML and thus are inline
55 var amountErrors = ['#general|escape','#retryMsg|escape','#amount|escape'];
66 var billingErrors = ['#fname|escape','#lname|escape','#city|escape','#country|escape','#street|escape','#state|escape','#zip|escape','#emailAdd|escape'];
@@ -9,7 +9,7 @@
1010 </script>
1111 <!--[if lt IE 7]>
1212 <script type="text/javascript">
13 - mw.loader.load('pfp.form.rapidhtml.webitects_2_3step.ie6');
 13+ mw.loader.load('pfp.form.rapidhtml.webitects.ie6');
1414 </script>
1515 <style type="text/css">
1616 body{
Index: branches/fundraising/deployment/payments_1.17/extensions/DonationInterface/payflowpro_gateway/forms/html/webitects_2_3step-CA.html
@@ -0,0 +1,215 @@
 2+<script type="text/javascript">
 3+ mw.loader.load('pfp.form.rapidhtml.webitects');
 4+ // these must go through RapidHTML and thus are inline
 5+ var amountErrors = ['#general|escape','#retryMsg|escape','#amount|escape'];
 6+ var billingErrors = ['#fname|escape','#lname|escape','#city|escape','#country|escape','#street|escape','#state|escape','#zip|escape','#emailAdd|escape'];
 7+ var paymentErrors = ['#card_num|escape','#card_type|escape','#cvv|escape'];
 8+ var actionURL = "@action";
 9+ var scriptPath = "@script_path";
 10+</script>
 11+<!--[if lt IE 7]>
 12+<script type="text/javascript">
 13+ mw.loader.load('pfp.form.rapidhtml.webitects.ie6');
 14+</script>
 15+<style type="text/css">
 16+ body{
 17+ behavior: url("@script_path/skins/vector/csshover.min.htc");
 18+ }
 19+</style><![endif]-->
 20+<!--[if IE 7]>
 21+<style>
 22+ .gainlayout {
 23+ zoom: 1;
 24+ height: 1%;
 25+ }
 26+</style>
 27+<![endif]-->
 28+
 29+<div class="ltr">
 30+ <table id="layouttable">
 31+ <tr>
 32+ <td>
 33+ <div id="appeal">
 34+ <div id="appeal-content">
 35+ <h2 id="appeal-head"> <span class="mw-headline">{{LanguageSwitch|2011FR/@appeal-title|@language}}</span></h2>
 36+ <div id="appeal-body" class="plainlinks">{{LanguageSwitch|2011FR/@appeal|@language}}</div>
 37+ </div>
 38+ </div>
 39+ </td>
 40+
 41+ <td>
 42+ <div id="donate">
 43+ <div id="donate-content">
 44+ <div id="donate-body" style="padding: 0 1em;">
 45+ <div id="step1header"><h3>%donate_interface-amount-legend% <span id="selected-amount">(CAD)</span> <span class="mute" id="change-amount" style="display: none;">(<a href="#">%donate_interface-change%</a>)</span></h3></div>
 46+
 47+ <form method="post" name="paypalcontribution">
 48+ <div id="step1wrapper">
 49+ <div id="amtErrorMessages" class="small"></div>
 50+ <table id="amount-table-white">
 51+ <tr>
 52+ <td><label><input id="amountRadio0" type="radio" name="amountRadio" value="5" /> <span id="amountSpan0">$5</span></label></td>
 53+ <td><label><input id="amountRadio1" type="radio" name="amountRadio" value="10" /> <span id="amountSpan1">$10</span></label></td>
 54+ <td><label><input id="amountRadio2" type="radio" name="amountRadio" value="20" /> <span id="amountSpan2">$20</span></label></td>
 55+ <td><label><input id="amountRadio3" type="radio" name="amountRadio" value="50" /> <span id="amountSpan3">$50</span></label></td>
 56+ </tr>
 57+ <tr>
 58+ <td><label><input id="amountRadio4" type="radio" name="amountRadio" value="75" /> <span id="amountSpan4">$75</span></label></td>
 59+ <td><label><input id="amountRadio5" type="radio" name="amountRadio" value="100" /> <span id="amountSpan5">$100</span></label></td>
 60+ <td><label><input id="amountRadio6" type="radio" name="amountRadio" value="250" /> <span id="amountSpan6">$250</span></label></td>
 61+ <td><input type="radio" name="amountRadio" id="input_amount_other" value="other" /> <label><span id="amountSpanOther">$</span><input type="text" class="txt-sm hint" name="amountGiven" size="4" id="other-amount" title="%donate_interface-other%" placeholder="%donate_interface-other%" onfocus="this.form.input_amount_other.checked=true;"/></label></td>
 62+ </tr>
 63+ </table>
 64+
 65+ <p class="donate-options">
 66+ <input class="btn" id="cc" type="button" value="%donate_interface-cc-button%" /><br />
 67+ <input class="btn" id="pp" type="button" value="%donate_interface-paypal-button%"/><span id='loading'></span>
 68+ </p>
 69+ </div>
 70+ <div id="step2header"><h3>%donate_interface-billing-address% <span class="mute" id="change-billing" style="display: none;">(<a href="#">%donate_interface-change%</a>)</span></h3></div>
 71+ <div id="step2wrapper">
 72+ <div id="billing-content" class="gainlayout">
 73+ <div id="billingErrorMessages" class="small"></div>
 74+ <div class="name-fields">
 75+ <span class="name-first"><input class="txt" id="fname" name="fname" title="%donate_interface-donor-fname%" value="@fname" placeholder="%donate_interface-donor-fname%"/></span>
 76+ <span class="name-last"><input class="txt" id="lname" name="lname" title="%donate_interface-donor-lname%" value="@lname" placeholder="%donate_interface-donor-lname%"/></span>
 77+ </div>
 78+ <div class="loc-fields">
 79+ <span class="loc-street"><input class="txt" id="street" name="street" title="%donate_interface-donor-street%" value="@street" placeholder="%donate_interface-donor-street%"/></span>
 80+ <span class="loc-city"><input class="txt" id="city" name="city" title="%donate_interface-donor-city%" value="@city" placeholder="%donate_interface-donor-city%"/></span>
 81+ <span class="loc-state">
 82+ <select id="state" name="state" class="txt" value="@state" >
 83+ <option value=""></option>
 84+ <option value=""></option><option value="AB">AB</option><option value="BC">BC</option><option value="MB">MB</option><option value="NB">NB</option><option value="NL">NL</option><option value="NS">NS</option><option value="ON">ON</option><option value="PE">PE</option><option value="QC">QC</option><option value="SK">SK</option>
 85+ </select>
 86+ </span>
 87+ <span class="loc-postal"><input class="txt" id="zip" name="zip" title="%donate_interface-zip%" value="@zip" placeholder="%donate_interface-donor-postal%"/></span> <!-- TODO: use postal code on non-US -->
 88+ </div>
 89+ <p><input class="txt" title="%donate_interface-donor-email%" id="emailAdd" name="emailAdd" value="@emailAdd" placeholder="%donate_interface-donor-email%"/></p>
 90+
 91+
 92+ <dl class="">
 93+ <dt><span class="label">Select credit card</span></dt>
 94+ <dd class="field" style="margin-bottom: 0;">
 95+ <ul class="options-h" id="cards" style="margin: 0;">
 96+ <li><input id="cc-visa" name="cardtype" type="radio" value="Visa" class="cardradio" /> <label for="cc-visa"><img alt="Visa" src="@script_path/extensions/DonationInterface/gateway_forms/includes/card-visa.png" /></label></li>
 97+ <li><input id="cc-mastercard" name="cardtype" type="radio" value="MasterCard" class="cardradio" /> <label for="cc-mastercard"><img alt="MasterCard" src="@script_path/extensions/DonationInterface/gateway_forms/includes/card-mastercard.png" /></label></li>
 98+ <li><input id="cc-amex" name="cardtype" type="radio" value="American Express" class="cardradio" /> <label for="cc-amex"><img alt="American Express" src="@script_path/extensions/DonationInterface/gateway_forms/includes/card-amex.png" /></label></li>
 99+ <li><input id="cc-discover" name="cardtype" type="radio" value="Discover" class="cardradio" /> <label for="cc-discover"><img alt="Discover" src="@script_path/extensions/DonationInterface/gateway_forms/includes/card-discover.png" /></label></li>
 100+ </ul>
 101+ <div id="paymentContinue" style="margin-top: 10px; display: none;"> <input class="btn" id="paymentContinueBtn" type="button" value="Continue" /></div>
 102+ </dd>
 103+ </dl>
 104+ </div>
 105+ </div>
 106+ <div id="step3header"><h3>Payment Information <span class="mute" id="change-payment" style="display: none;">(<a href="#">Change</a>)</span></h3></div>
 107+ <div id="step3wrapper" style="display: none;">
 108+ <div id="payment" class="gainlayout">
 109+ <div id="paymentErrorMessages" class="small"></div>
 110+ <dl class="form">
 111+ <dt><span class="label"><label for="card_num">Card number</label></span></dt>
 112+ <dd class="field"><input class="txt" id="card_num" name="card_num" value="@card_num"/></dd>
 113+
 114+ <dt></dt>
 115+ <dd class="field">
 116+ <div class="l" style="margin-right: 5%;">
 117+ <span class="label">Expiration date</span>
 118+ <select id="mos" name="mos">
 119+ <option value="">Month</option>
 120+ <option value="01">01 - January</option>
 121+ <option value="02">02 - February</option>
 122+ <option value="03">03 - March</option>
 123+ <option value="04">04 - April</option>
 124+ <option value="05">05 - May</option>
 125+ <option value="06">06 - June</option>
 126+ <option value="07">07 - July</option>
 127+ <option value="08">08 - August</option>
 128+ <option value="09">09 - September</option>
 129+ <option value="10">10 - October</option>
 130+ <option value="11">11 - November</option>
 131+ <option value="12">12 - December</option>
 132+ </select>
 133+
 134+ <select id="year" name="year">
 135+ <option value="">Year</option>
 136+ <option value="2011">2011</option>
 137+ <option value="2012">2012</option>
 138+ <option value="2013">2013</option>
 139+ <option value="2014">2014</option>
 140+ <option value="2015">2015</option>
 141+ <option value="2016">2016</option>
 142+ <option value="2017">2017</option>
 143+ <option value="2018">2018</option>
 144+ <option value="2019">2019</option>
 145+ <option value="2020">2020</option>
 146+ </select>
 147+ </div>
 148+ <div class="l">
 149+ <label class="label" for="cvv">Security code</label>
 150+ <input class="txt-sm" id="cvv" name="cvv" value="@cvv"/>
 151+ <a class="mute" href="#" id="where">Where?</a>
 152+ </div>
 153+
 154+ <div class="clear" id="codes" style="display: none;"><img alt="Security codes" src="@script_path/extensions/DonationInterface/gateway_forms/includes/security-code.png" /></div>
 155+ </dd>
 156+
 157+ <dt></dt>
 158+ <dd class="field">
 159+ <input id="submitcreditcard" class="btn" type="button" value="Submit donation" />
 160+ <p class="mute"><img alt="" src="@script_path/extensions/DonationInterface/gateway_forms/includes/padlock.gif" /> Your credit card will be securely processed.</p>
 161+ </dd>
 162+ </dl>
 163+ </div>
 164+ </div>
 165+
 166+ <input type="hidden" name="gateway" value="payflowpro" id="gateway" />
 167+ <input type="hidden" name="returnto" value="Thank_You/en" />
 168+ <input type="hidden" value="0" name="PaypalRedirect" id="PaypalRedirect">
 169+ <input type="hidden" value="@card" name="card" id="card">
 170+
 171+ <input type="hidden" value="@amount" name="amount" />
 172+ <input type="hidden" value="CA" name="country" id="country" />
 173+ <input type="hidden" value="@expiration" name="expiration" id="expiration"/>
 174+ <input type="hidden" value="CAD" name="currency_code" />
 175+ <input type="hidden" value="@utm_source" name="utm_source"/>
 176+ <input type="hidden" value="@utm_medium" name="utm_medium"/>
 177+ <input type="hidden" value="@utm_campaign" name="utm_campaign"/>
 178+ <input type="hidden" value="@language" name="language"/>
 179+ <input type="hidden" value="@referrer" name="referrer"/>
 180+ <input type="hidden" value="@comment" name="comment"/>
 181+ <input type="hidden" value="@comment-option" name="comment-option"/>
 182+ <input type="hidden" value="@email-opt" name="email-opt"/>
 183+ <input type="hidden" value="processed" name="payment_method"/>
 184+ <input type="hidden" value="@token" name="token"/>
 185+ <input type="hidden" value="@order_id" name="order_id"/>
 186+ <input type="hidden" value="@numAttempt" name="numAttempt"/>
 187+ <input type="hidden" value="@contribution_tracking_id" name="contribution_tracking_id"/>
 188+ <input type="hidden" value="@data_hash" name="data_hash"/>
 189+ <input type="hidden" value="@owa_session" name="owa_session"/>
 190+ <input type="hidden" value="@owa_ref" name="owa_ref"/>
 191+ <!-- new required fields -->
 192+ <input type="hidden" value="@gateway" name="gateway"/>
 193+ <input type="hidden" value="@payment_method" name="payment_method"/>
 194+ </form>
 195+ <div id="where-content">
 196+ {{LanguageSwitch|2011FR/core-appeal-whitebox-nodiv|@language}}
 197+ </div>
 198+ </div>
 199+ </div>
 200+ <p id="informationsharing">%donate_interface-informationsharing%</p>
 201+ <!-- TODO: links inside the message or not? -->
 202+ <ul id="moreinfolinks">
 203+ <li><a href="http://wikimediafoundation.org/wiki/Monthly_donations/en/US">%donate_interface-monthly-donation%</a></li><!-- TODO: localize the link -->
 204+ <li>%donate_interface-otherways-short%</li><!-- TODO: localize the link -->
 205+ <li><a href="http://wikimediafoundation.org/wiki/FAQ/en">%donate_interface-faqs%</a></li><!-- TODO: localize the link -->
 206+ <!--<li><a href="">%donate_interface-tax-info%</a></li>--><!-- TODO: localize the link -->
 207+ </ul>
 208+ </div>
 209+ </td>
 210+ </tr>
 211+ </table>
 212+</div>
 213+
 214+<!-- Wikimedia Project logo
 215+<li id="footer-copyrightico"><a href="https://www.mediawiki.org//wikimediafoundation.org/"><img src="//bits.wikimedia.org/images/wikimedia-button.png" width="88" height="31" alt="Wikimedia Foundation"/></a></li>
 216+ -->
Property changes on: branches/fundraising/deployment/payments_1.17/extensions/DonationInterface/payflowpro_gateway/forms/html/webitects_2_3step-CA.html
___________________________________________________________________
Added: svn:eol-style
1217 + native
Index: branches/fundraising/deployment/payments_1.17/extensions/DonationInterface/payflowpro_gateway/forms/css/webitects_2_3step.css
@@ -1,90 +0,0 @@
2 -#errorMessages {
3 - font-size: 0.75em;
4 - color: #FF0000;
5 -}
6 -/* Force vertical scrollbar
7 - html { overflow-y: scroll; }
8 - */
9 -/* Accordion */
10 -#accordion h3 {
11 - background: #FFFFFF;
12 - border: none;
13 - font-size: 1.1em;
14 - margin: 0;
15 - padding: 0.5em 0.9em;
16 - outline: 0;
17 -}
18 -.accordion-content {
19 - padding: 0.9em;
20 -}
21 -#step2accordion {
22 - display: none;
23 -}
24 -
25 -/* Layout */
26 -table#layouttable tr td {
27 - vertical-align: top;
28 -}
29 -
30 -#appeal {
31 - /*width: 100%;*/
32 - padding-right: 25px;
33 -}
34 -#appeal-content {
35 - /*padding-right: 380px;*/
36 -}
37 -.clear {
38 - clear: both;
39 -}
40 -#donate {
41 - /*float: left;*/
42 - /*margin-left: -350px;*/
43 - width: 350px;
44 -}
45 -#donate-content {
46 - background-color: #FFFFFF;
47 - border: 1px solid #000000;
48 - padding: 1em 0;
49 - font-size: 0.95em;
50 - /* Maybe */
51 - width: 348px;
52 -}
53 -#amount-table-white label {
54 - font-size: 1.1em;
55 -}
56 -
57 -#donate-body h3 {
58 - font-size: 17px;
59 -}
60 -
61 -#step1wrapper, #step2wrapper, #step3wrapper {
62 - width: 325px;
63 -}
64 -/* Initially hide steps 2 and 3 */
65 -#step2wrapper, #step2header, #step3wrapper, #step3header {
66 - display: none;
67 -}
68 -#where-content {
69 - font-size: 13px;
70 - line-height: 19px;
71 - width: 325px;
72 -}
73 -
74 -#amtErrorMessages, #billingErrorMessages, #paymentErrorMessages {
75 - color: #F00;
76 -}
77 -.txt{
78 - margin: 0 !important;
79 -}
80 -#billingContent span {
81 - margin: 0 !important;
82 -}
83 -p#informationsharing {
84 - padding: 0 15px;
85 - line-height: 14px;
86 - font-size: 11px;
87 -}
88 -ul#moreinfolinks li{
89 - list-style: none !important;
90 - list-style-image: none !important;
91 -}
\ No newline at end of file
Index: branches/fundraising/deployment/payments_1.17/extensions/DonationInterface/payflowpro_gateway/forms/css/webitects_2_3step.ie6.css
@@ -1,35 +0,0 @@
2 -/* style for IE6 + IE5.5 + IE5.0 */
3 -.gainlayout {
4 - height: 0 !important;
5 -}
6 -
7 -/* fix the input sizes on the billing address form */
8 -span.name-first input{
9 - width: 140px !important;
10 -}
11 -span.name-last input{
12 - width: 140px !important;
13 -}
14 -span.loc-street input{
15 - width: 305px !important;
16 -}
17 -span.loc-city input{
18 - width: 140px !important;
19 -}
20 -span.loc-postal input{
21 - width: 48px !important;
22 -}
23 -#emailAdd{
24 - width: 305px !important;
25 -}
26 -#select-credit-card{
27 - margin-bottom: 10px;
28 -}
29 -
30 -#donate, #donate-content{
31 - width: 340px !important;
32 -}
33 -
34 -#where-content, #step1wrapper, #step2wrapper, #step3wrapper{
35 - width: 330px !important;
36 -}
\ No newline at end of file
Property changes on: branches/fundraising/deployment/payments_1.17/extensions/DonationInterface/payflowpro_gateway/forms
___________________________________________________________________
Modified: svn:mergeinfo
371 Merged /trunk/extensions/DonationInterface/payflowpro_gateway/forms:r101852,101929
Property changes on: branches/fundraising/deployment/payments_1.17/extensions/DonationInterface/payflowpro_gateway
___________________________________________________________________
Modified: svn:mergeinfo
382 Merged /trunk/extensions/DonationInterface/payflowpro_gateway:r101852,101929
Index: branches/fundraising/deployment/payments_1.17/extensions/DonationInterface/gateway_forms/rapidhtml/RapidHtmlResources.php
@@ -5,7 +5,8 @@
66 * This file is included in DonationInterface/payflowpro_gateway.php
77 */
88
9 -$wgPayflowRapidHtmlRemoteExtPath = 'DonationInterface/gateway_forms/rapidhtml';
 9+$wgDonationInterfaceRapidHtmlRemoteExtPath = 'DonationInterface/gateway_forms/rapidhtml';
 10+$wgPayflowRapidHtmlRemoteExtPath = 'DonationInterface/payflowpro_gateway/rapidhtml';
1011 $wgGlobalCollectRapidHtmlRemoteExtPath = 'DonationInterface/globalcollect_gateway/forms';
1112
1213 /**
@@ -46,63 +47,71 @@
4748 /**
4849 * webitects
4950 */
50 -$wgResourceModules[ 'pfp.form.rapidhtml.webitects' ] = array(
 51+$wgResourceModules[ 'di.form.rapidhtml.webitects' ] = array(
5152 'styles' => array(
5253 'css/lp1.css',
53 - 'css/Webitects.css',
 54+ 'css/webitects.css',
5455 ),
55 - 'scripts' => array(
56 - ),
57 - 'dependencies' => array(
58 - 'jquery.ui.accordion',
59 - 'pfp.form.core.validate'
60 - ),
 56+ 'scripts' => '',
 57+ 'dependencies' => 'jquery.ui.accordion',
6158 'localBasePath' => dirname( __FILE__ ),
62 - 'remoteExtPath' => $wgPayflowRapidHtmlRemoteExtPath,
 59+ 'remoteExtPath' => $wgDonationInterfaceRapidHtmlRemoteExtPath,
6360 );
64 -$wgResourceModules[ 'gc.form.rapidhtml.webitects_2_3step' ] = array(
65 - 'styles' => array(
66 - 'css/webitects_2_3step.css',
67 - ),
68 - 'scripts' => array(
69 - 'js/webitects_2_3step.js',
70 - ),
71 - 'dependencies' => array(
72 - 'pfp.form.rapidhtml.webitects'
73 - ),
 61+$wgResourceModules[ 'di.form.rapidhtml.webitects.ie6' ] = array(
 62+ 'styles' => 'css/webitects.ie6.css',
 63+ 'scripts' => '',
 64+ 'dependencies' => 'di.form.rapidhtml.webitects',
 65+ 'localBasePath' => dirname( __FILE__ ),
 66+ 'remoteExtPath' => $wgDonationInterfaceRapidHtmlRemoteExtPath,
 67+);
 68+//$wgResourceModules[ 'di.form.rapidhtml.webitects.2nd' ] = array(
 69+// 'styles' => 'css/webitects2nd.css',
 70+// 'dependencies' => 'di.form.rapidhtml.webitects',
 71+// 'localBasePath' => dirname( __FILE__ ),
 72+// 'remoteExtPath' => $wgDonationInterfaceRapidHtmlRemoteExtPath,
 73+//);
 74+
 75+// GlobalCollect
 76+$wgResourceModules[ 'gc.form.rapidhtml.webitects' ] = array(
 77+ 'styles' => '', //'css/webitects_2_3step.css',
 78+ 'scripts' => 'js/webitects_2_3step.js',
 79+ 'dependencies' => 'di.form.rapidhtml.webitects',
7480 'localBasePath' => dirname( __FILE__ ).'/../../globalcollect_gateway/forms',
7581 'remoteExtPath' => $wgGlobalCollectRapidHtmlRemoteExtPath,
7682 );
77 -$wgResourceModules[ 'gc.form.rapidhtml.webitects_2_3step.ie6' ] = array(
78 - 'styles' => array(
79 - 'css/webitects_2_3step.ie6.css',
80 - ),
 83+$wgResourceModules[ 'gc.form.rapidhtml.webitects.ie6' ] = array(
8184 'dependencies' => array(
82 - 'gc.form.rapidhtml.webitects_2_3step'
 85+ 'di.form.rapidhtml.webitects.ie6',
 86+ 'gc.form.rapidhtml.webitects'
8387 ),
8488 'localBasePath' => dirname( __FILE__ ).'/../../globalcollect_gateway/forms',
8589 'remoteExtPath' => $wgGlobalCollectRapidHtmlRemoteExtPath,
8690 );
 91+//$wgResourceModules[ 'gc.form.rapidhtml.webitects.2nd' ] = array(
 92+// 'styles' => '',
 93+// 'dependencies' => array(
 94+// 'gc.form.rapidhtml.webitects',
 95+// 'di.form.rapidhtml.webitects.2nd'
 96+// ),
 97+// 'localBasePath' => dirname( __FILE__ ).'/../../globalcollect_gateway/forms',
 98+// 'remoteExtPath' => $wgGlobalCollectRapidHtmlRemoteExtPath,
 99+//);
87100
88 -$wgResourceModules[ 'pfp.form.rapidhtml.webitects_2_3step' ] = array(
89 - 'styles' => array(
90 - 'css/webitects_2_3step.css',
91 - ),
92 - 'scripts' => array(
93 - 'js/webitects_2_3step.js',
94 - ),
 101+// PayflowPro
 102+$wgResourceModules[ 'pfp.form.rapidhtml.webitects' ] = array(
 103+ 'styles' => '',
 104+ 'scripts' => 'js/webitects_2_3step.js',
95105 'dependencies' => array(
96 - 'pfp.form.rapidhtml.webitects'
 106+ 'di.form.rapidhtml.webitects',
 107+ 'pfp.form.core.validate'
97108 ),
98109 'localBasePath' => dirname( __FILE__ ).'/../../payflowpro_gateway/forms',
99110 'remoteExtPath' => $wgPayflowRapidHtmlRemoteExtPath,
100111 );
101 -$wgResourceModules[ 'pfp.form.rapidhtml.webitects_2_3step.ie6' ] = array(
102 - 'styles' => array(
103 - 'css/webitects_2_3step.ie6.css',
104 - ),
 112+$wgResourceModules[ 'pfp.form.rapidhtml.webitects.ie6' ] = array(
105113 'dependencies' => array(
106 - 'pfp.form.rapidhtml.webitects_2_3step'
 114+ 'di.form.rapidhtml.webitects.ie6',
 115+ 'pfp.form.rapidhtml.webitects',
107116 ),
108117 'localBasePath' => dirname( __FILE__ ).'/../../payflowpro_gateway/forms',
109118 'remoteExtPath' => $wgPayflowRapidHtmlRemoteExtPath,
Index: branches/fundraising/deployment/payments_1.17/extensions/DonationInterface/gateway_forms/rapidhtml/css/Webitects.css
@@ -1,118 +0,0 @@
2 -/*------------------+
3 - | Site: Wikipedia |
4 - | Part: New styles |
5 - | File: new.css |
6 - +------------------*/
7 -
8 -.l { float: left; }
9 -.r { float: right; }
10 -hr { margin: 1.5em 0 0.5em; }
11 -h3 span { font-weight: normal; }
12 -
13 -/* Amounts */
14 -#amount-table td { white-space: nowrap; }
15 -
16 -/* Callouts */
17 -.call-l { float: left; margin: 0.2em 1em 1em 0; }
18 -.call-l, .call-r { background: #fff; border: 1px solid #444; font-size: 13px; padding: 15px 20px; }
19 -.call-l h3, .call-r h3 { font-size: 17px; }
20 -.call-l .loading, .call-r .loading { background-image: url(https://payments.wikimedia.org/extensions/DonationInterface/payflowpro_gateway/forms/rapidhtml/images/loading-white.gif); }
21 -.call-r { float: right; margin: 0.2em 0 1em 1em; }
22 -
23 -/* Loading */
24 -#loading { font-size: 12px; margin-left: 0.5em; vertical-align: middle; }
25 -.loading { background: url(https://payments.wikimedia.org/extensions/DonationInterface/payflowpro_gateway/forms/rapidhtml/images/loading-green.gif) no-repeat 50% 50%; padding: 10px; }
26 -
27 -/* Muted text */
28 -.mute { font-size: 12px; }
29 -
30 -
31 -/*-------------------+
32 - | Site: Wikipedia |
33 - | Part: Form styles |
34 - | File: forms.css |
35 - +-------------------*/
36 -
37 -
38 -/* Specifics
39 -======================================================================*/
40 -/* Buttons */
41 -.btn { display: inline-block; font-size: 12px; }
42 -
43 -/* Donate options */
44 -.donate-options input { width: 15em; }
45 -
46 -/* Continue button */
47 -#paymentContinue input { width: 15em; }
48 -
49 -/* Checklists */
50 -.checklist { border: 1px solid #ccc; max-height: 20em; line-height: 1.4; margin: 0 0 1em 0; overflow: auto; }
51 -.checklist input { margin-bottom: 1px; }
52 -.checklist label { display: block; padding: 0.1em 0 0.1em 25px; height: 1%; text-indent: -25px; }
53 -.checklist li { background: none; display: block; float: none; margin: 0; padding: 0; white-space: normal; width: 100%; }
54 -.checklist li p { margin: 0; padding: 1em 0 0; }
55 -.checklist li ul { margin: 0 0 0 2em; }
56 -.checklist .mute { font-size: 1em; white-space: nowrap; }
57 -.checklist p { font-weight: bold; margin-bottom: 0.25em; }
58 -.checklist .selected { background: #ffa; }
59 -.checklist ul { margin-bottom: 1em; }
60 -
61 -/* Fields */
62 -.form { clear: both; font-size: 1.1em; height: 1%; }
63 -.form dd { margin: 0; }
64 -.form dt { clear: both; font-weight: normal; margin: 0.5em 0 0; }
65 -.form dt:first-child { margin: 0; }
66 -.form .label, span.label { display: block; font-size: 14px; font-weight: normal; }
67 -.field { margin: 0 0 1em; overflow: hidden; position: relative; }
68 -.field p { margin-bottom: 0.25em; }
69 -
70 -/* Location */
71 -.loc-fields span { float: left; margin-bottom: 5px; }
72 -.loc-fields .loc-city { margin-right: 1%; width: 51%; }
73 -.loc-fields .loc-postal { width: 18%; }
74 -.loc-fields .loc-state { margin-right: 4%; width: 22%; }
75 -.loc-fields .loc-street { margin-bottom: 5px; width: 100%; }
76 -
77 -/* Name */
78 -.name-fields span { float: left; margin: 0 2% 5px 0; width: 48%; }
79 -.name-fields .name-last { margin: 0; }
80 -
81 -/* Help text */
82 -.field-help { color: #666; font-size: 0.8em; font-weight: normal; }
83 -
84 -/* Hints */
85 -.ezpz-hint { color: #777; font-style: italic; }
86 -
87 -/* Options */
88 -.form .options-h, .form .options-v { margin: 0; }
89 -.options-h, .options-v { list-style: none; margin: 0 0 1em 0; }
90 -.options-h img, .options-v img { vertical-align: middle; }
91 -.options-h li, .options-v li { background: none; margin-bottom: 0.3em; padding: 0; }
92 -.options-h li { display: inline; line-height: 2.5; margin-right: 0.3em; white-space: nowrap; }
93 -.options-h li select { vertical-align: middle; }
94 -.options-h li:last-child { margin: 0; }
95 -.form .options-v { margin-top: 5px; }
96 -.options-v li { padding-left: 25px; text-indent: -25px; }
97 -
98 -/* Text boxes */
99 -textarea.txt { width: 99%; }
100 -select.txt { padding: 0.2em; }
101 -
102 -.txt, .txt-date, .txt-med, .txt-sm {
103 - border: 1px solid #ccc;
104 - -moz-box-shadow: inset 0 1px 1px #ddd;
105 - -webkit-box-shadow: inset 0 1px 1px #ddd;
106 - box-shadow: inset 0 0 1px #ddd;
107 - margin-right: 0.5em;
108 - padding: 0.3em;
109 - vertical-align: middle;
110 -}
111 -
112 -.txt { width: 95%; }
113 -.txt-date { width: 7em; }
114 -.txt-med { width: 47%; }
115 -.txt-sm { width: 4em; }
116 -
117 -/* overrides of payflowpro.css */
118 -input#fname { width: 95%; margin-right: 4px; }
119 -input#lname { width: 95%; }
\ No newline at end of file
Index: branches/fundraising/deployment/payments_1.17/extensions/DonationInterface/gateway_forms/rapidhtml/css/webitects.css
@@ -0,0 +1,211 @@
 2+/*------------------+
 3+ | Site: Wikipedia |
 4+ | Part: New styles |
 5+ | File: new.css |
 6+ +------------------*/
 7+
 8+.l { float: left; }
 9+.r { float: right; }
 10+hr { margin: 1.5em 0 0.5em; }
 11+h3 span { font-weight: normal; }
 12+
 13+/* Amounts */
 14+#amount-table td { white-space: nowrap; }
 15+
 16+/* Callouts */
 17+.call-l { float: left; margin: 0.2em 1em 1em 0; }
 18+.call-l, .call-r { background: #fff; border: 1px solid #444; font-size: 13px; padding: 15px 20px; }
 19+.call-l h3, .call-r h3 { font-size: 17px; }
 20+.call-l .loading, .call-r .loading { background-image: url(https://payments.wikimedia.org/extensions/DonationInterface/payflowpro_gateway/forms/rapidhtml/images/loading-white.gif); }
 21+.call-r { float: right; margin: 0.2em 0 1em 1em; }
 22+
 23+/* Loading */
 24+#loading { font-size: 12px; margin-left: 0.5em; vertical-align: middle; }
 25+.loading { background: url(https://payments.wikimedia.org/extensions/DonationInterface/payflowpro_gateway/forms/rapidhtml/images/loading-green.gif) no-repeat 50% 50%; padding: 10px; }
 26+
 27+/* Muted text */
 28+.mute { font-size: 12px; }
 29+
 30+
 31+/*-------------------+
 32+ | Site: Wikipedia |
 33+ | Part: Form styles |
 34+ | File: forms.css |
 35+ +-------------------*/
 36+
 37+
 38+/* Specifics
 39+======================================================================*/
 40+/* Buttons */
 41+.btn { display: inline-block; font-size: 12px; }
 42+
 43+/* Donate options */
 44+.donate-options input { width: 15em; }
 45+
 46+/* Continue button */
 47+#paymentContinue input { width: 15em; }
 48+
 49+/* Checklists */
 50+.checklist { border: 1px solid #ccc; max-height: 20em; line-height: 1.4; margin: 0 0 1em 0; overflow: auto; }
 51+.checklist input { margin-bottom: 1px; }
 52+.checklist label { display: block; padding: 0.1em 0 0.1em 25px; height: 1%; text-indent: -25px; }
 53+.checklist li { background: none; display: block; float: none; margin: 0; padding: 0; white-space: normal; width: 100%; }
 54+.checklist li p { margin: 0; padding: 1em 0 0; }
 55+.checklist li ul { margin: 0 0 0 2em; }
 56+.checklist .mute { font-size: 1em; white-space: nowrap; }
 57+.checklist p { font-weight: bold; margin-bottom: 0.25em; }
 58+.checklist .selected { background: #ffa; }
 59+.checklist ul { margin-bottom: 1em; }
 60+
 61+/* Fields */
 62+.form { clear: both; font-size: 1.1em; height: 1%; }
 63+.form dd { margin: 0; }
 64+.form dt { clear: both; font-weight: normal; margin: 0.5em 0 0; }
 65+.form dt:first-child { margin: 0; }
 66+.form .label, span.label { display: block; font-size: 14px; font-weight: normal; }
 67+.field { margin: 0 0 1em; overflow: hidden; position: relative; }
 68+.field p { margin-bottom: 0.25em; }
 69+
 70+/* Location */
 71+.loc-fields span { float: left; margin-bottom: 5px; }
 72+.loc-fields .loc-city { margin-right: 1%; width: 51%; }
 73+.loc-fields .loc-postal { width: 22%; }
 74+.loc-fields .loc-state { margin-right: 0%; width: 22%; }
 75+.loc-fields .loc-street { margin-bottom: 5px; width: 100%; }
 76+
 77+/* Name */
 78+.name-fields span { float: left; margin: 0 2% 5px 0; width: 48%; }
 79+.name-fields .name-last { margin: 0; }
 80+
 81+/* Help text */
 82+.field-help { color: #666; font-size: 0.8em; font-weight: normal; }
 83+
 84+/* Hints */
 85+.ezpz-hint { color: #777; font-style: italic; }
 86+
 87+/* Options */
 88+.form .options-h, .form .options-v { margin: 0; }
 89+.options-h, .options-v { list-style: none; margin: 0 0 1em 0; }
 90+.options-h img, .options-v img { vertical-align: middle; }
 91+.options-h li, .options-v li { background: none; margin-bottom: 0.3em; padding: 0; }
 92+.options-h li { display: inline; line-height: 2.5; margin-right: 0.3em; white-space: nowrap; }
 93+.options-h li select { vertical-align: middle; }
 94+.options-h li:last-child { margin: 0; }
 95+.form .options-v { margin-top: 5px; }
 96+.options-v li { padding-left: 25px; text-indent: -25px; }
 97+
 98+/* Text boxes */
 99+textarea.txt { width: 99%; }
 100+select.txt { padding: 0.2em; }
 101+
 102+.txt, .txt-date, .txt-med, .txt-sm {
 103+ border: 1px solid #ccc;
 104+ -moz-box-shadow: inset 0 1px 1px #ddd;
 105+ -webkit-box-shadow: inset 0 1px 1px #ddd;
 106+ box-shadow: inset 0 0 1px #ddd;
 107+ margin-right: 0.5em;
 108+ padding: 0.3em;
 109+ vertical-align: middle;
 110+}
 111+
 112+.txt { width: 95%; }
 113+.txt-date { width: 7em; }
 114+.txt-med { width: 47%; }
 115+.txt-sm { width: 4em; }
 116+
 117+/* overrides of payflowpro.css */
 118+input#fname { width: 95% !important; margin-right: 4px; }
 119+input#lname { width: 95% !important; }
 120+
 121+
 122+/* 2_3step additions */
 123+#errorMessages {
 124+ font-size: 0.75em;
 125+ color: #FF0000;
 126+}
 127+/* Force vertical scrollbar
 128+ html { overflow-y: scroll; }
 129+ */
 130+/* Accordion */
 131+#accordion h3 {
 132+ background: #FFFFFF;
 133+ border: none;
 134+ font-size: 1.1em;
 135+ margin: 0;
 136+ padding: 0.5em 0.9em;
 137+ outline: 0;
 138+}
 139+.accordion-content {
 140+ padding: 0.9em;
 141+}
 142+#step2accordion {
 143+ display: none;
 144+}
 145+
 146+/* Layout */
 147+table#layouttable tr td {
 148+ vertical-align: top;
 149+}
 150+
 151+#appeal {
 152+ /*width: 100%;*/
 153+ padding-right: 25px;
 154+}
 155+#appeal-content {
 156+ /*padding-right: 380px;*/
 157+}
 158+.clear {
 159+ clear: both;
 160+}
 161+#donate {
 162+ /*float: left;*/
 163+ /*margin-left: -350px;*/
 164+ width: 350px;
 165+}
 166+#donate-content {
 167+ background-color: #FFFFFF;
 168+ border: 1px solid #000000;
 169+ padding: 1em 0;
 170+ font-size: 0.95em;
 171+ /* Maybe */
 172+ width: 348px;
 173+}
 174+#amount-table-white label {
 175+ font-size: 1.1em;
 176+}
 177+
 178+#donate-body h3 {
 179+ font-size: 17px;
 180+}
 181+
 182+#step1wrapper, #step2wrapper, #step3wrapper {
 183+ width: 325px;
 184+}
 185+/* Initially hide steps 2 and 3 */
 186+#step2wrapper, #step2header, #step3wrapper, #step3header {
 187+ display: none;
 188+}
 189+#where-content {
 190+ font-size: 13px;
 191+ line-height: 19px;
 192+ width: 325px;
 193+}
 194+
 195+#amtErrorMessages, #billingErrorMessages, #paymentErrorMessages {
 196+ color: #F00;
 197+}
 198+.txt{
 199+ margin: 0 !important;
 200+}
 201+#billingContent span {
 202+ margin: 0 !important;
 203+}
 204+p#informationsharing {
 205+ padding: 0 15px;
 206+ line-height: 14px;
 207+ font-size: 11px;
 208+}
 209+ul#moreinfolinks li{
 210+ list-style: none !important;
 211+ list-style-image: none !important;
 212+}
\ No newline at end of file
Index: branches/fundraising/deployment/payments_1.17/extensions/DonationInterface/gateway_forms/rapidhtml/css/webitects.ie6.css
@@ -0,0 +1,35 @@
 2+/* style for IE6 + IE5.5 + IE5.0 */
 3+.gainlayout {
 4+ height: 0 !important;
 5+}
 6+
 7+/* fix the input sizes on the billing address form */
 8+span.name-first input{
 9+ width: 140px !important;
 10+}
 11+span.name-last input{
 12+ width: 140px !important;
 13+}
 14+span.loc-street input{
 15+ width: 305px !important;
 16+}
 17+span.loc-city input{
 18+ width: 140px !important;
 19+}
 20+span.loc-postal input{
 21+ width: 48px !important;
 22+}
 23+#emailAdd{
 24+ width: 305px !important;
 25+}
 26+#select-credit-card{
 27+ margin-bottom: 10px;
 28+}
 29+
 30+#donate, #donate-content{
 31+ width: 340px !important;
 32+}
 33+
 34+#where-content, #step1wrapper, #step2wrapper, #step3wrapper{
 35+ width: 330px !important;
 36+}
\ No newline at end of file
Property changes on: branches/fundraising/deployment/payments_1.17/extensions/DonationInterface/gateway_forms/rapidhtml/css/webitects.ie6.css
___________________________________________________________________
Added: svn:eol-style
137 + native
Index: branches/fundraising/deployment/payments_1.17/extensions/DonationInterface/gateway_forms/rapidhtml/js/jquery.ezpz_hint.js
@@ -1,62 +0,0 @@
2 -// EZPZ Hint v1.1.1; Copyright (c) 2009 Mike Enriquez, http://theezpzway.com; Released under the MIT License
3 -(function($){
4 - $.fn.ezpz_hint = function(options){
5 - var defaults = {
6 - hintClass: 'ezpz-hint',
7 - hintName: 'ezpz_hint_dummy_input'
8 - };
9 - var settings = $.extend(defaults, options);
10 -
11 - return this.each(function(){
12 - var hint;
13 - var dummy_input;
14 -
15 - // grab the input's title attribute
16 - text = $(this).attr('title');
17 -
18 - // create a dummy input and place it before the input
19 - $('<input type="text" name="temp" value="" />').insertBefore($(this));
20 -
21 - // set the dummy input's attributes
22 - hint = $(this).prev('input:first');
23 - hint.attr('class', $(this).attr('class'));
24 - hint.attr('size', $(this).attr('size'));
25 - hint.attr('name', settings.hintName);
26 - hint.attr('autocomplete', 'off');
27 - hint.attr('tabIndex', $(this).attr('tabIndex'));
28 - hint.addClass(settings.hintClass);
29 - hint.val(text);
30 -
31 - // hide the input
32 - $(this).hide();
33 -
34 - // don't allow autocomplete (sorry, no remember password)
35 - $(this).attr('autocomplete', 'off');
36 -
37 - // bind focus event on the dummy input to swap with the real input
38 - hint.focus(function(){
39 - dummy_input = $(this);
40 - $(this).next('input:first').show();
41 - $(this).next('input:first').focus();
42 - $(this).next('input:first').unbind('blur').blur(function(){
43 - if ($(this).val() == '') {
44 - $(this).hide();
45 - dummy_input.show();
46 - }
47 - });
48 - $(this).hide();
49 - });
50 -
51 - // swap if there is a default value
52 - if ($(this).val() != ''){
53 - hint.focus();
54 - };
55 -
56 - // remove the dummy inputs so that they don't get submitted
57 - $('form').submit(function(){
58 - $('.' + settings.hintName).remove();
59 - });
60 - });
61 -
62 - };
63 -})(jQuery);
\ No newline at end of file
Index: branches/fundraising/deployment/payments_1.17/extensions/DonationInterface/gateway_forms/RapidHtml.php
@@ -208,7 +208,7 @@
209209 * @return string The HTML form containing translated messages
210210 */
211211 public function add_messages( $html ) {
212 - global $wgRequest, $wgOut, $wgScriptPath;
 212+ global $wgRequest, $wgOut, $wgScriptPath, $wgDonationInterfaceMessageLinks;
213213 if( $wgRequest->getText( 'debug', 'false' ) == 'true' ){
214214 # do not replace tokens
215215 return $html;
@@ -217,16 +217,35 @@
218218 # replace interface messages
219219 # doing this before transclusion so that tokens can be passed as params (e.g. @language)
220220 $matches = array();
221 - preg_match_all( "/%([a-zA-Z0-9_-]+)%/", $html, $matches );
222 - foreach( $matches[1] as $msg_key ){
223 - $html = str_replace( '%' . $msg_key . '%', wfMsg( $msg_key ), $html );
 221+ preg_match_all( "/%([a-zA-Z0-9_-]+)(|(?:(?!%).)*)%/", $html, $matches );
 222+
 223+ foreach( $matches[ 1 ] as $i => $msg_key ){
 224+ if(isset($matches[ 2 ][ $i ]) && $matches[ 2 ][ $i ] != ''){
 225+ $params = explode( '|', trim( $matches[ 2 ][ $i ], '|' ) );
 226+
 227+ // replace link URLs with the global variable setting and pass language and country
 228+ foreach( $params as $k => $p ){
 229+ if( $p == "url" && isset( $wgDonationInterfaceMessageLinks[ $msg_key ] ) ){
 230+ $params[ $k ] = $wgDonationInterfaceMessageLinks[ $msg_key ];
 231+ if( strpos( $params[ $k ], '?' ) >= 0 ){
 232+ $params[ $k ] .= '&';
 233+ } else {
 234+ $params[ $k ] .= '?';
 235+ }
 236+ $params[ $k ] .= "language=" . $this->form_data['language']. "&country=" . $this->form_data['country'];
 237+ }
 238+ }
 239+ $html = str_replace( $matches[ 0 ][ $i ], wfMsg( $msg_key, $params ), $html );
 240+ } else {
 241+ $html = str_replace( '%' . $msg_key . '%', wfMsg( $msg_key ), $html );
 242+ }
224243 }
225244
226245 # do any requested tranclusion of templates
227246 $matches = array();
228247 preg_match_all( "/{{((?:(?!}).)+)}}/", $html, $matches );
229 - $i = 1;
230 - foreach( $matches[0] as $template ){
 248+
 249+ foreach( $matches[ 0 ] as $template ){
231250 # parse the template and replace in the html
232251 $html = str_replace( $template, $wgOut->parse( $template ), $html );
233252 }
Property changes on: branches/fundraising/deployment/payments_1.17/extensions/DonationInterface/gateway_forms
___________________________________________________________________
Modified: svn:mergeinfo
234253 Merged /trunk/extensions/DonationInterface/gateway_forms:r101852,101917,101929
Index: branches/fundraising/deployment/payments_1.17/extensions/DonationInterface/globalcollect_gateway/forms/html/webitects_2_3step.html
@@ -1,5 +1,5 @@
22 <script type="text/javascript">
3 - mw.loader.load('gc.form.rapidhtml.webitects_2_3step');
 3+ mw.loader.load('gc.form.rapidhtml.webitects');
44 // these must go through RapidHTML and thus are inline
55 var amountErrors = ['#general|escape','#retryMsg|escape','#amount|escape'];
66 var billingErrors = ['#fname|escape','#lname|escape','#city|escape','#country|escape','#street|escape','#state|escape','#zip|escape','#emailAdd|escape'];
@@ -9,7 +9,7 @@
1010 </script>
1111 <!--[if lt IE 7]>
1212 <script type="text/javascript">
13 - mw.loader.load('gc.form.rapidhtml.webitects_2_3step.ie6');
 13+ mw.loader.load('gc.form.rapidhtml.webitects.ie6');
1414 </script>
1515 <style type="text/css">
1616 body{
@@ -135,11 +135,11 @@
136136 </div>
137137 </div>
138138 </div>
139 - <p id="informationsharing">%donate_interface-informationsharing%</p>
 139+ <p id="informationsharing">%donate_interface-informationsharing|url%</p>
140140 <!-- TODO: links inside the message or not? -->
141141 <ul id="moreinfolinks">
142142 <li><a href="http://wikimediafoundation.org/wiki/Monthly_donations/en/US">%donate_interface-monthly-donation%</a></li><!-- TODO: localize the link -->
143 - <li>%donate_interface-otherways-short%</li><!-- TODO: localize the link -->
 143+ <li>%donate_interface-otherways-short|url%</li><!-- TODO: localize the link -->
144144 <li><a href="http://wikimediafoundation.org/wiki/FAQ/en">%donate_interface-faqs%</a></li><!-- TODO: localize the link -->
145145 <!--<li><a href="">%donate_interface-tax-info%</a></li>--><!-- TODO: localize the link -->
146146 </ul>
Index: branches/fundraising/deployment/payments_1.17/extensions/DonationInterface/globalcollect_gateway/forms/html/webitects_2_3step-CA.html
@@ -0,0 +1,156 @@
 2+<script type="text/javascript">
 3+ mw.loader.load('gc.form.rapidhtml.webitects');
 4+ // these must go through RapidHTML and thus are inline
 5+ var amountErrors = ['#general|escape','#retryMsg|escape','#amount|escape'];
 6+ var billingErrors = ['#fname|escape','#lname|escape','#city|escape','#country|escape','#street|escape','#state|escape','#zip|escape','#emailAdd|escape'];
 7+ var paymentErrors = ['#card_num|escape','#card_type|escape','#cvv|escape'];
 8+ var actionURL = "@action";
 9+ var scriptPath = "@script_path";
 10+</script>
 11+<!--[if lt IE 7]>
 12+<script type="text/javascript">
 13+ mw.loader.load('gc.form.rapidhtml.webitects.ie6');
 14+</script>
 15+<style type="text/css">
 16+ body{
 17+ behavior: url("@script_path/skins/vector/csshover.min.htc");
 18+ }
 19+</style><![endif]-->
 20+<!--[if IE 7]>
 21+<style>
 22+ .gainlayout {
 23+ zoom: 1;
 24+ height: 1%;
 25+ }
 26+</style>
 27+<![endif]-->
 28+
 29+<div class="ltr">
 30+ <table id="layouttable">
 31+ <tr>
 32+ <td>
 33+ <div id="appeal">
 34+ <div id="appeal-content">
 35+ <h2 id="appeal-head"> <span class="mw-headline">{{LanguageSwitch|2011FR/@appeal-title|@language}}</span></h2>
 36+ <div id="appeal-body" class="plainlinks">{{LanguageSwitch|2011FR/@appeal|@language}}</div>
 37+ </div>
 38+ </div>
 39+ </td>
 40+ <td>
 41+ <div id="donate">
 42+ <div id="donate-content">
 43+ <div id="donate-body" style="padding: 0 1em;">
 44+ <div id="step1header"><h3>%donate_interface-amount-legend% <span id="selected-amount">(CAD)</span> <span class="mute" id="change-amount" style="display: none;">(<a href="#">%donate_interface-change%</a>)</span></h3></div>
 45+
 46+ <form method="post" name="paypalcontribution">
 47+ <div id="step1wrapper">
 48+ <div id="amtErrorMessages" class="small"></div>
 49+ <table id="amount-table-white">
 50+ <tr>
 51+ <td><label><input id="amountRadio0" type="radio" name="amountRadio" value="5" /> <span id="amountSpan0">$5</span></label></td>
 52+ <td><label><input id="amountRadio1" type="radio" name="amountRadio" value="10" /> <span id="amountSpan1">$10</span></label></td>
 53+ <td><label><input id="amountRadio2" type="radio" name="amountRadio" value="20" /> <span id="amountSpan2">$20</span></label></td>
 54+ <td><label><input id="amountRadio3" type="radio" name="amountRadio" value="50" /> <span id="amountSpan3">$50</span></label></td>
 55+ </tr>
 56+ <tr>
 57+ <td><label><input id="amountRadio4" type="radio" name="amountRadio" value="75" /> <span id="amountSpan4">$75</span></label></td>
 58+ <td><label><input id="amountRadio5" type="radio" name="amountRadio" value="100" /> <span id="amountSpan5">$100</span></label></td>
 59+ <td><label><input id="amountRadio6" type="radio" name="amountRadio" value="250" /> <span id="amountSpan6">$250</span></label></td>
 60+ <td><input type="radio" name="amountRadio" id="input_amount_other" value="other" /> <label><span id="amountSpanOther">$</span><input type="text" class="txt-sm hint" name="amountGiven" size="4" id="other-amount" title="%donate_interface-other%" placeholder="%donate_interface-other%" onfocus="this.form.input_amount_other.checked=true;"/></label></td>
 61+ </tr>
 62+ </table>
 63+
 64+ <p class="donate-options">
 65+ <input class="btn" id="cc" type="button" value="%donate_interface-cc-button%" /><br />
 66+ <input class="btn" id="pp" type="button" value="%donate_interface-paypal-button%"/><span id='loading'></span>
 67+ </p>
 68+ </div>
 69+ <div id="step2header"><h3>%donate_interface-billing-address% <span class="mute" id="change-billing" style="display: none;">(<a href="#">%donate_interface-change%</a>)</span></h3></div>
 70+ <div id="step2wrapper">
 71+ <div id="billing-content" class="gainlayout">
 72+ <div id="billingErrorMessages" class="small"></div>
 73+ <div class="name-fields">
 74+ <span class="name-first"><input class="txt" id="fname" name="fname" title="%donate_interface-donor-fname%" value="@fname" placeholder="%donate_interface-donor-fname%"/></span>
 75+ <span class="name-last"><input class="txt" id="lname" name="lname" title="%donate_interface-donor-lname%" value="@lname" placeholder="%donate_interface-donor-lname%"/></span>
 76+ </div>
 77+ <div class="loc-fields">
 78+ <span class="loc-street"><input class="txt" id="street" name="street" title="%donate_interface-donor-street%" value="@street" placeholder="%donate_interface-donor-street%"/></span>
 79+ <span class="loc-city"><input class="txt" id="city" name="city" title="%donate_interface-donor-city%" value="@city" placeholder="%donate_interface-donor-city%"/></span>
 80+ <span class="loc-state">
 81+ <select id="state" name="state" class="txt" value="@state" >
 82+ <option value=""></option><option value="AB">AB</option><option value="BC">BC</option><option value="MB">MB</option><option value="NB">NB</option><option value="NL">NL</option><option value="NS">NS</option><option value="ON">ON</option><option value="PE">PE</option><option value="QC">QC</option><option value="SK">SK</option>
 83+ </select>
 84+ </span>
 85+ <span class="loc-postal"><input class="txt" id="zip" name="zip" title="%donate_interface-zip%" value="@zip" placeholder="%donate_interface-donor-postal%"/></span> <!-- TODO: use postal code on non-US -->
 86+ </div>
 87+ <p><input class="txt" title="%donate_interface-donor-email%" id="emailAdd" name="emailAdd" value="@emailAdd" placeholder="%donate_interface-donor-email%"/></p>
 88+
 89+ <dl class="">
 90+ <dt><span id="select-credit-card" class="label">%donate_interface-select-credit-card%</span></dt>
 91+ <dd class="field" style="margin-bottom: 0;">
 92+ <ul class="options-h" id="cards" style="margin: 0;">
 93+ <li><input id="cc-visa" name="cardtype" type="radio" value="visa" class="cardradio" /> <label for="cc-visa"><img alt="Visa" src="@script_path/extensions/DonationInterface/gateway_forms/includes/card-visa.png" /></label></li>
 94+ <li><input id="cc-mastercard" name="cardtype" type="radio" value="mastercard" class="cardradio" /> <label for="cc-mastercard"><img alt="MasterCard" src="@script_path/extensions/DonationInterface/gateway_forms/includes/card-mastercard.png" /></label></li>
 95+ <li><input id="cc-amex" name="cardtype" type="radio" value="american" class="cardradio" /> <label for="cc-amex"><img alt="American Express" src="@script_path/extensions/DonationInterface/gateway_forms/includes/card-amex.png" /></label></li>
 96+ <li><input id="cc-discover" name="cardtype" type="radio" value="discover" class="cardradio" /> <label for="cc-discover"><img alt="Discover" src="@script_path/extensions/DonationInterface/gateway_forms/includes/card-discover.png" /></label></li>
 97+ </ul>
 98+ <div id="paymentContinue" style="margin-top: 10px; display: none;"> <input class="btn" id="paymentContinueBtn" type="button" value="%donate_interface-continue%" /></div>
 99+ </dd>
 100+ </dl>
 101+ </div>
 102+ </div>
 103+ <div id="step3header"><h3>%donate_interface-cc-form-header-payment% <span class="mute" id="change-payment" style="display: none;">(<a href="#">%donate_interface-change%</a>)</span></h3></div>
 104+ <div id="step3wrapper" style="display: none;">
 105+ <div id="payment" class="gainlayout" style="height:314px;text-align:center;"></div>
 106+ </div>
 107+
 108+ <input type="hidden" name="returnto" value="Thank_You/en" />
 109+ <input type="hidden" value="0" name="PaypalRedirect" id="PaypalRedirect">
 110+
 111+ <input type="hidden" value="@amount" name="amount" />
 112+ <input type="hidden" value="CA" name="country" id="country" />
 113+ <input type="hidden" value="CAD" name="currency_code" />
 114+ <input type="hidden" value="@utm_source" name="utm_source"/>
 115+ <input type="hidden" value="@utm_medium" name="utm_medium"/>
 116+ <input type="hidden" value="@utm_campaign" name="utm_campaign"/>
 117+ <input type="hidden" value="@language" name="language"/>
 118+ <input type="hidden" value="@referrer" name="referrer"/>
 119+ <input type="hidden" value="@comment" name="comment"/>
 120+ <input type="hidden" value="@comment-option" name="comment-option"/>
 121+ <input type="hidden" value="@email-opt" name="email-opt"/>
 122+ <input type="hidden" value="@token" name="token"/>
 123+ <input type="hidden" value="@order_id" name="order_id"/>
 124+ <input type="hidden" value="@numAttempt" name="numAttempt"/>
 125+ <input type="hidden" value="@contribution_tracking_id" name="contribution_tracking_id"/>
 126+ <input type="hidden" value="@data_hash" name="data_hash"/>
 127+ <input type="hidden" value="@owa_session" name="owa_session"/>
 128+ <input type="hidden" value="@owa_ref" name="owa_ref"/>
 129+ <!-- new required fields -->
 130+ <input type="hidden" value="@gateway" name="gateway"/>
 131+ <input type="hidden" value="@payment_method" name="payment_method"/>
 132+ </form>
 133+ <div id="where-content">
 134+ {{LanguageSwitch|2011FR/core-appeal-whitebox-nodiv|@language}}
 135+ </div>
 136+ </div>
 137+ </div>
 138+ <p id="informationsharing">%donate_interface-informationsharing|url%</p>
 139+ <!-- TODO: links inside the message or not? -->
 140+ <ul id="moreinfolinks">
 141+ <li><a href="http://wikimediafoundation.org/wiki/Monthly_donations/en/US">%donate_interface-monthly-donation%</a></li><!-- TODO: localize the link -->
 142+ <li>%donate_interface-otherways-short|url%</li><!-- TODO: localize the link -->
 143+ <li><a href="http://wikimediafoundation.org/wiki/FAQ/en">%donate_interface-faqs%</a></li><!-- TODO: localize the link -->
 144+ <!--<li><a href="">%donate_interface-tax-info%</a></li>--><!-- TODO: localize the link -->
 145+ </ul>
 146+ </div>
 147+ </td>
 148+ </tr>
 149+ </table>
 150+
 151+
 152+
 153+</div>
 154+
 155+<!-- Wikimedia Project logo
 156+<li id="footer-copyrightico"><a href="https://www.mediawiki.org//wikimediafoundation.org/"><img src="//bits.wikimedia.org/images/wikimedia-button.png" width="88" height="31" alt="Wikimedia Foundation"/></a></li>
 157+ -->
Property changes on: branches/fundraising/deployment/payments_1.17/extensions/DonationInterface/globalcollect_gateway/forms/html/webitects_2_3step-CA.html
___________________________________________________________________
Added: svn:eol-style
1158 + native
Index: branches/fundraising/deployment/payments_1.17/extensions/DonationInterface/globalcollect_gateway/forms/css/webitects_2_3step.css
@@ -1,90 +0,0 @@
2 -#errorMessages {
3 - font-size: 0.75em;
4 - color: #FF0000;
5 -}
6 -/* Force vertical scrollbar
7 - html { overflow-y: scroll; }
8 - */
9 -/* Accordion */
10 -#accordion h3 {
11 - background: #FFFFFF;
12 - border: none;
13 - font-size: 1.1em;
14 - margin: 0;
15 - padding: 0.5em 0.9em;
16 - outline: 0;
17 -}
18 -.accordion-content {
19 - padding: 0.9em;
20 -}
21 -#step2accordion {
22 - display: none;
23 -}
24 -
25 -/* Layout */
26 -table#layouttable tr td {
27 - vertical-align: top;
28 -}
29 -
30 -#appeal {
31 - /*width: 100%;*/
32 - padding-right: 25px;
33 -}
34 -#appeal-content {
35 - /*padding-right: 380px;*/
36 -}
37 -.clear {
38 - clear: both;
39 -}
40 -#donate {
41 - /*float: left;*/
42 - /*margin-left: -350px;*/
43 - width: 350px;
44 -}
45 -#donate-content {
46 - background-color: #FFFFFF;
47 - border: 1px solid #000000;
48 - padding: 1em 0;
49 - font-size: 0.95em;
50 - /* Maybe */
51 - width: 348px;
52 -}
53 -#amount-table-white label {
54 - font-size: 1.1em;
55 -}
56 -
57 -#donate-body h3 {
58 - font-size: 17px;
59 -}
60 -
61 -#step1wrapper, #step2wrapper, #step3wrapper {
62 - width: 325px;
63 -}
64 -/* Initially hide steps 2 and 3 */
65 -#step2wrapper, #step2header, #step3wrapper, #step3header {
66 - display: none;
67 -}
68 -#where-content {
69 - font-size: 13px;
70 - line-height: 19px;
71 - width: 325px;
72 -}
73 -
74 -#amtErrorMessages, #billingErrorMessages, #paymentErrorMessages {
75 - color: #F00;
76 -}
77 -.txt{
78 - margin: 0 !important;
79 -}
80 -#billingContent span {
81 - margin: 0 !important;
82 -}
83 -p#informationsharing {
84 - padding: 0 15px;
85 - line-height: 14px;
86 - font-size: 11px;
87 -}
88 -ul#moreinfolinks li{
89 - list-style: none !important;
90 - list-style-image: none !important;
91 -}
\ No newline at end of file
Index: branches/fundraising/deployment/payments_1.17/extensions/DonationInterface/globalcollect_gateway/forms/css/webitects_2_3step.ie6.css
@@ -1,35 +0,0 @@
2 -/* style for IE6 + IE5.5 + IE5.0 */
3 -.gainlayout {
4 - height: 0 !important;
5 -}
6 -
7 -/* fix the input sizes on the billing address form */
8 -span.name-first input{
9 - width: 140px !important;
10 -}
11 -span.name-last input{
12 - width: 140px !important;
13 -}
14 -span.loc-street input{
15 - width: 305px !important;
16 -}
17 -span.loc-city input{
18 - width: 140px !important;
19 -}
20 -span.loc-postal input{
21 - width: 48px !important;
22 -}
23 -#emailAdd{
24 - width: 305px !important;
25 -}
26 -#select-credit-card{
27 - margin-bottom: 10px;
28 -}
29 -
30 -#donate, #donate-content{
31 - width: 340px !important;
32 -}
33 -
34 -#where-content, #step1wrapper, #step2wrapper, #step3wrapper{
35 - width: 330px !important;
36 -}
\ No newline at end of file
Property changes on: branches/fundraising/deployment/payments_1.17/extensions/DonationInterface
___________________________________________________________________
Modified: svn:mergeinfo
371 Merged /trunk/extensions/DonationInterface:r101852,101917,101929

Past revisions this follows-up on

RevisionCommit summaryAuthorDate
r101757Porting changes to pfp version of webitects_2_3steppgehres00:16, 3 November 2011
r101852Refactoring webitects forms to share common css and js between pfp and gc gat...pgehres19:01, 3 November 2011
r101917Fixing references to webitects_2_3step.ie6, FU r101852pgehres23:44, 3 November 2011
r101929Adding webitects_2_3step-CA for pfp and gc, also FU to r101917pgehres00:21, 4 November 2011

Status & tagging log