DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2024-09-19 23:37:38 -07:00
Code Issues Actions 6 Packages Projects Releases Wiki Activity

Fixed missing </h3 tags

Browse source
This commit is contained in:
snipe 2020-03-31 23:36:56 -07:00
parent b188285bc9
commit c6c75cc11f
71 changed files with 125 additions and 107 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

BIN
public/css/skins/skin-contrast.css
View file

Binary file not shown.

BIN
public/css/skins/skin-contrast.css.map
View file

Binary file not shown.

BIN
public/js/app.js
View file

Binary file not shown.

BIN
public/js/bootstrap/js/bootstrap.js vendored
View file

Binary file not shown.

BIN
public/js/bootstrap/js/bootstrap.min.js vendored
View file

Binary file not shown.

BIN
public/js/build/all.js
View file

Binary file not shown.

BIN
public/js/build/vue.js
View file

Binary file not shown.

BIN
public/js/build/vue.js.map
View file

Binary file not shown.

BIN
public/js/dist/all.js vendored
View file

Binary file not shown.

BIN
public/js/plugins/bootstrap-wysihtml5/bootstrap3-wysihtml5.all.js vendored
View file

Binary file not shown.

BIN
public/js/plugins/bootstrap-wysihtml5/bootstrap3-wysihtml5.all.min.js vendored
View file

Binary file not shown.

BIN
public/js/plugins/timepicker/bootstrap-timepicker.js vendored
View file

Binary file not shown.

BIN
public/js/plugins/timepicker/bootstrap-timepicker.min.js vendored
View file

Binary file not shown.

BIN
public/js/vue.js
View file

Binary file not shown.

6
public/mix-manifest.json
View file

@ -5,7 +5,7 @@
"/css/overrides.css": "/css/overrides.css?id=f4993c1ca8a18864253d",
"/css/skins/skin-blue.css": "/css/skins/skin-blue.css?id=d194a7417322aa53a7eb",
"/css/skins/skin-red.css": "/css/skins/skin-red.css?id=3161759c00be8a16387e",
"/css/skins/skin-contrast.css": "/css/skins/skin-contrast.css?id=732ee1ee283c8275b0c3",
"/css/skins/skin-contrast.css": "/css/skins/skin-contrast.css?id=ed59034198f214b6665a",
"/css/skins/skin-green.css": "/css/skins/skin-green.css?id=191049461e7b9606e5ca",
"/css/skins/skin-green-dark.css": "/css/skins/skin-green-dark.css?id=cb34691dbbb72cae7f5f",
"/css/skins/skin-black.css": "/css/skins/skin-black.css?id=1dfec89b8640b69dc0fc",
@ -18,13 +18,13 @@
"/css/skins/skin-blue-dark.css": "/css/skins/skin-blue-dark.css?id=d25c77d9c6f4cfe2efd4",
"/css/skins/skin-orange-dark.css": "/css/skins/skin-orange-dark.css?id=abc219c1fed59cecb860",
"/css/skins/skin-orange.css": "/css/skins/skin-orange.css?id=d5d91824310f39239fc2",
"/js/build/vue.js.map": "/js/build/vue.js.map?id=a5d4a263b47aa1a076c8",
"/js/build/vue.js.map": "/js/build/vue.js.map?id=db4b4df23c3b7551a5d0",
"/css/AdminLTE.css.map": "/css/AdminLTE.css.map?id=5a2d6f3c59191ce716e2",
"/css/app.css.map": "/css/app.css.map?id=96b5c985e860716e6a16",
"/css/overrides.css.map": "/css/overrides.css.map?id=750ac6db3f6c3533777a",
"/css/skins/skin-blue.css.map": "/css/skins/skin-blue.css.map?id=b7040f682702a4bf7458",
"/css/skins/skin-red.css.map": "/css/skins/skin-red.css.map?id=d9e30ec9a781e3d1175e",
"/css/skins/skin-contrast.css.map": "/css/skins/skin-contrast.css.map?id=5dbf3db4b4665efd1246",
"/css/skins/skin-contrast.css.map": "/css/skins/skin-contrast.css.map?id=2d5c1121cfaf24ca2caa",
"/css/skins/skin-green.css.map": "/css/skins/skin-green.css.map?id=4b6523370cb6abc02826",
"/css/skins/skin-green-dark.css.map": "/css/skins/skin-green-dark.css.map?id=988cf7da13d22c56bd8c",
"/css/skins/skin-black.css.map": "/css/skins/skin-black.css.map?id=ad0bf20283280a01b34f",

2
resources/assets/js/bootstrap-js.js vendored
View file

@ -1788,7 +1788,7 @@ if (typeof jQuery === 'undefined') {
placement: 'right',
trigger: 'click',
content: '',
template: '<div class="popover" role="tooltip"><div class="arrow"></div><h2 class="popover-title"></h3><div class="popover-content"></div></div>'
template: '<div class="popover" role="tooltip"><div class="arrow"></div><h2 class="popover-title"></h2><div class="popover-content"></div></div>'
})

2
resources/assets/js/bootstrap.min.js vendored
View file

File diff suppressed because one or more lines are too long

4
resources/assets/js/plugins/bootstrap-wysihtml5/bootstrap3-wysihtml5.all.js vendored
View file

