diff --git a/README.md b/README.md
index dd660f8..01cc812 100644
--- a/README.md
+++ b/README.md
@@ -261,7 +261,7 @@
>- all the **left/right** gestures have their counterparts available as well.
>- pressing `esc` while using the ***image editor*** wont close the modal but you can ***dbl click/tap*** the `modal background` to do so. **"to avoid accidentally canceling your changes"**.
- \* the info sidebar is only available on big screens **"> 1087px"**.
+ \* the info sidebar is only available on big screens **"> 1023px"**.
\* to stop interfering with other `keydown` events you can toggle the manager listener through
`EventHub.fire('disable-global-keys', true/false)`.
@@ -271,14 +271,14 @@
|----------------------|------------------------------------------|------------------|------------------------------|---------------------------------|
| | toggle upload panel *(toolbar)* | u | | |
| | refresh *(toolbar)* | r | hold *"clear cache"* | pinch in *(items container)* |
-| | move/show movable list *(toolbar)* | m | | |
+| | move/show movable list *(toolbar)* | m / p | | |
| | image editor *(toolbar)* | e | | |
| | delete *(toolbar)* | d / del | | |
| | lock/unlock *(toolbar)* | l | hold *"anything but images"* | |
| | change visibility *(toolbar)* | v | | |
| | toggle bulk selection *(toolbar)* | b | | |
| | (reset) bulk select all *(toolbar)* | a | | |
-| | add to movable list *(shopping cart)* | c | * | |
+| | add to movable list *(shopping cart)* | c / x | * | |
| | move/show movable list *(shopping cart)* | | ** | |
| | clear movable list *(shopping cart)* | | hold | |
| | toggle sidebar *(path bar)* | t | * | swipe left/right *(sidebar)* |
diff --git a/src/resources/assets/js/components/manager.vue b/src/resources/assets/js/components/manager.vue
index 313adc2..8c817fb 100644
--- a/src/resources/assets/js/components/manager.vue
+++ b/src/resources/assets/js/components/manager.vue
@@ -378,7 +378,7 @@ export default {
}
// copy file
- if (key == 'c') {
+ if (key == 'c' || key == 'x') {
this.addToMovableList()
}
@@ -395,7 +395,7 @@ export default {
// end of we have files
// move file
- if (key == 'm' && this.movableItemsCount) {
+ if ((key == 'm' || key == 'p') && this.movableItemsCount) {
this.showMovableList()
}
diff --git a/src/resources/assets/js/modules/movable.js b/src/resources/assets/js/modules/movable.js
index 5a43f72..5db2083 100644
--- a/src/resources/assets/js/modules/movable.js
+++ b/src/resources/assets/js/modules/movable.js
@@ -36,7 +36,9 @@ export default {
return this.movableList.splice(i, 1)
},
clearMovableList() {
- return this.resetInput('movableList', [])
+ this.resetInput('movableList', [])
+
+ return this.showNotif(this.trans('move_clear'))
},
inMovableList(item = this.selectedFile) {
return item &&
diff --git a/src/resources/assets/js/modules/utils.js b/src/resources/assets/js/modules/utils.js
index 47f1c9e..74cb328 100644
--- a/src/resources/assets/js/modules/utils.js
+++ b/src/resources/assets/js/modules/utils.js
@@ -219,10 +219,10 @@ export default {
return str
},
- showNotif(msg, s = 'success', duration = 3) {
+ showNotif(msg, t = 'success', duration = 3) {
let title
- switch (s) {
+ switch (t) {
case 'black':
case 'danger':
title = 'Error'
@@ -243,7 +243,7 @@ export default {
EventHub.fire('showNotif', {
title: title,
body: msg,
- type: s,
+ type: t,
duration: duration
})
},
diff --git a/src/resources/assets/sass/partials/utils.scss b/src/resources/assets/sass/partials/utils.scss
index b0d9cd4..9a84607 100644
--- a/src/resources/assets/sass/partials/utils.scss
+++ b/src/resources/assets/sass/partials/utils.scss
@@ -32,6 +32,10 @@
margin-bottom: 10px !important;
} // .m-b-10
+.m-b-20 {
+ margin-bottom: 20px !important;
+} // .m-b-20
+
.m-l-50 {
margin-left: 50px !important;
} // .m-l-50
diff --git a/src/resources/lang/en/messages.php b/src/resources/lang/en/messages.php
index 18b57dd..a0387eb 100644
--- a/src/resources/lang/en/messages.php
+++ b/src/resources/lang/en/messages.php
@@ -14,12 +14,12 @@
'options' => 'Options',
'ajax_error' => 'Oh NO! Something Went Wrong',
'application' => 'Application',
- 'are_you_sure_delete' => 'Are you sure you want to delete ?',
+ 'are_you_sure_delete' => 'Are You Sure You Want To Delete ?!!',
'audio' => [
'album' => 'Album',
'artist' => 'Artist',
'main' => 'Audio',
- 'support' => 'Your browser does not support the audio element',
+ 'support' => 'Your Browser Does Not Support The Audio Element',
'title' => 'Title',
'track' => 'Track Nº',
'year' => 'Year',
@@ -51,8 +51,8 @@
'zoom_out' => 'Zoom Out',
],
'delete' => [
- 'confirm' => 'Yes, Delete it !',
- 'folder' => 'Deleting a folder will also remove all of its content',
+ 'confirm' => 'Yes, Delete It !',
+ 'folder' => 'Deleting A Folder Will Also Remove All Of Its Content',
'main' => 'Delete',
'success' => 'Successfully Deleted',
],
@@ -75,9 +75,9 @@
'altered_fwli' => 'Can\'t Be Moved, Renamed Or Deleted Because It Has Some Locked Items',
'cant_upload' => 'Sorry File Can\'t Be Uploaded',
'creating_dir' => 'Something Gone Wrong While Creating The Directory, Please Check Your Permissions',
- 'deleting_file' => 'Something Gone Wrong While Deleting This File/Folder, Please Check Your Permissions,',
+ 'deleting_file' => 'Something Gone Wrong While Deleting This File/Folder, Please Check Your Permissions',
'doesnt_exist' => 'Folder ":attr" Doesnt Exist',
- 'moving' => 'There Seems To Be A Problem Moving This File/Folder, Make Sure You Have The Correct Permissions.',
+ 'moving' => 'There Seems To Be A Problem Moving This File/Folder, Make Sure You Have The Correct Permissions',
'moving_cloud' => 'Cloud Folders Can\'t Be "Renamed, Moved Or Copied"',
'move_into_self' => 'Folder Can\'t Be "Moved Or Copied" Into It Self',
],
@@ -101,11 +101,12 @@
'file_folder' => 'Move File/Folder',
'main' => 'Move',
'success' => 'Successfully Moved',
+ 'clear_list' => 'Movable List Successfully Cleared',
],
'name' => 'Name',
'new' => [
'create_folder' => 'Create New Folder',
- 'create_folder_notif' => 'New Folder Was created',
+ 'create_folder_notif' => 'New Folder Was Created',
'file_folder' => 'New File/Folder Name',
'folder_name' => 'New Folder Name',
],
@@ -115,7 +116,7 @@
'not_allowed_file_ext' => 'Files Of Type ":attr" Are Not Allowed',
'nothing_found' => 'Nothing Found',
'open' => 'Open',
- 'pdf' => 'Your Browser Does Not Support Pdfs. Please Download The Pdf To View It',
+ 'pdf' => 'Your Browser Does Not Support Pdfs, Please Download The Pdf To View It',
'preview' => 'Preview',
'public_url' => 'Public URL',
'refresh_notif' => 'Press The Refresh Button To View Them',
diff --git a/src/resources/views/_manager.blade.php b/src/resources/views/_manager.blade.php
index 22565da..72bdba9 100644
--- a/src/resources/views/_manager.blade.php
+++ b/src/resources/views/_manager.blade.php
@@ -35,6 +35,7 @@ class='hide-native-scrollbar'
'glbl_search_avail' => trans('MediaManager::messages.search.glbl_avail'),
'go_to_folder' => trans('MediaManager::messages.go_to_folder'),
'move_success' => trans('MediaManager::messages.move.success'),
+ 'move_clear' => trans('MediaManager::messages.move.clear_list'),
'new_uploads_notif' => trans('MediaManager::messages.upload.new_uploads_notif'),
'no_val' => trans('MediaManager::messages.no_val'),
'nothing_found' => trans('MediaManager::messages.nothing_found'),
@@ -123,7 +124,7 @@ class='hide-native-scrollbar'
ref="move"
:disabled="isLoading || !movableItemsCount"
v-tippy
- title="m"
+ title="m / p"
@click="moveItem()">
{{ trans('MediaManager::messages.move.main') }}
@@ -582,7 +583,7 @@ class="no_files"