Skip to content

Commit 5977687

Browse files
committed
refactor script.blade.php, update bootbox version
1 parent 0f149c1 commit 5977687

File tree

5 files changed

+105
-201
lines changed

5 files changed

+105
-201
lines changed

src/controllers/LfmController.php

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,9 +38,11 @@ public function show()
3838
}
3939

4040
return view('laravel-filemanager::index')->with([
41+
'url_prefix' => config('lfm.' . $type_key . 's_url'),
4142
'working_dir' => $this->rootFolder($default_folder_type),
4243
'file_type' => $this->currentLfmType(true),
43-
'startup_view' => config('lfm.' . $this->currentLfmType() . '_startup_view'),
44+
'startup_view' => config('lfm.' . $type_key . '_startup_view'),
45+
'lang' => trans('laravel-filemanager::lfm'),
4446
'no_extension' => ! extension_loaded('gd') && ! extension_loaded('imagick'),
4547
'config_error' => $config_error
4648
]);

src/views/crop.blade.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
<div class="row fill">
2-
<div class="col-md-8 fill">
1+
<div class="row">
2+
<div class="col-md-8">
33
<div class="crop-container">
44
<img src="{{ asset($img) }}" class="img img-responsive">
55
</div>
66
</div>
7-
<div class="col-md-4 fill">
7+
<div class="col-md-4">
88
<div class="text-center">
99

1010
<div class="img-preview center-block"></div>
@@ -63,4 +63,4 @@ function performCrop() {
6363
loadItems();
6464
});
6565
}
66-
</script>
66+
</script>

src/views/index.blade.php

Lines changed: 1 addition & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -122,27 +122,10 @@
122122
</div>
123123
</div>
124124

125-
<div class="modal fade" id="fileViewModal" tabindex="-1" role="dialog" aria-labelledby="fileLabel" aria-hidden="true">
126-
<div class="modal-dialog modal-lg">
127-
<div class="modal-content">
128-
<div class="modal-header">
129-
<button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
130-
<h4 class="modal-title" id="fileLabel">{{ Lang::get('laravel-filemanager::lfm.title-view') }}</h4>
131-
</div>
132-
<div class="modal-body" id="fileview_body">
133-
134-
</div>
135-
<div class="modal-footer">
136-
<button type="button" class="btn btn-default" data-dismiss="modal">{{ Lang::get('laravel-filemanager::lfm.btn-close') }}</button>
137-
</div>
138-
</div>
139-
</div>
140-
</div>
141-
142125
<script src="//cdnjs.cloudflare.com/ajax/libs/jquery/1.11.2/jquery.min.js"></script>
143126
<script src="//cdnjs.cloudflare.com/ajax/libs/jquery-migrate/1.4.0/jquery-migrate.min.js"></script>
144127
<script src="//maxcdn.bootstrapcdn.com/bootstrap/3.3.4/js/bootstrap.min.js"></script>
145-
<script src="//cdnjs.cloudflare.com/ajax/libs/bootbox.js/4.3.0/bootbox.js"></script>
128+
<script src="//cdnjs.cloudflare.com/ajax/libs/bootbox.js/4.4.0/bootbox.min.js"></script>
146129
<script src="//cdnjs.cloudflare.com/ajax/libs/jqueryui/1.11.2/jquery-ui.min.js"></script>
147130
<script src="{{ asset('vendor/laravel-filemanager/js/cropper.min.js') }}"></script>
148131
<script src="{{ asset('vendor/laravel-filemanager/js/jquery.form.min.js') }}"></script>

src/views/resize.blade.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
<div class="container">
2-
<div class="row fill">
3-
<div class="col-md-8 fill" id="containment">
2+
<div class="row">
3+
<div class="col-md-8" id="containment">
44
<img id="resize" src="{{ asset($img) }}" height="{{ $height }}" width="{{ $width }}">
55
</div>
6-
<div class="col-md-4 fill">
6+
<div class="col-md-4">
77

88
<table class="table table-compact table-striped">
99
<thead></thead>

0 commit comments

Comments
 (0)