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

Merge pull request #3862 from overleaf/tm-remove-comms-introducing-archiving

Browse source 
Remove comms which introduced per-user archiving and trashing

GitOrigin-RevId: e8bd7bd741fe25f4530f447cf020b499256745dc
This commit is contained in:
Shane Kilkelly 2021-04-01 09:18:21 +01:00 committed by Copybot
parent f9962fefe8
commit b9b4ca224c
5 changed files with 18 additions and 49 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
services/web/app/views/project/list/modals.pug
View file

@ -219,12 +219,20 @@ script(type='text/ng-template', id='archiveTrashLeaveOrDeleteProjectsModalTempla
ul
li(ng-repeat="project in projects | orderBy:'name'")
strong {{project.name}}
.project-action-alert.alert.alert-info(ng-if="action === 'archive'")
.project-action-alert-msg #{translate("archived_projects_info_note")}
a(href="https://www.overleaf.com/blog/new-feature-using-archive-and-trash-to-keep-your-projects-organized" target="_blank").project-action-alert-btn.btn.btn-info.pull-right #{translate("find_out_more")}
.project-action-alert.alert.alert-info(ng-if="action === 'trash'")
.project-action-alert-msg #{translate("trashed_projects_info_note")}
a(href="https://www.overleaf.com/blog/new-feature-using-archive-and-trash-to-keep-your-projects-organized" target="_blank").project-action-alert-btn.btn.btn-info.pull-right #{translate("find_out_more")}
div(ng-if="action === 'archive'")
p #{translate("archiving_projects_wont_affect_collaborators")}
|  
a(
href="https://www.overleaf.com/blog/new-feature-using-archive-and-trash-to-keep-your-projects-organized"
target="_blank"
) #{translate("find_out_more_nt")}
div(ng-if="action === 'trash'")
p #{translate("trashing_projects_wont_affect_collaborators")}
|  
a(
href="https://www.overleaf.com/blog/new-feature-using-archive-and-trash-to-keep-your-projects-organized"
target="_blank"
) #{translate("find_out_more_nt")}
.project-action-alert.alert.alert-warning(ng-if="action === 'leave' || action === 'delete'")
i.fa.fa-fw.fa-exclamation-triangle
.project-action-alert-msg #{translate("this_action_cannot_be_undone")}

18
services/web/app/views/project/list/side-bar.pug
View file

@ -58,24 +58,10 @@
a(href) #{translate("your_projects")}
li(ng-class="{active: (filter == 'shared')}", ng-click="filterProjects('shared')")
a(href) #{translate("shared_with_you")}
li.folders-menu-item-with-tooltip(ng-class="{active: (filter == 'archived')}", ng-click="filterProjects('archived')")
li(ng-class="{active: (filter == 'archived')}", ng-click="filterProjects('archived')")
a(href) #{settings.overleaf ? translate("archived_projects") : translate("deleted_projects")}
.folders-menu-tooltip-trigger(
href
tooltip=translate('archived_projects_info_note')
tooltip-placement="right"
tooltip-append-to-body="true"
stop-propagation="click"
) i
li.folders-menu-item-with-tooltip(ng-class="{active: (filter == 'trashed')}", ng-click="filterProjects('trashed')")
li(ng-class="{active: (filter == 'trashed')}", ng-click="filterProjects('trashed')")
a(href) #{translate("trashed_projects")}
.folders-menu-tooltip-trigger(
href
tooltip=translate('trashed_projects_info_note')
tooltip-placement="right"
tooltip-append-to-body="true"
stop-propagation="click"
) i
li.separator
h2 #{translate("tags_slash_folders")}
li.tag(ng-cloak)

26
services/web/frontend/stylesheets/app/project-list.less
View file

@ -306,11 +306,6 @@ ul.folders-menu {
}
}
}
> li.folders-menu-item-with-tooltip {
> a {
padding-right: 1.5 * @folders-menu-item-h-padding + @info-badge-size;
}
}
> li > a.small {
color: @gray;
}
@ -391,27 +386,6 @@ ul.folders-menu {
}
}
.folders-menu-tooltip-trigger {
display: none;
position: absolute;
top: 50%;
right: @folders-menu-item-h-padding;
width: @info-badge-size;
height: @info-badge-size;
margin-top: -(floor(@info-badge-size / 2));
line-height: @info-badge-size;
background-color: @info-badge-bg;
font-family: @font-family-serif;
color: #fff;
font-style: italic;
border-radius: ceil(@info-badge-size / 2);
text-align: center;
font-weight: 700;
@media (min-width: @screen-sm-min) {
display: block;
}
}
.project-action-alert {
display: flex;
margin-bottom: 0;

1
services/web/frontend/stylesheets/core/variables.less
View file

@ -958,7 +958,6 @@
@folders-tag-border-color: @folders-tag-menu-color;
@folders-tag-menu-active-hover: rgba(0, 0, 0, 0.1);
@folders-tag-menu-hover: rgba(0, 0, 0, 0.1);
@info-badge-size: 21px;
@info-badge-bg: @ol-blue;
// Progress bars
@progress-border-radius: @line-height-computed;

2
services/web/locales/en.json
View file

@ -119,6 +119,8 @@
"about_to_trash_projects": "You are about to trash the following projects:",
"archived_projects_info_note": "The Archive now works on a per-user basis. Projects that you decide to archive will only be archived for you, not your collaborators.",
"trashed_projects_info_note": "Overleaf now has a Trash for projects you want to get rid of. Trashing a project won't affect your collaborators.",
"archiving_projects_wont_affect_collaborators": "Archiving projects won't affect your collaborators.",
"trashing_projects_wont_affect_collaborators": "Trashing projects won't affect your collaborators.",
"register_intercept_sso": "You can link your __authProviderName__ account from the Account Settings page after logging in.",
"continue_to": "Continue to __appName__",
"project_ownership_transfer_confirmation_1": "Are you sure you want to make <0>__user__</0> the owner of <1>__project__</1>?",