Skip to content

Commit dff9e1e

Browse files
sangnguyenplussangnguyenplus
committed
Fix issue when CMS upgrade to Bootstrap 5
1 parent 76ea780 commit dff9e1e

File tree

6 files changed

+52
-62
lines changed

6 files changed

+52
-62
lines changed

‎plugin.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
"name": "Log Viewer",
33
"namespace": "Botble\\LogViewer\\",
44
"provider": "Botble\\LogViewer\\Providers\\LogViewerServiceProvider",
5-
"author": "Sang Nguyen",
6-
"url": "https://sangnguyen.info",
7-
"version": "5.3",
5+
"author": "Botble Technologies",
6+
"url": "https://botble.com",
7+
"version": "1.1",
88
"description": "Provides a log viewer for Botble CMS"
99
}

‎public/css/log-viewer.css‎

Lines changed: 1 addition & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1 @@
1-
.table-log-viewer.table {
2-
margin-bottom: 0;
3-
}
4-
.table-log-viewer.table td {
5-
margin: 0;
6-
padding: 5px 0 !important;
7-
}
8-
.table-log-viewer.table .text-left {
9-
width: 90px;
10-
}
11-
.table-log-viewer.table .text-center {
12-
text-align: center;
13-
}
1+
.table-log-viewer.table{margin-bottom:0}.table-log-viewer.table td{margin:0;padding:5px 0!important}.table-log-viewer.table .text-left{width:90px}.table-log-viewer.table .text-center{text-align:center}

‎resources/assets/sass/log-viewer.scss‎

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,16 @@
11
.table-log-viewer.table {
2-
margin-bottom : 0;
2+
margin-bottom: 0;
3+
34
td {
4-
margin : 0;
5-
padding : 5px 0 !important;
5+
margin: 0;
6+
padding: 5px 0 !important;
67
}
8+
79
.text-left {
8-
width : 90px;
10+
width: 90px;
911
}
12+
1013
.text-center {
11-
text-align : center;
14+
text-align: center;
1215
}
13-
}
16+
}

‎resources/views/logs.blade.php‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
@extends('core/base::layouts.master')
1+
@extends(BaseHelper::getAdminMasterLayoutTemplate())
22

33
@section('content')
44
@include('plugins/log-viewer::partials.style')
@@ -68,20 +68,20 @@
6868
<div id="delete-log-modal" class="modal fade">
6969
<div class="modal-dialog">
7070
<form id="delete-log-form" action="{{ route('log-viewer::logs.destroy') }}" method="post">
71-
<input type="hidden" name="_method" value="DELETE">
72-
<input type="hidden" name="_token" value="{{ csrf_token() }}">
71+
@method('DELETE')
72+
@csrf
7373
<input type="hidden" name="date">
7474
<div class="modal-content">
7575
<div class="modal-header">
7676
<h4 class="modal-title"><i class="til_img"></i><strong>{{ trans('plugins/log-viewer::log-viewer.delete_log_file') }}</strong></h4>
77-
<button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
77+
<button type="button" class="btn-close" data-bs-dismiss="modal" aria-hidden="true"></button>
7878
</div>
7979

