Merge branch 'develop' into features/create_multiple_asset_tags_on_asset_create

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",

resources/lang/en/admin/accessories/general.php

@@ -1,8 +1,6 @@
 <?php
 
 return array(
-    'about_accessories_title' 			=> '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',

resources/lang/en/admin/categories/general.php

@@ -1,8 +1,6 @@
 <?php
 
 return array(
-    'about_categories_title' 			=> 'About Categories',
-    'about_categories'  				=> 'Categories help you organize your items. Some example categories might be &quot;Desktops&quot;, &quot;Laptops&quot;, &quot;Mobile Phones&quot;, &quot;Tablets&quot;, 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.',

resources/lang/en/admin/companies/general.php

@@ -1,6 +1,4 @@
 <?php
 return [
-    'about_companies_title'            => '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',
 ];

resources/lang/en/admin/components/general.php

@@ -1,8 +1,6 @@
 <?php
 
 return array(
-    'about_components_title' 			=> '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',

resources/lang/en/admin/consumables/general.php

@@ -1,8 +1,6 @@
 <?php
 
 return array(
-    'about_consumables_title' 			=> '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',

resources/lang/en/admin/hardware/general.php

@@ -1,8 +1,6 @@
 <?php
 
 return array(
-    'about_assets_title'           => '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',
     'asset'  					=> 'Asset',
     'bulk_checkout'             => 'Checkout Assets',

resources/lang/en/help.php

@@ -0,0 +1,36 @@
+<?php
+
+return array(
+
+    /*
+    |--------------------------------------------------------------------------
+    | Password Reminder Language Lines
+    |--------------------------------------------------------------------------
+    |
+    | The following language lines are the default lines which match reasons
+    | that are given by the password broker for a password update attempt
+    | has failed, such as for an invalid token or invalid new password.
+    |
+    */
+
+    "more_info_title" => "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.<br><br>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 &quot;Desktops&quot;, &quot;Laptops&quot;, &quot;Mobile Phones&quot;, &quot;Tablets&quot;, 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.',
+
+
+
+);

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'),
+    'helpPosition'  => 'right',
-    'helpText' => trans('admin/accessories/general.about_accessories_text'),
+    'helpText' => trans('help.accessories'),
     'formAction' => ($item) ? route('accessories.update', ['accessory' => $item->id]) : route('accessories.store'),
 ])
 

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'),
+    'helpPosition'  => 'right',
-    'helpText' => trans('admin/categories/general.about_categories'),
+    'helpText' => trans('help.categories'),
     'formAction' => ($item) ? route('categories.update', ['category' => $item->id]) : route('categories.store'),
 ])
 

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'),
+    'helpPosition'  => 'right',
-    'helpText' => trans('admin/companies/general.about_companies_text'),
+    'helpText' => trans('help.companies'),
     'formAction' => ($item) ? route('companies.update', ['company' => $item->id]) : route('companies.store'),
 ])
 

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'),
+    'helpPosition'  => 'right',
-    'helpText' => trans('admin/components/general.about_components_text'),
+    'helpText' => trans('help.components'),
     'formAction' => ($item) ? route('components.update', ['component' => $item->id]) : route('components.store'),
 
 ])

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'),
+    'helpPosition'  => 'right',
-    'helpText' => trans('admin/consumables/general.about_consumables_text'),
+    'helpText' => trans('help.consumables'),
     'formAction' => ($item) ? route('consumables.update', ['accessory' => $item->id]) : route('consumables.store'),
 ])
 {{-- Page content --}}

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'),
 ])
 

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'),
+    'helpPosition'  => 'right',
-    'helpText' => trans('admin/depreciations/general.about_depreciations'),
+    'helpText' => trans('help.depreciations'),
     'formAction' => ($item) ? route('depreciations.update', ['depreciation' => $item->id]) : route('depreciations.store'),
 ])
 

resources/views/hardware/audit.blade.php

@@ -60,7 +60,7 @@
                                     <input type="checkbox" value="1" name="update_location" class="minimal" {{ Input::old('update_location') == '1' ? ' checked="checked"' : '' }}> Update asset location
                                 </label>
 
-                                <a href="#" class="text-dark-gray" tabindex="0" role="button" data-toggle="popover" data-trigger="focus" title="<i class='fa fa-life-ring'></i> More Info" data-html="true" data-content="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.<br><br>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."><i class="fa fa-life-ring"></i></a>
+                                @include ('partials.more-info', ['helpText' => trans('help.audit_help'), 'helpPosition' => 'right'])
 
 
 

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'),
+    'topSubmit' => true,
-    'helpText' => trans('admin/hardware/general.about_assets_text'),
+    'helpText' => trans('help.assets'),
+    'helpPosition' => 'right',
     'formAction' => ($item) ? route('hardware.update', ['hardware' => $item->id]) : route('hardware.store'),
 ])
 

