github/overleaf
1
0
Fork 0
mirror of https://github.com/overleaf/overleaf.git synced 2024-11-07 20:31:06 -05:00
Code Issues Projects Releases Packages Wiki Activity

Remove redundant baseUrl from plans page.

Browse source
This commit is contained in:
Shane Kilkelly 2016-11-25 15:24:50 +00:00
parent 167f01857a
commit acce8853ba
2 changed files with 4 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
services/web/app/coffee/Features/Subscription/SubscriptionController.coffee
View file

@ -14,7 +14,6 @@ module.exports = SubscriptionController =
plansPage: (req, res, next) -> plansPage: (req, res, next) ->
plans = SubscriptionViewModelBuilder.buildViewModel() plans = SubscriptionViewModelBuilder.buildViewModel()
baseUrl = ""
viewName = "subscriptions/plans" viewName = "subscriptions/plans"
if req.query.v? if req.query.v?
viewName = "#{viewName}_#{req.query.v}" viewName = "#{viewName}_#{req.query.v}"
@ -26,7 +25,6 @@ module.exports = SubscriptionController =
res.render viewName, res.render viewName,
title: "plans_and_pricing" title: "plans_and_pricing"
plans: plans plans: plans
baseUrl: baseUrl
gaExperiments: Settings.gaExperiments.plansPage gaExperiments: Settings.gaExperiments.plansPage
recomendedCurrency:recomendedCurrency recomendedCurrency:recomendedCurrency
shouldABTestPlans: currentUser == null or (currentUser?.signUpDate? and currentUser.signUpDate >= (new Date('2016-10-27'))) shouldABTestPlans: currentUser == null or (currentUser?.signUpDate? and currentUser.signUpDate >= (new Date('2016-10-27')))

8
services/web/app/views/subscriptions/plans.jade
View file

@ -100,7 +100,7 @@ block content
li li
br br
a.btn.btn-info( a.btn.btn-info(
ng-href="#{baseUrl}/user/subscription/new?planCode={{ getCollaboratorPlanCode() }}&currency={{currencyCode}}", ng-click="signUpNowClicked('collaborator')" ng-href="/user/subscription/new?planCode={{ getCollaboratorPlanCode() }}&currency={{currencyCode}}", ng-click="signUpNowClicked('collaborator')"
) )
span(ng-show="ui.view != 'annual'") #{translate("start_free_trial")} span(ng-show="ui.view != 'annual'") #{translate("start_free_trial")}
span(ng-show="ui.view == 'annual'") #{translate("buy_now")} span(ng-show="ui.view == 'annual'") #{translate("buy_now")}
@ -124,7 +124,7 @@ block content
li li
br br
a.btn.btn-info( a.btn.btn-info(
ng-href="#{baseUrl}/user/subscription/new?planCode=professional{{ ui.view == 'annual' && '-annual' || planQueryString}}&currency={{currencyCode}}", ng-click="signUpNowClicked('professional')" ng-href="/user/subscription/new?planCode=professional{{ ui.view == 'annual' && '-annual' || planQueryString}}&currency={{currencyCode}}", ng-click="signUpNowClicked('professional')"
) )
span(ng-show="ui.view != 'annual'") #{translate("start_free_trial")} span(ng-show="ui.view != 'annual'") #{translate("start_free_trial")}
span(ng-show="ui.view == 'annual'") #{translate("buy_now")} span(ng-show="ui.view == 'annual'") #{translate("buy_now")}
@ -166,7 +166,7 @@ block content
li li
br br
a.btn.btn-info( a.btn.btn-info(
ng-href="#{baseUrl}/user/subscription/new?planCode=student{{ plansVariant == 'default' ? planQueryString : '_'+plansVariant }}&currency={{currencyCode}}", ng-href="/user/subscription/new?planCode=student{{ plansVariant == 'default' ? planQueryString : '_'+plansVariant }}&currency={{currencyCode}}",
ng-click="signUpNowClicked('student')" ng-click="signUpNowClicked('student')"
) #{translate("start_free_trial")} ) #{translate("start_free_trial")}
@ -189,7 +189,7 @@ block content
li li
br br
a.btn.btn-info( a.btn.btn-info(
ng-href="#{baseUrl}/user/subscription/new?planCode=student-annual{{ plansVariant == 'default' ? '' : '_'+plansVariant }}&currency={{currencyCode}}", ng-href="/user/subscription/new?planCode=student-annual{{ plansVariant == 'default' ? '' : '_'+plansVariant }}&currency={{currencyCode}}",
ng-click="signUpNowClicked('student')" ng-click="signUpNowClicked('student')"
) #{translate("buy_now")} ) #{translate("buy_now")}