8080
<div class="modal-body with-padding">
8181
<p>{!! trans('plugins/log-viewer::log-viewer.confirm_delete_msg', ['date' => null]) !!}</p>
8282
</div>
8383
<div class="modal-footer">
84-
<button type="button" class="btn btn-sm btn-secondary float-left" data-dismiss="modal">{{ trans('core/base::forms.cancel') }}</button>
84+
<button type="button" class="btn btn-sm btn-secondary float-start" data-bs-dismiss="modal">{{ trans('core/base::forms.cancel') }}</button>
8585
<button type="submit" class="btn btn-sm btn-danger">{{ trans('plugins/log-viewer::log-viewer.delete_button') }}</button>
8686
</div>
8787
</div>
@@ -108,7 +108,7 @@
108108
deleteLogModal.modal('show');
109109
});
110110
111-
deleteLogForm.submit(function (event) {
111+
deleteLogForm.on('submit', function (event) {
112112
event.preventDefault();
113113
submitBtn.addClass('button-loading');
114114

‎resources/views/show.blade.php‎

Lines changed: 30 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
@extends('core/base::layouts.master')
1+
@extends(BaseHelper::getAdminMasterLayoutTemplate())
22

33
@section('content')
44
@include('plugins/log-viewer::partials.style')
@@ -11,21 +11,22 @@
1111
<div class="panel panel-default">
1212
<div class="panel-heading" style="height: 48px;line-height: 30px;">
1313
{{ trans('plugins/log-viewer::log-viewer.log_info') }} :
14-
<div class="group-btns float-right">
14+
<div class="group-btns float-end">
1515
<a href="{{ route('log-viewer::logs.download', [$log->date]) }}" class="btn btn-success">
1616
<i class="fa fa-download"></i> {{ trans('plugins/log-viewer::log-viewer.download') }}
1717
</a>
18-
<a href="#delete-log-modal" class="btn btn-danger" data-toggle="modal">
18+
<a href="#delete-log-modal" class="btn btn-danger" data-bs-toggle="modal">
1919
<i class="fa fa-trash"></i> {{ trans('plugins/log-viewer::log-viewer.delete') }}
2020
</a>
2121
</div>
22+
<div class="clearfix"></div>
2223
</div>
2324
<div class="table-responsive">
2425
<table class="table table-condensed">
2526
<thead>
2627
<tr>
2728
<td>{{ trans('plugins/log-viewer::log-viewer.file_path') }} :</td>
28-
<td colspan="5">{{ $log->getPath() }}</td>
29+
<td colspan="5"><strong>{{ $log->getPath() }}</strong></td>
2930
</tr>
3031
</thead>
3132
<tbody>
@@ -56,7 +57,7 @@
5657
@if ($entries->hasPages())
5758
<div class="panel-heading">
5859
{!! $entries->render() !!}
59-
<span class="label label-info float-right">
60+
<span class="label label-info float-end">
6061
{{ trans('plugins/log-viewer::log-viewer.page') }} {!! $entries->currentPage() !!} {{ trans('plugins/log-viewer::log-viewer.of') }} {!! $entries->lastPage() !!}
6162
</span>
6263
</div>
@@ -90,7 +91,7 @@
9091
</td>
9192
<td class="text-right">
9293
@if ($entry->hasStack())
93-
<a class="btn btn-secondary" role="button" data-toggle="collapse"
94+
<a class="btn btn-secondary" role="button" data-bs-toggle="collapse"
9495
href="#log-stack-{{ $key }}" aria-expanded="false"
9596
aria-controls="log-stack-{{ $key }}">
9697
<i class="fa fa-toggle-on"></i> {{ trans('plugins/log-viewer::log-viewer.stack') }}
@@ -115,7 +116,7 @@
115116
@if ($entries->hasPages())
116117
<div class="panel-footer">
117118
{!! $entries->render() !!}
118-
<span class="label label-info float-right">
119+
<span class="label label-info float-end">
119120
Page {!! $entries->currentPage() !!} of {!! $entries->lastPage() !!}
120121
</span>
121122
</div>
@@ -124,30 +125,29 @@
124125
</div>
125126
</div>
126127

127-
<div id="delete-log-modal" class="modal fade">
128-
<div class="modal-dialog">
129-
<form id="delete-log-form" action="{{ route('log-viewer::logs.destroy') }}" method="post">
130-
<input type="hidden" name="_method" value="DELETE">
131-
<input type="hidden" name="_token" value="{{ csrf_token() }}">
132-
<input type="hidden" name="date" value="{{ $log->date }}">
133-
<div class="modal-content">
134-
<div class="modal-header">
135-
<h4 class="modal-title"><i class="til_img"></i><strong>{{ trans('plugins/log-viewer::log-viewer.delete_log_file') }}</strong></h4>
136-
<button type="button" class="close" data-dismiss="modal" aria-label="Close">
137-
<span aria-hidden="true">&times;</span>
138-
</button>
139-
</div>
140-
<div class="modal-body">
141-
<p>{!! trans('plugins/log-viewer::log-viewer.confirm_delete_msg', ['date' => $log->date]) !!}</p>
142-
</div>
143-
<div class="modal-footer">
144-
<button type="button" class="btn btn-sm btn-secondary float-left" data-dismiss="modal">{{ trans('core/base::forms.cancel') }}</button>
145-
<button type="submit" class="btn btn-sm btn-danger">{{ trans('plugins/log-viewer::log-viewer.delete_button') }}</button>
146-
</div>
128+
<div id="delete-log-modal" class="modal fade">
129+
<div class="modal-dialog">
130+
<form id="delete-log-form" action="{{ route('log-viewer::logs.destroy') }}" method="post">
131+
@method('DELETE')
132+
@csrf
133+
<input type="hidden" name="date" value="{{ $log->date }}">
134+
<div class="modal-content">
135+
<div class="modal-header">
136+
<h4 class="modal-title"><i class="til_img"></i><strong>{{ trans('plugins/log-viewer::log-viewer.delete_log_file') }}</strong></h4>
137+
<button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close">
138+
</button>
147139
</div>
148-
</form>
149-
</div>
140+
<div class="modal-body">
141+
<p>{!! trans('plugins/log-viewer::log-viewer.confirm_delete_msg', ['date' => $log->date]) !!}</p>
142+
</div>
143+
<div class="modal-footer">
144+
<button type="button" class="btn btn-sm btn-secondary float-start" data-bs-dismiss="modal">{{ trans('core/base::forms.cancel') }}</button>
145+
<button type="submit" class="btn btn-sm btn-danger" id="delete-log-button">{{ trans('plugins/log-viewer::log-viewer.delete_button') }}</button>
146+
</div>
147+
</div>
148+
</form>
150149
</div>
150+
</div>
151151
@endsection
152152
@section('javascript')
153153
<script>
@@ -157,7 +157,7 @@
157157
var deleteLogForm = $('form#delete-log-form');
158158
var submitBtn = deleteLogForm.find('button[type=submit]');
159159
160-
deleteLogForm.submit(function (event) {
160+
deleteLogForm.on('submit', function (event) {
161161
event.preventDefault();
162162
submitBtn.addClass('button-loading');
163163

‎src/Http/Controllers/LogViewerController.php‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ public function __construct(LogViewer $logViewer)
4949
* List all logs.
5050
*
5151
* @param Request $request
52-
* @return View
52+
* @return \Illuminate\Contracts\Foundation\Application|\Illuminate\Contracts\View\Factory|\Illuminate\Contracts\View\View|View
5353
*/
5454
public function listLogs(Request $request)
5555
{
@@ -87,7 +87,7 @@ protected function paginate(array $data, Request $request)
8787
* Show the log.
8888
*
8989
* @param string $date
90-
* @return View
90+
* @return \Illuminate\Contracts\Foundation\Application|\Illuminate\Contracts\View\Factory|\Illuminate\Contracts\View\View|View
9191
*/
9292
public function show($date)
9393
{
@@ -111,15 +111,14 @@ protected function getLogOrFail($date)
111111
} catch (LogNotFoundException $ex) {
112112
abort(404, $ex->getMessage());
113113
}
114-
return null;
115114
}
116115

117116
/**
118117
* Filter the log entries by level.
119118
*
120119
* @param string $date
121120
* @param string $level
122-
* @return View|RedirectResponse
121+
* @return \Illuminate\Contracts\Foundation\Application|\Illuminate\Contracts\View\Factory|\Illuminate\Contracts\View\View|RedirectResponse|View
123122
*/
124123
public function showByLevel($date, $level)
125124
{

0 commit comments

Comments
 (0)