Skip to content

Commit 88f46d3

Browse files
streamtwstreamtw
committed
fix folder name in list view
1 parent bc82212 commit 88f46d3

File tree

5 files changed

+52
-41
lines changed

5 files changed

+52
-41
lines changed

‎src/controllers/ItemsController.php‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -91,8 +91,11 @@ private function getDirectories($path, $type = 'Images')
9191
$directories = [];
9292

9393
foreach ($all_directories as $directory) {
94-
if ($type !== 'Files' && basename($directory) !== 'thumbs') {
95-
$directories[] = basename($directory);
94+
$path_parts = explode('/', $directory);
95+
$dir_name = end($path_parts);
96+
97+
if ($type !== 'Files' && $dir_name !== 'thumbs') {
98+
$directories[] = $dir_name;
9699
}
97100
}
98101

@@ -118,7 +121,6 @@ private function getFileInfos($files, $type = 'Images')
118121

119122
if ($type === 'Images') {
120123
$file_type = File::mimeType($file);
121-
$extension = '';
122124
$icon = '';
123125
} else {
124126
$extension = strtolower(File::extension($file_name));
@@ -140,7 +142,6 @@ private function getFileInfos($files, $type = 'Images')
140142
'size' => $file_size,
141143
'created' => $file_created,
142144
'type' => $file_type,
143-
'extension' => $extension,
144145
'icon' => $icon,
145146
];
146147
}

‎src/views/files-list.blade.php‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
<div class="container">
2+
23
@if((sizeof($file_info) > 0) || (sizeof($directories) > 0))
34
<table class="table table-condensed table-striped">
45
<thead>
@@ -9,12 +10,12 @@
910
<th>{{ Lang::get('laravel-filemanager::lfm.title-action') }}</th>
1011
</thead>
1112
<tbody>
12-
@foreach($directories as $key => $dir)
13+
@foreach($directories as $key => $dir_name)
1314
<tr>
1415
<td>
1516
<i class="fa fa-folder-o"></i>
16-
<a id="large_folder_{{ $key }}" data-id="{{ $dir }}" href="javascript:clickFolder('large_folder_{{ $key }}',1)">
17-
{{ basename($dir) }}
17+
<a id="large_folder_{{ $key }}" data-id="{{ $dir_name }}" href="javascript:clickFolder('large_folder_{{ $key }}',1)">
18+
{{ $dir_name }}
1819
</a>
1920
</td>
2021
<td></td>
@@ -57,9 +58,11 @@
5758
</table>
5859

5960
@else
61+
<div class="row">
6062
<div class="col-md-12">
6163
<p>{{ Lang::get('laravel-filemanager::lfm.message-empty') }}</p>
6264
</div>
65+
</div>
6366
@endif
6467

6568
</div>

‎src/views/files.blade.php‎

Lines changed: 17 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -3,25 +3,25 @@
33

44
@if((sizeof($files) > 0) || (sizeof($directories) > 0))
55

6-
@foreach($directories as $key => $dir)
6+
@foreach($directories as $key => $dir_name)
77
<div class="col-sm-6 col-md-2">
8-
<div class="thumbnail text-center" data-id="{{ basename($dir) }}">
9-
<a id="folder_{{ $key }}" data-id="{{ $dir }}" onclick="clickFolder('folder_{{ $key }}',0)" class="folder-icon pointer">
8+
<div class="thumbnail text-center" data-id="{{ $dir_name }}">
9+
<a id="folder_{{ $key }}" data-id="{{ $dir_name }}" onclick="clickFolder('folder_{{ $key }}',0)" class="folder-icon pointer">
1010
<img src="/vendor/laravel-filemanager/img/folder.jpg">
1111
</a>
1212
</div>
1313
<div class="caption text-center">
1414
<div class="btn-group">
1515
<button type="button" onclick="clickFolder('folder_{{ $key }}',0)" class="btn btn-default btn-xs">
16-
{{ str_limit(basename($dir), $limit = 10, $end = '...') }}
16+
{{ str_limit($dir_name, $limit = 10, $end = '...') }}
1717
</button>
1818
<button type="button" class="btn btn-default dropdown-toggle btn-xs" data-toggle="dropdown" aria-expanded="false">
1919
<span class="caret"></span>
2020
<span class="sr-only">Toggle Dropdown</span>
2121
</button>
2222
<ul class="dropdown-menu" role="menu">
23-
<li><a href="javascript:rename('{{ basename($dir) }}')">{{ Lang::get('laravel-filemanager::lfm.menu-rename') }}</a></li>
24-
<li><a href="javascript:trash('{{ basename($dir) }}')">{{ Lang::get('laravel-filemanager::lfm.menu-delete') }}</a></li>
23+
<li><a href="javascript:rename('{{ $dir_name }}')">{{ Lang::get('laravel-filemanager::lfm.menu-rename') }}</a></li>
24+
<li><a href="javascript:trash('{{ $dir_name }}')">{{ Lang::get('laravel-filemanager::lfm.menu-delete') }}</a></li>
2525
</ul>
2626
</div>
2727

