@@ -50,8 +50,7 @@
-
-
+
@@ -60,8 +59,7 @@
Header Field
Import Field
Sample Value
-
-
+
diff --git a/resources/lang/en/general.php b/resources/lang/en/general.php
index e756ef79fc..f11af2b97c 100644
--- a/resources/lang/en/general.php
+++ b/resources/lang/en/general.php
@@ -95,12 +95,6 @@
'lastname_firstinitial' => 'Last Name First Initial (smith_j@example.com)',
'firstinitial.lastname' => 'First Initial Last Name (j.smith@example.com)',
'firstnamelastinitial' => 'First Name Last Initial (janes@example.com)',
- 'first' => 'First',
- 'firstnamelastname' => 'First Name Last Name (janesmith@example.com)',
- 'lastname_firstinitial' => 'Last Name First Initial (smith_j@example.com)',
- 'firstinitial.lastname' => 'First Initial Last Name (j.smith@example.com)',
- 'firstnamelastinitial' => 'First Name Last Initial (janes@example.com)',
- 'first' => 'First',
'first_name' => 'First Name',
'first_name_format' => 'First Name (jane@example.com)',
'files' => 'Files',
@@ -119,6 +113,8 @@
'image_upload' => 'Upload Image',
'image_filetypes_help' => 'Accepted filetypes are jpg, png, gif, and svg. Max upload size allowed is :size.',
'import' => 'Import',
+ 'importing' => 'Importing',
+ 'importing_help' => 'You can import assets, accessories, licenses, components, consumables, and users via CSV file.
The CSV should be comma-delimited and formatted with headers that match the ones in the sample CSVs in the documentation.', 'import-history' => 'Import History', 'asset_maintenance' => 'Asset Maintenance', 'asset_maintenance_report' => 'Asset Maintenance Report', diff --git a/resources/views/custom_fields/fieldsets/view.blade.php b/resources/views/custom_fields/fieldsets/view.blade.php index a8e3c940f2..d0a42f6c74 100644 --- a/resources/views/custom_fields/fieldsets/view.blade.php +++ b/resources/views/custom_fields/fieldsets/view.blade.php @@ -126,7 +126,7 @@ @stop -@section('moar_scripts') +@push('js') @can('update', $custom_fieldset) @endcan -@stop +@endpush diff --git a/resources/views/hardware/view.blade.php b/resources/views/hardware/view.blade.php index 121286459b..e5e5be6a85 100755 --- a/resources/views/hardware/view.blade.php +++ b/resources/views/hardware/view.blade.php @@ -731,14 +731,14 @@ @if ($asset->image) @elseif (($asset->model) && ($asset->model->image!='')) @endif diff --git a/resources/views/importer/import.blade.php b/resources/views/importer/import.blade.php index 58eb265e3a..281b2ef87d 100644 --- a/resources/views/importer/import.blade.php +++ b/resources/views/importer/import.blade.php @@ -36,11 +36,11 @@@{{ alert.message }}
The CSV should be comma-delimited and formatted with headers that match the ones in the sample CSVs in the documentation.', 'import-history' => 'Import History', 'asset_maintenance' => 'Asset Maintenance', 'asset_maintenance_report' => 'Asset Maintenance Report', diff --git a/resources/views/custom_fields/fieldsets/view.blade.php b/resources/views/custom_fields/fieldsets/view.blade.php index a8e3c940f2..d0a42f6c74 100644 --- a/resources/views/custom_fields/fieldsets/view.blade.php +++ b/resources/views/custom_fields/fieldsets/view.blade.php @@ -126,7 +126,7 @@ @stop -@section('moar_scripts') +@push('js') @can('update', $custom_fieldset) @endcan -@stop +@endpush diff --git a/resources/views/hardware/view.blade.php b/resources/views/hardware/view.blade.php index 121286459b..e5e5be6a85 100755 --- a/resources/views/hardware/view.blade.php +++ b/resources/views/hardware/view.blade.php @@ -731,14 +731,14 @@ @if ($asset->image) @elseif (($asset->model) && ($asset->model->image!='')) @endif diff --git a/resources/views/importer/import.blade.php b/resources/views/importer/import.blade.php index 58eb265e3a..281b2ef87d 100644 --- a/resources/views/importer/import.blade.php +++ b/resources/views/importer/import.blade.php @@ -36,11 +36,11 @@
 }}/uploads/assets/{{{ $asset->image }}})
