diff --git a/services/web/app/views/project/list.pug b/services/web/app/views/project/list.pug index 7ee28763a8..0cd67d473c 100644 --- a/services/web/app/views/project/list.pug +++ b/services/web/app/views/project/list.pug @@ -64,10 +64,12 @@ block content include ./list/side-bar if isShowingV1Projects && settings.overleaf && settings.overleaf.host - .project-list-sidebar-v1-link.col-md-2.col-xs-3 - span Want to go back to the V1 dashboard? - a.btn.btn-default(href=settings.overleaf.host + "/dash?prefer-v1-dash=1") - | Go back to V1 + .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/v2") Find out more]. + span To tag or rename your v1 projects, please go back to Overleaf v1. + a.project-list-sidebar-v1-link( + href=settings.overleaf.host + "/dash?prefer-v1-dash=1" + ) Go back to v1 .project-list-main.col-md-10.col-xs-9 include ./list/notifications diff --git a/services/web/app/views/project/list/modals.pug b/services/web/app/views/project/list/modals.pug index 1e12fb2293..c3d86feb70 100644 --- a/services/web/app/views/project/list/modals.pug +++ b/services/web/app/views/project/list/modals.pug @@ -317,38 +317,56 @@ script(type="text/ng-template", id="userProfileModalTemplate") script(type="text/ng-template", id="v1ImportModalTemplate") .modal-header button.close(ng-click="dismiss()") × - h3 #{translate("import_project_to_v2")} + h3 Move Project to Overleaf v2 .modal-body.v1-import-wrapper .v1-import-step-1(ng-show="step === 1") - img.v1-import-img( - src="/img/v1-import/v2-editor.png" - alt="The new V2 Editor." - ) - h2.v1-import-title Try importing your project to V2! - p Some exciting copy about the new features: - ul - li Some stuff - li Some more stuff - li Yet more stuff + .v1-import-row + .v1-import-col + img.v1-import-img( + src="/img/v1-import/v2-editor.png" + alt="The new V2 Editor." + ) + .v1-import-col + h2.v1-import-title Try the Overleaf v2 Editor + p The Overleaf v2 editor has many great new features including: + ul + li Faster real-time collaboration + li See your coauthors’ cursors + li Chat with math support + li Tracked changes and commenting + li Improved LaTeX autocomplete + li Two-way Dropbox sync + p.v1-import-cta Would you like to move #[strong {{project.name}}] into Overleaf v2? .v1-import-step-2(ng-show="step === 2") - div.v1-import-warning(aria-label="Warning symbol.") - i.fa.fa-exclamation-triangle - h2.v1-import-title #[strong Warning:] Overleaf V2 is in beta - p Once importing your project you will lose access to the some of the features of Overleaf V1. This includes the git bridge, journal integrations, WYSIWYG and linked files. We’re working on bringing these features to V2! - p Once you have imported a project to V2 you #[strong cannot go back to V1]. - p Are you sure you want to import to V2? + .v1-import-row + .v1-import-warning.v1-import-col(aria-label="Warning symbol.") + i.fa.fa-exclamation-triangle + .v1-import-col + h2.v1-import-title #[strong Warning:] Overleaf v2 is Experimental + p We are still working hard to bring some Overleaf v1 features to the v2 editor. If you move this project to v2 now, you will: + ul + li Lose access your project via git + li Not be able to use the Journals and Services menu to submit directly to our partners + li Not be able to use the Rich Text (WYSIWYG) mode + li Not be able to use linked files (to URLs or to files in other Overleaf projects) + li Not be able to use some bibliography integrations (Zotero, CiteULike) + li Lose access to your labelled versions and not be able to create new labelled versions + .v1-import-cta + p + strong Please note: you cannot move this project back to v1 once you have moved it to v2. If this is an important project, please consider making a clone in v1 before you move the project to v2. + p Are you sure you want to move #[strong {{project.name}}] into Overleaf v2? .modal-footer.v1-import-footer div(ng-show="step === 1") if settings.overleaf && settings.overleaf.host a.btn.btn-primary.v1-import-btn( ng-href=settings.overleaf.host + "/{{project.id}}" - ) #{translate("open_in_v1")} + ) No thanks, open in v1 button.btn.btn-primary.v1-import-btn( ng-click="moveToConfirmation()" - ) #{translate("import_to_v2")} + ) Yes, move project to v2 div(ng-show="step === 2") form( async-form="v1Import", @@ -363,9 +381,9 @@ script(type="text/ng-template", id="v1ImportModalTemplate") a.btn.btn-primary.v1-import-btn( ng-href=settings.overleaf.host + "/{{project.id}}" ng-class="{disabled: v1ImportForm.inflight || v1ImportForm.success}" - ) #{translate("never_mind_open_in_v1")} + ) No thanks, open in v1 input.btn.btn-primary.v1-import-btn( type="submit", - value=translate('yes_im_sure') + value="Yes, move project to v2" ng-disabled="v1ImportForm.inflight || v1ImportForm.success" ) diff --git a/services/web/app/views/v1-tooltip.pug b/services/web/app/views/v1-tooltip.pug index 2934adbe8b..728962338a 100644 --- a/services/web/app/views/v1-tooltip.pug +++ b/services/web/app/views/v1-tooltip.pug @@ -1,6 +1,6 @@ script(type="text/ng-template", id="v1ProjectTooltipTemplate") - span This project is from Overleaf version 1 and has not been imported to the beta yet + span This project is from Overleaf v1 and has not been imported to v2 yet. script(type="text/ng-template", id="v1TagTooltipTemplate") - span This folder is from Overleaf version 1 and has not been imported to the beta yet \ No newline at end of file + span This folder/tag is from Overleaf v1. Please go back to v1 to manage. \ No newline at end of file diff --git a/services/web/public/stylesheets/_ol_style_includes.less b/services/web/public/stylesheets/_ol_style_includes.less index c8505c2e56..f2832bd219 100644 --- a/services/web/public/stylesheets/_ol_style_includes.less +++ b/services/web/public/stylesheets/_ol_style_includes.less @@ -1 +1 @@ -@import "app/sidebar-v1-dash-link.less"; +@import "app/sidebar-v2-dash-pane.less"; diff --git a/services/web/public/stylesheets/app/list/v1-import-modal.less b/services/web/public/stylesheets/app/list/v1-import-modal.less index 64bb9fda37..eac07d8772 100644 --- a/services/web/public/stylesheets/app/list/v1-import-modal.less +++ b/services/web/public/stylesheets/app/list/v1-import-modal.less @@ -2,8 +2,34 @@ text-align: center; } +.v1-import-row { + display: flex; + align-items: center; +} + +.v1-import-col { + flex-basis: 50%; + flex-grow: 0; + flex-shrink: 0; + padding-left: 15px; + padding-right: 15px; +} + + .v1-import-col ul { + margin-bottom: 0; + } + .v1-import-img { width: 100%; + margin-top: 30px; +} + +.v1-import-cta { + margin-top: 20px; + margin-left: auto; + margin-right: auto; + width: 90%; + text-align: center; } .v1-import-warning { diff --git a/services/web/public/stylesheets/app/sidebar-v1-dash-link.less b/services/web/public/stylesheets/app/sidebar-v1-dash-link.less deleted file mode 100644 index 072042226e..0000000000 --- a/services/web/public/stylesheets/app/sidebar-v1-dash-link.less +++ /dev/null @@ -1,32 +0,0 @@ -@v1-dash-link-height: 130px; - -.project-list-sidebar { - height: calc(~"100% -" @v1-dash-link-height); -} - -.project-list-sidebar-v1-link { - position: absolute; - bottom: 0; - height: @v1-dash-link-height; - background-color: @v1-dash-link-bg; - text-align: center; - display: flex; - flex-direction: column; - justify-content: center; - color: white; -} - - .project-list-sidebar-v1-link a { - display: block; - margin-left: auto; - margin-right: auto; - margin-top: 12.5px; - padding-top: 0; - padding-bottom: 0; - background-color: @v1-dash-link-btn-bg; - color: #fff; - } - - .project-list-sidebar-v1-link a:hover { - background-color: @v1-dash-link-btn-hover-bg; - } \ No newline at end of file diff --git a/services/web/public/stylesheets/app/sidebar-v2-dash-pane.less b/services/web/public/stylesheets/app/sidebar-v2-dash-pane.less new file mode 100644 index 0000000000..d1586b4a5c --- /dev/null +++ b/services/web/public/stylesheets/app/sidebar-v2-dash-pane.less @@ -0,0 +1,27 @@ +@v2-dash-pane-link-height: 130px; + +.project-list-sidebar { + height: calc(~"100% -" @v2-dash-pane-link-height); +} + +.project-list-sidebar-v2-pane { + position: absolute; + bottom: 0; + height: @v2-dash-pane-link-height; + background-color: @v2-dash-pane-bg; + text-align: center; + display: flex; + flex-direction: column; + justify-content: center; + color: white; + font-size: 13px; +} + + .project-list-sidebar-v2-pane a { + color: @v2-dash-pane-link-color; + text-decoration: underline; + } + + .project-list-sidebar-v2-pane a:hover { + text-decoration: none; + } diff --git a/services/web/public/stylesheets/core/ol-variables.less b/services/web/public/stylesheets/core/ol-variables.less index 7a19278500..2485dd3853 100644 --- a/services/web/public/stylesheets/core/ol-variables.less +++ b/services/web/public/stylesheets/core/ol-variables.less @@ -135,9 +135,10 @@ @sidebar-active-bg : @ol-blue-gray-6; @sidebar-hover-bg : @ol-blue-gray-4; @sidebar-hover-text-decoration : none; -@v1-dash-link-bg : @ol-blue-gray-4; -@v1-dash-link-btn-bg : @ol-blue-gray-5; -@v1-dash-link-btn-hover-bg : @ol-blue-gray-6; +@v2-dash-pane-bg : @ol-blue-gray-4; +@v2-dash-pane-link-color : #FFF; +@v2-dash-pane-btn-bg : @ol-blue-gray-5; +@v2-dash-pane-btn-hover-bg : @ol-blue-gray-6; @folders-menu-margin : 0 -(@grid-gutter-width / 2); @folders-menu-line-height : @structured-list-line-height;