@@ -31,31 +31,33 @@
3131

3232
@foreach($file_info as $key => $file)
3333

34+
<?php $file_name = $file_info[$key]['name'];?>
35+
3436
<div class="col-sm-6 col-md-2 img-row">
3537

36-
<div class="thumbnail thumbnail-img text-center" style="border: none;" data-id="{{ $file_info[$key]['name'] }}" id="img_thumbnail_{{ $key }}">
38+
<div class="thumbnail thumbnail-img text-center" style="border: none;" data-id="{{ $file_name }}" id="img_thumbnail_{{ $key }}">
3739
<i class="fa {{ $file['icon'] }} fa-5x" style="cursor:pointer;" onclick="useFile('{{ basename($file) }}')"></i>
3840
</div>
3941

4042
<div class="caption text-center">
4143
<div class="btn-group ">
42-
<button type="button" onclick="useFile('{{ $file_info[$key]['name'] }}')" class="btn btn-default btn-xs">
43-
{{ str_limit($file_info[$key]['name'], $limit = 10, $end = '...') }}
44+
<button type="button" onclick="useFile('{{ $file_name }}')" class="btn btn-default btn-xs">
45+
{{ str_limit($file_name, $limit = 10, $end = '...') }}
4446
</button>
4547
<button type="button" class="btn btn-default dropdown-toggle btn-xs" data-toggle="dropdown" aria-expanded="false">
4648
<span class="caret"></span>
4749
<span class="sr-only">Toggle Dropdown</span>
4850
</button>
4951
<ul class="dropdown-menu" role="menu">
50-
<li><a href="javascript:rename('{{ $file_info[$key]['name'] }}')">{{ Lang::get('laravel-filemanager::lfm.menu-rename') }}</a></li>
51-
<li><a href="javascript:fileView('{{ $file_info[$key]['name'] }}')">{{ Lang::get('laravel-filemanager::lfm.menu-view') }}</a></li>
52-
<li><a href="javascript:download('{{ $file_info[$key]['name'] }}')">{{ Lang::get('laravel-filemanager::lfm.menu-download') }}</a></li>
52+
<li><a href="javascript:rename('{{ $file_name }}')">{{ Lang::get('laravel-filemanager::lfm.menu-rename') }}</a></li>
53+
<li><a href="javascript:fileView('{{ $file_name }}')">{{ Lang::get('laravel-filemanager::lfm.menu-view') }}</a></li>
54+
<li><a href="javascript:download('{{ $file_name }}')">{{ Lang::get('laravel-filemanager::lfm.menu-download') }}</a></li>
5355
<li class="divider"></li>
5456
{{--<li><a href="javascript:notImp()">Rotate</a></li>--}}
55-
<li><a href="javascript:resizeImage('{{ $file_info[$key]['name'] }}')">{{ Lang::get('laravel-filemanager::lfm.menu-resize') }}</a></li>
56-
<li><a href="javascript:cropImage('{{ $file_info[$key]['name'] }}')">{{ Lang::get('laravel-filemanager::lfm.menu-crop') }}</a></li>
57+
<li><a href="javascript:resizeImage('{{ $file_name }}')">{{ Lang::get('laravel-filemanager::lfm.menu-resize') }}</a></li>
58+
<li><a href="javascript:cropImage('{{ $file_name }}')">{{ Lang::get('laravel-filemanager::lfm.menu-crop') }}</a></li>
5759
<li class="divider"></li>
58-
<li><a href="javascript:trash('{{ $file_info[$key]['name'] }}')">{{ Lang::get('laravel-filemanager::lfm.menu-delete') }}</a></li>
60+
<li><a href="javascript:trash('{{ $file_name }}')">{{ Lang::get('laravel-filemanager::lfm.menu-delete') }}</a></li>
5961
</ul>
6062
</div>
6163
</div>

