r103397 MediaWiki - Code Review archive

Repository:	MediaWiki
Revision:	< r103396‎ \| r103397 \| r103398 >
Date:	22:24, 16 November 2011
Author:	pgehres
Status:	ok
Tags:
Comment:	Merging changes from last night's tests into a 'super form'
Modified paths:	/trunk/extensions/DonationInterface/gateway_forms/rapidhtml/RapidHtmlResources.php (modified) (history) /trunk/extensions/DonationInterface/payflowpro_gateway/forms/css/TwoStepTwoColumnLetter3-orig.css (added) (history) /trunk/extensions/DonationInterface/payflowpro_gateway/forms/css/TwoStepTwoColumnLetter3.css (modified) (history) /trunk/extensions/DonationInterface/payflowpro_gateway/forms/html/TwoStepTwoColumnLetter3-orig.html (added) (history) /trunk/extensions/DonationInterface/payflowpro_gateway/forms/html/TwoStepTwoColumnLetter3.html (modified) (history)

Diff [purge]

Index: trunk/extensions/DonationInterface/payflowpro_gateway/forms/html/TwoStepTwoColumnLetter3-orig.html
—	—	@@ -0,0 +1,181 @@
	2	+<script type="text/javascript">
	3	+ mw.loader.load('pfp.form.rapidhtml.TwoStepTwoColumnLetter3');
	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	+
	12	+<table width="100%" cellspacing="0" cellpadding="0" border="0">
	13	+ <tbody>
	14	+ <tr>
	15	+ <td id="appeal" valign="top">
	16	+ {{LanguageSwitch\|2011FR/@appeal/text\|@language}}
	17	+ </td>
	18	+ <td id="donate" valign="top">
	19	+ <div id="greenBackground" class="">
	20	+ <noscript>
	21	+ <div id="noscript">
	22	+ <p id="noscript-msg">It appears that you do not have JavaScript enabled, or your browser does not support it. In order to provide a safe, secure and pleasant experience, our donation form requires JavaScript.</p><p id="noscript-redirect-msg">If you cannot or do not wish to enable JavaScript, you may still contribute by visiting:</p><p id="noscript-redirect-link"><a href="http://wikimediafoundation.org/wiki/DonateNonJS/en">http://wikimediafoundation.org/wiki/DonateNonJS/en</a></p>
	23	+ </div>
	24	+ </noscript>
	25	+
	26	+ <h2 id="donate-head">Please complete your donation below ...</h2>
	27	+
	28	+ <p id="topError" class="creditcard-error-msg"></p>
	29	+
	30	+ <form name="payment" method="post" action="@action" autocomplete="off">
	31	+ <div id="payflowpro_gateway-personal-info">
	32	+ <table id="payflow-table-donor">
	33	+ <tbody>
	34	+ <tr>
	35	+ <td colspan="2"><span class="creditcard-error-msg"></span></td>
	36	+ </tr>
	37	+ <tr>
	38	+ <td colspan="2">
	39	+ <table cellspacing="0" cellpadding="4" border="1" id="donation_amount">
	40	+ <tbody>
	41	+ <tr>
	42	+ <td class="amount_header">Description</td>
	43	+ <td class="amount_header" style="text-align:right;width:75px;">Amount</td>
	44	+ <td class="amount_header" style="text-align:right;width:75px;">Currency</td>
	45	+ </tr>
	46	+ <tr>
	47	+ <td class="amount_data">Donation</td>
	48	+ <td class="amount_data" style="text-align:right;width:75px;">@amount</td>
	49	+ <td class="amount_data" style="text-align:right;width:75px;">@currency_code</td>
	50	+ </tr>
	51	+ </tbody>
	52	+ </table>
	53	+ </td>
	54	+ </tr>
	55	+ <tr>
	56	+ <td colspan="2"><h3 class="cc_header">Billing information<img src="@script_path/extensions/DonationInterface/gateway_forms/includes/padlock.gif" style="vertical-align:baseline;margin-left:8px;"></h3></td>
	57	+ </tr>
	58	+ <tr>
	59	+ <td class="label"></td>
	60	+ <td><img src="@script_path/extensions/DonationInterface/gateway_forms/includes/credit_card_logos.gif"></td>
	61	+ </tr>
	62	+ <tr>
	63	+ <td class="label"><label for="card_num">Card number</label></td>
	64	+ <td><input name="card_num" size="30" value="@card_num" type="text" maxlength="100" id="card_num" class="fullwidth" autocomplete="off"></td>
	65	+ </tr>
	66	+ <tr>
	67	+ <td class="label"><label for="mos">Expiration date</label></td>
	68	+ <td><select name="mos" id="mos"><option value="01">1 (January)</option><option value="02">2 (February)</option><option value="03">3 (March)</option><option value="04">4 (April)</option><option value="05">5 (May)</option><option value="06">6 (June)</option><option value="07">7 (July)</option><option value="08">8 (August)</option><option value="09">9 (September)</option><option value="10">10 (October)</option><option value="11">11 (November)</option><option value="12">12 (December)</option></select> / <select name="year" id="year">
	69	+ <!--<option value="">Year</option>-->
	70	+ <option value="2011">2011</option>
	71	+ <option value="2012">2012</option>
	72	+ <option value="2013">2013</option>
	73	+ <option value="2014">2014</option>
	74	+ <option value="2015">2015</option>
	75	+ <option value="2016">2016</option>
	76	+ <option value="2017">2017</option>
	77	+ <option value="2018">2018</option>
	78	+ <option value="2019">2019</option>
	79	+ <option value="2020">2020</option>
	80	+ <option value="2021">2021</option>
	81	+ </select></td>
	82	+ </tr>
	83	+ <tr>
	84	+ <td colspan="2"><span class="creditcard-error-msg"></span></td>
	85	+ </tr>
	86	+ <tr>
	87	+ <td class="label"><label for="cvv">Security code</label></td>
	88	+ <td><input name="cvv" size="5" value="@cvv" type="text" maxlength="10" id="cvv" autocomplete="off"> <a href="javascript:PopupCVV();">Where is this?</a></td>
	89	+ </tr>
	90	+ <tr>
	91	+ <td colspan="2"><span class="creditcard-error-msg"></span></td>
	92	+ </tr>
	93	+ <tr>
	94	+ <td colspan="2"><span class="creditcard-error-msg"></span></td>
	95	+ </tr>
	96	+ <tr>
	97	+ <td class="label"><label for="fname">Name on card</label></td>
	98	+ <td><input name="fname" size="30" value="@fname" type="text" placeholder="First name" maxlength="25" class="required" id="fname"><input name="lname" size="30" value="@lname" type="text" placeholder="Last name" maxlength="25" id="lname">
	99	+ </td>
	100	+ </tr>
	101	+ <tr>
	102	+ <td colspan="2"><span class="creditcard-error-msg"></span></td>
	103	+ </tr>
	104	+ <tr>
	105	+ <td class="label"><label for="street">Billing address</label></td>
	106	+ <td><input name="street" size="30" value="@street" type="text" placeholder="Street" maxlength="100" id="street" class="fullwidth"></td>
	107	+ </tr>
	108	+ <tr>
	109	+ <td colspan="2"><span class="creditcard-error-msg"></span></td>
	110	+ </tr>
	111	+ <tr>
	112	+ <td class="label"></td>
	113	+ <td><input name="city" size="18" value="@city" type="text" placeholder="City" maxlength="40" id="city">
	114	+ <select id="state" name="state" value="@state" >
	115	+ <option value=""></option>
	116	+ <option value="AK">AK</option><option value="AL">AL</option><option value="AR">AR</option><option value="AZ">AZ</option><option value="CA">CA</option><option value="CO">CO</option><option value="CT">CT</option><option value="DC">DC</option><option value="DE">DE</option><option value="FL">FL</option><option value="GA">GA</option><option value="HI">HI</option><option value="IA">IA</option><option value="ID">ID</option><option value="IL">IL</option><option value="IN">IN</option><option value="KS">KS</option><option value="KY">KY</option><option value="LA">LA</option><option value="MA">MA</option><option value="MD">MD</option><option value="ME">ME</option><option value="MI">MI</option><option value="MN">MN</option><option value="MO">MO</option><option value="MS">MS</option><option value="MT">MT</option><option value="NC">NC</option><option value="ND">ND</option><option value="NE">NE</option><option value="NH">NH</option><option value="NJ">NJ</option><option value="NM">NM</option><option value="NV">NV</option><option value="NY">NY</option><option value="OH">OH</option><option value="OK">OK</option><option value="OR">OR</option><option value="PA">PA</option><option value="PR">PR</option><option value="RI">RI</option><option value="SC">SC</option><option value="SD">SD</option><option value="TN">TN</option><option value="TX">TX</option><option value="UT">UT</option><option value="VA">VA</option><option value="VT">VT</option><option value="WA">WA</option><option value="WI">WI</option><option value="WV">WV</option><option value="WY">WY</option><option value="AA">AA</option><option value="AE">AE</option><option value="AP">AP</option>
	117	+ </select>
	118	+ <input name="zip" size="5" value="@zip" type="text" placeholder="Zip code" maxlength="10" id="zip">
	119	+ </td>
	120	+ </tr>
	121	+ <tr>
	122	+ <td colspan="2"><span class="creditcard-error-msg"></span></td>
	123	+ </tr>
	124	+ <tr>
	125	+ <td class="label"><label for="emailAdd">E-mail receipt to</label></td>
	126	+ <td><input name="emailAdd" size="30" value="@emailAdd" type="text" placeholder="Email address" maxlength="64" id="emailAdd" class="fullwidth"></td>
	127	+ </tr>
	128	+ <tr>
	129	+ <td class="label"></td>
	130	+ <td>
	131	+ <div id="mw-donate-submit-button"> <br>
	132	+ <input id="ccSubmitButton" name="ccSubmitButton" src="@script_path/extensions/DonationInterface/gateway_forms/includes/submit-donation-button.png" alt="Submit donation" type="image"/>
	133	+ </div>
	134	+ <div class="mw-donate-submessage" id="payflowpro_gateway-donate-submessage">
	135	+ <img src="@script_path/extensions/DonationInterface/gateway_forms/includes/padlock.gif" style="vertical-align:baseline;margin-right:4px;">Your credit / debit card will be securely processed.
	136	+ </div>
	137	+ </td>
	138	+ </tr>
	139	+ </tbody>
	140	+ </table>
	141	+
	142	+ </div>
	143	+ <input type="hidden" name="gateway" value="payflowpro" id="gateway" />
	144	+ <input type="hidden" name="returnto" value="Thank_You/en" />
	145	+ <input type="hidden" value="0" name="PaypalRedirect" id="PaypalRedirect">
	146	+ <input type="hidden" value="@amount" name="amount">
	147	+ <input type="hidden" value="US" name="country" id="country" />
	148	+ <input type="hidden" value="@expiration" name="expiration" id="expiration"/>
	149	+ <input type="hidden" value="USD" name="currency_code" />
	150	+ <input type="hidden" value="@utm_source" name="utm_source"/>
	151	+ <input type="hidden" value="@utm_medium" name="utm_medium"/>
	152	+ <input type="hidden" value="@utm_campaign" name="utm_campaign"/>
	153	+ <input type="hidden" value="@language" name="language"/>
	154	+ <input type="hidden" value="@referrer" name="referrer"/>
	155	+ <input type="hidden" value="@comment" name="comment"/>
	156	+ <input type="hidden" value="@comment-option" name="comment-option"/>
	157	+ <input type="hidden" value="1" name="email-opt"/>
	158	+ <input type="hidden" value="@token" name="token"/>
	159	+ <input type="hidden" value="@order_id" name="order_id"/>
	160	+ <input type="hidden" value="@numAttempt" name="numAttempt"/>
	161	+ <input type="hidden" value="@contribution_tracking_id" name="contribution_tracking_id"/>
	162	+ <input type="hidden" value="@data_hash" name="data_hash"/>
	163	+ <input type="hidden" value="@owa_session" name="owa_session"/>
	164	+ <input type="hidden" value="@owa_ref" name="owa_ref"/>
	165	+ <!-- new required fields -->
	166	+ <input type="hidden" value="@gateway" name="gateway"/>
	167	+ <input type="hidden" value="cc" name="payment_method"/>
	168	+ </form>
	169	+ <div class="payflow-cc-form-section" id="payflowpro_gateway-donate-addl-info">
	170	+ <div id="payflowpro_gateway-donate-addl-info-text">
	171	+ <div style="text-align:center;">* * *</div>
	172	+ <div class="">We do not store your credit card information, and your personal data is subject to our <a href="http://wikimediafoundation.org/wiki/Donor_policy">donor privacy policy</a>.</div><div class="">There are <a href="http://wikimediafoundation.org/wiki/Ways_to_Give/en">other ways to give</a>, including by check.</div>
	173	+ <div class="">Questions or comments? Contact: <a href="mailto:donate@wikimedia.org">donate@wikimedia.org</a>
	174	+ </div>
	175	+ </div>
	176	+ </div>
	177	+ <div style="clear:both;"></div>
	178	+ </div>
	179	+ </td>
	180	+ </tr>
	181	+ </tbody>
	182	+</table>
