Skip to content

Commit

Permalink
3.6.1
Browse files Browse the repository at this point in the history 
- small additions
  • Loading branch information
@ctf0
ctf0 committed Nov 30, 2019
1 parent f6b63cb commit eef70c6
Show file tree
Hide file tree
Showing 8 changed files with 31 additions and 23 deletions.
6 changes: 3 additions & 3 deletions README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"**.<br>
\* the info sidebar is only available on big screens **"> 1023px"**.<br>
\* to stop interfering with other `keydown` events you can toggle the manager listener through<br>
`EventHub.fire('disable-global-keys', true/false)`.

Expand All @@ -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)* |
Expand Down
4 changes: 2 additions & 2 deletions src/resources/assets/js/components/manager.vue
View file
Original file line number Diff line number Diff line change
Expand Up @@ -378,7 +378,7 @@ export default {
}
// copy file
if (key == 'c') {
if (key == 'c' || key == 'x') {
this.addToMovableList()
}
Expand All @@ -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()
}
Expand Down
4 changes: 3 additions & 1 deletion src/resources/assets/js/modules/movable.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 &&
Expand Down
6 changes: 3 additions & 3 deletions src/resources/assets/js/modules/utils.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand All @@ -243,7 +243,7 @@ export default {
EventHub.fire('showNotif', {
title: title,
body: msg,
type: s,
type: t,
duration: duration
})
},
Expand Down
4 changes: 4 additions & 0 deletions src/resources/assets/sass/partials/utils.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
17 changes: 9 additions & 8 deletions src/resources/lang/en/messages.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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',
Expand Down Expand Up @@ -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',
],
Expand All @@ -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',
],
Expand All @@ -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',
],
Expand All @@ -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',
Expand Down
5 changes: 3 additions & 2 deletions src/resources/views/_manager.blade.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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'),
Expand Down Expand Up @@ -123,7 +124,7 @@ class='hide-native-scrollbar'
ref="move"
:disabled="isLoading || !movableItemsCount"
v-tippy
title="m"
title="m / p"
@click="moveItem()">
<span class="icon"><icon name="share" scale="0.8"></icon></span>
<span>{{ trans('MediaManager::messages.move.main') }}</span>
Expand Down Expand Up @@ -582,7 +583,7 @@ class="no_files"
<div class="movable-list extra-func-btns">
<v-touch class="btn-plain"
v-tippy="{arrow: true, hideOnClick: false}"
:title="inMovableList() ? '{{ trans('MediaManager::messages.add.added') }}' : '{{ trans('MediaManager::messages.add.list') }}'"
:title="inMovableList() ? '{{ trans('MediaManager::messages.add.added') }}' : '{{ trans('MediaManager::messages.add.list') }} (c / x)'"
@tap="addToMovableList()"
@dbltap="showMovableList()"
@hold="clearMovableList()">
Expand Down
8 changes: 4 additions & 4 deletions src/resources/views/partials/modal/ops.blade.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -175,10 +175,10 @@ class="button is-warning"

<section class="modal-card-body">
{{-- destination --}}
<h5 class="subtitle m-b-10">{{ trans('MediaManager::messages.destination_folder') }} :</h5>
<div class="field">
<div class="tag is-black is-medium">@{{ files.path || '/' }}</div>
</div>
<h5 class="subtitle m-b-20">
{{ trans('MediaManager::messages.destination_folder') }} :
<span class="tag is-black is-medium">@{{ files.path || '/' }}</span>
</h5>

@include('MediaManager::partials.modal.mov-files-info')
</section>
Expand Down

0 comments on commit eef70c6

Please sign in to comment.