github/overleaf
1
0
Fork 0
mirror of https://github.com/overleaf/overleaf.git synced 2025-03-06 07:23:22 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #658 from sharelatex/ja-enable-subscriptions

Browse source 
Add message explaining Collaborator subscription to v1 users
This commit is contained in:
James Allen 2018-06-19 08:37:50 +01:00 committed by GitHub
commit a3e92a8867
3 changed files with 20 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
services/web/app/views/subscriptions/new.pug
View file

@ -10,6 +10,7 @@ block scripts
block content
.content.content-alt
.container(ng-controller="NewSubscriptionController" ng-cloak)
.row.card-group
.col-md-5.col-md-push-4
@ -35,6 +36,15 @@ block content
.row(ng-if="plansVariant == 'more-details' && planCode == 'student-annual' || plansVariant == 'more-details' && planCode == 'student-monthly'")
.col-xs-12
p.student-disclaimer #{translate('student_disclaimer')}
if plan_code == 'collaborator_free_trial_7_days' && !!settings.overleaf
.row
.col-xs-12
p.small.row-spaced-small
| The <strong>Collaborator</strong> plan is a new Overleaf v2 plan which includes track-changes, references search, and Dropbox &amp; GitHub integration. While Overleaf v2 is in beta, you can also still subscribe to a
|
a(href=settings.overleaf.host + "/plans") legacy plan in Overleaf v1
| .
hr.thin
.row
.col-md-12.text-center

12
services/web/app/views/subscriptions/successful_subscription.pug
View file

@ -18,17 +18,11 @@ block content
p.letter-from-founders
p #{translate("thanks_for_subscribing_you_help_sl", {planName:subscription.name})}
p #{translate("need_anything_contact_us_at")}
a(href='mailto:support@sharelatex.com') support@sharelatex.com
| . #{translate("goes_straight_to_our_inboxes")}.
a(href='mailto:support@sharelatex.com') #{settings.adminEmail}
| .
p #{translate("regards")},
br
| Henry and James
.portraits
span.img-circle
img(src=buildImgPath("about/henry_oswald.jpg"))
| &nbsp;
span.img-circle
img(src=buildImgPath("about/james_allen.jpg"))
| The #{settings.appName} Team
p
a.btn.btn-primary(href="/project") &lt; #{translate("back_to_your_projects")}

7
services/web/public/stylesheets/components/alerts.less
View file

@ -65,3 +65,10 @@
.alert-danger {
.alert-variant(@alert-danger-bg; @alert-danger-border; @alert-danger-text);
}
.alert when (@is-overleaf = true) {
a {
color: white;
text-decoration: underline;
}
}