Small UI tweaks for accessories

This commit is contained in:
snipe 2017-09-28 21:18:16 -07:00
parent 4d32f2b337
commit 42c2a66946
3 changed files with 64 additions and 47 deletions

View file

@ -2,25 +2,37 @@
{{-- Page title --}} {{-- Page title --}}
@section('title') @section('title')
{{ trans('admin/hardware/general.checkin') }} {{ trans('admin/accessories/general.checkin') }}
@parent @parent
@stop @stop
@section('header_right')
<a href="{{ URL::previous() }}" class="btn btn-primary pull-right">
{{ trans('general.back') }}</a>
@stop
{{-- Page content --}} {{-- Page content --}}
@section('content') @section('content')
<div class="row header">
<div class="col-md-12">
<a href="{{ URL::previous() }}" class="btn-flat gray pull-right"><i class="fa fa-arrow-left icon-white"></i> {{ trans('general.back') }}</a>
<h3> {{ trans('general.checkin') }}</h3>
</div>
</div>
<div class="row form-wrapper">
<!-- left column -->
<div class="col-md-10 column">
<form class="form-horizontal" method="post" action="" autocomplete="off"> <div class="row">
<div class="col-md-9">
<form class="form-horizontal" method="post" action="" autocomplete="off">
<!-- CSRF Token -->
<input type="hidden" name="_token" value="{{ csrf_token() }}" />
<div class="box box-default">
@if ($accessory->id)
<div class="box-header with-border">
<h3 class="box-title">{{ $accessory->name }}</h3>
</div><!-- /.box-header -->
@endif
<div class="box-body">
<form class="form-horizontal" method="post" action="" autocomplete="off">
<!-- CSRF Token --> <!-- CSRF Token -->
<input type="hidden" name="_token" value="{{ csrf_token() }}" /> <input type="hidden" name="_token" value="{{ csrf_token() }}" />
@ -53,8 +65,13 @@
</div> </div>
</div> </div>
</form> </form>
</div> <!-- .col-md-10.column --> </div>
</div> <!-- .row.form-wrapper --> <div class="box-footer text-right">
<button type="submit" class="btn btn-success"><i class="fa fa-check icon-white"></i> {{ trans('general.save') }}</button>
</div>
</div> <!-- .box.box-default -->
</form>
</div> <!-- .col-md-9-->
</div> <!-- .row -->
@stop @stop

View file

@ -2,7 +2,7 @@
{{-- Page title --}} {{-- Page title --}}
@section('title') @section('title')
{{ trans('admin/hardware/general.checkout') }} {{ trans('admin/accessories/general.checkout') }}
@parent @parent
@stop @stop
@section('header_right') @section('header_right')

View file

@ -87,8 +87,8 @@
&nbsp; &nbsp;</span> &nbsp; &nbsp;</span>
</span> </span>
@endif @endif
{{ $asset->present()->statusText() }} <a href="{{ route('statuslabels.show', $asset->assetstatus->id) }}">{{ $asset->present()->statusText() }}</a>
({{ $asset->assetstatus->getStatuslabelType() }}) <label class="label label-default">{{ $asset->assetstatus->getStatuslabelType() }}</label>
</td> </td>
</tr> </tr>
@endif @endif