Update Metronic Version to 8.2.1 #1

Merged
putrakuningan merged 77 commits from dev into master 2024-05-04 09:46:45 +00:00
2 changed files with 86 additions and 60 deletions
Showing only changes of commit bf4facb148 - Show all commits

View File

@ -4,42 +4,44 @@
$route = explode('.',Route::currentRouteName()); $route = explode('.',Route::currentRouteName());
@endphp @endphp
<!--begin::Title--> <!--begin::Title-->
<h1 class="page-heading d-flex text-dark fw-bold fs-3 flex-column justify-content-center my-0 text-capitalize"> <h1 class="page-heading d-flex text-dark fw-bold fs-3 flex-column justify-content-center my-0 text-capitalize">
{{ ucfirst(str_replace('-',' ',$route[0])) }} {{ ucfirst(str_replace('-',' ',$route[0])) }}
@if(count($route) > 1) @if(count($route) > 1)
@if($route[1] !== 'index' && $route[1] !== 'users') @if($route[1] !== 'index' && $route[1] !== 'users' && $route[1] !== 'show')
{{ $route[1] }} {{ $route[1] }}
@endif @endif
@endif @endif
</h1> </h1>
<!--end::Title--> <!--end::Title-->
<!--begin::Breadcrumb--> <!--begin::Breadcrumb-->
<ul class="breadcrumb breadcrumb-separatorless fw-semibold fs-7 my-0 pt-1"> <ul class="breadcrumb breadcrumb-separatorless fw-semibold fs-7 my-0 pt-1">
<!--begin::Item--> <!--begin::Item-->
<li class="breadcrumb-item text-muted"> <li class="breadcrumb-item text-muted">
<a href="{{ route('dashboard') }}" class="text-muted text-hover-primary">Dashboard</a> <a href="{{ route('dashboard') }}" class="text-muted text-hover-primary">Dashboard</a>
</li> </li>
<!--end::Item--> <!--end::Item-->
<!--begin::Item--> <!--begin::Item-->
<li class="breadcrumb-item"> <li class="breadcrumb-item">
<span class="bullet bg-gray-400 w-5px h-2px"></span> <span class="bullet bg-gray-400 w-5px h-2px"></span>
</li> </li>
<!--end::Item--> <!--end::Item-->
@if(count($route) > 1) @if(count($route) > 1)
@if($route[1] !== 'index' && $route[1] !=='users') @if($route[1] !== 'index' && $route[1] !=='users')
<!--begin::Item--> <!--begin::Item-->
<li class="breadcrumb-item text-muted text-capitalize">{{ ucfirst(str_replace('-',' ',$route[0])) }}</li> <li class="breadcrumb-item text-muted text-capitalize">{{ ucfirst(str_replace('-',' ',$route[0])) }}</li>
<!--end::Item--> <!--end::Item-->
<!--begin::Item--> @if(isset($route[1]) && $route[1]!=='show')
<li class="breadcrumb-item"> <!--begin::Item-->
<span class="bullet bg-gray-400 w-5px h-2px"></span> <li class="breadcrumb-item">
</li> <span class="bullet bg-gray-400 w-5px h-2px"></span>
<!--end::Item--> </li>
<!--begin::Item--> <!--end::Item-->
<li class="breadcrumb-item text-muted text-capitalize">{{ ucfirst(str_replace('-',' ',$route[1]))}}</li> <!--begin::Item-->
<!--end::Item--> <li class="breadcrumb-item text-muted text-capitalize">{{ ucfirst(str_replace('-',' ',$route[1]))}}</li>
<!--end::Item-->
@endif
@else @else
<!--begin::Item--> <!--begin::Item-->
<li class="breadcrumb-item text-muted text-capitalize">{{ ucfirst(str_replace('-',' ',$route[0])) }}</li> <li class="breadcrumb-item text-muted text-capitalize">{{ ucfirst(str_replace('-',' ',$route[0])) }}</li>
@ -51,7 +53,7 @@
<!--end::Item--> <!--end::Item-->
@endif @endif
</ul> </ul>
<!--end::Breadcrumb--> <!--end::Breadcrumb-->
</div> </div>
<!--end::Page title--> <!--end::Page title-->

View File

