@php
$select1DValues = [
- 'default' => trans('admin/settings/general.default').' [ '.$setting->alt_barcode.' ]',
- 'none' => trans('admin/settings/general.none'),
'C128' => 'C128',
'C39' => 'C39',
'EAN5' => 'EAN5',
'EAN13' => 'EAN13',
'UPCA' => 'UPCA',
- 'UPCE' => 'UPCE'
+ 'UPCE' => 'UPCE',
+ 'none' => trans('admin/settings/general.none'),
];
@endphp
{{ Form::select('label2_1d_type', $select1DValues, old('label2_1d_type', $setting->label2_1d_type), [ 'class'=>'select2 col-md-4', 'aria-label'=>'label2_1d_type' ]) }}
@@ -179,11 +178,10 @@
@php
$select2DValues = [
- 'default' => trans('admin/settings/general.default').' [ '.$setting->barcode_type.' ]',
- 'none' => trans('admin/settings/general.none'),
'QRCODE' => 'QRCODE',
'DATAMATRIX' => 'DATAMATRIX',
'PDF417' => 'PDF417',
+ 'none' => trans('admin/settings/general.none'),
];
@endphp
{{ Form::select('label2_2d_type', $select2DValues, old('label2_2d_type', $setting->label2_2d_type), [ 'class'=>'select2 col-md-4', 'aria-label'=>'label2_2d_type' ]) }}
diff --git a/resources/views/settings/logins.blade.php b/resources/views/settings/logins.blade.php
index aedef4f84..959392b63 100644
--- a/resources/views/settings/logins.blade.php
+++ b/resources/views/settings/logins.blade.php
@@ -2,7 +2,7 @@
{{-- Page title --}}
@section('title')
- Attempted Logins
+ {{ trans('admin/settings/general.login') }}
@parent
@stop
diff --git a/resources/views/users/index.blade.php b/resources/views/users/index.blade.php
index 91b9a2a31..28cbc30f7 100755
--- a/resources/views/users/index.blade.php
+++ b/resources/views/users/index.blade.php
@@ -18,7 +18,7 @@
@if ($snipeSettings->ldap_enabled == 1)
{{trans('general.ldap_sync')}}
@endif
-
{{ trans('general.create') }}
+
shortcuts_enabled == 1 ? "n" : ''}} class="btn btn-primary pull-right" style="margin-right: 5px;"> {{ trans('general.create') }}
@endcan
@if (request('status')=='deleted')
diff --git a/resources/views/users/print.blade.php b/resources/views/users/print.blade.php
index a9f977a3a..26ed2e812 100644
--- a/resources/views/users/print.blade.php
+++ b/resources/views/users/print.blade.php
@@ -373,7 +373,7 @@
-
+
EULA |
@@ -395,8 +395,8 @@
|
|
- Name |
- Signature |
+ {{ trans('general.name') }} |
+ {{ trans('general.signature') }} |
{{ trans('general.date') }} |
@@ -407,8 +407,8 @@
|
- Name |
- Signature |
+ {{ trans('general.name') }} |
+ {{ trans('general.signature') }} |
{{ trans('general.date') }} |
|
@@ -419,6 +419,10 @@
+
+
+
+