Commit 6a29c0a7 authored by Michael Ngei's avatar Michael Ngei

Merge branch 'iprsv2_brian' into 'master'

Coat of arms on Advanced form moved to left side and sidebar logo altered

See merge request !5
parents c8152de1 03948511
...@@ -73,12 +73,12 @@ return [ ...@@ -73,12 +73,12 @@ return [
'logo' => '<b>IPRS</b>', 'logo' => '<b>IPRS</b>',
'logo_img' => 'images/coat-of-arms.png', 'logo_img' => 'images/coat-of-arms.png',
'logo_img_class' => 'brand-image img-circle elevation-3', 'logo_img_class' => 'brand-image',
'logo_img_xl' => null, 'logo_img_xl' => null,
'logo_img_xl_class' => 'brand-image-xs', 'logo_img_xl_class' => 'brand-image-xs',
'logo_img_alt' => 'IPRS Logo', 'logo_img_alt' => 'IPRS Logo',
'logo-img-width' => 20, 'logo-img-width' => 35,
'logo-img-height' => 20, 'logo-img-height' => 35,
/* /*
|-------------------------------------------------------------------------- |--------------------------------------------------------------------------
......
<div> <div>
<div style="display: flex; justify-content: start; align-items: center; gap: 40px;">
<div style="display: flex; justify-content: center; align-items: center; flex-direction: column; margin-bottom: 20px;">
<img src="{{ asset('images/coat-of-arms.webp') }}"
alt="IPRS Logo" class="brand-image" style=" width: 8em;">
<h3 style="margin-top: 20px;">IPRS</h3>
</div>
<form class="form-inline" wire:submit="search" method="POST"> <div style="display: flex; flex: 0 0 auto; align-items: center; flex-direction: column;">
@csrf <img src="{{ asset('images/coat-of-arms.png') }}"
@method('POST') alt="IPRS Logo" class="brand-image" style=" width: 8em;">
<h3 style="margin-top: 20px;">IPRS</h3>
</div>
<div class="container"> <div style="flex: 1;">
<form class="form-inline" wire:submit="search" method="POST">
@csrf
@method('POST')
<div class="form-row"> <div class="container">
<div class="col-6 mb-3">
<label for="entrynumber">Entry Number</label>
<input type="text" wire:model="entrynumber" class="form-control adv-form-input capitalize" id="entrynumber" name="entrynumber">
</div> <div class="form-row">
<div class="col-6 mb-3">
<label for="entrynumber">Entry Number</label>
<input type="text" wire:model="entrynumber" class="form-control adv-form-input capitalize" id="entrynumber" name="entrynumber">
<div class="col-6 mb-3"> </div>
<label for="dateissue">Date of Issue</label>
<input type="date" class="form-control adv-form-input" id="dateissue" name="dateissue" placeholder="Date of Issue">
</div>
</div> <div class="col-6 mb-3">
<label for="dateissue">Date of Issue</label>
<input type="date" class="form-control adv-form-input" id="dateissue" name="dateissue" placeholder="Date of Issue">
</div>
<!-- button --> </div>
<div class="row" >
<div class="form-group col-md-2 d-flex"> <!-- button -->
<button type="submit" id="submitSearch" class="btn btn-block bg-gradient-success">Search</button> <div class="row" >
</div> <div class="form-group col-md-2 d-flex">
<div class="form-group col-md-2 d-flex"> <button type="submit" id="submitSearch" class="btn btn-block bg-gradient-success">Search</button>
<button type="submit" id="submitSearch" class="btn btn-block btn-outline-light">Reset</button> </div>
</div> <div class="form-group col-md-2 d-flex">
</div> <button type="submit" id="submitSearch" class="btn btn-block btn-outline-light">Reset</button>
</div>
</div>
</div>
</form>
</div> </div>
</form> </div>
</div> </div>
\ No newline at end of file
<div> <div>
<div style="display: flex; justify-content: center; align-items: center; flex-direction: column; margin-bottom: 20px;"> <div style="display: flex; justify-content: start; align-items: center; gap: 40px;">
<img src="{{ asset('images/coat-of-arms.webp') }}"
alt="IPRS Logo" class="brand-image" style=" width: 8em;">
<h3 style="margin-top: 20px;">IPRS</h3>
</div>
<form class="form-inline" wire:submit="search" method="POST"> <div style="display: flex; flex: 0 0 auto; align-items: center; flex-direction: column;">
@csrf <img src="{{ asset('images/coat-of-arms.png') }}"
@method('POST') alt="IPRS Logo" class="brand-image" style=" width: 8em;">
<h3 style="margin-top: 20px;">IPRS</h3>
</div>
<div class="container"> <div style="flex: 1;">
<form class="form-inline" wire:submit="search" method="POST">
@csrf
@method('POST')
<div class="form-row"> <div class="container">
<div class="col-6 mb-3">
<label for="entrynumber">Entry Number</label>
<input type="text" wire:model="entrynumber" class="form-control adv-form-input capitalize" id="entrynumber" name="entrynumber">
</div> <div class="form-row">
<div class="col-6 mb-3">
<label for="entrynumber">Entry Number</label>
<input type="text" wire:model="entrynumber" class="form-control adv-form-input capitalize" id="entrynumber" name="entrynumber">
<div class="col-6 mb-3"> </div>
<label for="dateissue">Date of Issue</label>
<input type="date" class="form-control adv-form-input" id="dateissue" name="dateissue" placeholder="Date of Issue">
</div>
</div> <div class="col-6 mb-3">
<label for="dateissue">Date of Issue</label>
<input type="date" class="form-control adv-form-input" id="dateissue" name="dateissue" placeholder="Date of Issue">
</div>
<!-- button --> </div>
<div class="row" >
<div class="form-group col-md-2 d-flex"> <!-- button -->
<button type="submit" id="submitSearch" class="btn btn-block bg-gradient-success">Search</button> <div class="row" >
</div> <div class="form-group col-md-2 d-flex">
<div class="form-group col-md-2 d-flex"> <button type="submit" id="submitSearch" class="btn btn-block bg-gradient-success">Search</button>
<button type="submit" id="submitSearch" class="btn btn-block btn-outline-light">Reset</button> </div>
</div> <div class="form-group col-md-2 d-flex">
</div> <button type="submit" id="submitSearch" class="btn btn-block btn-outline-light">Reset</button>
</div>
</div>
</div>
</form>
</div> </div>
</form> </div>
</div> </div>
\ No newline at end of file
<div> <div>
<div style="display: flex; justify-content: start; align-items: center; gap: 40px;">
<div style="display: flex; justify-content: center; align-items: center; flex-direction: column; margin-bottom: 20px;"> <div style="display: flex; flex: 0 0 auto; align-items: center; flex-direction: column;">
<img src="{{ asset('images/coat-of-arms.webp') }}" <img src="{{ asset('images/coat-of-arms.png') }}"
alt="IPRS Logo" class="brand-image" style=" width: 8em;"> alt="IPRS Logo" class="brand-image" style=" width: 8em;">
<h3 style="margin-top: 20px;">IPRS</h3> <h3 style="margin-top: 20px;">IPRS</h3>
</div> </div>
<form class="form-inline" wire:submit="search" method="POST"> <div style="flex: 1;">
@csrf <form class="form-inline" wire:submit="search" method="POST">
@method('POST') @csrf
@method('POST')
<div class="container"> <div class="container">
<div class="form-row"> <div class="form-row">
<div class="col-4"> <div class="col-4">
<label for="idnumber">Maisha Number</label> <label for="idnumber">Maisha Number</label>
<input type="text" wire:model="idnumber" class="form-control adv-form-input capitalize" id="idnumber" name="idnumber" placeholder="Enter Maisha Number" title="Enter Maisha Number"> <input type="text" wire:model="idnumber" class="form-control adv-form-input capitalize" id="idnumber" name="idnumber" placeholder="Enter Maisha Number" title="Enter Maisha Number">
</div> </div>
<div class="col-4"> <div class="col-4">
<label for="serialnumber">Serial Number</label> <label for="serialnumber">Serial Number</label>
<input type="text" wire:model="serialnum" class="form-control adv-form-input" id="serialumber" name="serialnumber" placeholder="Enter Serial Number" title="Enter Serial Number"> <input type="text" wire:model="serialnum" class="form-control adv-form-input" id="serialumber" name="serialnumber" placeholder="Enter Serial Number" title="Enter Serial Number">
</div> </div>
<div class="col-4"> <div class="col-4">
<label for="pinumber">PIN</label> <label for="pinumber">PIN</label>
<input type="text" wire:model="pin" class="form-control adv-form-input" id="pinumber" name="pinumber" placeholder="Enter PIN" title="Enter PIN"> <input type="text" wire:model="pin" class="form-control adv-form-input" id="pinumber" name="pinumber" placeholder="Enter PIN" title="Enter PIN">
</div> </div>
</div> </div>
<div class="form-row"> <div class="form-row">
<div class="col-4"> <div class="col-4">
<label for="firstname">First Name</label> <label for="firstname">First Name</label>
<input type="text" wire:model="firstname" class="form-control adv-form-input" id="firstname" name="firstname" placeholder="Enter First Name" title="Firstname"> <input type="text" wire:model="firstname" class="form-control adv-form-input" id="firstname" name="firstname" placeholder="Enter First Name" title="Firstname">
</div> </div>
<div class="col-4"> <div class="col-4">
<label for="surname">Surname</label> <label for="surname">Surname</label>
<input type="text" wire:model="surname" class="form-control adv-form-input" id="surname" name="surname" placeholder="Enter Surname" title="Surname"> <input type="text" wire:model="surname" class="form-control adv-form-input" id="surname" name="surname" placeholder="Enter Surname" title="Surname">
</div> </div>
<div class="col-4"> <div class="col-4">
<label for="othername">Other Name</label> <label for="othername">Other Name</label>
<input type="text" wire:model="othername" class="form-control adv-form-input" id="othername" name="othername" placeholder="Enter Othername" title="Othername"> <input type="text" wire:model="othername" class="form-control adv-form-input" id="othername" name="othername" placeholder="Enter Othername" title="Othername">
</div> </div>
</div> </div>
<div class="form-row"> <div class="form-row">
<div class="col-2"> <div class="col-2">
<div class="form-group" id="gender" > <div class="form-group" id="gender" >
<select class="form-control adv-form-input" name="gender" wire:model="gender"> <select class="form-control adv-form-input" name="gender" wire:model="gender">
<option>Gender</option> <option>Gender</option>
<option value="M">Male</option> <option value="M">Male</option>
<option value="F">Female</option> <option value="F">Female</option>
</select> </select>
</div>
</div>
<div class="col-2">
<input type="number" class="form-control adv-form-input" id="yob" name="yob" placeholder="Year of Birth" title="Year of Birth">
</div>
<div class="col-2">
<div class="form-group" id="month">
<select class="form-control adv-form-input" name="month" wire:model="month" >
<option>Month of Birth</option>
<option value=1>January</option>
<option value=2>February</option>
<option value=3>March</option>
<option value=4>April</option>
<option value=5>May</option>
<option value=6>June</option>
<option value=7>July</option>
<option value=8>August</option>
<option value=9>September</option>
<option value=10>October</option>
<option value=11>November</option>
<option value=12>December</option>
</select>
</div>
</div>
</div> </div>
</div>
<div class="col-2"> <!-- button -->
<input type="number" class="form-control adv-form-input" id="yob" name="yob" placeholder="Year of Birth" title="Year of Birth"> <div class="row" >
</div> <div class="form-group col-md-2 d-flex">
<div class="col-2"> <button type="submit" id="submitSearch" class="btn btn-block bg-gradient-success">Search</button>
<div class="form-group" id="month"> </div>
<select class="form-control adv-form-input" name="month" wire:model="month" > <div class="form-group col-md-2 d-flex">
<option>Month of Birth</option> <button type="submit" id="submitSearch" class="btn btn-block btn-outline-light">Reset</button>
<option value=1>January</option> </div>
<option value=2>February</option>
<option value=3>March</option>
<option value=4>April</option>
<option value=5>May</option>
<option value=6>June</option>
<option value=7>July</option>
<option value=8>August</option>
<option value=9>September</option>
<option value=10>October</option>
<option value=11>November</option>
<option value=12>December</option>
</select>
</div> </div>
</div> </div>
</div>
<!-- button --> </form>
<div class="row" >
<div class="form-group col-md-2 d-flex">
<button type="submit" id="submitSearch" class="btn btn-block bg-gradient-success">Search</button>
</div>
<div class="form-group col-md-2 d-flex">
<button type="submit" id="submitSearch" class="btn btn-block btn-outline-light">Reset</button>
</div>
</div>
</div> </div>
</div>
</form>
</div> </div>
<div> <div>
<div style="display: flex; justify-content: center; align-items: center; flex-direction: column; margin-bottom: 20px;"> <div style="display: flex; justify-content: start; align-items: center; gap: 40px;">
<img src="{{ asset('images/coat-of-arms.webp') }}"
alt="IPRS Logo" class="brand-image" style=" width: 8em;">
<h3 style="margin-top: 20px;">IPRS</h3>
</div>
<form class="form-inline" wire:submit="search" method="POST">
@csrf
@method('POST')
<div class="container">
<div class="form-row">
<div class="col-6 mb-3">
<label for="passnumber">Passport Number</label>
<input type="text" wire:model="passnumber" class="form-control adv-form-input capitalize" id="passnumber" name="passnumber">
</div>
<div class="col-6 mb-3">
<label for="idnumber">ID Number</label>
<input type="text" wire:model="idnumber" class="form-control adv-form-input capitalize" id="idnumber" name="idnumber">
</div>
<div class="col-6 mb-3"> <div style="display: flex; flex: 0 0 auto; align-items: center; flex-direction: column;">
<label for="dateissue">Date of Issue</label> <img src="{{ asset('images/coat-of-arms.png') }}"
<input type="date" class="form-control adv-form-input" id="dateissue" name="dateissue" placeholder="Date of Issue"> alt="IPRS Logo" class="brand-image" style=" width: 8em;">
</div> <h3 style="margin-top: 20px;">IPRS</h3>
</div>
<div class="col-6 mb-3"> <div style="flex: 1;">
<label for="dateexpiry">Date of Expiry</label>
<input type="date" class="form-control adv-form-input" id="dateexpiry" name="dateexpiry" placeholder="Date of Expiry"> <form class="form-inline" wire:submit="search" method="POST">
</div> @csrf
</div> @method('POST')
<div class="container">
<div class="form-row">
<div class="col-6 mb-3">
<label for="passnumber">Passport Number</label>
<input type="text" wire:model="passnumber" class="form-control adv-form-input capitalize" id="passnumber" name="passnumber">
</div>
<div class="col-6 mb-3">
<label for="idnumber">ID Number</label>
<input type="text" wire:model="idnumber" class="form-control adv-form-input capitalize" id="idnumber" name="idnumber">
</div>
<div class="col-6 mb-3">
<label for="dateissue">Date of Issue</label>
<input type="date" class="form-control adv-form-input" id="dateissue" name="dateissue" placeholder="Date of Issue">
</div>
<div class="col-6 mb-3">
<label for="dateexpiry">Date of Expiry</label>
<input type="date" class="form-control adv-form-input" id="dateexpiry" name="dateexpiry" placeholder="Date of Expiry">
</div>
</div>
<!-- button -->
<div class="row" >
<div class="form-group col-md-2 d-flex">
<button type="submit" id="submitSearch" class="btn btn-block bg-gradient-success">Search</button>
</div>
<div class="form-group col-md-2 d-flex">
<button type="submit" id="submitSearch" class="btn btn-block btn-outline-light">Reset</button>
</div>
</div>
<!-- button -->
<div class="row" >
<div class="form-group col-md-2 d-flex">
<button type="submit" id="submitSearch" class="btn btn-block bg-gradient-success">Search</button>
</div> </div>
<div class="form-group col-md-2 d-flex"> </form>
<button type="submit" id="submitSearch" class="btn btn-block btn-outline-light">Reset</button>
</div>
</div>
</div> </div>
</form> </div>
</div> </div>
\ No newline at end of file
<div> <div>
<div style="display: flex; justify-content: center; align-items: center; flex-direction: column; margin-bottom: 20px;"> <div style="display: flex; justify-content: start; align-items: center; gap: 40px;">
<img src="{{ asset('images/coat-of-arms.webp') }}"
alt="IPRS Logo" class="brand-image" style=" width: 8em;">
<h3 style="margin-top: 20px;">IPRS</h3>
</div>
<form class="form-inline" wire:submit="search" method="POST">
@csrf
@method('POST')
<div class="container">
<div class="form-row">
<div class="col-6 mb-3">
<label for="idnumber">Document number</label>
<input type="text" wire:model="docnumber" class="form-control adv-form-input capitalize" id="docnumber" name="docnumber">
</div>
<div class="col-6 mb-3">
<label for="idnumber">ID number</label>
<input type="text" wire:model="idnumber" class="form-control adv-form-input capitalize" id="idnumber" name="idnumber">
</div>
<div class="col-6 mb-3"> <div style="display: flex; flex: 0 0 auto; align-items: center; flex-direction: column;">
<label for="dateissue">Date of Issue</label> <img src="{{ asset('images/coat-of-arms.png') }}"
<input type="date" class="form-control adv-form-input" id="dateissue" name="dateissue" placeholder="Date of Issue"> alt="IPRS Logo" class="brand-image" style=" width: 8em;">
</div> <h3 style="margin-top: 20px;">IPRS</h3>
</div>
<div class="col-6 mb-3"> <div style="flex: 1;">
<label for="dateexpiry">Date of Expiry</label>
<input type="date" class="form-control adv-form-input" id="dateexpiry" name="dateexpiry" placeholder="Date of Expiry"> <form class="form-inline" wire:submit="search" method="POST">
</div> @csrf
</div> @method('POST')
<div class="container">
<div class="form-row">
<div class="col-6 mb-3">
<label for="idnumber">Document number</label>
<input type="text" wire:model="docnumber" class="form-control adv-form-input capitalize" id="docnumber" name="docnumber">
</div>
<div class="col-6 mb-3">
<label for="idnumber">ID number</label>
<input type="text" wire:model="idnumber" class="form-control adv-form-input capitalize" id="idnumber" name="idnumber">
</div>
<div class="col-6 mb-3">
<label for="dateissue">Date of Issue</label>
<input type="date" class="form-control adv-form-input" id="dateissue" name="dateissue" placeholder="Date of Issue">
</div>
<div class="col-6 mb-3">
<label for="dateexpiry">Date of Expiry</label>
<input type="date" class="form-control adv-form-input" id="dateexpiry" name="dateexpiry" placeholder="Date of Expiry">
</div>
</div>
<!-- button -->
<div class="row" >
<div class="form-group col-md-2 d-flex">
<button type="submit" id="submitSearch" class="btn btn-block bg-gradient-success">Search</button>
</div>
<div class="form-group col-md-2 d-flex">
<button type="submit" id="submitSearch" class="btn btn-block btn-outline-light">Reset</button>
</div>
</div>
<!-- button -->
<div class="row" >
<div class="form-group col-md-2 d-flex">
<button type="submit" id="submitSearch" class="btn btn-block bg-gradient-success">Search</button>
</div> </div>
<div class="form-group col-md-2 d-flex"> </form>
<button type="submit" id="submitSearch" class="btn btn-block btn-outline-light">Reset</button>
</div>
</div>
</div> </div>
</form> </div>
</div> </div>
\ No newline at end of file
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
@php( $dashboard_url = $dashboard_url ? url($dashboard_url) : '' ) @php( $dashboard_url = $dashboard_url ? url($dashboard_url) : '' )
@endif @endif
<a href="{{ $dashboard_url }}" style="margin-left: 10px;" <a href="{{ $dashboard_url }}"
@if($layoutHelper->isLayoutTopnavEnabled()) @if($layoutHelper->isLayoutTopnavEnabled())
class="navbar-brand {{ config('adminlte.classes_brand') }}" class="navbar-brand {{ config('adminlte.classes_brand') }}"
@else @else
...@@ -18,13 +18,11 @@ ...@@ -18,13 +18,11 @@
{{-- Small brand logo --}} {{-- Small brand logo --}}
<img src="{{ asset(config('adminlte.logo_img', 'vendor/adminlte/dist/img/AdminLTELogo.png')) }}" <img src="{{ asset(config('adminlte.logo_img', 'vendor/adminlte/dist/img/AdminLTELogo.png')) }}"
alt="{{ config('adminlte.logo_img_alt', 'AdminLTE') }}" alt="{{ config('adminlte.logo_img_alt', 'AdminLTE') }}"
class="{{ config('adminlte.logo_img_class', 'brand-image img-circle elevation-3') }}" class="{{ config('adminlte.logo_img_class', 'brand-image') }}">
style="width: 35px; height: 35px;">
{{-- Brand text --}} {{-- Brand text --}}
<span class="brand-text font-weight-light {{ config('adminlte.classes_brand_text') }}" > &nbsp;|&nbsp; <span class="brand-text font-weight-light {{ config('adminlte.classes_brand_text') }}" > &nbsp;|&nbsp;
<!-- {!! config('adminlte.logo', '<b>Admin</b>LTE') !!} --> {!! config('adminlte.logo') !!}
<b>IPRS</b>
</span> </span>
</a> </a>
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment