Skip to content

Commit 502ef59

Browse files
nasirkhannasirkhan
authored
Merge pull request #573 from nasirkhan/dev
Log viewer update, layout update
2 parents 7d7f7c8 + 4c9d6e1 commit 502ef59

File tree

12 files changed

+30
-37
lines changed

12 files changed

+30
-37
lines changed

‎resources/views/backend/roles/create.blade.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
class="text-muted">{{ __($module_action) }}</small>
2323

2424
<x-slot name="toolbar">
25-
<x-backend.buttons.return-back />
25+
<x-backend.buttons.return-back :small=true />
2626
</x-slot>
2727
</x-backend.section-header>
2828

‎resources/views/backend/roles/edit.blade.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,9 @@
2222
class="text-muted">{{ __($module_action) }}</small>
2323

2424
<x-slot name="toolbar">
25-
<x-backend.buttons.return-back />
25+
<x-backend.buttons.return-back :small=true />
2626
<x-buttons.show class="ms-1" title="{{ __('Show') }} {{ ucwords(Str::singular($module_name)) }}"
27-
route='{!! route("backend.$module_name.show", $$module_name_singular) !!}' />
27+
route='{!! route("backend.$module_name.show", $$module_name_singular) !!}' :small=true />
2828
</x-slot>
2929
</x-backend.section-header>
3030

‎resources/views/backend/roles/index.blade.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ class="text-muted">{{ __($module_action) }}</small>
2020

2121
<x-slot name="toolbar">
2222
<x-backend.buttons.create title="{{ __('Create') }} {{ ucwords(Str::singular($module_name)) }}"
23-
route='{{ route("backend.$module_name.create") }}' />
23+
route='{{ route("backend.$module_name.create") }}' :small=true />
2424
</x-slot>
2525
</x-backend.section-header>
2626

@@ -70,14 +70,14 @@ class="text-muted">{{ __($module_action) }}</small>
7070
</div>
7171
<div class="card-footer">
7272
<div class="row">
73-
<div class="col-7">
73+
<div class="col-12 col-sm-7">
7474
<div class="float-left">
7575
{!! $$module_name->total() !!} {{ __('labels.backend.total') }}
7676
</div>
7777
</div>
78-
<div class="col-5">
78+
<div class="col-12 col-sm-5">
7979
<div class="float-end">
80-
{!! $$module_name->render() !!}
80+
{{ $$module_name->links('pagination::bootstrap-5') }}
8181
</div>
8282
</div>
8383
</div>

‎resources/views/backend/roles/show.blade.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,10 @@
2020
class="text-muted">{{ __($module_title) }}</small>
2121

2222
<x-slot name="toolbar">
23-
<x-backend.buttons.return-back />
23+
<x-backend.buttons.return-back :small=true />
2424
<x-backend.buttons.edit class="ms-1"
2525
title="{{ __('Edit') }} {{ ucwords(Str::singular($module_name)) }}"
26-
route='{!! route("backend.$module_name.edit", $$module_name_singular) !!}' />
26+
route='{!! route("backend.$module_name.edit", $$module_name_singular) !!}' :small=true />
2727
</x-slot>
2828
</x-backend.section-header>
2929

‎resources/views/backend/users/changePassword.blade.php

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,8 @@
2121
<i class="{{ $module_icon }}"></i> {{ __($module_title) }} <small
2222
class="text-muted">{{ __($module_action) }}</small>
2323

24-
<x-slot name="subtitle">
25-
@lang(':module_name Management Dashboard', ['module_name' => Str::title($module_name)])
26-
</x-slot>
2724
<x-slot name="toolbar">
28-
<x-backend.buttons.return-back />
25+
<x-backend.buttons.return-back :small=true />
2926
</x-slot>
3027
</x-backend.section-header>
3128

‎resources/views/backend/users/create.blade.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
class="text-muted">{{ __($module_action) }}</small>
2323

2424
<x-slot name="toolbar">
25-
<x-backend.buttons.return-back />
25+
<x-backend.buttons.return-back :small=true />
2626
</x-slot>
2727
</x-backend.section-header>
2828

‎resources/views/backend/users/edit.blade.php

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
@section('breadcrumbs')
99
<x-backend.breadcrumbs>
1010
<x-backend.breadcrumb-item route='{{ route("backend.$module_name.index") }}' icon='{{ $module_icon }}'>
11-
{{ $$module_name_singular->name }} - {{ $$module_name_singular->username }}
11+
{{ $$module_name_singular->name }}
1212
</x-backend.breadcrumb-item>
1313

