ouyang/snipe-it
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

cleanup, reorder, restore Asset view and edit

Browse Source 
reordered fields on Asset Add/Edit form to flow more logically.
reordered fields on Asset View to flow more logically. Restored serial
number to Asset View. Added Asset specific notes field to Asset View
(they are in the log as part of the initial asset creation, but need to
be more prominent, especially if the device has a lot of history.
adjusted wording in EN lang template for clarity.
This commit is contained in:
diwanicki
2014-11-02 08:48:42 -05:00
parent af63d34412
commit ced8610833
4 changed files with 36 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/lang/en/admin/hardware/form.php
View File

@@ -12,7 +12,7 @@ return array(
'default_location' => 'Default Location',
'eol_date' => 'EOL Date',
'eol_rate' => 'EOL Rate',
'expires' => 'Expires',
'expires' => 'Warranty Ends',
'fully_depreciated' => 'Fully Depreciated',
'help_checkout' => 'If you wish to assign this asset immediately, you should select "Ready to Deploy" from the status list above, or unexpected things may happen. ',
'manufacturer' => 'Manufacturer',

2
app/lang/en/admin/hardware/table.php
View File

@@ -3,7 +3,7 @@
return array(
'asset_tag' => 'Asset Tag',
'asset_model' => 'Model',
'asset_model' => 'Model',
'book_value' => 'Value',
'change' => 'In/Out',
'checkout_date' => 'Checkout Date',

32
app/views/backend/hardware/edit.blade.php
View File

@@ -51,14 +51,6 @@
</div>
</div>
<!-- Asset Title -->
<div class="form-group {{ $errors->has('name') ? ' has-error' : '' }}">
<label for="name" class="col-md-2 control-label">@lang('admin/hardware/form.name')</label>
<div class="col-md-7">
<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="icon-remove-sign"></i> :message</span>') }}
</div>
</div>
<!-- Serial -->
<div class="form-group {{ $errors->has('serial') ? ' has-error' : '' }}">
<label for="serial" class="col-md-2 control-label">@lang('admin/hardware/form.serial') <i class='icon-asterisk'></i></label>
@@ -68,13 +60,13 @@
</div>
</div>
<!-- Order Number -->
<div class="form-group {{ $errors->has('order_number') ? ' has-error' : '' }}">
<label for="order_number" class="col-md-2 control-label">@lang('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', $asset->order_number) }}}" />
{{ $errors->first('order_number', '<span class="alert-msg"><i class="icon-remove-sign"></i> :message</span>') }}
</div>
<!-- Asset Name -->
<div class="form-group {{ $errors->has('name') ? ' has-error' : '' }}">
<label for="name" class="col-md-2 control-label">@lang('admin/hardware/form.name')</label>
<div class="col-md-7">
<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="icon-remove-sign"></i> :message</span>') }}
</div>
</div>
<!-- Model -->
@@ -107,6 +99,14 @@
</div>
</div>
<!-- Order Number -->
<div class="form-group {{ $errors->has('order_number') ? ' has-error' : '' }}">
<label for="order_number" class="col-md-2 control-label">@lang('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', $asset->order_number) }}}" />
{{ $errors->first('order_number', '<span class="alert-msg"><i class="icon-remove-sign"></i> :message</span>') }}
</div>
</div>
<!-- Purchase Cost -->
<div class="form-group {{ $errors->has('purchase_cost') ? ' has-error' : '' }}">
@@ -120,7 +120,7 @@
</div>
</div>
<!-- Warrantee -->
<!-- Warranty -->
<div class="form-group {{ $errors->has('warranty_months') ? ' has-error' : '' }}">
<label for="warranty_months" class="col-md-2 control-label">@lang('admin/hardware/form.warranty')</label>
<div class="col-md-2">

29
app/views/backend/hardware/view.blade.php
View File

@@ -17,6 +17,10 @@
@if ($asset->name)
({{{ $asset->name }}})
@endif
<br>
@if ($asset->serial)
[{{{ $asset->serial }}}]
@endif
</h3>
<div class="btn-group pull-right">
@@ -76,6 +80,13 @@
{{{ $asset->order_number }}} </div>
@endif
@if ($asset->supplier_id)
<div class="col-md-6"><strong>@lang('admin/hardware/form.supplier'): </strong>
<a href="{{ route('view/supplier', $asset->supplier_id) }}">
{{{ $asset->supplier->name }}}
</a> </div>
@endif
@if ($asset->warranty_months)
<div class="col-md-6"><strong>@lang('admin/hardware/form.warranty'):</strong>
{{{ $asset->warranty_months }}}
@@ -91,8 +102,6 @@
({{{ $asset->depreciation->months }}}
@lang('admin/hardware/form.months')
)</div>
<div class="col-md-6"><strong>@lang('admin/hardware/form.depreciates_on'): </strong>
{{{ $asset->depreciated_date() }}} </div>
<div class="col-md-6"><strong>@lang('admin/hardware/form.fully_depreciated'): </strong>
{{{ $asset->months_until_depreciated()->m }}}
@lang('admin/hardware/form.months')
@@ -100,6 +109,7 @@
, {{{ $asset->months_until_depreciated()->y }}}
@lang('admin/hardware/form.years')
@endif
({{{ $asset->depreciated_date() }}})
</div>
@endif
@@ -122,17 +132,14 @@
</div>
@endif
@if ($asset->supplier_id)
<div class="col-md-6"><strong>@lang('admin/hardware/form.supplier'): </strong>
<a href="{{ route('view/supplier', $asset->supplier_id) }}">
{{{ $asset->supplier->name }}}
</a> </div>
@endif
</div>
<!-- Asset notes -->
@if ($asset->notes)
<div class="col-md-6"><strong>@lang('admin/hardware/form.notes'):</strong>
{{{ $asset->notes }}} </div>
@endif
<!-- Licenses assets table -->
<h6>Software Assigned to {{{ $asset->name }}}</h6>