https://www.mediawiki.org/wiki/Special:Code/MediaWiki/103397

Revision: 103397
Author:   pgehres
Date:     2011-11-16 22:24:36 +0000 (Wed, 16 Nov 2011)
Log Message:
-----------
Merging changes from last night's tests into a 'super form' 

Modified Paths:
--------------
    
trunk/extensions/DonationInterface/gateway_forms/rapidhtml/RapidHtmlResources.php
    
trunk/extensions/DonationInterface/payflowpro_gateway/forms/css/TwoStepTwoColumnLetter3.css
    
trunk/extensions/DonationInterface/payflowpro_gateway/forms/html/TwoStepTwoColumnLetter3.html

Added Paths:
-----------
    
trunk/extensions/DonationInterface/payflowpro_gateway/forms/css/TwoStepTwoColumnLetter3-orig.css
    
trunk/extensions/DonationInterface/payflowpro_gateway/forms/html/TwoStepTwoColumnLetter3-orig.html

Modified: 
trunk/extensions/DonationInterface/gateway_forms/rapidhtml/RapidHtmlResources.php
===================================================================
--- 
trunk/extensions/DonationInterface/gateway_forms/rapidhtml/RapidHtmlResources.php
   2011-11-16 22:24:03 UTC (rev 103396)
+++ 
trunk/extensions/DonationInterface/gateway_forms/rapidhtml/RapidHtmlResources.php
   2011-11-16 22:24:36 UTC (rev 103397)
@@ -213,3 +213,11 @@
        'localBasePath' => dirname( __FILE__ 
).'/../../payflowpro_gateway/forms',
        'remoteExtPath' => $wgPayflowRapidHtmlRemoteExtPath,
 );
+$wgResourceModules[ 'pfp.form.rapidhtml.TwoStepTwoColumnLetter3.orig' ] = 
array(
+       'styles' => 'css/TwoStepTwoColumnLetter3-orig.css',
+       'scripts' => 'js/TwoStepTwoColumnLetter3.js',
+       'dependencies' => array( 'di.form.core.validate' ),
+       'localBasePath' => dirname( __FILE__ 
).'/../../payflowpro_gateway/forms',
+       'remoteExtPath' => $wgPayflowRapidHtmlRemoteExtPath,
+);
+

Added: 
trunk/extensions/DonationInterface/payflowpro_gateway/forms/css/TwoStepTwoColumnLetter3-orig.css
===================================================================
--- 
trunk/extensions/DonationInterface/payflowpro_gateway/forms/css/TwoStepTwoColumnLetter3-orig.css
                            (rev 0)
+++ 
trunk/extensions/DonationInterface/payflowpro_gateway/forms/css/TwoStepTwoColumnLetter3-orig.css
    2011-11-16 22:24:36 UTC (rev 103397)