Property changes on: trunk/extensions/DonationInterface/payflowpro_gateway/forms/html/TwoStepTwoColumnLetter3-orig.html
___________________________________________________________________
Added: svn:eol-style
1	183	+ native
Index: trunk/extensions/DonationInterface/payflowpro_gateway/forms/html/TwoStepTwoColumnLetter3.html
—	—	@@ -22,113 +22,95 @@
23	23	</div>
24	24	</noscript>
25	25
26		~~- <h2 id="donate-head">Please complete your donation below ...</h2>~~
	26	+ <!--<h2 id="donate-head">Please complete your donation below ...</h2>-->
27	27
28	28	<p id="topError" class="creditcard-error-msg"></p>
29	29
30		~~- <form name="payment" method="post" action="@action" autocomplete="off">~~
	30	+ <form name="payment" method="post" action="@action">
31	31	<div id="payflowpro_gateway-personal-info">
32	32	<table id="payflow-table-donor">
33	33	<tbody>
	34	+
34	35	<tr>
35		~~- <td colspan="2"><span class="creditcard-error-msg"></span></td>~~
36		~~- </tr>~~
37		~~- <tr>~~
38	36	<td colspan="2">
39		~~- <table cellspacing="0" cellpadding="4" border="1" id="donation_amount">~~
40		~~- <tbody>~~
41		~~- <tr>~~
42		~~- <td class="amount_header">Description</td>~~
43		~~- <td class="amount_header" style="text-align:right;width:75px;">Amount</td>~~
44		~~- <td class="amount_header" style="text-align:right;width:75px;">Currency</td>~~
45		~~- </tr>~~
46		~~- <tr>~~
47		~~- <td class="amount_data">Donation</td>~~
48		~~- <td class="amount_data" style="text-align:right;width:75px;">@amount</td>~~
49		~~- <td class="amount_data" style="text-align:right;width:75px;">@currency_code</td>~~
50		~~- </tr>~~
51		~~- </tbody>~~
52		~~- </table>~~
	37	+ <div id="step1header">
	38	+ <h3 class="amount_header">Donation amount  <span id="selected-amount">$@amount</span></h3>
	39	+ </div>
