change links to v1 to sign user in first

This commit is contained in:
Tim Alby 2018-09-14 14:09:43 +01:00
parent b14fe82c1c
commit 2e4d3d7aab
5 changed files with 8 additions and 8 deletions

View file

@ -98,7 +98,7 @@ block content
| To tag or rename your v1 projects, please go back to Overleaf v1.
div(ng-show="visible")
a.project-list-sidebar-v1-link(
href=settings.overleaf.host + "/dash?prefer-v1-dash=1"
href='/sign_in_to_v1?return_to=%2Fdash%3Fprefer-v1-dash%3D1'
) Go back to v1
if userIsFromSL(user)
div(ng-show="visible")

View file

@ -356,7 +356,7 @@ script(type="text/ng-template", id="v1ImportModalTemplate")
form-messages(for="v1ImportForm")
if settings.overleaf && settings.overleaf.host
a.btn.btn-primary.v1-import-btn(
ng-href=settings.overleaf.host + "/{{project.id}}"
ng-href='/sign_in_to_v1?return_to=%2F{{project.id}}'
ng-class="{disabled: v1ImportForm.inflight || v1ImportForm.response.success}"
) No thanks, open in v1
input.btn.btn-primary.v1-import-btn(

View file

@ -13,7 +13,7 @@
ng-show="project.accessLevel == 'owner'"
) {{project.name}}
a.projectName(
href=settings.overleaf.host + "/{{project.id}}"
href='/sign_in_to_v1?return_to=%2F{{project.id}}'
target="_blank"
ng-hide="project.accessLevel == 'owner'"
) {{project.name}}

View file

@ -122,7 +122,7 @@ block content
p
| You are subscribed to Overleaf through Overleaf v1
p
a.btn.btn-primary(href=settings.overleaf.host+"/users/edit#status") Manage v1 Subscription
a.btn.btn-primary(href='/sign_in_to_v1?return_to=%2Fusers%2Fedit%23status') Manage v1 Subscription
hr
if settings.overleaf && v1Subscriptions && v1Subscriptions.teams && v1Subscriptions.teams.length > 0
@ -130,7 +130,7 @@ block content
p
| You are a member of the Overleaf v1 team: <strong>#{team.name}</strong>
p
a.btn.btn-primary(href=settings.overleaf.host+"/teams") Manage v1 Team Membership
a.btn.btn-primary(href="/sign_in_to_v1?return_to=%2Fteams") Manage v1 Team Membership
hr
.card(ng-if="view == 'cancelation'")

View file

@ -127,7 +127,7 @@ block content
h3 #{translate("change_password")}
p
| To change your password,
| please go to #[a(href=settings.overleaf.host+'/users/edit') Overleaf v1 settings]
| please go to #[a(href='/sign_in_to_v1?return_to=%2Fusers%2Fedit%23details') Overleaf v1 settings]
| !{moduleIncludes("userSettings", locals)}
@ -193,7 +193,7 @@ block content
if settings.createV1AccountOnLogin && settings.overleaf
p
strong
| This will also delete your user account on #[a(href=settings.overleaf.host target="_blank") Overleaf v1].
| This will also delete your user account on #[a(href='/sign_in_to_v1?return_to=%2Fdash%3Fprefer-v1-dash%3D1' target="_blank") Overleaf v1].
| If you want to remove your projects from Overleaf v1, you must do this before you
| delete your account by going to your My Projects page in Overleaf v1, moving your
| projects to the Trash, and then from there either leaving or purging them, as appropriate.
@ -244,7 +244,7 @@ block content
div.alert.alert-info
| If you can't remember your password, or if you are using Single-Sign-On with another provider
| to sign in (such as Twitter or Google), please
| #[a(href=settings.overleaf.host+'/users/password/new', target='_blank') reset your password],
| #[a(href='/sign_in_to_v1?return_to=%2Fusers%2Fpassword%2Fnew', target='_blank') reset your password],
| and try again.
.modal-footer
button.btn.btn-default(