+  }}/uploads/models/{{ $asset->model->image }})
+
+
diff --git a/resources/views/reports/unaccepted_assets.blade.php b/resources/views/reports/unaccepted_assets.blade.php
index c87596a7af..45b6f163a3 100644
--- a/resources/views/reports/unaccepted_assets.blade.php
+++ b/resources/views/reports/unaccepted_assets.blade.php
@@ -48,7 +48,7 @@
@foreach ($assetsForReport as $assetItem)
@if ($assetItem)
- {{ ($assetItem->company) ? $assetItem->company->nam : '' }}
+ {{ ($assetItem->company) ? $assetItem->company->name : '' }}
{{ $assetItem->model->category->name }}
{{ $assetItem->model->name }}
{!! $assetItem->present()->nameUrl() !!}
diff --git a/resources/views/settings/saml.blade.php b/resources/views/settings/saml.blade.php
index 2f0a0d1e7c..f4a53f6cbe 100644
--- a/resources/views/settings/saml.blade.php
+++ b/resources/views/settings/saml.blade.php
@@ -101,7 +101,7 @@
+ accept="text/xml,application/xml" style="display:none; max-width: 90%">
{{ trans('admin/users/general.two_factor_enrolled') }}
-
+
+
@if (!config('app.lock_passwords'))
@@ -98,6 +98,11 @@
+
+
{{ trans('general.importing') }}
+{!! trans('general.importing_help') !!}
+{{ trans('admin/settings/general.saml_idp_metadata_help') }}
diff --git a/resources/views/users/view.blade.php b/resources/views/users/view.blade.php index a2846c51f9..852d3a3d80 100755 --- a/resources/views/users/view.blade.php +++ b/resources/views/users/view.blade.php @@ -285,12 +285,12 @@
-
+
{!! ($user->two_factor_active_and_enrolled()) ? ' '.trans('general.yes') : ' '.trans('general.no') !!}
@if ((Auth::user()->isSuperUser()) && ($snipeSettings->two_factor_enabled!='0') && ($snipeSettings->two_factor_enabled!=''))
-
+
{{ trans('admin/settings/general.two_factor_reset') }}
@@ -679,7 +679,7 @@ $(function () {
dataType: 'json',
success: function (data) {
- $("#two_factor_reset_toggle").html('').html('{{ trans('general.no') }}');
+ $("#two_factor_reset_toggle").html('').html(' {{ trans('general.no') }}');
$("#two_factor_reseticon").html('');
$("#two_factor_resetstatus").html('' + data.message);
diff --git a/webpack.mix.js b/webpack.mix.js
index f456c20e2b..20d9e746ec 100644
--- a/webpack.mix.js
+++ b/webpack.mix.js
@@ -17,7 +17,7 @@ mix
'./node_modules/bootstrap/dist/css/bootstrap.css',
'./node_modules/font-awesome/css/font-awesome.css',
'./public/css/build/AdminLTE.css',
- './node_modules/jquery-ui-dist/jquery-ui.css',
+ './node_modules/jquery-ui-bundle/jquery-ui.css',
'./node_modules/admin-lte/plugins/iCheck/minimal/blue.css',
'./node_modules/icheck/skins/minimal/minimal.css',
'./node_modules/bootstrap-datepicker/dist/css/bootstrap-datepicker.standalone.css',
@@ -111,6 +111,7 @@ mix
[
'./node_modules/admin-lte/dist/js/adminlte.min.js',
'./node_modules/tether/dist/js/tether.js',
+ './node_modules/jquery-ui-bundle/jquery-ui.js',
'./node_modules/jquery-slimscroll/jquery.slimscroll.js',
'./node_modules/jquery.iframe-transport/jquery.iframe-transport.js',
'./node_modules/blueimp-file-upload/js/jquery.fileupload.js',