53	40	</td>
54	41	</tr>
55	42	<tr>
56	43	<td colspan="2"><h3 class="cc_header">Billing information<img src="@script_path/extensions/DonationInterface/gateway_forms/includes/padlock.gif" style="vertical-align:baseline;margin-left:8px;"></h3></td>
57	44	</tr>
58	45	<tr>
59		~~- <td class="label"></td>~~
60		~~- <td><img src="@script_path/extensions/DonationInterface/gateway_forms/includes/credit_card_logos.gif"></td>~~
	46	+ <!--<td class="label"><label for="fname">Name on card</label></td>-->
	47	+ <td colspan="2"><input name="fname" value="@fname" type="text" placeholder="First name" id="fname"><input name="lname" value="@lname" type="text" placeholder="Last name" id="lname"></td>
61	48	</tr>
62	49	<tr>
63		~~- <td class="label"><label for="card_num">Card number</label></td>~~
64		~~- <td><input name="card_num" size="30" value="@card_num" type="text" maxlength="100" id="card_num" class="fullwidth" autocomplete="off"></td>~~
	50	+ <td colspan="2"><span class="creditcard-error-msg"></span></td>
65	51	</tr>
66	52	<tr>
67		~~- <td class="label"><label for="mos">Expiration date</label></td>~~
68		- <td><select name="mos" id="mos"><option value="01">1 (January)</option><option value="02">2 (February)</option><option value="03">3 (March)</option><option value="04">4 (April)</option><option value="05">5 (May)</option><option value="06">6 (June)</option><option value="07">7 (July)</option><option value="08">8 (August)</option><option value="09">9 (September)</option><option value="10">10 (October)</option><option value="11">11 (November)</option><option value="12">12 (December)</option></select> / <select name="year" id="year">
69		~~- <!--<option value="">Year</option>-->~~
70		~~- <option value="2011">2011</option>~~
71		~~- <option value="2012">2012</option>~~
72		~~- <option value="2013">2013</option>~~
73		~~- <option value="2014">2014</option>~~
74		~~- <option value="2015">2015</option>~~
75		~~- <option value="2016">2016</option>~~
76		~~- <option value="2017">2017</option>~~
77		~~- <option value="2018">2018</option>~~
78		~~- <option value="2019">2019</option>~~
79		~~- <option value="2020">2020</option>~~
80		~~- <option value="2021">2021</option>~~
81		~~- </select></td>~~
	53	+ <!--<td class="label"><label for="street">Billing address</label></td>-->
	54	+ <td colspan="2"><input name="street" value="@street" type="text" placeholder="Street" id="street"></td>
