diff --git a/public/css/blue@2x.png b/public/css/blue@2x.png new file mode 100755 index 0000000000..8fdea12f96 Binary files /dev/null and b/public/css/blue@2x.png differ diff --git a/public/js/app.js b/public/js/app.js index 9a564fcb18..7f52e74c0d 100644 Binary files a/public/js/app.js and b/public/js/app.js differ diff --git a/public/mix-manifest.json b/public/mix-manifest.json index 6ce0d93f88..48bcac62fb 100644 --- a/public/mix-manifest.json +++ b/public/mix-manifest.json @@ -1,5 +1,5 @@ { - "/js/app.js": "/js/app.js?id=818d31d3716495504611", + "/js/app.js": "/js/app.js?id=496b2158637db1de24ee", "/css/build/AdminLTE.css": "/css/build/AdminLTE.css?id=f7a5d783fef321018f4c", "/css/build/app.css": "/css/build/app.css?id=0dfc05b0fe1dcc9b6e3d", "/css/all.css": "/css/all.css?id=c6ec5749d68d87512346", diff --git a/resources/lang/en/admin/accessories/general.php b/resources/lang/en/admin/accessories/general.php index 22771aff0c..e9a2e69ff6 100644 --- a/resources/lang/en/admin/accessories/general.php +++ b/resources/lang/en/admin/accessories/general.php @@ -1,8 +1,6 @@ 'About Accessories', - 'about_accessories_text' => 'Accessories are anything you issue to users but that do not have a serial number (or you do not care about tracking them uniquely). For example, computer mice or keyboards.', 'accessory_category' => 'Accessory Category', 'accessory_name' => 'Accessory Name', 'checkout' => 'Checkout Accessory', diff --git a/resources/lang/en/admin/categories/general.php b/resources/lang/en/admin/categories/general.php index 7551fefffd..7741b7da62 100644 --- a/resources/lang/en/admin/categories/general.php +++ b/resources/lang/en/admin/categories/general.php @@ -1,8 +1,6 @@ 'About Categories', - 'about_categories' => 'Categories help you organize your items. Some example categories might be "Desktops", "Laptops", "Mobile Phones", "Tablets", and so on, but you can use categories any way that makes sense for you.', 'asset_categories' => 'Asset Categories', 'category_name' => 'Category Name', 'checkin_email' => 'Send email to user on checkin/checkout.', diff --git a/resources/lang/en/admin/companies/general.php b/resources/lang/en/admin/companies/general.php index 9a47968977..9d58ccb58e 100644 --- a/resources/lang/en/admin/companies/general.php +++ b/resources/lang/en/admin/companies/general.php @@ -1,6 +1,4 @@ 'About Companies', - 'about_companies_text' => 'Companies can be used as a simple identifier field, or can be used to limit visibility of assets, users, etc if full company support is enabled in your Admin settings.', 'select_company' => 'Select Company', ]; diff --git a/resources/lang/en/admin/components/general.php b/resources/lang/en/admin/components/general.php index 75c9d250ab..f7689a7ad1 100644 --- a/resources/lang/en/admin/components/general.php +++ b/resources/lang/en/admin/components/general.php @@ -1,8 +1,6 @@ 'About Components', - 'about_components_text' => 'Components are items that are part of an asset, for example HDD, RAM, etc.', 'component_name' => 'Component Name', 'checkin' => 'Checkin Component', 'checkout' => 'Checkout Component', diff --git a/resources/lang/en/admin/consumables/general.php b/resources/lang/en/admin/consumables/general.php index 53a69f8c03..7c6bb32968 100644 --- a/resources/lang/en/admin/consumables/general.php +++ b/resources/lang/en/admin/consumables/general.php @@ -1,8 +1,6 @@ 'About Consumables', - 'about_consumables_text' => 'Consumables are anything purchased that will be used up over time. For example, printer ink or copier paper.', 'checkout' => 'Checkout Consumable to User', 'consumable_name' => 'Consumable Name', 'create' => 'Create Consumable', diff --git a/resources/lang/en/admin/hardware/general.php b/resources/lang/en/admin/hardware/general.php index f1fcd4731e..e3afc7d2f1 100644 --- a/resources/lang/en/admin/hardware/general.php +++ b/resources/lang/en/admin/hardware/general.php @@ -1,9 +1,7 @@ 'About Assets', - 'about_assets_text' => 'Assets are items tracked by serial number or asset tag. They tend to be higher value items where identifying a specific item matters.', - 'archived' => 'Archived', + 'archived' => 'Archived', 'asset' => 'Asset', 'bulk_checkout' => 'Checkout Assets', 'checkin' => 'Checkin Asset', diff --git a/resources/lang/en/help.php b/resources/lang/en/help.php new file mode 100644 index 0000000000..4cb2354f89 --- /dev/null +++ b/resources/lang/en/help.php @@ -0,0 +1,36 @@ + "More Info", + + "audit_help" => "Checking this box will edit the asset record to reflect this new location. Leaving it unchecked will simply note the location in the audit log.

