Skip to content

Commit fad77d4

Browse files
jeremykenedyjeremykenedy
authored
Merge pull request #174 from KalimeroMK/master
laravellux/html remove
2 parents 20aa6fb + 84a3b76 commit fad77d4

File tree

5 files changed

+37
-32
lines changed

5 files changed

+37
-32
lines changed

‎composer.json‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,7 @@
1919
"minimum-stability": "dev",
2020
"require": {
2121
"php": ">=7.3.0|^8.0",
22-
"jaybizzle/laravel-crawler-detect": "1.*",
23-
"laravellux/html": "^7.1"
22+
"jaybizzle/laravel-crawler-detect": "1.*"
2423
},
2524
"autoload": {
2625
"psr-4": {

‎src/resources/views/forms/clear-activity-log.blade.php‎

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,7 @@
1-
{!! Form::open(array('route' => 'clear-activity')) !!}
2-
{!! Form::hidden('_method', 'DELETE') !!}
3-
{!! Form::button('<i class="fa fa-fw fa-trash" aria-hidden="true"></i>' . trans('LaravelLogger::laravel-logger.dashboard.menu.clear'), array('type' => 'button', 'data-toggle' => 'modal', 'data-target' => '#confirmDelete', 'data-title' => trans('LaravelLogger::laravel-logger.modals.clearLog.title'),'data-message' => trans('LaravelLogger::laravel-logger.modals.clearLog.message'), 'class' => 'dropdown-item')) !!}
4-
{!! Form::close() !!}
1+
<form action="{{ route('clear-activity') }}" method="POST">
2+
@csrf
3+
@method('DELETE')
4+
<button type="button" data-toggle="modal" data-target="#confirmDelete" data-title="{{ trans('LaravelLogger::laravel-logger.modals.clearLog.title') }}" data-message="{{ trans('LaravelLogger::laravel-logger.modals.clearLog.message') }}" class="dropdown-item">
5+
<i class="fa fa-fw fa-trash" aria-hidden="true"></i>{{ trans('LaravelLogger::laravel-logger.dashboard.menu.clear') }}
6+
</button>
7+
</form>

‎src/resources/views/forms/delete-activity-log.blade.php‎

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,7 @@
1-
{!! Form::open(array('route' => 'destroy-activity', 'class' => 'mb-0')) !!}
2-
{!! Form::hidden('_method', 'DELETE') !!}
3-
{!! Form::button('<i class="fa fa-fw fa-eraser" aria-hidden="true"></i>' . trans('LaravelLogger::laravel-logger.dashboardCleared.menu.deleteAll'), array('type' => 'button', 'class' => 'text-danger dropdown-item', 'data-toggle' => 'modal', 'data-target' => '#confirmDelete', 'data-title' => trans('LaravelLogger::laravel-logger.modals.deleteLog.title'),'data-message' => trans('LaravelLogger::laravel-logger.modals.deleteLog.message'))) !!}
4-
{!! Form::close() !!}
1+
<form action="{{ route('destroy-activity') }}" method="POST" class="mb-0">
2+
@csrf
3+
@method('DELETE')
4+
<button type="button" class="text-danger dropdown-item" data-toggle="modal" data-target="#confirmDelete" data-title="{{ trans('LaravelLogger::laravel-logger.modals.deleteLog.title') }}" data-message="{{ trans('LaravelLogger::laravel-logger.modals.deleteLog.message') }}">
5+
<i class="fa fa-fw fa-eraser" aria-hidden="true"></i>{{ trans('LaravelLogger::laravel-logger.dashboardCleared.menu.deleteAll') }}
6+
</button>
7+
</form>

‎src/resources/views/forms/restore-activity-log.blade.php‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1-
{!! Form::open(array('route' => 'restore-activity', 'method' => 'POST', 'class' => 'mb-0')) !!}
2-
{!! Form::button('<i class="fa fa-fw fa-history" aria-hidden="true"></i>' . trans('LaravelLogger::laravel-logger.dashboardCleared.menu.restoreAll'), array('type' => 'button', 'class' => 'text-success dropdown-item', 'data-toggle' => 'modal', 'data-target' => '#confirmRestore', 'data-title' => trans('LaravelLogger::laravel-logger.modals.restoreLog.title'),'data-message' => trans('LaravelLogger::laravel-logger.modals.restoreLog.message'))) !!}
3-
{!! Form::close() !!}
1+
<form action="{{ route('restore-activity') }}" method="POST" class="mb-0">
2+
@csrf
3+
<button type="button" class="text-success dropdown-item" data-toggle="modal" data-target="#confirmRestore" data-title="{{ trans('LaravelLogger::laravel-logger.modals.restoreLog.title') }}" data-message="{{ trans('LaravelLogger::laravel-logger.modals.restoreLog.message') }}">
4+
<i class="fa fa-fw fa-history" aria-hidden="true"></i>{{ trans('LaravelLogger::laravel-logger.dashboardCleared.menu.restoreAll') }}
5+
</button>
6+
</form>

‎src/resources/views/modals/confirm-modal.blade.php‎

Lines changed: 16 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,31 +1,28 @@
11
@php
2-
if (!isset($actionBtnIcon)) {
3-
$actionBtnIcon = null;
4-
} else {
5-
$actionBtnIcon = $actionBtnIcon . ' fa-fw';
6-
}
7-
if (!isset($modalClass)) {
8-
$modalClass = null;
9-
}
10-
if (!isset($btnSubmitText)) {
11-
$btnSubmitText = trans('LaravelLogger::laravel-logger.modals.shared.btnConfirm');
12-
}
2+
$actionBtnIcon = $actionBtnIcon ?? '';
3+
$actionBtnIcon = $actionBtnIcon ? $actionBtnIcon . ' fa-fw' : '';
4+
$modalClass = $modalClass ?? '';
5+
$btnSubmitText = $btnSubmitText ?? trans('LaravelLogger::laravel-logger.modals.shared.btnConfirm');
136
@endphp
14-
<div class="modal fade modal-{{$modalClass}}" id="{{$formTrigger}}" role="dialog" aria-labelledby="{{$formTrigger}}Label" aria-hidden="true">
7+
<div class="modal fade modal-{{ $modalClass }}" id="{{ $formTrigger }}" role="dialog" aria-labelledby="{{ $formTrigger }}Label" aria-hidden="true">
158
<div class="modal-dialog" role="document">
169
<div class="modal-content">
17-
<div class="modal-header {{$modalClass}}">
18-
<h5 class="modal-title">
19-
Confirm
20-
</h5>
21-
<button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
10+
<div class="modal-header {{ $modalClass }}">
11+
<h5 class="modal-title">Confirm</h5>
12+
<button type="button" class="close" data-dismiss="modal" aria-label="Close">
13+
<span aria-hidden="true">&times;</span>
14+
</button>
2215
</div>
2316
<div class="modal-body">
2417
<p>Are you sure?</p>
2518
</div>
2619
<div class="modal-footer">
27-
{!! Form::button('<i class="fa fa-fw fa-close" aria-hidden="true"></i> ' . trans('LaravelLogger::laravel-logger.modals.shared.btnCancel'), array('class' => 'btn btn-outline pull-left btn-flat', 'type' => 'button', 'data-dismiss' => 'modal' )) !!}
28-
{!! Form::button('<i class="fa ' . $actionBtnIcon . '" aria-hidden="true"></i> ' . $btnSubmitText, array('class' => 'btn btn-' . $modalClass . ' pull-right btn-flat', 'type' => 'button', 'id' => 'confirm' )) !!}
20+
<button class="btn btn-outline pull-left btn-flat" type="button" data-dismiss="modal">
21+
<i class="fa fa-fw fa-close" aria-hidden="true"></i> {{ trans('LaravelLogger::laravel-logger.modals.shared.btnCancel') }}
22+
</button>
23+
<button class="btn btn-{{ $modalClass }} pull-right btn-flat" type="button" id="confirm">
24+
<i class="fa {{ $actionBtnIcon }}" aria-hidden="true"></i> {{ $btnSubmitText }}
25+
</button>
2926
</div>
3027
</div>
3128
</div>

0 commit comments

Comments
 (0)