@ -1,50 +1,74 @@
@php
$route = explode('.',Route::currentRouteName());
@endphp
@if(file_exists(dirname(__FILE__, 4) . '/Modules/'.ucwords($route[0]).'/Resources/views/partials/_toolbar.blade.php'))
@include(strtolower($route[0]).'::partials._toolbar')
@else
<!--begin::Toolbar--> <!--begin::Toolbar-->
<div id="kt_app_toolbar" class="app-toolbar py-3 py-lg-6"> <div id="kt_app_toolbar" class="app-toolbar py-3 py-lg-6">
<!--begin::Toolbar container--> <!--begin::Toolbar container-->
<div id="kt_app_toolbar_container" class="app-container container-fluid d-flex flex-stack"> <div id="kt_app_toolbar_container" class="app-container container-fluid d-flex flex-stack">
@include(config('settings.KT_THEME_LAYOUT_DIR').'/partials/sidebar-layout/_page-title') @include(config('settings.KT_THEME_LAYOUT_DIR').'/partials/sidebar-layout/_page-title')
@php
$route = explode('.',Route::currentRouteName());
@endphp
@if(isset($route[1]) && $route[1] == 'index') @if(isset($route[0]) && $route[0]!=='cardboard-detail')
@if($route[0]=='document')<!--begin::Actions--> @if(isset($route[1]) && $route[1] == 'index')
<div class="d-flex align-items-center gap-2 gap-lg-3"> @if($route[0]=='document')
<!--begin::Primary button--> <!--begin::Actions-->
<a href="{{ route($route[0].'.create') }}" class="btn btn-sm fw-bold btn-primary text-capitalize">Add {{ str_replace('-',' ',$route[0]) }}</a> <div class="d-flex align-items-center gap-2 gap-lg-3">
<!--end::Primary button--> <!--begin::Primary button-->
</div> <a href="{{ route($route[0].'.create') }}" class="btn btn-sm fw-bold btn-primary text-capitalize">Add {{ str_replace('-',' ',$route[0]) }}</a>
<!--end::Actions--> <!--end::Primary button-->
@else </div>
<!--begin::Actions--> <!--end::Actions-->
@elseif($route[0]!=='settings')
<!--begin::Actions-->
<div class="d-flex align-items-center gap-2 gap-lg-3">
<!--begin::Primary button-->
<a href="{{ route($route[0].'.create') }}" class="btn btn-sm fw-bold btn-primary text-capitalize" data-bs-toggle="modal" data-bs-target="#kt_modal_{{ $route[0] }}">Add {{ str_replace('-',' ',$route[0]) }}</a>
<!--end::Primary button-->
</div>
<!--end::Actions-->
@endif
@elseif(isset($route[2]) && $route[2] == 'index')
@if($route[1]!=='users' || $route[0] !=='log')
<!--begin::Actions-->
<div class="d-flex align-items-center gap-2 gap-lg-3">
<!--begin::Primary button-->
<a href="{{ route($route[0].'.'.$route[1].'.create') }}" class="btn btn-sm fw-bold btn-primary text-capitalize" data-bs-toggle="modal" data-bs-target="#kt_modal_{{ $route[0] }}_{{ $route[1] }}">Add {{ str_replace('-',' ',$route[1]) }}</a>
<!--end::Primary button-->
</div>
<!--end::Actions-->
@else
<!--begin::Actions-->
<div class="d-flex align-items-center gap-2 gap-lg-3">
<!--begin::Primary button-->
<a href="{{ route($route[0].'.'.$route[1].'.create') }}" class="btn btn-sm fw-bold btn-primary text-capitalize" data-bs-toggle="modal" data-bs-target="#kt_modal_{{ $route[0] }}_{{ $route[1] }}">Add {{ str_replace('-',' ',$route[1]) }}</a>
<!--end::Primary button-->
</div>
<!--end::Actions-->
@endif
@endif
@elseif($route[0]=='cardboard-detail' && isset($route[1]) && $route[1] == 'show')
@php
$link = explode('/',url()->current());
$id = end($link);
@endphp
<!--begin::Actions-->
<div class="d-flex align-items-center gap-2 gap-lg-3"> <div class="d-flex align-items-center gap-2 gap-lg-3">
<!--begin::Primary button--> <!--begin::Primary button-->
<a href="{{ route($route[0].'.create') }}" class="btn btn-sm fw-bold btn-primary text-capitalize" data-bs-toggle="modal" data-bs-target="#kt_modal_{{ $route[0] }}">Add {{ str_replace('-',' ',$route[0]) }}</a> <a href="{{ route($route[0].'.index') }}?id={{ $id }}" class="btn btn-sm fw-bold btn-primary text-capitalize">Add Odner</a>
<!--end::Primary button-->
<!--begin::Primary button-->
<a href="{{ route('cardboard.index') }}" class="btn btn-sm fw-bold btn-warning text-capitalize">Back</a>
<!--end::Primary button--> <!--end::Primary button-->
</div> </div>
<!--end::Actions--> <!--end::Actions-->
@endif
@elseif(isset($route[2]) && $route[2] == 'index')
@if($route[1]!=='users')
<!--begin::Actions-->
<div class="d-flex align-items-center gap-2 gap-lg-3">
<!--begin::Primary button-->
<a href="{{ route($route[0].'.'.$route[1].'.create') }}" class="btn btn-sm fw-bold btn-primary text-capitalize" data-bs-toggle="modal" data-bs-target="#kt_modal_{{ $route[0] }}_{{ $route[1] }}">Add {{ str_replace('-',' ',$route[1]) }}</a>
<!--end::Primary button-->
</div>
<!--end::Actions-->
@else
<!--begin::Actions-->
<div class="d-flex align-items-center gap-2 gap-lg-3">
<!--begin::Primary button-->
<a href="{{ route($route[0].'.'.$route[1].'.create') }}" class="btn btn-sm fw-bold btn-primary text-capitalize" data-bs-toggle="modal" data-bs-target="#kt_modal_{{ $route[0] }}_{{ $route[1] }}">Add {{ str_replace('-',' ',$route[1]) }}</a>
<!--end::Primary button-->
</div>
<!--end::Actions-->
@endif
@endif @endif
</div> </div>
<!--end::Toolbar container--> <!--end::Toolbar container-->
</div> </div>
<!--end::Toolbar--> <!--end::Toolbar-->
@endif