Skip to content

Commit d879b71

Browse files
committed
modify view structure, fix grid view folder icon size
1 parent 707a1fb commit d879b71

File tree

11 files changed

+221
-349
lines changed

11 files changed

+221
-349
lines changed

src/controllers/ItemsController.php

Lines changed: 6 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ class ItemsController extends LfmController {
2020
public function getItems()
2121
{
2222
$type = Input::get('type');
23-
$view = $this->getView($type);
23+
$view = $this->getView();
2424
$path = parent::getPath();
2525

2626
$files = File::files($path);
@@ -29,7 +29,7 @@ public function getItems()
2929
$thumb_url = parent::getUrl('thumb');
3030

3131
return view($view)
32-
->with(compact('files', 'file_info', 'directories', 'thumb_url'));
32+
->with(compact('type', 'file_info', 'directories', 'thumb_url'));
3333
}
3434

3535

@@ -79,18 +79,12 @@ private function getFileInfos($files, $type = 'Images')
7979
}
8080

8181

82-
private function getView($type = 'Images')
82+
private function getView()
8383
{
84-
$view = 'laravel-filemanager::images';
85-
86-
if ($type !== 'Images') {
87-
$view = 'laravel-filemanager::files';
88-
}
89-
9084
if (Input::get('show_list') == 1) {
91-
$view .= '-list';
85+
return 'laravel-filemanager::list-view';
86+
} else {
87+
return 'laravel-filemanager::grid-view';
9288
}
93-
94-
return $view;
9589
}
9690
}

src/views/files-list.blade.php

Lines changed: 0 additions & 68 deletions
This file was deleted.

src/views/files.blade.php

Lines changed: 0 additions & 70 deletions
This file was deleted.

src/views/folders.blade.php

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
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>
6+
</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>
21+
22+
</div>
23+
</div>

src/views/grid-view.blade.php

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
<div class="row">
2+
3+
@if((sizeof($file_info) > 0) || (sizeof($directories) > 0))
4+
5+
@foreach($directories as $key => $dir_name)
6+
@include('laravel-filemanager::folders')
7+
@endforeach
8+
9+
@foreach($file_info as $key => $file)
10+
@include('laravel-filemanager::item')
11+
@endforeach
12+
13+
@else
14+
<div class="col-md-12">
15+
<p>{{ Lang::get('laravel-filemanager::lfm.message-empty') }}</p>
16+
</div>
17+
@endif
18+
19+
</div>

src/views/images-list.blade.php

Lines changed: 0 additions & 77 deletions
This file was deleted.

src/views/images.blade.php

Lines changed: 0 additions & 76 deletions
This file was deleted.

0 commit comments

Comments
 (0)