r101638 MediaWiki - Code Review archive

Repository:MediaWiki
Revision:< r101637‎ | r101638 | r101639 >
Date:17:15, 2 November 2011
Author:pgehres
Status:ok
Tags:fundraising 
Comment:
working to get ie6 working with webitects_2_3step, removed ez_pz, et. al
Modified paths:
  • /trunk/extensions/DonationInterface/gateway_forms/rapidhtml/RapidHtmlResources.php (modified) (history)
  • /trunk/extensions/DonationInterface/globalcollect_gateway/forms/css/webitects_2_3step.css (modified) (history)
  • /trunk/extensions/DonationInterface/globalcollect_gateway/forms/css/webitects_2_3step.ie6.css (added) (history)
  • /trunk/extensions/DonationInterface/globalcollect_gateway/forms/html/webitects_2_3step.html (modified) (history)
  • /trunk/extensions/DonationInterface/globalcollect_gateway/forms/js/webitects_2_3step.js (modified) (history)

Diff [purge]

Index: trunk/extensions/DonationInterface/gateway_forms/rapidhtml/RapidHtmlResources.php
——@@ -52,7 +52,6 @@
5353 'css/Webitects.css',
5454 ),
5555 'scripts' => array(
56 - 'js/jquery.ezpz_hint.js',
5756 ),
5857 'dependencies' => array(
5958 'jquery.ui.accordion',
——@@ -74,6 +73,16 @@
7574 'localBasePath' => dirname( __FILE__ ).'/../../globalcollect_gateway/forms',
7675 'remoteExtPath' => $wgGlobalCollectRapidHtmlRemoteExtPath,
7776 );
 77+$wgResourceModules[ 'gc.form.rapidhtml.webitects_2_3step.ie6' ] = array(
 78+ 'styles' => array(
 79+ 'css/webitects_2_3step.ie6.css',
 80+ ),
 81+ 'dependencies' => array(
 82+ 'gc.form.rapidhtml.webitects_2_3step'
 83+ ),
 84+ 'localBasePath' => dirname( __FILE__ ).'/../../globalcollect_gateway/forms',
 85+ 'remoteExtPath' => $wgGlobalCollectRapidHtmlRemoteExtPath,
 86+);
7887
7988 /**
8089 * globalcollect_test
Index: trunk/extensions/DonationInterface/globalcollect_gateway/forms/html/webitects_2_3step.html
——@@ -1,25 +1,32 @@
22 <script type="text/javascript">
33 mw.loader.load('gc.form.rapidhtml.webitects_2_3step');
44 // these must go through RapidHTML and thus are inline
5 - var amountErrors = ['#general|escape','#retryMsg|escape','#amount|escape'],
6 - billingErrors = ['#fname|escape','#lname|escape','#city|escape','#country|escape',
7 - '#street|escape','#state|escape','#zip|escape','#emailAdd|escape'],
8 - paymentErrors = ['#card_num|escape','#card_type|escape','#cvv|escape'],
9 - actionURL = "@action",
10 - scriptPath = "@script_path";
 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";
1110 </script>
1211 <!--[if lt IE 7]>
13 -<style type="text/css">body{behavior:url("@script_path/skins/vector/csshover.min.htc")}</style>
 12+<script type="text/javascript">
 13+ mw.loader.load('gc.form.rapidhtml.webitects_2_3step.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]>
1421 <style>
15 -/* style for IE6 + IE5.5 + IE5.0 */
16 -.gainlayout { height: 0; }
17 -</style><![endif]-->
18 -<!--[if IE 7]><style>
19 -.gainlayout { zoom: 1; height: 1%; }
20 -</style><![endif]-->
 22+ .gainlayout {
 23+ zoom: 1;
 24+ height: 1%;
 25+ }
 26+</style>
 27+<![endif]-->
2128
2229 <div class="ltr">
23 - <table>
 30+ <table id="layouttable">
2431 <tr>
2532 <td>
2633 <div id="appeal">
——@@ -63,24 +70,24 @@
6471 <div id="billing-content" class="gainlayout">
6572 <div id="billingErrorMessages" class="small"></div>
6673 <div class="name-fields">
67 - <span class="name-first"><input class="txt hint" id="fname" name="fname" title="%donate_interface-donor-fname%" value="@fname" /></span>
68 - <span class="name-last"><input class="txt hint" id="lname" name="lname" title="%donate_interface-donor-lname%" value="@lname" /></span>
 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>