@@ -0,0 +1,174 @@
+table#donation_amount {
+       background-color:transparent;
+       border:1px solid #AAAAAA;
+       border-collapse:collapse;
+       width: 394px;
+}
+table#donation_amount td {
+       border:1px solid #AAAAAA;
+}
+table#donation_amount td.amount_header {
+       background-color:#eef2f7;
+       font-size:90%;
+}
+table#donation_amount td.amount_data {
+       background-color:#daf2db;
+}
+h3.cc_header {
+       padding-bottom: 0;
+       margin-bottom: 0;
+       font-weight: normal;
+}
+div#payflowpro_gateway-donate-addl-info-text {
+       font-size: 90%;
+       line-height: 120%;
+    padding-top: 12px;
+}
+div#payflowpro_gateway-donate-submessage {
+       font-size: 90%;
+       line-height: 120%;
+}
+#payflow-table-donor td.label, #payflow-table-comment td.label, 
#payflow-table-cc td.label {
+       white-space: nowrap;
+    display: block;
+    padding-right: 1em;
+    text-align: right;
+    width: 94px;
+}
+input#city {
+       width: 130px;
+}
+input#zip {
+       width: 55px;
+}
+input.hasplaceholder {
+       color: rgb(153, 153, 153);
+}
+.payflow-cc-form-section {
+        float: none;
+        margin-right: 0em;
+        margin-bottom: 1em;
+}
+
+#payflowpro_gateway-cc_form_container {
+        width: 100%;
+}
+
+#payflowpro_gateway-cc_form_form {
+        width: 475px;
+        float: right;
+        margin-left: 2em;
+        padding-left: 2em;
+        border-left: 1px solid #BBBBBB;
+}
+
+#payflowpro_gateway-cc_form_letter {
+        height: 100%;
+}
+
+#payflowpro_gateway-cc_form_letter p {
+        font-size: 1.125em;
+        margin-bottom: 1.2em;
+}
+
+#payflowpro_gateway-personal-info {
+       margin-right:0 !important;
+}
+
+#payflowpro_gateway-donate-addl-info-secure-logos {
+       float: left;
+       margin-right: 2em;
+}
+
+#payflowpro_gateway-cc_form_letter_inside {    
+       padding-top: .5em;
+}
+
+#payflowpro_gateway-cc_otherways {
+       padding-top: .5em;
+       display: block;
+}
+#payflowpro_gateway-donate-addl-info {
+       margin-top:2em !important;
+       margin-bottom:1em !important;
+}
+
+#appeal {
+       background-color:transparent;
+       border-color:transparent;
+       border-style:solid;
+       border-width:1px 0 1px 1px;
+       padding:16px 24px 24px;
+}
+#appeal-head {
+       font-size:1.5em;
+       line-height:1.125em;
+       padding-bottom:0.5em;
+       padding-top:0.125em;
+}
+#appeal-body {
+       font-size:1.125em;
+       margin-bottom:1em;
+       padding:0.2em 0;
+}
+#donate {
+}
+#donate-head {
+       border:none;
+       font-size:1.5em;
+       line-height:1.125em;
+       padding-bottom:0em;
+       padding-top:0.125em;
+}
+#donate-body {
+       font-size:1.125em;
+       margin-bottom:1em;
+}
+
+/* Move the form up */
+#mw-head-base {
+       height: 1em !important;
+}
+
+/* Hiding content border */
+table {
+       background-color: transparent;
+}
+div#content {
+       background-color: transparent !important;
+       background-image: none !important;
+}
+div#mw-head-base {
+       background-image: none !important;
+}
+#footer {
+       background-image: none !important;
+}
+
+/* Hiding stuff we don't need */
+h1#firstHeading, div#contentSub {
+       display: none;
+}
+
+/* NEW STUFF */
+#greenBackground{
+    padding:16px 24px 24px;
+       width:400px;
+    background-color:#CCE7CD;
+       border:1px solid #5EAC58;
+}
+p#informationsharing {
+    width: 400px;
+    padding: 0 15px;
+    line-height: 14px;
+    font-size: 11px;
+}
+ul#moreinfolinks li{
+    list-style: none !important;
+    list-style-image: none !important;
+}
+h3.amount_header {
+       padding: 0 0 0.4em 0;
+       margin-bottom: 0;
+       font-weight: normal;
+}


Property changes on: 
trunk/extensions/DonationInterface/payflowpro_gateway/forms/css/TwoStepTwoColumnLetter3-orig.css
___________________________________________________________________
Added: svn:eol-style
   + native

Modified: 
trunk/extensions/DonationInterface/payflowpro_gateway/forms/css/TwoStepTwoColumnLetter3.css
===================================================================
--- 
trunk/extensions/DonationInterface/payflowpro_gateway/forms/css/TwoStepTwoColumnLetter3.css
 2011-11-16 22:24:03 UTC (rev 103396)
+++ 
trunk/extensions/DonationInterface/payflowpro_gateway/forms/css/TwoStepTwoColumnLetter3.css
 2011-11-16 22:24:36 UTC (rev 103397)
@@ -35,40 +35,33 @@
     text-align: right;
     width: 94px;
 }
-input#city {
-       width: 130px;
-}
-input#zip {
-       width: 55px;
-}
-input.hasplaceholder {
-       color: rgb(153, 153, 153);
-}
+
+
 .payflow-cc-form-section {
-        float: none;
-        margin-right: 0em;
-        margin-bottom: 1em;
+    float: none;
+    margin-right: 0em;
+    margin-bottom: 1em;
 }
 
 #payflowpro_gateway-cc_form_container {
