From 09be606a4e727954542271696867933b1879ee43 Mon Sep 17 00:00:00 2001 From: Davinder Singh Date: Tue, 15 Nov 2022 10:56:27 +0000 Subject: [PATCH] Merge pull request #10342 from overleaf/ds-buttons-project-page New buttons on project dashboard GitOrigin-RevId: 6e6a93a1ca1264dd214ccaf7976b665e45e7b10b --- services/web/app/views/project/list/modals.pug | 16 ++++++++-------- .../web/app/views/project/list/project-list.pug | 14 +++++++------- .../components/modals/projects-action-modal.tsx | 2 +- .../buttons/archive-projects-button.tsx | 2 +- .../buttons/download-projects-button.tsx | 2 +- .../project-tools-more-dropdown-button.tsx | 4 +++- .../project-tools/buttons/tags-dropdown.tsx | 3 ++- .../buttons/trash-projects-button.tsx | 2 +- .../buttons/unarchive-projects-button.tsx | 10 +++++++++- .../buttons/untrash-projects-button.tsx | 10 +++++++++- 10 files changed, 42 insertions(+), 23 deletions(-) diff --git a/services/web/app/views/project/list/modals.pug b/services/web/app/views/project/list/modals.pug index 8532d57725..3df137ed4d 100644 --- a/services/web/app/views/project/list/modals.pug +++ b/services/web/app/views/project/list/modals.pug @@ -24,7 +24,7 @@ script(type='text/ng-template', id='newTagModalTemplate') span.text-danger.error(ng-show="state.error") #{translate("generic_something_went_wrong")} //- We stop propagation to stop the clicks from closing the //- 'move to folder' menu. - button.btn.btn-default( + button.btn.btn-secondary( ng-click="cancel()" stop-propagation="click" ) #{translate("cancel")} @@ -54,7 +54,7 @@ script(type='text/ng-template', id='deleteTagModalTemplate') .modal-footer .modal-footer-left span.text-danger.error(ng-show="state.error") #{translate("generic_something_went_wrong")} - button.btn.btn-default( + button.btn.btn-secondary( ng-click="cancel()" ) #{translate("cancel")} button.btn.btn-danger( @@ -87,7 +87,7 @@ script(type='text/ng-template', id='renameTagModalTemplate') .modal-footer .modal-footer-left span.text-danger.error(ng-show="state.error") #{translate("generic_something_went_wrong")} - button.btn.btn-default(ng-click="cancel()") #{translate("cancel")} + button.btn.btn-secondary(ng-click="cancel()") #{translate("cancel")} button.btn.btn-primary( ng-click="rename()", ng-disabled="renameTagForm.$invalid || state.inflight" @@ -118,7 +118,7 @@ script(type='text/ng-template', id='renameProjectModalTemplate') focus-on="open" ) .modal-footer - button.btn.btn-default(ng-click="cancel()") #{translate("cancel")} + button.btn.btn-secondary(ng-click="cancel()") #{translate("cancel")} button.btn.btn-primary( ng-click="rename()", ng-disabled="renameProjectForm.$invalid || state.inflight" @@ -151,7 +151,7 @@ script(type='text/ng-template', id='cloneProjectModalTemplate') focus-on="open" ) .modal-footer - button.btn.btn-default( + button.btn.btn-secondary( ng-disabled="state.inflight" ng-click="cancel()" ) #{translate("cancel")} @@ -185,7 +185,7 @@ script(type='text/ng-template', id='newProjectModalTemplate') focus-on="open" ) .modal-footer - button.btn.btn-default( + button.btn.btn-secondary( ng-disabled="state.inflight" ng-click="cancel()" ) #{translate("cancel")} @@ -249,7 +249,7 @@ script(type='text/ng-template', id='archiveTrashLeaveOrDeleteProjectsModalTempla i.fa.fa-fw.fa-exclamation-triangle .project-action-alert-msg #{translate("this_action_cannot_be_undone")} .modal-footer - button.btn.btn-default( + button.btn.btn-secondary( ng-click="cancel()" ) #{translate("cancel")} button.btn.btn-danger( @@ -300,4 +300,4 @@ script(type="text/ng-template", id="uploadProjectModalTemplate") on-complete-callback="onComplete" ) .modal-footer - button.btn.btn-default(ng-click="cancel()") #{translate("cancel")} + button.btn.btn-secondary(ng-click="cancel()") #{translate("cancel")} diff --git a/services/web/app/views/project/list/project-list.pug b/services/web/app/views/project/list/project-list.pug index f8ed41c481..677be21bb8 100644 --- a/services/web/app/views/project/list/project-list.pug +++ b/services/web/app/views/project/list/project-list.pug @@ -30,7 +30,7 @@ include ./_current_plan_mixins +current_plan() .btn-toolbar .btn-group(ng-hide="selectedProjects.length < 1") - a.btn.btn-default( + a.btn.btn-secondary( href, aria-label=translate('download'), tooltip=translate('download'), @@ -39,7 +39,7 @@ include ./_current_plan_mixins ng-click="downloadSelectedProjects()" ) i.fa.fa-cloud-download(aria-hidden="true") - a.btn.btn-default( + a.btn.btn-secondary( href, ng-if="filter !== 'archived'" aria-label=translate("archive"), @@ -49,7 +49,7 @@ include ./_current_plan_mixins ng-click="openArchiveProjectsModal()" ) i.fa.fa-inbox(aria-hidden="true") - a.btn.btn-default( + a.btn.btn-secondary( href, ng-if="filter !== 'trashed'" aria-label=translate("trash"), @@ -63,7 +63,7 @@ include ./_current_plan_mixins ng-hide="selectedProjects.length < 1 || filter === 'archived' || filter === 'trashed'", dropdown ) - a.btn.btn-default.dropdown-toggle( + a.btn.btn-secondary.dropdown-toggle( href, data-toggle="dropdown", dropdown-toggle, @@ -102,7 +102,7 @@ include ./_current_plan_mixins ng-hide="selectedProjects.length != 1 || filter === 'archived' || filter === 'trashed'", dropdown ) - a.btn.btn-default.dropdown-toggle( + a.btn.btn-secondary.dropdown-toggle( href, data-toggle="dropdown", dropdown-toggle @@ -121,7 +121,7 @@ include ./_current_plan_mixins ) #{translate("make_copy")} .btn-group(ng-show="filter === 'archived' && selectedProjects.length > 0") - a.btn.btn-default( + a.btn.btn-secondary( href, data-original-title=translate("unarchive"), data-toggle="tooltip", @@ -130,7 +130,7 @@ include ./_current_plan_mixins ) #{translate("unarchive")} .btn-group(ng-show="filter === 'trashed' && selectedProjects.length > 0") - a.btn.btn-default( + a.btn.btn-secondary( href, data-original-title=translate("untrash"), data-toggle="tooltip", diff --git a/services/web/frontend/js/features/project-list/components/modals/projects-action-modal.tsx b/services/web/frontend/js/features/project-list/components/modals/projects-action-modal.tsx index b542cad40a..bd37fbb77d 100644 --- a/services/web/frontend/js/features/project-list/components/modals/projects-action-modal.tsx +++ b/services/web/frontend/js/features/project-list/components/modals/projects-action-modal.tsx @@ -127,7 +127,7 @@ function ProjectsActionModal({ {getUserFacingMessage(e.error)} ))} - + return ( + + ) } export default memo(UnarchiveProjectsButton) diff --git a/services/web/frontend/js/features/project-list/components/table/project-tools/buttons/untrash-projects-button.tsx b/services/web/frontend/js/features/project-list/components/table/project-tools/buttons/untrash-projects-button.tsx index 497a786fc5..775eaef30d 100644 --- a/services/web/frontend/js/features/project-list/components/table/project-tools/buttons/untrash-projects-button.tsx +++ b/services/web/frontend/js/features/project-list/components/table/project-tools/buttons/untrash-projects-button.tsx @@ -15,7 +15,15 @@ function UntrashProjectsButton() { } } - return + return ( + + ) } export default memo(UntrashProjectsButton)