diff --git a/services/web/app/views/subscriptions/_plans_faq.pug b/services/web/app/views/subscriptions/_plans_faq.pug index ba99521d4d..0fdf4d9a0f 100644 --- a/services/web/app/views/subscriptions/_plans_faq.pug +++ b/services/web/app/views/subscriptions/_plans_faq.pug @@ -16,18 +16,12 @@ p #{translate('faq_do_collab_need_premium_answer')} .col-md-6 h3 #{translate('faq_need_more_collab_question')} - if settings.overleaf - p !{translate('faq_need_more_collab_answer', { referFriendsLink: translate('referring_your_friends') })} - else - p !{translate('faq_need_more_collab_answer', { referFriendsLink: '' + translate('referring_your_friends') + ''})} + p !{translate('faq_need_more_collab_answer', { referFriendsLink: translate('referring_your_friends') })} .row .col-md-6 h3 #{translate('faq_purchase_more_licenses_question')} - if settings.overleaf - p !{translate('faq_purchase_more_licenses_answer', { groupLink: translate('discounted_group_accounts') })}  - a(href, ng-click="openGroupPlanModal()") #{translate("get_in_touch_for_details")} - else - p !{translate('faq_purchase_more_licenses_answer', { groupLink: '' + translate('discounted_group_accounts') + '' })} + p !{translate('faq_purchase_more_licenses_answer', { groupLink: translate('discounted_group_accounts') })}  + a(href, ng-click="openGroupPlanModal()") #{translate("get_in_touch_for_details")} .col-md-6 h3 #{translate('faq_monthly_or_annual_question')} p #{translate('faq_monthly_or_annual_answer')} @@ -37,7 +31,4 @@ p #{translate('faq_how_to_pay_answer')} .col-md-6 h3 #{translate('faq_pay_by_invoice_question')} - if settings.overleaf - p !{translate('faq_pay_by_invoice_answer', { groupLink: translate('discounted_group_accounts') })} - else - p !{translate('faq_pay_by_invoice_answer', { groupLink: '' + translate('discounted_group_accounts') + '' })} \ No newline at end of file + p !{translate('faq_pay_by_invoice_answer', { groupLink: translate('discounted_group_accounts') })} \ No newline at end of file diff --git a/services/web/app/views/subscriptions/_plans_page_mixins.pug b/services/web/app/views/subscriptions/_plans_page_mixins.pug index d320cd5238..7c4d2eb158 100644 --- a/services/web/app/views/subscriptions/_plans_page_mixins.pug +++ b/services/web/app/views/subscriptions/_plans_page_mixins.pug @@ -1,23 +1,20 @@ //- Buy Buttons mixin btn_buy_collaborator(location) - a.btn( - class=settings.overleaf ? 'btn-primary' : 'btn-info' + a.btn.btn-primary( ng-href="/user/subscription/new?planCode={{ getCollaboratorPlanCode() }}¤cy={{currencyCode}}", ng-click="signUpNowClicked('collaborator','" + location + "')" ) span(ng-show="ui.view != 'annual'") #{translate("start_free_trial")} span(ng-show="ui.view == 'annual'") #{translate("buy_now")} mixin btn_buy_free(location) - a.btn( - class=settings.overleaf ? 'btn-primary' : 'btn-info' + a.btn.btn-primary( href="/register" style=(getLoggedInUserId() === null ? "" : "visibility: hidden") ng-click="signUpNowClicked('free','" + location + "')" ) span.text-capitalize #{translate('get_started_now')} mixin btn_buy_professional(location) - a.btn( - class=settings.overleaf ? 'btn-primary' : 'btn-info' + a.btn.btn-primary( ng-href="/user/subscription/new?planCode=professional{{ ui.view == 'annual' && '-annual' || planQueryString}}¤cy={{currencyCode}}" ng-click="signUpNowClicked('professional','" + location + "')" ) @@ -25,15 +22,13 @@ mixin btn_buy_professional(location) span(ng-show="ui.view == 'annual'") #{translate("buy_now")} mixin btn_buy_student(location, plan) if plan == 'annual' - a.btn( - class=settings.overleaf ? 'btn-primary' : 'btn-info' + a.btn.btn-primary( ng-href="/user/subscription/new?planCode=student-annual¤cy={{currencyCode}}", ng-click="signUpNowClicked('student-annual','" + location + "')" ) #{translate("buy_now")} else //- planQueryString will contain _free_trial_7_days - a.btn( - class=settings.overleaf ? 'btn-primary' : 'btn-info' + a.btn.btn-primary( ng-href="/user/subscription/new?planCode=student{{planQueryString}}¤cy={{currencyCode}}", ng-click="signUpNowClicked('student-monthly','" + location + "')" ) #{translate("start_free_trial")} diff --git a/services/web/app/views/subscriptions/new.pug b/services/web/app/views/subscriptions/new.pug index ce21dca584..5145bf34a3 100644 --- a/services/web/app/views/subscriptions/new.pug +++ b/services/web/app/views/subscriptions/new.pug @@ -14,7 +14,7 @@ block content .container(ng-controller="NewSubscriptionController" ng-cloak) .row.card-group .col-md-5.col-md-push-4 - .card.card-highlighted(class=settings.overleaf ? 'card-border' : '') + .card.card-highlighted.card-border .page-header .row .col-xs-9 @@ -250,13 +250,6 @@ block content hr p.small.text-center We're confident that you'll love #{settings.appName}, but if not you can cancel anytime. We'll give you your money back, no questions asked, if you let us know within 30 days. - if !settings.overleaf - hr - span                   - a(href="https://www.positivessl.com" style="font-family: arial; font-size: 10px; color: #212121; text-decoration: none;") - img(src="https://www.positivessl.com/images-new/PositiveSSL_tl_trans.png" alt="SSL Certificate" title="SSL Certificate" border="0") - div(style="font-family: arial;font-weight:bold;font-size:15px;color:#86BEE0;") - a(href="https://www.positivessl.com" style="color:#86BEE0; text-decoration: none;") script(type="text/javascript"). diff --git a/services/web/app/views/subscriptions/plans.pug b/services/web/app/views/subscriptions/plans.pug index 4709b414c0..dd6927d3e5 100644 --- a/services/web/app/views/subscriptions/plans.pug +++ b/services/web/app/views/subscriptions/plans.pug @@ -89,13 +89,10 @@ block content span #{translate('reduce_costs_group_licenses')} br br - if settings.overleaf - a.btn.btn-default( - href - ng-click="openGroupPlanModal()" - ) #{translate('find_out_more')} - else - a.btn.btn-info(href="/i/university/groups") #{translate('find_out_more')} + a.btn.btn-default( + href + ng-click="openGroupPlanModal()" + ) #{translate('find_out_more')} div .row.row-spaced-large @@ -113,17 +110,13 @@ block content .col-sm-12(ng-if="ui.view == 'student'") +table_student - if !settings.overleaf - include _plans_quotes - include _plans_faq .row.row-spaced-large .col-md-12 .plans-header.plans-subheader.text-centered h2 #{translate('still_have_questions')} - button.btn.btn-header.text-capitalize( - class=settings.overleaf ? 'btn-default' : 'btn-info' + button.btn.btn-default.btn-header.text-capitalize( ng-controller="ContactGeneralModal" ng-click="openModal()" ) #{translate('get_in_touch')}