‎src/views/images-list.blade.php‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
<div class="container">
2+
23
@if((sizeof($file_info) > 0) || (sizeof($directories) > 0))
34
<table class="table table-condensed table-striped">
45
<thead>
@@ -9,12 +10,12 @@
910
<th>{{ Lang::get('laravel-filemanager::lfm.title-action') }}</th>
1011
</thead>
1112
<tbody>
12-
@foreach($directories as $key => $dir)
13+
@foreach($directories as $key => $dir_name)
1314
<tr>
1415
<td>
1516
<i class="fa fa-folder-o"></i>
16-
<a id="large_folder_{{ $key }}" data-id="{{ $dir }}" href="javascript:clickFolder('large_folder_{{ $key }}',1)">
17-
{{ basename($dir) }}
17+
<a id="large_folder_{{ $key }}" data-id="{{ $dir_name }}" href="javascript:clickFolder('large_folder_{{ $key }}',1)">
18+
{{ $dir_name }}
1819
</a>
1920
</td>
2021
<td></td>
@@ -66,9 +67,11 @@
6667
</table>
6768

6869
@else
70+
<div class="row">
6971
<div class="col-md-12">
7072
<p>{{ Lang::get('laravel-filemanager::lfm.message-empty') }}</p>
7173
</div>
74+
</div>
7275
@endif
7376

7477
</div>

‎src/views/images.blade.php‎

Lines changed: 18 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -3,26 +3,26 @@
33

44
@if((sizeof($files) > 0) || (sizeof($directories) > 0))
55

6-
@foreach($directories as $key => $dir)
6+
@foreach($directories as $key => $dir_name)
77
<div class="col-sm-6 col-md-2">
8-
<div class="thumbnail text-center" data-id="{{ basename($dir) }}">
9-
<a id="folder_{{ $key }}" data-id="{{ $dir }}" onclick="clickFolder('folder_{{ $key }}',0)" class="folder-icon pointer">
8+
<div class="thumbnail text-center" data-id="{{ $dir_name }}">
9+
<a id="folder_{{ $key }}" data-id="{{ $dir_name }}" onclick="clickFolder('folder_{{ $key }}',0)" class="folder-icon pointer">
1010
{{--<i class="fa fa-folder-o fa-5x"></i>--}}
1111
<img src="/vendor/laravel-filemanager/img/folder.jpg">
1212
</a>
1313
</div>
1414
<div class="caption text-center">
1515
<div class="btn-group">
1616
<button type="button" onclick="clickFolder('folder_{{ $key }}',0)" class="btn btn-default btn-xs">
17-
{{ str_limit(basename($dir), $limit = 10, $end = '...') }}
17+
{{ str_limit($dir_name, $limit = 10, $end = '...') }}
1818
</button>
1919
<button type="button" class="btn btn-default dropdown-toggle btn-xs" data-toggle="dropdown" aria-expanded="false">
2020
<span class="caret"></span>
2121
<span class="sr-only">Toggle Dropdown</span>
2222
</button>
2323
<ul class="dropdown-menu" role="menu">
24-
<li><a href="javascript:rename('{{ basename($dir) }}')">{{ Lang::get('laravel-filemanager::lfm.menu-rename') }}</a></li>
25-
<li><a href="javascript:trash('{{ basename($dir) }}')">{{ Lang::get('laravel-filemanager::lfm.menu-delete') }}</a></li>
24+
<li><a href="javascript:rename('{{ $dir_name }}')">{{ Lang::get('laravel-filemanager::lfm.menu-rename') }}</a></li>
25+
<li><a href="javascript:trash('{{ $dir_name }}')">{{ Lang::get('laravel-filemanager::lfm.menu-delete') }}</a></li>
2626
</ul>
2727
</div>
2828