-        width: 100%;
+    width: 100%;
 }
 
 #payflowpro_gateway-cc_form_form {
-        width: 475px;
-        float: right;
-        margin-left: 2em;
-        padding-left: 2em;
-        border-left: 1px solid #BBBBBB;
+    width: 475px;
+    float: right;
+    margin-left: 2em;
+    padding-left: 2em;
+    border-left: 1px solid #BBBBBB;
 }
 
 #payflowpro_gateway-cc_form_letter {
-        height: 100%;
+    height: 100%;
 }
 
 #payflowpro_gateway-cc_form_letter p {
-        font-size: 1.125em;
-        margin-bottom: 1.2em;
+    font-size: 1.125em;
+    margin-bottom: 1.2em;
 }
 
 #payflowpro_gateway-personal-info {
@@ -152,13 +145,13 @@
 
 /* NEW STUFF */
 #greenBackground{
-    padding:16px 24px 24px;
-       width:400px;
+    padding:16px 24px;
+       width:300px;
     background-color:#CCE7CD;
        border:1px solid #5EAC58;
 }
 p#informationsharing {
-    width: 400px;
+    width: 318px;
     padding: 0 15px;
     line-height: 14px;
     font-size: 11px;
@@ -172,3 +165,21 @@
        margin-bottom: 0;
        font-weight: normal;
 }
+
+table#payflow-table-donor{
+    /*margin-left: 10px;*/
+}
+
+/* Form inputs */
+input#fname, input#lname {
+    width: 130px;
+}
+input#street, input#card_num, input#emailAdd {
+    width: 271px;
+}
+input#city {
+       width: 135px;
+}
+input#zip {
+       width: 65px;
+}

Added: 
trunk/extensions/DonationInterface/payflowpro_gateway/forms/html/TwoStepTwoColumnLetter3-orig.html
===================================================================
--- 
trunk/extensions/DonationInterface/payflowpro_gateway/forms/html/TwoStepTwoColumnLetter3-orig.html
                          (rev 0)
+++ 
trunk/extensions/DonationInterface/payflowpro_gateway/forms/html/TwoStepTwoColumnLetter3-orig.html
  2011-11-16 22:24:36 UTC (rev 103397)
