From d98ffd94f9f36f19c8d9cdb5cd7c2ad2967de301 Mon Sep 17 00:00:00 2001
From: snipe <snipe@snipe.net>
Date: Sat, 26 Aug 2017 16:16:41 -0700
Subject: [PATCH] Localized modal titles with correct headers

---
 resources/views/modals/location.blade.php    | 2 +-
 resources/views/modals/model.blade.php       | 2 +-
 resources/views/modals/statuslabel.blade.php | 2 +-
 resources/views/modals/supplier.blade.php    | 2 +-
 resources/views/modals/user.blade.php        | 2 +-
 routes/web/hardware.php                      | 5 +++++
 6 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/resources/views/modals/location.blade.php b/resources/views/modals/location.blade.php
index 985a73672a..55f64c5559 100644
--- a/resources/views/modals/location.blade.php
+++ b/resources/views/modals/location.blade.php
@@ -2,7 +2,7 @@
     <div class="modal-content">
         <div class="modal-header">
             <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
-            <h4 class="modal-title">{{ trans('general.location') }}</h4>
+            <h4 class="modal-title">{{ trans('admin/locations/table.create')  }}</h4>
         </div>
         <div class="modal-body">
             <div class="alert alert-danger" id="modal_error_msg" style="display:none">
diff --git a/resources/views/modals/model.blade.php b/resources/views/modals/model.blade.php
index 599b4ea5db..5a348d3f3c 100644
--- a/resources/views/modals/model.blade.php
+++ b/resources/views/modals/model.blade.php
@@ -2,7 +2,7 @@
     <div class="modal-content">
         <div class="modal-header">
             <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
-            <h4 class="modal-title">{{ trans('general.model') }}</h4>
+            <h4 class="modal-title">{{ trans('admin/models/table.create') }}</h4>
         </div>
         <div class="modal-body">
             <div class="alert alert-danger" id="modal_error_msg" style="display:none">
diff --git a/resources/views/modals/statuslabel.blade.php b/resources/views/modals/statuslabel.blade.php
index 39847f157d..4d856bba8d 100644
--- a/resources/views/modals/statuslabel.blade.php
+++ b/resources/views/modals/statuslabel.blade.php
@@ -2,7 +2,7 @@
     <div class="modal-content">
         <div class="modal-header">
             <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
-            <h4 class="modal-title">{{ trans('admin/hardware/form.status') }}</h4>
+            <h4 class="modal-title">{{ trans('admin/statuslabels/table.create') }}</h4>
         </div>
         <div class="modal-body">
             <div class="alert alert-danger" id="modal_error_msg" style="display:none">
diff --git a/resources/views/modals/supplier.blade.php b/resources/views/modals/supplier.blade.php
index 89edb63397..0ab2b977cd 100644
--- a/resources/views/modals/supplier.blade.php
+++ b/resources/views/modals/supplier.blade.php
@@ -2,7 +2,7 @@
     <div class="modal-content">
         <div class="modal-header">
             <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
-            <h4 class="modal-title">{{ trans('general.supplier') }}</h4>
+            <h4 class="modal-title">{{ trans('admin/suppliers/table.create') }}</h4>
         </div>
         <div class="modal-body">
             <div class="alert alert-danger" id="modal_error_msg" style="display:none">
diff --git a/resources/views/modals/user.blade.php b/resources/views/modals/user.blade.php
index de444a320f..21f490dd9c 100644
--- a/resources/views/modals/user.blade.php
+++ b/resources/views/modals/user.blade.php
@@ -23,7 +23,7 @@
     <div class="modal-content">
         <div class="modal-header">
             <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
-            <h4 class="modal-title">{{ trans('general.user') }}</h4>
+            <h4 class="modal-title">{{ trans('admin/users/table.createuser') }}</h4>
         </div>
             <div class="modal-body">
             <div class="alert alert-danger" id="modal_error_msg" style="display:none">
diff --git a/routes/web/hardware.php b/routes/web/hardware.php
index c0775e8fe6..e9e1342824 100644
--- a/routes/web/hardware.php
+++ b/routes/web/hardware.php
@@ -17,6 +17,11 @@ Route::group(
             'parameters' => ['maintenance' => 'maintenance_id', 'asset' => 'asset_id']
         ]);
 
+        Route::get('scan', [
+            'as' => 'asset.scan',
+            'uses' => 'AssetsController@scan'
+        ]);
+
         Route::get('audit/{id}', [
             'as' => 'asset.audit.create',
             'uses' => 'AssetsController@audit'