Note that is this asset is checked out, it will not change the location of the person, asset or location it is checked out to.", + + 'assets' => 'Assets are items tracked by serial number or asset tag. They tend to be higher value items where identifying a specific item matters.', + + 'categories' => 'Categories help you organize your items. Some example categories might be "Desktops", "Laptops", "Mobile Phones", "Tablets", and so on, but you can use categories any way that makes sense for you.', + + 'accessories' => 'Accessories are anything you issue to users but that do not have a serial number (or you do not care about tracking them uniquely). For example, computer mice or keyboards.', + + 'companies' => 'Companies can be used as a simple identifier field, or can be used to limit visibility of assets, users, etc if full company support is enabled in your Admin settings.', + + 'components' => 'Components are items that are part of an asset, for example HDD, RAM, etc.', + + 'consumables' => 'Consumables are anything purchased that will be used up over time. For example, printer ink or copier paper.', + + 'depreciations' => 'You can set up asset depreciations to depreciate assets based on straight-line depreciation.', + + + +); diff --git a/resources/views/accessories/edit.blade.php b/resources/views/accessories/edit.blade.php index 9148c8b139..d92d06d2fb 100755 --- a/resources/views/accessories/edit.blade.php +++ b/resources/views/accessories/edit.blade.php @@ -1,8 +1,8 @@ @extends('layouts/edit-form', [ 'createText' => trans('admin/accessories/general.create') , 'updateText' => trans('admin/accessories/general.update'), - 'helpTitle' => trans('admin/accessories/general.about_accessories_title'), - 'helpText' => trans('admin/accessories/general.about_accessories_text'), + 'helpPosition' => 'right', + 'helpText' => trans('help.accessories'), 'formAction' => ($item) ? route('accessories.update', ['accessory' => $item->id]) : route('accessories.store'), ]) diff --git a/resources/views/categories/edit.blade.php b/resources/views/categories/edit.blade.php index ca43c49bb8..c70c1f9cd9 100755 --- a/resources/views/categories/edit.blade.php +++ b/resources/views/categories/edit.blade.php @@ -1,8 +1,8 @@ @extends('layouts/edit-form', [ 'createText' => trans('admin/categories/general.create') , 'updateText' => trans('admin/categories/general.update'), - 'helpTitle' => trans('admin/categories/general.about_categories_title'), - 'helpText' => trans('admin/categories/general.about_categories'), + 'helpPosition' => 'right', + 'helpText' => trans('help.categories'), 'formAction' => ($item) ? route('categories.update', ['category' => $item->id]) : route('categories.store'), ]) diff --git a/resources/views/companies/edit.blade.php b/resources/views/companies/edit.blade.php index ee77efc4f5..2181f39a0b 100644 --- a/resources/views/companies/edit.blade.php +++ b/resources/views/companies/edit.blade.php @@ -1,8 +1,8 @@ @extends('layouts/edit-form', [ 'createText' => trans('admin/companies/table.create') , 'updateText' => trans('admin/companies/table.update'), - 'helpTitle' => trans('admin/companies/general.about_companies_title'), - 'helpText' => trans('admin/companies/general.about_companies_text'), + 'helpPosition' => 'right', + 'helpText' => trans('help.companies'), 'formAction' => ($item) ? route('companies.update', ['company' => $item->id]) : route('companies.store'), ]) diff --git a/resources/views/components/edit.blade.php b/resources/views/components/edit.blade.php index 9bfdf6a433..14f5a0a232 100644 --- a/resources/views/components/edit.blade.php +++ b/resources/views/components/edit.blade.php @@ -1,8 +1,8 @@ @extends('layouts/edit-form', [ 'createText' => trans('admin/components/general.create') , 'updateText' => trans('admin/components/general.update'), - 'helpTitle' => trans('admin/components/general.about_components_title'), - 'helpText' => trans('admin/components/general.about_components_text'), + 'helpPosition' => 'right', + 'helpText' => trans('help.components'), 'formAction' => ($item) ? route('components.update', ['component' => $item->id]) : route('components.store'), ]) diff --git a/resources/views/consumables/edit.blade.php b/resources/views/consumables/edit.blade.php index 4392c1f1b4..d9cc270b73 100644 --- a/resources/views/consumables/edit.blade.php +++ b/resources/views/consumables/edit.blade.php @@ -1,8 +1,8 @@ @extends('layouts/edit-form', [ 'createText' => trans('admin/consumables/general.create') , 'updateText' => trans('admin/consumables/general.update'), - 'helpTitle' => trans('admin/consumables/general.about_consumables_title'), - 'helpText' => trans('admin/consumables/general.about_consumables_text'), + 'helpPosition' => 'right', + 'helpText' => trans('help.consumables'), 'formAction' => ($item) ? route('consumables.update', ['accessory' => $item->id]) : route('consumables.store'), ]) {{-- Page content --}} diff --git a/resources/views/departments/edit.blade.php b/resources/views/departments/edit.blade.php index 4d3952528e..855f2397ad 100644 --- a/resources/views/departments/edit.blade.php +++ b/resources/views/departments/edit.blade.php @@ -1,8 +1,6 @@ @extends('layouts/edit-form', [ 'createText' => trans('admin/departments/table.create') , 'updateText' => trans('admin/departments/table.update'), - 'helpTitle' => trans('admin/departments/table.about_locations_title'), - 'helpText' => trans('admin/departments/table.about_locations'), 'formAction' => ($item) ? route('departments.update', ['department' => $item->id]) : route('departments.store'), ]) diff --git a/resources/views/depreciations/edit.blade.php b/resources/views/depreciations/edit.blade.php index 7c3180be36..40a9b47332 100755 --- a/resources/views/depreciations/edit.blade.php +++ b/resources/views/depreciations/edit.blade.php @@ -1,8 +1,8 @@ @extends('layouts/edit-form', [ 'createText' => trans('admin/depreciations/general.create') , 'updateText' => trans('admin/depreciations/general.update'), - 'helpTitle' => trans('admin/depreciations/general.about_asset_depreciations'), - 'helpText' => trans('admin/depreciations/general.about_depreciations'), + 'helpPosition' => 'right', + 'helpText' => trans('help.depreciations'), 'formAction' => ($item) ? route('depreciations.update', ['depreciation' => $item->id]) : route('depreciations.store'), ]) diff --git a/resources/views/hardware/audit.blade.php b/resources/views/hardware/audit.blade.php index 7b3de62d6a..b9d8a9840c 100644 --- a/resources/views/hardware/audit.blade.php +++ b/resources/views/hardware/audit.blade.php @@ -60,7 +60,7 @@ Update asset location - + @include ('partials.more-info', ['helpText' => trans('help.audit_help'), 'helpPosition' => 'right']) diff --git a/resources/views/hardware/edit.blade.php b/resources/views/hardware/edit.blade.php index d423968faa..66b699ca08 100755 --- a/resources/views/hardware/edit.blade.php +++ b/resources/views/hardware/edit.blade.php @@ -2,8 +2,9 @@ @extends('layouts/edit-form', [ 'createText' => trans('admin/hardware/form.create'), 'updateText' => trans('admin/hardware/form.update'), - 'helpTitle' => trans('admin/hardware/general.about_assets_title'), - 'helpText' => trans('admin/hardware/general.about_assets_text'), + 'topSubmit' => true, + 'helpText' => trans('help.assets'), + 'helpPosition' => 'right', 'formAction' => ($item) ? route('hardware.update', ['hardware' => $item->id]) : route('hardware.store'), ]) diff --git a/resources/views/layouts/edit-form.blade.php b/resources/views/layouts/edit-form.blade.php index 75b1427e1d..81ef0bfdfa 100644 --- a/resources/views/layouts/edit-form.blade.php +++ b/resources/views/layouts/edit-form.blade.php @@ -23,46 +23,46 @@
+
+
-