82	55	</tr>
83	56	<tr>
84	57	<td colspan="2"><span class="creditcard-error-msg"></span></td>
85	58	</tr>
86	59	<tr>
87		~~- <td class="label"><label for="cvv">Security code</label></td>~~
88		~~- <td><input name="cvv" size="5" value="@cvv" type="text" maxlength="10" id="cvv" autocomplete="off"> <a href="javascript:PopupCVV();">Where is this?</a></td>~~
	60	+ <!--<td class="label"></td>-->
	61	+ <td colspan="2"><input name="city" value="@city" type="text" placeholder="City" id="city">
	62	+ <select id="state" name="state" value="@state" >
	63	+ <option value=""></option>
	64	+ <option value="AK">AK</option><option value="AL">AL</option><option value="AR">AR</option><option value="AZ">AZ</option><option value="CA">CA</option><option value="CO">CO</option><option value="CT">CT</option><option value="DC">DC</option><option value="DE">DE</option><option value="FL">FL</option><option value="GA">GA</option><option value="HI">HI</option><option value="IA">IA</option><option value="ID">ID</option><option value="IL">IL</option><option value="IN">IN</option><option value="KS">KS</option><option value="KY">KY</option><option value="LA">LA</option><option value="MA">MA</option><option value="MD">MD</option><option value="ME">ME</option><option value="MI">MI</option><option value="MN">MN</option><option value="MO">MO</option><option value="MS">MS</option><option value="MT">MT</option><option value="NC">NC</option><option value="ND">ND</option><option value="NE">NE</option><option value="NH">NH</option><option value="NJ">NJ</option><option value="NM">NM</option><option value="NV">NV</option><option value="NY">NY</option><option value="OH">OH</option><option value="OK">OK</option><option value="OR">OR</option><option value="PA">PA</option><option value="PR">PR</option><option value="RI">RI</option><option value="SC">SC</option><option value="SD">SD</option><option value="TN">TN</option><option value="TX">TX</option><option value="UT">UT</option><option value="VA">VA</option><option value="VT">VT</option><option value="WA">WA</option><option value="WI">WI</option><option value="WV">WV</option><option value="WY">WY</option><option value="AA">AA</option><option value="AE">AE</option><option value="AP">AP</option>
	65	+ </select>
	66	+ <input name="zip" value="@zip" type="text" placeholder="Zip code" id="zip">
	67	+ </td>
