diff --git a/resources/views/account/api.blade.php b/resources/views/account/api.blade.php index fe6ef5da17..a91eb94cba 100644 --- a/resources/views/account/api.blade.php +++ b/resources/views/account/api.blade.php @@ -23,7 +23,7 @@ @endif
-
+
When generating an API token, be sure to copy it down immediately as they will not be visible to you again.
diff --git a/resources/views/asset_maintenances/index.blade.php b/resources/views/asset_maintenances/index.blade.php index a0361533d9..2e87461647 100644 --- a/resources/views/asset_maintenances/index.blade.php +++ b/resources/views/asset_maintenances/index.blade.php @@ -53,7 +53,7 @@ function maintenanceActions(value, row) { var actions = ''; if ((row) && (row.available_actions.update === true)) { - actions += ' '; + actions += ' '; } actions += '' if ((row) && (row.available_actions.delete === true)) { diff --git a/resources/views/custom_fields/fields/edit.blade.php b/resources/views/custom_fields/fields/edit.blade.php index 30533d0a3c..9c229c4487 100644 --- a/resources/views/custom_fields/fields/edit.blade.php +++ b/resources/views/custom_fields/fields/edit.blade.php @@ -129,7 +129,7 @@
diff --git a/resources/views/custom_fields/index.blade.php b/resources/views/custom_fields/index.blade.php index 50b5a64f27..ab30d3e890 100644 --- a/resources/views/custom_fields/index.blade.php +++ b/resources/views/custom_fields/index.blade.php @@ -145,7 +145,7 @@ {{ $field->convertUnicodeDbSlug() }} @if ($field->convertUnicodeDbSlug()!=$field->db_column) -
WARNING. This field is in the custom fields table as {{ $field->db_column }} but should be {{ $field->convertUnicodeDbSlug() }}. +
WARNING. This field is in the custom fields table as {{ $field->db_column }} but should be {{ $field->convertUnicodeDbSlug() }}. @endif {{ $field->format }} @@ -159,7 +159,7 @@ @can('update', $field) - + Edit @endcan diff --git a/resources/views/errors/403.blade.php b/resources/views/errors/403.blade.php index 3501553cd2..8a867e3776 100644 --- a/resources/views/errors/403.blade.php +++ b/resources/views/errors/403.blade.php @@ -18,7 +18,7 @@
-

403 Forbidden.

+

403 Forbidden.

Sad panda. You are not authorized to do the thing. Maybe return to the dashboard, or contact your administrator.

diff --git a/resources/views/errors/404.blade.php b/resources/views/errors/404.blade.php index a93b9c7ad9..03e140bd3a 100644 --- a/resources/views/errors/404.blade.php +++ b/resources/views/errors/404.blade.php @@ -18,7 +18,7 @@
-

404 Page not found.

+

404 Page not found.

Sad panda. We could not find the page you were looking for. You should maybe return to the dashboard. diff --git a/resources/views/errors/503.blade.php b/resources/views/errors/503.blade.php index 1789630724..0d330fb8e5 100644 --- a/resources/views/errors/503.blade.php +++ b/resources/views/errors/503.blade.php @@ -27,7 +27,7 @@ System Unavailable

-

System Unavailable

+

System Unavailable

{!! json_decode(file_get_contents(storage_path('framework/down')), true)['message'] !!}

diff --git a/resources/views/hardware/bulk.blade.php b/resources/views/hardware/bulk.blade.php index f50a76ba2c..ce72111fab 100755 --- a/resources/views/hardware/bulk.blade.php +++ b/resources/views/hardware/bulk.blade.php @@ -20,7 +20,7 @@

{{ trans('admin/hardware/form.bulk_update_help') }}

- {{ trans('admin/hardware/form.bulk_update_warn', ['asset_count' => count($assets)]) }} + {{ trans('admin/hardware/form.bulk_update_warn', ['asset_count' => count($assets)]) }}
diff --git a/resources/views/hardware/edit.blade.php b/resources/views/hardware/edit.blade.php index 4d86a13f6c..a5db89555a 100755 --- a/resources/views/hardware/edit.blade.php +++ b/resources/views/hardware/edit.blade.php @@ -189,7 +189,7 @@ $("#selected_status_status").removeClass('text-danger'); $("#selected_status_status").removeClass('text-success'); $("#selected_status_status").addClass('text-warning'); - $("#selected_status_status").html(' That asset status is not deployable. This asset cannot be checked out. '); + $("#selected_status_status").html(' That asset status is not deployable. This asset cannot be checked out. '); } } }); diff --git a/resources/views/hardware/qr-view.blade.php b/resources/views/hardware/qr-view.blade.php index 7b6d3eb83b..f2880b0168 100644 --- a/resources/views/hardware/qr-view.blade.php +++ b/resources/views/hardware/qr-view.blade.php @@ -46,12 +46,12 @@
@if ($asset->model->deleted_at!='')
- + {{ trans('admin/hardware/general.model_deleted', array('model_id' => $asset->model->id)) }}
@elseif ($asset->deleted_at!='')
- + {{ trans('admin/hardware/general.deleted', array('asset_id' => $asset->id)) }}
@endif diff --git a/resources/views/layouts/default.blade.php b/resources/views/layouts/default.blade.php index db257ac22b..b6d1056754 100644 --- a/resources/views/layouts/default.blade.php +++ b/resources/views/layouts/default.blade.php @@ -741,7 +741,7 @@ @if ($debug_in_production)
- {{ strtoupper(trans('general.debug_warning')) }}: + {{ strtoupper(trans('general.debug_warning')) }}: {!! trans('general.debug_warning_text') !!}
diff --git a/resources/views/models/bulk-edit.blade.php b/resources/views/models/bulk-edit.blade.php index 9680db3a03..8fe6977690 100644 --- a/resources/views/models/bulk-edit.blade.php +++ b/resources/views/models/bulk-edit.blade.php @@ -22,7 +22,7 @@
-
You are about to edit the following:
+
You are about to edit the following:
diff --git a/resources/views/notifications.blade.php b/resources/views/notifications.blade.php index 960a83019a..d0812a6525 100755 --- a/resources/views/notifications.blade.php +++ b/resources/views/notifications.blade.php @@ -116,7 +116,7 @@
- + Warning: {{ $message }}
diff --git a/resources/views/partials/bootstrap-table.blade.php b/resources/views/partials/bootstrap-table.blade.php index 909cdc28da..aaf953c1b9 100644 --- a/resources/views/partials/bootstrap-table.blade.php +++ b/resources/views/partials/bootstrap-table.blade.php @@ -209,7 +209,7 @@ } if ((row.available_actions) && (row.available_actions.update === true)) { - actions += 'Update '; + actions += 'Update '; } if ((row.available_actions) && (row.available_actions.delete === true)) { @@ -446,7 +446,7 @@ function changeLogFormatter(value) { var result = ''; for (var index in value) { - result += index + ': ' + value[index].old + ' ' + value[index].new + '
' + result += index + ': ' + value[index].old + ' ' + value[index].new + '
' } return result; diff --git a/resources/views/reports/depreciation.blade.php b/resources/views/reports/depreciation.blade.php index 5ccf8354a8..93ee3f4a20 100644 --- a/resources/views/reports/depreciation.blade.php +++ b/resources/views/reports/depreciation.blade.php @@ -46,7 +46,7 @@ @else
- + Warning: You do not currently have any depreciations set up. Please set up at least one depreciation to view the depreciation report. diff --git a/resources/views/settings/purge-form.blade.php b/resources/views/settings/purge-form.blade.php index fda83bcbdf..56d265570d 100644 --- a/resources/views/settings/purge-form.blade.php +++ b/resources/views/settings/purge-form.blade.php @@ -18,7 +18,7 @@
-

{{ trans('admin/settings/general.purge') }}

+

{{ trans('admin/settings/general.purge') }}

{{ Form::open(['method' => 'POST', 'files' => false, 'autocomplete' => 'off', 'class' => 'form-horizontal', 'role' => 'form' ]) }} diff --git a/resources/views/setup/migrate.blade.php b/resources/views/setup/migrate.blade.php index 0f3f0f0ef5..985c6369b3 100644 --- a/resources/views/setup/migrate.blade.php +++ b/resources/views/setup/migrate.blade.php @@ -12,7 +12,7 @@ Create a User :: @if (trim($output)=='Nothing to migrate.')
- + There was nothing to migrate. Your database tables were already set up!
diff --git a/resources/views/suppliers/view.blade.php b/resources/views/suppliers/view.blade.php index 3a86da7c5d..dfc7fb320c 100755 --- a/resources/views/suppliers/view.blade.php +++ b/resources/views/suppliers/view.blade.php @@ -193,7 +193,7 @@ {{ $improvement->is_warranty ? trans('admin/asset_maintenances/message.warranty') : trans('admin/asset_maintenances/message.not_warranty') }} {{ sprintf( $snipeSettings->default_currency. '%01.2f', $improvement->cost) }} cost; ?> - + @endif diff --git a/resources/views/users/bulk-edit.blade.php b/resources/views/users/bulk-edit.blade.php index 6f401c8767..b4ebdbf981 100644 --- a/resources/views/users/bulk-edit.blade.php +++ b/resources/views/users/bulk-edit.blade.php @@ -20,7 +20,7 @@

{{ trans('admin/users/general.bulk_update_help') }}

- {{ trans('admin/users/general.bulk_update_warn', ['user_count' => count($users)]) }} + {{ trans('admin/users/general.bulk_update_warn', ['user_count' => count($users)]) }}
diff --git a/resources/views/users/view.blade.php b/resources/views/users/view.blade.php index ba1fa35a37..c9f131dca9 100755 --- a/resources/views/users/view.blade.php +++ b/resources/views/users/view.blade.php @@ -120,13 +120,17 @@
+ + @if ($user->deleted_at!='')
- + {{ trans('admin/users/message.user_deleted_warning') }} @can('update', $user) - {{ trans('admin/users/general.restore_user') }} + + {{ trans('admin/users/general.restore_user') }} + @endcan