@@ -0,0 +1,181 @@
+<script type="text/javascript">
+       mw.loader.load('pfp.form.rapidhtml.TwoStepTwoColumnLetter3');
+       // these must go through RapidHTML and thus are inline
+       var amountErrors = 
['#general|escape','#retryMsg|escape','#amount|escape'];
+       var billingErrors = 
['#fname|escape','#lname|escape','#city|escape','#country|escape','#street|escape','#state|escape','#zip|escape','#emailAdd|escape'];
+       var paymentErrors = 
['#card_num|escape','#card_type|escape','#cvv|escape'];
+       var actionURL = "@action";
+       var scriptPath = "@script_path";
+</script>
+
+<table width="100%" cellspacing="0" cellpadding="0" border="0">
+       <tbody>
+       <tr>
+               <td id="appeal" valign="top">
+                       {{LanguageSwitch|2011FR/@appeal/text|@language}}
+               </td>
+               <td id="donate" valign="top">
+                       <div id="greenBackground" class="">
+                       <noscript>
+                               <div id="noscript">
+                                       <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>
+                               </div>
+                       </noscript>
+
+                       <h2 id="donate-head">Please complete your donation 
below ...</h2>
+
+                       <p id="topError" class="creditcard-error-msg"></p>
+
+                       <form name="payment" method="post" action="@action" 
autocomplete="off">
+                               <div id="payflowpro_gateway-personal-info">
+                                       <table id="payflow-table-donor">
+                                               <tbody>
+                                               <tr>
+                                                       <td colspan="2"><span 
class="creditcard-error-msg"></span></td>
+                                               </tr>
+                                               <tr>
+                                                       <td colspan="2">
+                                                               <table 
cellspacing="0" cellpadding="4" border="1" id="donation_amount">
+                                                                       <tbody>
+                                                                       <tr>
+                                                                               
<td class="amount_header">Description</td>
+                                                                               
<td class="amount_header" style="text-align:right;width:75px;">Amount</td>
+                                                                               
<td class="amount_header" style="text-align:right;width:75px;">Currency</td>
+                                                                       </tr>
+                                                                       <tr>
+                                                                               
<td class="amount_data">Donation</td>
+                                                                               
<td class="amount_data" style="text-align:right;width:75px;">@amount</td>
+                                                                               
<td class="amount_data" style="text-align:right;width:75px;">@currency_code</td>
+                                                                       </tr>
+                                                                       </tbody>
+                                                               </table>
+                                                       </td>
+                                               </tr>
+                                               <tr>
+                                                       <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>
+                                               </tr>
+                                               <tr>
+                                                       <td class="label"></td>
+                                                       <td><img 
src="@script_path/extensions/DonationInterface/gateway_forms/includes/credit_card_logos.gif"></td>
+                                               </tr>
+                                               <tr>
+                                                       <td 
class="label"><label for="card_num">Card number</label></td>
+                                                       <td><input 
name="card_num" size="30" value="@card_num" type="text" maxlength="100" 
id="card_num" class="fullwidth" autocomplete="off"></td>
+                                               </tr>
+                                               <tr>
+                                                       <td 
class="label"><label for="mos">Expiration date</label></td>
+                                                       <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">
+                                                               <!--<option 
value="">Year</option>-->
+                                                               <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></td>
+                                               </tr>
+                                               <tr>
+                                                       <td colspan="2"><span 
class="creditcard-error-msg"></span></td>
+                                               </tr>
+                                               <tr>
+                                                       <td 
class="label"><label for="cvv">Security code</label></td>
+                                                       <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>
+                                               </tr>
+                                               <tr>
+                                                       <td colspan="2"><span 
class="creditcard-error-msg"></span></td>
+                                               </tr>
+                                               <tr>
+                                                       <td colspan="2"><span 
class="creditcard-error-msg"></span></td>
+                                               </tr>
+                                               <tr>
+                                                       <td 
class="label"><label for="fname">Name on card</label></td>
+                                                       <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">
+                                                       </td>
+                                               </tr>
+                                               <tr>
+                                                       <td colspan="2"><span 
class="creditcard-error-msg"></span></td>
+                                               </tr>
+                                               <tr>
+                                                       <td 
class="label"><label for="street">Billing address</label></td>
+                                                       <td><input 
name="street" size="30" value="@street" type="text" placeholder="Street" 
maxlength="100" id="street" class="fullwidth"></td>
+                                               </tr>
+                                               <tr>
+                                                       <td colspan="2"><span 
class="creditcard-error-msg"></span></td>
+                                               </tr>
+                                               <tr>
+                                                       <td class="label"></td>
+                                                       <td><input name="city" 
size="18" value="@city" type="text" placeholder="City" maxlength="40" id="city">
+                                                               <select 
id="state" name="state" value="@state" >
+                                                                       <option 
value=""></option>
+                                                                       <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>
+                                                               </select>
+                                                               <input 
name="zip" size="5" value="@zip" type="text" placeholder="Zip code" 
maxlength="10" id="zip">
+                                                       </td>
+                                               </tr>
+                                               <tr>
+                                                       <td colspan="2"><span 
class="creditcard-error-msg"></span></td>
+                                               </tr>
+                                               <tr>
+                                                       <td 
class="label"><label for="emailAdd">E-mail receipt to</label></td>
+                                                       <td><input 
name="emailAdd" size="30" value="@emailAdd" type="text" placeholder="Email 
address" maxlength="64" id="emailAdd" class="fullwidth"></td>
+                                               </tr>
+                                               <tr>
+                                                       <td class="label"></td>
+                                                       <td>
+                                                               <div 
id="mw-donate-submit-button">&nbsp;<br>
+                                                                       <input 
id="ccSubmitButton" name="ccSubmitButton" 
src="@script_path/extensions/DonationInterface/gateway_forms/includes/submit-donation-button.png"
 alt="Submit donation" type="image"/>