resources/views/layouts/edit-form.blade.php

@@ -23,46 +23,46 @@
 
 <div class="row">
     <div class="col-md-8 col-md-offset-2">
+        <form id="create-form" class="form-horizontal" method="post" action="{{ (isset($formAction)) ? $formAction : \Request::url()  }}" autocomplete="off" role="form" enctype="multipart/form-data">
+
         <div class="box box-default">
             <div class="box-header with-border">
-            <h3 class="box-title">
+
+            <h3 class="box-title" style="min-height: 20px;">
+            @if (isset($helpText))
+                @include ('partials.more-info',
+                    [
+                        'helpText' => $helpText,
+                        'helpPosition' => (isset($helpPosition)) ? $helpPosition : 'left'
+                    ])
+            @endif
+
             @if ($item->id)
             {{ $item->display_name }}
             @endif
             </h3>
-                @if (isset($helpText))
+                @if (isset($topSubmit))
                 <div class="box-tools pull-right">
-                        <button class="slideout-menu-toggle btn btn-box-tool btn-box-tool-lg" data-toggle="tooltip" title="Help"><i class="fa fa-question"></i></button>
+                 @include('partials.forms.edit.submit-button')
                 </div>
                 @endif
             </div><!-- /.box-header -->
 
             <div class="box-body">
-                <form id="create-form" class="form-horizontal" method="post" action="{{ (isset($formAction)) ? $formAction : \Request::url()  }}" autocomplete="off" role="form" enctype="multipart/form-data">
 
                     @if ($item->id)
                     {{ method_field('PUT') }}
                     @endif
 
-
                     <!-- CSRF Token -->
                     {{ csrf_field() }}
                     @yield('inputFields')
                     @include('partials.forms.edit.submit')
-                </form>
-            </div>
-        </div>
-    </div>
 
-    @if ((isset($helpText)) && (isset($helpTitle)))
-    <div class="slideout-menu">
-        <a href="#" class="slideout-menu-toggle pull-right">×</a>
-        <h3>
-            {{ $helpTitle}}
-        </h3>
-        <p>{{ $helpText }} </p>
             </div>
-    @endif
+        </div>
+    </div>
+    </form>
 </div>
 
 @stop

resources/views/licenses/edit.blade.php

@@ -1,8 +1,7 @@
 @extends('layouts/edit-form', [
     'createText' => trans('admin/licenses/form.create'),
     'updateText' => trans('admin/licenses/form.update'),
-    'helpTitle' => trans('admin/licenses/general.about_licenses_title'),
+    'topSubmit' => true,
-    'helpText' => trans('admin/licenses/general.about_licenses_text'),
     'formAction' => ($item) ? route('licenses.update', ['license' => $item->id]) : route('license.store'),
 ])
 

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'),
 ])

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'),
 ])

resources/views/partials/forms/edit/submit-button.blade.php

@@ -0,0 +1,5 @@
+<button type="submit" class="btn btn-success pull-right">
+    <i class="fa fa-check icon-white"></i>
+    {{ trans('general.save') }}
+</button>
+

resources/views/partials/forms/edit/submit.blade.php

@@ -1,4 +1,7 @@
-<div class="box-footer text-right">
+<!-- partials/forms/edit/submit.blade.php -->
-    <a class="btn btn-link text-left" href="{{ URL::previous() }}">{{ trans('button.cancel') }}</a>
+
-    <button type="submit" class="btn btn-success"><i class="fa fa-check icon-white"></i> {{ trans('general.save') }}</button>
+<div class="box-footer">
+        <a class="btn btn-link pull-left" href="{{ URL::previous() }}">{{ trans('button.cancel') }}</a>
+        @include('partials.forms.edit.submit-button')
 </div>
+<!-- / partials/forms/edit/submit.blade.php -->

resources/views/partials/more-info.blade.php

@@ -0,0 +1 @@
+<a href="#" class="text-dark-gray" tabindex="0" role="button" data-toggle="popover" data-trigger="focus" title="<i class='fa fa-life-ring'></i> {{ trans('help.more_info_title') }}"  data-placement="{{ (isset($helpPosition)) ? $helpPosition : 'right'  }}" data-html="true" data-content="{{ (isset($helpText)) ? $helpText : 'Info Missing'  }}"><i class="fa fa-life-ring"></i></a>