First stabs at improvements

Signed-off-by: snipe <snipe@snipe.net>
This commit is contained in:
snipe 2025-04-23 04:48:47 +01:00
parent eaaac76435
commit f05b2ad9be
6 changed files with 131 additions and 134 deletions

View file

@ -54,7 +54,8 @@
<!-- CSRF Token -->
<fieldset>
<fieldset name="login" aria-label="login">
<legend></legend>
<div class="form-group{{ $errors->has('username') ? ' has-error' : '' }}">
<label for="username">
@ -74,7 +75,7 @@
</div>
<div class="form-group">
<label class="form-control">
<input name="remember" type="checkbox" value="1"> {{ trans('auth/general.remember_me') }}
<input name="remember" type="checkbox" value="1" id="remember"> {{ trans('auth/general.remember_me') }}
</label>
</div>
</fieldset>
@ -94,7 +95,9 @@
@if (config('app.require_saml'))
<a class="btn btn-primary btn-block" href="{{ route('saml.login') }}">{{ trans('auth/general.saml_login') }}</a>
@else
<button class="btn btn-primary btn-block">{{ trans('auth/general.login') }}</button>
<button class="btn btn-primary btn-block" type="submit" id="submit">
{{ trans('auth/general.login') }}
</button>
@endif
@if ($snipeSettings->custom_forgot_pass_url)

View file