89	68	</tr>
90	69	<tr>
91	70	<td colspan="2"><span class="creditcard-error-msg"></span></td>
92	71	</tr>
	72	+
	73	+
93	74	<tr>
94		~~- <td colspan="2"><span class="creditcard-error-msg"></span></td>~~
	75	+ <!--<td class="label"></td>-->
	76	+ <td colspan="2"><img src="@script_path/extensions/DonationInterface/gateway_forms/includes/credit_card_logos.gif"></td>
95	77	</tr>
96	78	<tr>
97		~~- <td class="label"><label for="fname">Name on card</label></td>~~
98		- <td><input name="fname" size="30" value="@fname" type="text" placeholder="First name" maxlength="25" class="required" id="fname"><input name="lname" size="30" value="@lname" type="text" placeholder="Last name" maxlength="25" id="lname">
	79	+ <!--<td class="label"><label for="card_num">Card number</label></td>-->
	80	+ <td colspan="2"><input name="card_num" value="@card_num" placeholder="Card number" type="text" id="card_num" class="fullwidth" autocomplete="off"></td>
	81	+ </tr>
	82	+ <tr>
	83	+ <!--<td class="label"><label for="mos">Expiration date</label></td>-->
	84	+ <td colspan="2">
	85	+ <select name="mos" id="mos"><option value="01">1 (January)</option><option value="02">2 (February)</option><option value="03">3 (March)</option><option value="04">4 (April)</option><option value="05">5 (May)</option><option value="06">6 (June)</option><option value="07">7 (July)</option><option value="08">8 (August)</option><option value="09">9 (September)</option><option value="10">10 (October)</option><option value="11">11 (November)</option><option value="12">12 (December)</option></select> /
	86	+ <select name="year" id="year"><option value="2011">2011</option><option value="2012">2012</option><option value="2013">2013</option><option value="2014">2014</option><option value="2015">2015</option><option value="2016">2016</option><option value="2017">2017</option><option value="2018">2018</option><option value="2019">2019</option><option value="2020">2020</option><option value="2021">2021</option></select>
99	87	</td>
100	88	</tr>
101	89	<tr>
102	90	<td colspan="2"><span class="creditcard-error-msg"></span></td>
103	91	</tr>
104	92	<tr>
105		~~- <td class="label"><label for="street">Billing address</label></td>~~
106		~~- <td><input name="street" size="30" value="@street" type="text" placeholder="Street" maxlength="100" id="street" class="fullwidth"></td>~~
	93	+ <!--<td class="label"><label for="cvv">Security code</label></td>-->
	94	+ <td colspan="2"><input name="cvv" value="@cvv" placeholder="CVV" type="text" id="cvv" autocomplete="off"> <a href="javascript:PopupCVV();">Where is this?</a></td>
107	95	</tr>
108	96	<tr>
109	97	<td colspan="2"><span class="creditcard-error-msg"></span></td>
110	98	</tr>
111	99	<tr>
112		~~- <td class="label"></td>~~
113		~~- <td><input name="city" size="18" value="@city" type="text" placeholder="City" maxlength="40" id="city">~~
114		~~- <select id="state" name="state" value="@state" >~~
115		~~- <option value=""></option>~~
116		- <option value="AK">AK</option><option value="AL">AL</option><option value="AR">AR</option><option value="AZ">AZ</option><option value="CA">CA</option><option value="CO">CO</option><option value="CT">CT</option><option value="DC">DC</option><option value="DE">DE</option><option value="FL">FL</option><option value="GA">GA</option><option value="HI">HI</option><option value="IA">IA</option><option value="ID">ID</option><option value="IL">IL</option><option value="IN">IN</option><option value="KS">KS</option><option value="KY">KY</option><option value="LA">LA</option><option value="MA">MA</option><option value="MD">MD</option><option value="ME">ME</option><option value="MI">MI</option><option value="MN">MN</option><option value="MO">MO</option><option value="MS">MS</option><option value="MT">MT</option><option value="NC">NC</option><option value="ND">ND</option><option value="NE">NE</option><option value="NH">NH</option><option value="NJ">NJ</option><option value="NM">NM</option><option value="NV">NV</option><option value="NY">NY</option><option value="OH">OH</option><option value="OK">OK</option><option value="OR">OR</option><option value="PA">PA</option><option value="PR">PR</option><option value="RI">RI</option><option value="SC">SC</option><option value="SD">SD</option><option value="TN">TN</option><option value="TX">TX</option><option value="UT">UT</option><option value="VA">VA</option><option value="VT">VT</option><option value="WA">WA</option><option value="WI">WI</option><option value="WV">WV</option><option value="WY">WY</option><option value="AA">AA</option><option value="AE">AE</option><option value="AP">AP</option>
117		~~- </select>~~
118		~~- <input name="zip" size="5" value="@zip" type="text" placeholder="Zip code" maxlength="10" id="zip">~~
119		~~- </td>~~
	100	+ <td colspan="2"><span class="creditcard-error-msg"></span></td>
