Skip to content

Commit 60658b7

Browse files
committed
Improve icon display; move arrays to config
1 parent 51b7473 commit 60658b7

File tree

3 files changed

+109
-17
lines changed

3 files changed

+109
-17
lines changed

src/config/lfm.php

Lines changed: 32 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,38 @@
66
'images_dir' => 'public/vendor/laravel-filemanager/images/',
77
'images_url' => '/vendor/laravel-filemanager/images/',
88

9-
'files_dir' => 'public/vendor/laravel-filemanager/files/',
10-
'files_url' => '/vendor/laravel-filemanager/files/',
9+
'files_dir' => 'public/vendor/laravel-filemanager/files/',
10+
'files_url' => '/vendor/laravel-filemanager/files/',
1111

1212
'params' => 'type=Images&CKEditor=editor&CKEditorFuncNum=1&langCode=en',
13+
14+
'type_array' => [
15+
"pdf" => "Adobe Acrobat",
16+
"docx" => "Microsoft Word",
17+
"docx" => "Microsoft Word",
18+
"xls" => "Microsoft Excel",
19+
"xls" => "Microsoft Excel",
20+
"zip" => 'Archive',
21+
"gif" => 'GIF Image',
22+
"jpg" => 'JPEG Image',
23+
"jpeg" => 'JPEG Image',
24+
"png" => 'PNG Image',
25+
"ppt" => 'Microsoft PowerPoint',
26+
"pptx" => 'Microsoft PowerPoint',
27+
],
28+
29+
'icon_array' => [
30+
"pdf" => "fa-file-pdf-o",
31+
"docx" => "fa-file-word-o",
32+
"docx" => "fa-file-word-o",
33+
"xls" => "fa-file-excel-o",
34+
"xls" => "fa-file-excel-o",
35+
"zip" => 'fa-file-archive-o',
36+
"gif" => 'fa-file-image-o',
37+
"jpg" => 'fa-file-image-o',
38+
"jpeg" => 'fa-file-image-o',
39+
"png" => 'fa-file-image-o',
40+
"ppt" => 'fa-file-powerpoint-o',
41+
"pptx" => 'fa-file-powerpoint-o',
42+
],
1343
];

src/controllers/ItemsController.php

Lines changed: 10 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,11 @@ function __construct()
3535
}
3636

3737

38+
/**
39+
* Return json list of files
40+
*
41+
* @return mixed
42+
*/
3843
public function getFiles()
3944
{
4045
if (Input::has('base'))
@@ -55,21 +60,8 @@ public function getFiles()
5560
}
5661

5762
$file_info = [];
58-
59-
$icon_array = [
60-
"pdf" => "fa-file-pdf-o",
61-
"docx" => "fa-file-word-o",
62-
"docx" => "fa-file-word-o",
63-
"xls" => "fa-file-excel-o",
64-
"xls" => "fa-file-excel-o",
65-
"zip" => 'fa-file-archive-o',
66-
"gif" => 'fa-file-image-o',
67-
"jpg" => 'fa-file-image-o',
68-
"jpeg" => 'fa-file-image-o',
69-
"png" => 'fa-file-image-o',
70-
"ppt" => 'fa-file-powerpoint-o',
71-
"pptx" => 'fa-file-powerpoint-o',
72-
];
63+
$icon_array = Config::get('lfm.icon_array');
64+
$type_array = Config::get('lfm.type_array');
7365

7466
foreach ($files as $file)
7567
{
@@ -80,9 +72,11 @@ public function getFiles()
8072
if (array_key_exists($extension, $icon_array))
8173
{
8274
$icon = $icon_array[$extension];
75+
$type = $type_array[$extension];
8376
} else
8477
{
8578
$icon = "fa-file";
79+
$type= "File";
8680
}
8781

8882
$file_created = filemtime($file);
@@ -94,6 +88,7 @@ public function getFiles()
9488
'type' => $file_type,
9589
'extension' => $extension,
9690
'icon' => $icon,
91+
'type' => $type,
9792
];
9893
}
9994

src/views/files-list.blade.php

Lines changed: 67 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,67 @@
1+
<div class="container">
2+
@if((sizeof($file_info) > 0) || (sizeof($directories) > 0))
3+
<table class="table table-condensed table-striped">
4+
<thead>
5+
<tr>
6+
<th>Item</th>
7+
<th>Size</th>
8+
<th>Type</th>
9+
<th>Modified</th>
10+
<th>Action</th>
11+
</tr>
12+
</thead>
13+
<tbody>
14+
@foreach($directories as $key => $dir)
15+
<tr>
16+
<td>
17+
<i class="fa fa-folder-o"></i>
18+
<a id="large_folder_{{ $key }}" href="javascript:clickFolder('large_folder_{{ $key }}',1)"
19+
data-id="{{ $dir }}">
20+
{!! basename($dir) !!}
21+
</a>
22+
</td>
23+
<td></td>
24+
<td>Folder</td>
25+
<td></td>
26+
<td></td>
27+
</tr>
28+
@endforeach
29+
30+
@foreach($file_info as $file)
31+
<tr>
32+
<td>
33+
<i class="fa <?= $file['icon']; ?>"></i>
34+
<a href="javascript:useFile('<?= basename($file['name']) ?>')">
35+
{!! basename($file['name']) !!}
36+
</a>
37+
&nbsp;&nbsp;
38+
<a href="javascript:rename('<?= basename($file['name']) ?>')">
39+
<i class="fa fa-edit"></i>
40+
</a>
41+
</td>
42+
<td>
43+
{!! $file['size'] !!}
44+
</td>
45+
<td>
46+
{!! $file['type'] !!}
47+
</td>
48+
<td>
49+
{!! date("Y-m-d h:m", $file['created']) !!}
50+
</td>
51+
<td>
52+
<a href="javascript:trash('<?= basename($file['name']) ?>')">
53+
<i class="fa fa-trash fa-fw"></i>
54+
</a>
55+
</td>
56+
</tr>
57+
@endforeach
58+
</tbody>
59+
</table>
60+
61+
@else
62+
<div class="col-md-12">
63+
<p>Folder is empty.</p>
64+
</div>
65+
@endif
66+
67+
</div>

0 commit comments

Comments
 (0)