+                                                               </div>
+                                                               <div 
class="mw-donate-submessage" id="payflowpro_gateway-donate-submessage">
+                                                                       <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.
+                                                               </div>
+                                                       </td>
+                                               </tr>
+                                               </tbody>
+                                       </table>
+
+                               </div>
+                               <input type="hidden" name="gateway" 
value="payflowpro" id="gateway" />
+                               <input type="hidden" name="returnto" 
value="Thank_You/en" />
+                               <input type="hidden" value="0" 
name="PaypalRedirect" id="PaypalRedirect">
+                               <input type="hidden" value="@amount" 
name="amount">
+                               <input type="hidden" value="US" name="country" 
id="country" />
+                               <input type="hidden" value="@expiration" 
name="expiration" id="expiration"/>
+                               <input type="hidden" value="USD" 
name="currency_code" />
+                               <input type="hidden" value="@utm_source" 
name="utm_source"/>
+                               <input type="hidden" value="@utm_medium" 
name="utm_medium"/>
+                               <input type="hidden" value="@utm_campaign" 
name="utm_campaign"/>
+                               <input type="hidden" value="@language" 
name="language"/>
+                               <input type="hidden" value="@referrer" 
name="referrer"/>
+                               <input type="hidden" value="@comment" 
name="comment"/>
+                               <input type="hidden" value="@comment-option" 
name="comment-option"/>
+                               <input type="hidden" value="1" 
name="email-opt"/>
+                               <input type="hidden" value="@token" 
name="token"/>
+                               <input type="hidden" value="@order_id"  
name="order_id"/>
+                               <input type="hidden" value="@numAttempt" 
name="numAttempt"/>
+                               <input type="hidden" 
value="@contribution_tracking_id" name="contribution_tracking_id"/>
+                               <input type="hidden" value="@data_hash" 
name="data_hash"/>
+                               <input type="hidden" value="@owa_session" 
name="owa_session"/>
+                               <input type="hidden" value="@owa_ref" 
name="owa_ref"/>
+                               <!-- new required fields -->
+                               <input type="hidden" value="@gateway" 
name="gateway"/>
+                               <input type="hidden" value="cc" 
name="payment_method"/>
+                       </form>
+                               <div class="payflow-cc-form-section" 
id="payflowpro_gateway-donate-addl-info">
+                                       <div 
id="payflowpro_gateway-donate-addl-info-text">
+                                               <div 
style="text-align:center;">* * *</div>
+                                               <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>
+                                               <div class="">Questions or 
comments? Contact: <a 
href="mailto:[email protected]";>[email protected]</a>
+                                               </div>
+                                       </div>
+                               </div>
+                               <div style="clear:both;"></div>
+                       </div>
+               </td>
+       </tr>
+       </tbody>
+</table>


Property changes on: 
trunk/extensions/DonationInterface/payflowpro_gateway/forms/html/TwoStepTwoColumnLetter3-orig.html
___________________________________________________________________
Added: svn:eol-style
   + native

Modified: 
trunk/extensions/DonationInterface/payflowpro_gateway/forms/html/TwoStepTwoColumnLetter3.html
===================================================================
--- 
trunk/extensions/DonationInterface/payflowpro_gateway/forms/html/TwoStepTwoColumnLetter3.html
       2011-11-16 22:24:03 UTC (rev 103396)
+++ 
trunk/extensions/DonationInterface/payflowpro_gateway/forms/html/TwoStepTwoColumnLetter3.html
       2011-11-16 22:24:36 UTC (rev 103397)
@@ -22,113 +22,95 @@
                                </div>
                        </noscript>
 
-                       <h2 id="donate-head">Please complete your donation 
below ...</h2>
+                       <!--<h2 id="donate-head">Please complete your donation 
below ...</h2>-->
 
                        <p id="topError" class="creditcard-error-msg"></p>
 
-                       <form name="payment" method="post" action="@action" 
autocomplete="off">
+                       <form name="payment" method="post" action="@action">
                                <div id="payflowpro_gateway-personal-info">
                                        <table id="payflow-table-donor">
                                                <tbody>
+
                                                <tr>
