| Index: trunk/extensions/DonationInterface/payflowpro_gateway/forms/html/webitects_2_3step.html |
| — | — | @@ -1,5 +1,5 @@ |
| 2 | 2 | <script type="text/javascript"> |
| 3 | | - mw.loader.load('pfp.form.rapidhtml.webitects_2_3step'); |
| | 3 | + mw.loader.load('pfp.form.rapidhtml.webitects'); |
| 4 | 4 | // these must go through RapidHTML and thus are inline |
| 5 | 5 | var amountErrors = ['#general|escape','#retryMsg|escape','#amount|escape']; |
| 6 | 6 | var billingErrors = ['#fname|escape','#lname|escape','#city|escape','#country|escape','#street|escape','#state|escape','#zip|escape','#emailAdd|escape']; |
| — | — | @@ -9,7 +9,7 @@ |
| 10 | 10 | </script> |
| 11 | 11 | <!--[if lt IE 7]> |
| 12 | 12 | <script type="text/javascript"> |
| 13 | | - mw.loader.load('pfp.form.rapidhtml.webitects_2_3step.ie6'); |
| | 13 | + mw.loader.load('pfp.form.rapidhtml.webitects.ie6'); |
| 14 | 14 | </script> |
| 15 | 15 | <style type="text/css"> |
| 16 | 16 | body{ |
| Index: trunk/extensions/DonationInterface/payflowpro_gateway/forms/css/webitects_2_3step.css |
| — | — | @@ -1,90 +0,0 @@ |
| 2 | | -#errorMessages { |
| 3 | | - font-size: 0.75em; |
| 4 | | - color: #FF0000; |
| 5 | | -} |
| 6 | | -/* Force vertical scrollbar |
| 7 | | - html { overflow-y: scroll; } |
| 8 | | - */ |
| 9 | | -/* Accordion */ |
| 10 | | -#accordion h3 { |
| 11 | | - background: #FFFFFF; |
| 12 | | - border: none; |
| 13 | | - font-size: 1.1em; |
| 14 | | - margin: 0; |
| 15 | | - padding: 0.5em 0.9em; |
| 16 | | - outline: 0; |
| 17 | | -} |
| 18 | | -.accordion-content { |
| 19 | | - padding: 0.9em; |
| 20 | | -} |
| 21 | | -#step2accordion { |
| 22 | | - display: none; |
| 23 | | -} |
| 24 | | - |
| 25 | | -/* Layout */ |
| 26 | | -table#layouttable tr td { |
| 27 | | - vertical-align: top; |
| 28 | | -} |
| 29 | | - |
| 30 | | -#appeal { |
| 31 | | - /*width: 100%;*/ |
| 32 | | - padding-right: 25px; |
| 33 | | -} |
| 34 | | -#appeal-content { |
| 35 | | - /*padding-right: 380px;*/ |
| 36 | | -} |
| 37 | | -.clear { |
| 38 | | - clear: both; |
| 39 | | -} |
| 40 | | -#donate { |
| 41 | | - /*float: left;*/ |
| 42 | | - /*margin-left: -350px;*/ |
| 43 | | - width: 350px; |
| 44 | | -} |
| 45 | | -#donate-content { |
| 46 | | - background-color: #FFFFFF; |
| 47 | | - border: 1px solid #000000; |
| 48 | | - padding: 1em 0; |
| 49 | | - font-size: 0.95em; |
| 50 | | - /* Maybe */ |
| 51 | | - width: 348px; |
| 52 | | -} |
| 53 | | -#amount-table-white label { |
| 54 | | - font-size: 1.1em; |
| 55 | | -} |
| 56 | | - |
| 57 | | -#donate-body h3 { |
| 58 | | - font-size: 17px; |
| 59 | | -} |
| 60 | | - |
| 61 | | -#step1wrapper, #step2wrapper, #step3wrapper { |
| 62 | | - width: 325px; |
| 63 | | -} |
| 64 | | -/* Initially hide steps 2 and 3 */ |
| 65 | | -#step2wrapper, #step2header, #step3wrapper, #step3header { |
| 66 | | - display: none; |
| 67 | | -} |
| 68 | | -#where-content { |
| 69 | | - font-size: 13px; |
| 70 | | - line-height: 19px; |
| 71 | | - width: 325px; |
| 72 | | -} |
| 73 | | - |
| 74 | | -#amtErrorMessages, #billingErrorMessages, #paymentErrorMessages { |
| 75 | | - color: #F00; |
| 76 | | -} |
| 77 | | -.txt{ |
| 78 | | - margin: 0 !important; |
| 79 | | -} |
| 80 | | -#billingContent span { |
| 81 | | - margin: 0 !important; |
| 82 | | -} |
| 83 | | -p#informationsharing { |
| 84 | | - padding: 0 15px; |
| 85 | | - line-height: 14px; |
| 86 | | - font-size: 11px; |
| 87 | | -} |
| 88 | | -ul#moreinfolinks li{ |
| 89 | | - list-style: none !important; |
| 90 | | - list-style-image: none !important; |
| 91 | | -} |
| \ No newline at end of file |
| Index: trunk/extensions/DonationInterface/payflowpro_gateway/forms/css/webitects_2_3step.ie6.css |
| — | — | @@ -1,35 +0,0 @@ |
| 2 | | -/* style for IE6 + IE5.5 + IE5.0 */ |
| 3 | | -.gainlayout { |
| 4 | | - height: 0 !important; |
| 5 | | -} |
| 6 | | - |
| 7 | | -/* fix the input sizes on the billing address form */ |
| 8 | | -span.name-first input{ |
| 9 | | - width: 140px !important; |
| 10 | | -} |
| 11 | | -span.name-last input{ |
| 12 | | - width: 140px !important; |
| 13 | | -} |
| 14 | | -span.loc-street input{ |
| 15 | | - width: 305px !important; |
| 16 | | -} |
| 17 | | -span.loc-city input{ |
| 18 | | - width: 140px !important; |
| 19 | | -} |
| 20 | | -span.loc-postal input{ |
| 21 | | - width: 48px !important; |
| 22 | | -} |
| 23 | | -#emailAdd{ |
| 24 | | - width: 305px !important; |
| 25 | | -} |
| 26 | | -#select-credit-card{ |
| 27 | | - margin-bottom: 10px; |
| 28 | | -} |
| 29 | | - |
| 30 | | -#donate, #donate-content{ |
| 31 | | - width: 340px !important; |
| 32 | | -} |
| 33 | | - |
| 34 | | -#where-content, #step1wrapper, #step2wrapper, #step3wrapper{ |
| 35 | | - width: 330px !important; |
| 36 | | -} |
| \ No newline at end of file |
| Index: trunk/extensions/DonationInterface/gateway_forms/rapidhtml/RapidHtmlResources.php |
| — | — | @@ -5,7 +5,8 @@ |
| 6 | 6 | * This file is included in DonationInterface/payflowpro_gateway.php |
| 7 | 7 | */ |
| 8 | 8 | |
| 9 | | -$wgPayflowRapidHtmlRemoteExtPath = 'DonationInterface/gateway_forms/rapidhtml'; |
| | 9 | +$wgDonationInterfaceRapidHtmlRemoteExtPath = 'DonationInterface/gateway_forms/rapidhtml'; |
| | 10 | +$wgPayflowRapidHtmlRemoteExtPath = 'DonationInterface/payflowpro_gateway/rapidhtml'; |
| 10 | 11 | $wgGlobalCollectRapidHtmlRemoteExtPath = 'DonationInterface/globalcollect_gateway/forms'; |
| 11 | 12 | |
| 12 | 13 | /** |
| — | — | @@ -46,64 +47,53 @@ |
| 47 | 48 | /** |
| 48 | 49 | * webitects |
| 49 | 50 | */ |
| 50 | | -$wgResourceModules[ 'pfp.form.rapidhtml.webitects' ] = array( |
| | 51 | +$wgResourceModules[ 'di.form.rapidhtml.webitects' ] = array( |
| 51 | 52 | 'styles' => array( |
| 52 | 53 | 'css/lp1.css', |
| 53 | | - 'css/Webitects.css', |
| | 54 | + 'css/webitects.css', |
| 54 | 55 | ), |
| 55 | | - 'scripts' => array( |
| 56 | | - ), |
| 57 | | - 'dependencies' => array( |
| 58 | | - 'jquery.ui.accordion', |
| 59 | | - 'pfp.form.core.validate' |
| 60 | | - ), |
| | 56 | + 'scripts' => '', |
| | 57 | + 'dependencies' => 'jquery.ui.accordion', |
| 61 | 58 | 'localBasePath' => dirname( __FILE__ ), |
| 62 | | - 'remoteExtPath' => $wgPayflowRapidHtmlRemoteExtPath, |
| | 59 | + 'remoteExtPath' => $wgDonationInterfaceRapidHtmlRemoteExtPath, |
| 63 | 60 | ); |
| 64 | | -$wgResourceModules[ 'gc.form.rapidhtml.webitects_2_3step' ] = array( |
| 65 | | - 'styles' => array( |
| 66 | | - 'css/webitects_2_3step.css', |
| 67 | | - ), |
| 68 | | - 'scripts' => array( |
| 69 | | - 'js/webitects_2_3step.js', |
| 70 | | - ), |
| 71 | | - 'dependencies' => array( |
| 72 | | - 'pfp.form.rapidhtml.webitects' |
| 73 | | - ), |
| | 61 | +$wgResourceModules[ 'di.form.rapidhtml.webitects.ie6' ] = array( |
| | 62 | + 'styles' => 'css/webitects.ie6.css', |
| | 63 | + 'scripts' => '', |
| | 64 | + 'dependencies' => 'di.form.rapidhtml.webitects', |
| | 65 | + 'localBasePath' => dirname( __FILE__ ), |
| | 66 | + 'remoteExtPath' => $wgDonationInterfaceRapidHtmlRemoteExtPath, |
| | 67 | +); |
| | 68 | + |
| | 69 | +// GlobalCollect |
| | 70 | +$wgResourceModules[ 'gc.form.rapidhtml.webitects' ] = array( |
| | 71 | + 'styles' => '', //'css/webitects_2_3step.css', |
| | 72 | + 'scripts' => 'js/webitects_2_3step.js', |
| | 73 | + 'dependencies' => 'di.form.rapidhtml.webitects', |
| 74 | 74 | 'localBasePath' => dirname( __FILE__ ).'/../../globalcollect_gateway/forms', |
| 75 | 75 | 'remoteExtPath' => $wgGlobalCollectRapidHtmlRemoteExtPath, |
| 76 | 76 | ); |
| 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 | | - ), |
| | 77 | +$wgResourceModules[ 'gc.form.rapidhtml.webitects.ie6' ] = array( |
| | 78 | + 'styles' => 'css/webitects_2_3step.ie6.css', |
| | 79 | + 'dependencies' => 'gc.form.rapidhtml.webitects', |
| 84 | 80 | 'localBasePath' => dirname( __FILE__ ).'/../../globalcollect_gateway/forms', |
| 85 | 81 | 'remoteExtPath' => $wgGlobalCollectRapidHtmlRemoteExtPath, |
| 86 | 82 | ); |
| 87 | 83 | |
| 88 | | -$wgResourceModules[ 'pfp.form.rapidhtml.webitects_2_3step' ] = array( |
| 89 | | - 'styles' => array( |
| 90 | | - 'css/webitects_2_3step.css', |
| 91 | | - ), |
| 92 | | - 'scripts' => array( |
| 93 | | - 'js/webitects_2_3step.js', |
| 94 | | - ), |
| | 84 | +// PayflowPro |
| | 85 | +$wgResourceModules[ 'pfp.form.rapidhtml.webitects' ] = array( |
| | 86 | + 'styles' => '', |
| | 87 | + 'scripts' => 'js/webitects_2_3step.js', |
| 95 | 88 | 'dependencies' => array( |
| 96 | | - 'pfp.form.rapidhtml.webitects' |
| | 89 | + 'di.form.rapidhtml.webitects', |
| | 90 | + 'pfp.form.core.validate' |
| 97 | 91 | ), |
| 98 | 92 | 'localBasePath' => dirname( __FILE__ ).'/../../payflowpro_gateway/forms', |
| 99 | 93 | 'remoteExtPath' => $wgPayflowRapidHtmlRemoteExtPath, |
| 100 | 94 | ); |
| 101 | | -$wgResourceModules[ 'pfp.form.rapidhtml.webitects_2_3step.ie6' ] = array( |
| 102 | | - 'styles' => array( |
| 103 | | - 'css/webitects_2_3step.ie6.css', |
| 104 | | - ), |
| 105 | | - 'dependencies' => array( |
| 106 | | - 'pfp.form.rapidhtml.webitects_2_3step' |
| 107 | | - ), |
| | 95 | +$wgResourceModules[ 'pfp.form.rapidhtml.webitects.ie6' ] = array( |
| | 96 | + 'styles' => '', //css/webitects_2_3step.ie6.css', |
| | 97 | + 'dependencies' => 'pfp.form.rapidhtml.webitects', |
| 108 | 98 | 'localBasePath' => dirname( __FILE__ ).'/../../payflowpro_gateway/forms', |
| 109 | 99 | 'remoteExtPath' => $wgPayflowRapidHtmlRemoteExtPath, |
| 110 | 100 | ); |
| Index: trunk/extensions/DonationInterface/gateway_forms/rapidhtml/css/Webitects.css |
| — | — | @@ -1,118 +0,0 @@ |
| 2 | | -/*------------------+ |
| 3 | | - | Site: Wikipedia | |
| 4 | | - | Part: New styles | |
| 5 | | - | File: new.css | |
| 6 | | - +------------------*/ |
| 7 | | - |
| 8 | | -.l { float: left; } |
| 9 | | -.r { float: right; } |
| 10 | | -hr { margin: 1.5em 0 0.5em; } |
| 11 | | -h3 span { font-weight: normal; } |
| 12 | | - |
| 13 | | -/* Amounts */ |
| 14 | | -#amount-table td { white-space: nowrap; } |
| 15 | | - |
| 16 | | -/* Callouts */ |
| 17 | | -.call-l { float: left; margin: 0.2em 1em 1em 0; } |
| 18 | | -.call-l, .call-r { background: #fff; border: 1px solid #444; font-size: 13px; padding: 15px 20px; } |
| 19 | | -.call-l h3, .call-r h3 { font-size: 17px; } |
| 20 | | -.call-l .loading, .call-r .loading { background-image: url(https://payments.wikimedia.org/extensions/DonationInterface/payflowpro_gateway/forms/rapidhtml/images/loading-white.gif); } |
| 21 | | -.call-r { float: right; margin: 0.2em 0 1em 1em; } |
| 22 | | - |
| 23 | | -/* Loading */ |
| 24 | | -#loading { font-size: 12px; margin-left: 0.5em; vertical-align: middle; } |
| 25 | | -.loading { background: url(https://payments.wikimedia.org/extensions/DonationInterface/payflowpro_gateway/forms/rapidhtml/images/loading-green.gif) no-repeat 50% 50%; padding: 10px; } |
| 26 | | - |
| 27 | | -/* Muted text */ |
| 28 | | -.mute { font-size: 12px; } |
| 29 | | - |
| 30 | | - |
| 31 | | -/*-------------------+ |
| 32 | | - | Site: Wikipedia | |
| 33 | | - | Part: Form styles | |
| 34 | | - | File: forms.css | |
| 35 | | - +-------------------*/ |
| 36 | | - |
| 37 | | - |
| 38 | | -/* Specifics |
| 39 | | -======================================================================*/ |
| 40 | | -/* Buttons */ |
| 41 | | -.btn { display: inline-block; font-size: 12px; } |
| 42 | | - |
| 43 | | -/* Donate options */ |
| 44 | | -.donate-options input { width: 15em; } |
| 45 | | - |
| 46 | | -/* Continue button */ |
| 47 | | -#paymentContinue input { width: 15em; } |
| 48 | | - |
| 49 | | -/* Checklists */ |
| 50 | | -.checklist { border: 1px solid #ccc; max-height: 20em; line-height: 1.4; margin: 0 0 1em 0; overflow: auto; } |
| 51 | | -.checklist input { margin-bottom: 1px; } |
| 52 | | -.checklist label { display: block; padding: 0.1em 0 0.1em 25px; height: 1%; text-indent: -25px; } |
| 53 | | -.checklist li { background: none; display: block; float: none; margin: 0; padding: 0; white-space: normal; width: 100%; } |
| 54 | | -.checklist li p { margin: 0; padding: 1em 0 0; } |
| 55 | | -.checklist li ul { margin: 0 0 0 2em; } |
| 56 | | -.checklist .mute { font-size: 1em; white-space: nowrap; } |
| 57 | | -.checklist p { font-weight: bold; margin-bottom: 0.25em; } |
| 58 | | -.checklist .selected { background: #ffa; } |
| 59 | | -.checklist ul { margin-bottom: 1em; } |
| 60 | | - |
| 61 | | -/* Fields */ |
| 62 | | -.form { clear: both; font-size: 1.1em; height: 1%; } |
| 63 | | -.form dd { margin: 0; } |
| 64 | | -.form dt { clear: both; font-weight: normal; margin: 0.5em 0 0; } |
| 65 | | -.form dt:first-child { margin: 0; } |
| 66 | | -.form .label, span.label { display: block; font-size: 14px; font-weight: normal; } |
| 67 | | -.field { margin: 0 0 1em; overflow: hidden; position: relative; } |
| 68 | | -.field p { margin-bottom: 0.25em; } |
| 69 | | - |
| 70 | | -/* Location */ |
| 71 | | -.loc-fields span { float: left; margin-bottom: 5px; } |
| 72 | | -.loc-fields .loc-city { margin-right: 1%; width: 51%; } |
| 73 | | -.loc-fields .loc-postal { width: 18%; } |
| 74 | | -.loc-fields .loc-state { margin-right: 4%; width: 22%; } |
| 75 | | -.loc-fields .loc-street { margin-bottom: 5px; width: 100%; } |
| 76 | | - |
| 77 | | -/* Name */ |
| 78 | | -.name-fields span { float: left; margin: 0 2% 5px 0; width: 48%; } |
| 79 | | -.name-fields .name-last { margin: 0; } |
| 80 | | - |
| 81 | | -/* Help text */ |
| 82 | | -.field-help { color: #666; font-size: 0.8em; font-weight: normal; } |
| 83 | | - |
| 84 | | -/* Hints */ |
| 85 | | -.ezpz-hint { color: #777; font-style: italic; } |
| 86 | | - |
| 87 | | -/* Options */ |
| 88 | | -.form .options-h, .form .options-v { margin: 0; } |
| 89 | | -.options-h, .options-v { list-style: none; margin: 0 0 1em 0; } |
| 90 | | -.options-h img, .options-v img { vertical-align: middle; } |
| 91 | | -.options-h li, .options-v li { background: none; margin-bottom: 0.3em; padding: 0; } |
| 92 | | -.options-h li { display: inline; line-height: 2.5; margin-right: 0.3em; white-space: nowrap; } |
| 93 | | -.options-h li select { vertical-align: middle; } |
| 94 | | -.options-h li:last-child { margin: 0; } |
| 95 | | -.form .options-v { margin-top: 5px; } |
| 96 | | -.options-v li { padding-left: 25px; text-indent: -25px; } |
| 97 | | - |
| 98 | | -/* Text boxes */ |
| 99 | | -textarea.txt { width: 99%; } |
| 100 | | -select.txt { padding: 0.2em; } |
| 101 | | - |
| 102 | | -.txt, .txt-date, .txt-med, .txt-sm { |
| 103 | | - border: 1px solid #ccc; |
| 104 | | - -moz-box-shadow: inset 0 1px 1px #ddd; |
| 105 | | - -webkit-box-shadow: inset 0 1px 1px #ddd; |
| 106 | | - box-shadow: inset 0 0 1px #ddd; |
| 107 | | - margin-right: 0.5em; |
| 108 | | - padding: 0.3em; |
| 109 | | - vertical-align: middle; |
| 110 | | -} |
| 111 | | - |
| 112 | | -.txt { width: 95%; } |
| 113 | | -.txt-date { width: 7em; } |
| 114 | | -.txt-med { width: 47%; } |
| 115 | | -.txt-sm { width: 4em; } |
| 116 | | - |
| 117 | | -/* overrides of payflowpro.css */ |
| 118 | | -input#fname { width: 95%; margin-right: 4px; } |
| 119 | | -input#lname { width: 95%; } |
| \ No newline at end of file |
| Index: trunk/extensions/DonationInterface/gateway_forms/rapidhtml/css/webitects.css |
| — | — | @@ -0,0 +1,211 @@ |
| | 2 | +/*------------------+ |
| | 3 | + | Site: Wikipedia | |
| | 4 | + | Part: New styles | |
| | 5 | + | File: new.css | |
| | 6 | + +------------------*/ |
| | 7 | + |
| | 8 | +.l { float: left; } |
| | 9 | +.r { float: right; } |
| | 10 | +hr { margin: 1.5em 0 0.5em; } |
| | 11 | +h3 span { font-weight: normal; } |
| | 12 | + |
| | 13 | +/* Amounts */ |
| | 14 | +#amount-table td { white-space: nowrap; } |
| | 15 | + |
| | 16 | +/* Callouts */ |
| | 17 | +.call-l { float: left; margin: 0.2em 1em 1em 0; } |
| | 18 | +.call-l, .call-r { background: #fff; border: 1px solid #444; font-size: 13px; padding: 15px 20px; } |
| | 19 | +.call-l h3, .call-r h3 { font-size: 17px; } |
| | 20 | +.call-l .loading, .call-r .loading { background-image: url(https://payments.wikimedia.org/extensions/DonationInterface/payflowpro_gateway/forms/rapidhtml/images/loading-white.gif); } |
| | 21 | +.call-r { float: right; margin: 0.2em 0 1em 1em; } |
| | 22 | + |
| | 23 | +/* Loading */ |
| | 24 | +#loading { font-size: 12px; margin-left: 0.5em; vertical-align: middle; } |
| | 25 | +.loading { background: url(https://payments.wikimedia.org/extensions/DonationInterface/payflowpro_gateway/forms/rapidhtml/images/loading-green.gif) no-repeat 50% 50%; padding: 10px; } |
| | 26 | + |
| | 27 | +/* Muted text */ |
| | 28 | +.mute { font-size: 12px; } |
| | 29 | + |
| | 30 | + |
| | 31 | +/*-------------------+ |
| | 32 | + | Site: Wikipedia | |
| | 33 | + | Part: Form styles | |
| | 34 | + | File: forms.css | |
| | 35 | + +-------------------*/ |
| | 36 | + |
| | 37 | + |
| | 38 | +/* Specifics |
| | 39 | +======================================================================*/ |
| | 40 | +/* Buttons */ |
| | 41 | +.btn { display: inline-block; font-size: 12px; } |
| | 42 | + |
| | 43 | +/* Donate options */ |
| | 44 | +.donate-options input { width: 15em; } |
| | 45 | + |
| | 46 | +/* Continue button */ |
| | 47 | +#paymentContinue input { width: 15em; } |
| | 48 | + |
| | 49 | +/* Checklists */ |
| | 50 | +.checklist { border: 1px solid #ccc; max-height: 20em; line-height: 1.4; margin: 0 0 1em 0; overflow: auto; } |
| | 51 | +.checklist input { margin-bottom: 1px; } |
| | 52 | +.checklist label { display: block; padding: 0.1em 0 0.1em 25px; height: 1%; text-indent: -25px; } |
| | 53 | +.checklist li { background: none; display: block; float: none; margin: 0; padding: 0; white-space: normal; width: 100%; } |
| | 54 | +.checklist li p { margin: 0; padding: 1em 0 0; } |
| | 55 | +.checklist li ul { margin: 0 0 0 2em; } |
| | 56 | +.checklist .mute { font-size: 1em; white-space: nowrap; } |
| | 57 | +.checklist p { font-weight: bold; margin-bottom: 0.25em; } |
| | 58 | +.checklist .selected { background: #ffa; } |
| | 59 | +.checklist ul { margin-bottom: 1em; } |
| | 60 | + |
| | 61 | +/* Fields */ |
| | 62 | +.form { clear: both; font-size: 1.1em; height: 1%; } |
| | 63 | +.form dd { margin: 0; } |
| | 64 | +.form dt { clear: both; font-weight: normal; margin: 0.5em 0 0; } |
| | 65 | +.form dt:first-child { margin: 0; } |
| | 66 | +.form .label, span.label { display: block; font-size: 14px; font-weight: normal; } |
| | 67 | +.field { margin: 0 0 1em; overflow: hidden; position: relative; } |
| | 68 | +.field p { margin-bottom: 0.25em; } |
| | 69 | + |
| | 70 | +/* Location */ |
| | 71 | +.loc-fields span { float: left; margin-bottom: 5px; } |
| | 72 | +.loc-fields .loc-city { margin-right: 1%; width: 51%; } |
| | 73 | +.loc-fields .loc-postal { width: 18%; } |
| | 74 | +.loc-fields .loc-state { margin-right: 4%; width: 22%; } |
| | 75 | +.loc-fields .loc-street { margin-bottom: 5px; width: 100%; } |
| | 76 | + |
| | 77 | +/* Name */ |
| | 78 | +.name-fields span { float: left; margin: 0 2% 5px 0; width: 48%; } |
| | 79 | +.name-fields .name-last { margin: 0; } |
| | 80 | + |
| | 81 | +/* Help text */ |
| | 82 | +.field-help { color: #666; font-size: 0.8em; font-weight: normal; } |
| | 83 | + |
| | 84 | +/* Hints */ |
| | 85 | +.ezpz-hint { color: #777; font-style: italic; } |
| | 86 | + |
| | 87 | +/* Options */ |
| | 88 | +.form .options-h, .form .options-v { margin: 0; } |
| | 89 | +.options-h, .options-v { list-style: none; margin: 0 0 1em 0; } |
| | 90 | +.options-h img, .options-v img { vertical-align: middle; } |
| | 91 | +.options-h li, .options-v li { background: none; margin-bottom: 0.3em; padding: 0; } |
| | 92 | +.options-h li { display: inline; line-height: 2.5; margin-right: 0.3em; white-space: nowrap; } |
| | 93 | +.options-h li select { vertical-align: middle; } |
| | 94 | +.options-h li:last-child { margin: 0; } |
| | 95 | +.form .options-v { margin-top: 5px; } |
| | 96 | +.options-v li { padding-left: 25px; text-indent: -25px; } |
| | 97 | + |
| | 98 | +/* Text boxes */ |
| | 99 | +textarea.txt { width: 99%; } |
| | 100 | +select.txt { padding: 0.2em; } |
| | 101 | + |
| | 102 | +.txt, .txt-date, .txt-med, .txt-sm { |
| | 103 | + border: 1px solid #ccc; |
| | 104 | + -moz-box-shadow: inset 0 1px 1px #ddd; |
| | 105 | + -webkit-box-shadow: inset 0 1px 1px #ddd; |
| | 106 | + box-shadow: inset 0 0 1px #ddd; |
| | 107 | + margin-right: 0.5em; |
| | 108 | + padding: 0.3em; |
| | 109 | + vertical-align: middle; |
| | 110 | +} |
| | 111 | + |
| | 112 | +.txt { width: 95%; } |
| | 113 | +.txt-date { width: 7em; } |
| | 114 | +.txt-med { width: 47%; } |
| | 115 | +.txt-sm { width: 4em; } |
| | 116 | + |
| | 117 | +/* overrides of payflowpro.css */ |
| | 118 | +input#fname { width: 95% !important; margin-right: 4px; } |
| | 119 | +input#lname { width: 95% !important; } |
| | 120 | + |
| | 121 | + |
| | 122 | +/* 2_3step additions */ |
| | 123 | +#errorMessages { |
| | 124 | + font-size: 0.75em; |
| | 125 | + color: #FF0000; |
| | 126 | +} |
| | 127 | +/* Force vertical scrollbar |
| | 128 | + html { overflow-y: scroll; } |
| | 129 | + */ |
| | 130 | +/* Accordion */ |
| | 131 | +#accordion h3 { |
| | 132 | + background: #FFFFFF; |
| | 133 | + border: none; |
| | 134 | + font-size: 1.1em; |
| | 135 | + margin: 0; |
| | 136 | + padding: 0.5em 0.9em; |
| | 137 | + outline: 0; |
| | 138 | +} |
| | 139 | +.accordion-content { |
| | 140 | + padding: 0.9em; |
| | 141 | +} |
| | 142 | +#step2accordion { |
| | 143 | + display: none; |
| | 144 | +} |
| | 145 | + |
| | 146 | +/* Layout */ |
| | 147 | +table#layouttable tr td { |
| | 148 | + vertical-align: top; |
| | 149 | +} |
| | 150 | + |
| | 151 | +#appeal { |
| | 152 | + /*width: 100%;*/ |
| | 153 | + padding-right: 25px; |
| | 154 | +} |
| | 155 | +#appeal-content { |
| | 156 | + /*padding-right: 380px;*/ |
| | 157 | +} |
| | 158 | +.clear { |
| | 159 | + clear: both; |
| | 160 | +} |
| | 161 | +#donate { |
| | 162 | + /*float: left;*/ |
| | 163 | + /*margin-left: -350px;*/ |
| | 164 | + width: 350px; |
| | 165 | +} |
| | 166 | +#donate-content { |
| | 167 | + background-color: #FFFFFF; |
| | 168 | + border: 1px solid #000000; |
| | 169 | + padding: 1em 0; |
| | 170 | + font-size: 0.95em; |
| | 171 | + /* Maybe */ |
| | 172 | + width: 348px; |
| | 173 | +} |
| | 174 | +#amount-table-white label { |
| | 175 | + font-size: 1.1em; |
| | 176 | +} |
| | 177 | + |
| | 178 | +#donate-body h3 { |
| | 179 | + font-size: 17px; |
| | 180 | +} |
| | 181 | + |
| | 182 | +#step1wrapper, #step2wrapper, #step3wrapper { |
| | 183 | + width: 325px; |
| | 184 | +} |
| | 185 | +/* Initially hide steps 2 and 3 */ |
| | 186 | +#step2wrapper, #step2header, #step3wrapper, #step3header { |
| | 187 | + display: none; |
| | 188 | +} |
| | 189 | +#where-content { |
| | 190 | + font-size: 13px; |
| | 191 | + line-height: 19px; |
| | 192 | + width: 325px; |
| | 193 | +} |
| | 194 | + |
| | 195 | +#amtErrorMessages, #billingErrorMessages, #paymentErrorMessages { |
| | 196 | + color: #F00; |
| | 197 | +} |
| | 198 | +.txt{ |
| | 199 | + margin: 0 !important; |
| | 200 | +} |
| | 201 | +#billingContent span { |
| | 202 | + margin: 0 !important; |
| | 203 | +} |
| | 204 | +p#informationsharing { |
| | 205 | + padding: 0 15px; |
| | 206 | + line-height: 14px; |
| | 207 | + font-size: 11px; |
| | 208 | +} |
| | 209 | +ul#moreinfolinks li{ |
| | 210 | + list-style: none !important; |
| | 211 | + list-style-image: none !important; |
| | 212 | +} |
| \ No newline at end of file |
| Index: trunk/extensions/DonationInterface/gateway_forms/rapidhtml/css/webitects.ie6.css |
| — | — | @@ -0,0 +1,35 @@ |
| | 2 | +/* style for IE6 + IE5.5 + IE5.0 */ |
| | 3 | +.gainlayout { |
| | 4 | + height: 0 !important; |
| | 5 | +} |
| | 6 | + |
| | 7 | +/* fix the input sizes on the billing address form */ |
| | 8 | +span.name-first input{ |
| | 9 | + width: 140px !important; |
| | 10 | +} |
| | 11 | +span.name-last input{ |
| | 12 | + width: 140px !important; |
| | 13 | +} |
| | 14 | +span.loc-street input{ |
| | 15 | + width: 305px !important; |
| | 16 | +} |
| | 17 | +span.loc-city input{ |
| | 18 | + width: 140px !important; |
| | 19 | +} |
| | 20 | +span.loc-postal input{ |
| | 21 | + width: 48px !important; |
| | 22 | +} |
| | 23 | +#emailAdd{ |
| | 24 | + width: 305px !important; |
| | 25 | +} |
| | 26 | +#select-credit-card{ |
| | 27 | + margin-bottom: 10px; |
| | 28 | +} |
| | 29 | + |
| | 30 | +#donate, #donate-content{ |
| | 31 | + width: 340px !important; |
| | 32 | +} |
| | 33 | + |
| | 34 | +#where-content, #step1wrapper, #step2wrapper, #step3wrapper{ |
| | 35 | + width: 330px !important; |
| | 36 | +} |
| \ No newline at end of file |
| Property changes on: trunk/extensions/DonationInterface/gateway_forms/rapidhtml/css/webitects.ie6.css |
| ___________________________________________________________________ |
| Added: svn:eol-style |
| 1 | 37 | + native |
| Index: trunk/extensions/DonationInterface/gateway_forms/rapidhtml/js/jquery.ezpz_hint.js |
| — | — | @@ -1,62 +0,0 @@ |
| 2 | | -// EZPZ Hint v1.1.1; Copyright (c) 2009 Mike Enriquez, http://theezpzway.com; Released under the MIT License |
| 3 | | -(function($){ |
| 4 | | - $.fn.ezpz_hint = function(options){ |
| 5 | | - var defaults = { |
| 6 | | - hintClass: 'ezpz-hint', |
| 7 | | - hintName: 'ezpz_hint_dummy_input' |
| 8 | | - }; |
| 9 | | - var settings = $.extend(defaults, options); |
| 10 | | - |
| 11 | | - return this.each(function(){ |
| 12 | | - var hint; |
| 13 | | - var dummy_input; |
| 14 | | - |
| 15 | | - // grab the input's title attribute |
| 16 | | - text = $(this).attr('title'); |
| 17 | | - |
| 18 | | - // create a dummy input and place it before the input |
| 19 | | - $('<input type="text" name="temp" value="" />').insertBefore($(this)); |
| 20 | | - |
| 21 | | - // set the dummy input's attributes |
| 22 | | - hint = $(this).prev('input:first'); |
| 23 | | - hint.attr('class', $(this).attr('class')); |
| 24 | | - hint.attr('size', $(this).attr('size')); |
| 25 | | - hint.attr('name', settings.hintName); |
| 26 | | - hint.attr('autocomplete', 'off'); |
| 27 | | - hint.attr('tabIndex', $(this).attr('tabIndex')); |
| 28 | | - hint.addClass(settings.hintClass); |
| 29 | | - hint.val(text); |
| 30 | | - |
| 31 | | - // hide the input |
| 32 | | - $(this).hide(); |
| 33 | | - |
| 34 | | - // don't allow autocomplete (sorry, no remember password) |
| 35 | | - $(this).attr('autocomplete', 'off'); |
| 36 | | - |
| 37 | | - // bind focus event on the dummy input to swap with the real input |
| 38 | | - hint.focus(function(){ |
| 39 | | - dummy_input = $(this); |
| 40 | | - $(this).next('input:first').show(); |
| 41 | | - $(this).next('input:first').focus(); |
| 42 | | - $(this).next('input:first').unbind('blur').blur(function(){ |
| 43 | | - if ($(this).val() == '') { |
| 44 | | - $(this).hide(); |
| 45 | | - dummy_input.show(); |
| 46 | | - } |
| 47 | | - }); |
| 48 | | - $(this).hide(); |
| 49 | | - }); |
| 50 | | - |
| 51 | | - // swap if there is a default value |
| 52 | | - if ($(this).val() != ''){ |
| 53 | | - hint.focus(); |
| 54 | | - }; |
| 55 | | - |
| 56 | | - // remove the dummy inputs so that they don't get submitted |
| 57 | | - $('form').submit(function(){ |
| 58 | | - $('.' + settings.hintName).remove(); |
| 59 | | - }); |
| 60 | | - }); |
| 61 | | - |
| 62 | | - }; |
| 63 | | -})(jQuery); |
| \ No newline at end of file |
| Index: trunk/extensions/DonationInterface/gateway_forms/RapidHtml.php |
| — | — | @@ -208,7 +208,7 @@ |
| 209 | 209 | * @return string The HTML form containing translated messages |
| 210 | 210 | */ |
| 211 | 211 | public function add_messages( $html ) { |
| 212 | | - global $wgRequest, $wgOut, $wgScriptPath; |
| | 212 | + global $wgRequest, $wgOut, $wgScriptPath, $wgDonationInterfaceMessageLinks; |
| 213 | 213 | if( $wgRequest->getText( 'debug', 'false' ) == 'true' ){ |
| 214 | 214 | # do not replace tokens |
| 215 | 215 | return $html; |
| — | — | @@ -217,16 +217,35 @@ |
| 218 | 218 | # replace interface messages |
| 219 | 219 | # doing this before transclusion so that tokens can be passed as params (e.g. @language) |
| 220 | 220 | $matches = array(); |
| 221 | | - preg_match_all( "/%([a-zA-Z0-9_-]+)%/", $html, $matches ); |
| 222 | | - foreach( $matches[1] as $msg_key ){ |
| 223 | | - $html = str_replace( '%' . $msg_key . '%', wfMsg( $msg_key ), $html ); |
| | 221 | + preg_match_all( "/%([a-zA-Z0-9_-]+)(|(?:(?!%).)*)%/", $html, $matches ); |
| | 222 | + |
| | 223 | + foreach( $matches[ 1 ] as $i => $msg_key ){ |
| | 224 | + if(isset($matches[ 2 ][ $i ]) && $matches[ 2 ][ $i ] != ''){ |
| | 225 | + $params = explode( '|', trim( $matches[ 2 ][ $i ], '|' ) ); |
| | 226 | + |
| | 227 | + // replace link URLs with the global variable setting and pass language and country |
| | 228 | + foreach( $params as $k => $p ){ |
| | 229 | + if( $p == "url" && isset( $wgDonationInterfaceMessageLinks[ $msg_key ] ) ){ |
| | 230 | + $params[ $k ] = $wgDonationInterfaceMessageLinks[ $msg_key ]; |
| | 231 | + if( strpos( $params[ $k ], '?' ) >= 0 ){ |
| | 232 | + $params[ $k ] .= '&'; |
| | 233 | + } else { |
| | 234 | + $params[ $k ] .= '?'; |
| | 235 | + } |
| | 236 | + $params[ $k ] .= "language=" . $this->form_data['language']. "&country=" . $this->form_data['country']; |
| | 237 | + } |
| | 238 | + } |
| | 239 | + $html = str_replace( $matches[ 0 ][ $i ], wfMsg( $msg_key, $params ), $html ); |
| | 240 | + } else { |
| | 241 | + $html = str_replace( '%' . $msg_key . '%', wfMsg( $msg_key ), $html ); |
| | 242 | + } |
| 224 | 243 | } |
| 225 | 244 | |
| 226 | 245 | # do any requested tranclusion of templates |
| 227 | 246 | $matches = array(); |
| 228 | 247 | preg_match_all( "/{{((?:(?!}).)+)}}/", $html, $matches ); |
| 229 | | - $i = 1; |
| 230 | | - foreach( $matches[0] as $template ){ |
| | 248 | + |
| | 249 | + foreach( $matches[ 0 ] as $template ){ |
| 231 | 250 | # parse the template and replace in the html |
| 232 | 251 | $html = str_replace( $template, $wgOut->parse( $template ), $html ); |
| 233 | 252 | } |
| Index: trunk/extensions/DonationInterface/globalcollect_gateway/forms/html/webitects_2_3step.html |
| — | — | @@ -1,5 +1,5 @@ |
| 2 | 2 | <script type="text/javascript"> |
| 3 | | - mw.loader.load('gc.form.rapidhtml.webitects_2_3step'); |
| | 3 | + mw.loader.load('gc.form.rapidhtml.webitects'); |
| 4 | 4 | // these must go through RapidHTML and thus are inline |
| 5 | 5 | var amountErrors = ['#general|escape','#retryMsg|escape','#amount|escape']; |
| 6 | 6 | var billingErrors = ['#fname|escape','#lname|escape','#city|escape','#country|escape','#street|escape','#state|escape','#zip|escape','#emailAdd|escape']; |
| — | — | @@ -9,7 +9,7 @@ |
| 10 | 10 | </script> |
| 11 | 11 | <!--[if lt IE 7]> |
| 12 | 12 | <script type="text/javascript"> |
| 13 | | - mw.loader.load('gc.form.rapidhtml.webitects_2_3step.ie6'); |
| | 13 | + mw.loader.load('gc.form.rapidhtml.webitects.ie6'); |
| 14 | 14 | </script> |
| 15 | 15 | <style type="text/css"> |
| 16 | 16 | body{ |
| — | — | @@ -135,11 +135,11 @@ |
| 136 | 136 | </div> |
| 137 | 137 | </div> |
| 138 | 138 | </div> |
| 139 | | - <p id="informationsharing">%donate_interface-informationsharing%</p> |
| | 139 | + <p id="informationsharing">%donate_interface-informationsharing|url%</p> |
| 140 | 140 | <!-- TODO: links inside the message or not? --> |
| 141 | 141 | <ul id="moreinfolinks"> |
| 142 | 142 | <li><a href="http://wikimediafoundation.org/wiki/Monthly_donations/en/US">%donate_interface-monthly-donation%</a></li><!-- TODO: localize the link --> |
| 143 | | - <li>%donate_interface-otherways-short%</li><!-- TODO: localize the link --> |
| | 143 | + <li>%donate_interface-otherways-short|url%</li><!-- TODO: localize the link --> |
| 144 | 144 | <li><a href="http://wikimediafoundation.org/wiki/FAQ/en">%donate_interface-faqs%</a></li><!-- TODO: localize the link --> |
| 145 | 145 | <!--<li><a href="">%donate_interface-tax-info%</a></li>--><!-- TODO: localize the link --> |
| 146 | 146 | </ul> |
| Index: trunk/extensions/DonationInterface/globalcollect_gateway/forms/css/webitects_2_3step.css |
| — | — | @@ -1,90 +0,0 @@ |
| 2 | | -#errorMessages { |
| 3 | | - font-size: 0.75em; |
| 4 | | - color: #FF0000; |
| 5 | | -} |
| 6 | | -/* Force vertical scrollbar |
| 7 | | - html { overflow-y: scroll; } |
| 8 | | - */ |
| 9 | | -/* Accordion */ |
| 10 | | -#accordion h3 { |
| 11 | | - background: #FFFFFF; |
| 12 | | - border: none; |
| 13 | | - font-size: 1.1em; |
| 14 | | - margin: 0; |
| 15 | | - padding: 0.5em 0.9em; |
| 16 | | - outline: 0; |
| 17 | | -} |
| 18 | | -.accordion-content { |
| 19 | | - padding: 0.9em; |
| 20 | | -} |
| 21 | | -#step2accordion { |
| 22 | | - display: none; |
| 23 | | -} |
| 24 | | - |
| 25 | | -/* Layout */ |
| 26 | | -table#layouttable tr td { |
| 27 | | - vertical-align: top; |
| 28 | | -} |
| 29 | | - |
| 30 | | -#appeal { |
| 31 | | - /*width: 100%;*/ |
| 32 | | - padding-right: 25px; |
| 33 | | -} |
| 34 | | -#appeal-content { |
| 35 | | - /*padding-right: 380px;*/ |
| 36 | | -} |
| 37 | | -.clear { |
| 38 | | - clear: both; |
| 39 | | -} |
| 40 | | -#donate { |
| 41 | | - /*float: left;*/ |
| 42 | | - /*margin-left: -350px;*/ |
| 43 | | - width: 350px; |
| 44 | | -} |
| 45 | | -#donate-content { |
| 46 | | - background-color: #FFFFFF; |
| 47 | | - border: 1px solid #000000; |
| 48 | | - padding: 1em 0; |
| 49 | | - font-size: 0.95em; |
| 50 | | - /* Maybe */ |
| 51 | | - width: 348px; |
| 52 | | -} |
| 53 | | -#amount-table-white label { |
| 54 | | - font-size: 1.1em; |
| 55 | | -} |
| 56 | | - |
| 57 | | -#donate-body h3 { |
| 58 | | - font-size: 17px; |
| 59 | | -} |
| 60 | | - |
| 61 | | -#step1wrapper, #step2wrapper, #step3wrapper { |
| 62 | | - width: 325px; |
| 63 | | -} |
| 64 | | -/* Initially hide steps 2 and 3 */ |
| 65 | | -#step2wrapper, #step2header, #step3wrapper, #step3header { |
| 66 | | - display: none; |
| 67 | | -} |
| 68 | | -#where-content { |
| 69 | | - font-size: 13px; |
| 70 | | - line-height: 19px; |
| 71 | | - width: 325px; |
| 72 | | -} |
| 73 | | - |
| 74 | | -#amtErrorMessages, #billingErrorMessages, #paymentErrorMessages { |
| 75 | | - color: #F00; |
| 76 | | -} |
| 77 | | -.txt{ |
| 78 | | - margin: 0 !important; |
| 79 | | -} |
| 80 | | -#billingContent span { |
| 81 | | - margin: 0 !important; |
| 82 | | -} |
| 83 | | -p#informationsharing { |
| 84 | | - padding: 0 15px; |
| 85 | | - line-height: 14px; |
| 86 | | - font-size: 11px; |
| 87 | | -} |
| 88 | | -ul#moreinfolinks li{ |
| 89 | | - list-style: none !important; |
| 90 | | - list-style-image: none !important; |
| 91 | | -} |
| \ No newline at end of file |
| Index: trunk/extensions/DonationInterface/globalcollect_gateway/forms/css/webitects_2_3step.ie6.css |
| — | — | @@ -1,35 +0,0 @@ |
| 2 | | -/* style for IE6 + IE5.5 + IE5.0 */ |
| 3 | | -.gainlayout { |
| 4 | | - height: 0 !important; |
| 5 | | -} |
| 6 | | - |
| 7 | | -/* fix the input sizes on the billing address form */ |
| 8 | | -span.name-first input{ |
| 9 | | - width: 140px !important; |
| 10 | | -} |
| 11 | | -span.name-last input{ |
| 12 | | - width: 140px !important; |
| 13 | | -} |
| 14 | | -span.loc-street input{ |
| 15 | | - width: 305px !important; |
| 16 | | -} |
| 17 | | -span.loc-city input{ |
| 18 | | - width: 140px !important; |
| 19 | | -} |
| 20 | | -span.loc-postal input{ |
| 21 | | - width: 48px !important; |
| 22 | | -} |
| 23 | | -#emailAdd{ |
| 24 | | - width: 305px !important; |
| 25 | | -} |
| 26 | | -#select-credit-card{ |
| 27 | | - margin-bottom: 10px; |
| 28 | | -} |
| 29 | | - |
| 30 | | -#donate, #donate-content{ |
| 31 | | - width: 340px !important; |
| 32 | | -} |
| 33 | | - |
| 34 | | -#where-content, #step1wrapper, #step2wrapper, #step3wrapper{ |
| 35 | | - width: 330px !important; |
| 36 | | -} |
| \ No newline at end of file |