Skip to content

Commit

Permalink
Merge pull request #60 from Laravel-Backpack/v6
Browse files Browse the repository at this point in the history
v6-compatible version
  • Loading branch information
tabacitu authored Jul 1, 2023
2 parents 420922f + 2ad39cb commit 9a7d96e
Show file tree
Hide file tree
Showing 3 changed files with 21 additions and 12 deletions.
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
"minimum-stability": "dev",
"prefer-stable": true,
"require": {
"backpack/crud": "^4.1|^5.0"
"backpack/crud": "^6.0"
},
"require-dev": {
"phpunit/phpunit" : "^9.0||^7.0",
Expand Down
20 changes: 13 additions & 7 deletions src/resources/views/log_item.blade.php
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,17 @@
@endphp

@section('header')
<section class="container-fluid">
<h2>
{{ trans('backpack::logmanager.log_manager') }}<small>{{ trans('backpack::logmanager.file_name') }}: <i>{{ $file_name }}</i></small>
<small><a href="{{ route('log.index') }}" class="hidden-print font-sm"><i class="la la-angle-double-left"></i> {{ trans('backpack::logmanager.back_to_all_logs') }}</a></small>
</h2>
<section class="header-operation container-fluid animated fadeIn d-flex mb-2 align-items-end" bp-section="page-header">
<h1 bp-section="page-heading">
{{ trans('backpack::logmanager.log_manager') }}
</h1>
<p class="ms-2 ml-2 mb-2" bp-section="page-subheading">
{{ trans('backpack::logmanager.file_name') }}: <i>{{ $file_name }}</i>
</p>
<p class="ms-2 ml-2 mb-2" bp-section="page-subheading-back-button">
<small><a href="{{ route('log.index') }}" class="hidden-print font-sm"><i class="la la-angle-double-left"></i> {{
trans('backpack::logmanager.back_to_all_logs') }}</a></small>
</p>
</section>
@endsection

Expand All @@ -22,7 +28,7 @@
@forelse($logs as $key => $log)
<div class="card mb-0 pb-0">
<div class="card-header bg-{{ $log['level_class'] }}" role="tab" id="heading{{ $key }}">
<a role="button" data-toggle="collapse" data-parent="#accordion" href="#collapse{{ $key }}" aria-expanded="true" aria-controls="collapse{{ $key }}" class="text-white">
<a role="button" data-toggle="collapse" data-bs-toggle="collapse" data-parent="#accordion" href="#collapse{{ $key }}" aria-expanded="true" aria-controls="collapse{{ $key }}" class="text-white">
<i class="la la-{{ $log['level_img'] }}"></i>
<span>[{{ $log['date'] }}]</span>
{{ Str::limit($log['text'], 150) }}
Expand All @@ -31,7 +37,7 @@
<div id="collapse{{ $key }}" class="panel-collapse collapse p-3" role="tabpanel" aria-labelledby="heading{{ $key }}">
<div class="panel-body">
<p>{{$log['text']}}</p>
<pre><code class="php">{{ trim($log['stack']) }}</code></pre>
<pre class="p-0" ><code class="php">{{ trim($log['stack']) }}</code></pre>
</div>
</div>
</div>
Expand Down
11 changes: 7 additions & 4 deletions src/resources/views/logs.blade.php
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,13 @@
@endphp

@section('header')
<section class="container-fluid">
<h2>
{{ trans('backpack::logmanager.log_manager') }}<small>{{ trans('backpack::logmanager.log_manager_description') }}</small>
</h2>
<section class="header-operation container-fluid animated fadeIn d-flex mb-2 align-items-end" bp-section="page-header">
<h1 bp-section="page-heading">
{{ trans('backpack::logmanager.log_manager') }}
</h1>
<p class="ms-2 ml-2 mb-2" bp-section="page-subheading">
{{ trans('backpack::logmanager.log_manager_description') }}
</p>
</section>
@endsection

Expand Down

0 comments on commit 9a7d96e

Please sign in to comment.