Skip to content

Commit 88dfcae

Browse files
xaviqvxaviqv
committed
Administration styles to BS 4
1 parent 59ec399 commit 88dfcae

2 files changed

Lines changed: 23 additions & 24 deletions

File tree

‎src/Views/admin/configuration/index.blade.php‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -30,13 +30,13 @@
3030
<div class="card-body text-center">{{ trans('panichd::admin.config-index-no-settings') }}</div>
3131
</div>
3232
@else
33-
<ul class="nav nav-tabs nav-justified">
34-
<li class="active"><a data-toggle="tab" href="#init-configs">{{ trans('panichd::admin.config-index-initial') }}</a></li>
35-
<li><a data-toggle="tab" href="#ticket-configs">{{ trans('panichd::admin.config-index-tickets') }}</a></li>
36-
<li><a data-toggle="tab" href="#email-configs">{{ trans('panichd::admin.config-index-notifications') }}</a></li>
37-
<li><a data-toggle="tab" href="#perms-configs">{{ trans('panichd::admin.config-index-permissions') }}</a></li>
38-
<li><a data-toggle="tab" href="#editor-configs">{{ trans('panichd::admin.config-index-editor') }}</a></li>
39-
<li><a data-toggle="tab" href="#other-configs">{{ trans('panichd::admin.config-index-other') }}</a></li>
33+
<ul class="nav nav-tabs nav-justified" role="tablist">
34+
<li class="nav-item"><a class="nav-link active" data-toggle="tab" role="tab" href="#init-configs">{{ trans('panichd::admin.config-index-initial') }}</a></li>
35+
<li class="nav-item"><a class="nav-link" data-toggle="tab" role="tab" href="#ticket-configs">{{ trans('panichd::admin.config-index-tickets') }}</a></li>
36+
<li class="nav-item"><a class="nav-link" data-toggle="tab" role="tab" href="#email-configs">{{ trans('panichd::admin.config-index-notifications') }}</a></li>
37+
<li class="nav-item"><a class="nav-link" data-toggle="tab" role="tab" href="#perms-configs">{{ trans('panichd::admin.config-index-permissions') }}</a></li>
38+
<li class="nav-item"><a class="nav-link" data-toggle="tab" role="tab" href="#editor-configs">{{ trans('panichd::admin.config-index-editor') }}</a></li>
39+
<li class="nav-item"><a class="nav-link" data-toggle="tab" role="tab" href="#other-configs">{{ trans('panichd::admin.config-index-other') }}</a></li>
4040
</ul>
4141
<br />
4242
<div class="tab-content">

‎src/Views/admin/index.blade.php‎

Lines changed: 16 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -91,29 +91,29 @@
9191
<div class="col-md-4">
9292
{{--<h4><i class="fa fa-info-circle"></i> Tickets Activities</h4>--}}
9393
{{--<hr />--}}
94-
<ul class="nav nav-tabs nav-justified">
95-
<li class="{{$active_tab == "cat" ? "active" : ""}}">
96-
<a data-toggle="pill" href="#information-panel-categories">
94+
<ul class="nav nav-tabs nav-justified" class="nav-item">
95+
<li class="nav-item {{$active_tab == "cat" ? "active" : ""}}">
96+
<a class="nav-link active" data-toggle="pill" role="tab" href="#information-panel-categories">
9797
<i class="fa fa-folder"></i>
9898
<small>{{ trans('panichd::admin.index-categories') }}</small>
9999
</a>
100100
</li>
101-
<li class="{{$active_tab == "agents" ? "active" : ""}}">
102-
<a data-toggle="pill" href="#information-panel-agents">
101+
<li class="nav-item {{$active_tab == "agents" ? "active" : ""}}">
102+
<a class="nav-link" data-toggle="pill" role="tab" href="#information-panel-agents">
103103
<i class="fa fa-user"></i>
104104
<small>{{ trans('panichd::admin.index-agents') }}</small>
105105
</a>
106106
</li>
107-
<li class="{{$active_tab == "users" ? "active" : ""}}">
108-
<a data-toggle="pill" href="#information-panel-users">
107+
<li class="nav-item {{$active_tab == "users" ? "active" : ""}}">
108+
<a class="nav-link" data-toggle="pill" role="tab" href="#information-panel-users">
109109
<i class="fa fa-user"></i>
110110
<small>{{ trans('panichd::admin.index-users') }}</small>
111111
</a>
112112
</li>
113113
</ul>
114114
<br>
115115
<div class="tab-content">
116-
<ul id="information-panel-categories" class="list-group tab-pane fade {{$active_tab == "cat" ? "in active" : ""}}">
116+
<ul id="information-panel-categories" class="list-group tab-pane fade {{$active_tab == "cat" ? "show active" : ""}}" role="tabpanel">
117117
<li class="list-group-item">
118118
<span>{{ trans('panichd::admin.index-category') }}
119119
<span class="badge">{{ trans('panichd::admin.index-total') }}</span>
@@ -129,9 +129,8 @@
129129
</li>
130130
@foreach($categories as $category)
131131
<li class="list-group-item">
132-
<span style="color: {{ $category->color }}">
133-
{{ $category->name }} <span class="badge" style="background-color: {{ $category->color }}">{{ $category->tickets()->count() }}</span>
134-
</span>
132+
<span style="color: {{ $category->color }}">{{ $category->name }} </span><span class="badge" style="color: white; background-color: {{ $category->color }}">{{ $category->tickets()->count() }}</span>
133+
135134
<span class="pull-right small">
136135
<?php
137136
$a_button = [
@@ -167,9 +166,9 @@
167166
</span>
168167
</li>
169168
@endforeach
170-
{!! $categories->render() !!}
169+
{!! $categories->links('pagination::bootstrap-4') !!}
171170
</ul>
172-
<ul id="information-panel-agents" class="list-group tab-pane fade {{$active_tab == "agents" ? "in active" : ""}}">
171+
<ul id="information-panel-agents" class="list-group tab-pane fade {{$active_tab == "agents" ? "show active" : ""}}" role="tabpanel">
173172
<li class="list-group-item">
174173
<span>{{ trans('panichd::admin.index-agent') }}
175174
<span class="badge">{{ trans('panichd::admin.index-total') }}</span>
@@ -223,9 +222,9 @@
223222
</span>
224223
</li>
225224
@endforeach
226-
{!! $agents->render() !!}
225+
{!! $agents->links('pagination::bootstrap-4') !!}
227226
</ul>
228-
<ul id="information-panel-users" class="list-group tab-pane fade {{ $active_tab == "users" ? "in active" : "" }}">
227+
<ul id="information-panel-users" class="list-group tab-pane fade {{ $active_tab == "users" ? "show active" : "" }}" role="tabpanel">
229228
<li class="list-group-item">
230229
<span>{{ trans('panichd::admin.index-user') }}
231230
<span class="badge">{{ trans('panichd::admin.index-total') }}</span>
@@ -276,9 +275,9 @@
276275
</a>
277276
@endif
278277
</span>
279-
</a>
278+
</li>
280279
@endforeach
281-
{!! $users->render() !!}
280+
{!! $users->links('pagination::bootstrap-4') !!}
282281
</ul>
283282
</div>
284283
</div>

0 commit comments

Comments
 (0)