120	101	</tr>
	102	+
121	103	<tr>
122	104	<td colspan="2"><span class="creditcard-error-msg"></span></td>
123	105	</tr>
124	106	<tr>
125		~~- <td class="label"><label for="emailAdd">E-mail receipt to</label></td>~~
126		~~- <td><input name="emailAdd" size="30" value="@emailAdd" type="text" placeholder="Email address" maxlength="64" id="emailAdd" class="fullwidth"></td>~~
	107	+ <!--<td class="label"><label for="emailAdd">E-mail receipt to</label></td>-->
	108	+ <td colspan="2"><input name="emailAdd" value="@emailAdd" type="text" placeholder="Email address" id="emailAdd"></td>
127	109	</tr>
128	110	<tr>
129		~~- <td class="label"></td>~~
130		~~- <td>~~
	111	+ <!--<td class="label"></td>-->
	112	+ <td colspan="2">
131	113	<div id="mw-donate-submit-button"> <br>
132		~~- <input id="ccSubmitButton" name="ccSubmitButton" src="@script_path/extensions/DonationInterface/gateway_forms/includes/submit-donation-button.png" alt="Submit donation" type="image"/>~~
	114	+ <input id="ccSubmitButton" name="ccSubmitButton" src="@script_path/extensions/DonationInterface/gateway_forms/includes/submit-donation-button.png" alt="Submit donation" type="image">
133	115	</div>
134	116	<div class="mw-donate-submessage" id="payflowpro_gateway-donate-submessage">
135	117	<img src="@script_path/extensions/DonationInterface/gateway_forms/includes/padlock.gif" style="vertical-align:baseline;margin-right:4px;">Your credit / debit card will be securely processed.
—	—	@@ -165,16 +147,21 @@
166	148	<input type="hidden" value="@gateway" name="gateway"/>
167	149	<input type="hidden" value="cc" name="payment_method"/>
168	150	</form>
169		~~- <div class="payflow-cc-form-section" id="payflowpro_gateway-donate-addl-info">~~
170		~~- <div id="payflowpro_gateway-donate-addl-info-text">~~
171		~~- <div style="text-align:center;">* * *</div>~~
172		- <div class="">We do not store your credit card information, and your personal data is subject to our <a href="http://wikimediafoundation.org/wiki/Donor_policy">donor privacy policy</a>.</div><div class="">There are <a href="http://wikimediafoundation.org/wiki/Ways_to_Give/en">other ways to give</a>, including by check.</div>
173		~~- <div class="">Questions or comments? Contact: <a href="mailto:donate@wikimedia.org">donate@wikimedia.org</a>~~
174		~~- </div>~~
175		~~- </div>~~
176		~~- </div>~~
177		~~- <div style="clear:both;"></div>~~
178	151	</div>
	152	+ <p id="informationsharing">%donate_interface-informationsharing\|url%</p>
	153	+ <table>
	154	+ <tr>
	155	+ <td>
	156	+ <ul id="moreinfolinks">
	157	+ <li><a href="http://wikimediafoundation.org/wiki/Special:LandingCheck?landing_page=Monthly_donations&language=@language&uselang=@language&country=@country">%donate_interface-monthly-donation%</a></li>
	158	+ <li><a href="http://wikimediafoundation.org/wiki/Special:LandingCheck?landing_page=Ways_to_Give&language=@language&uselang=@language&country=@country">%donate_interface-otherways-short%</a></li>
	159	+ <li><a href="http://wikimediafoundation.org/wiki/Special:LandingCheck?landing_page=FAQ&language=@language&uselang=@language&country=@country">%donate_interface-faqs%</a></li>
	160	+ <li><a href="http://wikimediafoundation.org/wiki/Special:LandingCheck?landing_page=Tax_Deductibility&language=@language&uselang=@language&country=@country">%donate_interface-tax-info%</a></li>
	161	+ </ul>
	162	+ </td>
	163	+ <td>@verisign_logo</td>
	164	+ </tr>
	165	+ </table>