@ -27,127 +27,121 @@
@endif
<div class="row">
<!-- panel -->
<div class="col-lg-2 col-xs-6">
<a href="{{ route('hardware.index') }}">
<!-- small box -->
<div class="dashboard small-box bg-teal">
<div class="inner">
<h3>{{ number_format(\App\Models\Asset::AssetsForShow()->count()) }}</h3>
<p>{{ trans('general.assets') }}</p>
</div>
<div class="icon" aria-hidden="true">
<x-icon type="assets" />
</div>
@can('index', \App\Models\Asset::class)
<a href="{{ route('hardware.index') }}" class="small-box-footer">{{ trans('general.view_all') }}
<x-icon type="arrow-circle-right" />
<!-- panel -->
<div class="col-lg-2 col-xs-6">
<a href="{{ route('hardware.index') }}">
<!-- small hardware box -->
<div class="dashboard small-box bg-teal">
<div class="inner">
<h3>{{ number_format(\App\Models\Asset::AssetsForShow()->count()) }}</h3>
<p>{{ trans('general.assets') }}</p>
</div>
<div class="icon" aria-hidden="true">
<x-icon type="assets" />
</div>
<a href="{{ route('hardware.index') }}" class="small-box-footer">
{{ trans('general.view_all') }}
<x-icon type="arrow-circle-right" />
</a>
</div>
</a>
@endcan
</div>
</a>
</div><!-- ./col -->
</div><!-- ./col -->
<div class="col-lg-2 col-xs-6">
<a href="{{ route('licenses.index') }}">
<!-- small box -->
<div class="dashboard small-box bg-maroon">
<div class="inner">
<h3>{{ number_format($counts['license']) }}</h3>
<p>{{ trans('general.licenses') }}</p>
</div>
<div class="icon" aria-hidden="true">
<x-icon type="licenses" />
</div>
@can('view', \App\Models\License::class)
<a href="{{ route('licenses.index') }}" class="small-box-footer">{{ trans('general.view_all') }}
<x-icon type="arrow-circle-right" />
</a>
@endcan
</div>
</a>
</div><!-- ./col -->
<div class="col-lg-2 col-xs-6">
<!-- small box -->
<a href="{{ route('accessories.index') }}">
<div class="dashboard small-box bg-orange">
<div class="inner">
<h3> {{ number_format($counts['accessory']) }}</h3>
<p>{{ trans('general.accessories') }}</p>
</div>
<div class="icon" aria-hidden="true">
<x-icon type="accessories" />
</div>
@can('index', \App\Models\Accessory::class)
<a href="{{ route('accessories.index') }}" class="small-box-footer">{{ trans('general.view_all') }}
<x-icon type="arrow-circle-right" />
</a>
@endcan
</div>
</a>
</div><!-- ./col -->
<div class="col-lg-2 col-xs-6">
<!-- small box -->
<a href="{{ route('consumables.index') }}">
<div class="dashboard small-box bg-purple">
<div class="inner">
<h3> {{ number_format($counts['consumable']) }}</h3>
<p>{{ trans('general.consumables') }}</p>
</div>
<div class="icon" aria-hidden="true">
<x-icon type="consumables" />
</div>
@can('index', \App\Models\Consumable::class)
<a href="{{ route('consumables.index') }}" class="small-box-footer">{{ trans('general.view_all') }}
<x-icon type="arrow-circle-right" />
<div class="col-lg-2 col-xs-6">
<a href="{{ route('licenses.index') }}">
<!-- small license box -->
<div class="dashboard small-box bg-maroon">
<div class="inner">
<h3>{{ number_format($counts['license']) }}</h3>
<p>{{ trans('general.licenses') }}</p>
</div>
<div class="icon" aria-hidden="true">
<x-icon type="licenses" />
</div>
<a href="{{ route('licenses.index') }}" class="small-box-footer">
{{ trans('general.view_all') }}
<x-icon type="arrow-circle-right" />
</a>
</div>
</a>
@endcan
</div>
</div><!-- ./col -->
</div><!-- ./col -->
<div class="col-lg-2 col-xs-6">
<a href="{{ route('components.index') }}">
<!-- small box -->
<div class="dashboard small-box bg-yellow">
<div class="inner">
<h3>{{ number_format($counts['component']) }}</h3>
<p>{{ trans('general.components') }}</p>
</div>
<div class="icon" aria-hidden="true">
<x-icon type="components" />
</div>
@can('view', \App\Models\License::class)
<a href="{{ route('components.index') }}" class="small-box-footer">{{ trans('general.view_all') }}
<x-icon type="arrow-circle-right" />
</a>
@endcan
</div>
</a>
</div><!-- ./col -->
<div class="col-lg-2 col-xs-6">
<a href="{{ route('users.index') }}">
<!-- small box -->
<div class="dashboard small-box bg-light-blue">
<div class="inner">
<h3>{{ number_format($counts['user']) }}</h3>
<p>{{ trans('general.people') }}</p>
</div>
<div class="icon" aria-hidden="true">
<x-icon type="users" />
</div>
@can('view', \App\Models\License::class)
<a href="{{ route('users.index') }}" class="small-box-footer">{{ trans('general.view_all') }}
<x-icon type="arrow-circle-right" />
</a>
@endcan
</div>
</a>
</div><!-- ./col -->
<div class="col-lg-2 col-xs-6">
<!-- small accessories box -->
<a href="{{ route('accessories.index') }}">
<div class="dashboard small-box bg-orange">
<div class="inner">
<h3> {{ number_format($counts['accessory']) }}</h3>
<p>{{ trans('general.accessories') }}</p>
</div>
<div class="icon" aria-hidden="true">
<x-icon type="accessories" />
</div>
<a href="{{ route('accessories.index') }}" class="small-box-footer">
{{ trans('general.view_all') }}
<x-icon type="arrow-circle-right" />
</a>
</div>
</a>
</div><!-- ./col -->
<div class="col-lg-2 col-xs-6">
<!-- small consumables box -->
<a href="{{ route('consumables.index') }}">
<div class="dashboard small-box bg-purple">
<div class="inner">
<h3> {{ number_format($counts['consumable']) }}</h3>
<p>{{ trans('general.consumables') }}</p>
</div>
<div class="icon" aria-hidden="true">
<x-icon type="consumables" />
</div>
<a href="{{ route('consumables.index') }}" class="small-box-footer">
{{ trans('general.view_all') }}
<x-icon type="arrow-circle-right" />
</a>
</div>
</a>
</div><!-- ./col -->
<div class="col-lg-2 col-xs-6">
<!-- small components box -->
<a href="{{ route('components.index') }}">
<div class="dashboard small-box bg-yellow">
<div class="inner">
<h3>{{ number_format($counts['component']) }}</h3>
<p>{{ trans('general.components') }}</p>
</div>
<div class="icon" aria-hidden="true">
<x-icon type="components" />
</div>
<a href="{{ route('components.index') }}" class="small-box-footer">
{{ trans('general.view_all') }}
<x-icon type="arrow-circle-right" />
</a>
</div>
</a>
</div><!-- ./col -->
<div class="col-lg-2 col-xs-6">
<!-- small users box -->
<a href="{{ route('users.index') }}">
<div class="dashboard small-box bg-light-blue">
<div class="inner">
<h3>{{ number_format($counts['user']) }}</h3>
<p>{{ trans('general.people') }}</p>
</div>
<div class="icon" aria-hidden="true">
<x-icon type="users" />
</div>
<a href="{{ route('users.index') }}" class="small-box-footer">{{ trans('general.view_all') }}
<x-icon type="arrow-circle-right" />
</a>
</div>
</a>
</div><!-- ./col -->
</div>
</div>

