From bf6ebd88f6be33dcd54bc755633ce1b09ba80039 Mon Sep 17 00:00:00 2001 From: AnitaYCheng Date: Tue, 1 Sep 2015 19:13:04 -0700 Subject: [PATCH] Modifications to settings mixin and misc last changes. --- common/locales/en/npc.json | 4 +-- common/locales/en/settings.json | 1 + website/views/options/settings.jade | 50 ++++++++++++++--------------- 3 files changed, 28 insertions(+), 27 deletions(-) diff --git a/common/locales/en/npc.json b/common/locales/en/npc.json index 685a124983..add6d3b1e3 100644 --- a/common/locales/en/npc.json +++ b/common/locales/en/npc.json @@ -21,7 +21,7 @@ "ian": "Ian", "ianText": "Welcome to the Quest Shop! Here you can use Quest Scrolls to battle monsters with your friends. Be sure to check out our fine array of Quest Scrolls for purchase on the right!", "ianBrokenText": "Welcome to the Quest Shop... Here you can use Quest Scrolls to battle monsters with your friends... Be sure to check out our fine array of Quest Scrolls for purchase on the right...", - "USD": "USD", + "USD": "(USD)", "newStuff": "New Stuff", "cool": "Tell Me Later", "dismissAlert": "Dismiss This Alert", @@ -31,7 +31,7 @@ "donationDesc": "20 Gems, Donation to Habitica", "payWithCard": "Pay with Card", "payNote": "Note: PayPal sometimes takes a long time to clear. We recommend paying with card.", - "card": "Card", + "card": "Credit Card (using Stripe)", "amazonInstructions": "Click the button to pay using Amazon Payments", "paymentMethods": "Purchase using", diff --git a/common/locales/en/settings.json b/common/locales/en/settings.json index 1f11fbd684..e36462e799 100644 --- a/common/locales/en/settings.json +++ b/common/locales/en/settings.json @@ -115,6 +115,7 @@ "unsubscribeAllEmailsText": "By checking this box, I certify that I understand that by unsubscribing from all emails, Habitica will never be able to notify me via email about important changes to the site or my account.", "correctlyUnsubscribedEmailType": "Correctly unsubscribed from \"<%= emailType %>\" emails.", "subscriptionRateText": "Recurring $<%= price %> USD every <%= months %> months", + "recurringText": "recurring", "benefits": "Benefits", "coupon": "Coupon", "couponPlaceholder": "Enter Coupon Code", diff --git a/website/views/options/settings.jade b/website/views/options/settings.jade index 2f27a2b719..7ae231c336 100644 --- a/website/views/options/settings.jade +++ b/website/views/options/settings.jade @@ -275,26 +275,21 @@ script(id='partials/options.settings.export.html', type="text/ng-template") a(href="/export/userdata.json")= env.t('json') mixin subPerks() - table.table.table-striped - tr - td - span.hint(popover=env.t('buyGemsGoldText', {gemCost: "{{Shared.planGemLimits.convRate}}", gemLimit: "{{Shared.planGemLimits.convCap}}"}),popover-trigger='mouseenter',popover-placement='right') #{env.t('buyGemsGold')}  - span.badge.badge-success(ng-show='_subscription.key!="basic_earned"')=env.t('buyGemsGoldCap', {amount: '{{gemGoldCap(_subscription) | min }}'}) - tr - td - span.hint(popover=env.t('retainHistoryText'),popover-trigger='mouseenter',popover-placement='right')=env.t('retainHistory') - tr - td - span.hint(popover=env.t('doubleDropsText'),popover-trigger='mouseenter',popover-placement='right')=env.t('doubleDrops') - tr - td - span.hint(popover=env.t('mysteryItemText'),popover-trigger='mouseenter',popover-placement='right') #{env.t('mysteryItem')}  - div(ng-show='_subscription.key!="basic_earned"') - .badge.badge-success=env.t('mysticHourglass', {amount: '+{{numberOfMysticHourglasses(_subscription)}}'}) - .small.muted=env.t('mysticHourglassText') - tr - td - span.hint(popover=env.t('supportDevsText'),popover-trigger='mouseenter',popover-placement='right')=env.t('supportDevs') + ul + li + span.hint(popover=env.t('buyGemsGoldText', {gemCost: "{{Shared.planGemLimits.convRate}}", gemLimit: "{{Shared.planGemLimits.convCap}}"}),popover-trigger='mouseenter',popover-placement='right') #{env.t('buyGemsGold')}  + span.badge.badge-success(ng-show='_subscription.key!="basic_earned"') Cap raised to {{ [25 + user.purchased.plan.consecutive.gemCapExtra + Math.floor(Content.subscriptionBlocks[_subscription.key].months/3*5), 50] | min }} + li + span.hint(popover=env.t('retainHistoryText'),popover-trigger='mouseenter',popover-placement='right')=env.t('retainHistory') + li + span.hint(popover=env.t('doubleDropsText'),popover-trigger='mouseenter',popover-placement='right')=env.t('doubleDrops') + li + span.hint(popover=env.t('mysteryItemText'),popover-trigger='mouseenter',popover-placement='right') #{env.t('mysteryItem')}  + div(ng-show='_subscription.key!="basic_earned"') + .badge.badge-success=env.t('mysticHourglass', {amount: '+{{numberOfMysticHourglasses(_subscription)}}'}) + .small.muted=env.t('mysticHourglassText') + li + span.hint(popover=env.t('supportDevsText'),popover-trigger='mouseenter',popover-placement='right')=env.t('supportDevs') script(id='partials/feature-matrix-check.html',type='text/ng-template') span.task-checker.action-yesno @@ -372,12 +367,17 @@ script(id='partials/options.settings.subscription.html',type='text/ng-template') .form-group input.form-control(type='text', ng-model='_subscription.coupon', placeholder= env.t('couponPlaceholder')) .form-group - button.btn.btn-small(type='button',ng-click='applyCoupon(_subscription.coupon)')= env.t("apply") + button.pull-right.btn.btn-small(type='button',ng-click='applyCoupon(_subscription.coupon)')= env.t("apply") - h3(ng-if='(user.purchased.plan.customerId && user.purchased.plan.dateTerminated)')= env.t("resubscribe") - a.btn.btn-primary(ng-click='Payments.showStripe({subscription:_subscription.key, coupon:_subscription.coupon})', ng-disabled='!_subscription.key')= env.t('card') - a.btn.btn-success(href='/paypal/subscribe?_id={{user._id}}&apiToken={{user.apiToken}}&sub={{_subscription.key}}{{_subscription.coupon ? "&coupon="+_subscription.coupon : ""}}', ng-disabled='!_subscription.key')=env.t('paypal') - a.btn.btn-warning(ng-click="Payments.amazonPayments.init({type: 'subscription', subscription:_subscription.key, coupon:_subscription.coupon})")=env.t('amazonPayments') + h4(ng-if='(user.purchased.plan.customerId && user.purchased.plan.dateTerminated)')= env.t("resubscribe") + p.resubscribe + small.muted Subscribe using + a.purchase.btn.btn-primary(ng-click='Payments.showStripe({subscription:_subscription.key, coupon:_subscription.coupon})', ng-disabled='!_subscription.key')= env.t('card') + a.purchase(href='/paypal/subscribe?_id={{user._id}}&apiToken={{user.apiToken}}&sub={{_subscription.key}}{{_subscription.coupon ? "&coupon="+_subscription.coupon : ""}}', ng-disabled='!_subscription.key') + img(src='https://www.paypalobjects.com/webstatic/en_US/i/buttons/pp-acceptance-small.png',alt=env.t('paypal')) + a.purchase(ng-click="Payments.amazonPayments.init({type: 'subscription', subscription:_subscription.key, coupon:_subscription.coupon})") + img(src='https://payments.amazon.com/gp/cba/button',alt=env.t('amazonPayments')) + div(ng-if='user.purchased.plan.customerId') .btn.btn-primary(ng-if='!user.purchased.plan.dateTerminated && user.purchased.plan.paymentMethod=="Stripe"', ng-click='Payments.showStripeEdit()')=env.t('subUpdateCard') .btn.btn-sm.btn-danger(ng-if='!user.purchased.plan.dateTerminated', ng-click='Payments.cancelSubscription()')=env.t('cancelSub')