6976 </div>
7077 <div class="loc-fields">
71 - <span class="loc-street"><input class="txt hint" id="street" name="street" title="%donate_interface-donor-street%" value="@street" /></span>
72 - <span class="loc-city"><input class="txt hint" id="city" name="city" title="%donate_interface-donor-city%" value="@city" /></span>
 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>
7380 <span class="loc-state">
7481 <select id="state" name="state" class="txt" value="@state" >
7582 <option value=""></option>
7683 <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>
7784 </select>
7885 </span>
79 - <span class="loc-postal"><input class="txt hint" id="zip" name="zip" title="%donate_interface-zip%" value="@zip"/></span> <!-- TODO: use postal code on non-US -->
 86+ <span class="loc-postal"><input class="txt" id="zip" name="zip" title="%donate_interface-zip%" value="@zip" placeholder="%donate_interface-zip%"/></span> <!-- TODO: use postal code on non-US -->
8087 </div>
81 - <p><input class="txt hint" title="%donate_interface-donor-email%" id="emailAdd" name="emailAdd" value="@emailAdd"/></p>
 88+ <p><input class="txt" title="%donate_interface-donor-email%" id="emailAdd" name="emailAdd" value="@emailAdd" placeholder="%donate_interface-donor-email%"/></p>
8289
8390 <dl class="">
84 - <dt><span class="label">%donate_interface-select-credit-card%</span></dt>
 91+ <dt><span id="select-credit-card" class="label">%donate_interface-select-credit-card%</span></dt>
8592 <dd class="field" style="margin-bottom: 0;">
8693 <ul class="options-h" id="cards" style="margin: 0;">
8794 <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>
Index: trunk/extensions/DonationInterface/globalcollect_gateway/forms/css/webitects_2_3step.css
——@@ -21,25 +21,23 @@
2222 display: none;
2323 }
2424
25 -/* Callouts */
26 -.call-l, .call-r {
27 - width: 270px;
 25+/* Layout */
 26+table#layouttable tr td {
 27+ vertical-align: top;
2828 }
2929
30 -/* Layout */
3130 #appeal {
32 - float: left;
33 - width: 100%;
 31+ /*width: 100%;*/
3432 }
3533 #appeal-content {
36 - padding-right: 380px;
 34+ /*padding-right: 380px;*/
3735 }
3836 .clear {
3937 clear: both;
4038 }
4139 #donate {
42 - float: left;
43 - margin-left: -350px;
 40+ /*float: left;*/
 41+ /*margin-left: -350px;*/
4442 width: 350px;
4543 }
4644 #donate-content {
——@@ -73,4 +71,10 @@
7472
7573 #amtErrorMessages, #billingErrorMessages, #paymentErrorMessages {
7674 color: #F00;
 75+}
 76+.txt{
 77+ margin: 0 !important;
 78+}
 79+#billingContent span{
 80+ margin: 0 !important;
7781 }
\ No newline at end of file
Index: trunk/extensions/DonationInterface/globalcollect_gateway/forms/css/webitects_2_3step.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: trunk/extensions/DonationInterface/globalcollect_gateway/forms/css/webitects_2_3step.ie6.css
___________________________________________________________________
Added: svn:eol-style
137 + native
Index: trunk/extensions/DonationInterface/globalcollect_gateway/forms/js/webitects_2_3step.js
——@@ -56,8 +56,6 @@
5757 }
5858 showAmount( $( 'input[name="amount"]' ) ); // lets go ahead and assume there is something to show
5959 }
60 - // Init inline labels
61 - $( ".hint" ).ezpz_hint();
6260
6361 $( "#cc" ).click( function() {
6462 /* safety check for people who hit the back button */

Follow-up revisions

RevisionCommit summaryAuthorDate
r101746MFT r101074, r101217, r101236, r101382, r101501, r101503, r101504, r101512, r...awjrichards23:23, 2 November 2011

Status & tagging log