@ -14417,7 +14417,7 @@ function program7(depth0,data) {
if(stack1 || stack1 === 0) { buffer += stack1; }
buffer += "\">\n <div class=\"modal-content\">\n <div class=\"modal-header\">\n <a class=\"close\" data-dismiss=\"modal\">&times;</a>\n <h2>"
+ escapeExpression(((stack1 = ((stack1 = ((stack1 = (depth0 && depth0.locale)),stack1 == null || stack1 === false ? stack1 : stack1.image)),stack1 == null || stack1 === false ? stack1 : stack1.insert)),typeof stack1 === functionType ? stack1.apply(depth0) : stack1))
+ "</h3>\n </div>\n <div class=\"modal-body\">\n <div class=\"form-group\">\n <input value=\"http://\" class=\"bootstrap-wysihtml5-insert-image-url form-control\" data-wysihtml5-dialog-field=\"src\">\n </div> \n </div>\n <div class=\"modal-footer\">\n <a class=\"btn btn-default\" data-dismiss=\"modal\" data-wysihtml5-dialog-action=\"cancel\" href=\"#\">"
+ "</h2>\n </div>\n <div class=\"modal-body\">\n <div class=\"form-group\">\n <input value=\"http://\" class=\"bootstrap-wysihtml5-insert-image-url form-control\" data-wysihtml5-dialog-field=\"src\">\n </div> \n </div>\n <div class=\"modal-footer\">\n <a class=\"btn btn-default\" data-dismiss=\"modal\" data-wysihtml5-dialog-action=\"cancel\" href=\"#\">"
+ escapeExpression(((stack1 = ((stack1 = ((stack1 = (depth0 && depth0.locale)),stack1 == null || stack1 === false ? stack1 : stack1.image)),stack1 == null || stack1 === false ? stack1 : stack1.cancel)),typeof stack1 === functionType ? stack1.apply(depth0) : stack1))
+ "</a>\n <a class=\"btn btn-primary\" data-dismiss=\"modal\" data-wysihtml5-dialog-action=\"save\" href=\"#\">"
+ escapeExpression(((stack1 = ((stack1 = ((stack1 = (depth0 && depth0.locale)),stack1 == null || stack1 === false ? stack1 : stack1.image)),stack1 == null || stack1 === false ? stack1 : stack1.insert)),typeof stack1 === functionType ? stack1.apply(depth0) : stack1))
@ -14469,7 +14469,7 @@ function program7(depth0,data) {
if(stack1 || stack1 === 0) { buffer += stack1; }
buffer += "\">\n <div class=\"modal-content\">\n <div class=\"modal-header\">\n <a class=\"close\" data-dismiss=\"modal\">&times;</a>\n <h2>"
+ escapeExpression(((stack1 = ((stack1 = ((stack1 = (depth0 && depth0.locale)),stack1 == null || stack1 === false ? stack1 : stack1.link)),stack1 == null || stack1 === false ? stack1 : stack1.insert)),typeof stack1 === functionType ? stack1.apply(depth0) : stack1))
+ "</h3>\n </div>\n <div class=\"modal-body\">\n <div class=\"form-group\">\n <input value=\"http://\" class=\"bootstrap-wysihtml5-insert-link-url form-control\" data-wysihtml5-dialog-field=\"href\">\n </div> \n <div class=\"checkbox\">\n <label> \n <input type=\"checkbox\" class=\"bootstrap-wysihtml5-insert-link-target\" checked>"
+ "</h2>\n </div>\n <div class=\"modal-body\">\n <div class=\"form-group\">\n <input value=\"http://\" class=\"bootstrap-wysihtml5-insert-link-url form-control\" data-wysihtml5-dialog-field=\"href\">\n </div> \n <div class=\"checkbox\">\n <label> \n <input type=\"checkbox\" class=\"bootstrap-wysihtml5-insert-link-target\" checked>"
+ escapeExpression(((stack1 = ((stack1 = ((stack1 = (depth0 && depth0.locale)),stack1 == null || stack1 === false ? stack1 : stack1.link)),stack1 == null || stack1 === false ? stack1 : stack1.target)),typeof stack1 === functionType ? stack1.apply(depth0) : stack1))
+ "\n </label>\n </div>\n </div>\n <div class=\"modal-footer\">\n <a class=\"btn btn-default\" data-dismiss=\"modal\" data-wysihtml5-dialog-action=\"cancel\" href=\"#\">"
+ escapeExpression(((stack1 = ((stack1 = ((stack1 = (depth0 && depth0.locale)),stack1 == null || stack1 === false ? stack1 : stack1.link)),stack1 == null || stack1 === false ? stack1 : stack1.cancel)),typeof stack1 === functionType ? stack1.apply(depth0) : stack1))

2
resources/assets/js/plugins/bootstrap-wysihtml5/bootstrap3-wysihtml5.all.min.js vendored
View file

File diff suppressed because one or more lines are too long

2
resources/assets/js/plugins/timepicker/bootstrap-timepicker.js vendored
View file

@ -328,7 +328,7 @@
template = '<div class="bootstrap-timepicker-widget modal hide fade in" data-backdrop="'+ (this.modalBackdrop ? 'true' : 'false') +'">'+
'<div class="modal-header">'+
'<a href="#" class="close" data-dismiss="modal">×</a>'+
'<h2>Pick a Time</h3>'+
'<h2>Pick a Time</h2>'+
'</div>'+
'<div class="modal-content">'+
templateContent +

2
resources/assets/js/plugins/timepicker/bootstrap-timepicker.min.js vendored
View file

File diff suppressed because one or more lines are too long

4
resources/assets/less/skins/skin-contrast.less
View file

@ -140,4 +140,8 @@ a.btn {
.pagination>.active>a {
background-color: @navy;
color: #FFF!important;
}
btn-success {
background-color: darken(@green, 30%);
}

4
resources/macros/macros.php
View file

@ -72,7 +72,7 @@ Form::macro('locales', function ($name = "locale", $selected = null, $class = nu
if($id) {
$idclause=" id='$id'";
}
$select = '<select name="'.$name.'" class="'.$class.'" style="min-width:350px"'.$idclause.'>';
$select = '<select name="'.$name.'" class="'.$class.'" style="min-width:350px"'.$idclause.' aria-label="'.$name.'">';
foreach ($locales as $abbr => $locale) {
$select .= '<option value="'.$abbr.'"'.($selected == $abbr ? ' selected="selected"' : '').'>'.$locale.'</option> ';
@ -346,7 +346,7 @@ Form::macro('countries', function ($name = "country", $selected = null, $class =
if($id) {
$idclause=" id='$id'";
}
$select = '<select name="'.$name.'" class="'.$class.'" style="min-width:350px"'.$idclause.'>';
$select = '<select name="'.$name.'" class="'.$class.'" style="min-width:350px"'.$idclause.' aria-label="'.$name.'">';
foreach ($countries as $abbr => $country) {
$select .= '<option value="'.strtoupper($abbr).'"'.(strtoupper($selected)== strtoupper($abbr) ? ' selected="selected"' : '').'>'.$country.'</option> ';

2
resources/views/accessories/checkin.blade.php
View file

@ -26,7 +26,7 @@
<div class="box box-default">
@if ($accessory->id)
<div class="box-header with-border">
<h2 class="box-title">{{ $accessory->name }}</h3>
<h2 class="box-title">{{ $accessory->name }}</h2>
</div><!-- /.box-header -->
@endif

2
resources/views/accessories/checkout.blade.php
View file

@ -24,7 +24,7 @@
<div class="box box-default">
@if ($accessory->id)
<div class="box-header with-border">
<h2 class="box-title">{{ $accessory->name }}</h3>
<h2 class="box-title">{{ $accessory->name }}</h2>
</div><!-- /.box-header -->
@endif

2
resources/views/account/accept-asset.blade.php
View file

@ -64,7 +64,7 @@
@if ($snipeSettings->require_accept_signature=='1')
<div class="col-md-12 col-sm-12 text-center" style="padding-top: 20px">
<h2>Sign below to indicate that you agree to the terms of service:</h3>
<h2>Sign below to indicate that you agree to the terms of service:</h2>
<div id="signature-pad" class="m-signature-pad">
<div class="m-signature-pad--body col-md-12 col-sm-12 col-lg-12 col-xs-12">

10
resources/views/account/view-assets.blade.php
View file

@ -16,7 +16,7 @@ View Assets for {{ $user->present()->fullName() }}
@if ($user->id)
<div class="box-header with-border">
<div class="box-heading">
<h2 class="box-title"> {{ trans('admin/users/general.assets_user', array('name' => $user->first_name)) }}</h3>
<h2 class="box-title"> {{ trans('admin/users/general.assets_user', array('name' => $user->first_name)) }}</h2>
</div>
</div><!-- /.box-header -->
@endif
@ -89,7 +89,7 @@ View Assets for {{ $user->present()->fullName() }}
@if ($user->id)
<div class="box-header with-border">
<div class="box-heading">
<h2 class="box-title"> {{ trans('admin/users/general.software_user', array('name' => $user->first_name)) }}</h3>
<h2 class="box-title"> {{ trans('admin/users/general.software_user', array('name' => $user->first_name)) }}</h2>
</div>
</div><!-- /.box-header -->
@endif
@ -147,7 +147,7 @@ View Assets for {{ $user->present()->fullName() }}
@if ($user->id)
<div class="box-header with-border">
<div class="box-heading">
<h2 class="box-title"> {{ trans('general.consumables') }} </h3>
<h2 class="box-title"> {{ trans('general.consumables') }} </h2>
</div>
</div><!-- /.box-header -->
@endif
@ -199,7 +199,7 @@ View Assets for {{ $user->present()->fullName() }}
@if ($user->id)
<div class="box-header with-border">
<div class="box-heading">
<h2 class="box-title"> {{ trans('general.accessories') }}</h3>
<h2 class="box-title"> {{ trans('general.accessories') }}</h2>
</div>
</div><!-- /.box-header -->
@endif
@ -250,7 +250,7 @@ View Assets for {{ $user->present()->fullName() }}
@if ($user->id)
<div class="box-header with-border">
<div class="box-heading">
<h2 class="box-title"> History</h3>
<h2 class="box-title"> History</h2>
</div>
</div><!-- /.box-header -->
@endif

2
resources/views/asset_maintenances/edit.blade.php
View file

@ -37,7 +37,7 @@
@if ($item)
{{ $item->name }}
@endif
</h3>
</h2>
</div><!-- /.box-header -->
<div class="box-body">

2
resources/views/asset_maintenances/view.blade.php
View file

@ -16,7 +16,7 @@ use Carbon\Carbon;
<h2 class="title">
{{ trans('admin/asset_maintenances/general.view') }}
{{ " - " . $assetMaintenance->title }}
</h3>
</h2>
<div class="btn-group pull-right">
<div class="dropdown">

2
resources/views/auth/passwords/email.blade.php
View file

@ -19,7 +19,7 @@
<div class="box login-box" style="width: 100%">
<div class="box-header">
<h2 class="box-title"> {{ trans('auth/general.send_password_link') }}</h3>
<h2 class="box-title"> {{ trans('auth/general.send_password_link') }}</h2>
</div>

2
resources/views/auth/passwords/reset.blade.php
View file

@ -17,7 +17,7 @@
<div class="box login-box" style="width: 100%">
<div class="box-header">
<h2 class="box-title"> {{ trans('auth/general.reset_password') }}</h3>
<h2 class="box-title"> {{ trans('auth/general.reset_password') }}</h2>
</div>

2
resources/views/auth/two_factor.blade.php
View file

@ -13,7 +13,7 @@
<div class="box login-box">
<div class="box-header">
<h2 class="box-title"> {{ trans('admin/settings/general.two_factor') }}</h3>
<h2 class="box-title"> {{ trans('admin/settings/general.two_factor') }}</h2>
</div>

2
resources/views/auth/two_factor_enroll.blade.php
View file

@ -13,7 +13,7 @@
<div class="box login-box">
<div class="box-header">
<h2 class="box-title"> {{ trans('admin/settings/general.two_factor_enrollment') }}</h3>
<h2 class="box-title"> {{ trans('admin/settings/general.two_factor_enrollment') }}</h2>
</div>

2
resources/views/components/checkin.blade.php
View file

@ -22,7 +22,7 @@
<div class="box box-default">
<div class="box-header with-border">
<h2 class="box-title"> {{ $component->name }}</h3>
<h2 class="box-title"> {{ $component->name }}</h2>
</div>
<div class="box-body">

2
resources/views/components/checkout.blade.php
View file

@ -19,7 +19,7 @@
@if ($component->id)
<div class="box-header with-border">
<div class="box-heading">
<h2 class="box-title">{{ $component->name }} ({{ $component->numRemaining() }} {{ trans('admin/components/general.remaining') }})</h3>
<h2 class="box-title">{{ $component->name }} ({{ $component->numRemaining() }} {{ trans('admin/components/general.remaining') }})</h2>
</div>
</div><!-- /.box-header -->
@endif

2
resources/views/consumables/checkout.blade.php
View file

@ -21,7 +21,7 @@
@if ($consumable->id)
<div class="box-header with-border">
<div class="box-heading">
<h2 class="box-title">{{ $consumable->name }} </h3>
<h2 class="box-title">{{ $consumable->name }} </h2>
</div>
</div><!-- /.box-header -->
@endif

2
resources/views/consumables/view.blade.php
View file

@ -22,7 +22,7 @@
@if ($consumable->id)
<div class="box-header with-border">
<div class="box-heading">
<h2 class="box-title"> {{ $consumable->name }}</h3>
<h2 class="box-title"> {{ $consumable->name }}</h2>
</div>
</div><!-- /.box-header -->
@endif

2
resources/views/custom_fields/fieldsets/view.blade.php
View file

@ -16,7 +16,7 @@
<div class="col-md-12">
<div class="box box-default">
<div class="box-header with-border">
<h2 class="box-title">{{ $custom_fieldset->name }} {{ trans('admin/custom_fields/general.fieldset') }}</h3>
<h2 class="box-title">{{ $custom_fieldset->name }} {{ trans('admin/custom_fields/general.fieldset') }}</h2>
<div class="box-tools pull-right">
</div>
</div><!-- /.box-header -->

4
resources/views/custom_fields/index.blade.php
View file

@ -14,7 +14,7 @@
<div class="box box-default">
<div class="box-header with-border">
<h2 class="box-title">{{ trans('admin/custom_fields/general.fieldsets') }}</h3>
<h2 class="box-title">{{ trans('admin/custom_fields/general.fieldsets') }}</h2>
<div class="box-tools pull-right">
@can('create', \App\Models\CustomFieldset::class)
<a href="{{ route('fieldsets.create') }}" class="btn btn-sm btn-primary" data-toggle="tooltip" title="Create a new fieldset">{{ trans('admin/custom_fields/general.create_fieldset') }}</a>
@ -96,7 +96,7 @@
<div class="col-md-12">
<div class="box box-default">
<div class="box-header with-border">
<h2 class="box-title">{{ trans('admin/custom_fields/general.custom_fields') }}</h3>
<h2 class="box-title">{{ trans('admin/custom_fields/general.custom_fields') }}</h2>
<div class="box-tools pull-right">
@can('create', \App\Models\CustomField::class)
<a href="{{ route('fields.create') }}" class="btn btn-sm btn-primary" data-toggle="tooltip" title="Create a new custom field">{{ trans('admin/custom_fields/general.create_field') }}</a>

16
resources/views/dashboard.blade.php
View file

@ -33,7 +33,7 @@
<!-- small box -->
<div class="small-box bg-teal">
<div class="inner">
<h2>{{ number_format($counts['asset']) }}</h3>
<h2>{{ number_format($counts['asset']) }}</h2>
<p>{{ trans('general.total_assets') }}</p>
</div>
<div class="icon" aria-hidden="true">
@ -49,7 +49,7 @@
<!-- small box -->
<div class="small-box bg-maroon">
<div class="inner">
<h2>{{ number_format($counts['license']) }}</h3>
<h2>{{ number_format($counts['license']) }}</h2>
<p>{{ trans('general.total_licenses') }}</p>
</div>
<div class="icon" aria-hidden="true">
@ -66,7 +66,7 @@
<!-- small box -->
<div class="small-box bg-orange">
<div class="inner">
<h2> {{ number_format($counts['accessory']) }}</h3>
<h2> {{ number_format($counts['accessory']) }}</h2>
<p>{{ trans('general.total_accessories') }}</p>
</div>
<div class="icon" aria-hidden="true">
@ -82,7 +82,7 @@
<!-- small box -->
<div class="small-box bg-purple">
<div class="inner">
<h2> {{ number_format($counts['consumable']) }}</h3>
<h2> {{ number_format($counts['consumable']) }}</h2>
<p>{{ trans('general.total_consumables') }}</p>
</div>
<div class="icon" aria-hidden="true">
@ -101,7 +101,7 @@
<div class="col-md-12">
<div class="box">
<div class="box-header with-border">
<h2 class="box-title">This is your dashboard. There are many like it, but this one is yours.</h3>
<h2 class="box-title">This is your dashboard. There are many like it, but this one is yours.</h2>
</div>
<!-- /.box-header -->
<div class="box-body">
@ -153,7 +153,7 @@
<div class="col-md-12">
<div class="box">
<div class="box-header with-border">
<h2 class="box-title">{{ trans('general.recent_activity') }}</h3>
<h2 class="box-title">{{ trans('general.recent_activity') }}</h2>
<div class="box-tools pull-right">
<button type="button" class="btn btn-box-tool" data-widget="collapse" aria-hidden="true">
<i class="fa fa-minus" aria-hidden="true"></i>
@ -204,7 +204,7 @@
<div class="col-md-6">
<div class="box box-default">
<div class="box-header with-border">
<h2 class="box-title">{{ trans('general.assets') }} by Status</h3>
<h2 class="box-title">{{ trans('general.assets') }} by Status</h2>
<div class="box-tools pull-right">
<button type="button" class="btn btn-box-tool" data-widget="collapse" aria-hidden="true">
<i class="fa fa-minus" aria-hidden="true"></i>
@ -229,7 +229,7 @@
<!-- Categories -->
<div class="box box-default">
<div class="box-header with-border">
<h2 class="box-title">Asset {{ trans('general.categories') }}</h3>
<h2 class="box-title">Asset {{ trans('general.categories') }}</h2>
<div class="box-tools pull-right">
<button type="button" class="btn btn-box-tool" data-widget="collapse">
<i class="fa fa-minus" aria-hidden="true"></i>

2
resources/views/errors/403.blade.php
View file

@ -18,7 +18,7 @@
<div style="padding-top: 200px">
<img src="{{ url('/') }}/img/sad-panda.png" style="width: 200px; height: 200px;" class="pull-left">
<div class="error-content">
<h2><i class="fa fa-warning text-yellow"></i> 403 Forbidden.</h3>
<h2><i class="fa fa-warning text-yellow"></i> 403 Forbidden.</h2>
<p>
Sad panda. You are not authorized to do the thing. Maybe <a href="{{ url('/') }}">return to the dashboard</a>, or contact your administrator.
</p>

2
resources/views/errors/404.blade.php
View file

@ -18,7 +18,7 @@
<div style="padding-top: 200px">
<img src="{{ url('/') }}/img/sad-panda.png" style="width: 200px; height: 200px;" class="pull-left">
<div class="error-content">
<h2><i class="fa fa-warning text-yellow"></i> 404 Page not found.</h3>
<h2><i class="fa fa-warning text-yellow"></i> 404 Page not found.</h2>
<p>
Sad panda. We could not find the page you were looking for.
You should maybe <a href="{{ url('/') }}">return to the dashboard</a>.

2
resources/views/errors/503.blade.php
View file

@ -27,7 +27,7 @@ System Unavailable
</div>
<div class="col-md-10">
<div class="callout callout-danger">
<h2><i class="icon fa fa-warning"></i> System Unavailable</h3>
<h2><i class="icon fa fa-warning"></i> System Unavailable</h2>
<p>{!! json_decode(file_get_contents(storage_path('framework/down')), true)['message'] !!}</p>
</div>
</div>

2
resources/views/hardware/audit.blade.php
View file

@ -28,7 +28,7 @@
'class' => 'form-horizontal' ]) }}
<div class="box-header with-border">
<h2 class="box-title"> {{ trans('admin/hardware/form.tag') }} {{ $asset->asset_tag }}</h3>
<h2 class="box-title"> {{ trans('admin/hardware/form.tag') }} {{ $asset->asset_tag }}</h2>
</div>
<div class="box-body">
{{csrf_field()}}

4
resources/views/hardware/bulk-checkout.blade.php
View file

@ -21,7 +21,7 @@
<div class="col-md-7">
<div class="box box-default">
<div class="box-header with-border">
<h2 class="box-title"> {{ trans('admin/hardware/form.tag') }} </h3>
<h2 class="box-title"> {{ trans('admin/hardware/form.tag') }} </h2>
</div>
<div class="box-body">
<form class="form-horizontal" method="post" action="" autocomplete="off">
@ -90,7 +90,7 @@
<div class="col-md-5" id="current_assets_box" style="display:none;">
<div class="box box-primary">
<div class="box-header with-border">
<h2 class="box-title">{{ trans('admin/users/general.current_assets') }}</h3>
<h2 class="box-title">{{ trans('admin/users/general.current_assets') }}</h2>
</div>
<div class="box-body">
<div id="current_assets_content">

2
resources/views/hardware/bulk-delete.blade.php
View file

@ -21,7 +21,7 @@
{{csrf_field()}}
<div class="box box-default">
<div class="box-header with-border">
<h2 class="box-title" style="color: red">{{ trans('admin/hardware/form.bulk_delete_warn', ['asset_count' => count($assets)]) }}</h3>
<h2 class="box-title" style="color: red">{{ trans('admin/hardware/form.bulk_delete_warn', ['asset_count' => count($assets)]) }}</h2>
</div>
<div class="box-body">

2
resources/views/hardware/checkin.blade.php
View file

@ -21,7 +21,7 @@
<div class="col-md-9">
<div class="box box-default">
<div class="box-header with-border">
<h2 class="box-title">{{ trans('admin/hardware/form.tag') }} {{ $asset->asset_tag }}</h3>
<h2 class="box-title">{{ trans('admin/hardware/form.tag') }} {{ $asset->asset_tag }}</h2>
</div><!-- /.box-header -->
<div class="box-body">

4
resources/views/hardware/checkout.blade.php
View file

@ -22,7 +22,7 @@
<div class="box box-default">
<form class="form-horizontal" method="post" action="" autocomplete="off">
<div class="box-header with-border">
<h2 class="box-title"> {{ trans('admin/hardware/form.tag') }} {{ $asset->asset_tag }}</h3>
<h2 class="box-title"> {{ trans('admin/hardware/form.tag') }} {{ $asset->asset_tag }}</h2>
</div>
<div class="box-body">
{{csrf_field()}}
@ -134,7 +134,7 @@
<div class="col-md-5" id="current_assets_box" style="display:none;">
<div class="box box-primary">
<div class="box-header with-border">
<h2 class="box-title">{{ trans('admin/users/general.current_assets') }}</h3>
<h2 class="box-title">{{ trans('admin/users/general.current_assets') }}</h2>
</div>
<div class="box-body">
<div id="current_assets_content">

4
resources/views/hardware/history.blade.php
View file

@ -148,7 +148,7 @@
<div class="col-md-12">
<div class="box box-default">
<div class="box-header with-border">
<h2 class="box-title"> {{ count($status['error']) }} Error Messages </h3>
<h2 class="box-title"> {{ count($status['error']) }} Error Messages </h2>
</div>
<div class="box-body">
<div style="height : 400px; overflow : auto;">
@ -175,7 +175,7 @@
<div class="col-md-12">
<div class="box box-default">
<div class="box-header with-border">
<h2 class="box-title"> {{ count($status['success']) }} Success Messages </h3>
<h2 class="box-title"> {{ count($status['success']) }} Success Messages </h2>
</div>
<div class="box-body">
<div style="height : 400px; overflow : auto;">

2
resources/views/hardware/qr-view.blade.php
View file

@ -17,7 +17,7 @@
@if ($asset->name)
({{ $asset->name }})
@endif
</h3>
</h2>
<div class="btn-group pull-right">
<div class="dropdown">

4
resources/views/hardware/quickscan.blade.php
View file

@ -23,7 +23,7 @@
<div class="col-md-6">
<div class="box box-default">
<div class="box-header with-border">
<h2 class="box-title"> {{ trans('general.bulkaudit') }} </h3>
<h2 class="box-title"> {{ trans('general.bulkaudit') }} </h2>
</div>
<div class="box-body">
{{csrf_field()}}
@ -87,7 +87,7 @@
<div class="col-md-6">
<div class="box box-default" id="audited-div" style="display: none">
<div class="box-header with-border">
<h2 class="box-title"> {{ trans('general.bulkaudit_status') }} (<span id="audit-counter">0</span> assets audited) </h3>
<h2 class="box-title"> {{ trans('general.bulkaudit_status') }} (<span id="audit-counter">0</span> assets audited) </h2>
</div>
<div class="box-body">

2
resources/views/layouts/default.blade.php
View file

@ -288,7 +288,7 @@
<small class="pull-right">
{{ $alert_items[$i]['remaining'] }} remaining
</small>
</h3>
</h2>
<div class="progress xs">
<div class="progress-bar progress-bar-yellow" style="width: {{ $alert_items[$i]['percent'] }}%" role="progressbar" aria-valuenow="{{ $alert_items[$i]['percent'] }}" aria-valuemin="0" aria-valuemax="100">
<span class="sr-only">{{ $alert_items[$i]['percent'] }}% Complete</span>

4
resources/views/layouts/edit-form.blade.php
View file

@ -29,7 +29,7 @@
@if ($item->id)
{{ $item->display_name }}
@endif
</h3>
</h2>
@if (isset($helpText))
<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>
@ -59,7 +59,7 @@
<a href="#" class="slideout-menu-toggle pull-right">×</a>
<h2>
{{ $helpTitle}}
</h3>
</h2>
<p>{{ $helpText }} </p>
</div>
@endif

2
resources/views/licenses/checkin.blade.php
View file

@ -22,7 +22,7 @@
<div class="box box-default">
<div class="box-header with-border">
<h2 class="box-title"> {{ $licenseSeat->license->name }}</h3>
<h2 class="box-title"> {{ $licenseSeat->license->name }}</h2>
</div>
<div class="box-body">

2
resources/views/licenses/checkout.blade.php
View file

@ -21,7 +21,7 @@
<div class="box box-default">
<div class="box-header with-border">
<h2 class="box-title"> {{ $license->name }}</h3>
<h2 class="box-title"> {{ $license->name }}</h2>
</div>
<div class="box-body">

6
resources/views/locations/view.blade.php
View file

@ -23,7 +23,7 @@
<div class="box box-default">
<div class="box-header with-border">
<div class="box-heading">
<h2 class="box-title">{{ trans('general.users') }}</h3>
<h2 class="box-title">{{ trans('general.users') }}</h2>
</div>
</div>
<div class="box-body">
@ -56,7 +56,7 @@
<div class="box box-default">
<div class="box-header with-border">
<div class="box-heading">
<h2 class="box-title">{{ trans('general.assets') }}</h3>
<h2 class="box-title">{{ trans('general.assets') }}</h2>
</div>
</div>
<div class="box-body">
@ -90,7 +90,7 @@
<div class="box box-default">
<div class="box-header with-border">
<div class="box-heading">
<h2 class="box-title">{{ trans('general.components') }}</h3>
<h2 class="box-title">{{ trans('general.components') }}</h2>
</div>
</div>
<div class="box-body">

2
resources/views/models/bulk-delete.blade.php
View file

@ -21,7 +21,7 @@
{{csrf_field()}}
<div class="box box-default">
<div class="box-header with-border">
<h2 class="box-title" style="color: red">{{ trans('admin/models/general.bulk_delete_warn', ['model_count' => $valid_count]) }}</h3>
<h2 class="box-title" style="color: red">{{ trans('admin/models/general.bulk_delete_warn', ['model_count' => $valid_count]) }}</h2>
</div>
<div class="box-body">

4
resources/views/models/view.blade.php
View file

@ -37,7 +37,7 @@
<div class="box-heading">
<h2 class="box-title"> {{ $model->name }}
{{ ($model->model_number) ? '(#'.$model->model_number.')' : '' }}
</h3>
</h2>
</div>
</div><!-- /.box-header -->
@endif
@ -90,7 +90,7 @@
<div class="box box-default">
<div class="box-header with-border">
<div class="box-heading">
<h2 class="box-title"> More Info:</h3>
<h2 class="box-title"> More Info:</h2>
</div>
</div><!-- /.box-header -->
<div class="box-body">

2
resources/views/partials/forms/edit/company-select.blade.php
View file

@ -2,7 +2,7 @@
<div id="{{ $fieldname }}" class="form-group{{ $errors->has($fieldname) ? ' has-error' : '' }}">
{{ Form::label($fieldname, $translated_name, array('class' => 'col-md-3 control-label')) }}
<div class="col-md-7">
<select class="js-data-ajax" data-endpoint="companies" data-placeholder="{{ trans('general.select_company') }}" name="{{ $fieldname }}" style="width: 100%" id="company_select">
<select class="js-data-ajax" data-endpoint="companies" data-placeholder="{{ trans('general.select_company') }}" name="{{ $fieldname }}" style="width: 100%" id="company_select" aria-label="{{ $fieldname }}">
@if ($company_id = Input::old($fieldname, (isset($item)) ? $item->{$fieldname} : ''))
<option value="{{ $company_id }}" selected="selected">
{{ (\App\Models\Company::find($company_id)) ? \App\Models\Company::find($company_id)->name : '' }}

2
resources/views/partials/forms/edit/department-select.blade.php
View file

@ -3,7 +3,7 @@
{{ Form::label($fieldname, $translated_name, array('class' => 'col-md-3 control-label')) }}
<div class="col-md-7">
<select class="js-data-ajax" data-endpoint="departments" data-placeholder="{{ trans('general.select_department') }}" name="{{ $fieldname }}" style="width: 100%" id="department_select">
<select class="js-data-ajax" data-endpoint="departments" data-placeholder="{{ trans('general.select_department') }}" name="{{ $fieldname }}" style="width: 100%" id="department_select" aria-label="{{ $fieldname }}">
@if ($department_id = Input::old($fieldname, (isset($item)) ? $item->{$fieldname} : ''))
<option value="{{ $department_id }}" selected="selected">
{{ (\App\Models\Department::find($department_id)) ? \App\Models\Department::find($department_id)->name : '' }}

2
resources/views/partials/forms/edit/location-select.blade.php
View file

@ -3,7 +3,7 @@
{{ Form::label($fieldname, $translated_name, array('class' => 'col-md-3 control-label')) }}
<div class="col-md-7{{ ((isset($required) && ($required =='true'))) ? ' required' : '' }}">
<select class="js-data-ajax" data-endpoint="locations" data-placeholder="{{ trans('general.select_location') }}" name="{{ $fieldname }}" style="width: 100%" id="{{ $fieldname }}_location_select">
<select class="js-data-ajax" data-endpoint="locations" data-placeholder="{{ trans('general.select_location') }}" name="{{ $fieldname }}" style="width: 100%" id="{{ $fieldname }}_location_select" aria-label="{{ $fieldname }}">
@if ($location_id = Input::old($fieldname, (isset($item)) ? $item->{$fieldname} : ''))
<option value="{{ $location_id }}" selected="selected">
{{ (\App\Models\Location::find($location_id)) ? \App\Models\Location::find($location_id)->name : '' }}

2
resources/views/partials/forms/edit/user-select.blade.php
View file

@ -3,7 +3,7 @@
{{ Form::label($fieldname, $translated_name, array('class' => 'col-md-3 control-label')) }}
<div class="col-md-7{{ ((isset($required)) && ($required=='true')) ? ' required' : '' }}">
<select class="js-data-ajax" data-endpoint="users" data-placeholder="{{ trans('general.select_user') }}" name="{{ $fieldname }}" style="width: 100%" id="assigned_user_select">
<select class="js-data-ajax" data-endpoint="users" data-placeholder="{{ trans('general.select_user') }}" name="{{ $fieldname }}" style="width: 100%" id="assigned_user_select" aria-label="{{ $fieldname }}">
@if ($user_id = Input::old($fieldname, (isset($item)) ? $item->{$fieldname} : ''))
<option value="{{ $user_id }}" selected="selected">
{{ (\App\Models\User::find($user_id)) ? \App\Models\User::find($user_id)->present()->fullName : '' }}

2
resources/views/reports/custom.blade.php
View file

@ -24,7 +24,7 @@
<!-- Horizontal Form -->
<div class="box box-default">
<div class="box-header with-border">
<h2 class="box-title">Customize Report</h3>
<h2 class="box-title">Customize Report</h2>
</div><!-- /.box-header -->
<div class="box-body">

2
resources/views/reports/index.blade.php
View file

@ -14,7 +14,7 @@
<a href="{{ route('reports/export') }}" class="btn btn-flat gray pull-right"><i class="fa fa-download icon-white"></i>
{{ trans('admin/hardware/table.dl_csv') }}</a>
</div>
<h2>{{ trans('general.depreciation_report') }}</h3>
<h2>{{ trans('general.depreciation_report') }}</h2>
</div>
<div class="row">

2
resources/views/settings/index.blade.php
View file

@ -259,7 +259,7 @@
<div class="col-md-12">
<div class="box box-default">
<div class="box-header">
<h2 class="box-title">{{ trans('admin/settings/general.system') }}</h3>
<h2 class="box-title">{{ trans('admin/settings/general.system') }}</h2>
</div>
<div class="box-body">

2
resources/views/settings/phpinfo.blade.php
View file

@ -19,7 +19,7 @@
<div class="col-md-12">
<div class="box box-default">
<div class="box-header">
<h2 class="box-title">PHP Info</h3>
<h2 class="box-title">PHP Info</h2>
</div>
<div class="box-body">

2
resources/views/settings/purge-form.blade.php
View file

@ -18,7 +18,7 @@
<div class="col-md-8 col-md-offset-2">
<div class="box box-solid box-danger">
<div class="box-header with-border">
<h2 class="box-title"><i class="fa fa-warning"></i> {{ trans('admin/settings/general.purge') }}</h3>
<h2 class="box-title"><i class="fa fa-warning"></i> {{ trans('admin/settings/general.purge') }}</h2>
</div>
{{ Form::open(['method' => 'POST', 'files' => false, 'autocomplete' => 'off', 'class' => 'form-horizontal', 'role' => 'form' ]) }}
<!-- CSRF Token -->

8
resources/views/suppliers/view.blade.php
View file

@ -25,7 +25,7 @@
<div class="box box-default">
<div class="box-header with-border">
<div class="box-heading">
<h2 class="box-title"> {{ trans('general.assets') }}</h3>
<h2 class="box-title"> {{ trans('general.assets') }}</h2>
</div>
</div><!-- /.box-header -->
@ -75,7 +75,7 @@
<div class="box-header with-border">
<div class="box-heading">
<h2 class="box-title"> {{ trans('general.accessories') }}</h3>
<h2 class="box-title"> {{ trans('general.accessories') }}</h2>
</div>
</div><!-- /.box-header -->
@ -113,7 +113,7 @@
@if ($supplier->id)
<div class="box-header with-border">
<div class="box-heading">
<h2 class="box-title"> {{ trans('general.licenses') }}</h3>
<h2 class="box-title"> {{ trans('general.licenses') }}</h2>
</div>
</div><!-- /.box-header -->
@endif
@ -155,7 +155,7 @@
@if ($supplier->id)
<div class="box-header with-border">
<div class="box-heading">
<h2 class="box-title"> Improvements</h3>
<h2 class="box-title"> Improvements</h2>
</div>
</div><!-- /.box-header -->
@endif

62
resources/views/users/edit.blade.php
View file

@ -175,6 +175,7 @@
class="form-control"
value=""
autocomplete="off"
aria-label="password_confirmation"
readonly
onfocus="this.removeAttribute('readonly');"
{{ ((config('app.lock_passwords') && ($user->id)) ? ' disabled' : '') }}
@ -229,6 +230,7 @@
<input
class="form-control"
type="text"
aria-label="employee_num"
name="employee_num"
id="employee_num"
value="{{ Input::old('employee_num', $user->employee_num) }}"
@ -295,7 +297,7 @@
<div class="form-group{{ $errors->has('city') ? ' has-error' : '' }}">
<label class="col-md-3 control-label" for="city">{{ trans('general.city') }}</label>
<div class="col-md-4">
<input class="form-control" type="text" name="city" id="city" value="{{ Input::old('city', $user->city) }}" />
<input class="form-control" type="text" name="city" id="city" aria-label="city" value="{{ Input::old('city', $user->city) }}" />
{!! $errors->first('city', '<span class="alert-msg">:message</span>') !!}
</div>
</div>
@ -311,7 +313,7 @@
<!-- Country -->
<div class="form-group{{ $errors->has('country') ? ' has-error' : '' }}">
<label class="col-md-3 control-label" for="city">{{ trans('general.country') }}</label>
<label class="col-md-3 control-label" for="country">{{ trans('general.country') }}</label>
<div class="col-md-4">
{!! Form::countries('country', Input::old('country', $user->country), 'select2') !!}
{!! $errors->first('country', '<span class="alert-msg">:message</span>') !!}
@ -339,7 +341,7 @@
<div class="col-md-9">
@if (config('app.lock_passwords'))
<div class="icheckbox disabled" style="padding-left: 10px;">
<input type="checkbox" value="1" name="activated" class="minimal disabled" {{ (old('activated', $user->activated)) == '1' ? ' checked="checked"' : '' }} disabled="disabled">
<input type="checkbox" value="1" name="activated" class="minimal disabled" {{ (old('activated', $user->activated)) == '1' ? ' checked="checked"' : '' }} disabled="disabled" aria-label="activated">
<!-- this is necessary because the field is disabled and will reset -->
<input type="hidden" name="activated" value="{{ $user->activated }}">
{{ trans('admin/users/general.activated_help_text') }}
@ -350,13 +352,13 @@
<div class="icheckbox disabled" style="padding-left: 10px;">
<input type="checkbox" value="1" name="activated" class="minimal disabled" checked="checked" disabled="disabled">
<!-- this is necessary because the field is disabled and will reset -->
<input type="hidden" name="activated" value="1">
<input type="hidden" name="activated" value="1" aria-label="activated">
{{ trans('admin/users/general.activated_help_text') }}
<p class="help-block">{{ trans('admin/users/general.activated_disabled_help_text') }}</p>
</div>
@else
<div style="padding-left: 10px;">
<input type="checkbox" value="1" name="activated" class="minimal" {{ (old('activated', $user->activated)) == '1' ? ' checked="checked"' : '' }}>
<input type="checkbox" value="1" name="activated" class="minimal" {{ (old('activated', $user->activated)) == '1' ? ' checked="checked"' : '' }} aria-label="activated">
{{ trans('admin/users/general.activated_help_text') }}
</div>
@endif
@ -417,7 +419,7 @@
<!-- Groups -->
<div class="form-group{{ $errors->has('groups') ? ' has-error' : '' }}">
<label class="col-md-3 control-label" for="groups"> {{ trans('general.groups') }}</label>
<label class="col-md-3 control-label" for="groups[]"> {{ trans('general.groups') }}</label>
<div class="col-md-5">
@if ((Config::get('app.lock_passwords') || (!Auth::user()->isSuperUser())))
@ -435,6 +437,7 @@
<div class="controls">
<select
name="groups[]"
aria-label="groups[]"
id="groups[]"
multiple="multiple"
class="form-control">
@ -502,28 +505,31 @@
data-toggle="tooltip"
data-placement="right"
title="{{ $localPermission['note'] }}">
<h4>{{ $area . ': ' . $localPermission['label'] }}</h4>
<h2>{{ $area . ': ' . $localPermission['label'] }}</h2>
</td>
<td class="col-md-1 permissions-item">
<label class="sr-only" for="{{ 'permission['.$localPermission['permission'].']' }}">{{ 'permission['.$localPermission['permission'].']' }}</label>
@if (($localPermission['permission'] == 'superuser') && (!Auth::user()->isSuperUser()))
{{ Form::radio('permission['.$localPermission['permission'].']', '1',$userPermissions[$localPermission['permission'] ] == '1',['disabled'=>"disabled", 'class'=>'minimal']) }}
{{ Form::radio('permission['.$localPermission['permission'].']', '1',$userPermissions[$localPermission['permission'] ] == '1',['disabled'=>"disabled", 'class'=>'minimal', 'aria-label'=> 'permission['.$localPermission['permission'].']']) }}
@else
{{ Form::radio('permission['.$localPermission['permission'].']', '1',$userPermissions[$localPermission['permission'] ] == '1',['value'=>"grant", 'class'=>'minimal']) }}
{{ Form::radio('permission['.$localPermission['permission'].']', '1',$userPermissions[$localPermission['permission'] ] == '1',['value'=>"grant", 'class'=>'minimal', 'aria-label'=> 'permission['.$localPermission['permission'].']']) }}
@endif
</td>
<td class="col-md-1 permissions-item">
<label class="sr-only" for="{{ 'permission['.$localPermission['permission'].']' }}">{{ 'permission['.$localPermission['permission'].']' }}</label>
@if (($localPermission['permission'] == 'superuser') && (!Auth::user()->isSuperUser()))
{{ Form::radio('permission['.$localPermission['permission'].']', '-1',$userPermissions[$localPermission['permission'] ] == '-1',['disabled'=>"disabled", 'class'=>'minimal']) }}
{{ Form::radio('permission['.$localPermission['permission'].']', '-1',$userPermissions[$localPermission['permission'] ] == '-1',['disabled'=>"disabled", 'class'=>'minimal', 'aria-label'=> 'permission['.$localPermission['permission'].']']) }}
@else
{{ Form::radio('permission['.$localPermission['permission'].']', '-1',$userPermissions[$localPermission['permission'] ] == '-1',['value'=>"deny", 'class'=>'minimal']) }}
{{ Form::radio('permission['.$localPermission['permission'].']', '-1',$userPermissions[$localPermission['permission'] ] == '-1',['value'=>"deny", 'class'=>'minimal', 'aria-label'=> 'permission['.$localPermission['permission'].']']) }}
@endif
</td>
<td class="col-md-1 permissions-item">
<label class="sr-only" for="{{ 'permission['.$localPermission['permission'].']' }}">{{ 'permission['.$localPermission['permission'].']' }}</label>
@if (($localPermission['permission'] == 'superuser') && (!Auth::user()->isSuperUser()))
{{ Form::radio('permission['.$localPermission['permission'].']','0',$userPermissions[$localPermission['permission'] ] == '0',['disabled'=>"disabled",'class'=>'minimal'] ) }}
{{ Form::radio('permission['.$localPermission['permission'].']','0',$userPermissions[$localPermission['permission'] ] == '0',['disabled'=>"disabled",'class'=>'minimal', 'aria-label'=> 'permission['.$localPermission['permission'].']'] ) }}
@else
{{ Form::radio('permission['.$localPermission['permission'].']','0',$userPermissions[$localPermission['permission'] ] == '0',['value'=>"inherit", 'class'=>'minimal'] ) }}
{{ Form::radio('permission['.$localPermission['permission'].']','0',$userPermissions[$localPermission['permission'] ] == '0',['value'=>"inherit", 'class'=>'minimal', 'aria-label'=> 'permission['.$localPermission['permission'].']'] ) }}
@endif
</td>
</tr>
@ -532,16 +538,22 @@
<tr class="header-row permissions-row">
<td class="col-md-5 header-name">
<h2>{{ $area }}</h3>
<h2>{{ $area }}</h2>
</td>
<td class="col-md-1 permissions-item">
{{ Form::radio("$area", '1',false,['value'=>"grant", 'class'=>'minimal', 'data-checker-group' => str_slug($area)]) }}
<br><br>
<label for="{{ $area }}" class="sr-only">{{ $area }}</label>
{{ Form::radio("$area", '1',false,['value'=>"grant", 'class'=>'minimal', 'data-checker-group' => str_slug($area), 'aria-label' => $area]) }}
</td>
<td class="col-md-1 permissions-item">
{{ Form::radio("$area", '-1',false,['value'=>"deny", 'class'=>'minimal', 'data-checker-group' => str_slug($area)]) }}
<br><br>
<label for="{{ $area }}" class="sr-only">{{ $area }}</label>
{{ Form::radio("$area", '-1',false,['value'=>"deny", 'class'=>'minimal', 'data-checker-group' => str_slug($area), 'aria-label' => $area]) }}
</td>
<td class="col-md-1 permissions-item">
{{ Form::radio("$area", '0',false,['value'=>"inherit", 'class'=>'minimal', 'data-checker-group' => str_slug($area)] ) }}
<br><br>
<label for="{{ $area }}" class="sr-only">{{ $area }}</label>
{{ Form::radio("$area", '0',false,['value'=>"inherit", 'class'=>'minimal', 'data-checker-group' => str_slug($area), 'aria-label' => $area] ) }}
</td>
</tr>
@ -556,24 +568,26 @@
{{ $permission['label'] }}
</td>
<td class="col-md-1 permissions-item">
<label class="sr-only" for="{{ 'permission['.$permission['permission'].']' }}">{{ 'permission['.$permission['permission'].']' }}</label>
@if (($permission['permission'] == 'superuser') && (!Auth::user()->isSuperUser()))
{{ Form::radio('permission['.$permission['permission'].']', '1', $userPermissions[$permission['permission'] ] == '1', ["value"=>"grant", 'disabled'=>'disabled', 'class'=>'minimal radiochecker-'.str_slug($area)]) }}
{{ Form::radio('permission['.$permission['permission'].']', '1', $userPermissions[$permission['permission'] ] == '1', ["value"=>"grant", 'disabled'=>'disabled', 'class'=>'minimal radiochecker-'.str_slug($area), 'aria-label'=>'permission['.$permission['permission'].']']) }}
@else
{{ Form::radio('permission['.$permission['permission'].']', '1', $userPermissions[ $permission['permission'] ] == '1', ["value"=>"grant",'class'=>'minimal radiochecker-'.str_slug($area)]) }}
{{ Form::radio('permission['.$permission['permission'].']', '1', $userPermissions[ $permission['permission'] ] == '1', ["value"=>"grant",'class'=>'minimal radiochecker-'.str_slug($area), 'aria-label' =>'permission['.$permission['permission'].']']) }}
@endif
</td>
<td class="col-md-1 permissions-item">
@if (($permission['permission'] == 'superuser') && (!Auth::user()->isSuperUser()))
{{ Form::radio('permission['.$permission['permission'].']', '-1', $userPermissions[$permission['permission'] ] == '-1', ["value"=>"deny", 'disabled'=>'disabled', 'class'=>'minimal radiochecker-'.str_slug($area)]) }}
{{ Form::radio('permission['.$permission['permission'].']', '-1', $userPermissions[$permission['permission'] ] == '-1', ["value"=>"deny", 'disabled'=>'disabled', 'class'=>'minimal radiochecker-'.str_slug($area), 'aria-label'=>'permission['.$permission['permission'].']']) }}
@else
{{ Form::radio('permission['.$permission['permission'].']', '-1', $userPermissions[$permission['permission'] ] == '-1', ["value"=>"deny",'class'=>'minimal radiochecker-'.str_slug($area)]) }}
{{ Form::radio('permission['.$permission['permission'].']', '-1', $userPermissions[$permission['permission'] ] == '-1', ["value"=>"deny",'class'=>'minimal radiochecker-'.str_slug($area), 'aria-label'=>'permission['.$permission['permission'].']']) }}
@endif
</td>
<td class="col-md-1 permissions-item">
@if (($permission['permission'] == 'superuser') && (!Auth::user()->isSuperUser()))
{{ Form::radio('permission['.$permission['permission'].']', '0', $userPermissions[$permission['permission']] =='0', ["value"=>"inherit", 'disabled'=>'disabled', 'class'=>'minimal radiochecker-'.str_slug($area)]) }}
{{ Form::radio('permission['.$permission['permission'].']', '0', $userPermissions[$permission['permission']] =='0', ["value"=>"inherit", 'disabled'=>'disabled', 'class'=>'minimal radiochecker-'.str_slug($area), 'aria-label'=>'permission['.$permission['permission'].']']) }}
@else
{{ Form::radio('permission['.$permission['permission'].']', '0', $userPermissions[$permission['permission']] =='0', ["value"=>"inherit", 'class'=>'minimal radiochecker-'.str_slug($area)]) }}
{{ Form::radio('permission['.$permission['permission'].']', '0', $userPermissions[$permission['permission']] =='0', ["value"=>"inherit", 'class'=>'minimal radiochecker-'.str_slug($area), 'aria-label'=>'permission['.$permission['permission'].']']) }}
@endif
</td>
@endif
@ -587,7 +601,7 @@
</div><!-- /.tab-pane -->
</div><!-- /.tab-content -->
<div class="box-footer text-right">
<button type="submit" class="btn btn-success"><i class="fa fa-check icon-white"></i> {{ trans('general.save') }}</button>
<button type="submit" class="btn btn-success"><i class="fa fa-check icon-white" aria-hidden="true"></i> {{ trans('general.save') }}</button>
</div>
</div><!-- nav-tabs-custom -->
</form>

2
resources/views/users/ldap.blade.php
View file

@ -52,7 +52,7 @@ LDAP User Sync
<div class="box box-default">
<div class="box-header with-border">
<h2 class="box-title">Synchronization Results</h3>
<h2 class="box-title">Synchronization Results</h2>
</div><!-- /.box-header -->
<div class="box-body">
<table class="table table-bordered">

4
resources/views/users/print.blade.php
View file

@ -39,13 +39,13 @@
<img class="print-logo" src="{{ url('/') }}/uploads/{{ $snipeSettings->logo }}">
@endif
{{ $snipeSettings->site_name }}
</h3>
</h2>
@elseif ($snipeSettings->brand == '2')
@if ($snipeSettings->logo!='')
<img class="print-logo" src="{{ url('/') }}/uploads/{{ $snipeSettings->logo }}">
@endif
@else
<h2>{{ $snipeSettings->site_name }}</h3>
<h2>{{ $snipeSettings->site_name }}</h2>
@endif
@endif