View file

@ -46,15 +46,15 @@
<body class="hold-transition login-page">
@if (($snipeSettings) && ($snipeSettings->logo!=''))
<center>
<a href="{{ config('app.url') }}"><img id="login-logo" src="{{ Storage::disk('public')->url('').e($snipeSettings->logo) }}"></a>
</center>
<div class="text-center">
<a href="{{ config('app.url') }}">
<img id="login-logo" src="{{ Storage::disk('public')->url('').e($snipeSettings->logo) }}" alt="{{ $snipeSettings->site_name }}">
</a>
</div>
@endif
<!-- Content -->
@yield('content')
<div class="text-center" style="padding-top: 100px;">
@if (($snipeSettings) && ($snipeSettings->privacy_policy_link!=''))
<a target="_blank" rel="noopener" href="{{ $snipeSettings->privacy_policy_link }}" target="_new">{{ trans('admin/settings/general.privacy_policy') }}</a>

View file

@ -400,8 +400,8 @@ dir="{{ Helper::determineLanguageDirection() }}">
{{ trans('general.logout') }}
</a>
<form id="logout-form" action="{{ route('logout.post') }}" method="POST"
style="display: none;">
<form id="logout-form" action="{{ route('logout.post') }}" method="POST" style="display: none;">
<button type="submit" style="display: none;" title="logout"></button>
{{ csrf_field() }}
</form>

View file

@ -1,5 +1,5 @@
@if ($errors->any())
<div class="col-md-12">
<div class="col-md-12" id="error-notification">
<div class="alert alert-danger fade in">
<button type="button" class="close" data-dismiss="alert">&times;</button>
<i class="fas fa-exclamation-triangle faa-pulse animated"></i>
@ -12,7 +12,7 @@
@if ($message = session()->get('status'))
<div class="col-md-12">
<div class="col-md-12" id="success-notification">
<div class="alert alert-success fade in">
<button type="button" class="close" data-dismiss="alert">&times;</button>
<i class="fas fa-check faa-pulse animated"></i>
@ -24,7 +24,7 @@
@if ($message = session()->get('success'))
<div class="col-md-12">
<div class="col-md-12" id="success-notification">
<div class="alert alert-success fade in">
<button type="button" class="close" data-dismiss="alert">&times;</button>
<i class="fas fa-check faa-pulse animated"></i>
@ -37,7 +37,7 @@
@if ($message = session()->get('success-unescaped'))
<div class="col-md-12">
<div class="col-md-12" id="success-notification">
<div class="alert alert-success fade in">
<button type="button" class="close" data-dismiss="alert">&times;</button>
<i class="fas fa-check faa-pulse animated"></i>
@ -51,7 +51,7 @@
@if ($assets = session()->get('assets'))
@foreach ($assets as $asset)
<div class="col-md-12">
<div class="col-md-12" id="multi-error-notification">
<div class="alert alert-info fade in">
<button type="button" class="close" data-dismiss="alert">&times;</button>
<i class="fas fa-info-circle faa-pulse animated"></i>
@ -77,7 +77,7 @@
@if ($consumables = session()->get('consumables'))
@foreach ($consumables as $consumable)
<div class="col-md-12">
<div class="col-md-12" id="success-notification">
<div class="alert alert-info fade in">
<button type="button" class="close" data-dismiss="alert">&times;</button>
<i class="fas fa-info-circle faa-pulse animated"></i>

View file

@ -322,7 +322,7 @@
</fieldset>
<fieldset>
<fieldset name="checkin-preferences">
<legend>
{{ trans('admin/settings/general.legends.checkin') }}
</legend>
@ -342,7 +342,7 @@
<fieldset>
<fieldset name="dashboard">
<legend>
{{ trans('admin/settings/general.legends.dashboard') }}
</legend>