1414
<x-backend.breadcrumb-item type="active">{{ __($module_title) }}
@@ -51,7 +51,7 @@
5151
<div class="form-group">
5252
<?php
5353
$field_name = 'first_name';
54-
$field_lable = label_case($field_name);
54+
$field_lable = __(label_case($field_name));
5555
$field_placeholder = $field_lable;
5656
$required = 'required';
5757
?>
@@ -63,7 +63,7 @@
6363
<div class="form-group">
6464
<?php
6565
$field_name = 'last_name';
66-
$field_lable = label_case($field_name);
66+
$field_lable = __(label_case($field_name));
6767
$field_placeholder = $field_lable;
6868
$required = 'required';
6969
?>
@@ -75,7 +75,7 @@
7575
<div class="form-group">
7676
<?php
7777
$field_name = 'email';
78-
$field_lable = label_case($field_name);
78+
$field_lable = __(label_case($field_name));
7979
$field_placeholder = $field_lable;
8080
$required = 'required';
8181
?>
@@ -87,7 +87,7 @@
8787
<div class="form-group">
8888
<?php
8989
$field_name = 'mobile';
90-
$field_lable = label_case($field_name);
90+
$field_lable = __(label_case($field_name));
9191
$field_placeholder = $field_lable;
9292
$required = '';
9393
?>
@@ -102,7 +102,7 @@
102102
<div class="form-group">
103103
<?php
104104
$field_name = 'gender';
105-
$field_lable = label_case($field_name);
105+
$field_lable = __(label_case($field_name));
106106
$field_placeholder = '-- Select an option --';
107107
$required = '';
108108
$select_options = [
@@ -120,7 +120,7 @@
120120
<div class="form-group">
121121
<?php
122122
$field_name = 'date_of_birth';
123-
$field_lable = label_case($field_name);
123+
$field_lable = __(label_case($field_name));
124124
$field_placeholder = $field_lable;
125125
$required = '';
126126
?>
@@ -135,7 +135,7 @@
135135
<div class="form-group">
136136
<?php
137137
$field_name = 'address';
138-
$field_lable = label_case($field_name);
138+
$field_lable = __(label_case($field_name));
139139
$field_placeholder = $field_lable;
140140
$required = '';
141141
?>
@@ -147,7 +147,7 @@
147147
<div class="form-group">
148148
<?php
149149
$field_name = 'bio';
150-
$field_lable = label_case($field_name);
150+
$field_lable = __(label_case($field_name));
151151
$field_placeholder = $field_lable;
152152
$required = '';
153153
?>

‎resources/views/backend/users/index_datatable.blade.php

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,14 +15,11 @@
1515
<x-backend.section-header>
1616
<i class="{{ $module_icon }}"></i> {{ __($module_title) }} <small class="text-muted">{{ __($module_action) }}</small>
1717

18-
<x-slot name="subtitle">
19-
@lang(":module_name Management Dashboard", ['module_name'=>Str::title($module_name)])
20-
</x-slot>
2118
<x-slot name="toolbar">
22-
<x-backend.buttons.create route='{{ route("backend.$module_name.create") }}' title="{{__('Create')}} {{ ucwords(Str::singular($module_name)) }}" />
19+
<x-backend.buttons.create route='{{ route("backend.$module_name.create") }}' title="{{__('Create')}} {{ ucwords(Str::singular($module_name)) }}" :small=true />
2320

2421
<div class="btn-group">
25-
<button class="btn btn-secondary dropdown-toggle" type="button" data-coreui-toggle="dropdown" aria-expanded="false">
22+
<button class="btn btn-secondary btn-sm dropdown-toggle" type="button" data-coreui-toggle="dropdown" aria-expanded="false">
2623
<i class="fas fa-cog"></i>
2724
</button>
2825
<ul class="dropdown-menu">

‎resources/views/backend/users/show.blade.php

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
@section('breadcrumbs')
99
<x-backend.breadcrumbs>
1010
<x-backend.breadcrumb-item route='{{ route("backend.$module_name.index") }}' icon='{{ $module_icon }}'>
11-
{{ $$module_name_singular->name }} - {{ $$module_name_singular->username }}
11+
{{ $$module_name_singular->name }}
1212
</x-backend.breadcrumb-item>
1313

1414
<x-backend.breadcrumb-item type="active">{{ __($module_title) }}
@@ -20,16 +20,15 @@
2020
<x-backend.layouts.show :data="$user">
2121

2222
<x-backend.section-header>
23-
<i class="{{ $module_icon }}"></i> {{ $$module_name_singular->name }} -
24-
{{ $$module_name_singular->username }} <small class="text-muted">{{ __($module_title) }}
23+
<i class="{{ $module_icon }}"></i> {{ $$module_name_singular->name }} <small class="text-muted">{{ __($module_title) }}
2524
{{ __($module_action) }}</small>
2625

2726
<x-slot name="toolbar">
28-
<x-backend.buttons.return-back />
29-
<a class="btn btn-primary m-1" data-toggle="tooltip" href="{{ route('backend.users.index') }}"
27+
<x-backend.buttons.return-back :small=true />
28+
<a class="btn btn-primary btn-sm m-1" data-toggle="tooltip" href="{{ route('backend.users.index') }}"
3029
title="List"><i class="fas fa-list"></i> List</a>
3130
<x-buttons.edit title="{{ __('Edit') }} {{ ucwords(Str::singular($module_name)) }}"
32-
route='{!! route("backend.$module_name.edit", $$module_name_singular) !!}' />
31+
route='{!! route("backend.$module_name.edit", $$module_name_singular) !!}' :small=true />
3332
</x-slot>
3433
</x-backend.section-header>
3534

‎resources/views/components/backend/buttons/save.blade.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
@props(["small"=>""])
2-
{{ html()->submit($text = icon('fas fa-save fa-fw')." Save")->class('btn btn-success m-1'.(($small=='true')? ' btn-sm' : '')) }}
2+
{{ html()->submit($text = icon('fa-solid fa-floppy-disk fa-fw')." ".__('Save'))->class('btn btn-success m-1'.(($small=='true')? ' btn-sm' : '')) }}

‎resources/views/vendor/log-viewer/laravel-starter/logs.blade.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ class="badge badge-level-{{ $key }}">{{ $value }}</span>
9090
</table>
9191
</div>
9292

93-
{{ $rows->render() }}
93+
{{ $rows->links('pagination::bootstrap-5') }}
9494
</div>
9595
</div>
9696

‎resources/views/vendor/log-viewer/laravel-starter/show.blade.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -214,7 +214,7 @@ class="list-group-item list-group-item-action d-flex justify-content-between ali
214214
</div>
215215
</div>
216216

217-
{!! $entries->appends(compact('query'))->render() !!}
217+
{!! $entries->appends(compact('query'))->render('pagination::bootstrap-5') !!}
218218
</div>
219219
</div>
220220
</div>

0 commit comments

Comments
 (0)