agw/overleaf-cep
1
0
Fork 0
mirror of https://github.com/yu-i-i/overleaf-cep.git synced 2026-11-15 14:43:46 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/sharelatex/web-sharelatex

Browse Source
This commit is contained in:
Henry Oswald
2015-01-29 18:32:26 +00:00
parent 948eeb87ba 36513f443c
commit cb889efb6a
3 changed files with 33 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
services/web/app/views/subscriptions/new.jade
+18 -14
View File
@@ -22,11 +22,9 @@ block content
.card.card-highlighted
.page-header
.row
.col-md-9
.col-xs-9
h2 {{planName}}
div !{translate("first_few_days_free", {trialLen:'{{trialLength}}'})}
div #{translate("every")} {{billingCycleType}}
.col-md-3
.col-xs-3
div.dropdown.changePlanButton.pull-right(ng-cloak)
a.btn.btn-default.dropdown-toggle(
href="#",
@@ -39,7 +37,13 @@ block content
a(
ng-click="changeCurrency(currency)",
) {{currency}} ({{value['symbol']}})
h2.pull-right.totalPrice {{price.currency.symbol}}{{price.next.total}}
hr.thin
.row
.col-md-12.text-center
div(ng-if="trialLength") !{translate("first_few_days_free", {trialLen:'{{trialLength}}'})}
div(ng-if="price")
strong {{price.currency.symbol}}{{price.next.total}}
span #{translate("every")} {{billingCycleType}}
.row
.col-md-12
form(ng-show="planName")
@@ -124,22 +128,22 @@ block content
hr
.row
.col-md-12
.form-group
.form-group(ng-class="validation.errorFields.address1 ? 'has-error' : ''")
label #{translate("billing_address")}
input.form-control(type='text', value='', maxlength='255', tabindex='1', onkeyup='', ng-model="data.address1", placeholder="#{translate('address')}")
.form-group
.form-group(ng-class="validation.errorFields.address2 ? 'has-error' : ''")
input.form-control(type='text', value='', maxlength='255', tabindex='1', onkeyup='', ng-model="data.address2", placeholder="#{translate('address')}")
.form-group
.form-group(ng-class="validation.errorFields.state ? 'has-error' : ''")
input.form-control(type='text', value='', maxlength='255', tabindex='1', onkeyup='', ng-model="data.state", placeholder="#{translate('state')}")
.row
.col-md-7
.form-group
.form-group(ng-class="validation.errorFields.city ? 'has-error' : ''")
input.form-control(type='text', value='', maxlength='255', tabindex='1', onkeyup='', data-recurly="city", ng-model="data.city", placeholder="#{translate('city')}")
.col-md-5
.col-md-5(ng-class="validation.errorFields.postal_code ? 'has-error' : ''")
input.form-control(type='text', value='', maxlength='255', tabindex='1', onkeyup='', data-recurly="postal_code", ng-model="data.postal_code", placeholder="#{translate('zip_post_code')}")
.row
.col-md-7
.form-group
.form-group(ng-class="validation.errorFields.country ? 'has-error' : ''")
select.form-control(data-recurly="country", ng-model="data.country", ng-change="updateCountry()", required)
mixin countries_options()
.row
@@ -150,16 +154,16 @@ block content
.row
.col-md-7
.col-xs-7
.form-group
button.btn.btn-success(ng-click="submit()", ng-disabled="processing") #{translate("upgrade_now")}
.col-md-3.pricingBreakdown
.col-xs-3.pricingBreakdown
div Subtotal
div Tax
div
strong Total
.col-md-2
.col-xs-2
div.pull-right {{price.currency.symbol}}{{price.next.subtotal}}
div.pull-right {{price.currency.symbol}}{{price.next.tax}}
div.pull-right