From c2617e7411b5dcf005d68c7e730d39f2f353ae6c Mon Sep 17 00:00:00 2001
From: Eugen Ciur <eugen@papermerge.com>
Date: Mon, 18 Apr 2022 15:02:57 +0200
Subject: [PATCH] group extra actions into dropdown menu
---
.../viewer/action_buttons/index.hbs | 49 ++++++++++++-------
app/components/viewer/index.js | 11 +++--
2 files changed, 38 insertions(+), 22 deletions(-)
diff --git a/app/components/viewer/action_buttons/index.hbs b/app/components/viewer/action_buttons/index.hbs
index 67102cd..548046d 100644
--- a/app/components/viewer/action_buttons/index.hbs
+++ b/app/components/viewer/action_buttons/index.hbs
@@ -45,25 +45,38 @@
</button>
{{else if this.is_any_page_selected }}
<button
- class="btn btn-light"
type="button"
- {{on "click" @onRotateClockwise}} >
- <i class="bi bi-arrow-clockwise"></i>
- Rotate
- </button>
- <button
- class="btn btn-light"
- type="button"
- {{on "click" @onRotateCounterclockwise}} >
- <i class="bi bi-arrow-counterclockwise"></i>
- Rotate
- </button>
- <button
- class="btn btn-danger mx-5"
- type="button"
- {{on "click" @openConfirmDeletionModal}} >
- <i class="fa fa-times"></i>
- Delete Pages
+ data-bs-toggle="dropdown"
+ class="btn btn-light dropdown-toggle mx-1">
+ ...
</button>
+ <ul class="dropdown-menu"
+ aria-expand="false"
+ aria-labelledby="display-mode">
+ <li class="dropdown-item">
+ <button
+ class="btn"
+ {{on "click" @onRotateClockwise}}>
+ <i class="bi bi-arrow-clockwise"></i>
+ Rotate 90 CW
+ </button>
+ </li>
+ <li class="dropdown-item">
+ <button
+ class="btn"
+ {{on "click" @onRotateCounterclockwise}}>
+ <i class="bi bi-arrow-counterclockwise"></i>
+ Rotate 90 CCW
+ </button>
+ </li>
+ <li class="dropdown-item">
+ <button
+ class="btn"
+ {{on "click" @openConfirmDeletionModal}}>
+ <i class="fa fa-times text-danger"></i>
+ Delete Pages
+ </button>
+ </li>
+ </ul>
{{/if}}
</div>
diff --git a/app/components/viewer/index.js b/app/components/viewer/index.js
index 5aab481..69c1749 100644
--- a/app/components/viewer/index.js
+++ b/app/components/viewer/index.js
@@ -223,6 +223,7 @@ export default class ViewerComponent extends Component {
}).then(() => {
this._pages = [];
this.router.refresh();
+ this.notify.info("Page(s) moved successfully");
});
}
@@ -250,11 +251,13 @@ export default class ViewerComponent extends Component {
let page_ids = [];
page_ids = this.selected_pages.map(page => page.id);
- await this.requests.deletePages(page_ids);
+ this.requests.deletePages(page_ids).then(() => {
+ this.show_confirm_pages_deletion_modal = false;
+ this.selected_pages = A([]);
+ this.router.refresh();
+ this.notify.info('Page(s) deleted successfully');
+ });
- this.show_confirm_pages_deletion_modal = false;
- this.selected_pages = A([]);
- this.router.refresh();
}
@action
--
GitLab