Committer: skomarov
LJSUP-8014: Credit card payment process refactoringU trunk/bin/upgrading/en_LJ.dat U trunk/htdocs/stc/widgets/credit-card.css
Modified: trunk/bin/upgrading/en_LJ.dat
===================================================================
--- trunk/bin/upgrading/en_LJ.dat 2011-03-02 08:08:56 UTC (rev 10148)
+++ trunk/bin/upgrading/en_LJ.dat 2011-03-02 09:06:26 UTC (rev 10149)
@@ -3012,8 +3012,6 @@
ljcom.badpass.common=Your password is based on a commonly used password.
-ljcom.badpass.digits_only=Your password should not contains digits only.
-
ljcom.badpass.displayname=Your password cannot be based on your display name.
ljcom.badpass.distinct=Your password must have at least four different characters.
@@ -4021,34 +4019,92 @@
pay.cart.unknownclothing=Unknown Clothing: [[name]]
+pay.cc.form.address.bubble-lite=Enter your billing address.
+
+pay.cc.form.address.bubble-warning=Please check your address. Enter your address exactly as it appears on your statement. If you have recently moved, you may need to use your previous address.
+
pay.cc.form.address.label=Billing Address:
pay.cc.form.btn.coppaconfirm=Confirm Parental/Guardian Consent
pay.cc.form.btn.finish=Finish
+pay.cc.form.bubble-alert=Please switch your keyboard to English.
+
+pay.cc.form.cardexpires.bubble-lite=Enter your card's expiration date.
+
+pay.cc.form.cardexpires.bubble-warning=You have entered an expiration date in the past. Please enter the correct expiration date.
+
pay.cc.form.cardexpires.label=Expires:
+pay.cc.form.cardnumber.bubble-lite=Enter your card number. %card_type% card numbers are 16 digits long.
+
+pay.cc.form.cardnumber.bubble-lite.americanexpress=Enter your card number. American Express card numbers are 15 digits long.
+
+pay.cc.form.cardnumber.bubble-warning.visa=Invalid credit card number entered. Visa card numbers are 16 digits long.
+
+pay.cc.form.cardnumber.bubble-warning.mastercard=Invalid credit card number entered. MasterCard numbers are 16 digits long.
+
+pay.cc.form.cardnumber.bubble-warning.americanexpress=Invalid credit card number entered. American Express numbers are 15 digits long.
+
+pay.cc.form.cardnumber.bubble-warning.discover=Invalid credit card number entered. Discover card numbers are 16 digits long.
+
pay.cc.form.cardnumber.label=Card Number:
+pay.cc.form.cardtype.bubble-lite=Choose your card type. We support Visa, MasterCard, American Express, and Discover.
+
+pay.cc.form.cardtype.bubble-warning=Wrong card type selected. You have selected %card_type%, but entered a %card_type% number.
+
pay.cc.form.cardtype.label=Card Type:
+pay.cc.form.city.bubble-lite=Enter card holder’s billing address.
+
+pay.cc.form.city.bubble-warning=Please check your address. Enter your address exactly as it appears on your statement. If you have recently moved, you may need to use your previous address.
+
pay.cc.form.city.label=City:
+pay.cc.form.country.bubble-lite=Choose your billing country.
+
pay.cc.form.country.label=Billing Country:
+pay.cc.form.cvv2.bubble-lite=Enter the security code from the back of your card. %card_type% has a 3 digit security code. <a [[aopts]]>See an example</a>.
+
+pay.cc.form.cvv2.bubble-lite.americanexpress=Enter the security code from the back of your card. American Express has a 4 digit security code. <a [[aopts]]>See an example</a>.
+
+pay.cc.form.cvv2.bubble-warning.visa=Invalid security code number entered. Visa has a 3 digit security code number.
+
+pay.cc.form.cvv2.bubble-warning.mastercard=Invalid security code number entered. MasterCard has a 3 digit security code number.
+
+pay.cc.form.cvv2.bubble-warning.americanexpress=Invalid security code number entered. American Express has a 4 digit security code number.
+
+pay.cc.form.cvv2.bubble-warning.discover=Invalid security code number entered. Discover has a 3 digit security code number.
+
pay.cc.form.cvv2.info=<a [[aopts]]>what's this?</a>
pay.cc.form.cvv2.label=Card Verification Number:
+pay.cc.form.email.bubble-lite=Enter your Email address.
+
+pay.cc.form.email.bubble-warning=Please check your email address. You must enter your email address to proceed.
+
pay.cc.form.email.label=Email Address:
+pay.cc.form.name.bubble-lite=Enter your name as it appears on your card.
+
+pay.cc.form.name.bubble-warning=Please check your name.
+
pay.cc.form.name.label=Name on Card:
pay.cc.form.note=Please note that all payments are immediately applied to your account and are not refundable.
pay.cc.form.postalcode.label=Postal Code:
+pay.cc.form.state.bubble-lite=Select your state (US only).
+
+pay.cc.form.state.bubble-lite.other=Enter your province.
+
+pay.cc.form.state.bubble-warning=Please enter a valid US state.
+
pay.cc.form.state.label=State / Province:
pay.cc.form.state.other=(Other)
@@ -4071,6 +4127,10 @@
pay.cc.validate.name=Please enter the card owner's full name.
+pay.cc.form.postalcode.bubble-lite=Enter your postal code.
+
+pay.cc.form.postalcode.bubble-warning=Please check your zip code. If you have recently moved, you may need to use your previous address. If you are using your full zip+4 zip code, use the format XXXXX-XXXX, including the hyphen.
+
pay.cc.validate.postalcode.other=Please enter a valid postal zip code.
pay.cc.validate.postalcode.us.invalid=The postal zip code entered is not valid in the United States. If it is over five digits, you must include the -.
Modified: trunk/htdocs/stc/widgets/credit-card.css
===================================================================
--- trunk/htdocs/stc/widgets/credit-card.css 2011-03-02 08:08:56 UTC (rev 10148)
+++ trunk/htdocs/stc/widgets/credit-card.css 2011-03-02 09:06:26 UTC (rev 10149)
@@ -1,37 +1,52 @@
-.b-ccform{
- width:400px;
- margin:0 0 15px;
- padding:10px;
- border:1px solid #D1D1D1;
- -webkit-border-radius:5px;
- -moz-border-radius:5px;
- border-radius:5px;
- background:#EDEDED;
+#ccform {
+ margin-bottom: 20px;
+ }
+.b-ccform {
+ width: 400px;
+ margin: 0 0 15px;
+ padding: 10px;
+ border: 1px solid #D1D1D1;
+ -webkit-border-radius: 5px;
+ -moz-border-radius: 5px;
+ border-radius: 5px;
+ background: #EDEDED;
list-style: none;
- line-height:1.4;
+ line-height: 1.4;
}
.b-ccform LI {
+ position: relative;
}
.b-ccform .b-ccform-note {
- padding:5px 0 0;
+ padding: 5px 0 0;
}
.b-ccform LI DL {
- overflow:hidden;
- margin:0 0 10px;
+ overflow: hidden;
+ margin: 0 0 10px;
}
.b-ccform LI DL DT {
- float:left;
- width:145px;
- margin:0 10px 0 0;
- padding:2px 0 0;
- text-align:right;
+ float: left;
+ width: 145px;
+ margin: 0 10px 0 0;
+ padding: 2px 0 0;
+ text-align: right;
}
.b-ccform LI DL DD {
- margin:0 0 0 155px;
- padding:2px 0;
+ margin: 0 0 0 155px;
+ padding: 2px 0;
}
.b-ccform LI DL .b-ccform-state {
- margin:0 0 10px;
+ margin: 0 0 10px;
}
- .i-ccform-cvv2 {
- }
\ No newline at end of file
+ .b-ccform LI .b-bubble {
+ display: none;
+ position: absolute;
+ top: 0;
+ left: 440px;
+ width: 322px;
+ margin: 0 !important;
+ font-size: 11px;
+ }
+ .b-ccform LI .b-bubble-other {
+ top: 35px;
+ }
+