From 7910f2109fd30887a345c69bfbab2138c1f759f0 Mon Sep 17 00:00:00 2001 From: Alasdair Smith Date: Mon, 30 Oct 2017 15:32:54 +0000 Subject: [PATCH] Switch to V1 wording --- .../web/app/coffee/Features/Project/ProjectController.coffee | 3 ++- services/web/app/views/project/list/ol-item.pug | 2 +- services/web/app/views/project/list/project-list.pug | 4 ++-- .../web/public/coffee/main/project-list/project-list.coffee | 2 +- services/web/public/stylesheets/app/project-list.less | 2 +- 5 files changed, 7 insertions(+), 6 deletions(-) diff --git a/services/web/app/coffee/Features/Project/ProjectController.coffee b/services/web/app/coffee/Features/Project/ProjectController.coffee index 9b281617c8..ac28dcdf4c 100644 --- a/services/web/app/coffee/Features/Project/ProjectController.coffee +++ b/services/web/app/coffee/Features/Project/ProjectController.coffee @@ -434,6 +434,7 @@ module.exports = ProjectController = archived: !!project.archived owner_ref: project.owner_ref tokens: project.tokens + isV1Project: false } return model @@ -444,7 +445,7 @@ module.exports = ProjectController = lastUpdated: moment.unix(project.updated_at) accessLevel: "readOnly", archived: project.removed || project.archived - isOLProject: true + isV1Project: true } _injectProjectOwners: (projects, callback = (error, projects) ->) -> diff --git a/services/web/app/views/project/list/ol-item.pug b/services/web/app/views/project/list/ol-item.pug index a5f21e7387..49a6dd01f2 100644 --- a/services/web/app/views/project/list/ol-item.pug +++ b/services/web/app/views/project/list/ol-item.pug @@ -1,5 +1,5 @@ .col-xs-8 - span.label.label-default.ol-label V1 + span.label.label-default.v1-label V1 span a.projectName( href=settings.overleaf.host + "/{{project.id}}" diff --git a/services/web/app/views/project/list/project-list.pug b/services/web/app/views/project/list/project-list.pug index 66103ea3fa..260cc387f0 100644 --- a/services/web/app/views/project/list/project-list.pug +++ b/services/web/app/views/project/list/project-list.pug @@ -143,12 +143,12 @@ ng-controller="ProjectListItemController" ) .row( - ng-if="!project.isOLProject" + ng-if="!project.isV1Project" select-row ) include ./item .row( - ng-if="project.isOLProject" + ng-if="project.isV1Project" ) include ./ol-item li( diff --git a/services/web/public/coffee/main/project-list/project-list.coffee b/services/web/public/coffee/main/project-list/project-list.coffee index 63e669308c..335f46c62d 100644 --- a/services/web/public/coffee/main/project-list/project-list.coffee +++ b/services/web/public/coffee/main/project-list/project-list.coffee @@ -117,7 +117,7 @@ define [ visible = false # Hide projects from V1 if we only want to see shared projects - if $scope.filter == "shared" and project.isOLProject + if $scope.filter == "shared" and project.isV1Project visible = false # Hide projects we don't own if we only want to see owned projects diff --git a/services/web/public/stylesheets/app/project-list.less b/services/web/public/stylesheets/app/project-list.less index 88442147f2..d3745854c3 100644 --- a/services/web/public/stylesheets/app/project-list.less +++ b/services/web/public/stylesheets/app/project-list.less @@ -367,7 +367,7 @@ ul.project-list { border-bottom-left-radius: 0; } - .ol-label { + .v1-label { margin-right: 11px; margin-left: 5px; padding: 2px 3px 1px;