+ +

+ @if (isset($helpText)) + @include ('partials.more-info', + [ + 'helpText' => $helpText, + 'helpPosition' => (isset($helpPosition)) ? $helpPosition : 'left' + ]) + @endif + @if ($item->id) {{ $item->display_name }} @endif

- @if (isset($helpText)) -
- -
+ @if (isset($topSubmit)) +
+ @include('partials.forms.edit.submit-button') +
@endif
- @if ($item->id) {{ method_field('PUT') }} @endif - {{ csrf_field() }} @yield('inputFields') @include('partials.forms.edit.submit') - +
- - @if ((isset($helpText)) && (isset($helpTitle))) -
- × -

- {{ $helpTitle}} -

-

{{ $helpText }}

-
- @endif +
@stop diff --git a/resources/views/licenses/edit.blade.php b/resources/views/licenses/edit.blade.php index 18b55acbd1..2fe78436d6 100755 --- a/resources/views/licenses/edit.blade.php +++ b/resources/views/licenses/edit.blade.php @@ -1,8 +1,7 @@ @extends('layouts/edit-form', [ - 'createText' => trans('admin/licenses/form.create') , + 'createText' => trans('admin/licenses/form.create'), 'updateText' => trans('admin/licenses/form.update'), - 'helpTitle' => trans('admin/licenses/general.about_licenses_title'), - 'helpText' => trans('admin/licenses/general.about_licenses_text'), + 'topSubmit' => true, 'formAction' => ($item) ? route('licenses.update', ['license' => $item->id]) : route('license.store'), ]) diff --git a/resources/views/locations/edit.blade.php b/resources/views/locations/edit.blade.php index 3990c5b8fb..6f03f10d97 100755 --- a/resources/views/locations/edit.blade.php +++ b/resources/views/locations/edit.blade.php @@ -1,7 +1,8 @@ @extends('layouts/edit-form', [ 'createText' => trans('admin/locations/table.create') , 'updateText' => trans('admin/locations/table.update'), - 'helpTitle' => trans('admin/locations/table.about_locations_title'), + 'topSubmit' => true, + 'helpPosition' => 'right', 'helpText' => trans('admin/locations/table.about_locations'), 'formAction' => ($item) ? route('locations.update', ['location' => $item->id]) : route('locations.store'), ]) diff --git a/resources/views/models/edit.blade.php b/resources/views/models/edit.blade.php index ccf8728c8b..cf67b847a2 100755 --- a/resources/views/models/edit.blade.php +++ b/resources/views/models/edit.blade.php @@ -1,7 +1,8 @@ @extends('layouts/edit-form', [ 'createText' => trans('admin/models/table.create') , 'updateText' => trans('admin/models/table.update'), - 'helpTitle' => trans('admin/models/general.about_models_title'), + 'topSubmit' => true, + 'helpPosition' => 'right', 'helpText' => trans('admin/models/general.about_models_text'), 'formAction' => ($item) ? route('models.update', ['model' => $item->id]) : route('models.store'), ]) diff --git a/resources/views/partials/forms/edit/submit-button.blade.php b/resources/views/partials/forms/edit/submit-button.blade.php new file mode 100644 index 0000000000..c51487c24b --- /dev/null +++ b/resources/views/partials/forms/edit/submit-button.blade.php @@ -0,0 +1,5 @@ + + diff --git a/resources/views/partials/forms/edit/submit.blade.php b/resources/views/partials/forms/edit/submit.blade.php index 20b934df13..e9c0f3e964 100644 --- a/resources/views/partials/forms/edit/submit.blade.php +++ b/resources/views/partials/forms/edit/submit.blade.php @@ -1,4 +1,7 @@ -
- {{ trans('button.cancel') }} - + + +
+ {{ trans('button.cancel') }} + @include('partials.forms.edit.submit-button')
+ diff --git a/resources/views/partials/more-info.blade.php b/resources/views/partials/more-info.blade.php new file mode 100644 index 0000000000..eca7f427f6 --- /dev/null +++ b/resources/views/partials/more-info.blade.php @@ -0,0 +1 @@ +