Skip to content

Commit fca7b85

Browse files
streamtwstreamtw
committed
refactor html structure in blades
1 parent 66a03c3 commit fca7b85

File tree

11 files changed

+193
-222
lines changed

11 files changed

+193
-222
lines changed

‎public/css/lfm.css‎

Lines changed: 31 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -1,69 +1,60 @@
1-
html, body {
2-
height: 100%;
1+
#wrapper {
2+
height: 100vh;
3+
margin-bottom: 0px;
34
}
45

5-
.img-row {
6-
overflow: visible;
7-
margin-bottom: 10px;
8-
}
9-
10-
.container {
11-
height: 100%;
12-
margin-left: 5px;
13-
margin-right: 5px;
14-
width: 99%;
15-
}
16-
17-
.fill {
18-
height: 100%;
19-
min-height: 100%;
20-
}
21-
22-
.wrapper {
23-
height: 100%;
24-
}
25-
26-
#lfm-leftcol {
27-
min-height: 80%;
6+
#tree {
7+
height: calc(100vh - 70px);
288
}
299

30-
#right-nav {
31-
border-left: 1px solid silver;
32-
height: 90%;
33-
min-height: 90%;
10+
#main {
11+
border-left: 1px solid silver;
3412
}
3513

3614
#content {
37-
overflow: auto;
15+
height: calc(100vh - 140px);
16+
overflow: scroll;
3817
}
3918

40-
#tree1 {
41-
margin-left: 5px;
19+
.img-row {
20+
margin-bottom: 10px;
4221
}
4322