@@ -32,31 +32,33 @@
3232

3333
@foreach($files as $key => $file)
3434

35+
<?php $file_name = $file_info[$key]['name'];?>
36+
3537
<div class="col-sm-6 col-md-2 img-row">
3638

37-
<div class="thumbnail thumbnail-img" data-id="{{ $file_info[$key]['name'] }}" id="img_thumbnail_{{ $key }}">
38-
<img id="{{ $file }}" src="{{ $dir_location }}{{ $base }}/thumbs/{{ $file_info[$key]['name'] }}?r={{ str_random(40) }}" alt="" style="cursor:pointer;" onclick="useFile('{{ $file_info[$key]['name'] }}')">
39+
<div class="thumbnail thumbnail-img" data-id="{{ $file_name }}" id="img_thumbnail_{{ $key }}">
40+
<img id="{{ $file }}" src="{{ $dir_location }}{{ $base }}/thumbs/{{ $file_name }}?r={{ str_random(40) }}" alt="" style="cursor:pointer;" onclick="useFile('{{ $file_name }}')">
3941
</div>
4042

4143
<div class="caption text-center">
4244
<div class="btn-group ">
43-
<button type="button" onclick="useFile('{{ $file_info[$key]['name'] }}')" class="btn btn-default btn-xs">
44-
{{ str_limit($file_info[$key]['name'], $limit = 10, $end = '...') }}
45+
<button type="button" onclick="useFile('{{ $file_name }}')" class="btn btn-default btn-xs">
46+
{{ str_limit($file_name, $limit = 10, $end = '...') }}
4547
</button>
4648
<button type="button" class="btn btn-default dropdown-toggle btn-xs" data-toggle="dropdown" aria-expanded="false">
4749
<span class="caret"></span>
4850
<span class="sr-only">Toggle Dropdown</span>
4951
</button>
5052
<ul class="dropdown-menu" role="menu">
51-
<li><a href="javascript:rename('{{ $file_info[$key]['name'] }}')">{{ Lang::get('laravel-filemanager::lfm.menu-rename') }}</a></li>
52-
<li><a href="javascript:fileView('{{ $file_info[$key]['name'] }}')">{{ Lang::get('laravel-filemanager::lfm.menu-view') }}</a></li>
53-
<li><a href="javascript:download('{{ $file_info[$key]['name'] }}')">{{ Lang::get('laravel-filemanager::lfm.menu-download') }}</a></li>
53+
<li><a href="javascript:rename('{{ $file_name }}')">{{ Lang::get('laravel-filemanager::lfm.menu-rename') }}</a></li>
54+
<li><a href="javascript:fileView('{{ $file_name }}')">{{ Lang::get('laravel-filemanager::lfm.menu-view') }}</a></li>
55+
<li><a href="javascript:download('{{ $file_name }}')">{{ Lang::get('laravel-filemanager::lfm.menu-download') }}</a></li>
5456
<li class="divider"></li>
5557
{{--<li><a href="javascript:notImp()">Rotate</a></li>--}}
56-
<li><a href="javascript:resizeImage('{{ $file_info[$key]['name'] }}')">{{ Lang::get('laravel-filemanager::lfm.menu-resize') }}</a></li>
57-
<li><a href="javascript:cropImage('{{ $file_info[$key]['name'] }}')">{{ Lang::get('laravel-filemanager::lfm.menu-crop') }}</a></li>
58+
<li><a href="javascript:resizeImage('{{ $file_name }}')">{{ Lang::get('laravel-filemanager::lfm.menu-resize') }}</a></li>
59+
<li><a href="javascript:cropImage('{{ $file_name }}')">{{ Lang::get('laravel-filemanager::lfm.menu-crop') }}</a></li>
5860
<li class="divider"></li>
59-
<li><a href="javascript:trash('{{ $file_info[$key]['name'] }}')">{{ Lang::get('laravel-filemanager::lfm.menu-delete') }}</a></li>
61+
<li><a href="javascript:trash('{{ $file_name }}')">{{ Lang::get('laravel-filemanager::lfm.menu-delete') }}</a></li>
6062
</ul>
6163
</div>
6264
</div>

0 commit comments

Comments
 (0)