-                                                       <td colspan="2"><span 
class="creditcard-error-msg"></span></td>
-                                               </tr>
-                                               <tr>
                                                        <td colspan="2">
-                                                               <table 
cellspacing="0" cellpadding="4" border="1" id="donation_amount">
-                                                                       <tbody>
-                                                                       <tr>
-                                                                               
<td class="amount_header">Description</td>
-                                                                               
<td class="amount_header" style="text-align:right;width:75px;">Amount</td>
-                                                                               
<td class="amount_header" style="text-align:right;width:75px;">Currency</td>
-                                                                       </tr>
-                                                                       <tr>
-                                                                               
<td class="amount_data">Donation</td>
-                                                                               
<td class="amount_data" style="text-align:right;width:75px;">@amount</td>
-                                                                               
<td class="amount_data" style="text-align:right;width:75px;">@currency_code</td>
-                                                                       </tr>
-                                                                       </tbody>
-                                                               </table>
+                                                               <div 
id="step1header">
+                                                                       <h3 
class="amount_header">Donation amount&#160;&#160;<span 
id="selected-amount">$@amount</span></h3>
+                                                               </div>
                                                        </td>
                                                </tr>
                                                <tr>
                                                        <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>
                                                </tr>
                                                <tr>
-                                                       <td class="label"></td>
-                                                       <td><img 
src="@script_path/extensions/DonationInterface/gateway_forms/includes/credit_card_logos.gif"></td>
+                                                       <!--<td 
class="label"><label for="fname">Name on card</label></td>-->
+                                                       <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>
                                                </tr>
                                                <tr>
-                                                       <td 
class="label"><label for="card_num">Card number</label></td>
-                                                       <td><input 
name="card_num" size="30" value="@card_num" type="text" maxlength="100" 
id="card_num" class="fullwidth" autocomplete="off"></td>
+                                                       <td colspan="2"><span 
class="creditcard-error-msg"></span></td>
                                                </tr>
                                                <tr>
-                                                       <td 
class="label"><label for="mos">Expiration date</label></td>
-                                                       <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">
-                                                               <!--<option 
value="">Year</option>-->
-                                                               <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></td>
+                                                       <!--<td 
class="label"><label for="street">Billing address</label></td>-->
+                                                       <td colspan="2"><input 
name="street" value="@street" type="text" placeholder="Street" id="street"></td>
                                                </tr>
                                                <tr>
                                                        <td colspan="2"><span 
class="creditcard-error-msg"></span></td>
                                                </tr>
                                                <tr>
-                                                       <td 
class="label"><label for="cvv">Security code</label></td>
-                                                       <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>
+                                                       <!--<td 
class="label"></td>-->
+                                                       <td colspan="2"><input 
name="city" value="@city" type="text" placeholder="City" id="city">
+                                                               <select 
id="state" name="state" value="@state" >
+                                                                       <option 
value=""></option>
+                                                                       <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>
+                                                               </select>
+                                                               <input 
name="zip" value="@zip" type="text" placeholder="Zip code" id="zip">
+                                                       </td>
                                                </tr>
                                                <tr>
                                                        <td colspan="2"><span 
class="creditcard-error-msg"></span></td>
                                                </tr>
+
+
                                                <tr>
-                                                       <td colspan="2"><span 
class="creditcard-error-msg"></span></td>
+                                                       <!--<td 
class="label"></td>-->
+                                                       <td colspan="2"><img 
src="@script_path/extensions/DonationInterface/gateway_forms/includes/credit_card_logos.gif"></td>
                                                </tr>
                                                <tr>
-                                                       <td 
class="label"><label for="fname">Name on card</label></td>
-                                                       <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">
+                                                       <!--<td 
class="label"><label for="card_num">Card number</label></td>-->
+                                                       <td colspan="2"><input 
name="card_num" value="@card_num" placeholder="Card number" type="text" 
id="card_num" class="fullwidth" autocomplete="off"></td>
+                                               </tr>
+                                               <tr>
+                                                       <!--<td 
class="label"><label for="mos">Expiration date</label></td>-->
+                                                       <td colspan="2">
+                                                               <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"><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>
                                                        </td>
                                                </tr>
                                                <tr>
                                                        <td colspan="2"><span 
class="creditcard-error-msg"></span></td>
                                                </tr>
                                                <tr>
-                                                       <td 
class="label"><label for="street">Billing address</label></td>
-                                                       <td><input 
name="street" size="30" value="@street" type="text" placeholder="Street" 
maxlength="100" id="street" class="fullwidth"></td>
+                                                       <!--<td 
class="label"><label for="cvv">Security code</label></td>-->
+                                                       <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>
                                                </tr>
                                                <tr>
                                                        <td colspan="2"><span 
class="creditcard-error-msg"></span></td>
                                                </tr>
                                                <tr>
-                                                       <td class="label"></td>
-                                                       <td><input name="city" 
size="18" value="@city" type="text" placeholder="City" maxlength="40" id="city">
-                                                               <select 
id="state" name="state" value="@state" >
-                                                                       <option 
value=""></option>
-                                                                       <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>
-                                                               </select>
-                                                               <input 
name="zip" size="5" value="@zip" type="text" placeholder="Zip code" 
maxlength="10" id="zip">
-                                                       </td>
+                                                       <td colspan="2"><span 
class="creditcard-error-msg"></span></td>
                                                </tr>
+
                                                <tr>
                                                        <td colspan="2"><span 
class="creditcard-error-msg"></span></td>
                                                </tr>
                                                <tr>
-                                                       <td 
class="label"><label for="emailAdd">E-mail receipt to</label></td>
-                                                       <td><input 
name="emailAdd" size="30" value="@emailAdd" type="text" placeholder="Email 
address" maxlength="64" id="emailAdd" class="fullwidth"></td>
+                                                       <!--<td 
class="label"><label for="emailAdd">E-mail receipt to</label></td>-->
+                                                       <td colspan="2"><input 
name="emailAdd" value="@emailAdd" type="text" placeholder="Email address" 
id="emailAdd"></td>
                                                </tr>
                                                <tr>
-                                                       <td class="label"></td>
-                                                       <td>
+                                                       <!--<td 
class="label"></td>-->
+                                                       <td colspan="2">
                                                                <div 
id="mw-donate-submit-button">&nbsp;<br>
-                                                                       <input 
id="ccSubmitButton" name="ccSubmitButton" 
src="@script_path/extensions/DonationInterface/gateway_forms/includes/submit-donation-button.png"
 alt="Submit donation" type="image"/>
+                                                                       <input 
id="ccSubmitButton" name="ccSubmitButton" 
src="@script_path/extensions/DonationInterface/gateway_forms/includes/submit-donation-button.png"
 alt="Submit donation" type="image">
                                                                </div>
                                                                <div 
class="mw-donate-submessage" id="payflowpro_gateway-donate-submessage">
                                                                        <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 @@
                                <input type="hidden" value="@gateway" 
name="gateway"/>
                                <input type="hidden" value="cc" 
name="payment_method"/>
                        </form>
-                               <div class="payflow-cc-form-section" 
id="payflowpro_gateway-donate-addl-info">
-                                       <div 
id="payflowpro_gateway-donate-addl-info-text">
-                                               <div 
style="text-align:center;">* * *</div>
-                                               <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>
-                                               <div class="">Questions or 
comments? Contact: <a 
href="mailto:[email protected]";>[email protected]</a>
-                                               </div>
-                                       </div>
-                               </div>
-                               <div style="clear:both;"></div>
                        </div>
+                       <p 
id="informationsharing">%donate_interface-informationsharing|url%</p>
+                       <table>
+                               <tr>
+                                       <td>
+                                               <ul id="moreinfolinks">
+                                                       <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>
+                                                       <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>
+                                                       <li><a 
href="http://wikimediafoundation.org/wiki/Special:LandingCheck?landing_page=FAQ&language=@language&uselang=@language&country=@country";>%donate_interface-faqs%</a></li>
+                                                       <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>
+                                               </ul>
+                                       </td>
+                                       <td>@verisign_logo</td>
+                               </tr>
+                       </table>
                </td>
        </tr>
        </tbody>


_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs

Reply via email to