179	166	</td>
180	167	</tr>
181	168	</tbody>
Index: trunk/extensions/DonationInterface/payflowpro_gateway/forms/css/TwoStepTwoColumnLetter3-orig.css
—	—	@@ -0,0 +1,174 @@
	2	+table#donation_amount {
	3	+ background-color:transparent;
	4	+ border:1px solid #AAAAAA;
	5	+ border-collapse:collapse;
	6	+ width: 394px;
	7	+}
	8	+table#donation_amount td {
	9	+ border:1px solid #AAAAAA;
	10	+}
	11	+table#donation_amount td.amount_header {
	12	+ background-color:#eef2f7;
	13	+ font-size:90%;
	14	+}
	15	+table#donation_amount td.amount_data {
	16	+ background-color:#daf2db;
	17	+}
	18	+h3.cc_header {
	19	+ padding-bottom: 0;
	20	+ margin-bottom: 0;
	21	+ font-weight: normal;
	22	+}
	23	+div#payflowpro_gateway-donate-addl-info-text {
	24	+ font-size: 90%;
	25	+ line-height: 120%;
	26	+ padding-top: 12px;
	27	+}
	28	+div#payflowpro_gateway-donate-submessage {
	29	+ font-size: 90%;
	30	+ line-height: 120%;
	31	+}
	32	+#payflow-table-donor td.label, #payflow-table-comment td.label, #payflow-table-cc td.label {
	33	+ white-space: nowrap;
	34	+ display: block;
	35	+ padding-right: 1em;
	36	+ text-align: right;
	37	+ width: 94px;
	38	+}
	39	+input#city {
	40	+ width: 130px;
	41	+}
	42	+input#zip {
	43	+ width: 55px;
	44	+}
	45	+input.hasplaceholder {
	46	+ color: rgb(153, 153, 153);
	47	+}
	48	+.payflow-cc-form-section {
	49	+ float: none;
	50	+ margin-right: 0em;
	51	+ margin-bottom: 1em;
	52	+}
	53	+
	54	+#payflowpro_gateway-cc_form_container {
	55	+ width: 100%;
	56	+}
	57	+
	58	+#payflowpro_gateway-cc_form_form {
	59	+ width: 475px;
	60	+ float: right;
	61	+ margin-left: 2em;
	62	+ padding-left: 2em;
	63	+ border-left: 1px solid #BBBBBB;
	64	+}
	65	+
	66	+#payflowpro_gateway-cc_form_letter {
	67	+ height: 100%;
	68	+}
	69	+
	70	+#payflowpro_gateway-cc_form_letter p {
	71	+ font-size: 1.125em;
	72	+ margin-bottom: 1.2em;
	73	+}
	74	+
	75	+#payflowpro_gateway-personal-info {
	76	+ margin-right:0 !important;
	77	+}
	78	+
	79	+#payflowpro_gateway-donate-addl-info-secure-logos {
	80	+ float: left;
	81	+ margin-right: 2em;
	82	+}
	83	+
	84	+#payflowpro_gateway-cc_form_letter_inside {
	85	+ padding-top: .5em;
	86	+}
	87	+
	88	+#payflowpro_gateway-cc_otherways {
	89	+ padding-top: .5em;
	90	+ display: block;
	91	+}
	92	+#payflowpro_gateway-donate-addl-info {
	93	+ margin-top:2em !important;
	94	+ margin-bottom:1em !important;
	95	+}
	96	+
	97	+#appeal {
	98	+ background-color:transparent;
	99	+ border-color:transparent;
	100	+ border-style:solid;
	101	+ border-width:1px 0 1px 1px;
	102	+ padding:16px 24px 24px;
	103	+}
	104	+#appeal-head {
	105	+ font-size:1.5em;
	106	+ line-height:1.125em;
	107	+ padding-bottom:0.5em;
	108	+ padding-top:0.125em;
	109	+}
	110	+#appeal-body {
	111	+ font-size:1.125em;
	112	+ margin-bottom:1em;
	113	+ padding:0.2em 0;
	114	+}
	115	+#donate {
	116	+}
	117	+#donate-head {
	118	+ border:none;
	119	+ font-size:1.5em;
	120	+ line-height:1.125em;
	121	+ padding-bottom:0em;
	122	+ padding-top:0.125em;
	123	+}
	124	+#donate-body {
	125	+ font-size:1.125em;
	126	+ margin-bottom:1em;
	127	+}
	128	+
	129	+/* Move the form up */
	130	+#mw-head-base {
	131	+ height: 1em !important;
	132	+}
	133	+
	134	+/* Hiding content border */
	135	+table {
	136	+ background-color: transparent;
	137	+}
	138	+div#content {
	139	+ background-color: transparent !important;
	140	+ background-image: none !important;
	141	+}
	142	+div#mw-head-base {
	143	+ background-image: none !important;
	144	+}
	145	+#footer {
	146	+ background-image: none !important;
	147	+}
	148	+
	149	+/* Hiding stuff we don't need */
	150	+h1#firstHeading, div#contentSub {
	151	+ display: none;
	152	+}
	153	+
	154	+/* NEW STUFF */
	155	+#greenBackground{
	156	+ padding:16px 24px 24px;
	157	+ width:400px;
	158	+ background-color:#CCE7CD;
	159	+ border:1px solid #5EAC58;
	160	+}
	161	+p#informationsharing {
	162	+ width: 400px;
	163	+ padding: 0 15px;
	164	+ line-height: 14px;
	165	+ font-size: 11px;
	166	+}
	167	+ul#moreinfolinks li{
	168	+ list-style: none !important;
	169	+ list-style-image: none !important;
	170	+}
	171	+h3.amount_header {
	172	+ padding: 0 0 0.4em 0;
	173	+ margin-bottom: 0;
	174	+ font-weight: normal;
	175	+}