44-
.pointer {
45-
cursor: pointer;
23+
.clickable {
24+
cursor: pointer;
4625
}
4726

4827
.img-preview {
49-
background-color: #f7f7f7;
50-
overflow: hidden;
51-
width: 100%;
52-
text-align: center;
53-
height: 200px;
28+
background-color: #f7f7f7;
29+
overflow: hidden;
30+
width: 100%;
31+
text-align: center;
32+
height: 200px;
5433
}
5534

5635
.hidden {
57-
display: none;
36+
display: none;
37+
}
38+
39+
.thumbnail {
40+
max-width: 210px;
41+
max-height: 210px;
5842
}
5943

6044
.square {
45+
width: 100%;
46+
padding-bottom: 100%;
47+
position: relative;
48+
}
49+
.square > img, .square > .icon-container {
6150
position: absolute;
6251
top: 0;
6352
right: 0;
6453
bottom: 0;
6554
left: 0;
55+
max-width: 100%;
6656
}
57+
6758
.icon-container {
6859
width: 100%;
6960
height: 100%;

‎src/controllers/FolderController.php‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ public function getFolders()
2424
$shared_folders = parent::getDirectories($share_path);
2525

2626
return view('laravel-filemanager::tree')
27+
->with('allow_multi_user', parent::allowMultiUser())
2728
->with('user_dir', $lfm_user_path['long'])
2829
->with('dirs', $user_folders)
2930
->with('share_dir', $lfm_share_path['long'])

‎src/controllers/ItemsController.php‎

Lines changed: 23 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -15,25 +15,21 @@ class ItemsController extends LfmController
1515
*/
1616
public function getItems()
1717
{
18-
$type = $this->currentLfmType(true);
19-
$view = $this->getView();
2018
$path = parent::getCurrentPath();
2119

22-
$files = File::files($path);
23-
$file_info = $this->getFileInfos($files);
24-
$directories = parent::getDirectories($path);
25-
$thumb_url = parent::getThumbUrl();
26-
27-
return view($view)
28-
->with(compact('type', 'file_info', 'directories', 'thumb_url'));
20+
return view($this->getView())->with([
21+
'type' => $this->currentLfmType(true),
22+
'files' => $this->getFilesWithInfo($path),
23+
'directories' => parent::getDirectories($path)
24+
]);
2925
}
3026

3127

32-
private function getFileInfos($files)
28+
private function getFilesWithInfo($path)
3329
{
34-
$file_info = [];
30+
$arr_files = [];
3531

36-
foreach ($files as $key => $file) {
32+
foreach (File::files($path) as $key => $file) {
3733
$file_name = parent::getFileName($file)['short'];
3834
$file_created = filemtime($file);
3935
$file_size = number_format((File::size($file) / 1024), 2, ".", "");
@@ -46,7 +42,7 @@ private function getFileInfos($files)
4642

4743
if ($this->isProcessingImages()) {
4844
$file_type = File::mimeType($file);
49-
$icon = '';
45+
$icon = 'fa-image';
5046
} else {
5147
$extension = strtolower(File::extension($file_name));
5248

@@ -62,25 +58,35 @@ private function getFileInfos($files)
6258
}
6359
}
6460

65-
$file_info[$key] = [
61+
if (realpath(parent::getThumbPath($file_name)) !== false) {
62+
$thumb_url = parent::getThumbUrl($file_name);
63+
} else {
64+
$thumb_url = null;
65+
}
66+
67+
68+
$arr_files[$key] = [
6669
'name' => $file_name,
6770
'size' => $file_size,
6871
'created' => $file_created,
6972
'type' => $file_type,
7073
'icon' => $icon,
74+
'thumb' => $thumb_url
7175
];
7276
}
7377

74-
return $file_info;
78+
return $arr_files;
7579
}
7680

7781

7882
private function getView()
7983
{
8084
if (request('show_list') == 1) {
81-
return 'laravel-filemanager::list-view';
85+
$view_type = 'list';
8286
} else {
83-
return 'laravel-filemanager::grid-view';
87+
$view_type = 'grid';
8488
}
89+
90+
return 'laravel-filemanager::' . $view_type . '-view';
8591
}
8692
}

‎src/lang/en/lfm.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99

1010
'menu-rename' => 'Rename',
1111
'menu-delete' => 'Delete',
12-
'menu-view' => 'View',
12+
'menu-view' => 'Preview',
1313
'menu-download' => 'Download',
1414
'menu-resize' => 'Resize',
1515
'menu-crop' => 'Crop',

‎src/views/folders.blade.php‎

Lines changed: 20 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,24 @@
1-
<div class="col-sm-4 col-md-3 col-lg-2">
2-
<div class="thumbnail text-center" data-id="{{ $dir_name['long'] }}">
3-
<a data-id="{{ $dir_name['long'] }}" class="folder-icon pointer folder-item">
4-
<img src="{{ asset('vendor/laravel-filemanager/img/folder.png') }}" style='max-height:200px;'>
5-
</a>
1+
<?php $folder_name = $dir_name['short']; ?>
2+
<?php $folder_path = $dir_name['long']; ?>
3+
4+
<div class="thumbnail clickable">
5+
<div data-id="{{ $folder_path }}" class="folder-item square">
6+
<img src="{{ asset('vendor/laravel-filemanager/img/folder.png') }}">
67
</div>
7-
<div class="caption text-center">
8-
<div class="btn-group">
9-
<button type="button" data-id="{{ $dir_name['long'] }}" class="btn btn-default btn-xs folder-item">
10-
{{ str_limit($dir_name['short'], $limit = 10, $end = '...') }}
11-
</button>
12-
<button type="button" class="btn btn-default dropdown-toggle btn-xs" data-toggle="dropdown" aria-expanded="false">
13-
<span class="caret"></span>
14-
<span class="sr-only">Toggle Dropdown</span>
15-
</button>
16-
<ul class="dropdown-menu" role="menu">
17-
<li><a href="javascript:rename('{{ $dir_name['short'] }}')"><i class="fa fa-edit fa-fw"></i> {{ Lang::get('laravel-filemanager::lfm.menu-rename') }}</a></li>
18-
<li><a href="javascript:trash('{{ $dir_name['short'] }}')"><i class="fa fa-trash fa-fw"></i> {{ Lang::get('laravel-filemanager::lfm.menu-delete') }}</a></li>
19-
</ul>
20-
</div>
8+
</div>
219

10+
<div class="caption text-center">
11+
<div class="btn-group">
12+
<button type="button" data-id="{{ $folder_path }}" class="btn btn-default btn-xs folder-item">
13+
{{ str_limit($folder_name, $limit = 10, $end = '...') }}
14+
</button>
15+
<button type="button" class="btn btn-default dropdown-toggle btn-xs" data-toggle="dropdown" aria-expanded="false">
16+
<span class="caret"></span>
17+
<span class="sr-only">Toggle Dropdown</span>
18+
</button>
19+
<ul class="dropdown-menu" role="menu">
20+
<li><a href="javascript:rename('{{ $folder_name }}')"><i class="fa fa-edit fa-fw"></i> {{ Lang::get('laravel-filemanager::lfm.menu-rename') }}</a></li>
21+
<li><a href="javascript:trash('{{ $folder_name }}')"><i class="fa fa-trash fa-fw"></i> {{ Lang::get('laravel-filemanager::lfm.menu-delete') }}</a></li>
22+
</ul>
2223
</div>
2324
</div>

‎src/views/grid-view.blade.php‎

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,17 @@
11
<div class="row">
22

3-
@if((sizeof($file_info) > 0) || (sizeof($directories) > 0))
3+
@if((sizeof($files) > 0) || (sizeof($directories) > 0))
44

55
@foreach($directories as $key => $dir_name)
6-
@include('laravel-filemanager::folders')
6+
<div class="col-sm-4 col-md-3 col-lg-2 img-row">
7+
@include('laravel-filemanager::folders')
8+
</div>
79
@endforeach
810

9-
@foreach($file_info as $key => $file)
10-
@include('laravel-filemanager::item')
11+
@foreach($files as $key => $file)
12+
<div class="col-sm-4 col-md-3 col-lg-2 img-row">
13+
@include('laravel-filemanager::item')
14+
</div>
1115
@endforeach
1216

1317
@else

0 commit comments

Comments
 (0)