mirror of
https://github.com/snipe/snipe-it.git
synced 2025-02-21 03:15:45 -08:00
Reformat all view files. (#3105)
* Reformat all view files. Check for matching tags and rearrange to make everything line up. * Fix regression on asset create where the log was no longer saved.
This commit is contained in:
Daniel Meltzer
snipe
parent
cafafe851c
commit
13cf11368f
|
|
@ -116,7 +116,7 @@ class Asset extends Depreciable
|
|||
|
||||
|
||||
if ($this->save()) {
|
||||
$this->logCheckout($note);
|
||||
$log = $this->logCheckout($note);
|
||||
if ((($this->requireAcceptance()=='1') || ($this->getEula())) && ($user->email!='')) {
|
||||
$this->checkOutNotifyMail($log->id, $user, $checkout_at, $expected_checkin, $note);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -193,14 +193,13 @@ class AssetPresenter extends Presenter
|
|||
**/
|
||||
public function name()
|
||||
{
|
||||
|
||||
if (empty($this->name)) {
|
||||
if (isset($this->model)) {
|
||||
return $this->model->name.' ('.$this->asset_tag.')';
|
||||
}
|
||||
return $this->asset_tag;
|
||||
} else {
|
||||
return $this->name;
|
||||
return $this->name.' ('.$this->asset_tag.')';
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -62,7 +62,7 @@ class ConsumablePresenter extends Presenter
|
|||
* Link to this consumables name
|
||||
* @return string
|
||||
*/
|
||||
private function nameUrl()
|
||||
public function nameUrl()
|
||||
{
|
||||
return (string)link_to_route('consumables.show', $this->name, $this->id);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -65,7 +65,7 @@ class UserPresenter extends Presenter
|
|||
$result = [
|
||||
'id' => $this->id,
|
||||
'checkbox' => ($status!='deleted') ? '<div class="text-center hidden-xs hidden-sm"><input type="checkbox" name="edit_user['.e($this->id).']" class="one_required"></div>' : '',
|
||||
'name' => $this->fullName(),
|
||||
'name' => $this->nameUrl(),
|
||||
'jobtitle' => $this->jobtitle,
|
||||
'email' => $this->emailLink(),
|
||||
'username' => $this->username,
|
||||
|
|
|
|||
|
|
@ -24,8 +24,6 @@
|
|||
<!-- CSRF Token -->
|
||||
<input type="hidden" name="_token" value="{{ csrf_token() }}" />
|
||||
|
||||
|
||||
|
||||
@if ($accessory->name)
|
||||
<!-- accessory name -->
|
||||
<div class="form-group">
|
||||
|
|
@ -40,7 +38,9 @@
|
|||
<div class="form-group {{ $errors->has('note') ? 'error' : '' }}">
|
||||
<label for="note" class="col-md-2 control-label">{{ trans('admin/hardware/form.notes') }}</label>
|
||||
<div class="col-md-7">
|
||||
<textarea class="col-md-6 form-control" id="note" name="note">{{ Input::old('note', $accessory->note) }}</textarea>
|
||||
<textarea class="col-md-6 form-control" id="note" name="note">
|
||||
{{ Input::old('note', $accessory->note) }}
|
||||
</textarea>
|
||||
{!! $errors->first('note', '<span class="alert-msg"><i class="fa fa-times"></i> :message</span>') !!}
|
||||
</div>
|
||||
</div>
|
||||
|
|
@ -54,7 +54,7 @@
|
|||
</div>
|
||||
|
||||
</form>
|
||||
</div>
|
||||
</div>
|
||||
</div> <!-- .col-md-10.column -->
|
||||
</div> <!-- .row.form-wrapper -->
|
||||
|
||||
@stop
|
||||
|
|
|
|||
|
|
@ -52,8 +52,10 @@
|
|||
<!-- User -->
|
||||
|
||||
<div class="form-group {{ $errors->has('assigned_to') ? ' has-error' : '' }}">
|
||||
<label for="assigned_to" class="col-md-3 control-label">{{ trans('admin/hardware/form.checkout_to') }}
|
||||
<i class='icon-asterisk'></i></label>
|
||||
<label for="assigned_to" class="col-md-3 control-label">
|
||||
{{ trans('admin/hardware/form.checkout_to') }}
|
||||
<i class='icon-asterisk'></i>
|
||||
</label>
|
||||
<div class="col-md-9">
|
||||
{{ Form::select('assigned_to', $users_list , Input::old('assigned_to', $accessory->assigned_to), array('class'=>'select2', 'style'=>'min-width:350px')) }}
|
||||
{!! $errors->first('assigned_to', '<span class="alert-msg"><i class="fa fa-times"></i> :message</span>') !!}
|
||||
|
|
@ -70,7 +72,6 @@
|
|||
|
||||
@if ($accessory->getEula())
|
||||
<div class="form-group">
|
||||
|
||||
<div class="col-md-9 col-md-offset-3">
|
||||
<p class="hint-block">{{ trans('admin/categories/general.required_eula') }}</p>
|
||||
</div>
|
||||
|
|
@ -81,10 +82,10 @@
|
|||
<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>
|
||||
</div>
|
||||
</div> <!-- .box.box-default -->
|
||||
</form>
|
||||
</div>
|
||||
</div> <!-- .col-md-9-->
|
||||
</div> <!-- .row -->
|
||||
|
||||
|
||||
@stop
|
||||
|
|
|
|||
|
|
@ -15,7 +15,6 @@
|
|||
{{-- Page content --}}
|
||||
@section('content')
|
||||
|
||||
|
||||
<div class="row">
|
||||
<div class="col-md-12">
|
||||
|
||||
|
|
@ -34,8 +33,10 @@
|
|||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
@stop
|
||||
|
||||
@section('moar_scripts')
|
||||
@include ('partials.bootstrap-table', [
|
||||
|
|
@ -44,6 +45,3 @@
|
|||
'columns' => \App\Presenters\AccessoryPresenter::dataTableLayout()
|
||||
])
|
||||
@stop
|
||||
|
||||
|
||||
@stop
|
||||
|
|
|
|||
|
|
@ -22,17 +22,22 @@
|
|||
<ul class="dropdown-menu pull-right" role="menu" aria-labelledby="dropdownMenu1">
|
||||
@if ($accessory->assigned_to != '')
|
||||
@can('checkin', \App\Models\Accessory::class)
|
||||
<li role="presentation"><a href="{{ route('checkin/accessory', $accessory->id) }}">{{ trans('admin/accessories/general.checkin') }}</a></li>
|
||||
<li role="presentation">
|
||||
<a href="{{ route('checkin/accessory', $accessory->id) }}">{{ trans('admin/accessories/general.checkin') }}</a>
|
||||
</li>
|
||||
@endcan
|
||||
@else
|
||||
@can('checkout', \App\Models\Accessory::class)
|
||||
<li role="presentation"><a href="{{ route('checkout/accessory', $accessory->id) }}">{{ trans('admin/accessories/general.checkout') }}</a></li>
|
||||
<li role="presentation">
|
||||
<a href="{{ route('checkout/accessory', $accessory->id) }}">{{ trans('admin/accessories/general.checkout') }}</a>
|
||||
</li>
|
||||
@endcan
|
||||
@endif
|
||||
@can('update', \App\Models\Accessory::class)
|
||||
<li role="presentation"><a href="{{ route('accessories.edit', $accessory->id) }}">{{ trans('admin/accessories/general.edit') }}</a></li>
|
||||
<li role="presentation">
|
||||
<a href="{{ route('accessories.edit', $accessory->id) }}">{{ trans('admin/accessories/general.edit') }}</a>
|
||||
</li>
|
||||
@endcan
|
||||
|
||||
</ul>
|
||||
</div>
|
||||
@endcan
|
||||
|
|
@ -55,8 +60,8 @@
|
|||
data-url="{{ route('api.accessories.view', $accessory->id) }}"
|
||||
data-cookie="true"
|
||||
data-click-to-select="true"
|
||||
data-cookie-id-table="accessoryUsersTable">
|
||||
|
||||
data-cookie-id-table="accessoryUsersTable"
|
||||
>
|
||||
<thead>
|
||||
<tr>
|
||||
<th data-switchable="false" data-searchable="false" data-sortable="false" data-field="name">{{ trans('general.user') }}</th>
|
||||
|
|
@ -70,8 +75,8 @@
|
|||
</div>
|
||||
|
||||
|
||||
<!-- side address column -->
|
||||
<div class="col-md-3">
|
||||
<!-- side address column -->
|
||||
<div class="col-md-3">
|
||||
|
||||
<h4>{{ trans('admin/accessories/general.about_accessories_title') }}</h4>
|
||||
<p>{{ trans('admin/accessories/general.about_accessories_text') }} </p>
|
||||
|
|
@ -81,11 +86,10 @@
|
|||
@endcan
|
||||
</div>
|
||||
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
@stop
|
||||
|
||||
@section('moar_scripts')
|
||||
@include ('partials.bootstrap-table', ['exportFile' => 'accessory' . $accessory->name . '-export', 'search' => false])
|
||||
@stop
|
||||
|
||||
@stop
|
||||
|
|
|
|||
|
|
@ -34,21 +34,18 @@
|
|||
<input type="hidden" name="logId" value="{{ $findlog->id }}" />
|
||||
|
||||
|
||||
<div class="row">
|
||||
<div class="row">
|
||||
<div class="col-sm-10 col-sm-offset-1 col-md-8 col-md-offset-2">
|
||||
|
||||
<div class="panel box box-default">
|
||||
|
||||
<div class="box-body">
|
||||
<div class="col-md-12">
|
||||
|
||||
|
||||
<div class="radio">
|
||||
<label>
|
||||
<input type="radio" name="asset_acceptance" id="accepted" value="accepted">
|
||||
I accept
|
||||
</label>
|
||||
</div>
|
||||
|
||||
<div class="radio">
|
||||
<label>
|
||||
<input type="radio" name="asset_acceptance" id="declined" value="declined">
|
||||
|
|
@ -78,13 +75,10 @@
|
|||
<button type="button" class="btn btn-sm btn-default clear" data-action="clear" id="clear_button">Clear</button>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div> <!-- .col-md-12.text-center-->
|
||||
@endif
|
||||
|
||||
|
||||
|
||||
|
||||
</div><!-- / col-md-7 col-sm-12 -->
|
||||
</div><!-- / col-md-12 -->
|
||||
|
||||
</div> <!-- / box-body -->
|
||||
<div class="box-footer text-right">
|
||||
|
|
@ -92,10 +86,11 @@
|
|||
</div><!-- /.box-footer -->
|
||||
</div> <!-- / box-default -->
|
||||
</div> <!-- / col -->
|
||||
</div> <!-- / row -->
|
||||
|
||||
</div> <!-- / row -->
|
||||
</form>
|
||||
|
||||
@stop
|
||||
|
||||
@section('moar_scripts')
|
||||
|
||||
<script src="{{ asset('assets/js/signature_pad.min.js') }}"></script>
|
||||
|
|
@ -139,5 +134,3 @@
|
|||
|
||||
</script>
|
||||
@stop
|
||||
|
||||
@stop
|
||||
|
|
|
|||
|
|
@ -8,7 +8,6 @@ Change your Password
|
|||
{{-- Account page content --}}
|
||||
@section('content')
|
||||
<div class="row header">
|
||||
|
||||
<div class="col-md-12">
|
||||
<h3>{{ trans('general.changepassword') }}</h3>
|
||||
</div>
|
||||
|
|
@ -65,4 +64,5 @@ Change your Password
|
|||
</div>
|
||||
|
||||
</form>
|
||||
</div>
|
||||
@stop
|
||||
|
|
|
|||
|
|
@ -28,8 +28,8 @@
|
|||
|
||||
<!-- Last Name -->
|
||||
<div class="form-group {{ $errors->has('last_name') ? ' has-error' : '' }}">
|
||||
<label for="last_name" class="col-md-3 control-label">{{ trans('general.last_name') }}
|
||||
|
||||
<label for="last_name" class="col-md-3 control-label">
|
||||
{{ trans('general.last_name') }}
|
||||
</label>
|
||||
<div class="col-md-5 required">
|
||||
<input class="form-control" type="text" name="last_name" id="last_name" value="{{ Input::old('last_name', $user->last_name) }}" />
|
||||
|
|
@ -39,7 +39,8 @@
|
|||
|
||||
<!-- Location -->
|
||||
<div class="form-group {{ $errors->has('location_id') ? 'error' : '' }}">
|
||||
<label class="col-md-3 control-label" for="location_id">{{ trans('general.location') }}
|
||||
<label class="col-md-3 control-label" for="location_id">
|
||||
{{ trans('general.location') }}
|
||||
</label>
|
||||
<div class="col-md-5">
|
||||
<div class="field-box">
|
||||
|
|
@ -71,11 +72,13 @@
|
|||
<!-- Gravatar Email -->
|
||||
<div class="form-group {{ $errors->has('gravatar') ? ' has-error' : '' }}">
|
||||
<label for="gravatar" class="col-md-3 control-label">{{ trans('general.gravatar_email') }}
|
||||
<small>(Private)</small></label>
|
||||
<small>(Private)</small>
|
||||
</label>
|
||||
<div class="col-md-5">
|
||||
<input class="form-control" type="text" name="gravatar" id="gravatar" value="{{ Input::old('gravatar', $user->gravatar) }}" />
|
||||
{!! $errors->first('gravatar', '<span class="alert-msg"><i class="fa fa-times"></i> :message</span>') !!}
|
||||
<p><img src="//secure.gravatar.com/avatar/{{ md5(strtolower(trim($user->gravatar))) }}" width="30" height="30" />
|
||||
<p>
|
||||
<img src="//secure.gravatar.com/avatar/{{ md5(strtolower(trim($user->gravatar))) }}" width="30" height="30" />
|
||||
<a href="http://gravatar.com"><small>Change your avatar at Gravatar.com</small></a>.
|
||||
</p>
|
||||
</div>
|
||||
|
|
@ -104,11 +107,8 @@
|
|||
|
||||
<!-- Two factor opt in -->
|
||||
@if ($snipeSettings->two_factor_enabled=='1')
|
||||
|
||||
<div class="form-group {{ $errors->has('avatar') ? 'has-error' : '' }}">
|
||||
|
||||
<div class="col-md-7 col-md-offset-3">
|
||||
|
||||
@can('self.two_factor')
|
||||
<label for="avatar">{{ Form::checkbox('two_factor_optin', '1', Input::old('two_factor_optin', $user->two_factor_optin),array('class' => 'minimal')) }}
|
||||
@else
|
||||
|
|
@ -126,23 +126,15 @@
|
|||
@endif
|
||||
</div>
|
||||
</div>
|
||||
|
||||
@endif
|
||||
|
||||
|
||||
|
||||
|
||||
</div>
|
||||
{{ Form::close() }}
|
||||
</div> <!-- .box-body -->
|
||||
<div class="box-footer text-right">
|
||||
<button type="submit" class="btn btn-success"><i class="fa fa-ok icon-white"></i> {{ trans('general.save') }}</button>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
||||
|
||||
|
||||
</form>
|
||||
</div> <!-- .box-footer-->
|
||||
</div> <!-- .box-default -->
|
||||
</div> <!-- .col-md-9 -->
|
||||
</div> <!-- .row-->
|
||||
|
||||
@stop
|
||||
|
|
|
|||
|
|
@ -73,8 +73,6 @@
|
|||
@endif
|
||||
|
||||
<td>{{ $asset->expected_checkin }}</td>
|
||||
|
||||
|
||||
<td>
|
||||
@if ($asset->isRequestedBy(Auth::user()))
|
||||
{{Form::submit(trans('button.cancel'), ['class' => 'btn btn-danger btn-sm'])}}
|
||||
|
|
@ -89,7 +87,6 @@
|
|||
</table>
|
||||
</div>
|
||||
|
||||
|
||||
@else
|
||||
<div class="col-md-12">
|
||||
<div class="alert alert-info alert-block">
|
||||
|
|
@ -97,8 +94,6 @@
|
|||
{{ trans('general.no_results') }}
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
||||
@endif
|
||||
</div>
|
||||
|
||||
|
|
@ -118,7 +113,6 @@
|
|||
|
||||
<tbody>
|
||||
@foreach($models as $requestableModel)
|
||||
|
||||
<tr>
|
||||
<form action="{{route('account/request-item', ['itemType' => 'asset_model', 'itemId' => $requestableModel->id])}}"
|
||||
method="POST"
|
||||
|
|
@ -155,10 +149,9 @@
|
|||
</div> <!-- .nav-tabs-custom -->
|
||||
</div> <!-- .col-md-12> -->
|
||||
</div> <!-- .row -->
|
||||
|
||||
|
||||
|
||||
@stop
|
||||
|
||||
|
||||
@section('moar_scripts')
|
||||
<script>
|
||||
|
||||
|
|
|
|||
|
|
@ -9,7 +9,7 @@ View Assets for {{ $user->present()->fullName() }}
|
|||
{{-- Account page content --}}
|
||||
@section('content')
|
||||
|
||||
<div class="row">
|
||||
<div class="row">
|
||||
<div class="col-md-12">
|
||||
<div class="box box-default">
|
||||
|
||||
|
|
@ -38,27 +38,25 @@ View Assets for {{ $user->present()->fullName() }}
|
|||
@foreach ($user->assets as $asset)
|
||||
<tr>
|
||||
<td>
|
||||
@if ($asset->physical=='1') {{ $asset->model->name }}
|
||||
@if ($asset->physical=='1')
|
||||
{{ $asset->model->name }}
|
||||
@endif
|
||||
</td>
|
||||
<td>{{ $asset->asset_tag }}</td>
|
||||
<td>{{ $asset->name }}</td>
|
||||
<td>
|
||||
|
||||
@if (($asset->image) && ($asset->image!=''))
|
||||
<img src="{{ url('/') }}/uploads/assets/{{ $asset->image }}" height="50" width="50">
|
||||
|
||||
@elseif (($asset->model) && ($asset->model->image!=''))
|
||||
<img src="{{ url('/') }}/uploads/models/{{ $asset->model->image }}" height="50" width="50">
|
||||
@endif
|
||||
|
||||
</td>
|
||||
|
||||
</tr>
|
||||
@endforeach
|
||||
</tbody>
|
||||
</table>
|
||||
</div>
|
||||
</div> <!-- .table-responsive-->
|
||||
@else
|
||||
|
||||
<div class="col-md-12">
|
||||
|
|
@ -68,15 +66,14 @@ View Assets for {{ $user->present()->fullName() }}
|
|||
</div>
|
||||
</div>
|
||||
@endif
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div> <!-- .box-body-->
|
||||
</div><!--.box.box-default-->
|
||||
</div> <!-- .col-md-12-->
|
||||
</div> <!-- .row-->
|
||||
|
||||
<div class="row">
|
||||
<div class="row">
|
||||
<div class="col-md-12">
|
||||
<div class="box box-default">
|
||||
|
||||
@if ($user->id)
|
||||
<div class="box-header with-border">
|
||||
<div class="box-heading">
|
||||
|
|
@ -101,9 +98,7 @@ View Assets for {{ $user->present()->fullName() }}
|
|||
<tr>
|
||||
<td>{{ $license->name }}</td>
|
||||
<td>
|
||||
|
||||
@can('viewKeys', $license)
|
||||
|
||||
{{ mb_strimwidth($license->serial, 0, 50, "...") }}
|
||||
@else
|
||||
---
|
||||
|
|
@ -113,9 +108,8 @@ View Assets for {{ $user->present()->fullName() }}
|
|||
@endforeach
|
||||
</tbody>
|
||||
</table>
|
||||
</div>
|
||||
</div> <!-- .table-responsive-->
|
||||
@else
|
||||
|
||||
<div class="col-md-12">
|
||||
<div class="alert alert-info alert-block">
|
||||
<i class="fa fa-info-circle"></i>
|
||||
|
|
@ -123,15 +117,14 @@ View Assets for {{ $user->present()->fullName() }}
|
|||
</div>
|
||||
</div>
|
||||
@endif
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div> <!-- .box-body-->
|
||||
</div><!--.box.box-default-->
|
||||
</div> <!-- .col-md-12-->
|
||||
</div> <!-- .row-->
|
||||
|
||||
<div class="row">
|
||||
<div class="row">
|
||||
<div class="col-md-12">
|
||||
<div class="box box-default">
|
||||
|
||||
@if ($user->id)
|
||||
<div class="box-header with-border">
|
||||
<div class="box-heading">
|
||||
|
|
@ -160,7 +153,6 @@ View Assets for {{ $user->present()->fullName() }}
|
|||
</table>
|
||||
</div>
|
||||
@else
|
||||
|
||||
<div class="col-md-12">
|
||||
<div class="alert alert-info alert-block">
|
||||
<i class="fa fa-info-circle"></i>
|
||||
|
|
@ -169,12 +161,12 @@ View Assets for {{ $user->present()->fullName() }}
|
|||
</div>
|
||||
@endif
|
||||
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div> <!-- .box-body-->
|
||||
</div><!--.box.box-default-->
|
||||
</div> <!-- .col-md-12-->
|
||||
</div> <!-- .row-->
|
||||
|
||||
<div class="row">
|
||||
<div class="row">
|
||||
<div class="col-md-12">
|
||||
<div class="box box-default">
|
||||
|
||||
|
|
@ -206,7 +198,6 @@ View Assets for {{ $user->present()->fullName() }}
|
|||
</table>
|
||||
</div>
|
||||
@else
|
||||
|
||||
<div class="col-md-12">
|
||||
<div class="alert alert-info alert-block">
|
||||
<i class="fa fa-info-circle"></i>
|
||||
|
|
@ -214,14 +205,14 @@ View Assets for {{ $user->present()->fullName() }}
|
|||
</div>
|
||||
</div>
|
||||
@endif
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div> <!-- .box-body-->
|
||||
</div><!--.box.box-default-->
|
||||
</div> <!-- .col-md-12-->
|
||||
</div> <!-- .row-->
|
||||
|
||||
<div class="row">
|
||||
<div class="col-md-12">
|
||||
<div class="box box-default">
|
||||
|
||||
@if ($user->id)
|
||||
<div class="box-header with-border">
|
||||
<div class="box-heading">
|
||||
|
|
@ -258,7 +249,6 @@ View Assets for {{ $user->present()->fullName() }}
|
|||
@else
|
||||
<i class="fa fa-times"></i>
|
||||
@endif
|
||||
|
||||
</td>
|
||||
<td>
|
||||
{{ strtolower(trans('general.'.str_replace(' ','_',$log->action_type))) }}
|
||||
|
|
@ -280,7 +270,6 @@ View Assets for {{ $user->present()->fullName() }}
|
|||
@else
|
||||
{{ trans('general.bad_data') }}
|
||||
@endif
|
||||
|
||||
</td>
|
||||
<td>
|
||||
@if ($log->user)
|
||||
|
|
@ -292,10 +281,9 @@ View Assets for {{ $user->present()->fullName() }}
|
|||
@endforeach
|
||||
</tbody>
|
||||
</table>
|
||||
</div>
|
||||
</div> <!--.table-responsive-->
|
||||
|
||||
@else
|
||||
|
||||
|
||||
<div class="col-md-12">
|
||||
<div class="alert alert-info alert-block">
|
||||
<i class="fa fa-info-circle"></i>
|
||||
|
|
@ -303,9 +291,9 @@ View Assets for {{ $user->present()->fullName() }}
|
|||
</div>
|
||||
</div>
|
||||
@endif
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div> <!-- .box-body-->
|
||||
</div><!--.box.box-default-->
|
||||
</div> <!-- .col-md-12-->
|
||||
</div> <!-- .row-->
|
||||
|
||||
@stop
|
||||
|
|
|
|||
|
|
@ -17,7 +17,6 @@
|
|||
<div class="col-md-12">
|
||||
|
||||
@if ($requestedItems->count() > 0)
|
||||
|
||||
<div class="table-responsive">
|
||||
<table class="table table-striped">
|
||||
<thead>
|
||||
|
|
@ -33,9 +32,7 @@
|
|||
</thead>
|
||||
<tbody>
|
||||
@foreach ($requestedItems as $request)
|
||||
|
||||
<tr>
|
||||
|
||||
<form action="#" method="POST" accept-charset="utf-8">
|
||||
{{ csrf_field() }}
|
||||
<td>{{ $request->itemType() }}</td>
|
||||
|
|
@ -64,7 +61,6 @@
|
|||
</table>
|
||||
</div>
|
||||
|
||||
|
||||
@else
|
||||
<div class="col-md-12">
|
||||
<div class="alert alert-info alert-block">
|
||||
|
|
@ -72,13 +68,7 @@
|
|||
{{ trans('general.no_results') }}
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
||||
@endif
|
||||
</div>
|
||||
</div> <!-- .col-md-12> -->
|
||||
</div> <!-- .row -->
|
||||
|
||||
|
||||
|
||||
@stop
|
||||
|
|
|
|||
|
|
@ -20,8 +20,6 @@
|
|||
{{-- Page content --}}
|
||||
@section('content')
|
||||
|
||||
|
||||
|
||||
<div class="row">
|
||||
<div class="col-md-9">
|
||||
@if ($item->id)
|
||||
|
|
@ -31,22 +29,22 @@
|
|||
<form class="form-horizontal" method="post" action="{{ route('maintenances.store') }}" autocomplete="off">
|
||||
@endif
|
||||
<!-- CSRF Token -->
|
||||
<input type="hidden" name="_token" value="{{ csrf_token() }}" />
|
||||
{{ csrf_field() }}
|
||||
|
||||
<div class="box box-default">
|
||||
<div class="box-header with-border">
|
||||
|
||||
<h3 class="box-title">
|
||||
@if ($item)
|
||||
{{ $item->name }}
|
||||
@endif
|
||||
</h3>
|
||||
</div><!-- /.box-header -->
|
||||
<div class="box-body">
|
||||
|
||||
<div class="box-body">
|
||||
<!-- Asset -->
|
||||
<div class="form-group {{ $errors->has('asset_id') ? ' has-error' : '' }}">
|
||||
<label for="asset_id" class="col-md-3 control-label">{{ trans('admin/asset_maintenances/table.asset_name') }}
|
||||
<label for="asset_id" class="col-md-3 control-label">
|
||||
{{ trans('admin/asset_maintenances/table.asset_name') }}
|
||||
</label>
|
||||
<div class="col-md-7{{ (\App\Helpers\Helper::checkIfRequired($item, 'asset_id')) ? ' required' : '' }}">
|
||||
@if ($selectedAsset == null)
|
||||
|
|
@ -56,17 +54,15 @@
|
|||
@endif
|
||||
{!! $errors->first('asset_id', '<span class="alert-msg"><i class="fa fa-times"></i> :message</span>') !!}
|
||||
</div>
|
||||
</div>
|
||||
</div> <!-- .form-group -->
|
||||
|
||||
@include ('partials.forms.edit.supplier')
|
||||
@include ('partials.forms.edit.maintenance_type')
|
||||
|
||||
|
||||
|
||||
<!-- Title -->
|
||||
<div class="form-group {{ $errors->has('title') ? ' has-error' : '' }}">
|
||||
<label for="title" class="col-md-3 control-label">{{ trans('admin/asset_maintenances/form.title') }}
|
||||
</label>
|
||||
<label for="title" class="col-md-3 control-label">
|
||||
{{ trans('admin/asset_maintenances/form.title') }}
|
||||
</label>
|
||||
<div class="col-md-7{{ (\App\Helpers\Helper::checkIfRequired($item, 'title')) ? ' required' : '' }}">
|
||||
<input class="form-control" type="text" name="title" id="title" value="{{ Input::old('title', $item->title) }}" />
|
||||
|
|
@ -76,7 +72,8 @@
|
|||
|
||||
<!-- Start Date -->
|
||||
<div class="form-group {{ $errors->has('start_date') ? ' has-error' : '' }}">
|
||||
<label for="start_date" class="col-md-3 control-label">{{ trans('admin/asset_maintenances/form.start_date') }}
|
||||
<label for="start_date" class="col-md-3 control-label">
|
||||
{{ trans('admin/asset_maintenances/form.start_date') }}
|
||||
</label>
|
||||
<div class="input-group col-md-2{{ (\App\Helpers\Helper::checkIfRequired($item, 'start_date')) ? ' required' : '' }}">
|
||||
<input type="date" class="datepicker form-control" data-date-format="yyyy-mm-dd" placeholder="Select Date" name="start_date" id="start_date" value="{{ Input::old('start_date', $item->start_date) }}">
|
||||
|
|
@ -87,7 +84,9 @@
|
|||
|
||||
<!-- Completion Date -->
|
||||
<div class="form-group {{ $errors->has('completion_date') ? ' has-error' : '' }}">
|
||||
<label for="start_date" class="col-md-3 control-label">{{ trans('admin/asset_maintenances/form.completion_date') }}</label>
|
||||
<label for="start_date" class="col-md-3 control-label">
|
||||
{{ trans('admin/asset_maintenances/form.completion_date') }}
|
||||
</label>
|
||||
<div class="input-group col-md-2">
|
||||
<input type="date" class="datepicker form-control" data-date-format="yyyy-mm-dd" placeholder="Select Date" name="completion_date" id="completion_date" value="{{ Input::old('completion_date', $item->completion_date) }}">
|
||||
<span class="input-group-addon"><i class="fa fa-calendar"></i></span>
|
||||
|
|
@ -126,8 +125,8 @@
|
|||
{!! $errors->first('notes', '<span class="alert-msg"><i class="fa fa-times"></i> :message</span>') !!}
|
||||
</div>
|
||||
</div>
|
||||
</div> <!-- .box-body -->
|
||||
|
||||
</div>
|
||||
<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>
|
||||
|
|
|
|||
|
|
@ -2,8 +2,8 @@
|
|||
|
||||
{{-- Page title --}}
|
||||
@section('title')
|
||||
{{ trans('admin/asset_maintenances/general.asset_maintenances') }}
|
||||
@parent
|
||||
{{ trans('admin/asset_maintenances/general.asset_maintenances') }}
|
||||
@parent
|
||||
@stop
|
||||
|
||||
|
||||
|
|
@ -13,18 +13,13 @@
|
|||
@endcan
|
||||
@stop
|
||||
|
||||
|
||||
{{-- Page content --}}
|
||||
@section('content')
|
||||
|
||||
|
||||
|
||||
<div class="row">
|
||||
<div class="col-md-12">
|
||||
|
||||
<div class="box box-default">
|
||||
<div class="box-body">
|
||||
|
||||
<table
|
||||
name="maintenances"
|
||||
id="table"
|
||||
|
|
@ -32,7 +27,8 @@
|
|||
data-url="{{route('api.asset_maintenances.list') }}"
|
||||
data-cookie="true"
|
||||
data-click-to-select="true"
|
||||
data-cookie-id-table="maintenancesTable-{{ config('version.hash_version') }}">
|
||||
data-cookie-id-table="maintenancesTable-{{ config('version.hash_version') }}"
|
||||
>
|
||||
<thead>
|
||||
<tr>
|
||||
<th data-field="companyName" data-sortable="false" data-visible="false">{{ trans('admin/companies/table.title') }}</th>
|
||||
|
|
@ -57,6 +53,7 @@
|
|||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
@stop
|
||||
|
||||
@section('moar_scripts')
|
||||
|
|
|
|||
|
|
@ -5,13 +5,13 @@ use Carbon\Carbon;
|
|||
|
||||
{{-- Page title --}}
|
||||
@section('title')
|
||||
{{ trans('admin/asset_maintenances/general.view') }} {{ $assetMaintenance->title }}
|
||||
@parent
|
||||
{{ trans('admin/asset_maintenances/general.view') }} {{ $assetMaintenance->title }}
|
||||
@parent
|
||||
@stop
|
||||
|
||||
{{-- Page content --}}
|
||||
@section('content')
|
||||
<div class="row header">
|
||||
<div class="row header">
|
||||
<div class="col-md-12">
|
||||
<h3 class="title">
|
||||
{{ trans('admin/asset_maintenances/general.view') }}
|
||||
|
|
@ -19,7 +19,6 @@ use Carbon\Carbon;
|
|||
</h3>
|
||||
|
||||
<div class="btn-group pull-right">
|
||||
|
||||
<div class="dropdown">
|
||||
<button class="btn btn-default dropdown-toggle" data-toggle="dropdown">{{ trans('button.actions') }}
|
||||
<span class="caret"></span>
|
||||
|
|
@ -30,9 +29,9 @@ use Carbon\Carbon;
|
|||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="user-profile ">
|
||||
<div class="user-profile ">
|
||||
<div class="row profile">
|
||||
<div class="col-md-9 bio">
|
||||
<!-- 1st Row Begin -->
|
||||
|
|
@ -43,6 +42,7 @@ use Carbon\Carbon;
|
|||
</div>
|
||||
</div>
|
||||
<!-- 1st Row End -->
|
||||
|
||||
<!-- 2nd Row Begin -->
|
||||
<div class="row">
|
||||
<div class="col-md-3 col-sm-3" style="padding-bottom: 10px; margin-left: 15px; word-wrap: break-word;">
|
||||
|
|
@ -99,5 +99,5 @@ use Carbon\Carbon;
|
|||
<!-- 5th Row End -->
|
||||
</div> <!-- col-md-9 bio end -->
|
||||
</div> <!-- row profile end -->
|
||||
</div> <!-- user-profile end -->
|
||||
</div> <!-- user-profile end -->
|
||||
@stop
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@
|
|||
|
||||
@section('inputFields')
|
||||
|
||||
@include ('partials.forms.edit.name', ['translated_name' => trans('admin/categories/general.category_name')])
|
||||
@include ('partials.forms.edit.name', ['translated_name' => trans('admin/categories/general.`name')])
|
||||
|
||||
<!-- Type -->
|
||||
<div class="form-group {{ $errors->has('category_type') ? ' has-error' : '' }}">
|
||||
|
|
@ -66,7 +66,6 @@
|
|||
@section('content')
|
||||
@parent
|
||||
|
||||
|
||||
@if ($snipeSettings->default_eula_text!='')
|
||||
<!-- Modal -->
|
||||
<div class="modal fade" id="eulaModal" tabindex="-1" role="dialog" aria-labelledby="eulaModalLabel" aria-hidden="true">
|
||||
|
|
|
|||
|
|
@ -15,13 +15,11 @@
|
|||
{{-- Page content --}}
|
||||
@section('content')
|
||||
|
||||
|
||||
<div class="row">
|
||||
<div class="col-md-12">
|
||||
<div class="box box-default">
|
||||
<div class="box-body">
|
||||
<div class="table-responsive">
|
||||
|
||||
<table
|
||||
class="table table-striped snipe-table"
|
||||
name="categories"
|
||||
|
|
@ -29,7 +27,8 @@
|
|||
data-url="{{route('api.categories.list') }}"
|
||||
data-cookie="true"
|
||||
data-click-to-select="true"
|
||||
data-cookie-id-table="categoriesTable-{{ config('version.hash_version') }}">
|
||||
data-cookie-id-table="categoriesTable-{{ config('version.hash_version') }}"
|
||||
>
|
||||
<thead>
|
||||
<tr>
|
||||
<th data-sortable="true" data-field="id" data-visible="false">{{ trans('general.id') }}</th>
|
||||
|
|
@ -42,12 +41,9 @@
|
|||
</tr>
|
||||
</thead>
|
||||
</table>
|
||||
|
||||
</div>
|
||||
</div><!-- /.box-body -->
|
||||
</div><!-- /.box -->
|
||||
|
||||
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
|
|
|||
|
|
@ -22,14 +22,10 @@
|
|||
|
||||
{{-- Page content --}}
|
||||
@section('content')
|
||||
|
||||
|
||||
<div class="row">
|
||||
<div class="row">
|
||||
<div class="col-md-12">
|
||||
<div class="box box-default">
|
||||
<div class="box-body">
|
||||
|
||||
|
||||
<table
|
||||
name="category_assets"
|
||||
class="snipe-table"
|
||||
|
|
@ -37,7 +33,8 @@
|
|||
data-url="{{ route('api.categories.'.$category->category_type.'.view', [$category->id, $category->category_type]) }}"
|
||||
data-cookie="true"
|
||||
data-click-to-select="true"
|
||||
data-cookie-id-table="categoryAssetsTable">
|
||||
data-cookie-id-table="categoryAssetsTable"
|
||||
>
|
||||
<thead>
|
||||
<tr>
|
||||
<th data-searchable="false" data-sortable="false" data-field="companyName" data-visible="false">
|
||||
|
|
@ -59,7 +56,7 @@
|
|||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
</div>
|
||||
@stop
|
||||
|
||||
@section('moar_scripts')
|
||||
|
|
|
|||
|
|
@ -14,7 +14,6 @@
|
|||
{{-- Page content --}}
|
||||
@section('content')
|
||||
|
||||
|
||||
<div class="row">
|
||||
<div class="col-md-9">
|
||||
<div class="box box-default">
|
||||
|
|
@ -27,13 +26,15 @@
|
|||
<th class="col-md-9">{{ trans('admin/companies/table.name') }}</th>
|
||||
<th class="col-md-2">{{ trans('table.actions') }}</th>
|
||||
</tr>
|
||||
</thead>
|
||||
|
||||
<tbody>
|
||||
@foreach ($companies as $company)
|
||||
<tr>
|
||||
<td>{{ $company->id }}</td>
|
||||
<td>{{ $company->name }}</td>
|
||||
<td>
|
||||
<form method="POST" action="{{ route('companies.destroy', $company->id) }}" role="form">
|
||||
|
||||
<input type="hidden" name="_token" value="{{ csrf_token() }}" />
|
||||
|
||||
<a href="{{ route('companies.edit', $company->id) }}" class="btn btn-sm btn-warning"
|
||||
|
|
@ -44,20 +45,16 @@
|
|||
<button type="submit" class="btn btn-sm btn-danger" title="{{ trans('button.delete') }}">
|
||||
<i class="fa fa-trash icon-white"></i>
|
||||
</button>
|
||||
|
||||
</form>
|
||||
</td>
|
||||
</tr>
|
||||
@endforeach
|
||||
</thead>
|
||||
|
||||
<tbody>
|
||||
</tbody>
|
||||
</table>
|
||||
</div><!-- /.box-body -->
|
||||
</div><!-- /.box -->
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<!-- side address column -->
|
||||
<div class="col-md-3">
|
||||
|
|
@ -67,7 +64,6 @@
|
|||
</p>
|
||||
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
@stop
|
||||
|
|
|
|||
|
|
@ -9,15 +9,13 @@
|
|||
{{-- Page content --}}
|
||||
@section('content')
|
||||
|
||||
<div class="row">
|
||||
<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() }}" />
|
||||
{{ csrf_field() }}
|
||||
|
||||
<div class="box box-default">
|
||||
|
||||
@if ($component->id)
|
||||
<div class="box-header with-border">
|
||||
<div class="box-heading">
|
||||
|
|
@ -26,9 +24,7 @@
|
|||
</div><!-- /.box-header -->
|
||||
@endif
|
||||
|
||||
|
||||
<div class="box-body">
|
||||
|
||||
@if ($component->name)
|
||||
<!-- consumable name -->
|
||||
<div class="form-group">
|
||||
|
|
@ -39,9 +35,7 @@
|
|||
</div>
|
||||
@endif
|
||||
|
||||
|
||||
<!-- Asset -->
|
||||
|
||||
<div class="form-group {{ $errors->has('asset_id') ? ' has-error' : '' }}">
|
||||
<label for="asset_id" class="col-md-3 control-label">{{ trans('admin/hardware/form.checkout_to') }}
|
||||
<i class='icon-asterisk'></i></label>
|
||||
|
|
@ -60,17 +54,13 @@
|
|||
</div>
|
||||
</div>
|
||||
|
||||
</div>
|
||||
</div> <!-- .BOX-BODY-->
|
||||
<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>
|
||||
</div>
|
||||
</div> <!-- .box-default-->
|
||||
</form>
|
||||
</div> <!-- .col-md-9-->
|
||||
</div> <!-- .row -->
|
||||
|
||||
|
||||
|
||||
</form>
|
||||
|
||||
</div>
|
||||
</div>
|
||||
@stop
|
||||
|
|
|
|||
|
|
@ -14,11 +14,8 @@
|
|||
|
||||
{{-- Page content --}}
|
||||
@section('content')
|
||||
|
||||
|
||||
<div class="row">
|
||||
<div class="col-md-12">
|
||||
|
||||
<div class="box box-default">
|
||||
<div class="box-body">
|
||||
{{ Form::open([
|
||||
|
|
@ -26,7 +23,6 @@
|
|||
'route' => ['component/bulk-form'],
|
||||
'class' => 'form-inline' ]) }}
|
||||
|
||||
|
||||
<div id="toolbar">
|
||||
<!-- <select name="bulk_actions" class="form-control select2" style="width: 130px;">
|
||||
<option value="checkout">Checkout</option>
|
||||
|
|
@ -36,7 +32,6 @@
|
|||
-->
|
||||
</div>
|
||||
|
||||
|
||||
<table
|
||||
data-toolbar="#toolbar"
|
||||
name="components"
|
||||
|
|
@ -45,7 +40,8 @@
|
|||
data-url="{{route('api.components.list') }}"
|
||||
data-cookie="true"
|
||||
data-click-to-select="true"
|
||||
data-cookie-id-table="componentsTable-{{ config('version.hash_version') }}-{{ config('version.hash_version') }}">
|
||||
data-cookie-id-table="componentsTable-{{ config('version.hash_version') }}-{{ config('version.hash_version') }}"
|
||||
>
|
||||
<thead>
|
||||
<tr>
|
||||
<th data-class="hidden-xs" data-switchable="false" data-searchable="false" data-sortable="false" data-field="checkbox"><div class="text-center"><input type="checkbox" id="checkAll" style="padding-left: 0px;"></div></th>
|
||||
|
|
@ -62,14 +58,12 @@
|
|||
<th data-sortable="true" data-searchable="true" data-field="purchase_date" data-visible="false">{{ trans('admin/components/general.date') }}</th>
|
||||
<th data-sortable="true" data-searchable="true" data-field="purchase_cost" data-visible="false">{{ trans('admin/components/general.cost') }}</th>
|
||||
<th data-switchable="false" data-searchable="false" data-sortable="false" data-field="actions"> {{ trans('table.actions') }}</th>
|
||||
|
||||
</tr>
|
||||
</thead>
|
||||
</table>
|
||||
{{ Form::close() }}
|
||||
</div><!-- /.box-body -->
|
||||
</div><!-- /.box -->
|
||||
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
|
|
|||
|
|
@ -25,10 +25,10 @@
|
|||
<li role="presentation"><a href="{{ route('checkout/component', $component->id) }}">{{ trans('admin/components/general.checkout') }}</a></li>
|
||||
@endcan
|
||||
@endif
|
||||
|
||||
@can('update', $component)
|
||||
<li role="presentation"><a href="{{ route('components.edit', $component->id) }}">{{ trans('admin/components/general.edit') }}</a></li>
|
||||
@endcan
|
||||
|
||||
</ul>
|
||||
</div>
|
||||
@endcan
|
||||
|
|
@ -41,12 +41,10 @@
|
|||
<div class="row">
|
||||
<div class="col-md-9">
|
||||
<div class="box box-default">
|
||||
|
||||
<div class="box-body">
|
||||
<div class="row">
|
||||
<div class="col-md-12">
|
||||
<div class="table table-responsive">
|
||||
|
||||
<table
|
||||
name="component_users"
|
||||
class="table table-striped snipe-table"
|
||||
|
|
@ -54,7 +52,8 @@
|
|||
data-url="{{route('api.components.view', $component->id)}}"
|
||||
data-cookie="true"
|
||||
data-click-to-select="true"
|
||||
data-cookie-id-table="componentDetailTable-{{ config('version.hash_version') }}">
|
||||
data-cookie-id-table="componentDetailTable-{{ config('version.hash_version') }}"
|
||||
>
|
||||
<thead>
|
||||
<tr>
|
||||
<th data-switchable="false" data-searchable="false" data-sortable="false" data-field="name">{{ trans('general.asset') }}</th>
|
||||
|
|
@ -64,17 +63,15 @@
|
|||
</thead>
|
||||
</table>
|
||||
</div>
|
||||
|
||||
</div>
|
||||
</div>
|
||||
</div> <!-- .col-md-12-->
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div> <!-- .col-md-9-->
|
||||
|
||||
|
||||
<!-- side address column -->
|
||||
<div class="col-md-3">
|
||||
|
||||
@if ($component->serial!='')
|
||||
<div class="col-md-12" style="padding-bottom: 5px;"><strong>{{ trans('admin/hardware/form.serial') }}: </strong>
|
||||
{{ $component->serial }} </div>
|
||||
|
|
@ -96,9 +93,8 @@
|
|||
<div class="col-md-12" style="padding-bottom: 5px;"><strong>{{ trans('admin/components/general.order') }}:</strong>
|
||||
{{ $component->order_number }} </div>
|
||||
@endif
|
||||
|
||||
</div>
|
||||
</div>
|
||||
</div> <!-- .row-->
|
||||
|
||||
@stop
|
||||
|
||||
|
|
|
|||
|
|
@ -9,7 +9,7 @@
|
|||
{{-- Page content --}}
|
||||
@section('content')
|
||||
|
||||
<div class="row">
|
||||
<div class="row">
|
||||
<div class="col-md-9">
|
||||
|
||||
<form class="form-horizontal" method="post" action="" autocomplete="off">
|
||||
|
|
@ -26,9 +26,7 @@
|
|||
</div><!-- /.box-header -->
|
||||
@endif
|
||||
|
||||
|
||||
<div class="box-body">
|
||||
|
||||
@if ($consumable->name)
|
||||
<!-- consumable name -->
|
||||
<div class="form-group">
|
||||
|
|
@ -39,9 +37,7 @@
|
|||
</div>
|
||||
@endif
|
||||
|
||||
|
||||
<!-- User -->
|
||||
|
||||
<div class="form-group {{ $errors->has('assigned_to') ? ' has-error' : '' }}">
|
||||
<label for="assigned_to" class="col-md-3 control-label">{{ trans('admin/hardware/form.checkout_to') }}
|
||||
<i class='icon-asterisk'></i></label>
|
||||
|
|
@ -61,23 +57,18 @@
|
|||
|
||||
@if ($consumable->getEula())
|
||||
<div class="form-group">
|
||||
|
||||
<div class="col-md-9 col-md-offset-3">
|
||||
<p class="hint-block">{{ trans('admin/categories/general.required_eula') }}</p>
|
||||
</div>
|
||||
</div>
|
||||
@endif
|
||||
</div>
|
||||
</div> <!-- .box-body -->
|
||||
<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>
|
||||
</form>
|
||||
|
||||
</div>
|
||||
|
||||
|
||||
|
||||
</form>
|
||||
|
||||
</div>
|
||||
</div>
|
||||
@stop
|
||||
|
|
|
|||
|
|
@ -15,7 +15,6 @@
|
|||
{{-- Page content --}}
|
||||
@section('content')
|
||||
|
||||
|
||||
<div class="row">
|
||||
<div class="col-md-12">
|
||||
|
||||
|
|
@ -28,7 +27,8 @@
|
|||
data-url="{{route('api.consumables.list') }}"
|
||||
data-cookie="true"
|
||||
data-click-to-select="true"
|
||||
data-cookie-id-table="consumablesTable-{{ config('version.hash_version') }}-{{ config('version.hash_version') }}">
|
||||
data-cookie-id-table="consumablesTable-{{ config('version.hash_version') }}-{{ config('version.hash_version') }}"
|
||||
>
|
||||
<thead>
|
||||
<tr>
|
||||
<th data-sortable="true" data-field="id" data-visible="false">{{ trans('general.id') }}</th>
|
||||
|
|
@ -53,14 +53,10 @@
|
|||
</div><!-- /.box-body -->
|
||||
</div><!-- /.box -->
|
||||
|
||||
</div>
|
||||
</div>
|
||||
|
||||
</div> <!-- /.col-md-12 -->
|
||||
</div> <!-- /.row -->
|
||||
@stop
|
||||
|
||||
@section('moar_scripts')
|
||||
@include ('partials.bootstrap-table', ['exportFile' => 'consumables-export', 'search' => true])
|
||||
|
||||
|
||||
@stop
|
||||
|
||||
@stop
|
||||
|
|
|
|||
|
|
@ -2,7 +2,6 @@
|
|||
|
||||
{{-- Page title --}}
|
||||
@section('title')
|
||||
|
||||
{{ $consumable->name }}
|
||||
{{ trans('general.consumable') }}
|
||||
@parent
|
||||
|
|
@ -20,7 +19,6 @@
|
|||
<div class="row">
|
||||
<div class="col-md-9">
|
||||
<div class="box box-default">
|
||||
|
||||
@if ($consumable->id)
|
||||
<div class="box-header with-border">
|
||||
<div class="box-heading">
|
||||
|
|
@ -33,7 +31,6 @@
|
|||
<div class="row">
|
||||
<div class="col-md-12">
|
||||
<div class="table table-responsive">
|
||||
|
||||
<table
|
||||
name="consumable_users"
|
||||
class="table table-striped snipe-table"
|
||||
|
|
@ -41,7 +38,8 @@
|
|||
data-url="{{route('api.consumables.view', $consumable->id)}}"
|
||||
data-cookie="true"
|
||||
data-click-to-select="true"
|
||||
data-cookie-id-table="consumableDetailTable-{{ config('version.hash_version') }}">
|
||||
data-cookie-id-table="consumableDetailTable-{{ config('version.hash_version') }}"
|
||||
>
|
||||
<thead>
|
||||
<tr>
|
||||
<th data-switchable="false" data-searchable="false" data-sortable="false" data-field="name">{{ trans('general.user') }}</th>
|
||||
|
|
@ -51,51 +49,61 @@
|
|||
</thead>
|
||||
</table>
|
||||
</div>
|
||||
</div>
|
||||
</div> <!-- /.col-md-12-->
|
||||
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div> <!-- /.box.box-default-->
|
||||
</div> <!-- /.col-md-9-->
|
||||
<div class="col-md-3">
|
||||
|
||||
<h4>{{ trans('admin/consumables/general.about_consumables_title') }}</h4>
|
||||
<p>{{ trans('admin/consumables/general.about_consumables_text') }} </p>
|
||||
|
||||
|
||||
@if ($consumable->purchase_date)
|
||||
<div class="col-md-12" style="padding-bottom: 5px;"><strong>{{ trans('general.purchase_date') }}: </strong>
|
||||
{{ $consumable->purchase_date }} </div>
|
||||
<div class="col-md-12" style="padding-bottom: 5px;">
|
||||
<strong>{{ trans('general.purchase_date') }}: </strong>
|
||||
{{ $consumable->purchase_date }}
|
||||
</div>
|
||||
@endif
|
||||
|
||||
@if ($consumable->purchase_cost)
|
||||
<div class="col-md-12" style="padding-bottom: 5px;"><strong>{{ trans('general.purchase_cost') }}:</strong>
|
||||
<div class="col-md-12" style="padding-bottom: 5px;">
|
||||
<strong>{{ trans('general.purchase_cost') }}:</strong>
|
||||
{{ $snipeSettings->default_currency }}
|
||||
|
||||
{{ \App\Helpers\Helper::formatCurrencyOutput($consumable->purchase_cost) }} </div>
|
||||
{{ \App\Helpers\Helper::formatCurrencyOutput($consumable->purchase_cost) }}
|
||||
</div>
|
||||
@endif
|
||||
|
||||
@if ($consumable->item_no)
|
||||
<div class="col-md-12" style="padding-bottom: 5px;"><strong>{{ trans('admin/consumables/general.item_no') }}:</strong>
|
||||
{{ $consumable->item_no }} </div>
|
||||
<div class="col-md-12" style="padding-bottom: 5px;">
|
||||
<strong>{{ trans('admin/consumables/general.item_no') }}:</strong>
|
||||
{{ $consumable->item_no }}
|
||||
</div>
|
||||
@endif
|
||||
|
||||
@if ($consumable->model_number)
|
||||
<div class="col-md-12" style="padding-bottom: 5px;"><strong>{{ trans('general.model_no') }}:</strong>
|
||||
{{ $consumable->model_number }} </div>
|
||||
<div class="col-md-12" style="padding-bottom: 5px;">
|
||||
<strong>{{ trans('general.model_no') }}:</strong>
|
||||
{{ $consumable->model_number }}
|
||||
</div>
|
||||
@endif
|
||||
|
||||
@if ($consumable->manufacturer)
|
||||
<div class="col-md-12" style="padding-bottom: 5px;"><strong>{{ trans('general.manufacturer') }}:</strong>
|
||||
{{ $consumable->manufacturer->name }} </div>
|
||||
<div class="col-md-12" style="padding-bottom: 5px;">
|
||||
<strong>{{ trans('general.manufacturer') }}:</strong>
|
||||
{{ $consumable->manufacturer->name }}
|
||||
</div>
|
||||
@endif
|
||||
|
||||
@if ($consumable->order_number)
|
||||
<div class="col-md-12" style="padding-bottom: 5px;"><strong>{{ trans('general.order_number') }}:</strong>
|
||||
{{ $consumable->order_number }} </div>
|
||||
@endif
|
||||
<div class="col-md-12" style="padding-bottom: 5px;">
|
||||
<strong>{{ trans('general.order_number') }}:</strong>
|
||||
{{ $consumable->order_number }}
|
||||
</div>
|
||||
</div>
|
||||
@endif
|
||||
</div> <!-- /.col-md-3-->
|
||||
</div> <!-- /.row-->
|
||||
|
||||
@stop
|
||||
|
||||
|
|
|
|||
|
|
@ -14,40 +14,35 @@
|
|||
|
||||
{{-- Page content --}}
|
||||
@section('content')
|
||||
|
||||
<div class="row">
|
||||
<div class="col-md-9">
|
||||
<div class="col-md-9">
|
||||
<!-- Horizontal Form -->
|
||||
<div class="box box-default">
|
||||
<div class="box-body">
|
||||
|
||||
|
||||
{{ Form::open(['route' => 'fieldsets.store', 'class'=>'form-horizontal']) }}
|
||||
<!-- CSRF Token -->
|
||||
<input type="hidden" name="_token" value="{{ csrf_token() }}" />
|
||||
|
||||
{{ csrf_field() }}
|
||||
<!-- Name -->
|
||||
<div class="form-group {{ $errors->has('name') ? ' has-error' : '' }}">
|
||||
<label for="name" class="col-md-4 control-label">{{ trans('admin/custom_fields/general.fieldset_name') }}
|
||||
<i class='fa fa-asterisk'></i></label>
|
||||
<label for="name" class="col-md-4 control-label">
|
||||
{{ trans('admin/custom_fields/general.fieldset_name') }}
|
||||
<i class='fa fa-asterisk'></i>
|
||||
</label>
|
||||
<div class="col-md-6">
|
||||
<input class="form-control" type="text" name="name" id="name" value="{{ Input::old('name') }}" />
|
||||
{!! $errors->first('name', '<span class="alert-msg"><i class="fa fa-times"></i> :message</span>') !!}
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
{{ Form::close() }}
|
||||
</div> <!-- /.box-body-->
|
||||
<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>
|
||||
|
||||
|
||||
{{ Form::close() }}
|
||||
</div> <!-- /.box.box-default-->
|
||||
</div>
|
||||
</div>
|
||||
<div class="col-md-3">
|
||||
<div class="col-md-3">
|
||||
<h4>About Fieldsets</h4>
|
||||
<p>Fieldsets work like containers of the custom fields you've created. This allows you to group commonly used custom attributes together for easy associations. </p>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
@stop
|
||||
|
|
|
|||
|
|
@ -17,18 +17,15 @@
|
|||
@section('content')
|
||||
|
||||
<div class="row">
|
||||
<div class="col-md-9">
|
||||
<div class="col-md-9">
|
||||
<!-- Horizontal Form -->
|
||||
<div class="box box-default">
|
||||
<div class="box-body">
|
||||
|
||||
|
||||
{{ Form::open(['route' => 'fields.store', 'class'=>'form-horizontal']) }}
|
||||
|
||||
|
||||
<!-- Name -->
|
||||
<div class="form-group {{ $errors->has('name') ? ' has-error' : '' }}">
|
||||
<label for="name" class="col-md-4 control-label">{{ trans('admin/custom_fields/general.field_name') }} </label>
|
||||
<label for="name" class="col-md-4 control-label">
|
||||
{{ trans('admin/custom_fields/general.field_name') }}
|
||||
</label>
|
||||
<div class="col-md-6 required">
|
||||
<input class="form-control" type="text" name="name" id="name" value="{{ Input::old('name') }}" />
|
||||
|
|
@ -38,7 +35,8 @@
|
|||
|
||||
<!-- Element Type -->
|
||||
<div class="form-group {{ $errors->has('element') ? ' has-error' : '' }}">
|
||||
<label for="element" class="col-md-4 control-label">{{ trans('admin/custom_fields/general.field_element') }}</label>
|
||||
<label for="element" class="col-md-4 control-label">
|
||||
{{ trans('admin/custom_fields/general.field_element') }}
|
||||
</label>
|
||||
<div class="col-md-6 required">
|
||||
|
||||
|
|
@ -50,22 +48,20 @@
|
|||
|
||||
<!-- Element values -->
|
||||
<div class="form-group {{ $errors->has('element') ? ' has-error' : '' }}" id="field_values_text" style="display:none;">
|
||||
<label for="field_values" class="col-md-4 control-label">{{ trans('admin/custom_fields/general.field_values') }}</label>
|
||||
<label for="field_values" class="col-md-4 control-label">
|
||||
{{ trans('admin/custom_fields/general.field_values') }}
|
||||
</label>
|
||||
<div class="col-md-6 required">
|
||||
|
||||
{!! Form::textarea('field_values', Input::old('field_values'), ['style' => 'width: 100%', 'rows' => 4, 'class' => 'form-control']) !!}
|
||||
{!! $errors->first('field_values', '<span class="alert-msg"><i class="fa fa-times"></i> :message</span>') !!}
|
||||
|
||||
<p class="help-block">{{ trans('admin/custom_fields/general.field_values_help') }}</p>
|
||||
</div>
|
||||
|
||||
|
||||
</div>
|
||||
|
||||
<!-- Format -->
|
||||
<div class="form-group {{ $errors->has('format') ? ' has-error' : '' }}">
|
||||
<label for="format" class="col-md-4 control-label">{{ trans('admin/custom_fields/general.field_format') }}</label>
|
||||
<label for="format" class="col-md-4 control-label">
|
||||
{{ trans('admin/custom_fields/general.field_format') }}
|
||||
</label>
|
||||
<div class="col-md-6 required">
|
||||
{{ Form::select("format",\App\Helpers\Helper::predefined_formats(),"ANY", array('class'=>'format select2 form-control')) }}
|
||||
|
|
@ -75,7 +71,8 @@
|
|||
|
||||
<!-- Custom Format -->
|
||||
<div class="form-group {{ $errors->has('custom_format') ? ' has-error' : '' }}" id="custom_regex" style="display:none;">
|
||||
<label for="custom_format" class="col-md-4 control-label">{{ trans('admin/custom_fields/general.field_custom_format') }}
|
||||
<label for="custom_format" class="col-md-4 control-label">
|
||||
{{ trans('admin/custom_fields/general.field_custom_format') }}
|
||||
</label>
|
||||
<div class="col-md-6 required">
|
||||
<input class="form-control" type="text" name="custom_format" id="custom_format" value="{{ Input::old('custom_format') }}" />
|
||||
|
|
@ -87,7 +84,8 @@
|
|||
<div class="form-group {{ $errors->has('custom_format') ? ' has-error' : '' }}">
|
||||
<div class="col-md-8 col-md-offset-4">
|
||||
<label for="field_encrypted">
|
||||
<input type="checkbox" value="1" name="field_encrypted" id="field_encrypted" class="minimal"{{ Input::old('field_encrypted') ? ' checked="checked"' : '' }}> {{ trans('admin/custom_fields/general.encrypt_field') }}
|
||||
<input type="checkbox" value="1" name="field_encrypted" id="field_encrypted" class="minimal"{{ Input::old('field_encrypted') ? ' checked="checked"' : '' }}>
|
||||
{{ trans('admin/custom_fields/general.encrypt_field') }}
|
||||
</label>
|
||||
</div>
|
||||
|
||||
|
|
@ -95,27 +93,26 @@
|
|||
<div class="callout callout-danger">
|
||||
<p><i class="fa fa-warning"></i> {{ trans('admin/custom_fields/general.encrypt_field_help') }}</p>
|
||||
</div>
|
||||
|
||||
</div>
|
||||
</div>
|
||||
|
||||
{{ Form::close() }}
|
||||
|
||||
</div>
|
||||
</div> <!-- /.box-body-->
|
||||
<div class="box-footer text-right">
|
||||
<button type="submit" class="btn btn-success"> {{ trans('general.save') }}</button>
|
||||
</div>
|
||||
</div> <!--.box.box-default-->
|
||||
</div> <!--/.col-md-9-->
|
||||
<div class="col-md-3">
|
||||
<h4>About Custom Fields</h4>
|
||||
<p>Custom fields allow you to add arbitrary attributes to assets.</p>
|
||||
</div>
|
||||
</div>
|
||||
{{ Form::close() }}
|
||||
<div class="col-md-3">
|
||||
<h4>About Custom Fields</h4>
|
||||
<p>Custom fields allow you to add arbitrary attributes to assets.</p>
|
||||
</div>
|
||||
@stop
|
||||
|
||||
@section('moar_scripts')
|
||||
<script>
|
||||
|
||||
|
||||
<script>
|
||||
$(document).ready(function(){
|
||||
|
||||
// Only display the custom format field if it's a custom format validation type
|
||||
|
|
@ -152,8 +149,5 @@
|
|||
$("#encrypt_warning").hide();
|
||||
});
|
||||
|
||||
</script>
|
||||
@stop
|
||||
|
||||
|
||||
</script>
|
||||
@stop
|
||||
|
|
|
|||
|
|
@ -7,32 +7,24 @@
|
|||
@stop
|
||||
|
||||
@section('header_right')
|
||||
<a href="{{ route('fields.index') }}" class="btn btn-primary pull-right">
|
||||
<a href="{{ route('fields.index') }}" class="btn btn-primary pull-right">
|
||||
{{ trans('general.back') }}</a>
|
||||
@stop
|
||||
|
||||
|
||||
|
||||
@section('content')
|
||||
|
||||
|
||||
|
||||
<div class="row">
|
||||
<div class="row">
|
||||
<div class="col-md-12">
|
||||
|
||||
<div class="box box-default">
|
||||
|
||||
<div class="box-header with-border">
|
||||
<h3 class="box-title">{{ $custom_fieldset->name }} {{ trans('admin/custom_fields/general.fieldset') }}</h3>
|
||||
<div class="box-tools pull-right">
|
||||
|
||||
</div>
|
||||
</div><!-- /.box-header -->
|
||||
<div class="box-body">
|
||||
|
||||
<table
|
||||
name="fieldsets"
|
||||
id="sort" class="table table-responsive todo-list">
|
||||
id="sort" class="table table-responsive todo-list"
|
||||
>
|
||||
<thead>
|
||||
<tr>
|
||||
<th class="col-md-1"></th>
|
||||
|
|
@ -45,22 +37,6 @@
|
|||
<th class="col-md-1"></th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tfoot>
|
||||
<tr>
|
||||
<td colspan="5" class="text-right">
|
||||
{{ Form::open(['route' =>
|
||||
["fieldsets.associate",$custom_fieldset->id],
|
||||
'class'=>'form-horizontal',
|
||||
'id' => 'ordering']) }}
|
||||
{{ Form::checkbox("required","on") }}
|
||||
{{ trans('admin/custom_fields/general.required') }}
|
||||
{{ Form::text("order",$maxid)}}
|
||||
{{ Form::select("field_id",$custom_fields_list,"",["onchange" => "$('#ordering').submit()"]) }}
|
||||
<span class="alert-msg"><?= $errors->first('field_id'); ?></span>
|
||||
|
||||
</td>
|
||||
</tr>
|
||||
</tfoot>
|
||||
<tbody>
|
||||
@foreach($custom_fieldset->fields as $field)
|
||||
<tr class="cansort" data-index="{{ $field->pivot->custom_field_id }}" id="item_{{ $field->pivot->custom_field_id }}">
|
||||
|
|
@ -77,20 +53,35 @@
|
|||
<td>{{$field->element}}</td>
|
||||
<td>{{ $field->field_encrypted=='1' ? trans('general.yes') : trans('general.no') }}</td>
|
||||
<td>{{$field->pivot->required ? "REQUIRED" : "OPTIONAL"}}</td>
|
||||
<td><a href="{{ route('fields.disassociate', [$field,$custom_fieldset->id]) }}" class="btn btn-sm btn-danger">Remove</a></td>
|
||||
<td>
|
||||
<a href="{{ route('fields.disassociate', [$field,$custom_fieldset->id]) }}" class="btn btn-sm btn-danger">Remove</a>
|
||||
</td>
|
||||
</tr>
|
||||
@endforeach
|
||||
</tbody>
|
||||
<tfoot>
|
||||
<tr>
|
||||
<td colspan="5" class="text-right">
|
||||
{{ Form::open(['route' =>
|
||||
["fieldsets.associate",$custom_fieldset->id],
|
||||
'class'=>'form-horizontal',
|
||||
'id' => 'ordering']) }}
|
||||
{{ Form::checkbox("required","on") }}
|
||||
{{ trans('admin/custom_fields/general.required') }}
|
||||
{{ Form::text("order",$maxid)}}
|
||||
{{ Form::select("field_id",$custom_fields_list,"",["onchange" => "$('#ordering').submit()"]) }}
|
||||
<span class="alert-msg"><?= $errors->first('field_id'); ?></span>
|
||||
{{ Form::close() }}
|
||||
</td>
|
||||
</tr>
|
||||
</tfoot>
|
||||
</table>
|
||||
</div> <!-- /.box-body-->
|
||||
</div> <!-- /.box.box-default-->
|
||||
</div> <!-- /.col-md-12-->
|
||||
</div> <!--/.row-->
|
||||
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
||||
</div>
|
||||
|
||||
@stop
|
||||
|
||||
@section('moar_scripts')
|
||||
<script>
|
||||
|
|
@ -126,6 +117,4 @@
|
|||
stop: updateIndex
|
||||
}).disableSelection();
|
||||
</script>
|
||||
|
||||
@stop
|
||||
@stop
|
||||
|
|
|
|||
|
|
@ -8,10 +8,8 @@
|
|||
|
||||
@section('content')
|
||||
|
||||
|
||||
<div class="row">
|
||||
<div class="row">
|
||||
<div class="col-md-9">
|
||||
|
||||
<div class="box box-default">
|
||||
|
||||
<div class="box-header with-border">
|
||||
|
|
@ -20,10 +18,9 @@
|
|||
<a href="{{ route('fieldsets.create') }}" class="btn btn-sm btn-primary" data-toggle="tooltip" title="Create a new fieldset">{{ trans('admin/custom_fields/general.create_fieldset') }}</a>
|
||||
</div>
|
||||
</div><!-- /.box-header -->
|
||||
|
||||
<div class="box-body">
|
||||
<table
|
||||
name="fieldsets"
|
||||
id="table" class="table table-responsive table-no-bordered">
|
||||
<table name="fieldsets" id="table" class="table table-responsive table-no-bordered">
|
||||
<thead>
|
||||
<tr>
|
||||
<th>{{ trans('general.name') }}</th>
|
||||
|
|
@ -33,7 +30,6 @@
|
|||
</tr>
|
||||
</thead>
|
||||
|
||||
|
||||
@if(isset($custom_fieldsets))
|
||||
<tbody>
|
||||
@foreach($custom_fieldsets AS $fieldset)
|
||||
|
|
@ -50,8 +46,7 @@
|
|||
@endforeach
|
||||
</td>
|
||||
<td>
|
||||
{{ Form::open(array('route' => array('fieldsets.destroy', $fieldset->id), 'method' => 'delete')) }}
|
||||
|
||||
{{ Form::open(['route' => array('fieldsets.destroy', $fieldset->id), 'method' => 'delete']) }}
|
||||
@if($fieldset->models->count() > 0)
|
||||
<button type="submit" class="btn btn-danger btn-sm disabled" disabled><i class="fa fa-trash"></i></button>
|
||||
@else
|
||||
|
|
@ -61,28 +56,23 @@
|
|||
</td>
|
||||
</tr>
|
||||
@endforeach
|
||||
@endif
|
||||
|
||||
</tbody>
|
||||
@endif
|
||||
</table>
|
||||
|
||||
</div><!-- /.box-body -->
|
||||
</div><!-- /.box -->
|
||||
</div><!-- /.box.box-default -->
|
||||
|
||||
</div>
|
||||
</div> <!-- .col-md-9-->
|
||||
<!-- side address column -->
|
||||
<div class="col-md-3">
|
||||
<h4>{{ trans('admin/custom_fields/general.about_fieldsets_title') }}</h4>
|
||||
<p>{{ trans('admin/custom_fields/general.about_fieldsets_text') }} </p>
|
||||
|
||||
</div>
|
||||
</div>
|
||||
</div> <!-- .row-->
|
||||
|
||||
<div class="row">
|
||||
<div class="col-md-9">
|
||||
|
||||
<div class="box box-default">
|
||||
|
||||
<div class="box-header with-border">
|
||||
<h3 class="box-title">{{ trans('admin/custom_fields/general.custom_fields') }}</h3>
|
||||
<div class="box-tools pull-right">
|
||||
|
|
@ -90,10 +80,7 @@
|
|||
</div>
|
||||
</div><!-- /.box-header -->
|
||||
<div class="box-body">
|
||||
|
||||
<table
|
||||
name="fieldsets"
|
||||
id="table" class="table table-responsive table-no-bordered">
|
||||
<table name="fieldsets" id="table" class="table table-responsive table-no-bordered">
|
||||
<thead>
|
||||
<tr>
|
||||
<th>{{ trans('general.name') }}</th>
|
||||
|
|
@ -104,7 +91,6 @@
|
|||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
|
||||
@foreach($custom_fields AS $field)
|
||||
<tr>
|
||||
<td>{{ $field->name }}</td>
|
||||
|
|
@ -125,25 +111,13 @@
|
|||
@endif
|
||||
{{ Form::close() }}
|
||||
</td>
|
||||
|
||||
</tr>
|
||||
@endforeach
|
||||
|
||||
|
||||
|
||||
|
||||
</tbody>
|
||||
</table>
|
||||
|
||||
|
||||
</div><!-- /.box-body -->
|
||||
</div><!-- /.box -->
|
||||
|
||||
</div>
|
||||
|
||||
|
||||
|
||||
</div>
|
||||
</div> <!-- /.col-md-9-->
|
||||
</div>
|
||||
|
||||
@stop
|
||||
|
|
|
|||
|
|
@ -12,7 +12,6 @@
|
|||
|
||||
<link rel="stylesheet" type="text/css" href="{{ asset('assets/css/morris.css') }}">
|
||||
<div class="row">
|
||||
|
||||
<!-- panel -->
|
||||
<div class="col-lg-3 col-xs-6">
|
||||
<!-- small box -->
|
||||
|
|
@ -77,12 +76,10 @@
|
|||
@endcan
|
||||
</div>
|
||||
</div><!-- ./col -->
|
||||
|
||||
</div>
|
||||
|
||||
|
||||
<!-- recent activity -->
|
||||
<div class="row">
|
||||
<div class="row">
|
||||
<div class="col-md-9">
|
||||
<div class="box">
|
||||
<div class="box-header with-border">
|
||||
|
|
@ -110,7 +107,6 @@
|
|||
<th class="col-sm-2" data-field="target">To</th>
|
||||
</tr>
|
||||
</thead>
|
||||
|
||||
</table>
|
||||
</div><!-- /.responsive -->
|
||||
</div><!-- /.col -->
|
||||
|
|
@ -122,7 +118,6 @@
|
|||
<div class="box box-default">
|
||||
<div class="box-header with-border">
|
||||
<h3 class="box-title">{{ trans('general.assets') }}</h3>
|
||||
|
||||
<div class="box-tools pull-right">
|
||||
<button type="button" class="btn btn-box-tool" data-widget="collapse"><i class="fa fa-minus"></i>
|
||||
</button>
|
||||
|
|
@ -134,30 +129,24 @@
|
|||
<div class="col-md-12">
|
||||
<div class="chart-responsive">
|
||||
<canvas id="statusPieChart" height="150"></canvas>
|
||||
</div> <!-- ./chart-responsive -->
|
||||
</div> <!-- /.col -->
|
||||
</div> <!-- /.row -->
|
||||
</div><!-- /.box-body -->
|
||||
</div> <!-- /.box -->
|
||||
</div>
|
||||
<!-- ./chart-responsive -->
|
||||
</div>
|
||||
</div> <!--/row-->
|
||||
|
||||
<!-- /.col -->
|
||||
</div>
|
||||
<!-- /.row -->
|
||||
</div>
|
||||
</div>
|
||||
<!-- /.box -->
|
||||
</div>
|
||||
</div>
|
||||
@stop
|
||||
|
||||
|
||||
@section('moar_scripts')
|
||||
<script src="{{ asset('assets/js/plugins/chartjs/Chart.min.js') }}"></script>
|
||||
<script>
|
||||
|
||||
|
||||
var pieChartCanvas = $("#statusPieChart").get(0).getContext("2d");
|
||||
var pieChart = new Chart(pieChartCanvas);
|
||||
var ctx = document.getElementById("statusPieChart");
|
||||
|
||||
|
||||
$.get('{{ route('api.statuslabels.assets') }}', function (data) {
|
||||
var myPieChart = new Chart(ctx,{
|
||||
|
||||
|
|
@ -167,16 +156,11 @@
|
|||
});
|
||||
// document.getElementById('my-doughnut-legend').innerHTML = myPieChart.generateLegend();
|
||||
});
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
</script>
|
||||
|
||||
<script src="{{ asset('assets/js/bootstrap-table.js') }}"></script>
|
||||
<script src="{{ asset('assets/js/extensions/mobile/bootstrap-table-mobile.js') }}"></script>
|
||||
<script type="text/javascript">
|
||||
<script src="{{ asset('assets/js/bootstrap-table.js') }}"></script>
|
||||
<script src="{{ asset('assets/js/extensions/mobile/bootstrap-table-mobile.js') }}"></script>
|
||||
<script type="text/javascript">
|
||||
$('#table').bootstrapTable({
|
||||
classes: 'table table-responsive table-no-bordered',
|
||||
undefinedText: '',
|
||||
|
|
@ -191,8 +175,5 @@
|
|||
mobileResponsive: true,
|
||||
});
|
||||
|
||||
</script>
|
||||
@stop
|
||||
|
||||
|
||||
</script>
|
||||
@stop
|
||||
|
|
|
|||
|
|
@ -12,7 +12,8 @@
|
|||
@include ('partials.forms.edit.name', ['translated_name' => trans('admin/depreciations/general.depreciation_name')])
|
||||
<!-- Months -->
|
||||
<div class="form-group {{ $errors->has('months') ? ' has-error' : '' }}">
|
||||
<label for="months" class="col-md-3 control-label">{{ trans('admin/depreciations/general.number_of_months') }}
|
||||
<label for="months" class="col-md-3 control-label">
|
||||
{{ trans('admin/depreciations/general.number_of_months') }}
|
||||
</label>
|
||||
<div class="col-md-7{{ (\App\Helpers\Helper::checkIfRequired($item, 'months')) ? ' required' : '' }}">
|
||||
<div class="col-md-2" style="padding-left:0px">
|
||||
|
|
|
|||
|
|
@ -39,7 +39,7 @@ Asset Depreciations
|
|||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div> <!-- /.col-md-9-->
|
||||
|
||||
|
||||
<!-- side address column -->
|
||||
|
|
|
|||
|
|
@ -18,14 +18,15 @@
|
|||
<!-- Name -->
|
||||
<div class="form-group {{ $errors->has('name') ? ' has-error' : '' }}">
|
||||
<label for="name" class="col-md-3 control-label">{{ trans('admin/groups/titles.group_name') }}
|
||||
<i class='fa fa-asterisk'></i></label>
|
||||
<i class='fa fa-asterisk'></i>
|
||||
</label>
|
||||
<div class="col-md-6 required">
|
||||
<input class="form-control" type="text" name="name" id="name" value="{{ Input::old('name', $group->name) }}" />
|
||||
{!! $errors->first('name', '<span class="alert-msg"><i class="fa fa-times"></i> :message</span>') !!}
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="col-md-8 col-md-offset-3">
|
||||
<div class="col-md-8 col-md-offset-3">
|
||||
|
||||
@foreach ($permissions as $area => $permission)
|
||||
@for ($i = 0; $i < count($permission); $i++)
|
||||
|
|
@ -38,13 +39,11 @@
|
|||
|
||||
<!-- radio -->
|
||||
<div class="form-group" style="padding-left: 15px;">
|
||||
|
||||
<label class="radio-padding">
|
||||
{{ Form::radio('permission['.$permission_name.']', 1,
|
||||
(array_key_exists($permission_name, $groupPermissions) && $groupPermissions[$permission_name]), ['class' => 'minimal']) }}
|
||||
Grant
|
||||
</label>
|
||||
|
||||
<label class="radio-padding">
|
||||
{{ Form::radio('permission['.$permission_name.']', 0, (!array_key_exists($permission_name, $groupPermissions) || !$groupPermissions[$permission_name]), ['class' => 'minimal']) }}
|
||||
Deny
|
||||
|
|
@ -54,4 +53,5 @@
|
|||
@endif
|
||||
@endfor
|
||||
@endforeach
|
||||
</div>
|
||||
@stop
|
||||
|
|
|
|||
|
|
@ -13,14 +13,11 @@
|
|||
|
||||
{{-- Content --}}
|
||||
@section('content')
|
||||
|
||||
<div class="row">
|
||||
<div class="row">
|
||||
<div class="col-md-12">
|
||||
<div class="box box-default">
|
||||
<div class="box-body">
|
||||
|
||||
<div class="table-responsive">
|
||||
|
||||
<table
|
||||
name="groups"
|
||||
class="table table-striped snipe-table"
|
||||
|
|
@ -41,9 +38,9 @@
|
|||
</thead>
|
||||
</table>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
</div>
|
||||
</div> <!--.box-body-->
|
||||
</div> <!-- /.box.box-default-->
|
||||
</div> <!-- .col-md-12-->
|
||||
</div>
|
||||
@stop
|
||||
@section('moar_scripts')
|
||||
|
|
|
|||
|
|
@ -13,8 +13,11 @@
|
|||
<div class="row header">
|
||||
<div class="col-md-12">
|
||||
<a href="{{ route('update/group', $group->id) }}" class="btn-flat white pull-right">
|
||||
{{ trans('admin/groups/table.update') }}</a>
|
||||
<a href="{{ url('admin/groups') }}" class="btn-flat gray pull-right" style="margin-right:5px;"><i class="fa fa-arrow-left icon-white"></i> {{ trans('general.back') }}</a>
|
||||
{{ trans('admin/groups/table.update') }}
|
||||
</a>
|
||||
<a href="{{ url('admin/groups') }}" class="btn-flat gray pull-right" style="margin-right:5px;">
|
||||
<i class="fa fa-arrow-left icon-white"></i> {{ trans('general.back') }}
|
||||
</a>
|
||||
<h3 class="name"> {{ trans('admin/groups/titles.group_management') }} - {{ $group->name }}</h3>
|
||||
</div>
|
||||
</div>
|
||||
|
|
@ -30,14 +33,13 @@
|
|||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
|
||||
@foreach ($users as $user)
|
||||
<tr>
|
||||
<td><a href="{{ route('users.show', $user->id) }}">{{ $user->first_name }} {{ $user->last_name }}</a></td>
|
||||
<td>
|
||||
<a href="{{ route('users.show', $user->id) }}">{{ $user->first_name }} {{ $user->last_name }}</a>
|
||||
</td>
|
||||
</tr>
|
||||
@endforeach
|
||||
|
||||
|
||||
</tbody>
|
||||
</table>
|
||||
|
||||
|
|
@ -50,4 +52,6 @@
|
|||
</div>
|
||||
@endif
|
||||
</div>
|
||||
</div> <!--.col-md-12-->
|
||||
</div> <!--.user-profile-->
|
||||
@stop
|
||||
|
|
|
|||
|
|
@ -6,37 +6,31 @@
|
|||
@parent
|
||||
@stop
|
||||
|
||||
|
||||
{{-- Page content --}}
|
||||
@section('content')
|
||||
|
||||
<style>
|
||||
.input-group {
|
||||
.input-group {
|
||||
padding-left: 0px !important;
|
||||
}
|
||||
}
|
||||
</style>
|
||||
|
||||
|
||||
<div class="row">
|
||||
|
||||
<!-- left column -->
|
||||
<div class="col-md-7">
|
||||
|
||||
<div class="box box-default">
|
||||
<div class="box-header with-border">
|
||||
<h3 class="box-title"> {{ trans('admin/hardware/form.tag') }} </h3>
|
||||
</div>
|
||||
<div class="box-body">
|
||||
<form class="form-horizontal" method="post" action="" autocomplete="off">
|
||||
<!-- CSRF Token -->
|
||||
<input type="hidden" name="_token" value="{{ csrf_token() }}" />
|
||||
|
||||
{{ csrf_field() }}
|
||||
|
||||
<!-- User -->
|
||||
<div id="assigned_user" class="form-group{{ $errors->has('assigned_to') ? ' has-error' : '' }}">
|
||||
|
||||
{{ Form::label('assigned_to', trans('admin/hardware/form.checkout_to'), array('class' => 'col-md-3 control-label')) }}
|
||||
|
||||
<div class="col-md-7 required">
|
||||
{{ Form::select('assigned_to', $users_list , Input::old('assigned_to'), array('class'=>'select2', 'id'=>'assigned_to', 'style'=>'width:100%')) }}
|
||||
|
||||
|
|
@ -49,9 +43,7 @@
|
|||
|
||||
<!-- Checkout/Checkin Date -->
|
||||
<div class="form-group {{ $errors->has('checkout_at') ? 'error' : '' }}">
|
||||
|
||||
{{ Form::label('name', trans('admin/hardware/form.checkout_date'), array('class' => 'col-md-3 control-label')) }}
|
||||
|
||||
<div class="col-md-8">
|
||||
<div class="col-md-4 input-group required">
|
||||
<input type="date" class="datepicker form-control" data-date-format="yyyy-mm-dd" name="checkout_at" id="checkout_at" value="{{ Input::old('checkout_at', date('Y-m-d')) }}">
|
||||
|
|
@ -63,9 +55,7 @@
|
|||
|
||||
<!-- Expected Checkin Date -->
|
||||
<div class="form-group {{ $errors->has('expected_checkin') ? 'error' : '' }}">
|
||||
|
||||
{{ Form::label('name', trans('admin/hardware/form.expected_checkin'), array('class' => 'col-md-3 control-label')) }}
|
||||
|
||||
<div class="col-md-8">
|
||||
<div class="col-md-4 input-group">
|
||||
<input type="date" class="datepicker form-control" data-date-format="yyyy-mm-dd" name="expected_checkin" id="expected_checkin" value="{{ Input::old('expected_checkin') }}">
|
||||
|
|
@ -78,9 +68,7 @@
|
|||
|
||||
<!-- Note -->
|
||||
<div class="form-group {{ $errors->has('note') ? 'error' : '' }}">
|
||||
|
||||
{{ Form::label('note', trans('admin/hardware/form.notes'), array('class' => 'col-md-3 control-label')) }}
|
||||
|
||||
<div class="col-md-8">
|
||||
<textarea class="col-md-6 form-control" id="note" name="note">{{ Input::old('note') }}</textarea>
|
||||
{!! $errors->first('note', '<span class="alert-msg"><i class="fa fa-times"></i> :message</span>') !!}
|
||||
|
|
@ -88,26 +76,20 @@
|
|||
</div>
|
||||
|
||||
<div class="form-group{{ $errors->has('selected_asset') ? ' has-error' : '' }}">
|
||||
|
||||
{{ Form::label('selected_asset', trans('general.assets'), array('class' => 'col-md-3 control-label')) }}
|
||||
|
||||
<div class="col-md-8 required">
|
||||
{{ Form::select('selected_assets[]', $assets_list , Input::old('selected_asset'), array('class'=>'select2', 'id'=>'selected_asset', 'style'=>'width:100%', 'multiple'=>'multiple')) }}
|
||||
|
||||
{!! $errors->first('selected_asset', '<span class="alert-msg"><i class="fa fa-times"></i> :message</span>') !!}
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
||||
|
||||
</div>
|
||||
</form>
|
||||
</div> <!--./box-body-->
|
||||
<div class="box-footer">
|
||||
<a class="btn btn-link" href="{{ URL::previous() }}"> {{ trans('button.cancel') }}</a>
|
||||
<button type="submit" class="btn btn-success pull-right"><i class="fa fa-check icon-white"></i> {{ trans('general.checkout') }}</button>
|
||||
</div>
|
||||
</div>
|
||||
</form>
|
||||
</div>
|
||||
</div> <!--/.col-md-7-->
|
||||
|
||||
<!-- right column -->
|
||||
<div class="col-md-5" id="current_assets_box" style="display:none;">
|
||||
|
|
@ -121,10 +103,8 @@
|
|||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
||||
</div>
|
||||
|
||||
@stop
|
||||
|
||||
@section('moar_scripts')
|
||||
|
||||
|
|
@ -275,6 +255,5 @@ $(function() {
|
|||
});
|
||||
});
|
||||
</script>
|
||||
@stop
|
||||
|
||||
@stop
|
||||
|
|
@ -2,38 +2,29 @@
|
|||
|
||||
{{-- Page title --}}
|
||||
@section('title')
|
||||
{{ trans('admin/hardware/form.bulk_delete') }}
|
||||
|
||||
{{ trans('admin/hardware/form.bulk_delete') }}
|
||||
@parent
|
||||
@stop
|
||||
|
||||
@section('header_right')
|
||||
<a href="{{ URL::previous() }}" class="btn btn-primary pull-right">
|
||||
<a href="{{ URL::previous() }}" class="btn btn-primary pull-right">
|
||||
{{ trans('general.back') }}</a>
|
||||
@stop
|
||||
|
||||
|
||||
|
||||
{{-- Page content --}}
|
||||
|
||||
@section('content')
|
||||
|
||||
<div class="row">
|
||||
|
||||
|
||||
<div class="row">
|
||||
<!-- left column -->
|
||||
<div class="col-md-12">
|
||||
|
||||
<p>{{ trans('admin/hardware/form.bulk_delete_help') }}</p>
|
||||
|
||||
<form class="form-horizontal" method="post" action="{{ route('hardware/bulkdelete') }}" autocomplete="off" role="form">
|
||||
{{csrf_field()}}
|
||||
<div class="box box-default">
|
||||
<div class="box-header with-border">
|
||||
<h3 class="box-title" style="color: red">{{ trans('admin/hardware/form.bulk_delete_warn', ['asset_count' => count($assets)]) }}</h3>
|
||||
</div>
|
||||
<div class="box-body">
|
||||
|
||||
<input type="hidden" name="_token" value="{{ csrf_token() }}" />
|
||||
<div class="box-body">
|
||||
<table class="table table-striped table-condensed">
|
||||
<thead>
|
||||
<tr>
|
||||
|
|
@ -62,21 +53,16 @@
|
|||
</td>
|
||||
</tr>
|
||||
@endforeach
|
||||
|
||||
</tbody>
|
||||
|
||||
</table>
|
||||
|
||||
|
||||
</div><!-- /.box-body -->
|
||||
|
||||
<div class="box-footer text-right">
|
||||
<a class="btn btn-link" href="{{ URL::previous() }}" method="post" enctype="multipart/form-data">{{ trans('button.cancel') }}</a>
|
||||
<button type="submit" class="btn btn-success" id="submit-button"><i class="fa fa-check icon-white"></i> {{ trans('general.delete') }}</button>
|
||||
</div><!-- /.box-footer -->
|
||||
</div><!-- /.box -->
|
||||
</form>
|
||||
|
||||
|
||||
</div>
|
||||
</div>
|
||||
</div> <!-- .col-md-12-->
|
||||
</div><!--.row-->
|
||||
@stop
|
||||
|
|
|
|||
|
|
@ -12,13 +12,8 @@
|
|||
{{ trans('general.back') }}</a>
|
||||
@stop
|
||||
|
||||
|
||||
{{-- Page content --}}
|
||||
|
||||
@section('content')
|
||||
|
||||
|
||||
|
||||
<div class="row">
|
||||
<div class="col-md-8 col-md-offset-2">
|
||||
|
||||
|
|
@ -28,15 +23,10 @@
|
|||
<i class="fa fa-warning"></i> {{ trans('admin/hardware/form.bulk_update_warn', ['asset_count' => count($assets)]) }}
|
||||
</div>
|
||||
|
||||
|
||||
|
||||
<form class="form-horizontal" method="post" action="{{ route('hardware/bulksave') }}" autocomplete="off" role="form">
|
||||
|
||||
<!-- CSRF Token -->
|
||||
<input type="hidden" name="_token" value="{{ csrf_token() }}" />
|
||||
{{ csrf_field() }}
|
||||
|
||||
<div class="box box-default">
|
||||
|
||||
<div class="box-body">
|
||||
<!-- Purchase Date -->
|
||||
<div class="form-group {{ $errors->has('purchase_date') ? ' has-error' : '' }}">
|
||||
|
|
@ -70,10 +60,11 @@
|
|||
</div>
|
||||
</div>
|
||||
|
||||
|
||||
<!-- Default Location -->
|
||||
<div class="form-group {{ $errors->has('status_id') ? ' has-error' : '' }}">
|
||||
<label for="status_id" class="col-md-2 control-label">{{ trans('admin/hardware/form.default_location') }}</label>
|
||||
<label for="status_id" class="col-md-2 control-label">
|
||||
{{ trans('admin/hardware/form.default_location') }}
|
||||
</label>
|
||||
<div class="col-md-7">
|
||||
{{ Form::select('rtd_location_id', $location_list , Input::old('rtd_location_id'), array('class'=>'select2', 'style'=>'width:350px')) }}
|
||||
{!! $errors->first('status_id', '<span class="alert-msg"><i class="fa fa-times"></i> :message</span>') !!}
|
||||
|
|
@ -88,14 +79,15 @@
|
|||
<div class="input-group col-md-3">
|
||||
<span class="input-group-addon">{{ $snipeSettings->default_currency }}</span>
|
||||
<input type="text" class="form-control" placeholder="{{ trans('admin/hardware/form.cost') }}" name="purchase_cost" id="purchase_cost" value="{{ Input::old('purchase_cost') }}">
|
||||
|
||||
{!! $errors->first('purchase_cost', '<span class="alert-msg"><i class="fa fa-times"></i> :message</span>') !!}
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<!-- Supplier -->
|
||||
<div class="form-group {{ $errors->has('supplier_id') ? ' has-error' : '' }}">
|
||||
<label for="supplier_id" class="col-md-2 control-label">{{ trans('admin/hardware/form.supplier') }}</label>
|
||||
<label for="supplier_id" class="col-md-2 control-label">
|
||||
{{ trans('admin/hardware/form.supplier') }}
|
||||
</label>
|
||||
<div class="col-md-7">
|
||||
{{ Form::select('supplier_id', $supplier_list , Input::old('supplier_id'), array('class'=>'select2', 'style'=>'min-width:350px')) }}
|
||||
{!! $errors->first('supplier_id', '<span class="alert-msg"><i class="fa fa-times"></i> :message</span>') !!}
|
||||
|
|
@ -115,7 +107,9 @@
|
|||
|
||||
<!-- Order Number -->
|
||||
<div class="form-group {{ $errors->has('order_number') ? ' has-error' : '' }}">
|
||||
<label for="order_number" class="col-md-2 control-label">{{ trans('admin/hardware/form.order') }}</label>
|
||||
<label for="order_number" class="col-md-2 control-label">
|
||||
{{ trans('admin/hardware/form.order') }}
|
||||
</label>
|
||||
<div class="col-md-7">
|
||||
<input class="form-control" type="text" name="order_number" id="order_number" value="{{ Input::old('order_number') }}" />
|
||||
{!! $errors->first('order_number', '<span class="alert-msg"><i class="fa fa-times"></i> :message</span>') !!}
|
||||
|
|
@ -124,19 +118,23 @@
|
|||
|
||||
<!-- Warranty -->
|
||||
<div class="form-group {{ $errors->has('warranty_months') ? ' has-error' : '' }}">
|
||||
<label for="warranty_months" class="col-md-2 control-label">{{ trans('admin/hardware/form.warranty') }}</label>
|
||||
<label for="warranty_months" class="col-md-2 control-label">
|
||||
{{ trans('admin/hardware/form.warranty') }}
|
||||
</label>
|
||||
<div class="col-md-2">
|
||||
<div class="input-group">
|
||||
<input class="col-md-2 form-control" type="text" name="warranty_months" id="warranty_months" value="{{ Input::old('warranty_months') }}" /> <span class="input-group-addon">{{ trans('admin/hardware/form.months') }}</span>
|
||||
<input class="col-md-2 form-control" type="text" name="warranty_months" id="warranty_months" value="{{ Input::old('warranty_months') }}" />
|
||||
<span class="input-group-addon">{{ trans('admin/hardware/form.months') }}</span>
|
||||
{!! $errors->first('warranty_months', '<span class="alert-msg"><i class="fa fa-times"></i> :message</span>') !!}
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<!-- Requestable -->
|
||||
|
||||
<div class="form-group {{ $errors->has('warranty_months') ? ' has-error' : '' }}">
|
||||
<label for="requestable" class="col-md-2 control-label">{{ trans('admin/hardware/form.requestable') }}</label>
|
||||
<div class="form-group {{ $errors->has('requestable') ? ' has-error' : '' }}">
|
||||
<label for="requestable" class="col-md-2 control-label">
|
||||
{{ trans('admin/hardware/form.requestable') }}
|
||||
</label>
|
||||
<div class="col-md-10">
|
||||
<label class="radio">
|
||||
<input type="radio" name="requestable" value="1"> Yes
|
||||
|
|
@ -150,21 +148,16 @@
|
|||
</div>
|
||||
</div>
|
||||
|
||||
|
||||
@foreach ($assets as $key => $value)
|
||||
<input type="hidden" name="bulk_edit[{{ $key }}]" value="1">
|
||||
@endforeach
|
||||
|
||||
|
||||
</div>
|
||||
</div> <!--/.box-body-->
|
||||
|
||||
<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>
|
||||
|
||||
|
||||
</div> <!--/.box.box-default-->
|
||||
</form>
|
||||
</div>
|
||||
</div> <!--/.col-md-8-->
|
||||
</div>
|
||||
@stop
|
||||
|
|
|
|||
|
|
@ -2,27 +2,23 @@
|
|||
|
||||
{{-- Page title --}}
|
||||
@section('title')
|
||||
{{ trans('admin/hardware/general.checkin') }}
|
||||
@parent
|
||||
{{ trans('admin/hardware/general.checkin') }}
|
||||
@parent
|
||||
@stop
|
||||
|
||||
{{-- Page content --}}
|
||||
@section('content')
|
||||
|
||||
|
||||
<style>
|
||||
<style>
|
||||
|
||||
.input-group {
|
||||
padding-left: 0px !important;
|
||||
}
|
||||
</style>
|
||||
</style>
|
||||
|
||||
|
||||
<div class="row">
|
||||
|
||||
<div class="row">
|
||||
<!-- left column -->
|
||||
<div class="col-md-9">
|
||||
|
||||
<div class="box box-default">
|
||||
<div class="box-header with-border">
|
||||
<h3 class="box-title">{{ trans('admin/hardware/form.tag') }} {{ $asset->asset_tag }}</h3>
|
||||
|
|
@ -30,7 +26,6 @@
|
|||
|
||||
<div class="box-body">
|
||||
<div class="col-md-12">
|
||||
|
||||
@if ($backto=='user')
|
||||
<form class="form-horizontal" method="post"
|
||||
action="{{ route('checkin/hardware', array('assetId'=> $asset->id, 'backto'=>'user')) }}"
|
||||
|
|
@ -39,15 +34,11 @@
|
|||
<form class="form-horizontal" method="post"
|
||||
action="{{ route('checkin/hardware', $asset->id) }}" autocomplete="off">
|
||||
@endif
|
||||
<!-- CSRF Token -->
|
||||
<input type="hidden" name="_token" value="{{ csrf_token() }}"/>
|
||||
|
||||
{{csrf_field()}}
|
||||
@if ($asset->model->name)
|
||||
<!-- Asset name -->
|
||||
<!-- AssetModel name -->
|
||||
<div class="form-group">
|
||||
|
||||
{{ Form::label('name', trans('admin/hardware/form.model'), array('class' => 'col-md-3 control-label')) }}
|
||||
|
||||
<div class="col-md-8">
|
||||
<p class="form-control-static">{{ $asset->model->name }}</p>
|
||||
</div>
|
||||
|
|
@ -66,9 +57,7 @@
|
|||
|
||||
<!-- Status -->
|
||||
<div class="form-group {{ $errors->has('status_id') ? 'error' : '' }}">
|
||||
|
||||
{{ Form::label('name', trans('admin/hardware/form.status'), array('class' => 'col-md-3 control-label')) }}
|
||||
|
||||
<div class="col-md-7 required">
|
||||
{{ Form::select('status_id', $statusLabel_list, '', array('class'=>'select2', 'style'=>'width:100%','id' =>'modal-statuslabel_types')) }}
|
||||
{!! $errors->first('status_id', '<span class="alert-msg"><i class="fa fa-times"></i> :message</span>') !!}
|
||||
|
|
@ -77,9 +66,7 @@
|
|||
|
||||
<!-- Checkout/Checkin Date -->
|
||||
<div class="form-group {{ $errors->has('checkin_at') ? 'error' : '' }}">
|
||||
|
||||
{{ Form::label('name', trans('admin/hardware/form.checkin_date'), array('class' => 'col-md-3 control-label')) }}
|
||||
|
||||
<div class="col-md-8">
|
||||
<div class="col-md-4 input-group required">
|
||||
<input type="date" class="datepicker form-control"
|
||||
|
|
@ -108,14 +95,14 @@
|
|||
class="fa fa-check icon-white"></i> {{ trans('general.checkin') }}</button>
|
||||
</form>
|
||||
</div>
|
||||
</div>
|
||||
</form>
|
||||
</div> <!--/.col-md-12-->
|
||||
</div> <!--/.box-body-->
|
||||
<div class="box-footer">
|
||||
<a class="btn btn-link" href="{{ URL::previous() }}"> {{ trans('button.cancel') }}</a>
|
||||
|
||||
</div>
|
||||
</div>
|
||||
|
||||
</div>
|
||||
</div> <!--/.box.box-default-->
|
||||
</div>
|
||||
</div>
|
||||
|
||||
@stop
|
||||
|
|
|
|||
|
|
@ -6,7 +6,6 @@
|
|||
@parent
|
||||
@stop
|
||||
|
||||
|
||||
{{-- Page content --}}
|
||||
@section('content')
|
||||
|
||||
|
|
@ -17,29 +16,20 @@
|
|||
}
|
||||
</style>
|
||||
|
||||
|
||||
<div class="row">
|
||||
|
||||
<!-- left column -->
|
||||
<div class="col-md-7">
|
||||
|
||||
<div class="box box-default">
|
||||
<form class="form-horizontal" method="post" action="" autocomplete="off">
|
||||
<div class="box-header with-border">
|
||||
<h3 class="box-title"> {{ trans('admin/hardware/form.tag') }} {{ $asset->asset_tag }}</h3>
|
||||
</div>
|
||||
<div class="box-body">
|
||||
<form class="form-horizontal" method="post" action="" autocomplete="off">
|
||||
<!-- CSRF Token -->
|
||||
<input type="hidden" name="_token" value="{{ csrf_token() }}" />
|
||||
|
||||
|
||||
|
||||
{{csrf_field()}}
|
||||
@if ($asset->model->name)
|
||||
<!-- Asset name -->
|
||||
<div class="form-group {{ $errors->has('name') ? 'error' : '' }}">
|
||||
|
||||
{{ Form::label('name', trans('admin/hardware/form.model'), array('class' => 'col-md-3 control-label')) }}
|
||||
|
||||
<div class="col-md-8">
|
||||
<p class="form-control-static">{{ $asset->model->name }}</p>
|
||||
</div>
|
||||
|
|
@ -48,9 +38,7 @@
|
|||
|
||||
<!-- Asset Name -->
|
||||
<div class="form-group {{ $errors->has('name') ? 'error' : '' }}">
|
||||
|
||||
{{ Form::label('name', trans('admin/hardware/form.name'), array('class' => 'col-md-3 control-label')) }}
|
||||
|
||||
<div class="col-md-8">
|
||||
<input class="form-control" type="text" name="name" id="name" value="{{ Input::old('name', $asset->name) }}" />
|
||||
{!! $errors->first('name', '<span class="alert-msg"><i class="fa fa-times"></i> :message</span>') !!}
|
||||
|
|
@ -59,9 +47,7 @@
|
|||
|
||||
<!-- User -->
|
||||
<div id="assigned_user" class="form-group{{ $errors->has('assigned_to') ? ' has-error' : '' }}">
|
||||
|
||||
{{ Form::label('assigned_to', trans('admin/hardware/form.checkout_to'), array('class' => 'col-md-3 control-label')) }}
|
||||
|
||||
<div class="col-md-7 required">
|
||||
{{ Form::select('assigned_to', $users_list , Input::old('assigned_to', $asset->assigned_to), array('class'=>'select2', 'id'=>'assigned_to', 'style'=>'width:100%')) }}
|
||||
|
||||
|
|
@ -72,13 +58,9 @@
|
|||
</div>
|
||||
</div>
|
||||
|
||||
|
||||
|
||||
<!-- Checkout/Checkin Date -->
|
||||
<div class="form-group {{ $errors->has('checkout_at') ? 'error' : '' }}">
|
||||
|
||||
{{ Form::label('name', trans('admin/hardware/form.checkout_date'), array('class' => 'col-md-3 control-label')) }}
|
||||
|
||||
<div class="col-md-8">
|
||||
<div class="col-md-4 input-group required">
|
||||
<input type="date" class="datepicker form-control" data-date-format="yyyy-mm-dd" name="checkout_at" id="checkout_at" value="{{ Input::old('checkout_at', date('Y-m-d')) }}">
|
||||
|
|
@ -88,12 +70,9 @@
|
|||
</div>
|
||||
</div>
|
||||
|
||||
|
||||
<!-- Expected Checkin Date -->
|
||||
<div class="form-group {{ $errors->has('expected_checkin') ? 'error' : '' }}">
|
||||
|
||||
{{ Form::label('name', trans('admin/hardware/form.expected_checkin'), array('class' => 'col-md-3 control-label')) }}
|
||||
|
||||
<div class="col-md-8">
|
||||
<div class="col-md-4 input-group">
|
||||
<input type="date" class="datepicker form-control" data-date-format="yyyy-mm-dd" name="expected_checkin" id="expected_checkin" value="{{ Input::old('expected_checkin') }}">
|
||||
|
|
@ -105,27 +84,24 @@
|
|||
|
||||
<!-- Note -->
|
||||
<div class="form-group {{ $errors->has('note') ? 'error' : '' }}">
|
||||
|
||||
{{ Form::label('note', trans('admin/hardware/form.notes'), array('class' => 'col-md-3 control-label')) }}
|
||||
|
||||
<div class="col-md-8">
|
||||
<textarea class="col-md-6 form-control" id="note" name="note">{{ Input::old('note', $asset->note) }}</textarea>
|
||||
{!! $errors->first('note', '<span class="alert-msg"><i class="fa fa-times"></i> :message</span>') !!}
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
||||
|
||||
@if ($asset->requireAcceptance())
|
||||
|
||||
<div class="form-group">
|
||||
<div class="col-md-8 col-md-offset-3">
|
||||
<p class="text-yellow"><i class="fa fa-warning"></i> {{ trans('admin/categories/general.required_acceptance') }}</p>
|
||||
<p class="text-yellow">
|
||||
<i class="fa fa-warning"></i>
|
||||
{{ trans('admin/categories/general.required_acceptance') }}
|
||||
</p>
|
||||
</div>
|
||||
</div>
|
||||
@endif
|
||||
|
||||
|
||||
@if ($asset->getEula())
|
||||
<div class="form-group">
|
||||
<div class="col-md-8 col-md-offset-3">
|
||||
|
|
@ -133,15 +109,14 @@
|
|||
</div>
|
||||
</div>
|
||||
@endif
|
||||
|
||||
</div>
|
||||
</div> <!--/.box-body-->
|
||||
<div class="box-footer">
|
||||
<a class="btn btn-link" href="{{ URL::previous() }}"> {{ trans('button.cancel') }}</a>
|
||||
<button type="submit" class="btn btn-success pull-right"><i class="fa fa-check icon-white"></i> {{ trans('general.checkout') }}</button>
|
||||
</div>
|
||||
</div>
|
||||
</form>
|
||||
</div>
|
||||
</div> <!--/.col-md-7-->
|
||||
|
||||
<!-- right column -->
|
||||
<div class="col-md-5" id="current_assets_box" style="display:none;">
|
||||
|
|
@ -155,10 +130,8 @@
|
|||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
||||
</div>
|
||||
|
||||
@stop
|
||||
|
||||
@section('moar_scripts')
|
||||
|
||||
|
|
@ -339,5 +312,3 @@ $(function() {
|
|||
});
|
||||
</script>
|
||||
@stop
|
||||
|
||||
@stop
|
||||
|
|
|
|||
|
|
@ -1,144 +0,0 @@
|
|||
@extends('layouts/default')
|
||||
|
||||
{{-- Page title --}}
|
||||
@section('title')
|
||||
{{ trans('admin/hardware/general.clone') }}
|
||||
@parent
|
||||
@stop
|
||||
|
||||
{{-- Page content --}}
|
||||
@section('content')
|
||||
<div class="page-header">
|
||||
|
||||
<div class="pull-right">
|
||||
<a href="{{ URL::previous() }}" class="btn-flat gray"><i class="fa fa-arrow-left icon-white"></i> {{ trans('general.back') }}</a>
|
||||
</div>
|
||||
|
||||
<h3>{{ trans('admin/hardware/general.clone') }}</h3>
|
||||
</div>
|
||||
|
||||
|
||||
<form class="form-horizontal" method="post" action="" autocomplete="off">
|
||||
<!-- CSRF Token -->
|
||||
<input type="hidden" name="_token" value="{{ csrf_token() }}" />
|
||||
|
||||
<!-- Asset Tag -->
|
||||
<div class="form-group {{ $errors->has('asset_tag') ? 'error' : '' }}">
|
||||
<label class="control-label" for="asset_tag">{{ trans('admin/hardware/form.tag') }}</label>
|
||||
<div class="controls">
|
||||
<input class="col-md-4" type="text" name="asset_tag" id="asset_tag" value="{{ Input::old('asset_tag', $asset->asset_tag) }}" />
|
||||
{!! $errors->first('asset_tag', '<span class="help-inline"><i class="fa fa-times"></i> :message</span>') !!}
|
||||
</div>
|
||||
</div>
|
||||
<!-- Asset Title -->
|
||||
<div class="form-group {{ $errors->has('name') ? 'error' : '' }}">
|
||||
<label class="control-label" for="name">{{ trans('admin/hardware/form.name') }}</label>
|
||||
<div class="controls">
|
||||
<input class="col-md-4" type="text" name="name" id="name" value="{{ Input::old('name', $asset->name) }}" />
|
||||
{!! $errors->first('name', '<span class="help-inline"><i class="fa fa-times"></i> :message</span>') !!}
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
||||
<!-- Serial -->
|
||||
<div class="form-group {{ $errors->has('serial') ? 'error' : '' }}">
|
||||
<label class="control-label" for="serial">{{ trans('admin/hardware/form.serial') }}</label>
|
||||
<div class="controls">
|
||||
<input class="col-md-4" type="text" name="serial" id="serial" value="{{ Input::old('serial', $asset->serial) }}" />
|
||||
{!! $errors->first('serial', '<span class="help-inline"><i class="fa fa-times"></i> :message</span>') !!}
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<!-- Order Number -->
|
||||
<div class="form-group {{ $errors->has('order_number') ? 'error' : '' }}">
|
||||
<label class="control-label" for="order_number">{{ trans('admin/hardware/form.order') }}</label>
|
||||
<div class="controls">
|
||||
<input class="col-md-4" type="text" name="order_number" id="order_number" value="{{ Input::old('order_number', $asset->order_number) }}" />
|
||||
{!! $errors->first('order_number', '<span class="help-inline"><i class="fa fa-times"></i> :message</span>') !!}
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<!-- Model -->
|
||||
<div class="form-group {{ $errors->has('model_id') ? 'error' : '' }}">
|
||||
<label class="control-label" for="parent">{{ trans('admin/hardware/form.model') }}</label>
|
||||
<div class="controls">
|
||||
{{ Form::select('model_id', $model_list , Input::old('model_id', $asset->model_id), array('class'=>'select2', 'style'=>'min-width:350px')) }}
|
||||
{!! $errors->first('model_id', '<span class="help-inline"><i class="fa fa-times"></i> :message</span>') !!}
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<!-- Purchase Date -->
|
||||
<div class="form-group input-append {{ $errors->has('purchase_date') ? 'error' : '' }}" >
|
||||
<label class="control-label" for="purchase_date">{{ trans('admin/hardware/form.date') }}</label>
|
||||
<div class="controls">
|
||||
<input type="text" class="datepicker span2" data-date-format="yyyy-mm-dd" placeholder="Select Date" name="purchase_date" id="purchase_date" value="{{ Input::old('purchase_date', $asset->purchase_date) }}">
|
||||
{!! $errors->first('purchase_date', '<span class="help-inline"><i class="fa fa-times"></i> :message</span>') !!}
|
||||
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<!-- Purchase Cost -->
|
||||
<div class="form-group {{ $errors->has('purchase_cost') ? 'error' : '' }}">
|
||||
<label class="control-label" for="purchase_cost">{{ trans('admin/hardware/form.cost') }}</label>
|
||||
<div class="controls">
|
||||
<div class="input-prepend">
|
||||
<span class="add-on">$</span>
|
||||
<input class="col-md-2" type="text" name="purchase_cost" id="purchase_cost" value="{{ Input::old('purchase_cost', $asset->purchase_cost) }}" />
|
||||
{!! $errors->first('purchase_cost', '<span class="help-inline"><i class="fa fa-times"></i> :message</span>') !!}
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<!-- Warrantee -->
|
||||
<div class="form-group {{ $errors->has('warranty_months') ? 'error' : '' }}">
|
||||
<label class="control-label" for="serial">{{ trans('admin/hardware/form.warranty') }}</label>
|
||||
<div class="controls">
|
||||
<input class="col-md-1" type="text" name="warranty_months" id="warranty_months" value="{{ Input::old('warranty_months', $asset->warranty_months) }}" />
|
||||
{{ trans('admin/hardware/form.months') }}
|
||||
{!! $errors->first('warranty_months', '<span class="help-inline"><i class="fa fa-times"></i> :message</span>') !!}
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<!-- Depreciation -->
|
||||
<div class="form-group {{ $errors->has('depreciation_id') ? 'error' : '' }}">
|
||||
<label class="control-label" for="parent">{{ trans('admin/hardware/form.depreciation') }}</label>
|
||||
<div class="controls">
|
||||
<div class="field-box">
|
||||
{{ Form::select('depreciation_id', $depreciation_list , Input::old('depreciation_id', $asset->depreciation_id), array('class'=>'select2', 'style'=>'width:250px')) }}
|
||||
{!! $errors->first('depreciation_id', '<span class="help-inline"><i class="fa fa-times"></i> :message</span>') !!}
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<!-- Status -->
|
||||
<div class="form-group {{ $errors->has('status_id') ? 'error' : '' }}">
|
||||
<label class="control-label" for="parent">{{ trans('admin/hardware/form.status') }}</label>
|
||||
<div class="controls">
|
||||
<div class="field-box">
|
||||
{{ Form::select('status_id', $statuslabel_list , Input::old('status_id', $asset->status_id), array('class'=>'select2', 'style'=>'width:250px')) }}
|
||||
{!! $errors->first('depreciation_id', '<span class="help-inline"><i class="fa fa-times"></i> :message</span>') !!}
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
||||
<!-- Notes -->
|
||||
<div class="form-group {{ $errors->has('notes') ? 'error' : '' }}">
|
||||
<label class="control-label" for="notes">{{ trans('admin/hardware/form.notes') }}</label>
|
||||
<div class="controls">
|
||||
<textarea class="col-md-6 form-control" id="notes" name="notes">{{ Input::old('notes', $asset->notes) }}</textarea>
|
||||
{!! $errors->first('notes', '<span class="help-inline"><i class="fa fa-times"></i> :message</span>') !!}
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<!-- Form actions -->
|
||||
<div class="form-group">
|
||||
<div class="controls">
|
||||
<a class="btn btn-link" href="{{ URL::previous() }}">{{ trans('button.cancel') }}</a>
|
||||
<button type="submit" class="btn-flat success"><i class="fa fa-check icon-white"></i> {{ trans('general.save') }}</button>
|
||||
</div>
|
||||
</div>
|
||||
</form>
|
||||
|
||||
|
||||
@stop
|
||||
|
|
@ -12,44 +12,40 @@
|
|||
|
||||
@section('inputFields')
|
||||
|
||||
@include ('partials.forms.edit.company')
|
||||
<!-- Asset Tag -->
|
||||
<div class="form-group {{ $errors->has('asset_tag') ? ' has-error' : '' }}">
|
||||
@include ('partials.forms.edit.company')
|
||||
<!-- Asset Tag -->
|
||||
<div class="form-group {{ $errors->has('asset_tag') ? ' has-error' : '' }}">
|
||||
<label for="asset_tag" class="col-md-3 control-label">{{ trans('admin/hardware/form.tag') }}</label>
|
||||
<div class="col-md-7 col-sm-12{{ (\App\Helpers\Helper::checkIfRequired($item, 'asset_tag')) ? ' required' : '' }}">
|
||||
<div class="col-md-7 col-sm-12{{ (\App\Helpers\Helper::checkIfRequired($item, 'asset_tag')) ? ' required' : '' }}">
|
||||
@if ($item->id)
|
||||
<input class="form-control" type="text" name="asset_tag" id="asset_tag" value="{{ Input::old('asset_tag', $item->asset_tag) }}" />
|
||||
@else
|
||||
<input class="form-control" type="text" name="asset_tag" id="asset_tag" value="{{ Input::old('asset_tag', \App\Models\Asset::autoincrement_asset()) }}">
|
||||
@endif
|
||||
|
||||
{!! $errors->first('asset_tag', '<span class="alert-msg"><i class="fa fa-times"></i> :message</span>') !!}
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<!-- Model -->
|
||||
<div class="form-group {{ $errors->has('model_id') ? ' has-error' : '' }}">
|
||||
<!-- Model -->
|
||||
<div class="form-group {{ $errors->has('model_id') ? ' has-error' : '' }}">
|
||||
<label for="parent" class="col-md-3 control-label">{{ trans('admin/hardware/form.model') }}</label>
|
||||
<div class="col-md-7 col-sm-10{{ (\App\Helpers\Helper::checkIfRequired($item, 'model_id')) ? ' required' : '' }}">
|
||||
<div class="col-md-7 col-sm-10{{ (\App\Helpers\Helper::checkIfRequired($item, 'model_id')) ? ' required' : '' }}">
|
||||
@if (isset($selected_model))
|
||||
{{ Form::select('model_id', $model_list , $selected_model->id, array('class'=>'select2 model', 'style'=>'width:100%','id' =>'model_select_id')) }}
|
||||
|
||||
@else
|
||||
{{ Form::select('model_id', $model_list , Input::old('model_id', $item->model_id), array('class'=>'select2 model', 'style'=>'width:100%','id' =>'model_select_id')) }}
|
||||
@endif
|
||||
|
||||
<!-- onclick="return dependency('model')" -->
|
||||
{!! $errors->first('model_id', '<span class="alert-msg"><i class="fa fa-times"></i> :message</span>') !!}
|
||||
|
||||
</div>
|
||||
<div class="col-md-1 col-sm-1 text-left">
|
||||
</div>
|
||||
<div class="col-md-1 col-sm-1 text-left">
|
||||
<a href='#' data-toggle="modal" data-target="#createModal" data-dependency="model" data-select="model_select_id" class="btn btn-sm btn-default">New</a>
|
||||
<span class="mac_spinner" style="padding-left: 10px; color: green; display:none; width: 30px;"><i class="fa fa-spinner fa-spin"></i> </span>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
||||
<div id='custom_fields_content'>
|
||||
<div id='custom_fields_content'>
|
||||
<!-- Custom Fields -->
|
||||
@if ($item->model && $item->model->fieldset)
|
||||
<?php $model=$item->model; ?>
|
||||
|
|
@ -62,14 +58,15 @@
|
|||
@if (isset($model) && $model)
|
||||
@include("models/custom_fields_form",["model" => $model])
|
||||
@endif
|
||||
</div>
|
||||
</div>
|
||||
|
||||
@include ('partials.forms.edit.status')
|
||||
@include ('partials.forms.edit.status')
|
||||
|
||||
@if (!$item->id)
|
||||
<!-- Assigned To -->
|
||||
<div id="assigned_user" style="display: none;" class="form-group {{ $errors->has('assigned_to') ? ' has-error' : '' }}">
|
||||
<label for="parent" class="col-md-3 control-label">{{ trans('admin/hardware/form.checkout_to') }}
|
||||
@if (!$item->id)
|
||||
<!-- Assigned To -->
|
||||
<div id="assigned_user" style="display: none;" class="form-group {{ $errors->has('assigned_to') ? ' has-error' : '' }}">
|
||||
<label for="parent" class="col-md-3 control-label">
|
||||
{{ trans('admin/hardware/form.checkout_to') }}
|
||||
</label>
|
||||
<div class="col-md-7 col-sm-12">
|
||||
{{ Form::select('assigned_to', $assigned_to , Input::old('assigned_to', $item->assigned_to), array('class'=>'select2', 'id'=>'assigned_to', 'style'=>'width:100%')) }}
|
||||
|
|
@ -79,26 +76,26 @@
|
|||
<div class="col-md-1 col-sm-1 text-left" style="margin-left: -20px; padding-top: 3px">
|
||||
<a href='#' data-toggle="modal" data-target="#createModal" data-dependency="user" data-select='assigned_to' class="btn btn-sm btn-default">New</a>
|
||||
</div>
|
||||
</div>
|
||||
@endif
|
||||
</div>
|
||||
@endif
|
||||
|
||||
@include ('partials.forms.edit.serial', ['translated_serial' => trans('admin/hardware/form.serial')])
|
||||
@include ('partials.forms.edit.name', ['translated_name' => trans('admin/hardware/form.name')])
|
||||
@include ('partials.forms.edit.purchase_date')
|
||||
@include ('partials.forms.edit.supplier')
|
||||
@include ('partials.forms.edit.order_number')
|
||||
<?php
|
||||
$currency_type=null;
|
||||
if ($item->id && $item->assetloc) {
|
||||
@include ('partials.forms.edit.serial', ['translated_serial' => trans('admin/hardware/form.serial')])
|
||||
@include ('partials.forms.edit.name', ['translated_name' => trans('admin/hardware/form.name')])
|
||||
@include ('partials.forms.edit.purchase_date')
|
||||
@include ('partials.forms.edit.supplier')
|
||||
@include ('partials.forms.edit.order_number')
|
||||
<?php
|
||||
$currency_type=null;
|
||||
if ($item->id && $item->assetloc) {
|
||||
$currency_type = $item->assetloc->currency;
|
||||
}
|
||||
?>
|
||||
@include ('partials.forms.edit.purchase_cost', ['currency_type' => $currency_type])
|
||||
@include ('partials.forms.edit.warranty')
|
||||
@include ('partials.forms.edit.notes')
|
||||
}
|
||||
?>
|
||||
@include ('partials.forms.edit.purchase_cost', ['currency_type' => $currency_type])
|
||||
@include ('partials.forms.edit.warranty')
|
||||
@include ('partials.forms.edit.notes')
|
||||
|
||||
<!-- Default Location -->
|
||||
<div class="form-group {{ $errors->has('rtd_location_id') ? ' has-error' : '' }}">
|
||||
<!-- Default Location -->
|
||||
<div class="form-group {{ $errors->has('rtd_location_id') ? ' has-error' : '' }}">
|
||||
<label for="rtd_location_id" class="col-md-3 control-label">{{ trans('admin/hardware/form.default_location') }}</label>
|
||||
<div class="col-md-7 col-sm-11">
|
||||
{{ Form::select('rtd_location_id', $location_list , Input::old('rtd_location_id', $item->rtd_location_id), array('class'=>'select2', 'style'=>'width:100%','id'=>'rtd_location_select')) }}
|
||||
|
|
@ -108,30 +105,29 @@ if ($item->id && $item->assetloc) {
|
|||
<div class="col-md-1 col-sm-1 text-left">
|
||||
<a href='#' data-toggle="modal" data-target="#createModal" data-dependency='location' data-select='rtd_location_select' class="btn btn-sm btn-default">New</a>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
@include ('partials.forms.edit.requestable', ['requestable_text' => trans('admin/hardware/general.requestable')])
|
||||
@include ('partials.forms.edit.requestable', ['requestable_text' => trans('admin/hardware/general.requestable')])
|
||||
|
||||
<!-- Image -->
|
||||
@if ($item->image)
|
||||
<div class="form-group {{ $errors->has('image_delete') ? 'has-error' : '' }}">
|
||||
<!-- Image -->
|
||||
@if ($item->image)
|
||||
<div class="form-group {{ $errors->has('image_delete') ? 'has-error' : '' }}">
|
||||
<label class="col-md-3 control-label" for="image_delete">{{ trans('general.image_delete') }}</label>
|
||||
<div class="col-md-5">
|
||||
{{ Form::checkbox('image_delete'),array('class' => 'minimal') }}
|
||||
<img src="{{ url('/') }}/uploads/assets/{{ $item->image }}" />
|
||||
{!! $errors->first('image_delete', '<span class="alert-msg">:message</span>') !!}
|
||||
</div>
|
||||
</div>
|
||||
@endif
|
||||
</div>
|
||||
@endif
|
||||
|
||||
<div class="form-group {{ $errors->has('image') ? 'has-error' : '' }}">
|
||||
<div class="form-group {{ $errors->has('image') ? 'has-error' : '' }}">
|
||||
<label class="col-md-3 control-label" for="image">{{ trans('general.image_upload') }}</label>
|
||||
<div class="col-md-5">
|
||||
<!-- {{ Form::file('image') }} -->
|
||||
<input type="file" id="file-upload" accept="image/*" name="image">
|
||||
{!! $errors->first('image', '<span class="alert-msg">:message</span>') !!}
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
@stop
|
||||
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
|
||||
{{-- Page title --}}
|
||||
@section('title')
|
||||
{{ trans('general.import') }}
|
||||
{{ trans('general.import') }}
|
||||
@parent
|
||||
@stop
|
||||
|
||||
|
|
@ -10,17 +10,15 @@
|
|||
@section('content')
|
||||
|
||||
|
||||
{{-- Modal import dialog --}}
|
||||
|
||||
@if (session()->has('import_errors'))
|
||||
<div class="box">
|
||||
<div class="box">
|
||||
<div class="box-body">
|
||||
<div class="alert alert-warning">
|
||||
<strong>Warning</strong> {{trans('admin/hardware/message.import.errorDetail')}}
|
||||
</div>
|
||||
|
||||
<div class="errors-table">
|
||||
|
||||
<table class="table table-striped table-bordered" id="errors-table">
|
||||
<thead>
|
||||
<th>Asset</th>
|
||||
|
|
@ -45,10 +43,10 @@
|
|||
</table>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
@endif
|
||||
|
||||
|
||||
{{-- Modal import dialog --}}
|
||||
<div class="modal fade" id="importModal">
|
||||
<form id="import-modal-form" class="form-horizontal" method="post" action="{{ route('assets/import/process-file') }}" autocomplete="off" role="form">
|
||||
{{ csrf_field()}}
|
||||
|
|
@ -93,7 +91,6 @@
|
|||
<div class="col-md-12">
|
||||
<div class="box">
|
||||
<div class="box-body">
|
||||
|
||||
<div class="col-md-3">
|
||||
<!-- The fileinput-button span is used to style the file input field as button -->
|
||||
<span class="btn btn-info fileinput-button">
|
||||
|
|
@ -119,7 +116,6 @@
|
|||
</div>
|
||||
<div class="row">
|
||||
<div class="col-md-12">
|
||||
|
||||
<table class="table table-striped" id="upload-table">
|
||||
<thead>
|
||||
<th>File</th>
|
||||
|
|
@ -145,10 +141,10 @@
|
|||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
||||
</div>
|
||||
</div>
|
||||
@stop
|
||||
|
||||
@section('moar_scripts')
|
||||
|
||||
<link rel="stylesheet" type="text/css" href="{{ asset('assets/css/lib/jquery.fileupload.css') }}">
|
||||
|
|
@ -218,5 +214,3 @@
|
|||
});
|
||||
</script>
|
||||
@stop
|
||||
|
||||
@stop
|
||||
|
|
|
|||
|
|
@ -2,32 +2,31 @@
|
|||
|
||||
@section('title0')
|
||||
|
||||
@if (Input::get('status'))
|
||||
@if (Input::get('status')=='Pending')
|
||||
{{ trans('general.pending') }}
|
||||
@elseif (Input::get('status')=='RTD')
|
||||
{{ trans('general.ready_to_deploy') }}
|
||||
@elseif (Input::get('status')=='Undeployable')
|
||||
{{ trans('general.undeployable') }}
|
||||
@elseif (Input::get('status')=='Deployable')
|
||||
{{ trans('general.deployed') }}
|
||||
@elseif (Input::get('status')=='Requestable')
|
||||
{{ trans('admin/hardware/general.requestable') }}
|
||||
@elseif (Input::get('status')=='Archived')
|
||||
{{ trans('general.archived') }}
|
||||
@elseif (Input::get('status')=='Deleted')
|
||||
{{ trans('general.deleted') }}
|
||||
@endif
|
||||
@else
|
||||
{{ trans('general.all') }}
|
||||
@endif
|
||||
|
||||
{{ trans('general.assets') }}
|
||||
@if (Input::get('status'))
|
||||
@if (Input::get('status')=='Pending')
|
||||
{{ trans('general.pending') }}
|
||||
@elseif (Input::get('status')=='RTD')
|
||||
{{ trans('general.ready_to_deploy') }}
|
||||
@elseif (Input::get('status')=='Undeployable')
|
||||
{{ trans('general.undeployable') }}
|
||||
@elseif (Input::get('status')=='Deployable')
|
||||
{{ trans('general.deployed') }}
|
||||
@elseif (Input::get('status')=='Requestable')
|
||||
{{ trans('admin/hardware/general.requestable') }}
|
||||
@elseif (Input::get('status')=='Archived')
|
||||
{{ trans('general.archived') }}
|
||||
@elseif (Input::get('status')=='Deleted')
|
||||
{{ trans('general.deleted') }}
|
||||
@endif
|
||||
@else
|
||||
{{ trans('general.all') }}
|
||||
@endif
|
||||
{{ trans('general.assets') }}
|
||||
@stop
|
||||
|
||||
{{-- Page title --}}
|
||||
@section('title')
|
||||
@yield('title0') @parent
|
||||
@yield('title0') @parent
|
||||
@stop
|
||||
|
||||
@section('header_right')
|
||||
|
|
@ -58,7 +57,6 @@
|
|||
</div>
|
||||
@endif
|
||||
|
||||
|
||||
<table
|
||||
name="assets"
|
||||
{{-- data-row-style="rowStyle" --}}
|
||||
|
|
@ -112,29 +110,15 @@
|
|||
<th data-switchable="false" data-searchable="false" data-sortable="false" data-field="actions" >{{ trans('table.actions') }}</th>
|
||||
</tr>
|
||||
</thead>
|
||||
{{-- <tfoot>
|
||||
<tr>
|
||||
<td colspan="12">
|
||||
<select name="bulk_actions" class="form-control">
|
||||
<option value="edit">Edit</option>
|
||||
<option value="delete">Delete</option>
|
||||
<option value="labels">Generate Labels</option>
|
||||
</select>
|
||||
<button class="btn btn-default" id="bulkEdit" disabled>Go</button>
|
||||
</td>
|
||||
</tr>
|
||||
</tfoot> --}}
|
||||
</table>
|
||||
{{ Form::close() }}
|
||||
</div><!-- /.col -->
|
||||
</div><!-- /.row -->
|
||||
{{ Form::close() }}
|
||||
</div><!-- ./box-body -->
|
||||
</div><!-- /.box -->
|
||||
</div>
|
||||
|
||||
|
||||
</div>
|
||||
|
||||
@stop
|
||||
|
||||
@section('moar_scripts')
|
||||
@include ('partials.bootstrap-table', [
|
||||
|
|
@ -162,5 +146,3 @@
|
|||
});
|
||||
</script>
|
||||
@stop
|
||||
|
||||
@stop
|
||||
|
|
|
|||
|
|
@ -20,7 +20,6 @@
|
|||
</h3>
|
||||
|
||||
<div class="btn-group pull-right">
|
||||
|
||||
<div class="dropdown">
|
||||
<button class="btn btn-default dropdown-toggle" data-toggle="dropdown">{{ trans('button.actions') }}
|
||||
<span class="caret"></span>
|
||||
|
|
@ -37,16 +36,14 @@
|
|||
<li role="presentation"><a href="{{ route('clone/hardware', $asset->id) }}">{{ trans('admin/hardware/general.clone') }}</a></li>
|
||||
</ul>
|
||||
</div>
|
||||
|
||||
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="user-profile">
|
||||
<div class="row profile">
|
||||
<div class="col-md-9 bio">
|
||||
|
||||
<div class="row profile">
|
||||
<div class="col-md-9 bio">
|
||||
<div class="col-md-12">
|
||||
@if ($asset->model->deleted_at!='')
|
||||
<div class="alert alert-warning alert-block">
|
||||
<i class="fa fa-warning"></i>
|
||||
|
|
@ -62,7 +59,6 @@
|
|||
@if ($asset->serial)
|
||||
<div class="col-md-12" style="padding-bottom: 5px;"><strong>{{ trans('admin/hardware/form.serial') }}: </strong>
|
||||
<em>{{ $asset->serial }}</em></div>
|
||||
|
||||
@endif
|
||||
|
||||
@if ($asset->mac_address!='')
|
||||
|
|
@ -72,60 +68,79 @@
|
|||
@endif
|
||||
|
||||
@if ($asset->model->manufacturer)
|
||||
<div class="col-md-12" style="padding-bottom: 5px;"><strong>{{ trans('admin/hardware/form.manufacturer') }}: </strong>
|
||||
<div class="col-md-12" style="padding-bottom: 5px;">
|
||||
<strong>{{ trans('admin/hardware/form.manufacturer') }}: </strong>
|
||||
<a href="{{ route('manufacturers.edit', $asset->model->manufacturer->id) }}">
|
||||
{{ $asset->model->manufacturer->name }}
|
||||
</a> </div>
|
||||
<div class="col-md-12" style="padding-bottom: 5px;"><strong>{{ trans('admin/hardware/form.model') }}:</strong>
|
||||
</a>
|
||||
</div>
|
||||
<div class="col-md-12" style="padding-bottom: 5px;">
|
||||
<strong>{{ trans('admin/hardware/form.model') }}:</strong>
|
||||
<a href="{{ route('models.show', $asset->model->id) }}">
|
||||
{{ $asset->model->name }}
|
||||
</a>
|
||||
/ {{ $asset->model->model_number }}</div>
|
||||
/ {{ $asset->model->model_number }}
|
||||
</div>
|
||||
@endif
|
||||
|
||||
@if ($asset->purchase_date)
|
||||
<div class="col-md-12" style="padding-bottom: 5px;"><strong>{{ trans('admin/hardware/form.date') }}: </strong>
|
||||
{{ $asset->purchase_date }} </div>
|
||||
<div class="col-md-12" style="padding-bottom: 5px;">
|
||||
<strong>{{ trans('admin/hardware/form.date') }}: </strong>
|
||||
{{ $asset->purchase_date }}
|
||||
</div>
|
||||
@endif
|
||||
|
||||
@if ($asset->purchase_cost)
|
||||
<div class="col-md-12" style="padding-bottom: 5px;"><strong>{{ trans('admin/hardware/form.cost') }}:</strong>
|
||||
<div class="col-md-12" style="padding-bottom: 5px;">
|
||||
<strong>{{ trans('admin/hardware/form.cost') }}:</strong>
|
||||
{{ $snipeSettings->default_currency }}
|
||||
{{ number_format($asset->purchase_cost,2) }} </div>
|
||||
{{ number_format($asset->purchase_cost,2) }}
|
||||
</div>
|
||||
@endif
|
||||
|
||||
@if ($asset->order_number)
|
||||
<div class="col-md-12" style="padding-bottom: 5px;"><strong>{{ trans('admin/hardware/form.order') }}:</strong>
|
||||
{{ $asset->order_number }} </div>
|
||||
<div class="col-md-12" style="padding-bottom: 5px;">
|
||||
<strong>{{ trans('admin/hardware/form.order') }}:</strong>
|
||||
{{ $asset->order_number }}
|
||||
</div>
|
||||
@endif
|
||||
|
||||
@if ($asset->supplier_id)
|
||||
<div class="col-md-6" style="padding-bottom: 5px;"><strong>{{ trans('admin/hardware/form.supplier') }}: </strong>
|
||||
<div class="col-md-6" style="padding-bottom: 5px;">
|
||||
<strong>{{ trans('admin/hardware/form.supplier') }}: </strong>
|
||||
<a href="{{ route('suppliers.show', $asset->supplier_id) }}">
|
||||
{{ $asset->supplier->name }}
|
||||
</a> </div>
|
||||
</a>
|
||||
</div>
|
||||
@endif
|
||||
|
||||
@if ($asset->warranty_months)
|
||||
<div class="col-md-12" style="padding-bottom: 5px;"><strong>{{ trans('admin/hardware/form.warranty') }}:</strong>
|
||||
<div class="col-md-12" style="padding-bottom: 5px;">
|
||||
<strong>{{ trans('admin/hardware/form.warranty') }}:</strong>
|
||||
{{ $asset->warranty_months }}
|
||||
{{ trans('admin/hardware/form.months') }}
|
||||
</div>
|
||||
<div class="col-md-12 {{ $asset->present()->warrantee_expires() < date("Y-m-d H:i:s") ? 'ui-state-highlight' : '' }}" style="padding-bottom: 5px;"><strong>{{ trans('admin/hardware/form.expires') }}:</strong>
|
||||
{{ $asset->present()->warrantee_expires() }}</div>
|
||||
<div class="col-md-12 {{ $asset->present()->warrantee_expires() < date("Y-m-d H:i:s") ? 'ui-state-highlight' : '' }}" style="padding-bottom: 5px;">
|
||||
<strong>{{ trans('admin/hardware/form.expires') }}:</strong>
|
||||
{{ $asset->present()->warrantee_expires() }}
|
||||
</div>
|
||||
@endif
|
||||
|
||||
@if ($asset->depreciation)
|
||||
<div class="col-md-12" style="padding-bottom: 5px;"><strong>{{ trans('admin/hardware/form.depreciation') }}: </strong>
|
||||
<div class="col-md-12" style="padding-bottom: 5px;">
|
||||
<strong>{{ trans('admin/hardware/form.depreciation') }}: </strong>
|
||||
{{ $asset->depreciation->name }}
|
||||
({{ $asset->depreciation->months }}
|
||||
{{ trans('admin/hardware/form.months') }}
|
||||
)</div>
|
||||
<div class="col-md-12" style="padding-bottom: 5px;"><strong>{{ trans('admin/hardware/form.fully_depreciated') }}: </strong>
|
||||
)
|
||||
</div>
|
||||
<div class="col-md-12" style="padding-bottom: 5px;">
|
||||
<strong>{{ trans('admin/hardware/form.fully_depreciated') }}: </strong>
|
||||
@if ($asset->time_until_depreciated()->y > 0)
|
||||
{{ $asset->time_until_depreciated()->y }}
|
||||
{{ trans('admin/hardware/form.years') }},
|
||||
@endif
|
||||
|
||||
{{ $asset->time_until_depreciated()->m }}
|
||||
{{ trans('admin/hardware/form.months') }}
|
||||
({{ $asset->depreciated_date()->format('Y-m-d') }})
|
||||
|
|
@ -137,7 +152,8 @@
|
|||
<div class="col-md-12" style="padding-bottom: 5px;">
|
||||
<strong>{{ trans('admin/hardware/form.eol_rate') }}: </strong>
|
||||
{{ $asset->model->eol }}
|
||||
{{ trans('admin/hardware/form.months') }} </div>
|
||||
{{ trans('admin/hardware/form.months') }}
|
||||
</div>
|
||||
<div class="col-md-12" style="padding-bottom: 5px;">
|
||||
<strong>{{ trans('admin/hardware/form.eol_date') }}: </strong>
|
||||
{{ $asset->present()->eol_date() }}
|
||||
|
|
@ -146,19 +162,15 @@
|
|||
@if ($asset->present()->months_until_eol()->y > 0) {{ $asset->present()->months_until_eol()->y }}
|
||||
{{ trans('general.years') }},
|
||||
@endif
|
||||
|
||||
{{ $asset->present()->months_until_eol()->m }}
|
||||
{{ trans('general.months') }}
|
||||
)
|
||||
@endif
|
||||
</div>
|
||||
@endif
|
||||
</div>
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
<div class="col-md-12">
|
||||
<div class="col-md-12">
|
||||
<!-- Licenses assets table -->
|
||||
<h6>Software Assigned </h6>
|
||||
<br>
|
||||
|
|
@ -184,7 +196,6 @@
|
|||
</tbody>
|
||||
</table>
|
||||
@else
|
||||
|
||||
<div class="col-md-12">
|
||||
<div class="alert alert-info alert-block">
|
||||
<i class="fa fa-info-circle"></i>
|
||||
|
|
@ -192,13 +203,12 @@
|
|||
</div>
|
||||
</div>
|
||||
@endif
|
||||
|
||||
</div>
|
||||
|
||||
<div class="col-md-12">
|
||||
|
||||
|
||||
<h6>{{ trans('general.file_uploads') [ <a href="#" data-toggle="modal" data-target="#uploadFileModal">@lang('button.add') }}</a> ]</h6>
|
||||
|
||||
<h6>
|
||||
{{ trans('general.file_uploads') }} [ <a href="#" data-toggle="modal" data-target="#uploadFileModal">{{trans('button.add')}} </a> ]
|
||||
</h6>
|
||||
|
||||
<table class="table table-hover">
|
||||
<thead>
|
||||
|
|
@ -214,7 +224,8 @@
|
|||
@foreach ($asset->uploads as $file)
|
||||
<tr>
|
||||
<td>
|
||||
@if ($file->note) {{ $file->note }}
|
||||
@if ($file->note)
|
||||
{{ $file->note }}
|
||||
@endif
|
||||
</td>
|
||||
<td>
|
||||
|
|
@ -242,19 +253,13 @@
|
|||
{{ trans('general.no_results') }}
|
||||
</td>
|
||||
</tr>
|
||||
|
||||
@endif
|
||||
|
||||
</tbody>
|
||||
</table>
|
||||
</div>
|
||||
|
||||
</div>
|
||||
|
||||
|
||||
|
||||
|
||||
<div class="col-md-12">
|
||||
<!-- checked out assets table -->
|
||||
|
||||
<table class="table table-hover table-fixed break-word">
|
||||
<thead>
|
||||
<tr>
|
||||
|
|
@ -268,7 +273,6 @@
|
|||
<tbody>
|
||||
@if (count($asset->assetlog) > 0)
|
||||
@foreach ($asset->assetlog as $log)
|
||||
|
||||
<tr>
|
||||
<td>{{ $log->created_at }}</td>
|
||||
<td>
|
||||
|
|
@ -279,7 +283,6 @@
|
|||
<td>{{ $log->action_type }}</td>
|
||||
<td>
|
||||
@if ((isset($log->target_id)) && ($log->target_id!=0) && ($log->target_id!=''))
|
||||
|
||||
@if ($log->target->deleted_at=='')
|
||||
<a href="{{ route('users.show', $log->target_id) }}">
|
||||
{{ $log->user->present()->fullName() }}
|
||||
|
|
@ -287,15 +290,14 @@
|
|||
@else
|
||||
<del>{{ $log->user->present()->fullName() }}</del>
|
||||
@endif
|
||||
|
||||
@endif
|
||||
</td>
|
||||
<td>
|
||||
@if ($log->note) {{ $log->note }}
|
||||
@if ($log->note)
|
||||
{{ $log->note }}
|
||||
@endif
|
||||
</td>
|
||||
</tr>
|
||||
|
||||
@endforeach
|
||||
@endif
|
||||
<tr>
|
||||
|
|
@ -309,27 +311,20 @@
|
|||
<td>{{ trans('general.created_asset') }}</td>
|
||||
<td></td>
|
||||
<td>
|
||||
<!-- @if ($asset->notes)
|
||||
{{ $asset->notes }}
|
||||
@endif -->
|
||||
</td>
|
||||
</tr>
|
||||
</tbody>
|
||||
</table>
|
||||
|
||||
|
||||
</div>
|
||||
</div>
|
||||
</div> <!--/.col-md-9.bio-->
|
||||
|
||||
<!-- side address column -->
|
||||
<div class="col-md-3">
|
||||
|
||||
<!-- Asset notes -->
|
||||
@if ($asset->notes)
|
||||
|
||||
@if ($asset->notes)
|
||||
<h6>{{ trans('admin/hardware/form.notes') }}:</h6>
|
||||
<div class="break-word">{{ nl2br(e($asset->notes)) }}</div>
|
||||
|
||||
@endif
|
||||
@endif
|
||||
|
||||
@if ($qr_code->display)
|
||||
<h6>{{ trans('admin/hardware/form.qr') }}</h6>
|
||||
|
|
@ -340,24 +335,26 @@
|
|||
</ul>
|
||||
@endif
|
||||
|
||||
|
||||
@if (($asset->assigneduser) && ($asset->assigned_to > 0) && ($asset->deleted_at==''))
|
||||
<h6><br>{{ trans('admin/hardware/form.checkedout_to') }}</h6>
|
||||
<ul>
|
||||
|
||||
<li><img src="{{ $asset->assigneduser->present()->gravatar() }}" class="img-circle" style="width: 100px; margin-right: 20px;" /><br /><br /></li>
|
||||
<li><a href="{{ route('users.show', $asset->assigned_to) }}">{{ $asset->assigneduser->present()->fullName() }}</a></li>
|
||||
|
||||
<li>
|
||||
<img src="{{ $asset->assigneduser->present()->gravatar() }}" class="img-circle" style="width: 100px; margin-right: 20px;" /><br /><br />
|
||||
</li>
|
||||
<li>
|
||||
<a href="{{ route('users.show', $asset->assigned_to) }}">{{ $asset->assigneduser->present()->fullName() }}</a>
|
||||
</li>
|
||||
|
||||
@if (isset($asset->assetloc->address))
|
||||
<li>{{ $asset->assetloc->address }}
|
||||
@if (isset($asset->assetloc->address2)) {{ $asset->assetloc->address2 }}
|
||||
<li>
|
||||
{{ $asset->assetloc->address }}
|
||||
@if (isset($asset->assetloc->address2))
|
||||
{{ $asset->assetloc->address2 }}
|
||||
@endif
|
||||
</li>
|
||||
@if (isset($asset->assetloc->city))
|
||||
<li>{{ $asset->assetloc->city }}, {{ $asset->assetloc->state }} {{ $asset->assetloc->zip }}</li>
|
||||
@endif
|
||||
|
||||
@endif
|
||||
|
||||
@if (isset($asset->assigneduser->email))
|
||||
|
|
@ -367,15 +364,11 @@
|
|||
@if ((isset($asset->assigneduser->phone)) && ($asset->assigneduser->phone!=''))
|
||||
<li><i class="fa fa-phone"></i> {{ $asset->assigneduser->phone }}</li>
|
||||
@endif
|
||||
|
||||
|
||||
</ul>
|
||||
|
||||
@endif
|
||||
|
||||
@if (($asset->status_id ) && ($asset->status_id > 0))
|
||||
<!-- Status Info -->
|
||||
|
||||
@if ($asset->assetstatus)
|
||||
<h6><br>
|
||||
@if (($asset->assetstatus->deployable=='1') && ($asset->assigned_to > 0))
|
||||
|
|
@ -386,7 +379,6 @@
|
|||
{{ trans('admin/hardware/general.asset') }}
|
||||
@endif
|
||||
<ul>
|
||||
|
||||
@if (($asset->assetstatus->deployable=='1') && ($asset->assigned_to > 0) && ($asset->deleted_at==''))
|
||||
<li><br /><a href="{{ route('checkin/hardware', $asset->id) }}" class="btn btn-primary btn-sm">{{ trans('admin/hardware/general.checkin') }}</a></li>
|
||||
@elseif ((($asset->assetstatus->deployable=='1') && (($asset->assigned_to=='') || ($asset->assigned_to==0))) && ($asset->deleted_at==''))
|
||||
|
|
@ -410,10 +402,9 @@
|
|||
|
||||
@endif
|
||||
@endif
|
||||
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div> <!-- /.col-md-3-->
|
||||
</div> <!--/.row.profile-->
|
||||
</div> <!--/.user-profile-->
|
||||
|
||||
<!-- Modal -->
|
||||
<div class="modal fade" id="uploadFileModal" tabindex="-1" role="dialog" aria-labelledby="uploadFileModalLabel" aria-hidden="true">
|
||||
|
|
|
|||
|
|
@ -6,13 +6,10 @@
|
|||
@parent
|
||||
@stop
|
||||
|
||||
|
||||
|
||||
|
||||
{{-- Right header --}}
|
||||
@section('header_right')
|
||||
@can('manage', \App\Models\Asset::class)
|
||||
<div class="dropdown pull-right">
|
||||
@can('manage', \App\Models\Asset::class)
|
||||
<div class="dropdown pull-right">
|
||||
<button class="btn btn-default dropdown-toggle" data-toggle="dropdown">{{ trans('button.actions') }}
|
||||
<span class="caret"></span>
|
||||
</button>
|
||||
|
|
@ -27,19 +24,12 @@
|
|||
<li role="presentation"><a href="{{ route('hardware.edit', $asset->id) }}">{{ trans('admin/hardware/general.edit') }}</a></li>
|
||||
<li role="presentation"><a href="{{ route('clone/hardware', $asset->id) }}">{{ trans('admin/hardware/general.clone') }}</a></li>
|
||||
</ul>
|
||||
</div>
|
||||
@endcan
|
||||
</div>
|
||||
@endcan
|
||||
@stop
|
||||
|
||||
|
||||
|
||||
|
||||
{{-- Page content --}}
|
||||
@section('content')
|
||||
|
||||
|
||||
|
||||
|
||||
<div class="row">
|
||||
<div class="col-md-12">
|
||||
|
||||
|
|
@ -84,33 +74,35 @@
|
|||
</span>
|
||||
</span>
|
||||
@endif
|
||||
|
||||
{{ $asset->assetstatus->name }}
|
||||
|
||||
({{ $asset->assetstatus->getStatuslabelType() }})
|
||||
</td>
|
||||
</tr>
|
||||
@endif
|
||||
|
||||
@if ($asset->company)
|
||||
<tr>
|
||||
<td>{{ trans('general.company') }}</td>
|
||||
<td>{{ $asset->company->name }}</td>
|
||||
</tr>
|
||||
@endif
|
||||
|
||||
@if ($asset->name)
|
||||
<tr>
|
||||
<td>{{ trans('admin/hardware/form.name') }}</td>
|
||||
<td>{{ $asset->name }}</td>
|
||||
</tr>
|
||||
@endif
|
||||
|
||||
@if ($asset->serial)
|
||||
<tr>
|
||||
<td>{{ trans('admin/hardware/form.serial') }}</td>
|
||||
<td>{{ $asset->serial }}</td>
|
||||
</tr>
|
||||
@endif
|
||||
@if ($asset->model->manufacturer)
|
||||
|
||||
@if ($asset->model->manufacturer)
|
||||
<tr>
|
||||
<td>{{ trans('admin/hardware/form.manufacturer') }}</td>
|
||||
<td>
|
||||
|
|
@ -134,7 +126,6 @@
|
|||
@else
|
||||
{{ $asset->model->name }}
|
||||
@endcan
|
||||
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
|
|
@ -143,15 +134,13 @@
|
|||
{{ $asset->model->model_number }}
|
||||
</td>
|
||||
</tr>
|
||||
|
||||
@endif
|
||||
|
||||
@if ($asset->model->fieldset)
|
||||
@foreach($asset->model->fieldset->fields as $field)
|
||||
<tr>
|
||||
<td>{{ $field->name }}
|
||||
|
||||
|
||||
<td>
|
||||
{{ $field->name }}
|
||||
</td>
|
||||
<td>
|
||||
@if ($field->field_encrypted=='1')
|
||||
|
|
@ -159,7 +148,6 @@
|
|||
@endif
|
||||
|
||||
@if ($field->isFieldDecryptable($asset->{$field->db_column_name()} ))
|
||||
|
||||
@can('superuser')
|
||||
@if (($field->format=='URL') && ($asset->{$field->db_column_name()}!=''))
|
||||
<a href="{{ \App\Helpers\Helper::gracefulDecrypt($field, $asset->{$field->db_column_name()}) }}" target="_new">{{ \App\Helpers\Helper::gracefulDecrypt($field, $asset->{$field->db_column_name()}) }}</a>
|
||||
|
|
@ -177,7 +165,6 @@
|
|||
{{ $asset->{$field->db_column_name()} }}
|
||||
@endif
|
||||
@endif
|
||||
|
||||
</td>
|
||||
</tr>
|
||||
@endforeach
|
||||
|
|
@ -250,7 +237,6 @@
|
|||
)
|
||||
</td>
|
||||
</tr>
|
||||
|
||||
<tr>
|
||||
<td>
|
||||
{{ trans('admin/hardware/form.fully_depreciated') }}
|
||||
|
|
@ -302,6 +288,7 @@
|
|||
</td>
|
||||
</tr>
|
||||
@endif
|
||||
|
||||
<tr>
|
||||
<td>{{ trans('admin/hardware/form.notes') }}</td>
|
||||
<td> {!! nl2br(e($asset->notes)) !!}</td>
|
||||
|
|
@ -344,16 +331,12 @@
|
|||
</td>
|
||||
</tr>
|
||||
@endif
|
||||
|
||||
|
||||
|
||||
</tbody>
|
||||
</table>
|
||||
</div> <!-- /table-responsive -->
|
||||
</div><!-- /col -->
|
||||
</div><!-- /col-md-8 -->
|
||||
|
||||
<div class="col-md-4">
|
||||
|
||||
@if ($asset->image)
|
||||
<img src="{{ url('/') }}/uploads/assets/{{{ $asset->image }}}" class="assetimg img-responsive">
|
||||
@elseif ($asset->model->image!='')
|
||||
|
|
@ -372,7 +355,6 @@
|
|||
</p>
|
||||
|
||||
<ul class="list-unstyled">
|
||||
|
||||
@if ((isset($asset->assigneduser->email)) && ($asset->assigneduser->email!=''))
|
||||
<li><i class="fa fa-envelope-o"></i> <a href="mailto:{{ $asset->assigneduser->email }}">{{ $asset->assigneduser->email }}</a></li>
|
||||
@endif
|
||||
|
|
@ -420,12 +402,10 @@
|
|||
</div><!-- /row -->
|
||||
</div><!-- /.tab-pane asset details -->
|
||||
|
||||
|
||||
<div class="tab-pane fade" id="software">
|
||||
<div class="row">
|
||||
<div class="col-md-12">
|
||||
<!-- Licenses assets table -->
|
||||
|
||||
@if (count($asset->licenses) > 0)
|
||||
<table class="table">
|
||||
<thead>
|
||||
|
|
@ -459,13 +439,13 @@
|
|||
</div><!-- /col -->
|
||||
</div> <!-- row -->
|
||||
</div> <!-- /.tab-pane software -->
|
||||
|
||||
<div class="tab-pane fade" id="components">
|
||||
<!-- checked out assets table -->
|
||||
<div class="row">
|
||||
<div class="col-md-12">
|
||||
@if(count($asset->components) > 0)
|
||||
<table class="table table-striped">
|
||||
|
||||
<tbody>
|
||||
<?php $totalCost = 0; ?>
|
||||
@foreach ($asset->components as $component)
|
||||
|
|
@ -489,10 +469,10 @@
|
|||
{{ trans('general.no_results') }}
|
||||
</div>
|
||||
@endif
|
||||
|
||||
</div>
|
||||
</div>
|
||||
</div> <!-- /.tab-pane components -->
|
||||
|
||||
<div class="tab-pane fade" id="maintenances">
|
||||
<div class="row">
|
||||
<div class="col-md-12">
|
||||
|
|
@ -516,6 +496,7 @@
|
|||
<th>{{ trans('admin/asset_maintenances/table.is_warranty') }}</th>
|
||||
<th>{{ trans('admin/asset_maintenances/form.cost') }}</th>
|
||||
<th>{{ trans('general.admin') }}</th>
|
||||
|
||||
@can('update', \App\Models\Asset::class)
|
||||
<th>{{ trans('table.actions') }}</th>
|
||||
@endcan
|
||||
|
|
@ -598,13 +579,10 @@
|
|||
<td>{{ $log->action_type }}</td>
|
||||
<td>
|
||||
@if ($log->action_type=='uploaded')
|
||||
|
||||
{{ $log->filename }}
|
||||
@elseif ((isset($log->target_id)) && ($log->target_id!=0) && ($log->target_id!=''))
|
||||
|
||||
|
||||
@if ($log->target instanceof \App\Models\User)
|
||||
|
||||
@if ($log->target->deleted_at=='')
|
||||
<a href="{{ route('users.show', $log->target_id) }}">
|
||||
{{ $log->target->present()->fullName() }}
|
||||
|
|
@ -628,13 +606,13 @@
|
|||
Unknown
|
||||
@endif
|
||||
@else
|
||||
|
||||
Deleted User
|
||||
@endif
|
||||
@endif
|
||||
</td>
|
||||
<td>
|
||||
@if ($log->note) {{ $log->note }}
|
||||
@if ($log->note)
|
||||
{{ $log->note }}
|
||||
@endif
|
||||
</td>
|
||||
@if ($snipeSettings->require_accept_signature=='1')
|
||||
|
|
@ -645,7 +623,6 @@
|
|||
</td>
|
||||
@endif
|
||||
</tr>
|
||||
|
||||
@endforeach
|
||||
@endif
|
||||
<!-- Add a "created asset" row to the log list. This isn't an official log entry.-->
|
||||
|
|
@ -698,7 +675,6 @@
|
|||
@endcan
|
||||
|
||||
<div class="col-md-12">
|
||||
|
||||
<table class="table table-hover">
|
||||
<thead>
|
||||
<tr>
|
||||
|
|
@ -744,9 +720,7 @@
|
|||
{{ trans('general.no_results') }}
|
||||
</td>
|
||||
</tr>
|
||||
|
||||
@endif
|
||||
|
||||
</tbody>
|
||||
</table>
|
||||
</div> <!-- /.col-md-12 -->
|
||||
|
|
@ -756,6 +730,7 @@
|
|||
</div> <!-- /.nav-tabs-custom -->
|
||||
</div> <!-- /. col-md-12 -->
|
||||
</div> <!-- /. row -->
|
||||
@stop
|
||||
|
||||
@section('moar_scripts')
|
||||
<script>
|
||||
|
|
@ -764,6 +739,5 @@
|
|||
$(this).ekkoLightbox();
|
||||
});
|
||||
</script>
|
||||
@stop
|
||||
|
||||
@stop
|
||||
|
|
|
|||
|
|
@ -7,28 +7,21 @@
|
|||
@stop
|
||||
|
||||
@section('header_right')
|
||||
<a href="{{ URL::previous() }}" class="btn btn-primary pull-right">
|
||||
{{ trans('general.back') }}</a>
|
||||
<a href="{{ URL::previous() }}" class="btn btn-primary pull-right">{{ trans('general.back') }}</a>
|
||||
@stop
|
||||
|
||||
{{-- Page content --}}
|
||||
@section('content')
|
||||
|
||||
|
||||
|
||||
<div class="row form-wrapper">
|
||||
<!-- left column -->
|
||||
<div class="col-md-10 column">
|
||||
<!-- left column -->
|
||||
<div class="col-md-10 column">
|
||||
|
||||
@if ($backto=='user')
|
||||
@if ($backto=='user')
|
||||
<form class="form-horizontal" method="post" action="{{ route('licenses.checkin', array('licenseeat_id'=> $licenseseat->id, 'backto'=>'user')) }}" autocomplete="off">
|
||||
@else
|
||||
@else
|
||||
<form class="form-horizontal" method="post" action="{{ route('licenses.checkin', $licenseseat->id) }}" autocomplete="off">
|
||||
@endif
|
||||
|
||||
<!-- CSRF Token -->
|
||||
<input type="hidden" name="_token" value="{{ csrf_token() }}" />
|
||||
|
||||
@endif
|
||||
{{csrf_field()}}
|
||||
|
||||
<!-- Asset name -->
|
||||
<div class="form-group">
|
||||
|
|
@ -62,10 +55,8 @@
|
|||
<button type="submit" class="btn btn-success"><i class="fa fa-check icon-white"></i> {{ trans('general.checkin') }}</button>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
||||
</form>
|
||||
</div>
|
||||
</form>
|
||||
</div> <!-- .col-md-10-->
|
||||
</div>
|
||||
|
||||
@stop
|
||||
|
|
|
|||
|
|
@ -13,17 +13,11 @@
|
|||
|
||||
{{-- Page content --}}
|
||||
@section('content')
|
||||
|
||||
|
||||
|
||||
<div class="row">
|
||||
|
||||
<div class="row">
|
||||
<!-- left column -->
|
||||
<div class="col-md-7">
|
||||
|
||||
<form class="form-horizontal" method="post" action="" autocomplete="off">
|
||||
<!-- CSRF Token -->
|
||||
<input type="hidden" name="_token" value="{{ csrf_token() }}" />
|
||||
{{csrf_field()}}
|
||||
|
||||
<div class="box box-default">
|
||||
<div class="box-header with-border">
|
||||
|
|
@ -31,8 +25,6 @@
|
|||
</div>
|
||||
<div class="box-body">
|
||||
|
||||
|
||||
|
||||
<!-- Asset name -->
|
||||
<div class="form-group">
|
||||
<label class="col-sm-2 control-label">{{ trans('admin/hardware/form.name') }}</label>
|
||||
|
|
@ -60,7 +52,6 @@
|
|||
</div>
|
||||
</div>
|
||||
|
||||
|
||||
<!-- User -->
|
||||
<div class="form-group {{ $errors->has('assigned_to') ? ' has-error' : '' }}">
|
||||
<label for="assigned_to" class="col-md-2 control-label">{{ trans('admin/hardware/form.checkout_to') }}
|
||||
|
|
@ -73,11 +64,9 @@
|
|||
<p class="help-block">
|
||||
{{ trans('admin/licenses/form.checkout_help') }}
|
||||
</p>
|
||||
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
||||
<!-- Note -->
|
||||
<div class="form-group {{ $errors->has('note') ? 'error' : '' }}">
|
||||
<label for="note" class="col-md-2 control-label">{{ trans('admin/hardware/form.notes') }}</label>
|
||||
|
|
@ -91,8 +80,9 @@
|
|||
<a class="btn btn-link" href="{{ route('licenses.index') }}">{{ trans('button.cancel') }}</a>
|
||||
<button type="submit" class="btn btn-success pull-right"><i class="fa fa-check icon-white"></i> {{ trans('general.checkout') }}</button>
|
||||
</div>
|
||||
</div> <!-- /.box-->
|
||||
</form>
|
||||
</div>
|
||||
</div> <!-- /.col-md-7-->
|
||||
</div>
|
||||
|
||||
@stop
|
||||
|
|
|
|||
|
|
@ -89,7 +89,6 @@
|
|||
<span class="input-group-addon"><i class="fa fa-calendar"></i></span>
|
||||
</div><!-- /.input group -->
|
||||
|
||||
|
||||
{!! $errors->first('termination_date', '<span class="alert-msg"><i class="fa fa-times"></i> :message</span>') !!}
|
||||
</div>
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -22,7 +22,6 @@
|
|||
<div class="row">
|
||||
<div class="col-md-12">
|
||||
<div class="box">
|
||||
|
||||
<div class="box-body">
|
||||
<table
|
||||
name="licenses"
|
||||
|
|
@ -53,14 +52,10 @@
|
|||
</thead>
|
||||
</table>
|
||||
</div><!-- /.box-body -->
|
||||
<div class="box-footer clearfix">
|
||||
|
||||
<div class="box-footer clearfix">
|
||||
</div>
|
||||
</div><!-- /.box -->
|
||||
|
||||
|
||||
|
||||
|
||||
</div>
|
||||
</div>
|
||||
@stop
|
||||
|
|
|
|||
|
|
@ -19,15 +19,12 @@
|
|||
<li><a href="{{ route('clone/license', $license->id) }}">{{ trans('admin/licenses/general.clone') }}</a></li>
|
||||
</ul>
|
||||
@endcan
|
||||
</div>
|
||||
</div>
|
||||
@stop
|
||||
|
||||
|
||||
{{-- Page content --}}
|
||||
@section('content')
|
||||
|
||||
<div class="row">
|
||||
|
||||
<div class="col-md-12">
|
||||
<!-- Custom Tabs -->
|
||||
<div class="nav-tabs-custom">
|
||||
|
|
@ -35,15 +32,13 @@
|
|||
<li class="active"><a href="#tab_1" data-toggle="tab">Details</a></li>
|
||||
<li><a href="#tab_2" data-toggle="tab">{{ trans('general.file_uploads') }}</a></li>
|
||||
<li><a href="#tab_3" data-toggle="tab">{{ trans('admin/licenses/general.checkout_history') }}</a></li>
|
||||
|
||||
<li class="pull-right"><a href="#" data-toggle="modal" data-target="#uploadFileModal"><i class="fa fa-paperclip"></i> {{ trans('button.upload') }}</a></li>
|
||||
</ul>
|
||||
|
||||
<div class="tab-content">
|
||||
<div class="tab-pane active" id="tab_1">
|
||||
|
||||
<div class="row">
|
||||
<div class="col-md-7">
|
||||
|
||||
<table class="table table-striped">
|
||||
<thead>
|
||||
<tr>
|
||||
|
|
@ -57,11 +52,9 @@
|
|||
<?php $count=1; ?>
|
||||
@if ($license->licenseseats)
|
||||
@foreach ($license->licenseseats as $licensedto)
|
||||
|
||||
<tr>
|
||||
<td>Seat {{ $count }} </td>
|
||||
<td>
|
||||
|
||||
@if (($licensedto->user) && ($licensedto->deleted_at == NULL))
|
||||
@can('users.view')
|
||||
<a href="{{ route('users.show', $licensedto->assigned_to) }}">
|
||||
|
|
@ -70,7 +63,6 @@
|
|||
@else
|
||||
{{ $licensedto->user->present()->fullName() }}
|
||||
@endcan
|
||||
|
||||
@elseif (($licensedto->user) && ($licensedto->deleted_at != NULL))
|
||||
<del>{{ $licensedto->user->present()->fullName() }}</del>
|
||||
@elseif ($licensedto->asset)
|
||||
|
|
@ -82,7 +74,6 @@
|
|||
@else
|
||||
{{ $licensedto->asset->assigneduser->present()->fullName() }}
|
||||
@endcan
|
||||
|
||||
@endif
|
||||
@endif
|
||||
</td>
|
||||
|
|
@ -95,13 +86,11 @@
|
|||
@else
|
||||
{{ $licensedto->asset->name }} {{ $licensedto->asset->asset_tag }}
|
||||
@endcan
|
||||
|
||||
@endif
|
||||
</td>
|
||||
<td>
|
||||
@can('checkout', $licensedto)
|
||||
@if (($licensedto->assigned_to) || ($licensedto->asset_id))
|
||||
|
||||
@if ($license->reassignable)
|
||||
<a href="{{ route('licenses.checkin', $licensedto->id) }}" class="btn btn-primary btn-sm">
|
||||
{{ trans('general.checkin') }}
|
||||
|
|
@ -111,21 +100,19 @@
|
|||
@endif
|
||||
@else
|
||||
<a href="{{ route('licenses.checkout', $licensedto->id) }}" class="btn btn-info btn-sm">
|
||||
{{ trans('general.checkout') }}</a>
|
||||
{{ trans('general.checkout') }}
|
||||
</a>
|
||||
@endif
|
||||
@endcan
|
||||
</td>
|
||||
|
||||
</tr>
|
||||
<?php $count++; ?>
|
||||
@endforeach
|
||||
@endif
|
||||
|
||||
|
||||
</tbody>
|
||||
</table>
|
||||
|
||||
</div>
|
||||
|
||||
<div class="col-md-5">
|
||||
<div class="table">
|
||||
<table class="table">
|
||||
|
|
@ -148,7 +135,9 @@
|
|||
@if (!is_null($license->serial))
|
||||
<tr>
|
||||
<td>{{ trans('admin/licenses/form.license_key') }}</td>
|
||||
<td style="word-wrap: break-word;overflow-wrap: break-word;word-break: break-word;">{!! nl2br(e($license->serial)) !!}</td>
|
||||
<td style="word-wrap: break-word;overflow-wrap: break-word;word-break: break-word;">
|
||||
{!! nl2br(e($license->serial)) !!}
|
||||
</td>
|
||||
</tr>
|
||||
@endif
|
||||
@endcan
|
||||
|
|
@ -167,7 +156,6 @@
|
|||
</tr>
|
||||
@endif
|
||||
|
||||
|
||||
@if ($license->supplier_id)
|
||||
<tr>
|
||||
<td>{{ trans('general.supplier') }}:
|
||||
|
|
@ -182,10 +170,8 @@
|
|||
|
||||
@if ($license->expiration_date > 0)
|
||||
<tr>
|
||||
<td>{{ trans('admin/licenses/form.expiration') }}:
|
||||
</td>
|
||||
<td> {{ $license->expiration_date }}
|
||||
</td>
|
||||
<td>{{ trans('admin/licenses/form.expiration') }}:</td>
|
||||
<td>{{ $license->expiration_date }}</td>
|
||||
</tr>
|
||||
@endif
|
||||
|
||||
|
|
@ -221,7 +207,6 @@
|
|||
@endif
|
||||
{{ $license->time_until_depreciated()->m }}
|
||||
{{ trans('admin/hardware/form.months') }}
|
||||
|
||||
</td>
|
||||
</tr>
|
||||
@endif
|
||||
|
|
@ -239,19 +224,14 @@
|
|||
|
||||
@if ($license->purchase_date > 0)
|
||||
<tr>
|
||||
<td>
|
||||
{{ trans('general.purchase_date') }}:
|
||||
</td>
|
||||
<td>
|
||||
{{ $license->purchase_date }}
|
||||
</td>
|
||||
<td>{{ trans('general.purchase_date') }}:</td>
|
||||
<td>{{ $license->purchase_date }}</td>
|
||||
</tr>
|
||||
@endif
|
||||
|
||||
@if ($license->purchase_cost > 0)
|
||||
<tr>
|
||||
<td>{{ trans('general.purchase_cost') }}:
|
||||
</td>
|
||||
<td>{{ trans('general.purchase_cost') }}:</td>
|
||||
<td>
|
||||
{{ $snipeSettings->default_currency }}
|
||||
{{ \App\Helpers\Helper::formatCurrencyOutput($license->purchase_cost) }}
|
||||
|
|
@ -261,51 +241,39 @@
|
|||
|
||||
@if ($license->order_number)
|
||||
<tr>
|
||||
<td>{{ trans('general.order_number') }}:
|
||||
</td>
|
||||
<td>
|
||||
{{ $license->order_number }}
|
||||
</td>
|
||||
<td>{{ trans('general.order_number') }}:</td>
|
||||
<td>{{ $license->order_number }}</td>
|
||||
</tr>
|
||||
@endif
|
||||
|
||||
@if (($license->seats) && ($license->seats) > 0)
|
||||
<tr>
|
||||
<td>{{ trans('admin/licenses/form.seats') }}:
|
||||
</td>
|
||||
<td>
|
||||
{{ $license->seats }}</td>
|
||||
<td>{{ trans('admin/licenses/form.seats') }}:</td>
|
||||
<td>{{ $license->seats }}</td>
|
||||
</tr>
|
||||
@endif
|
||||
|
||||
<tr>
|
||||
<td>
|
||||
{{ trans('admin/licenses/form.reassignable') }}:
|
||||
</td>
|
||||
<td>
|
||||
{{ $license->reassignable ? 'Yes' : 'No' }}
|
||||
</td>
|
||||
<td>{{ trans('admin/licenses/form.reassignable') }}:</td>
|
||||
<td>{{ $license->reassignable ? 'Yes' : 'No' }}</td>
|
||||
</tr>
|
||||
|
||||
@if ($license->notes)
|
||||
<tr><td>
|
||||
{{ trans('general.notes') }}:
|
||||
</td><td>
|
||||
{!! nl2br(e($license->notes)) !!}</td></tr>
|
||||
<tr>
|
||||
<td>{{ trans('general.notes') }}:</td>
|
||||
<td>
|
||||
{!! nl2br(e($license->notes)) !!}
|
||||
</td>
|
||||
</tr>
|
||||
@endif
|
||||
|
||||
|
||||
</tbody>
|
||||
</table>
|
||||
</div>
|
||||
</div> <!-- .table-->
|
||||
</div> <!--/.col-md-5-->
|
||||
</div> <!--/.row-->
|
||||
</div> <!-- /.tab-pane -->
|
||||
|
||||
</div>
|
||||
</div>
|
||||
|
||||
</div>
|
||||
<!-- /.tab-pane -->
|
||||
<div class="tab-pane" id="tab_2">
|
||||
|
||||
<table class="table table-striped">
|
||||
<thead>
|
||||
<tr>
|
||||
|
|
@ -324,12 +292,12 @@
|
|||
{{ $file->note }}
|
||||
@endif
|
||||
</td>
|
||||
<td>
|
||||
{{ $file->filename }}
|
||||
</td>
|
||||
<td>{{ $file->filename }}</td>
|
||||
<td>
|
||||
@if ($file->filename)
|
||||
<a href="{{ route('show/licensefile', [$license->id, $file->id]) }}" class="btn btn-default">Download</a>
|
||||
<a href="{{ route('show/licensefile', [$license->id, $file->id]) }}" class="btn btn-default">
|
||||
Download
|
||||
</a>
|
||||
@endif
|
||||
</td>
|
||||
<td>
|
||||
|
|
@ -339,18 +307,13 @@
|
|||
@endforeach
|
||||
@else
|
||||
<tr>
|
||||
<td colspan="4">
|
||||
{{ trans('general.no_results') }}
|
||||
</td>
|
||||
<td colspan="4">{{ trans('general.no_results') }}</td>
|
||||
</tr>
|
||||
|
||||
@endif
|
||||
|
||||
</tbody>
|
||||
</table>
|
||||
</div> <!-- /.tab-pane -->
|
||||
|
||||
</div>
|
||||
<!-- /.tab-pane -->
|
||||
<div class="tab-pane" id="tab_3">
|
||||
<div class="row">
|
||||
<div class="col-md-12">
|
||||
|
|
@ -378,7 +341,6 @@
|
|||
|
||||
<td>
|
||||
@if (($log->target) && ($log->target->id!='0'))
|
||||
|
||||
@if ($log->target_type == 'App\Models\User')
|
||||
<a href="{{ route('users.show', $log->target_id) }}">
|
||||
{{ $log->userlog->present()->fullName() }}
|
||||
|
|
@ -388,17 +350,14 @@
|
|||
{{ $log->userlog->present()->name() }}
|
||||
</a>
|
||||
@endif
|
||||
|
||||
|
||||
@elseif ($log->action_type=='uploaded')
|
||||
|
||||
{{ $log->filename }}
|
||||
|
||||
@endif
|
||||
|
||||
</td>
|
||||
|
||||
<td>
|
||||
@if ($log->note) {{ $log->note }}
|
||||
@if ($log->note)
|
||||
{{ $log->note }}
|
||||
@endif
|
||||
</td>
|
||||
</tr>
|
||||
|
|
@ -407,7 +366,8 @@
|
|||
<tr>
|
||||
<td>{{ $license->created_at }}</td>
|
||||
<td>
|
||||
@if ($license->adminuser) {{ $license->adminuser->present()->fullName() }}
|
||||
@if ($license->adminuser)
|
||||
{{ $license->adminuser->present()->fullName() }}
|
||||
@else
|
||||
{{ trans('general.unknown_admin') }}
|
||||
@endif
|
||||
|
|
@ -422,21 +382,13 @@
|
|||
</tr>
|
||||
</tbody>
|
||||
</table>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
</div>
|
||||
<!-- /.tab-pane -->
|
||||
</div>
|
||||
<!-- /.tab-content -->
|
||||
</div>
|
||||
<!-- nav-tabs-custom -->
|
||||
</div>
|
||||
<!-- /.col -->
|
||||
|
||||
|
||||
</div>
|
||||
<!-- /.row -->
|
||||
</div> <!-- /.col-md-12-->
|
||||
</div> <!-- /.row-->
|
||||
</div> <!-- /.tab-pane -->
|
||||
</div> <!-- /.tab-content -->
|
||||
</div> <!-- nav-tabs-custom -->
|
||||
</div> <!-- /.col -->
|
||||
</div> <!-- /.row -->
|
||||
|
||||
|
||||
<!-- Modal -->
|
||||
|
|
@ -452,9 +404,7 @@
|
|||
'route' => ['upload/license', $license->id],
|
||||
'files' => true, 'class' => 'form-horizontal' ]) }}
|
||||
<div class="modal-body">
|
||||
|
||||
<p>{{ trans('admin/licenses/general.filetype_info') }}</p>
|
||||
|
||||
<div class="form-group col-md-12">
|
||||
<div class="input-group col-md-12">
|
||||
<input class="col-md-12 form-control" type="text" name="notes" id="notes" placeholder="Notes">
|
||||
|
|
@ -465,9 +415,7 @@
|
|||
{{ Form::file('licensefile[]', ['multiple' => 'multiple']) }}
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
||||
</div>
|
||||
</div> <!-- /.modal-body-->
|
||||
<div class="modal-footer">
|
||||
<button type="button" class="btn btn-default" data-dismiss="modal">{{ trans('button.cancel') }}</button>
|
||||
<button type="submit" class="btn btn-primary btn-sm">{{ trans('button.upload') }}</button>
|
||||
|
|
|
|||
|
|
@ -12,13 +12,11 @@
|
|||
@stop
|
||||
{{-- Page content --}}
|
||||
@section('content')
|
||||
|
||||
<div class="row">
|
||||
<div class="col-md-12">
|
||||
<div class="box box-default">
|
||||
<div class="box-body">
|
||||
<div class="table-responsive">
|
||||
|
||||
<table
|
||||
name="locations"
|
||||
class="table table-striped snipe-table"
|
||||
|
|
@ -53,11 +51,11 @@
|
|||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
@stop
|
||||
|
||||
@section('moar_scripts')
|
||||
@include ('partials.bootstrap-table', ['exportFile' => 'locations-export', 'search' => true])
|
||||
|
||||
|
||||
@stop
|
||||
|
|
|
|||
|
|
@ -15,10 +15,9 @@
|
|||
{{-- Page content --}}
|
||||
@section('content')
|
||||
|
||||
<div class="row">
|
||||
<div class="row">
|
||||
<div class="col-md-12">
|
||||
<div class="box box-default">
|
||||
|
||||
<div class="box-body">
|
||||
<div class="row">
|
||||
<div class="col-md-12">
|
||||
|
|
@ -43,12 +42,11 @@
|
|||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="row">
|
||||
<div class="row">
|
||||
<div class="col-md-12">
|
||||
<div class="box box-default">
|
||||
|
||||
<div class="box-body">
|
||||
<div class="row">
|
||||
<div class="col-md-12">
|
||||
|
|
@ -76,13 +74,10 @@
|
|||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
>
|
||||
|
||||
</div>
|
||||
|
||||
@stop
|
||||
|
||||
|
||||
@section('moar_scripts')
|
||||
@include ('partials.bootstrap-table', ['exportFile' => 'locations-export', 'search' => true])
|
||||
|
||||
|
|
|
|||
|
|
@ -20,7 +20,6 @@
|
|||
<div class="box box-default">
|
||||
<div class="box-body">
|
||||
<div class="table-responsive">
|
||||
|
||||
<table
|
||||
name="manufacturers"
|
||||
class="table table-striped snipe-table"
|
||||
|
|
@ -41,12 +40,9 @@
|
|||
</tr>
|
||||
</thead>
|
||||
</table>
|
||||
|
||||
</div>
|
||||
</div><!-- /.box-body -->
|
||||
</div><!-- /.box -->
|
||||
|
||||
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
|
|
|||
|
|
@ -23,10 +23,10 @@
|
|||
{{-- Page content --}}
|
||||
@section('content')
|
||||
|
||||
<div class="row">
|
||||
<div class="row">
|
||||
<div class="col-md-12">
|
||||
|
||||
<div class="nav-tabs-custom">
|
||||
|
||||
<ul class="nav nav-tabs">
|
||||
<li class="active">
|
||||
<a href="#assets" data-toggle="tab">Assets</a>
|
||||
|
|
@ -41,6 +41,7 @@
|
|||
<a href="#consumables" data-toggle="tab">Consumables</a>
|
||||
</li>
|
||||
</ul>
|
||||
|
||||
<div class="tab-content">
|
||||
<div class="tab-pane fade in active" id="assets">
|
||||
<table
|
||||
|
|
@ -100,7 +101,7 @@
|
|||
</tr>
|
||||
</thead>
|
||||
</table>
|
||||
</div>
|
||||
</div><!-- /.tab-pan licenses-->
|
||||
|
||||
<div class="tab-pane fade" id="accessories">
|
||||
<table
|
||||
|
|
@ -129,7 +130,8 @@
|
|||
</tr>
|
||||
</thead>
|
||||
</table>
|
||||
</div>
|
||||
</div> <!-- /.tab-pan accessories-->
|
||||
|
||||
<div class="tab-pane fade" id="consumables">
|
||||
<table
|
||||
name="manufacturer_licenses"
|
||||
|
|
@ -160,11 +162,12 @@
|
|||
</tr>
|
||||
</thead>
|
||||
</table>
|
||||
</div>
|
||||
</div> <!-- /.tab-pan consumables-->
|
||||
|
||||
</div> <!-- /.tab-content -->
|
||||
</div> <!-- /.nav-tabs-custom -->
|
||||
</div><!-- /. col-md-12 -->
|
||||
</div> <!-- /.row -->
|
||||
</div> <!-- /.row -->
|
||||
@stop
|
||||
|
||||
@section('moar_scripts')
|
||||
|
|
|
|||
|
|
@ -53,12 +53,11 @@
|
|||
</table>
|
||||
</div><!-- /.box-body -->
|
||||
</div><!-- /.box -->
|
||||
|
||||
|
||||
</div>
|
||||
</div>
|
||||
|
||||
@stop
|
||||
|
||||
@section('moar_scripts')
|
||||
@include ('partials.bootstrap-table', ['exportFile' => 'models-export', 'search' => true])
|
||||
|
||||
|
|
|
|||
|
|
@ -29,10 +29,9 @@
|
|||
{{-- Page content --}}
|
||||
@section('content')
|
||||
|
||||
<div class="row">
|
||||
<div class="row">
|
||||
<div class="col-md-9">
|
||||
<div class="box box-default">
|
||||
|
||||
@if ($model->id)
|
||||
<div class="box-header with-border">
|
||||
<div class="box-heading">
|
||||
|
|
@ -40,8 +39,6 @@
|
|||
</div>
|
||||
</div><!-- /.box-header -->
|
||||
@endif
|
||||
|
||||
|
||||
<div class="box-body">
|
||||
<table
|
||||
name="modelassets"
|
||||
|
|
@ -64,43 +61,45 @@
|
|||
</tr>
|
||||
</thead>
|
||||
</table>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div> <!-- /.box-body-->
|
||||
</div> <!-- /.box-default-->
|
||||
</div> <!-- /.col-md-9-->
|
||||
|
||||
<!-- side address column -->
|
||||
<div class="col-md-3">
|
||||
<h4>More Info:</h4>
|
||||
<ul class="list-unstyled">
|
||||
|
||||
@if ($model->manufacturer)
|
||||
<li>{{ trans('general.manufacturer') }}:
|
||||
{{ $model->manufacturer->name }}</li>
|
||||
<li>
|
||||
{{ trans('general.manufacturer') }}:
|
||||
{{ $model->manufacturer->name }}
|
||||
</li>
|
||||
@endif
|
||||
|
||||
@if ($model->model_number)
|
||||
<li>{{ trans('general.model_no') }}:
|
||||
{{ $model->model_number }}</li>
|
||||
<li>
|
||||
{{ trans('general.model_no') }}:
|
||||
{{ $model->model_number }}
|
||||
</li>
|
||||
@endif
|
||||
|
||||
@if ($model->depreciation)
|
||||
<li>{{ trans('general.depreciation') }}:
|
||||
{{ $model->depreciation->name }} ({{ $model->depreciation->months }}
|
||||
{{ trans('general.months') }}
|
||||
)</li>
|
||||
<li>
|
||||
{{ trans('general.depreciation') }}:
|
||||
{{ $model->depreciation->name }} ({{ $model->depreciation->months.' '.trans('general.months')}})
|
||||
</li>
|
||||
@endif
|
||||
|
||||
@if ($model->eol)
|
||||
<li>{{ trans('general.eol') }}:
|
||||
{{ $model->eol }}
|
||||
{{ trans('general.months') }}</li>
|
||||
{{ $model->eol .' '. trans('general.months') }} {{ trans('general.months') }}
|
||||
</li>
|
||||
@endif
|
||||
|
||||
@if ($model->fieldset)
|
||||
<li>{{ trans('admin/models/general.fieldset') }}:
|
||||
<a href="{{ route('fieldsets.show', $model->fieldset->id) }}">{{ $model->fieldset->name }}</a>
|
||||
</li>
|
||||
|
||||
@endif
|
||||
|
||||
@if ($model->image)
|
||||
|
|
@ -109,17 +108,15 @@
|
|||
|
||||
@if ($model->deleted_at!='')
|
||||
<li><br /><a href="{{ route('restore/model', $model->id) }}" class="btn-flat large info ">{{ trans('admin/models/general.restore') }}</a></li>
|
||||
|
||||
@endif
|
||||
|
||||
</ul>
|
||||
|
||||
@if ($model->note)
|
||||
Notes:
|
||||
<p>{!! $model->present()->note() !!}
|
||||
<p>
|
||||
{!! $model->present()->note() !!}
|
||||
</p>
|
||||
@endif
|
||||
|
||||
</div>
|
||||
</div>
|
||||
@stop
|
||||
|
|
|
|||
|
|
@ -9,15 +9,11 @@
|
|||
{{-- Page content --}}
|
||||
@section('content')
|
||||
|
||||
|
||||
<div class="row">
|
||||
<div class="col-md-12">
|
||||
|
||||
<div class="box box-default">
|
||||
<div class="box-body">
|
||||
|
||||
<div class="table-responsive">
|
||||
|
||||
<table
|
||||
name="accessoriesReport"
|
||||
id="table"
|
||||
|
|
@ -34,7 +30,6 @@
|
|||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
|
||||
@foreach ($accessories as $accessory)
|
||||
<tr>
|
||||
<td>{{ is_null($accessory->company) ? '' : $accessory->company->name }}</td>
|
||||
|
|
@ -46,9 +41,9 @@
|
|||
</tbody>
|
||||
</table>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -9,11 +9,8 @@
|
|||
{{-- Page content --}}
|
||||
@section('content')
|
||||
|
||||
|
||||
|
||||
<div class="row">
|
||||
<div class="col-md-12">
|
||||
|
||||
<div class="box box-default">
|
||||
<div class="box-body">
|
||||
|
||||
|
|
@ -36,13 +33,11 @@
|
|||
<th class="col-sm-1" data-field="note">{{ trans('general.notes') }}</th>
|
||||
</tr>
|
||||
</thead>
|
||||
|
||||
</table>
|
||||
|
||||
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
@stop
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -16,10 +16,8 @@
|
|||
|
||||
<div class="row">
|
||||
<div class="col-md-12">
|
||||
|
||||
<div class="box box-default">
|
||||
<div class="box-body">
|
||||
|
||||
<div class="table-responsive">
|
||||
|
||||
<table
|
||||
|
|
|
|||
|
|
@ -10,7 +10,6 @@
|
|||
@section('content')
|
||||
<div class="row">
|
||||
<div class="col-md-12">
|
||||
|
||||
<div class="box box-default">
|
||||
<div class="box-body">
|
||||
|
||||
|
|
@ -86,9 +85,9 @@
|
|||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
@stop
|
||||
|
||||
@section('moar_scripts')
|
||||
<script src="{{ asset('assets/js/bootstrap-table.js') }}"></script>
|
||||
|
|
@ -130,4 +129,3 @@
|
|||
});
|
||||
</script>
|
||||
@stop
|
||||
@stop
|
||||
|
|
|
|||
|
|
@ -16,21 +16,17 @@
|
|||
@section('content')
|
||||
|
||||
<div class="row">
|
||||
<div class="col-md-8 col-md-offset-2">
|
||||
<div class="col-md-8 col-md-offset-2">
|
||||
|
||||
{{ Form::open(['method' => 'post', 'class' => 'form-horizontal']) }}
|
||||
<!-- CSRF Token -->
|
||||
<input type="hidden" name="_token" value="{{ csrf_token() }}">
|
||||
|
||||
{{csrf_field()}}
|
||||
|
||||
<!-- Horizontal Form -->
|
||||
<div class="box box-default">
|
||||
|
||||
<div class="box-header with-border">
|
||||
<h3 class="box-title">Customize Report</h3>
|
||||
</div><!-- /.box-header -->
|
||||
|
||||
|
||||
<div class="box-body">
|
||||
<div class="col-md-3">
|
||||
|
||||
|
|
@ -40,7 +36,6 @@
|
|||
{{ trans('general.company') }}
|
||||
</label>
|
||||
</div>
|
||||
|
||||
<div class="checkbox col-md-12">
|
||||
<label>
|
||||
{{ Form::checkbox('asset_tag', '1') }}
|
||||
|
|
@ -71,7 +66,6 @@
|
|||
{{ trans('general.category') }}
|
||||
</label>
|
||||
</div>
|
||||
|
||||
<div class="checkbox col-md-12">
|
||||
<label>
|
||||
{{ Form::checkbox('serial', '1') }}
|
||||
|
|
@ -120,21 +114,18 @@
|
|||
{{ trans('admin/licenses/table.assigned_to') }}
|
||||
</label>
|
||||
</div>
|
||||
|
||||
<div class="checkbox col-md-12">
|
||||
<label>
|
||||
{{ Form::checkbox('username', '1') }}
|
||||
{{ trans('admin/users/table.username') }}
|
||||
</label>
|
||||
</div>
|
||||
|
||||
<div class="checkbox col-md-12">
|
||||
<label>
|
||||
{{ Form::checkbox('employee_num', '1') }}
|
||||
{{ trans('admin/users/table.employee_num') }}
|
||||
</label>
|
||||
</div>
|
||||
|
||||
<div class="checkbox col-md-12">
|
||||
<label>
|
||||
{{ Form::checkbox('status', '1') }}
|
||||
|
|
@ -160,9 +151,6 @@
|
|||
</label>
|
||||
</div>
|
||||
|
||||
|
||||
|
||||
|
||||
@foreach ($customfields as $customfield)
|
||||
<div class="checkbox col-md-12">
|
||||
<label>
|
||||
|
|
@ -171,19 +159,18 @@
|
|||
</label>
|
||||
</div>
|
||||
@endforeach
|
||||
</div>
|
||||
|
||||
</div> <!-- /.col-md-3-->
|
||||
|
||||
<div class="col-md-7">
|
||||
<p>Select the fields you'd like to include in your custom report, and click Generate. The file (YYYY-mm-dd-his-custom-asset-report.csv) will download automatically, and you can open it in Excel.</p>
|
||||
</div>
|
||||
|
||||
</div>
|
||||
</div> <!-- /.box-body-->
|
||||
<div class="box-footer text-right">
|
||||
<button type="submit" class="btn btn-success"><i class="fa fa-download icon-white"></i> {{ trans('general.generate') }}</button>
|
||||
</div>
|
||||
</div>
|
||||
</form>
|
||||
</div> <!--/.box.box-default-->
|
||||
{{ Form::close() }}
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
|
|
|||
|
|
@ -9,12 +9,10 @@
|
|||
{{-- Page content --}}
|
||||
@section('content')
|
||||
|
||||
|
||||
<div class="row">
|
||||
<div class="col-md-12">
|
||||
<div class="box box-default">
|
||||
<div class="box-body">
|
||||
|
||||
<div class="table-responsive">
|
||||
<table
|
||||
class="table table-striped table-bordered table-compact"
|
||||
|
|
@ -45,7 +43,6 @@
|
|||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
|
||||
@foreach ($assets as $asset)
|
||||
<tr>
|
||||
<td>{{ is_null($asset->company) ? '' : $asset->company->name }}</td>
|
||||
|
|
@ -53,7 +50,6 @@
|
|||
@if ($asset->model)
|
||||
{{ $asset->model->category->name }}
|
||||
@endif
|
||||
|
||||
</td>
|
||||
<td>
|
||||
@if ($asset->deleted_at!='')
|
||||
|
|
@ -61,7 +57,6 @@
|
|||
@else
|
||||
{{ $asset->asset_tag }}
|
||||
@endif
|
||||
|
||||
</td>
|
||||
<td>{{ $asset->model->name }}</td>
|
||||
@if ($snipeSettings->display_asset_name)
|
||||
|
|
@ -87,7 +82,6 @@
|
|||
{{ $asset->assigneduser->present()->fullName() }}
|
||||
</a>
|
||||
@endif
|
||||
|
||||
@endif
|
||||
</td>
|
||||
<td>
|
||||
|
|
@ -111,7 +105,8 @@
|
|||
@else
|
||||
{{ $snipeSettings->default_currency }}
|
||||
@endif
|
||||
{{ \App\Helpers\Helper::formatCurrencyOutput($asset->purchase_cost) }}</td>
|
||||
{{ \App\Helpers\Helper::formatCurrencyOutput($asset->purchase_cost) }}
|
||||
</td>
|
||||
<td class="align-right">
|
||||
@if ($asset->assetloc )
|
||||
{{ $asset->assetloc->currency }}
|
||||
|
|
@ -119,7 +114,8 @@
|
|||
{{ $snipeSettings->default_currency }}
|
||||
@endif
|
||||
|
||||
{{ \App\Helpers\Helper::formatCurrencyOutput($asset->getDepreciatedValue()) }}</td>
|
||||
{{ \App\Helpers\Helper::formatCurrencyOutput($asset->getDepreciatedValue()) }}
|
||||
</td>
|
||||
<td class="align-right">
|
||||
@if ($asset->assetloc)
|
||||
{{ $asset->assetloc->currency }}
|
||||
|
|
@ -127,22 +123,24 @@
|
|||
{{ $snipeSettings->default_currency }}
|
||||
@endif
|
||||
|
||||
-{{ \App\Helpers\Helper::formatCurrencyOutput(($asset->purchase_cost - $asset->getDepreciatedValue())) }}</td>
|
||||
-{{ \App\Helpers\Helper::formatCurrencyOutput(($asset->purchase_cost - $asset->getDepreciatedValue())) }}
|
||||
</td>
|
||||
@else
|
||||
<td></td>
|
||||
<td></td>
|
||||
<td></td>
|
||||
@endif
|
||||
|
||||
|
||||
</tr>
|
||||
@endforeach
|
||||
</tbody>
|
||||
</table>
|
||||
</div>
|
||||
</div>
|
||||
</table>
|
||||
</div> <!-- /.table-responsive-->
|
||||
</div> <!-- /.box-body-->
|
||||
</div> <!--/box.box-default-->
|
||||
</div> <!-- /.col-md-12-->
|
||||
</div> <!--/.row-->
|
||||
|
||||
</div>
|
||||
@stop
|
||||
|
||||
@section('moar_scripts')
|
||||
<script src="{{ asset('assets/js/bootstrap-table.js') }}"></script>
|
||||
|
|
|
|||
|
|
@ -9,21 +9,17 @@
|
|||
{{-- Page content --}}
|
||||
@section('content')
|
||||
|
||||
|
||||
<div class="page-header">
|
||||
|
||||
<div class="pull-right">
|
||||
<a href="{{ route('reports/export') }}" class="btn btn-flat gray pull-right"><i class="fa fa-download icon-white"></i>
|
||||
{{ trans('admin/hardware/table.dl_csv') }}</a>
|
||||
</div>
|
||||
|
||||
<h3>{{ trans('general.depreciation_report') }}</h3>
|
||||
</div>
|
||||
|
||||
<div class="row">
|
||||
|
||||
<div class="table-responsive">
|
||||
<table id="example">
|
||||
<div class="table-responsive">
|
||||
<table id="example">
|
||||
<thead>
|
||||
<tr role="row">
|
||||
<th class="col-sm-1">{{ trans('admin/hardware/table.asset_tag') }}</th>
|
||||
|
|
@ -42,7 +38,6 @@
|
|||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
|
||||
@foreach ($assets as $asset)
|
||||
<tr>
|
||||
<td>{{ $asset->asset_tag }}</td>
|
||||
|
|
@ -82,19 +77,18 @@
|
|||
</td>
|
||||
<td class="align-right">
|
||||
{{ $snipeSettings->default_currency }}
|
||||
-{{ number_format(($asset->purchase_cost - $asset->depreciate())) }}</td>
|
||||
@else
|
||||
-{{ number_format(($asset->purchase_cost - $asset->depreciate())) }}
|
||||
</td>
|
||||
@else {{-- purchase_cost > 0 --}}
|
||||
<td></td>
|
||||
<td></td>
|
||||
<td></td>
|
||||
@endif
|
||||
|
||||
|
||||
</tr>
|
||||
@endforeach
|
||||
</tbody>
|
||||
</table>
|
||||
|
||||
</table>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
@stop
|
||||
|
|
|
|||
|
|
@ -8,14 +8,10 @@
|
|||
|
||||
{{-- Page content --}}
|
||||
@section('content')
|
||||
|
||||
|
||||
|
||||
<div class="row">
|
||||
<div class="col-md-12">
|
||||
<div class="box box-default">
|
||||
<div class="box-body">
|
||||
|
||||
<div class="table-responsive">
|
||||
<table
|
||||
name="licensesReport"
|
||||
|
|
@ -39,8 +35,8 @@
|
|||
<th class="col-sm-1 text-right">{{ trans('admin/hardware/table.diff') }}</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
|
||||
<tbody>
|
||||
@foreach ($licenses as $license)
|
||||
<tr>
|
||||
<td>{{ is_null($license->company) ? '' : $license->company->name }}</td>
|
||||
|
|
@ -51,20 +47,29 @@
|
|||
<td>{{ $license->expiration_date }}</td>
|
||||
<td>{{ $license->purchase_date }}</td>
|
||||
<td class="text-right">
|
||||
{{ $snipeSettings->default_currency }}{{ \App\Helpers\Helper::formatCurrencyOutput($license->purchase_cost) }}</td>
|
||||
<td>{{ ($license->depreciation) ? e($license->depreciation->name).' ('.$license->depreciation->months.' '.trans('general.months').')' : '' }}</td>
|
||||
<td class="text-right">{{ $snipeSettings->default_currency }}{{ \App\Helpers\Helper::formatCurrencyOutput($license->getDepreciatedValue()) }}</td>
|
||||
<td class="text-right">-{{ $snipeSettings->default_currency }}{{ \App\Helpers\Helper::formatCurrencyOutput(($license->purchase_cost - $license->getDepreciatedValue())) }}</td>
|
||||
{{ $snipeSettings->default_currency }}{{ \App\Helpers\Helper::formatCurrencyOutput($license->purchase_cost) }}
|
||||
</td>
|
||||
<td>
|
||||
{{ ($license->depreciation) ? e($license->depreciation->name).' ('.$license->depreciation->months.' '.trans('general.months').')' : '' }}
|
||||
</td>
|
||||
<td class="text-right">
|
||||
{{ $snipeSettings->default_currency }}{{ \App\Helpers\Helper::formatCurrencyOutput($license->getDepreciatedValue()) }}
|
||||
</td>
|
||||
<td class="text-right">
|
||||
-{{ $snipeSettings->default_currency }}{{ \App\Helpers\Helper::formatCurrencyOutput(($license->purchase_cost - $license->getDepreciatedValue())) }}
|
||||
</td>
|
||||
</tr>
|
||||
@endforeach
|
||||
</tbody>
|
||||
</table>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</table>
|
||||
</div> <!-- /.table-responsive-->
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
@stop
|
||||
|
||||
@section('moar_scripts')
|
||||
<script src="{{ asset('assets/js/bootstrap-table.js') }}"></script>
|
||||
<script src="{{ asset('assets/js/extensions/cookie/bootstrap-table-cookie.js') }}"></script>
|
||||
|
|
@ -105,5 +110,3 @@
|
|||
});
|
||||
</script>
|
||||
@stop
|
||||
|
||||
@stop
|
||||
|
|
|
|||
|
|
@ -13,10 +13,8 @@
|
|||
|
||||
<div class="row">
|
||||
<div class="col-md-12">
|
||||
|
||||
<div class="box box-default">
|
||||
<div class="box-body">
|
||||
|
||||
<div class="table-responsive">
|
||||
<table
|
||||
name="unacceptedAssetsReport"
|
||||
|
|
@ -56,17 +54,19 @@
|
|||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
@section('moar_scripts')
|
||||
<script src="{{ asset('assets/js/bootstrap-table.js') }}"></script>
|
||||
<script src="{{ asset('assets/js/extensions/cookie/bootstrap-table-cookie.js') }}"></script>
|
||||
<script src="{{ asset('assets/js/extensions/mobile/bootstrap-table-mobile.js') }}"></script>
|
||||
<script src="{{ asset('assets/js/extensions/export/bootstrap-table-export.js') }}"></script>
|
||||
<script src="{{ asset('assets/js/extensions/export/tableExport.js') }}"></script>
|
||||
<script src="{{ asset('assets/js/extensions/export/jquery.base64.js') }}"></script>
|
||||
<script type="text/javascript">
|
||||
@stop
|
||||
|
||||
@section('moar_scripts')
|
||||
<script src="{{ asset('assets/js/bootstrap-table.js') }}"></script>
|
||||
<script src="{{ asset('assets/js/extensions/cookie/bootstrap-table-cookie.js') }}"></script>
|
||||
<script src="{{ asset('assets/js/extensions/mobile/bootstrap-table-mobile.js') }}"></script>
|
||||
<script src="{{ asset('assets/js/extensions/export/bootstrap-table-export.js') }}"></script>
|
||||
<script src="{{ asset('assets/js/extensions/export/tableExport.js') }}"></script>
|
||||
<script src="{{ asset('assets/js/extensions/export/jquery.base64.js') }}"></script>
|
||||
<script type="text/javascript">
|
||||
$('#table').bootstrapTable({
|
||||
classes: 'table table-responsive table-no-bordered',
|
||||
undefinedText: '',
|
||||
|
|
@ -97,7 +97,5 @@
|
|||
},
|
||||
|
||||
});
|
||||
</script>
|
||||
@stop
|
||||
|
||||
</script>
|
||||
@stop
|
||||
|
|
|
|||
|
|
@ -15,7 +15,6 @@
|
|||
<div class="box box-default">
|
||||
<div class="box-body">
|
||||
<div class="table-responsive">
|
||||
|
||||
<table class="table table-striped">
|
||||
<thead>
|
||||
<th>File</th>
|
||||
|
|
@ -30,10 +29,14 @@
|
|||
<td>{{ date("M d, Y g:i A", $file['modified']) }} </td>
|
||||
<td>{{ $file['filesize'] }}</td>
|
||||
<td>
|
||||
<a data-html="false"
|
||||
class="btn delete-asset btn-danger btn-sm {{ (config('app.lock_passwords')) ? ' disabled': '' }}" data-toggle="modal" href=" {{ route('settings/delete-file', $file['filename']) }}" data-content="{{ trans('admin/settings/message.backup.delete_confirm') }}" data-title="{{ trans('general.delete') }} {{ htmlspecialchars($file['filename']) }} ?" onClick="return false;">
|
||||
<i class="fa fa-trash icon-white"></i>
|
||||
</a>
|
||||
{{ Helper::generateDatatableButton(
|
||||
'delete',
|
||||
route('settings/delete-file', $file['filename']),
|
||||
config('app.lock_passwords'),
|
||||
trans('admin/settings/message.backup.delete_confirm'),
|
||||
$file['filename']
|
||||
)
|
||||
}}
|
||||
</td>
|
||||
</tr>
|
||||
@endforeach
|
||||
|
|
|
|||
|
|
@ -10,7 +10,6 @@
|
|||
{{-- Page content --}}
|
||||
@section('content')
|
||||
|
||||
|
||||
<style>
|
||||
.checkbox label {
|
||||
padding-right: 40px;
|
||||
|
|
@ -25,16 +24,12 @@
|
|||
<!-- Bootstrap Color Picker -->
|
||||
<link rel="stylesheet" href="{{ asset('assets/js/plugins/colorpicker/bootstrap-colorpicker.min.css') }}">
|
||||
|
||||
|
||||
{{ Form::open(['method' => 'POST', 'files' => true, 'class' => 'form-horizontal', 'role' => 'form' ]) }}
|
||||
<!-- CSRF Token -->
|
||||
{{ Form::hidden('_token', csrf_token()) }}
|
||||
|
||||
|
||||
{{csrf_field()}}
|
||||
|
||||
<div class="row">
|
||||
<div class="col-sm-10 col-sm-offset-1 col-md-8 col-md-offset-2">
|
||||
|
||||
<div class="panel box box-default">
|
||||
<div class="box-header">
|
||||
<h3 class="box-title"></h3>
|
||||
|
|
@ -54,7 +49,6 @@
|
|||
</div>
|
||||
<div id="collapseOne" class="panel-collapse collapse in" role="tabbox" aria-labelledby="headingOne">
|
||||
<div class="box-body">
|
||||
|
||||
<!-- Site name -->
|
||||
<div class="form-group {{ $errors->has('site_name') ? 'error' : '' }}">
|
||||
<div class="col-md-3">
|
||||
|
|
@ -111,7 +105,9 @@
|
|||
{{ Form::checkbox('full_multiple_companies_support', '1', Input::old('full_multiple_companies_support', $setting->full_multiple_companies_support),array('class' => 'minimal')) }}
|
||||
{{ trans('admin/settings/general.full_multiple_companies_support_text') }}
|
||||
{!! $errors->first('full_multiple_companies_support', '<span class="alert-msg">:message</span>') !!}
|
||||
<p class="help-block">{{ trans('admin/settings/general.full_multiple_companies_support_help_text') }}</p>
|
||||
<p class="help-block">
|
||||
{{ trans('admin/settings/general.full_multiple_companies_support_help_text') }}
|
||||
</p>
|
||||
</div>
|
||||
</div>
|
||||
<!-- /.form-group -->
|
||||
|
|
@ -177,7 +173,6 @@
|
|||
<div class="col-md-9">
|
||||
{{ Form::text('email_domain', Input::old('email_domain', $setting->email_domain), array('class' => 'form-control','placeholder' => 'example.com')) }}
|
||||
<span class="help-block">{{ trans('general.email_domain_help') }}</span>
|
||||
|
||||
{!! $errors->first('email_domain', '<span class="alert-msg">:message</span>') !!}
|
||||
</div>
|
||||
</div>
|
||||
|
|
@ -190,7 +185,6 @@
|
|||
</div>
|
||||
<div class="col-md-9">
|
||||
{!! Form::username_format('email_format', Input::old('email_format', $setting->email_format), 'select2') !!}
|
||||
|
||||
{!! $errors->first('email_format', '<span class="alert-msg">:message</span>') !!}
|
||||
</div>
|
||||
</div>
|
||||
|
|
@ -202,7 +196,6 @@
|
|||
</div>
|
||||
<div class="col-md-9">
|
||||
{!! Form::username_format('username_format', Input::old('username_format', $setting->username_format), 'select2') !!}
|
||||
|
||||
{!! $errors->first('username_format', '<span class="alert-msg">:message</span>') !!}
|
||||
</div>
|
||||
</div>
|
||||
|
|
@ -222,7 +215,6 @@
|
|||
|
||||
{{ Form::checkbox('alerts_enabled', '1', Input::old('alerts_enabled', $setting->alerts_enabled),array('class' => 'minimal')) }}
|
||||
{{ trans('admin/settings/general.alerts_enabled') }}
|
||||
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
|
@ -249,8 +241,6 @@
|
|||
</div>
|
||||
|
||||
|
||||
|
||||
|
||||
<!-- Header color -->
|
||||
<div class="form-group {{ $errors->has('header_color') ? 'error' : '' }}">
|
||||
<div class="col-md-3">
|
||||
|
|
@ -263,8 +253,6 @@
|
|||
<i></i>
|
||||
</div>
|
||||
</div><!-- /.input group -->
|
||||
|
||||
|
||||
{!! $errors->first('header_color', '<span class="alert-msg">:message</span>') !!}
|
||||
</div>
|
||||
</div>
|
||||
|
|
@ -308,11 +296,10 @@
|
|||
{!! $errors->first('per_page', '<span class="alert-msg">:message</span>') !!}
|
||||
</div>
|
||||
</div>
|
||||
</div> <!-- .box-body-->
|
||||
</div> <!--/.collapseOne-->
|
||||
</div>
|
||||
|
||||
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="panel box box-primary">
|
||||
<div class="box-header with-border">
|
||||
<h4 class="box-title">
|
||||
|
|
@ -358,20 +345,18 @@
|
|||
<div class="col-md-9">
|
||||
{{ Form::text('zerofill_count', Input::old('zerofill_count', $setting->zerofill_count), array('class' => 'form-control', 'style'=>'width: 100px;')) }}
|
||||
{!! $errors->first('zerofill_count', '<span class="alert-msg">:message</span>') !!}
|
||||
|
||||
</div>
|
||||
</div>
|
||||
</div> <!-- /.box-body-->
|
||||
</div><!--/#collapseTwo-->
|
||||
</div>
|
||||
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="panel box box-primary">
|
||||
<div class="box-header with-border">
|
||||
<h4 class="box-title">
|
||||
<a data-toggle="collapse" data-parent="#accordion" href="#collapseThree" class="accordion-header">
|
||||
<i class="fa fa-barcode"></i>
|
||||
{{ trans('admin/settings/general.barcode_settings') }}
|
||||
|
||||
</a>
|
||||
</h4>
|
||||
</div>
|
||||
|
|
@ -379,7 +364,6 @@
|
|||
<div id="collapseThree" class="box-collapse collapse" role="tabbox" aria-labelledby="headingThree">
|
||||
<div class="box-body">
|
||||
@if ($is_gd_installed)
|
||||
|
||||
<!-- qr code -->
|
||||
<div class="form-group">
|
||||
<div class="col-md-3">
|
||||
|
|
@ -423,7 +407,6 @@
|
|||
{!! $errors->first('barcode_type', '<span class="alert-msg"><i class="fa fa-times"></i> :message</span>') !!}
|
||||
</div>
|
||||
</div>
|
||||
|
||||
@else
|
||||
<span class="help-block col-md-offset-3 col-md-12">
|
||||
{{ trans('admin/settings/general.php_gd_warning') }}
|
||||
|
|
@ -431,27 +414,22 @@
|
|||
{{ trans('admin/settings/general.php_gd_info') }}
|
||||
</span>
|
||||
@endif
|
||||
|
||||
</div>
|
||||
</div>
|
||||
</div> <!--/.box-body-->
|
||||
</div> <!--/#collapseThree-->
|
||||
</div>
|
||||
|
||||
<div class="panel box box-primary">
|
||||
|
||||
<div class="box-header with-border">
|
||||
<h4 class="box-title">
|
||||
<a data-toggle="collapse" data-parent="#accordion" href="#collapseSeven" class="accordion-header">
|
||||
<i class="fa fa-table"></i>
|
||||
Labels
|
||||
|
||||
</a>
|
||||
</h4>
|
||||
</div>
|
||||
|
||||
<div id="collapseSeven" class="box-collapse collapse" role="tabbox" aria-labelledby="headingSeven">
|
||||
<div class="box-body">
|
||||
|
||||
|
||||
<!-- qr text -->
|
||||
<div class="form-group {{ $errors->has('qr_text') ? 'error' : '' }}">
|
||||
<div class="col-md-3">
|
||||
|
|
@ -497,8 +475,6 @@
|
|||
</div>
|
||||
</div>
|
||||
|
||||
|
||||
|
||||
<div class="form-group {{ $errors->has('labels_width') ? 'error' : '' }}">
|
||||
<div class="col-md-3">
|
||||
{{ Form::label('labels_width', trans('admin/settings/general.label_dimensions')) }}
|
||||
|
|
@ -521,7 +497,6 @@
|
|||
</div>
|
||||
</div>
|
||||
|
||||
|
||||
<div class="form-group {{ $errors->has('labels_width') ? 'error' : '' }}">
|
||||
<div class="col-md-3">
|
||||
{{ Form::label('labels_width', trans('admin/settings/general.label_gutters')) }}
|
||||
|
|
@ -544,8 +519,6 @@
|
|||
</div>
|
||||
</div>
|
||||
|
||||
|
||||
|
||||
<div class="form-group {{ $errors->has('labels_width') ? 'error' : '' }}">
|
||||
<div class="col-md-3">
|
||||
{{ Form::label('labels_width', trans('admin/settings/general.page_padding')) }}
|
||||
|
|
@ -555,12 +528,10 @@
|
|||
{{ Form::text('labels_pmargin_top', Input::old('labels_pmargin_top', $setting->labels_pmargin_top), array('class' => 'form-control')) }}
|
||||
<div class="input-group-addon">{{ trans('admin/settings/general.top') }}</div>
|
||||
</div>
|
||||
|
||||
<div class="input-group">
|
||||
{{ Form::text('labels_pmargin_right', Input::old('labels_pmargin_right', $setting->labels_pmargin_right), array('class' => 'form-control')) }}
|
||||
<div class="input-group-addon">{{ trans('admin/settings/general.right') }}</div>
|
||||
</div>
|
||||
|
||||
</div>
|
||||
<div class="col-md-3 form-group" style="margin-left: 10px; ">
|
||||
<div class="input-group" style="margin-bottom: 15px;">
|
||||
|
|
@ -600,7 +571,6 @@
|
|||
</div>
|
||||
</div>
|
||||
|
||||
|
||||
<div class="form-group">
|
||||
<div class="col-md-3">
|
||||
{{ Form::label('labels_width', trans('admin/settings/general.label_fields')) }}
|
||||
|
|
@ -615,23 +585,17 @@
|
|||
{{ Form::checkbox('labels_display_serial', '1', Input::old('labels_display_serial', $setting->labels_display_serial),array('class' => 'minimal')) }}
|
||||
{{ trans('admin/hardware/form.serial') }}
|
||||
</label>
|
||||
|
||||
<label>
|
||||
{{ Form::checkbox('labels_display_tag', '1', Input::old('labels_display_tag', $setting->labels_display_tag),array('class' => 'minimal')) }}
|
||||
{{ trans('admin/hardware/form.tag') }}
|
||||
</label>
|
||||
</div> <!--/.CHECKBOX-->
|
||||
</div> <!--/.col-md-9-->
|
||||
</div> <!--/.form-group-->
|
||||
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div><!--/.box-body-->
|
||||
</div> <!--/#collapseSeven-->
|
||||
</div> <!--/.box.box-primary-->
|
||||
|
||||
<div class="panel box box-primary">
|
||||
<div class="box-header with-border">
|
||||
|
|
@ -639,7 +603,6 @@
|
|||
<a data-toggle="collapse" data-parent="#accordion" href="#collapseFour" class="accordion-header">
|
||||
<i class="fa fa-file-text-o"></i>
|
||||
{{ trans('admin/settings/general.default_eula_text') }}
|
||||
|
||||
</a>
|
||||
</h4>
|
||||
</div>
|
||||
|
|
@ -654,13 +617,10 @@
|
|||
<p class="help-block">{!! trans('admin/settings/general.eula_markdown') !!}</p>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
</div>
|
||||
</div> <!--/#collapseFou-->
|
||||
</div>
|
||||
|
||||
</div>
|
||||
|
||||
|
||||
<div class="panel box box-primary">
|
||||
<div class="box-header with-border">
|
||||
<h4 class="box-title">
|
||||
|
|
@ -671,6 +631,7 @@
|
|||
</a>
|
||||
</h4>
|
||||
</div>
|
||||
|
||||
<div id="collapseFive" class="box-collapse collapse" role="tabbox" aria-labelledby="headingFive">
|
||||
<div class="box-body">
|
||||
<p class="help-block">{!! trans('admin/settings/general.slack_integration_help',array('slack_link' => 'https://my.slack.com/services/new/incoming-webhook')) !!}</p>
|
||||
|
|
@ -704,11 +665,9 @@
|
|||
{!! $errors->first('slack_channel', '<span class="alert-msg">:message</span>') !!}
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div> <!--/.box-body-->
|
||||
</div> <!--/#collapseFive-->
|
||||
</div> <!-- /.panel-->
|
||||
|
||||
<div class="panel box box-primary">
|
||||
<div class="box-header with-border">
|
||||
|
|
@ -734,7 +693,6 @@
|
|||
</div>
|
||||
</div>
|
||||
|
||||
|
||||
<!-- AD Flag -->
|
||||
<div class="form-group">
|
||||
<div class="col-md-3">
|
||||
|
|
@ -744,10 +702,8 @@
|
|||
{{ Form::checkbox('is_ad', '1', Input::old('is_ad', $setting->is_ad),array('class' => 'minimal')) }}
|
||||
{{ trans('admin/settings/general.is_ad') }}
|
||||
{!! $errors->first('is_ad', '<span class="alert-msg">:message</span>') !!}
|
||||
|
||||
</div>
|
||||
</div>
|
||||
<!-- /.form-group -->
|
||||
|
||||
<!-- LDAP Password Sync -->
|
||||
<div class="form-group">
|
||||
|
|
@ -759,10 +715,8 @@
|
|||
{{ trans('general.yes') }}
|
||||
<p class="help-block">{{ trans('admin/settings/general.ldap_pw_sync_help') }}</p>
|
||||
{!! $errors->first('ldap_pw_sync', '<span class="alert-msg">:message</span>') !!}
|
||||
|
||||
</div>
|
||||
</div>
|
||||
<!-- /.form-group -->
|
||||
|
||||
<!-- AD Domain -->
|
||||
<div class="form-group {{ $errors->has('ad_domain') ? 'error' : '' }}">
|
||||
|
|
@ -775,14 +729,10 @@
|
|||
@else
|
||||
{{ Form::text('ad_domain', Input::old('ad_domain', $setting->ad_domain), array('class' => 'form-control','placeholder' => 'example.com')) }}
|
||||
@endif
|
||||
|
||||
<p class="help-block">{{ trans('admin/settings/general.ad_domain_help') }}</p>
|
||||
|
||||
|
||||
{!! $errors->first('ad_domain', '<span class="alert-msg">:message</span>') !!}
|
||||
</div>
|
||||
</div><!-- LDAP Server -->
|
||||
|
||||
</div><!-- AD Domain -->
|
||||
|
||||
<!-- LDAP Server -->
|
||||
<div class="form-group {{ $errors->has('ldap_server') ? 'error' : '' }}">
|
||||
|
|
@ -800,7 +750,6 @@
|
|||
</div>
|
||||
</div><!-- LDAP Server -->
|
||||
|
||||
|
||||
<!-- Start TLS -->
|
||||
<div class="form-group">
|
||||
<div class="col-md-3">
|
||||
|
|
@ -810,12 +759,10 @@
|
|||
{{ Form::checkbox('ldap_tls', '1', Input::old('ldap_tls', $setting->ldap_tls),array('class' => 'minimal')) }}
|
||||
{{ trans('admin/settings/general.ldap_tls_help') }}
|
||||
{!! $errors->first('ldap_tls', '<span class="alert-msg">:message</span>') !!}
|
||||
|
||||
</div>
|
||||
</div>
|
||||
<!-- /.form-group -->
|
||||
|
||||
|
||||
<!-- Ignore LDAP Certificate -->
|
||||
<div class="form-group {{ $errors->has('ldap_server_cert_ignore') ? 'error' : '' }}">
|
||||
<div class="col-md-3">
|
||||
{{ Form::label('ldap_server_cert_ignore', trans('admin/settings/general.ldap_server_cert')) }}
|
||||
|
|
@ -839,12 +786,10 @@
|
|||
@else
|
||||
{{ Form::text('ldap_uname', Input::old('ldap_uname', $setting->ldap_uname), array('class' => 'form-control','placeholder' => 'binduser@example.com')) }}
|
||||
@endif
|
||||
|
||||
{!! $errors->first('ldap_uname', '<span class="alert-msg">:message</span>') !!}
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
||||
<!-- LDAP pword -->
|
||||
<div class="form-group {{ $errors->has('ldap_pword') ? 'error' : '' }}">
|
||||
<div class="col-md-3">
|
||||
|
|
@ -856,12 +801,10 @@
|
|||
@else
|
||||
{{ Form::password('ldap_pword', array('class' => 'form-control','placeholder' => 'binduserpassword')) }}
|
||||
@endif
|
||||
|
||||
{!! $errors->first('ldap_pword', '<span class="alert-msg">:message</span>') !!}
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
||||
<!-- LDAP basedn -->
|
||||
<div class="form-group {{ $errors->has('ldap_basedn') ? 'error' : '' }}">
|
||||
<div class="col-md-3">
|
||||
|
|
@ -873,7 +816,6 @@
|
|||
@else
|
||||
{{ Form::text('ldap_basedn', Input::old('ldap_basedn', $setting->ldap_basedn), array('class' => 'form-control','placeholder' => 'cn=users/authorized,dc=example,dc=com')) }}
|
||||
@endif
|
||||
|
||||
{!! $errors->first('ldap_basedn', '<span class="alert-msg">:message</span>') !!}
|
||||
</div>
|
||||
</div>
|
||||
|
|
@ -889,12 +831,10 @@
|
|||
@else
|
||||
{{ Form::text('ldap_filter', Input::old('ldap_filter', $setting->ldap_filter), array('class' => 'form-control','placeholder' => '&(cn=*)')) }}
|
||||
@endif
|
||||
|
||||
{!! $errors->first('ldap_filter', '<span class="alert-msg">:message</span>') !!}
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
||||
<!-- LDAP username field-->
|
||||
<div class="form-group {{ $errors->has('ldap_username_field') ? 'error' : '' }}">
|
||||
<div class="col-md-3">
|
||||
|
|
@ -906,12 +846,10 @@
|
|||
@else
|
||||
{{ Form::text('ldap_username_field', Input::old('ldap_username_field', $setting->ldap_username_field), array('class' => 'form-control','placeholder' => 'samaccountname')) }}
|
||||
@endif
|
||||
|
||||
{!! $errors->first('ldap_username_field', '<span class="alert-msg">:message</span>') !!}
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
||||
<!-- LDAP Last Name Field -->
|
||||
<div class="form-group {{ $errors->has('ldap_lname_field') ? 'error' : '' }}">
|
||||
<div class="col-md-3">
|
||||
|
|
@ -923,12 +861,10 @@
|
|||
@else
|
||||
{{ Form::text('ldap_lname_field', Input::old('ldap_lname_field', $setting->ldap_lname_field), array('class' => 'form-control','placeholder' => 'sn')) }}
|
||||
@endif
|
||||
|
||||
{!! $errors->first('ldap_lname_field', '<span class="alert-msg">:message</span>') !!}
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
||||
<!-- LDAP First Name field -->
|
||||
<div class="form-group {{ $errors->has('ldap_fname_field') ? 'error' : '' }}">
|
||||
<div class="col-md-3">
|
||||
|
|
@ -940,7 +876,6 @@
|
|||
@else
|
||||
{{ Form::text('ldap_fname_field', Input::old('ldap_fname_field', $setting->ldap_fname_field), array('class' => 'form-control','placeholder' => 'givenname')) }}
|
||||
@endif
|
||||
|
||||
{!! $errors->first('ldap_fname_field', '<span class="alert-msg">:message</span>') !!}
|
||||
</div>
|
||||
</div>
|
||||
|
|
@ -956,7 +891,6 @@
|
|||
@else
|
||||
{{ Form::text('ldap_auth_filter_query', Input::old('ldap_auth_filter_query', $setting->ldap_auth_filter_query), array('class' => 'form-control','placeholder' => '"uid="')) }}
|
||||
@endif
|
||||
|
||||
{!! $errors->first('ldap_auth_filter_query', '<span class="alert-msg">:message</span>') !!}
|
||||
</div>
|
||||
</div>
|
||||
|
|
@ -972,7 +906,6 @@
|
|||
@else
|
||||
{{ Form::text('ldap_version', Input::old('ldap_version', $setting->ldap_version), array('class' => 'form-control','placeholder' => '3')) }}
|
||||
@endif
|
||||
|
||||
{!! $errors->first('ldap_version', '<span class="alert-msg">:message</span>') !!}
|
||||
</div>
|
||||
</div>
|
||||
|
|
@ -988,7 +921,6 @@
|
|||
@else
|
||||
{{ Form::text('ldap_active_flag', Input::old('ldap_active_flag', $setting->ldap_active_flag), array('class' => 'form-control','placeholder' => '')) }}
|
||||
@endif
|
||||
|
||||
{!! $errors->first('ldap_active_flag', '<span class="alert-msg">:message</span>') !!}
|
||||
</div>
|
||||
</div>
|
||||
|
|
@ -1004,7 +936,6 @@
|
|||
@else
|
||||
{{ Form::text('ldap_emp_num', Input::old('ldap_emp_num', $setting->ldap_emp_num), array('class' => 'form-control','placeholder' => '')) }}
|
||||
@endif
|
||||
|
||||
{!! $errors->first('ldap_emp_num', '<span class="alert-msg">:message</span>') !!}
|
||||
</div>
|
||||
</div>
|
||||
|
|
@ -1020,21 +951,24 @@
|
|||
@else
|
||||
{{ Form::text('ldap_email', Input::old('ldap_email', $setting->ldap_email), array('class' => 'form-control','placeholder' => '')) }}
|
||||
@endif
|
||||
|
||||
{!! $errors->first('ldap_email', '<span class="alert-msg">:message</span>') !!}
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div> <!-- /box body -->
|
||||
</div> <!--/.box-body-->
|
||||
</div> <!--/#collapseSix-->
|
||||
</div> <!-- .box.box-primary -->
|
||||
</div> <!--/.box-group-->
|
||||
</div> <!--/.box-body-->
|
||||
<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> <!-- /box body -->
|
||||
</div> <!-- /box footer -->
|
||||
</div> <!-- /box -->
|
||||
</div> <!-- /.col-md-8-->
|
||||
</div> <!-- /.row-->
|
||||
|
||||
{{Form::close()}}
|
||||
|
||||
|
||||
</form>
|
||||
@stop
|
||||
|
||||
@section('moar_scripts')
|
||||
<!-- bootstrap color picker -->
|
||||
|
|
@ -1043,6 +977,3 @@
|
|||
$(".header-color").colorpicker();
|
||||
</script>
|
||||
@stop
|
||||
|
||||
|
||||
@stop
|
||||
|
|
|
|||
|
|
@ -6,11 +6,8 @@
|
|||
@parent
|
||||
@stop
|
||||
|
||||
|
||||
|
||||
{{-- Page content --}}
|
||||
@section('content')
|
||||
|
||||
<div class="row">
|
||||
<div class="col-md-8 col-md-offset-2">
|
||||
<div class="box box-default">
|
||||
|
|
@ -21,16 +18,8 @@
|
|||
</div>
|
||||
</div>
|
||||
<div class="box-body">
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
<div class="table-responsive">
|
||||
<table class="table table-striped">
|
||||
|
||||
|
||||
|
||||
<tbody>
|
||||
@foreach ($settings as $setting)
|
||||
<tr>
|
||||
|
|
@ -81,7 +70,6 @@
|
|||
<td>{{ trans('general.no') }}</td>
|
||||
@endif
|
||||
</tr>
|
||||
|
||||
<tr>
|
||||
<td>{{ trans('admin/settings/general.header_color') }}</td>
|
||||
|
||||
|
|
@ -100,7 +88,6 @@
|
|||
<td>{{ trans('general.no') }}</td>
|
||||
@endif
|
||||
</tr>
|
||||
|
||||
<tr>
|
||||
<td>{{ trans('admin/settings/general.require_accept_signature') }}</td>
|
||||
|
||||
|
|
@ -110,7 +97,6 @@
|
|||
<td>{{ trans('general.no') }}</td>
|
||||
@endif
|
||||
</tr>
|
||||
|
||||
<tr>
|
||||
<td>{{ trans('admin/settings/general.load_remote_text') }}</td>
|
||||
|
||||
|
|
@ -120,13 +106,10 @@
|
|||
<td>{{ trans('general.no') }}</td>
|
||||
@endif
|
||||
</tr>
|
||||
|
||||
<tr>
|
||||
<td>{{ trans('admin/settings/general.auto_increment_prefix') }}</td>
|
||||
<td>{{ $setting->auto_increment_prefix }}</td>
|
||||
</tr>
|
||||
|
||||
|
||||
<tr>
|
||||
<td>{{ trans('admin/settings/general.per_page') }}</td>
|
||||
<td>{{ $setting->per_page }} </td>
|
||||
|
|
@ -185,9 +168,7 @@
|
|||
<tr id="ldaptestrow">
|
||||
<td class="col-md-4">Test LDAP Connection</td>
|
||||
<td class="col-md-8">
|
||||
|
||||
<a class="btn btn-default btn-sm pull-left" id="ldaptest" style="margin-right: 10px;"> Test LDAP</a>
|
||||
|
||||
<span id="ldaptesticon">
|
||||
</span>
|
||||
<span id="ldaptestresult">
|
||||
|
|
@ -197,12 +178,10 @@
|
|||
</td>
|
||||
</tr>
|
||||
@endif
|
||||
|
||||
|
||||
@endforeach
|
||||
</tbody>
|
||||
</table>
|
||||
|
||||
</div>
|
||||
<h4>{{ trans('admin/settings/general.system') }}</h4>
|
||||
<div class="table-responsive">
|
||||
<table class="table table-striped">
|
||||
|
|
@ -226,12 +205,12 @@
|
|||
</tbody>
|
||||
</table>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div> <!-- /box-body-->
|
||||
</div> <!--/box-default-->
|
||||
</div><!--/col-md-8-->
|
||||
</div><!--/row-->
|
||||
|
||||
<div class="row">
|
||||
<div class="row">
|
||||
<div class="col-md-8 col-md-offset-2">
|
||||
<div class="box box-solid box-danger">
|
||||
<div class="box-header with-border">
|
||||
|
|
@ -239,12 +218,9 @@
|
|||
</div>
|
||||
{{ Form::open(['method' => 'POST', 'route' => ['purge'], 'class' => 'form-horizontal', 'role' => 'form' ]) }}
|
||||
<!-- CSRF Token -->
|
||||
{{ Form::hidden('_token', csrf_token()) }}
|
||||
{{csrf_field()}}
|
||||
<div class="box-body">
|
||||
<p>{{ trans('admin/settings/general.confirm_purge_help') }}</p>
|
||||
|
||||
|
||||
|
||||
<div class="col-md-3{{ $errors->has('confirm_purge') ? 'error' : '' }}">
|
||||
{{ Form::label('confirm_purge', trans('admin/settings/general.confirm_purge')) }}
|
||||
</div>
|
||||
|
|
@ -254,23 +230,21 @@
|
|||
@else
|
||||
{{ Form::text('confirm_purge', Input::old('confirm_purge'), array('class' => 'form-control')) }}
|
||||
@endif
|
||||
|
||||
{!! $errors->first('ldap_version', '<span class="alert-msg">:message</span>') !!}
|
||||
</div>
|
||||
|
||||
|
||||
</div>
|
||||
<div class="box-footer text-right">
|
||||
<button type="submit" class="btn btn-danger">{{ trans('admin/settings/general.purge') }}</button>
|
||||
</div> <!-- /box body -->
|
||||
</form>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div> <!--/box-footer-->
|
||||
{{ Form::close() }}
|
||||
</div> <!--/.box-solid-->
|
||||
</div><!-- /.col-md-8-->
|
||||
</div><!--/.row-->
|
||||
|
||||
@stop
|
||||
|
||||
@section('moar_scripts')
|
||||
|
||||
|
||||
<script>
|
||||
<script>
|
||||
$("#ldaptest").click(function(){
|
||||
$("#ldaptestrow").removeClass('success');
|
||||
$("#ldaptestrow").removeClass('danger');
|
||||
|
|
@ -306,6 +280,5 @@
|
|||
|
||||
|
||||
|
||||
</script>
|
||||
@stop
|
||||
</script>
|
||||
@stop
|
||||
|
|
|
|||
|
|
@ -11,20 +11,15 @@
|
|||
{{ trans('general.back') }}</a>
|
||||
@stop
|
||||
|
||||
|
||||
{{-- Page content --}}
|
||||
@section('content')
|
||||
|
||||
|
||||
<div class="row">
|
||||
<div class="col-md-9">
|
||||
<div class="box box-default">
|
||||
<div class="box-body">
|
||||
{!! nl2br($output) !!}
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
||||
@stop
|
||||
|
|
|
|||
|
|
@ -8,21 +8,13 @@ Create a User ::
|
|||
|
||||
{{-- Page content --}}
|
||||
@section('content')
|
||||
|
||||
|
||||
|
||||
|
||||
<div class="col-lg-12" style="padding-top: 20px;">
|
||||
|
||||
<div class="col-lg-12" style="padding-top: 20px;">
|
||||
<div class="col-md-12">
|
||||
<div class="alert alert-warning">
|
||||
<i class="fa fa-check"></i>
|
||||
Success! Your admin user has been added!
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<p>Click here to go to your app login! <a href="{{ url('/') }}">{{ url('/') }}</a></p>
|
||||
|
||||
</div>
|
||||
|
||||
</div>
|
||||
@stop
|
||||
|
|
|
|||
|
|
@ -9,10 +9,9 @@ Create a User ::
|
|||
{{-- Page content --}}
|
||||
@section('content')
|
||||
|
||||
<p>This page will do a system check to make sure your configuration looks correct. We'll add your first user on the next page. </p>
|
||||
<p>This page will do a system check to make sure your configuration looks correct. We'll add your first user on the next page. </p>
|
||||
|
||||
|
||||
<table class="table">
|
||||
<table class="table">
|
||||
<thead>
|
||||
<tr>
|
||||
<th class="col-lg-2">Setting</th>
|
||||
|
|
@ -21,7 +20,7 @@ Create a User ::
|
|||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
<tr{!! ($start_settings['url_valid']) ? ' class="success"' : ' class="danger"' !!}>
|
||||
<tr {!! ($start_settings['url_valid']) ? ' class="success"' : ' class="danger"' !!}>
|
||||
<td>URL</td>
|
||||
<td>
|
||||
@if ($start_settings['url_valid'])
|
||||
|
|
@ -29,7 +28,6 @@ Create a User ::
|
|||
@else
|
||||
<i class="fa fa-times preflight-error"></i>
|
||||
@endif
|
||||
|
||||
</td>
|
||||
<td>
|
||||
@if ($start_settings['url_valid'])
|
||||
|
|
@ -40,7 +38,8 @@ Create a User ::
|
|||
@endif
|
||||
</td>
|
||||
</tr>
|
||||
<tr{!! ($start_settings['db_conn']===true) ? ' class="success"' : ' class="danger"' !!}>
|
||||
|
||||
<tr {!! ($start_settings['db_conn']===true) ? ' class="success"' : ' class="danger"' !!}>
|
||||
<td>Database</td>
|
||||
<td>
|
||||
@if ($start_settings['db_conn']===true)
|
||||
|
|
@ -57,7 +56,8 @@ Create a User ::
|
|||
@endif
|
||||
</td>
|
||||
</tr>
|
||||
<tr{!! (!$start_settings['env_exposed']) ? ' class="success"' : ' class="danger"' !!}>
|
||||
|
||||
<tr {!! (!$start_settings['env_exposed']) ? ' class="success"' : ' class="danger"' !!}>
|
||||
<td>Config File</td>
|
||||
<td>
|
||||
@if (!$start_settings['env_exposed'])
|
||||
|
|
@ -75,7 +75,7 @@ Create a User ::
|
|||
</td>
|
||||
</tr>
|
||||
|
||||
<tr{!! ($start_settings['prod']) ? ' class="success"' : ' class="warning"' !!}>
|
||||
<tr {!! ($start_settings['prod']) ? ' class="success"' : ' class="warning"' !!}>
|
||||
<td>Environment</td>
|
||||
<td>
|
||||
@if ($start_settings['prod'])
|
||||
|
|
@ -93,7 +93,7 @@ Create a User ::
|
|||
</td>
|
||||
</tr>
|
||||
|
||||
<tr{!! (!$start_settings['owner_is_admin']) ? ' class="success"' : ' class="danger"' !!}>
|
||||
<tr {!! (!$start_settings['owner_is_admin']) ? ' class="success"' : ' class="danger"' !!}>
|
||||
<td>File Owner</td>
|
||||
<td>
|
||||
@if (!$start_settings['owner_is_admin'])
|
||||
|
|
@ -111,7 +111,7 @@ Create a User ::
|
|||
</td>
|
||||
</tr>
|
||||
|
||||
<tr{!! (!$start_settings['writable']) ? ' class="danger"' : ' class="success"' !!}>
|
||||
<tr {!! (!$start_settings['writable']) ? ' class="danger"' : ' class="success"' !!}>
|
||||
<td>Permissions</td>
|
||||
<td>
|
||||
@if ($start_settings['writable'])
|
||||
|
|
@ -129,7 +129,7 @@ Create a User ::
|
|||
</td>
|
||||
</tr>
|
||||
|
||||
<tr{!! ($start_settings['debug_exposed']) ? ' class="danger"' : ' class="success"' !!}>
|
||||
<tr {!! ($start_settings['debug_exposed']) ? ' class="danger"' : ' class="success"' !!}>
|
||||
<td>Debug</td>
|
||||
<td>
|
||||
@if (!$start_settings['debug_exposed'])
|
||||
|
|
@ -147,7 +147,7 @@ Create a User ::
|
|||
</td>
|
||||
</tr>
|
||||
|
||||
<tr{!! ($start_settings['gd']) ? ' class="success"' : ' class="warning"' !!}>
|
||||
<tr {!! ($start_settings['gd']) ? ' class="success"' : ' class="warning"' !!}>
|
||||
<td>Image Library</td>
|
||||
<td>
|
||||
@if ($start_settings['gd'])
|
||||
|
|
@ -164,6 +164,7 @@ Create a User ::
|
|||
@endif
|
||||
</td>
|
||||
</tr>
|
||||
|
||||
<tr id="mailrow">
|
||||
<td>Email</td>
|
||||
<td id="mailtesticon">
|
||||
|
|
@ -173,23 +174,20 @@ Create a User ::
|
|||
<span id="mailtestresult"></span>
|
||||
</td>
|
||||
</tr>
|
||||
|
||||
</tbody>
|
||||
</table>
|
||||
</table>
|
||||
|
||||
@stop
|
||||
|
||||
|
||||
@section('button')
|
||||
@section('button')
|
||||
<form action="{{ route('setup.migrate') }}" method="GET">
|
||||
<button class="btn btn-primary">Next: Create Database Tables</button>
|
||||
</form>
|
||||
@parent
|
||||
@stop
|
||||
|
||||
|
||||
@parent
|
||||
@stop
|
||||
|
||||
@section('moar_scripts')
|
||||
<script type="text/javascript">
|
||||
<script type="text/javascript">
|
||||
$(document).ready(function () {
|
||||
|
||||
$("#mailtest").click(function(){
|
||||
|
|
@ -221,6 +219,5 @@ Create a User ::
|
|||
|
||||
});
|
||||
});
|
||||
</script>
|
||||
@stop
|
||||
</script>
|
||||
@stop
|
||||
|
|
|
|||
|
|
@ -8,12 +8,7 @@ Create a User ::
|
|||
|
||||
{{-- Page content --}}
|
||||
@section('content')
|
||||
|
||||
|
||||
|
||||
|
||||
<div class="col-lg-12" style="padding-top: 20px;">
|
||||
|
||||
<div class="col-lg-12" style="padding-top: 20px;">
|
||||
@if (trim($output)=='Nothing to migrate.')
|
||||
<div class="col-md-12">
|
||||
<div class="alert alert-warning">
|
||||
|
|
@ -33,8 +28,7 @@ Create a User ::
|
|||
|
||||
<p>Migration output: </p>
|
||||
<pre>{{ $output }}</pre>
|
||||
</div>
|
||||
|
||||
</div>
|
||||
@stop
|
||||
|
||||
@section('button')
|
||||
|
|
|
|||
|
|
@ -9,13 +9,12 @@ Create a User ::
|
|||
{{-- Page content --}}
|
||||
@section('content')
|
||||
|
||||
<p> This is the account information you'll use to access the site for the first time. All fields are required. </p>
|
||||
<p> This is the account information you'll use to access the site for the first time. All fields are required. </p>
|
||||
|
||||
<form action="{{ route('setup.user.save') }}" method="POST">
|
||||
{!! csrf_field() !!}
|
||||
<form action="{{ route('setup.user.save') }}" method="POST">
|
||||
{{ csrf_field() }}
|
||||
|
||||
<div class="col-lg-12" style="padding-top: 20px;">
|
||||
|
||||
<!-- Site Name -->
|
||||
<div class="row">
|
||||
<div class="form-group col-lg-12 {{ $errors->has('site_name') ? 'error' : '' }}">
|
||||
|
|
@ -27,7 +26,6 @@ Create a User ::
|
|||
</div>
|
||||
|
||||
<!-- email domain -->
|
||||
|
||||
<div class="row">
|
||||
<div class="form-group col-lg-6 {{ $errors->has('email_domain') ? 'error' : '' }}">
|
||||
{{ Form::label('email_domain', trans('general.email_domain')) }}
|
||||
|
|
@ -45,14 +43,12 @@ Create a User ::
|
|||
</div>
|
||||
</div>
|
||||
|
||||
|
||||
<!-- first name -->
|
||||
|
||||
<!-- Name -->
|
||||
<div class="row">
|
||||
<!-- first name -->
|
||||
<div class="form-group col-lg-6 {{ $errors->has('first_name') ? 'error' : '' }}">
|
||||
{{ Form::label('first_name', trans('general.first_name')) }}
|
||||
{{ Form::text('first_name', Input::old('first_name'), array('class' => 'form-control','placeholder' => 'Jane')) }}
|
||||
|
||||
{!! $errors->first('first_name', '<span class="alert-msg">:message</span>') !!}
|
||||
</div>
|
||||
|
||||
|
|
@ -105,13 +101,11 @@ Create a User ::
|
|||
</label>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
||||
</div> <!--/.COL-LG-12-->
|
||||
@stop
|
||||
|
||||
@section('button')
|
||||
<button class="btn btn-primary">Next: Save User</button>
|
||||
</form>
|
||||
</form>
|
||||
@parent
|
||||
@stop
|
||||
|
|
|
|||
|
|
@ -14,8 +14,6 @@
|
|||
<a href="{{ route('suppliers.create') }}" class="btn btn-primary pull-right"> {{ trans('general.create') }}</a>
|
||||
@stop
|
||||
|
||||
|
||||
|
||||
<div class="row">
|
||||
<div class="col-md-12">
|
||||
<div class="box box-default">
|
||||
|
|
|
|||
|
|
@ -15,10 +15,9 @@
|
|||
{{-- Page content --}}
|
||||
@section('content')
|
||||
|
||||
<div class="row">
|
||||
<div class="row">
|
||||
<div class="col-md-9">
|
||||
<div class="box box-default">
|
||||
|
||||
@if ($supplier->id)
|
||||
<div class="box-header with-border">
|
||||
<div class="box-heading">
|
||||
|
|
@ -28,7 +27,6 @@
|
|||
</div><!-- /.box-header -->
|
||||
@endif
|
||||
|
||||
|
||||
<div class="box-body">
|
||||
<!-- checked out suppliers table -->
|
||||
<h6>Assets</h6>
|
||||
|
|
@ -44,17 +42,17 @@
|
|||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
|
||||
@foreach ($supplier->assets as $supplierassets)
|
||||
<tr>
|
||||
|
||||
<td><a href="{{ route('hardware.show', $supplierassets->id) }}">{{ $supplierassets->asset_tag }}</a></td>
|
||||
<td><a href="{{ route('hardware.show', $supplierassets->id) }}">{{ $supplierassets->present()->name() }}</a></td>
|
||||
<td>
|
||||
{!! $supplierassets->present()->assetTagUrl() !!}
|
||||
</td>
|
||||
<td>
|
||||
{!! $supplierassets->present()->nameUrl() !!}
|
||||
</td>
|
||||
<td>
|
||||
@if ($supplierassets->assigneduser)
|
||||
<a href="{{ route('users.show', $supplierassets->assigned_to) }}">
|
||||
{{ $supplierassets->assigneduser->present()->fullName() }}
|
||||
</a>
|
||||
{!! $supplierassets->assigneduser->present()->nameUrl() !!}
|
||||
@endif
|
||||
</td>
|
||||
<td>
|
||||
|
|
@ -64,20 +62,19 @@
|
|||
<a href="{{ route('checkout/hardware', $supplierassets->id) }}" class="btn btn-success btn-sm">Checkout</a>
|
||||
@endif
|
||||
</td>
|
||||
|
||||
</tr>
|
||||
@endforeach
|
||||
</tbody>
|
||||
</table>
|
||||
</div>
|
||||
</div> <!--/box-body-->
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div> <!--/col-md-9-->
|
||||
|
||||
<!-- side address column -->
|
||||
<div class="col-md-3">
|
||||
<h4>Contact:</h4>
|
||||
<ul class="list-unstyled">
|
||||
|
||||
@if ($supplier->contact)
|
||||
<li><i class="fa fa-user"></i>{{ $supplier->contact }}</li>
|
||||
@endif
|
||||
|
|
@ -88,15 +85,20 @@
|
|||
<li><i class="fa fa-print"></i>{{ $supplier->fax }}</li>
|
||||
@endif
|
||||
|
||||
|
||||
@if ($supplier->email)
|
||||
<li><i class="fa fa-envelope-o"></i><a href="mailto:{{ $supplier->email }}">
|
||||
<li>
|
||||
<i class="fa fa-envelope-o"></i>
|
||||
<a href="mailto:{{ $supplier->email }}">
|
||||
{{ $supplier->email }}
|
||||
</a></li>
|
||||
</a>
|
||||
</li>
|
||||
@endif
|
||||
|
||||
@if ($supplier->url)
|
||||
<li><i class="fa fa-globe"></i><a href="{{ $supplier->url }}" target="_new">{{ $supplier->url }}</a></li>
|
||||
<li>
|
||||
<i class="fa fa-globe"></i>
|
||||
<a href="{{ $supplier->url }}" target="_new">{{ $supplier->url }}</a>
|
||||
</li>
|
||||
@endif
|
||||
|
||||
@if ($supplier->address)
|
||||
|
|
@ -121,12 +123,11 @@
|
|||
@if ($supplier->image)
|
||||
<li><br /><img src="{{ url('/') }}/uploads/suppliers/{{ $supplier->image }}" /></li>
|
||||
@endif
|
||||
|
||||
</ul>
|
||||
</div> <!--/col-md-3-->
|
||||
</div> <!--/row-->
|
||||
|
||||
</div>
|
||||
</div>
|
||||
<div class="row">
|
||||
<div class="row">
|
||||
<div class="col-md-9">
|
||||
<div class="box box-default">
|
||||
|
||||
|
|
@ -138,9 +139,7 @@
|
|||
</div><!-- /.box-header -->
|
||||
@endif
|
||||
|
||||
|
||||
<div class="box-body">
|
||||
|
||||
<table class="table table-hover">
|
||||
<thead>
|
||||
<tr>
|
||||
|
|
@ -151,20 +150,18 @@
|
|||
<tbody>
|
||||
@foreach ($supplier->licenses as $license)
|
||||
<tr>
|
||||
<td><a href="{{ route('licenses.show', $license->id) }}">{{ $license->name }}</a></td>
|
||||
<td><a href="{{ route('licenses.show', $license->id) }}">{{ $license->serial }}</a></td>
|
||||
</td>
|
||||
<td>{!! $license->present()->nameUrl() !!}</td>
|
||||
<td>{!! $license->present()->serialUrl() !!}</td>
|
||||
</tr>
|
||||
@endforeach
|
||||
</tbody>
|
||||
</table>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="row">
|
||||
<div class="row">
|
||||
<div class="col-md-9">
|
||||
<div class="box box-default">
|
||||
|
||||
|
|
@ -176,7 +173,6 @@
|
|||
</div><!-- /.box-header -->
|
||||
@endif
|
||||
|
||||
|
||||
<div class="box-body">
|
||||
<table class="table table-hover">
|
||||
<thead>
|
||||
|
|
@ -210,6 +206,7 @@
|
|||
@endforeach
|
||||
@endif
|
||||
</tbody>
|
||||
|
||||
<tfoot>
|
||||
<tr>
|
||||
<td></td>
|
||||
|
|
@ -222,8 +219,9 @@
|
|||
</tfoot>
|
||||
</table>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
</div>
|
||||
</div>
|
||||
</div> <!-- /.row-->
|
||||
|
||||
@stop
|
||||
|
|
|
|||
|
|
@ -9,17 +9,13 @@ Bulk Checkin & Delete
|
|||
{{-- Page content --}}
|
||||
@section('content')
|
||||
|
||||
|
||||
<div class="row">
|
||||
<div class="row">
|
||||
<div class="col-md-8 col-md-offset-2">
|
||||
<div class="box box-default">
|
||||
<div class="box-body">
|
||||
|
||||
<form class="form-horizontal" role="form" method="post" action="{{ route('users/bulksave') }}">
|
||||
<div class="box-body">
|
||||
<!-- CSRF Token -->
|
||||
<input type="hidden" name="_token" value="{{ csrf_token() }}" />
|
||||
|
||||
|
||||
{{csrf_field()}}
|
||||
<div class="col-md-12">
|
||||
<div class="callout callout-danger">
|
||||
<i class="fa fa-exclamation-circle"></i>
|
||||
|
|
@ -36,7 +32,6 @@ Bulk Checkin & Delete
|
|||
</div>
|
||||
@endif
|
||||
|
||||
|
||||
<div class="col-md-12">
|
||||
<div class="table-responsive">
|
||||
<table class="display table table-hover">
|
||||
|
|
@ -50,6 +45,42 @@ Bulk Checkin & Delete
|
|||
<th class="col-md-5">Licenses</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
@foreach ($users as $user)
|
||||
<tr {!! ($user->isSuperUser() ? ' class="danger"':'') !!}>
|
||||
<td>
|
||||
@if (Auth::id()!=$user->id)
|
||||
<input type="checkbox" name="edit_user[]" value="{{ $user->id }}" checked="checked">
|
||||
@else
|
||||
<input type="checkbox" name="edit_user[]" value="{{ $user->id }}" disabled>
|
||||
@endif
|
||||
</td>
|
||||
|
||||
<td>
|
||||
<span {{ (Auth::user()->id==$user->id ? ' style="text-decoration: line-through"' : '') }}>
|
||||
{{ $user->present()->fullName() }} ({{ $user->username }})
|
||||
</span>
|
||||
{{ (Auth::id()==$user->id ? ' (cannot delete yourself)' : '') }}
|
||||
</td>
|
||||
<td>
|
||||
@foreach ($user->groups as $group)
|
||||
<a href=" {{ route('update/group', $group->id) }}" class="label label-default">
|
||||
{{ $group->name }}
|
||||
</a>
|
||||
@endforeach
|
||||
</td>
|
||||
<td>
|
||||
{{ number_format($user->assets()->count()) }}
|
||||
</td>
|
||||
<td>
|
||||
{{ number_format($user->accessories()->count()) }}
|
||||
</td>
|
||||
<td>
|
||||
{{ number_format($user->licenses()->count()) }}
|
||||
</td>
|
||||
</tr>
|
||||
@endforeach
|
||||
</tbody>
|
||||
<tfoot>
|
||||
<tr>
|
||||
<td colspan="6" class="warning">
|
||||
|
|
@ -63,59 +94,18 @@ Bulk Checkin & Delete
|
|||
</td>
|
||||
</tr>
|
||||
</tfoot>
|
||||
<tbody>
|
||||
@foreach ($users as $user)
|
||||
<tr {!! ($user->isSuperUser() ? ' class="danger"':'') !!}>
|
||||
<td>
|
||||
@if (Auth::user()->id!=$user->id)
|
||||
<input type="checkbox" name="edit_user[]" value="{{ $user->id }}" checked="checked">
|
||||
@else
|
||||
<input type="checkbox" name="edit_user[]" value="{{ $user->id }}" disabled>
|
||||
@endif
|
||||
</td>
|
||||
|
||||
<td>
|
||||
<span{{ (Auth::user()->id==$user->id ? ' style="text-decoration: line-through"' : '') }}>{{ $user->present()->fullName() }} ({{ $user->username }})</span>
|
||||
|
||||
{{ (Auth::user()->id==$user->id ? ' (cannot delete yourself)' : '') }}
|
||||
|
||||
</td>
|
||||
<td>
|
||||
@foreach ($user->groups as $group)
|
||||
<a href=" {{ route('update/group', $group->id) }}" class="label label-default">
|
||||
{{ $group->name }}
|
||||
</a>
|
||||
@endforeach
|
||||
</td>
|
||||
|
||||
<td>
|
||||
{{ number_format($user->assets->count()) }}
|
||||
</td>
|
||||
<td>
|
||||
{{ number_format($user->accessories->count()) }}
|
||||
</td>
|
||||
<td>
|
||||
{{ number_format($user->licenses->count()) }}
|
||||
</td>
|
||||
|
||||
</tr>
|
||||
@endforeach
|
||||
</tbody>
|
||||
</table>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div> <!--/table-responsive-->
|
||||
</div><!--/col-md-12-->
|
||||
</div> <!--/box-body-->
|
||||
<div class="box-footer text-right">
|
||||
<a class="btn btn-link" href="{{ URL::previous() }}">{{ trans('button.cancel') }}</a>
|
||||
<button type="submit" class="btn btn-success"><i class="fa fa-check icon-white"></i> {{ trans('button.submit') }}</button>
|
||||
</div><!-- /.box-footer -->
|
||||
</form>
|
||||
</div>
|
||||
|
||||
|
||||
|
||||
</div>
|
||||
|
||||
|
||||
</form>
|
||||
<form class="form-horizontal" role="form" method="post" action="{{ route('users/bulksave') }}">
|
||||
</div>
|
||||
|
||||
@stop
|
||||
|
|
|
|||
|
|
@ -69,17 +69,15 @@
|
|||
</style>
|
||||
|
||||
<div class="row">
|
||||
<div class="col-md-8 col-md-offset-2">
|
||||
<div class="col-md-8 col-md-offset-2">
|
||||
<form class="form-horizontal" method="post" autocomplete="off" action="{{ ($user) ? route('users.update', ['user' => $user->id]) : route('users.store') }}" id="userForm">
|
||||
{{csrf_field()}}
|
||||
|
||||
|
||||
<form class="form-horizontal" method="post" autocomplete="off" action="{{ ($user) ? route('users.update', ['user' => $user->id]) : route('users.store') }}" id="userForm">
|
||||
<!-- CSRF Token -->
|
||||
<input type="hidden" name="_token" value="{{ csrf_token() }}">
|
||||
@if($user->id)
|
||||
@if($user->id)
|
||||
{{ method_field('PUT') }}
|
||||
@endif
|
||||
@endif
|
||||
<!-- Custom Tabs -->
|
||||
<div class="nav-tabs-custom">
|
||||
<div class="nav-tabs-custom">
|
||||
<ul class="nav nav-tabs">
|
||||
<li class="active"><a href="#tab_1" data-toggle="tab">Information</a></li>
|
||||
<li><a href="#tab_2" data-toggle="tab">Permissions</a></li>
|
||||
|
|
@ -89,11 +87,10 @@
|
|||
<div class="tab-pane active" id="tab_1">
|
||||
<div class="row">
|
||||
<div class="col-md-12">
|
||||
|
||||
<!-- First Name -->
|
||||
<div class="form-group {{ $errors->has('first_name') ? 'has-error' : '' }}">
|
||||
<label class="col-md-3 control-label" for="first_name">{{ trans('general.first_name') }}</label>
|
||||
<div class="col-md-8{{ (\App\Helpers\Helper::checkIfRequired($user, 'first_name')) ? ' required' : '' }}">
|
||||
<div class="col-md-8 {{ (\App\Helpers\Helper::checkIfRequired($user, 'first_name')) ? ' required' : '' }}">
|
||||
<input class="form-control" type="text" name="first_name" id="first_name" value="{{ Input::old('first_name', $user->first_name) }}" />
|
||||
{!! $errors->first('first_name', '<span class="alert-msg">:message</span>') !!}
|
||||
</div>
|
||||
|
|
@ -313,7 +310,6 @@
|
|||
<option value="1"{{ (Input::old('activated') == 1 ? ' selected="selected"' : '') }}>{{ trans('general.yes') }}</option>
|
||||
<option value="0">{{ trans('general.no') }}</option>
|
||||
@endif
|
||||
|
||||
</select>
|
||||
{!! $errors->first('activated', '<span class="alert-msg">:message</span>') !!}
|
||||
</div>
|
||||
|
|
@ -321,7 +317,6 @@
|
|||
</div>
|
||||
|
||||
@if ($snipeSettings->two_factor_enabled!='')
|
||||
|
||||
@if ($snipeSettings->two_factor_enabled=='1')
|
||||
<div class="form-group">
|
||||
<div class="col-md-3 control-label">
|
||||
|
|
@ -336,8 +331,6 @@
|
|||
</div>
|
||||
@endif
|
||||
|
||||
|
||||
|
||||
<!-- Reset Two Factor -->
|
||||
<div class="form-group">
|
||||
<div class="col-md-8 col-md-offset-3 two_factor_resetrow">
|
||||
|
|
@ -348,13 +341,11 @@
|
|||
</span>
|
||||
<span id="two_factor_resetstatus">
|
||||
</span>
|
||||
|
||||
</div>
|
||||
<div class="col-md-8 col-md-offset-3 two_factor_resetrow">
|
||||
<p class="help-block">{{ trans('admin/settings/general.two_factor_reset_help') }}</p>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
@endif
|
||||
|
||||
<!-- Notes -->
|
||||
|
|
@ -370,9 +361,7 @@
|
|||
<div class="form-group{{ $errors->has('groups') ? ' has-error' : '' }}">
|
||||
<label class="col-md-3 control-label" for="groups"> {{ trans('general.groups') }}</label>
|
||||
<div class="col-md-5">
|
||||
|
||||
@if ((Config::get('app.lock_passwords') || (!Auth::user()->isSuperUser())))
|
||||
|
||||
@if (count($userGroups->keys()) > 0)
|
||||
<ul>
|
||||
@foreach ($groups as $id => $group)
|
||||
|
|
@ -380,7 +369,6 @@
|
|||
@endforeach
|
||||
</ul>
|
||||
@endif
|
||||
|
||||
<span class="help-block">Only superadmins may edit group memberships.</p>
|
||||
@else
|
||||
<div class="controls">
|
||||
|
|
@ -388,11 +376,10 @@
|
|||
name="groups[]"
|
||||
id="groups[]"
|
||||
multiple="multiple"
|
||||
class="form-control">
|
||||
|
||||
class="form-control"
|
||||
>
|
||||
@foreach ($groups as $id => $group)
|
||||
<option value="{{ $id }}"
|
||||
{{ ($userGroups->keys()->contains($id) ? ' selected="selected"' : '') }}>
|
||||
<option value="{{ $id }}" {{ ($userGroups->keys()->contains($id) ? ' selected="selected"' : '') }}>
|
||||
{{ $group }}
|
||||
</option>
|
||||
@endforeach
|
||||
|
|
@ -401,14 +388,13 @@
|
|||
<span class="help-block">
|
||||
{{ trans('admin/users/table.groupnotes') }}
|
||||
</span>
|
||||
</div>
|
||||
</div> <!--/controls-->
|
||||
@endif
|
||||
</div> <!--/col-md-5-->
|
||||
</div>
|
||||
|
||||
</div>
|
||||
</div>
|
||||
<!-- Email user -->
|
||||
@if (!$user->id)
|
||||
|
||||
<div class="form-group">
|
||||
<div class="col-sm-3">
|
||||
</div>
|
||||
|
|
@ -416,14 +402,13 @@
|
|||
<div class="checkbox">
|
||||
<label for="email_user">
|
||||
{{ Form::checkbox('email_user', '1', Input::old('email_user'), array('id'=>'email_user','disabled'=>'disabled')) }}
|
||||
|
||||
Email this user their credentials? <span class="help-text" id="email_user_warn">(Cannot send email. No user email address specified.)</span>
|
||||
</label>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div> <!--/form-group-->
|
||||
@endif
|
||||
</div>
|
||||
</div> <!--/col-md-12-->
|
||||
</div>
|
||||
</div><!-- /.tab-pane -->
|
||||
|
||||
|
|
@ -433,6 +418,7 @@
|
|||
<p class="alert alert-warning">Only superadmins may grant a user superadmin access.</p>
|
||||
@endif
|
||||
</div>
|
||||
|
||||
<table class="table table-striped permissions">
|
||||
<thead>
|
||||
<tr class="permissions-row">
|
||||
|
|
@ -442,10 +428,11 @@
|
|||
<th class="col-md-1"><span class="line"></span>Inherit</th>
|
||||
</tr>
|
||||
</thead>
|
||||
|
||||
@foreach ($permissions as $area => $permissionsArray)
|
||||
@if (count($permissionsArray) == 1)
|
||||
<tbody class="permissions-group">
|
||||
<?php $localPermission = $permissionsArray[0] ?>
|
||||
<?php $localPermission = $permissionsArray[0]; ?>
|
||||
<tr class="header-row permissions-row">
|
||||
<td class="col-md-5 tooltip-base permissions-item"
|
||||
data-toggle="tooltip"
|
||||
|
|
@ -454,13 +441,13 @@
|
|||
>
|
||||
<h4>{{ $area . ': ' . $localPermission['label'] }}</h4>
|
||||
</td>
|
||||
|
||||
<td class="col-md-1 permissions-item">
|
||||
@if (($localPermission['permission'] == 'superuser') && (!Auth::user()->isSuperUser()))
|
||||
{{ Form::radio('permission['.$localPermission['permission'].']', '1',$userPermissions[$localPermission['permission'] ] == '1',['disabled'=>"disabled"]) }}
|
||||
@else
|
||||
{{ Form::radio('permission['.$localPermission['permission'].']', '1',$userPermissions[$localPermission['permission'] ] == '1',['value'=>"grant"]) }}
|
||||
@endif
|
||||
|
||||
</td>
|
||||
<td class="col-md-1 permissions-item">
|
||||
@if (($localPermission['permission'] == 'superuser') && (!Auth::user()->isSuperUser()))
|
||||
|
|
@ -468,7 +455,6 @@
|
|||
@else
|
||||
{{ Form::radio('permission['.$localPermission['permission'].']', '-1',$userPermissions[$localPermission['permission'] ] == '-1',['value'=>"deny"]) }}
|
||||
@endif
|
||||
|
||||
</td>
|
||||
<td class="col-md-1 permissions-item">
|
||||
@if (($localPermission['permission'] == 'superuser') && (!Auth::user()->isSuperUser()))
|
||||
|
|
@ -495,6 +481,7 @@
|
|||
{{ Form::radio("$area", '0',false,['value'=>"inherit"] ) }}
|
||||
</td>
|
||||
</tr>
|
||||
|
||||
@foreach ($permissionsArray as $index => $permission)
|
||||
<tr class="permissions-row">
|
||||
@if ($permission['display'])
|
||||
|
|
@ -516,7 +503,6 @@
|
|||
<td class="col-md-1 permissions-item">
|
||||
@if (($permission['permission'] == 'superuser') && (!Auth::user()->isSuperUser()))
|
||||
{{ Form::radio('permission['.$permission['permission'].']', '-1', $userPermissions[$permission['permission'] ] == '-1', ["value"=>"deny", 'disabled'=>'disabled']) }}
|
||||
|
||||
@else
|
||||
{{ Form::radio('permission['.$permission['permission'].']', '-1', $userPermissions[$permission['permission'] ] == '-1', ["value"=>"deny"]) }}
|
||||
@endif
|
||||
|
|
@ -528,7 +514,6 @@
|
|||
{{ Form::radio('permission['.$permission['permission'].']', '0', $userPermissions[$permission['permission']] =='0', ["value"=>"inherit"]) }}
|
||||
@endif
|
||||
</td>
|
||||
|
||||
@endif
|
||||
</tr>
|
||||
@endforeach
|
||||
|
|
@ -541,11 +526,12 @@
|
|||
<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><!-- nav-tabs-custom -->
|
||||
</form>
|
||||
</div>
|
||||
</div>
|
||||
</div><!-- nav-tabs-custom -->
|
||||
</form>
|
||||
</div> <!--/col-md-8-->
|
||||
</div><!--/row-->
|
||||
@stop
|
||||
|
||||
@section('moar_scripts')
|
||||
<script>
|
||||
$(document).ready(function() {
|
||||
|
|
|
|||
|
|
@ -16,9 +16,9 @@ Create a User
|
|||
|
||||
<div class="row">
|
||||
<div class="col-md-8 col-md-offset-2">
|
||||
<form class="form-horizontal" role="form" method="post" enctype="multipart/form-data" action="">
|
||||
<div class="box box-default">
|
||||
<div class="box-body">
|
||||
<form class="form-horizontal" role="form" method="post" enctype="multipart/form-data" action="">
|
||||
<!-- CSRF Token -->
|
||||
<input type="hidden" name="_token" value="{{ csrf_token() }}" />
|
||||
|
||||
|
|
@ -30,11 +30,15 @@ Create a User
|
|||
@endif
|
||||
|
||||
<p>
|
||||
Upload a CSV file with one or more users. Passwords will be auto-generated. The CSV should have the <strong>first</strong> fields as: </p>
|
||||
Upload a CSV file with one or more users. Passwords will be auto-generated. The CSV should have the <strong>first</strong> fields as:
|
||||
</p>
|
||||
|
||||
<p><strong>firstName,lastName, username, email, location_id, phone, jobtitle, employee_num, company_id</strong>. </p>
|
||||
<p>
|
||||
<strong>firstName,lastName, username, email, location_id, phone, jobtitle, employee_num, company_id</strong>.
|
||||
</p>
|
||||
|
||||
<p>Any additional fields to the right of those fields will be ignored. Email is optional, however users will not be able to recover their passwords or receive EULAs if you do not provide an email address. If you wish to include a company association, you must reference the ID number of an existing company - companies will not be created on the fly.
|
||||
<p>
|
||||
Any additional fields to the right of those fields will be ignored. Email is optional, however users will not be able to recover their passwords or receive EULAs if you do not provide an email address. If you wish to include a company association, you must reference the ID number of an existing company - companies will not be created on the fly.
|
||||
</p>
|
||||
|
||||
@if (config('app.lock_passwords'))
|
||||
|
|
@ -57,7 +61,6 @@ Create a User
|
|||
</div>
|
||||
</div>
|
||||
|
||||
|
||||
<!-- Email user -->
|
||||
<div class="form-group">
|
||||
<div class="col-sm-2 ">
|
||||
|
|
@ -75,33 +78,14 @@ Create a User
|
|||
{{ Form::checkbox('activate', '1', Input::old('activate')) }} Activate user?
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
||||
|
||||
</div>
|
||||
|
||||
</div> <!--/box-body-->
|
||||
<!-- Form Actions -->
|
||||
<div class="box-footer text-right">
|
||||
<button type="submit" class="btn btn-default">{{ trans('button.submit') }}</button>
|
||||
</div>
|
||||
</div>
|
||||
</form>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
</form>
|
||||
</div></div></div></div>
|
||||
<script>
|
||||
$(document).ready(function(){
|
||||
|
||||
$('#generate-password').pGenerator({
|
||||
'bind': 'click',
|
||||
'passwordElement': '#password',
|
||||
'displayElement': '#password-display',
|
||||
'passwordLength': 10,
|
||||
'uppercase': true,
|
||||
'lowercase': true,
|
||||
'numbers': true,
|
||||
'specialChars': false,
|
||||
|
||||
});
|
||||
});
|
||||
|
||||
</script>
|
||||
@stop
|
||||
|
|
|
|||
|
|
@ -10,7 +10,6 @@
|
|||
@endif
|
||||
{{ trans('general.users') }}
|
||||
|
||||
|
||||
@parent
|
||||
@stop
|
||||
|
||||
|
|
@ -31,7 +30,6 @@
|
|||
@can('view', \App\Models\User::class)
|
||||
<a class="btn btn-default pull-right" href="{{ route('users.export') }}" style="margin-right: 5px;">Export</a>
|
||||
@endcan
|
||||
|
||||
@stop
|
||||
|
||||
{{-- Page content --}}
|
||||
|
|
@ -39,11 +37,8 @@
|
|||
|
||||
<div class="row">
|
||||
<div class="col-md-12">
|
||||
|
||||
<div class="box box-default">
|
||||
|
||||
<div class="box-body">
|
||||
|
||||
{{ Form::open([
|
||||
'method' => 'POST',
|
||||
'route' => ['users/bulkedit'],
|
||||
|
|
@ -60,7 +55,6 @@
|
|||
@endcan
|
||||
@endif
|
||||
|
||||
|
||||
<table
|
||||
name="users"
|
||||
data-toolbar="#toolbar"
|
||||
|
|
@ -116,26 +110,14 @@
|
|||
<th data-switchable="false" data-searchable="false" data-sortable="false" data-field="actions" >{{ trans('table.actions') }}</th>
|
||||
</tr>
|
||||
</thead>
|
||||
{{-- <tfoot>
|
||||
<tr>
|
||||
<td colspan="12">
|
||||
<select name="bulk_actions" class="form-control">
|
||||
<option value="delete">Bulk Delete</option>
|
||||
</select>
|
||||
<button class="btn btn-default" id="bulkEdit" disabled>Go</button>
|
||||
</td>
|
||||
</tr>
|
||||
</tfoot> --}}
|
||||
</table>
|
||||
|
||||
{{ Form::close() }}
|
||||
</div><!-- /.box-body -->
|
||||
</div><!-- /.box -->
|
||||
|
||||
</div>
|
||||
</div>
|
||||
@stop
|
||||
|
||||
@stop
|
||||
|
||||
@section('moar_scripts')
|
||||
@include ('partials.bootstrap-table', ['exportFile' => 'users-export', 'search' => true])
|
||||
|
|
|
|||
|
|
@ -17,21 +17,15 @@ LDAP User Sync
|
|||
@section('content')
|
||||
|
||||
<div class="row">
|
||||
<div class="col-md-9">
|
||||
|
||||
|
||||
@if ($snipeSettings->ldap_enabled == 0)
|
||||
<div class="col-md-9">
|
||||
@if ($snipeSettings->ldap_enabled == 0)
|
||||
{{ trans('admin/users/message.ldap_not_configured') }}
|
||||
@else
|
||||
|
||||
|
||||
@else
|
||||
<form class="form-horizontal" role="form" method="post" action="" id="ldap-form">
|
||||
<!-- CSRF Token -->
|
||||
<input type="hidden" name="_token" value="{{ csrf_token() }}" />
|
||||
|
||||
{{csrf_field()}}
|
||||
<div class="box box-default">
|
||||
<div class="box-body">
|
||||
|
||||
<!-- location_id-->
|
||||
<div class="form-group {{ $errors->has('location_id') ? 'has-error' : '' }}">
|
||||
<label class="col-md-2 control-label" for="location_id">{{ trans('admin/users/table.location') }}
|
||||
</label>
|
||||
|
|
@ -45,9 +39,7 @@ LDAP User Sync
|
|||
<i id="sync-button-icon" class="fa fa-refresh icon-white"></i> <span id="sync-button-text">Synchronize</span>
|
||||
</button>
|
||||
</div>
|
||||
|
||||
</div>
|
||||
|
||||
</div>
|
||||
</div>
|
||||
</form>
|
||||
|
|
@ -58,17 +50,15 @@ LDAP User Sync
|
|||
</p>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="row">
|
||||
<div class="col-md-12">
|
||||
|
||||
<div class="col-md-12">
|
||||
@if (Session::get('summary'))
|
||||
|
||||
<div class="box box-default">
|
||||
<div class="box-header with-border">
|
||||
<h3 class="box-title">Synchronization Results</h3>
|
||||
</div><!-- /.box-header -->
|
||||
<div class="box-body">
|
||||
|
||||
<table class="table table-bordered">
|
||||
<tr>
|
||||
<th>Username</th><th>Employee Number</th>
|
||||
|
|
@ -92,19 +82,16 @@ LDAP User Sync
|
|||
|
||||
</td>
|
||||
</tr>
|
||||
|
||||
@endforeach
|
||||
</table>
|
||||
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
||||
@endif
|
||||
@endif
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
@stop
|
||||
|
||||
@section('moar_scripts')
|
||||
|
||||
<script type="text/javascript">
|
||||
|
|
@ -119,4 +106,3 @@ LDAP User Sync
|
|||
</script>
|
||||
|
||||
@stop
|
||||
@stop
|
||||
|
|
|
|||
|
|
@ -11,21 +11,70 @@
|
|||
|
||||
<div class="row">
|
||||
<div class="col-md-12">
|
||||
|
||||
|
||||
<div class="nav-tabs-custom">
|
||||
<ul class="nav nav-tabs">
|
||||
<li class="active"><a href="#info_tab" data-toggle="tab"><span class="hidden-lg hidden-md"><i class="fa fa-info-circle"></i></span> <span class="hidden-xs hidden-sm">Info</span></a></li>
|
||||
<li><a href="#asset_tab" data-toggle="tab"><span class="hidden-lg hidden-md"><i class="fa fa-barcode"></i></span> <span class="hidden-xs hidden-sm">{{ trans('general.assets') }}</span></a></li>
|
||||
<li><a href="#licenses_tab" data-toggle="tab"><span class="hidden-lg hidden-md"><i class="fa fa-floppy-o"></i></span> <span class="hidden-xs hidden-sm">{{ trans('general.licenses') }}</span></a></li>
|
||||
<li><a href="#accessories_tab" data-toggle="tab"><span class="hidden-lg hidden-md"><i class="fa fa-keyboard-o"></i></span> <span class="hidden-xs hidden-sm">{{ trans('general.accessories') }}</span></a></li>
|
||||
<li><a href="#consumables_tab" data-toggle="tab"><span class="hidden-lg hidden-md"><i class="fa fa-tint"></i></span> <span class="hidden-xs hidden-sm">{{ trans('general.consumables') }}</span></a></li>
|
||||
<li><a href="#files_tab" data-toggle="tab"><span class="hidden-lg hidden-md"><i class="fa fa-paperclip"></i></span> <span class="hidden-xs hidden-sm">{{ trans('general.file_uploads') }}</span></a></li>
|
||||
<li><a href="#history_tab" data-toggle="tab"><span class="hidden-lg hidden-md"><i class="fa fa-clock-o"></i></span> <span class="hidden-xs hidden-sm">{{ trans('general.history') }}</span></a></li>
|
||||
|
||||
<li class="active">
|
||||
<a href="#info_tab" data-toggle="tab">
|
||||
<span class="hidden-lg hidden-md">
|
||||
<i class="fa fa-info-circle"></i>
|
||||
</span>
|
||||
<span class="hidden-xs hidden-sm">Info</span>
|
||||
</a>
|
||||
</li>
|
||||
|
||||
<li>
|
||||
<a href="#asset_tab" data-toggle="tab">
|
||||
<span class="hidden-lg hidden-md">
|
||||
<i class="fa fa-barcode"></i>
|
||||
</span>
|
||||
<span class="hidden-xs hidden-sm">{{ trans('general.assets') }}</span>
|
||||
</a>
|
||||
</li>
|
||||
|
||||
<li>
|
||||
<a href="#licenses_tab" data-toggle="tab">
|
||||
<span class="hidden-lg hidden-md">
|
||||
<i class="fa fa-floppy-o"></i>
|
||||
</span>
|
||||
<span class="hidden-xs hidden-sm">{{ trans('general.licenses') }}</span>
|
||||
</a>
|
||||
</li>
|
||||
|
||||
<li>
|
||||
<a href="#accessories_tab" data-toggle="tab">
|
||||
<span class="hidden-lg hidden-md">
|
||||
<i class="fa fa-keyboard-o"></i>
|
||||
</span> <span class="hidden-xs hidden-sm">{{ trans('general.accessories') }}</span>
|
||||
</a>
|
||||
</li>
|
||||
|
||||
<li>
|
||||
<a href="#consumables_tab" data-toggle="tab">
|
||||
<span class="hidden-lg hidden-md">
|
||||
<i class="fa fa-tint"></i></span>
|
||||
<span class="hidden-xs hidden-sm">{{ trans('general.consumables') }}</span>
|
||||
</a>
|
||||
</li>
|
||||
|
||||
<li>
|
||||
<a href="#files_tab" data-toggle="tab">
|
||||
<span class="hidden-lg hidden-md">
|
||||
<i class="fa fa-paperclip"></i></span>
|
||||
<span class="hidden-xs hidden-sm">{{ trans('general.file_uploads') }}</span>
|
||||
</a>
|
||||
</li>
|
||||
|
||||
<li>
|
||||
<a href="#history_tab" data-toggle="tab">
|
||||
<span class="hidden-lg hidden-md">
|
||||
<i class="fa fa-clock-o"></i></span>
|
||||
<span class="hidden-xs hidden-sm">{{ trans('general.history') }}</span>
|
||||
</a>
|
||||
</li>
|
||||
|
||||
@can('update', $user)
|
||||
<li class="dropdown pull-right">
|
||||
|
||||
<a class="dropdown-toggle" data-toggle="dropdown" href="#">
|
||||
<i class="fa fa-gear"></i> {{ trans('button.actions') }}
|
||||
<span class="caret"></span>
|
||||
|
|
@ -40,6 +89,7 @@
|
|||
</li>
|
||||
@endcan
|
||||
</ul>
|
||||
|
||||
<div class="tab-content">
|
||||
<div class="tab-pane active" id="info_tab">
|
||||
<div class="row">
|
||||
|
|
@ -61,8 +111,8 @@
|
|||
<img src="{{ $user->present()->gravatar() }}" class="avatar img-circle hidden-print">
|
||||
@endif
|
||||
</div>
|
||||
<div class="col-md-8">
|
||||
|
||||
<div class="col-md-8">
|
||||
<div class="table table-responsive">
|
||||
<table class="table table-striped">
|
||||
@if (!is_null($user->company))
|
||||
|
|
@ -93,7 +143,7 @@
|
|||
@if ($user->manager)
|
||||
<tr>
|
||||
<td>Manager</td>
|
||||
<td><a href="{{ route('users.show', $user->manager->id) }}">{{ $user->manager->present()->fullName() }}</a></td>
|
||||
<td>{{$user->manager->present()->nameUrl() }}</td>
|
||||
</tr>
|
||||
@endif
|
||||
|
||||
|
|
@ -120,33 +170,30 @@
|
|||
@if ($user->created_at)
|
||||
<tr>
|
||||
<td>{{ trans('general.created_at') }}</td>
|
||||
<td>
|
||||
{{ $user->created_at->format('F j, Y h:iA') }}
|
||||
</td>
|
||||
<td>{{ $user->created_at->format('F j, Y h:iA') }}</td>
|
||||
</tr>
|
||||
@endif
|
||||
|
||||
</table>
|
||||
</div>
|
||||
</div>
|
||||
</div> <!--/col-md-8-->
|
||||
|
||||
<!-- Start button column -->
|
||||
<div class="col-md-2">
|
||||
@can('update', $user)
|
||||
<div class="col-md-12">
|
||||
|
||||
<a href="{{ route('users.edit', $user->id) }}" style="width: 100%;" class="btn btn-sm btn-default">{{ trans('admin/users/general.edit') }}</a>
|
||||
</div>
|
||||
<div class="col-md-12" style="padding-top: 5px;">
|
||||
<a href="{{ route('clone/user', $user->id) }}" style="width: 100%;" class="btn btn-sm btn-default">{{ trans('admin/users/general.clone') }}</a>
|
||||
</div>
|
||||
|
||||
|
||||
@if ((Auth::user()->id !== $user->id) && (!config('app.lock_passwords')))
|
||||
|
||||
@can('delete', $user)
|
||||
@if ($user->deleted_at=='')
|
||||
<div class="col-md-12" style="padding-top: 5px;">
|
||||
<a href="{{ route('users.destroy', $user->id) }}" style="width: 100%;" class="btn btn-sm btn-warning">{{ trans('button.delete') }}</a>
|
||||
<form action="{{route('users.destroy',$user->id)}}" method="POST">
|
||||
{{csrf_field()}}
|
||||
{{ method_field("DELETE")}}
|
||||
<button style="width: 100%;" class="btn btn-sm btn-warning">{{ trans('button.delete')}}</button>
|
||||
</form>
|
||||
</div>
|
||||
<div class="col-md-12" style="padding-top: 5px;">
|
||||
<form action="{{ route('users/bulkedit') }}" method="POST">
|
||||
|
|
@ -161,17 +208,13 @@
|
|||
<a href="{{ route('restore/user', $user->id) }}" style="width: 100%;" class="btn btn-sm btn-warning">{{ trans('button.restore') }}</a>
|
||||
</div>
|
||||
@endif
|
||||
|
||||
@endif
|
||||
@endcan
|
||||
@endcan
|
||||
</div>
|
||||
<!-- End button column -->
|
||||
|
||||
</div>
|
||||
|
||||
|
||||
|
||||
</div> <!--/.row-->
|
||||
</div><!-- /.tab-pane -->
|
||||
|
||||
<div class="tab-pane" id="asset_tab">
|
||||
<!-- checked out assets table -->
|
||||
<div class="table-responsive">
|
||||
|
|
@ -188,16 +231,16 @@
|
|||
@foreach ($user->assets as $asset)
|
||||
<tr>
|
||||
<td>
|
||||
@if ($asset->physical=='1') {{ $asset->model->name }}
|
||||
@if ($asset->physical=='1')
|
||||
{!! $asset->model->present()->nameUrl() !!}
|
||||
@endif
|
||||
</td>
|
||||
<td>
|
||||
@can('view', $asset)
|
||||
<a href="{{ route('hardware.show', $asset->id) }}">{{ $asset->asset_tag }}</a>
|
||||
{!! $asset->present()->assetTagUrl() !!}
|
||||
@endcan
|
||||
</td>
|
||||
<td><a href="{{ route('hardware.show', $asset->id) }}">{{ $asset->name }}</a></td>
|
||||
|
||||
<td>{!! $asset->present()->nameUrl() !!}</td>
|
||||
<td class="hidden-print">
|
||||
@can('checkin', $asset)
|
||||
<a href="{{ route('checkin/hardware', array('assetId'=> $asset->id, 'backto'=>'user')) }}" class="btn btn-primary btn-sm">Checkin</a>
|
||||
|
|
@ -208,7 +251,8 @@
|
|||
</tbody>
|
||||
</table>
|
||||
</div>
|
||||
</div><!-- /.tab-pane -->
|
||||
</div><!-- /asset_tab -->
|
||||
|
||||
<div class="tab-pane" id="licenses_tab">
|
||||
<div class="table-responsive">
|
||||
<table class="display table table-hover">
|
||||
|
|
@ -223,10 +267,11 @@
|
|||
@foreach ($user->licenses as $license)
|
||||
<tr>
|
||||
<td>
|
||||
<a href="{{ route('licenses.show', $license->id) }}">{{ $license->name }}</a>
|
||||
|
||||
{!! $license->present()->nameUrl() !!}
|
||||
</td>
|
||||
<td>
|
||||
{!! $license->present()->serialUrl() !!}
|
||||
</td>
|
||||
<td><a href="{{ route('licenses.show', $license->id) }}">{{ mb_strimwidth($license->serial, 0, 50, "...") }}</a></td>
|
||||
<td class="hidden-print">
|
||||
@can('update', $license)
|
||||
<a href="{{ route('licenses.checkin', array('licenseseat_id'=> $license->pivot->id, 'backto'=>'user')) }}" class="btn btn-primary btn-sm">Checkin</a>
|
||||
|
|
@ -237,7 +282,8 @@
|
|||
</tbody>
|
||||
</table>
|
||||
</div>
|
||||
</div><!-- /.tab-pane -->
|
||||
</div><!-- /licenses-tab -->
|
||||
|
||||
<div class="tab-pane" id="accessories_tab">
|
||||
<div class="table-responsive">
|
||||
<table class="display table table-hover">
|
||||
|
|
@ -250,7 +296,7 @@
|
|||
<tbody>
|
||||
@foreach ($user->accessories as $accessory)
|
||||
<tr>
|
||||
<td><a href="{{ route('accessories.show', $accessory->id) }}">{{ $accessory->name }}</a></td>
|
||||
<td>{!!$accessory->present()->nameUrl()!!}</td>
|
||||
<td class="hidden-print">
|
||||
@can('checkin', $accessory)
|
||||
<a href="{{ route('checkin/accessory', array('accessory_id'=> $accessory->pivot->id, 'backto'=>'user')) }}" class="btn btn-primary btn-sm">Checkin</a>
|
||||
|
|
@ -261,7 +307,8 @@
|
|||
</tbody>
|
||||
</table>
|
||||
</div>
|
||||
</div><!-- /.tab-pane -->
|
||||
</div><!-- /accessories-tab -->
|
||||
|
||||
<div class="tab-pane" id="consumables_tab">
|
||||
<div class="table-responsive">
|
||||
<table class="display table table-striped">
|
||||
|
|
@ -274,16 +321,16 @@
|
|||
<tbody>
|
||||
@foreach ($user->consumables as $consumable)
|
||||
<tr>
|
||||
<td><a href="{{ route('consumables.show', $consumable->id) }}">{{ $consumable->name }}</a></td>
|
||||
<td>{!! $consumable->present()->nameUrl() !!}</a></td>
|
||||
<td>{{ $consumable->created_at }}</td>
|
||||
</tr>
|
||||
@endforeach
|
||||
</tbody>
|
||||
</table>
|
||||
</div>
|
||||
</div><!-- /.tab-pane -->
|
||||
<div class="tab-pane" id="files_tab">
|
||||
</div><!-- /consumables-tab -->
|
||||
|
||||
<div class="tab-pane" id="files_tab">
|
||||
<div class="row">
|
||||
<div class="col-md-12 col-sm-12">
|
||||
<p>{{ trans('admin/hardware/general.filetype_info') }}</p>
|
||||
|
|
@ -296,15 +343,12 @@
|
|||
<span>Select File...</span>
|
||||
<!-- The file input field used as target for the file upload widget -->
|
||||
<input id="fileupload" type="file" name="file[]" data-url="{{ url('/') }}/api/users/{{ $user->id }}/upload">
|
||||
|
||||
</span>
|
||||
@endcan
|
||||
|
||||
</div>
|
||||
<div class="col-md-4">
|
||||
<input id="notes" type="text" name="notes">
|
||||
</div>
|
||||
|
||||
<div class="col-md-6" id="progress-container" style="visibility: hidden; padding-bottom: 20px;">
|
||||
<!-- The global progress bar -->
|
||||
<div class="col-md-11">
|
||||
|
|
@ -320,13 +364,10 @@
|
|||
</div>
|
||||
</div>
|
||||
|
||||
|
||||
<link rel="stylesheet" type="text/css" href="{{ asset('assets/css/lib/jquery.fileupload.css') }}">
|
||||
<link rel="stylesheet" type="text/css" href="{{ asset('assets/css/lib/jquery.fileupload-ui.css') }}">
|
||||
|
||||
|
||||
<div class="col-md-12 col-sm-12">
|
||||
|
||||
<div class="table-responsive">
|
||||
<table class="display table table-striped">
|
||||
<thead>
|
||||
|
|
@ -341,7 +382,8 @@
|
|||
@foreach ($user->uploads as $file)
|
||||
<tr>
|
||||
<td>
|
||||
@if ($file->note) {{ $file->note }}
|
||||
@if ($file->note)
|
||||
{{ $file->note }}
|
||||
@endif
|
||||
</td>
|
||||
<td>
|
||||
|
|
@ -359,16 +401,13 @@
|
|||
</td>
|
||||
</tr>
|
||||
@endforeach
|
||||
|
||||
</tbody>
|
||||
</table>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div> <!--/ROW-->
|
||||
</div><!--/FILES_TAB-->
|
||||
|
||||
|
||||
|
||||
</div><!-- /.tab-pane -->
|
||||
<div class="tab-pane" id="history_tab">
|
||||
<div class="table-responsive">
|
||||
<table class="table table-striped" id="example">
|
||||
|
|
@ -390,9 +429,8 @@
|
|||
<td>{{ $log->created_at }}</td>
|
||||
<td>{{ $log->action_type }}</td>
|
||||
<td>
|
||||
|
||||
@if (($log->item) && ($log->itemType()=="asset"))
|
||||
<a href="{{ route('hardware.show', $log->item_id) }}">{{ $log->item->asset_tag }} - {{ $log->item->present()->name() }}</a>
|
||||
{!! $log->item->present()->nameUrl() !!}
|
||||
@elseif ($log->item)
|
||||
<a href="{{ route($log->parseItemRoute().'.show', $log->item_id) }}">
|
||||
{{ $log->item->name }}
|
||||
|
|
@ -400,12 +438,11 @@
|
|||
@else
|
||||
{{ trans('general.bad_data') }}
|
||||
@endif
|
||||
|
||||
</td>
|
||||
<td>
|
||||
@if ($log->action_type != 'requested')
|
||||
@if (isset($log->user))
|
||||
<a href="{{route('users.show', $log->user_id)}}">{{ $log->user->present()->fullName() }}</a>
|
||||
{!! $log->user->present()->nameUrl() !!}
|
||||
@else
|
||||
Deleted Admin
|
||||
@endif
|
||||
|
|
@ -418,9 +455,10 @@
|
|||
</div><!-- /.tab-pane -->
|
||||
</div><!-- /.tab-content -->
|
||||
</div><!-- nav-tabs-custom -->
|
||||
</div>
|
||||
</div>
|
||||
|
||||
</div>
|
||||
</div>
|
||||
@stop
|
||||
|
||||
@section('moar_scripts')
|
||||
<script>
|
||||
|
|
@ -480,5 +518,3 @@ $(function () {
|
|||
</script>
|
||||
|
||||
@stop
|
||||
|
||||
@stop
|
||||
|
|
|
|||
Loading…
Reference in a new issue