Property changes on: trunk/extensions/DonationInterface/payflowpro_gateway/forms/css/TwoStepTwoColumnLetter3-orig.css
___________________________________________________________________
Added: svn:eol-style
1	176	+ native
Index: trunk/extensions/DonationInterface/payflowpro_gateway/forms/css/TwoStepTwoColumnLetter3.css
—	—	@@ -35,40 +35,33 @@
36	36	text-align: right;
37	37	width: 94px;
38	38	}
39		~~-input#city {~~
40		~~- width: 130px;~~
41		-}
42		~~-input#zip {~~
43		~~- width: 55px;~~
44		-}
45		~~-input.hasplaceholder {~~
46		~~- color: rgb(153, 153, 153);~~
47		-}
	39	+
	40	+
48	41	.payflow-cc-form-section {
49		~~- float: none;~~
50		~~- margin-right: 0em;~~
51		~~- margin-bottom: 1em;~~
	42	+ float: none;
	43	+ margin-right: 0em;
	44	+ margin-bottom: 1em;
52	45	}
53	46
54	47	#payflowpro_gateway-cc_form_container {
55		~~- width: 100%;~~
	48	+ width: 100%;
56	49	}
57	50
58	51	#payflowpro_gateway-cc_form_form {
59		~~- width: 475px;~~
60		~~- float: right;~~
61		~~- margin-left: 2em;~~
62		~~- padding-left: 2em;~~
63		~~- border-left: 1px solid #BBBBBB;~~
	52	+ width: 475px;
	53	+ float: right;
	54	+ margin-left: 2em;
	55	+ padding-left: 2em;
	56	+ border-left: 1px solid #BBBBBB;
64	57	}
65	58
66	59	#payflowpro_gateway-cc_form_letter {
67		~~- height: 100%;~~
	60	+ height: 100%;
68	61	}
69	62
70	63	#payflowpro_gateway-cc_form_letter p {
71		~~- font-size: 1.125em;~~
72		~~- margin-bottom: 1.2em;~~
	64	+ font-size: 1.125em;
	65	+ margin-bottom: 1.2em;
73	66	}
74	67
75	68	#payflowpro_gateway-personal-info {
—	—	@@ -152,13 +145,13 @@
153	146
154	147	/* NEW STUFF */
155	148	#greenBackground{
156		~~- padding:16px 24px 24px;~~
157		~~- width:400px;~~
	149	+ padding:16px 24px;
	150	+ width:300px;
158	151	background-color:#CCE7CD;
159	152	border:1px solid #5EAC58;
160	153	}
161	154	p#informationsharing {
162		~~- width: 400px;~~
	155	+ width: 318px;
163	156	padding: 0 15px;
164	157	line-height: 14px;
165	158	font-size: 11px;
—	—	@@ -172,3 +165,21 @@
173	166	margin-bottom: 0;
174	167	font-weight: normal;
175	168	}
	169	+
	170	+table#payflow-table-donor{
	171	+ /margin-left: 10px;/
	172	+}
	173	+
	174	+/* Form inputs */
	175	+input#fname, input#lname {
	176	+ width: 130px;
	177	+}
	178	+input#street, input#card_num, input#emailAdd {
	179	+ width: 271px;
	180	+}
	181	+input#city {
	182	+ width: 135px;
	183	+}
	184	+input#zip {
	185	+ width: 65px;
	186	+}
Index: trunk/extensions/DonationInterface/gateway_forms/rapidhtml/RapidHtmlResources.php
—	—	@@ -213,3 +213,11 @@
214	214	'localBasePath' => dirname( __FILE__ ).'/../../payflowpro_gateway/forms',
215	215	'remoteExtPath' => $wgPayflowRapidHtmlRemoteExtPath,
216	216	);
	217	+$wgResourceModules[ 'pfp.form.rapidhtml.TwoStepTwoColumnLetter3.orig' ] = array(
	218	+ 'styles' => 'css/TwoStepTwoColumnLetter3-orig.css',
	219	+ 'scripts' => 'js/TwoStepTwoColumnLetter3.js',
	220	+ 'dependencies' => array( 'di.form.core.validate' ),
	221	+ 'localBasePath' => dirname( __FILE__ ).'/../../payflowpro_gateway/forms',
	222	+ 'remoteExtPath' => $wgPayflowRapidHtmlRemoteExtPath,
	223	+);
	224	+

Follow-up revisions

Revision	Commit summary	Author	Date
r103408	MFT r103325, r103259, r103371, r103397, r103399, r103401	awjrichards	23:28, 16 November 2011

Status & tagging log

22:51, 16 November 2011 Jalexander-WMF (talk | contribs) changed the status of r103397 [removed: new added: ok]