Skip to content

Commit ba7f0e6

Browse files
jeremykenedyjeremykenedy
authored
Merge pull request #27 from azorpax/ui-and-blade-placement
Updated the implementation of blade placements and added ellipsis for URL in the table
2 parents 0b8f44b + f303abd commit ba7f0e6

File tree

8 files changed

+134
-124
lines changed

8 files changed

+134
-124
lines changed

‎README.md‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -131,8 +131,9 @@ LARAVEL_LOGGER_LOG_RECORD_FAILURES_TO_FILE=true
131131
LARAVEL_LOGGER_FLASH_MESSAGE_BLADE_ENABLED=true
132132
LARAVEL_LOGGER_JQUERY_CDN_ENABLED=true
133133
LARAVEL_LOGGER_JQUERY_CDN_URL=https://code.jquery.com/jquery-2.2.4.min.js
134-
LARAVEL_LOGGER_BLADE_CSS_PLACEMENT_ENABLED=false
135-
LARAVEL_LOGGER_BLADE_JS_PLACEMENT_ENABLED=false
134+
LARAVEL_LOGGER_BLADE_PLACEMENT=yield #option: yield or stack
135+
LARAVEL_LOGGER_BLADE_PLACEMENT_CSS=template_linked_css #placement name
136+
LARAVEL_LOGGER_BLADE_PLACEMENT_JS=footer_scripts #placement name
136137
LARAVEL_LOGGER_BOOTSTRAP_JS_CDN_ENABLED=true
137138
LARAVEL_LOGGER_BOOTSTRAP_JS_CDN_URL=https://maxcdn.bootstrapcdn.com/bootstrap/4.0.0/js/bootstrap.min.js
138139
LARAVEL_LOGGER_FONT_AWESOME_CDN_ENABLED=true
@@ -261,7 +262,8 @@ To use the trait:
261262
│   │   └── confirm-modal.blade.php
262263
│   ├── partials
263264
│   │   ├── form-status.blade.php
264-
│   │   └── styles.blade.php
265+
│   │   ├── styles.blade.php
266+
| | └── scripts.blade.php
265267
│   └── scripts
266268
│   ├── clickable-row.blade.php
267269
│   ├── confirm-modal.blade.php

‎src/config/laravel-logger.php‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -112,8 +112,9 @@
112112
'bootstrapCardClasses' => '',
113113

114114
// Blade Extension Placement
115-
'enableBladeCssPlacement' => env('LARAVEL_LOGGER_BLADE_CSS_PLACEMENT_ENABLED', false),
116-
'enableBladeJsPlacement' => env('LARAVEL_LOGGER_BLADE_JS_PLACEMENT_ENABLED', false),
115+
'bladePlacement' => env('LARAVEL_LOGGER_BLADE_PLACEMENT', 'yield'),
116+
'bladePlacementCss' => env('LARAVEL_LOGGER_BLADE_PLACEMENT_CSS', 'template_linked_css'),
117+
'bladePlacementJs' => env('LARAVEL_LOGGER_BLADE_PLACEMENT_JS', 'footer_scripts'),
117118

