| Index: trunk/extensions/DonationInterface/gateway_forms/rapidhtml/RapidHtmlResources.php |
| — | — | @@ -134,8 +134,8 @@ |
| 135 | 135 | $wgResourceModules[ 'gc.form.rapidhtml.cc' ] = array( |
| 136 | 136 | 'styles' => 'css/gc.cc.css', |
| 137 | 137 | 'scripts' => array( |
| 138 | | - 'js/gc.cc.js', |
| 139 | | - 'js/gc.js' |
| | 138 | + 'js/gc.js', |
| | 139 | + 'js/gc.cc.js' |
| 140 | 140 | ), |
| 141 | 141 | 'dependencies' => array( 'di.form.core.validate' ), |
| 142 | 142 | 'localBasePath' => dirname( __FILE__ ).'/../../globalcollect_gateway/forms', |
| Index: trunk/extensions/DonationInterface/globalcollect_gateway/forms/html/cc/cc-US.html |
| — | — | @@ -64,7 +64,7 @@ |
| 65 | 65 | <tr> |
| 66 | 66 | <td> |
| 67 | 67 | <dl class=""> |
| 68 | | - <dd class="field" style="margin-bottom: 0; margin-left: 10px;"> |
| | 68 | + <dd class="field" style="margin-bottom: 0; margin-left: 0;"> |
| 69 | 69 | <ul class="options-h" id="cards" style="margin: 0;"> |
| 70 | 70 | <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> |
| 71 | 71 | <li><input id="cc-mastercard" name="cardtype" type="radio" value="mastercard" class="cardradio" /> <label for="cc-mastercard"><img alt="MasterCard" src="@script_path/extensions/DonationInterface/gateway_forms/includes/card-mastercard.png" /></label></li> |
| Index: trunk/extensions/DonationInterface/globalcollect_gateway/forms/js/gc.cc.js |
| — | — | @@ -38,8 +38,11 @@ |
| 39 | 39 | } |
| 40 | 40 | |
| 41 | 41 | $( "#paymentContinueBtn" ).live( "click", function() { |
| 42 | | - if ( validate_personal( document.paypalcontribution ) && validateAmount() ) { |
| 43 | | - displayCreditCardForm() |
| | 42 | + if ( validate_personal( document.payment ) && validateAmount() ) { |
| | 43 | + $( "#payment" ).animate( { height:'314px' }, 1000 ); |
| | 44 | + displayCreditCardForm(); |
| | 45 | + // hide the continue button so that people don't get confused with two of them |
| | 46 | + $( "#paymentContinue" ).hide(); |
| 44 | 47 | } |
| 45 | 48 | } ); |
| 46 | 49 | |