diff options
author | Abijeet <abijeetpatro@gmail.com> | 2018-06-02 20:45:19 +0530 |
---|---|---|
committer | John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com> | 2018-06-18 07:39:43 +0200 |
commit | 45db89f3e6b7b391db5f9c766f3b3ef8b4e0750a (patch) | |
tree | 18f459ff41135a5b3d0adb1afb797c10a3f3facc /apps/files_trashbin | |
parent | 174ba1f0124b9f5999d6f9842259ab1b2b143c5a (diff) | |
download | nextcloud-server-45db89f3e6b7b391db5f9c766f3b3ef8b4e0750a.tar.gz nextcloud-server-45db89f3e6b7b391db5f9c766f3b3ef8b4e0750a.zip |
Added a new action menu in files and trash list.
Uses the new file-multi-select-menu component.
Towards #7647
Signed-off-by: Abijeet <abijeetpatro@gmail.com>
Diffstat (limited to 'apps/files_trashbin')
-rw-r--r-- | apps/files_trashbin/js/app.js | 14 | ||||
-rw-r--r-- | apps/files_trashbin/templates/index.php | 16 |
2 files changed, 16 insertions, 14 deletions
diff --git a/apps/files_trashbin/js/app.js b/apps/files_trashbin/js/app.js index fd3d5db32ff..002c01bf967 100644 --- a/apps/files_trashbin/js/app.js +++ b/apps/files_trashbin/js/app.js @@ -30,7 +30,19 @@ OCA.Trashbin.App = { fileActions: this._createFileActions(), detailsViewEnabled: false, scrollTo: urlParams.scrollto, - config: OCA.Files.App.getFilesConfig() + config: OCA.Files.App.getFilesConfig(), + multiSelectMenu: [ + { + name: 'restore', + displayName: t('files', 'Restore'), + iconClass: 'icon-history', + }, + { + name: 'delete', + displayName: t('files', 'Delete'), + iconClass: 'icon-delete', + } + ] } ); }, diff --git a/apps/files_trashbin/templates/index.php b/apps/files_trashbin/templates/index.php index a4459947d09..dd24abb5de1 100644 --- a/apps/files_trashbin/templates/index.php +++ b/apps/files_trashbin/templates/index.php @@ -31,25 +31,15 @@ <div id="headerName-container"> <a class="name sort columntitle" data-sort="name"><span><?php p($l->t( 'Name' )); ?></span><span class="sort-indicator"></span></a> <span id="selectedActionsList" class='selectedActions'> - <a href="" class="undelete"> - <span class="icon icon-history"></span> - <span><?php p($l->t('Restore'))?></span> - </a> - <a href="" class="delete-selected"> - <span class="icon icon-delete"></span> - <span><?php p($l->t('Delete'))?></span> + <a href="" class="actions-selected"> + <span class="icon icon-more"></span> + <span><?php p($l->t('Actions'))?></span> </a> </span> </div> </th> <th id="headerDate" class="hidden column-mtime"> <a id="modified" class="columntitle" data-sort="mtime"><span><?php p($l->t( 'Deleted' )); ?></span><span class="sort-indicator"></span></a> - <span class="selectedActions"> - <a href="" class="delete-selected"> - <span><?php p($l->t('Delete'))?></span> - <span class="icon icon-delete"></span> - </a> - </span> </th> </tr> </thead> |