118119
/*
119120
|--------------------------------------------------------------------------

‎src/resources/views/logger/activity-log-cleared.blade.php‎

Lines changed: 36 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,45 @@
11
@extends(config('LaravelLogger.loggerBladeExtended'))
22

3-
@section('template_title')
4-
@lang('LaravelLogger::laravel-logger.dashboardCleared.title')
5-
@endsection
3+
@if(config('LaravelLogger.bladePlacement') == 'yield')
4+
@section(config('LaravelLogger.bladePlacementCss'))
5+
@elseif (config('LaravelLogger.bladePlacement') == 'stack')
6+
@push(config('LaravelLogger.bladePlacementCss'))
7+
@endif
68

7-
@if(config('LaravelLogger.enableBladeCssPlacement'))
8-
@section('template_linked_css')
99
@include('LaravelLogger::partials.styles')
10+
11+
@if(config('LaravelLogger.bladePlacement') == 'yield')
12+
@endsection
13+
@elseif (config('LaravelLogger.bladePlacement') == 'stack')
14+
@endpush
15+
@endif
16+
17+
@if(config('LaravelLogger.bladePlacement') == 'yield')
18+
@section(config('LaravelLogger.bladePlacementJs'))
19+
@elseif (config('LaravelLogger.bladePlacement') == 'stack')
20+
@push(config('LaravelLogger.bladePlacementJs'))
21+
@endif
22+
23+
@include('LaravelLogger::partials.scripts')
24+
@include('LaravelLogger::scripts.confirm-modal', ['formTrigger' => '#confirmDelete'])
25+
@include('LaravelLogger::scripts.confirm-modal', ['formTrigger' => '#confirmRestore'])
26+
27+
@if(config('LaravelLogger.enableDrillDown'))
28+
@include('LaravelLogger::scripts.clickable-row')
29+
@include('LaravelLogger::scripts.tooltip')
30+
@endif
31+
32+
@if(config('LaravelLogger.bladePlacement') == 'yield')
1033
@endsection
11-
@else
12-
@include('LaravelLogger::partials.styles')
34+
@elseif (config('LaravelLogger.bladePlacement') == 'stack')
35+
@endpush
1336
@endif
1437

38+
39+
@section('template_title')
40+
@lang('LaravelLogger::laravel-logger.dashboardCleared.title')
41+
@endsection
42+
1543
@php
1644
switch (config('LaravelLogger.bootstapVersion')) {
1745
case '4':
@@ -101,38 +129,4 @@
101129
@include('LaravelLogger::modals.confirm-modal', ['formTrigger' => 'confirmDelete', 'modalClass' => 'danger', 'actionBtnIcon' => 'fa-trash-o'])
102130
@include('LaravelLogger::modals.confirm-modal', ['formTrigger' => 'confirmRestore', 'modalClass' => 'success', 'actionBtnIcon' => 'fa-check'])
103131

104-
@endsection
105-
106-
@if(config('LaravelLogger.enableBladeJsPlacement'))
107-
@section('footer_scripts')
108-
@endif
109-
110-
@if(config('LaravelLogger.enablejQueryCDN'))
111-
<script type="text/javascript" src="{{ config('LaravelLogger.JQueryCDN') }}"></script>
112-
@endif
113-
114-
@if(config('LaravelLogger.enableBootstrapJsCDN'))
115-
<script type="text/javascript" src="{{ config('LaravelLogger.bootstrapJsCDN') }}"></script>
116-
@endif
117-
118-
@if(config('LaravelLogger.enablePopperJsCDN'))
119-
<script type="text/javascript" src="{{ config('LaravelLogger.popperJsCDN') }}"></script>
120-
@endif
121-
122-
@include('LaravelLogger::scripts.confirm-modal', ['formTrigger' => '#confirmDelete'])
123-
@include('LaravelLogger::scripts.confirm-modal', ['formTrigger' => '#confirmRestore'])
124-
125-
@if(config('LaravelLogger.loggerDatatables'))
126-
@if (count($activities) > 10)
127-
@include('LaravelLogger::scripts.datatables')
128-
@endif
129-
@endif
130-
131-
@if(config('LaravelLogger.enableDrillDown'))
132-
@include('LaravelLogger::scripts.clickable-row')
133-
@include('LaravelLogger::scripts.tooltip')
134-
@endif
135-
136-
@if(config('LaravelLogger.enableBladeJsPlacement'))
137-
@endsection
138-
@endif
132+
@endsection

‎src/resources/views/logger/activity-log-item.blade.php‎

Lines changed: 28 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,37 @@
11
@extends(config('LaravelLogger.loggerBladeExtended'))
22

3-
@section('template_title')
4-
@lang('LaravelLogger::laravel-logger.drilldown.title', ['id' => $activity->id])
5-
@endsection
3+
@if(config('LaravelLogger.bladePlacement') == 'yield')
4+
@section(config('LaravelLogger.bladePlacementCss'))
5+
@elseif (config('LaravelLogger.bladePlacement') == 'stack')
6+
@push(config('LaravelLogger.bladePlacementCss'))
7+
@endif
68

7-
@if(config('LaravelLogger.enableBladeCssPlacement'))
8-
@section('template_linked_css')
99
@include('LaravelLogger::partials.styles')
10+
11+
@if(config('LaravelLogger.bladePlacement') == 'yield')
1012
@endsection
11-
@else
12-
@include('LaravelLogger::partials.styles')
13+
@elseif (config('LaravelLogger.bladePlacement') == 'stack')
14+
@endpush
15+
@endif
16+
17+
@if(config('LaravelLogger.bladePlacement') == 'yield')
18+
@section(config('LaravelLogger.bladePlacementJs'))
19+
@elseif (config('LaravelLogger.bladePlacement') == 'stack')
20+
@push(config('LaravelLogger.bladePlacementJs'))
1321
@endif
1422

23+
@include('LaravelLogger::partials.scripts')
24+
25+
@if(config('LaravelLogger.bladePlacement') == 'yield')
26+
@endsection
27+
@elseif (config('LaravelLogger.bladePlacement') == 'stack')
28+
@endpush
29+
@endif
30+
31+
@section('template_title')
32+
@lang('LaravelLogger::laravel-logger.drilldown.title', ['id' => $activity->id])
33+
@endsection
34+
1535
@php
1636
switch (config('LaravelLogger.bootstapVersion')) {
1737
case '4':
@@ -361,30 +381,4 @@
361381
</div>
362382
</div>
363383
</div>
364-
@endsection
365-
366-
@if(config('LaravelLogger.enableBladeJsPlacement'))
367-
@section('footer_scripts')
368-
@endif
369-
370-
@if(config('LaravelLogger.enablejQueryCDN'))
371-
<script type="text/javascript" src="{{ config('LaravelLogger.JQueryCDN') }}"></script>
372-
@endif
373-
374-
@if(config('LaravelLogger.enableBootstrapJsCDN'))
375-
<script type="text/javascript" src="{{ config('LaravelLogger.bootstrapJsCDN') }}"></script>
376-
@endif
377-
378-
@if(config('LaravelLogger.enablePopperJsCDN'))
379-
<script type="text/javascript" src="{{ config('LaravelLogger.popperJsCDN') }}"></script>
380-
@endif
381-
382-
@if(config('LaravelLogger.loggerDatatables'))
383-
@if (count($userActivities) > 10)
384-
@include('LaravelLogger::scripts.datatables')
385-
@endif
386-
@endif
387-
388-
@if(config('LaravelLogger.enableBladeJsPlacement'))
389-
@endsection
390-
@endif
384+
@endsection

‎src/resources/views/logger/activity-log.blade.php‎

Lines changed: 35 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,43 @@
11
@extends(config('LaravelLogger.loggerBladeExtended'))
22

3-
@section('template_title')
4-
@lang('LaravelLogger::laravel-logger.dashboard.title')
5-
@endsection
3+
@if(config('LaravelLogger.bladePlacement') == 'yield')
4+
@section(config('LaravelLogger.bladePlacementCss'))
5+
@elseif (config('LaravelLogger.bladePlacement') == 'stack')
6+
@push(config('LaravelLogger.bladePlacementCss'))
7+
@endif
68

7-
@if(config('LaravelLogger.enableBladeCssPlacement'))
8-
@section('template_linked_css')
9-
@include('LaravelLogger::partials.styles')
10-
@endsection
11-
@else
129
@include('LaravelLogger::partials.styles')
10+
11+
@if(config('LaravelLogger.bladePlacement') == 'yield')
12+
@endsection
13+
@elseif (config('LaravelLogger.bladePlacement') == 'stack')
14+
@endpush
15+
@endif
16+
17+
@if(config('LaravelLogger.bladePlacement') == 'yield')
18+
@section(config('LaravelLogger.bladePlacementJs'))
19+
@elseif (config('LaravelLogger.bladePlacement') == 'stack')
20+
@push(config('LaravelLogger.bladePlacementJs'))
1321
@endif
1422

23+
@include('LaravelLogger::partials.scripts')
24+
@include('LaravelLogger::scripts.confirm-modal', ['formTrigger' => '#confirmDelete'])
25+
26+
@if(config('LaravelLogger.enableDrillDown'))
27+
@include('LaravelLogger::scripts.clickable-row')
28+
@include('LaravelLogger::scripts.tooltip')
29+
@endif
30+
31+
@if(config('LaravelLogger.bladePlacement') == 'yield')
32+
@endsection
33+
@elseif (config('LaravelLogger.bladePlacement') == 'stack')
34+
@endpush
35+
@endif
36+
37+
@section('template_title')
38+
@lang('LaravelLogger::laravel-logger.dashboard.title')
39+
@endsection
40+
1541
@php
1642
switch (config('LaravelLogger.bootstapVersion')) {
1743
case '4':
@@ -105,37 +131,4 @@
105131

106132
@include('LaravelLogger::modals.confirm-modal', ['formTrigger' => 'confirmDelete', 'modalClass' => 'danger', 'actionBtnIcon' => 'fa-trash-o'])
107133

108-
@endsection
109-
110-
@if(config('LaravelLogger.enableBladeJsPlacement'))
111-
@section('footer_scripts')
112-
@endif
113-
114-
@if(config('LaravelLogger.enablejQueryCDN'))
115-
<script type="text/javascript" src="{{ config('LaravelLogger.JQueryCDN') }}"></script>
116-
@endif
117-
118-
@if(config('LaravelLogger.enableBootstrapJsCDN'))
119-
<script type="text/javascript" src="{{ config('LaravelLogger.bootstrapJsCDN') }}"></script>
120-
@endif
121-
122-
@if(config('LaravelLogger.enablePopperJsCDN'))
123-
<script type="text/javascript" src="{{ config('LaravelLogger.popperJsCDN') }}"></script>
124-
@endif
125-
126-
@include('LaravelLogger::scripts.confirm-modal', ['formTrigger' => '#confirmDelete'])
127-
128-
@if(config('LaravelLogger.loggerDatatables'))
129-
@if (count($activities) > 10)
130-
@include('LaravelLogger::scripts.datatables')
131-
@endif
132-
@endif
133-
134-
@if(config('LaravelLogger.enableDrillDown'))
135-
@include('LaravelLogger::scripts.clickable-row')
136-
@include('LaravelLogger::scripts.tooltip')
137-
@endif
138-
139-
@if(config('LaravelLogger.enableBladeJsPlacement'))
140-
@endsection
141-
@endif
134+
@endsection

‎src/resources/views/logger/partials/activity-table.blade.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,7 @@
130130
{{ $activity->methodType }}
131131
</span>
132132
</td>
133-
<td>
133+
<td class="ellipsis">
134134
@if($hoverable)
135135
{{ showCleanRoutUrl($activity->route) }}
136136
@else

‎src/resources/views/partials/scripts.blade.php‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
2+
@if(config('LaravelLogger.enablejQueryCDN'))
3+
<script type="text/javascript" src="{{ config('LaravelLogger.JQueryCDN') }}"></script>
4+
@endif
5+
6+
@if(config('LaravelLogger.enableBootstrapJsCDN'))
7+
<script type="text/javascript" src="{{ config('LaravelLogger.bootstrapJsCDN') }}"></script>
8+
@endif
9+
10+
@if(config('LaravelLogger.enablePopperJsCDN'))
11+
<script type="text/javascript" src="{{ config('LaravelLogger.popperJsCDN') }}"></script>
12+
@endif
13+
14+
@if(config('LaravelLogger.loggerDatatables'))
15+
@if (count($userActivities) > 10)
16+
@include('LaravelLogger::scripts.datatables')
17+
@endif
18+
@endif

‎src/resources/views/partials/styles.blade.php‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,14 @@
1919
.table-responsive {
2020
border: none;
2121
}
22+
23+
.activity-table > table > tbody td.ellipsis {
24+
max-width: 350px;
25+
white-space: nowrap;
26+
overflow: hidden;
27+
text-overflow: ellipsis;
28+
}
29+
2230
.list-group {
2331
margin-bottom: 0;
2432
}

0 commit comments

Comments
 (0)