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

Use hasFeature for message about returning to v1/SL

Browse source
This commit is contained in:
James Allen 2018-01-31 10:05:56 +00:00
parent 7e829f6944
commit de7f13aea6
2 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
services/web/app/coffee/infrastructure/Features.coffee
View file

@ -12,5 +12,7 @@ module.exports = Features =
return not Features.externalAuthenticationSystemUsed() return not Features.externalAuthenticationSystemUsed()
when 'github-sync' when 'github-sync'
return Settings.enableGithubSync return Settings.enableGithubSync
when 'v1-return-message'
return Settings.accountMerge? and Settings.overleaf?
else else
throw new Error("unknown feature: #{feature}") throw new Error("unknown feature: #{feature}")

2
services/web/app/views/project/list.pug
View file

@ -64,7 +64,7 @@ block content
aside.project-list-sidebar.col-md-2.col-xs-3 aside.project-list-sidebar.col-md-2.col-xs-3
include ./list/side-bar include ./list/side-bar
if settings.accountMerge && settings.overleaf if hasFeature('v1-return-message')
.project-list-sidebar-v2-pane.col-md-2.col-xs-3 .project-list-sidebar-v2-pane.col-md-2.col-xs-3
span Welcome to the Overleaf v2 alpha! #[a(href="https://www.overleaf.com/help/342-overleaf-v2-faq") Find out more]. span Welcome to the Overleaf v2 alpha! #[a(href="https://www.overleaf.com/help/342-overleaf-v2-faq") Find out more].
if userIsFromOLv1(user) if userIsFromOLv1(user)