From d9432baf7ad497e6b7104990401a4074b1d6fe80 Mon Sep 17 00:00:00 2001
From: snipe <snipe@snipe.net>
Date: Wed, 9 Oct 2024 23:51:20 +0100
Subject: [PATCH] Mlore ldap style improvements

Signed-off-by: snipe <snipe@snipe.net>
---
 resources/views/layouts/default.blade.php |  10 +-
 resources/views/settings/ldap.blade.php   | 389 ++++++++++++++++------
 2 files changed, 298 insertions(+), 101 deletions(-)

diff --git a/resources/views/layouts/default.blade.php b/resources/views/layouts/default.blade.php
index 163bcee284..81440136f3 100644
--- a/resources/views/layouts/default.blade.php
+++ b/resources/views/layouts/default.blade.php
@@ -189,14 +189,14 @@ dir="{{ Helper::determineLanguageDirection() }}">
                                           action="{{ route('findbytag/hardware') }}" method="get">
                                         <div class="col-xs-12 col-md-12">
                                             <div class="col-xs-12 form-group">
-                                                <label class="sr-only"
-                                                       for="tagSearch">{{ trans('general.lookup_by_tag') }}</label>
-                                                <input type="text" class="form-control" id="tagSearch" name="assetTag"
-                                                       placeholder="{{ trans('general.lookup_by_tag') }}">
+                                                <label class="sr-only" for="tagSearch">
+                                                    {{ trans('general.lookup_by_tag') }}
+                                                </label>
+                                                <input type="text" class="form-control" id="tagSearch" name="assetTag" placeholder="{{ trans('general.lookup_by_tag') }}">
                                                 <input type="hidden" name="topsearch" value="true" id="search">
                                             </div>
                                             <div class="col-xs-1">
-                                                <button type="submit" class="btn btn-primary pull-right">
+                                                <button type="submit" id="topSearchButton" class="btn btn-primary pull-right">
                                                     <x-icon type="search" />
                                                     <span class="sr-only">{{ trans('general.search') }}</span>
                                                 </button>
diff --git a/resources/views/settings/ldap.blade.php b/resources/views/settings/ldap.blade.php
index 1cfdad555c..86e5869132 100644
--- a/resources/views/settings/ldap.blade.php
+++ b/resources/views/settings/ldap.blade.php
@@ -42,7 +42,6 @@
 
     @endif
 
-
     <form method="POST"  action="{{ route('settings.ldap.save') }}" autocomplete="off" class="form-horizontal" role="form" id="create-form">
     <!-- CSRF Token -->
     {{csrf_field()}}
@@ -62,7 +61,7 @@
                     <h2 class="box-title">
                         <x-icon type="ldap"/>
                         {{ trans('admin/settings/general.ldap_ad') }}
-                    </h4>
+                    </h2>
                 </div>
                 <div class="box-body">
 
@@ -76,11 +75,15 @@
                             <div class="col-md-8">
 
                                 <label class="form-control">
-                                    {{ Form::checkbox('ldap_enabled', '1', old('ldap_enabled', $setting->ldap_enabled), [((config('app.lock_passwords')===true)) ? 'disabled ': '', 'id' => 'ldap_enabled', 'class' => 'form-control '. $setting->demoMode, $setting->demoMode]) }}
+                                    {{ Form::checkbox('ldap_enabled', '1', old('ldap_enabled', $setting->ldap_enabled)) }}
                                 {{ trans('admin/settings/general.ldap_enabled') }}
                                 </label>
+
                                 @if (config('app.lock_passwords')===true)
-                                    <p class="text-warning"><i class="fas fa-lock" aria-hidden="true"></i> {{ trans('general.feature_disabled') }}</p>
+                                    <p class="text-warning">
+                                        <x-icon type="locked" />
+                                        {{ trans('general.feature_disabled') }}
+                                    </p>
                                 @endif
                             </div>
                         </div>
@@ -93,15 +96,21 @@
                             </div>
                             <div class="col-md-8">
                                 <label class="form-control">
-                                {{ Form::checkbox('is_ad', '1', old('is_ad', $setting->is_ad), [((config('app.lock_passwords')===true)) ? 'disabled ': '', 'class' => $setting->demoMode, $setting->demoMode]) }}
+                                {{ Form::checkbox('is_ad', '1', old('is_ad', $setting->is_ad)) }}
                                 {{ trans('admin/settings/general.is_ad') }}
                                 </label>
                                 @error('is_ad')
-                                    <span class="alert-msg" aria-hidden="true">{{ $message }}</span>
+                                    <span class="alert-msg">
+                                         <x-icon type="x" />
+                                        {{ $message }}
+                                    </span>
                                 @enderror
 
                                 @if (config('app.lock_passwords')===true)
-                                    <p class="text-warning"><i class="fas fa-lock" aria-hidden="true"></i> {{ trans('general.feature_disabled') }}</p>
+                                    <p class="text-warning">
+                                        <x-icon type="locked" />
+                                        {{ trans('general.feature_disabled') }}
+                                    </p>
                                 @endif
                             </div>
                         </div>
@@ -113,16 +122,23 @@
                             </div>
                             <div class="col-md-8">
                                 <label class="form-control">
-                                {{ Form::checkbox('ldap_pw_sync', '1', old('ldap_pw_sync', $setting->ldap_pw_sync), [((config('app.lock_passwords')===true)) ? 'disabled ': '', 'class' => 'minimal '. $setting->demoMode, $setting->demoMode]) }}
+                                {{ Form::checkbox('ldap_pw_sync', '1', old('ldap_pw_sync', $setting->ldap_pw_sync)) }}
                                 {{ trans('general.yes') }}
                                 </label>
 
                                 <p class="help-block">{{ trans('admin/settings/general.ldap_pw_sync_help') }}</p>
                                 @error('ldap_pw_sync')
-                                    <span class="alert-msg" aria-hidden="true">{{ $message }}</span>
+                                    <span class="alert-msg">
+                                         <x-icon type="x" />
+                                        {{ $message }}
+                                    </span>
                                 @enderror
+
                                 @if (config('app.lock_passwords')===true)
-                                    <p class="text-warning"><i class="fas fa-lock" aria-hidden="true"></i> {{ trans('general.feature_disabled') }}</p>
+                                    <p class="text-warning">
+                                        <x-icon type="locked" />
+                                        {{ trans('general.feature_disabled') }}
+                                    </p>
                                 @endif
 
                             </div>
@@ -134,13 +150,20 @@
                                 {{ Form::label('ad_domain', trans('admin/settings/general.ad_domain')) }}
                             </div>
                             <div class="col-md-8">
-                                {{ Form::text('ad_domain', old('ad_domain', $setting->ad_domain), ['class' => 'form-control','placeholder' => trans('general.example') .'example.com', $setting->demoMode]) }}
+                                {{ Form::text('ad_domain', old('ad_domain', $setting->ad_domain), ['class' => 'form-control','placeholder' => trans('general.example') .'example.com']) }}
                                 <p class="help-block">{{ trans('admin/settings/general.ad_domain_help') }}</p>
                                 @error('ad_domain')
-                                    <span class="alert-msg" aria-hidden="true">{{ $message }}</span>
+                                    <span class="alert-msg">
+                                         <x-icon type="x" />
+                                        {{ $message }}
+                                    </span>
                                 @enderror
+
                                 @if (config('app.lock_passwords')===true)
-                                    <p class="text-warning"><i class="fas fa-lock" aria-hidden="true"></i> {{ trans('general.feature_disabled') }}</p>
+                                    <p class="text-warning">
+                                        <x-icon type="locked" />
+                                        {{ trans('general.feature_disabled') }}
+                                    </p>
                                 @endif
                             </div>
                         </div><!-- AD Domain -->
@@ -151,13 +174,19 @@
                                 {{ Form::label('ldap_client_tls_key', trans('admin/settings/general.ldap_client_tls_key')) }}
                             </div>
                             <div class="col-md-8">
-                                {{ Form::textarea('ldap_client_tls_key', old('ldap_client_tls_key', $setting->ldap_client_tls_key), ['class' => 'form-control','placeholder' =>  trans('general.example') .'-----BEGIN RSA PRIVATE KEY-----'."\r\n1234567890\r\n-----END RSA PRIVATE KEY-----
-", $setting->demoMode]) }}
+                                {{ Form::textarea('ldap_client_tls_key', old('ldap_client_tls_key', $setting->ldap_client_tls_key), ['class' => 'form-control','placeholder' =>  trans('general.example') .'-----BEGIN RSA PRIVATE KEY-----'."\r\n1234567890\r\n-----END RSA PRIVATE KEY-----"]) }}
                                 @error('ldap_client_tls_key')
-                                    <span class="alert-msg" aria-hidden="true">{{ $message }}</span>
+                                    <span class="alert-msg">
+                                         <x-icon type="x" />
+                                        {{ $message }}
+                                    </span>
                                 @enderror
+
                                 @if (config('app.lock_passwords')===true)
-                                    <p class="text-warning"><i class="fas fa-lock" aria-hidden="true"></i> {{ trans('general.feature_disabled') }}</p>
+                                    <p class="text-warning">
+                                        <x-icon type="locked" />
+                                        {{ trans('general.feature_disabled') }}
+                                    </p>
                                 @endif
                             </div>
                         </div><!-- LDAP Client-Side TLS key -->
@@ -168,13 +197,20 @@
                                 {{ Form::label('ldap_client_tls_cert', trans('admin/settings/general.ldap_client_tls_cert')) }}
                             </div>
                             <div class="col-md-8">
-                                {{ Form::textarea('ldap_client_tls_cert', old('ldap_client_tls_cert', $setting->ldap_client_tls_cert), ['class' => 'form-control','placeholder' =>  trans('general.example') .'-----BEGIN CERTIFICATE-----'."\r\n1234567890\r\n-----END CERTIFICATE-----", $setting->demoMode]) }}
+                                {{ Form::textarea('ldap_client_tls_cert', old('ldap_client_tls_cert', $setting->ldap_client_tls_cert), ['class' => 'form-control','placeholder' =>  trans('general.example') .'-----BEGIN CERTIFICATE-----'."\r\n1234567890\r\n-----END CERTIFICATE-----"]) }}
                                 <p class="help-block">{{ trans('admin/settings/general.ldap_client_tls_cert_help') }}</p>
                                 @error('ldap_client_tls_cert')
-                                    <span class="alert-msg" aria-hidden="true">{{ $message }}</span>
+                                    <span class="alert-msg">
+                                       <x-icon type="x" />
+                                        {{ $message }}
+                                    </span>
                                 @enderror
+
                                 @if (config('app.lock_passwords')===true)
-                                    <p class="text-warning"><i class="fas fa-lock" aria-hidden="true"></i> {{ trans('general.feature_disabled') }}</p>
+                                    <p class="text-warning">
+                                        <x-icon type="locked" />
+                                        {{ trans('general.feature_disabled') }}
+                                    </p>
                                 @endif
                             </div>
                         </div><!-- LDAP Client-Side TLS certificate -->
@@ -185,13 +221,21 @@
                                 {{ Form::label('ldap_server', trans('admin/settings/general.ldap_server')) }}
                             </div>
                             <div class="col-md-8">
-                                {{ Form::text('ldap_server', old('ldap_server', $setting->ldap_server), ['class' => 'form-control','placeholder' =>  trans('general.example') .'ldap://ldap.example.com', $setting->demoMode]) }}
+                                {{ Form::text('ldap_server', old('ldap_server', $setting->ldap_server), ['class' => 'form-control','placeholder' =>  trans('general.example') .'ldap://ldap.example.com']) }}
                                 @error('ldap_server')
-                                    <span class="alert-msg" aria-hidden="true">{{ $message }}</span>
+                                    <span class="alert-msg">
+                                        <x-icon type="x" />
+                                        {{ $message }}
+                                    </span>
                                 @enderror
+
                                 <p class="help-block">{{ trans('admin/settings/general.ldap_server_help') }}</p>
+
                                 @if (config('app.lock_passwords')===true)
-                                    <p class="text-warning"><i class="fas fa-lock" aria-hidden="true"></i> {{ trans('general.feature_disabled') }}</p>
+                                    <p class="text-warning">
+                                        <x-icon type="locked" />
+                                        {{ trans('general.feature_disabled') }}
+                                    </p>
                                 @endif
                             </div>
                         </div><!-- LDAP Server -->
@@ -203,14 +247,21 @@
                             </div>
                             <div class="col-md-8">
                                 <label class="form-control">
-                                    {{ Form::checkbox('ldap_tls', '1', old('ldap_tls', $setting->ldap_tls),['class' => 'minimal '. $setting->demoMode, $setting->demoMode]) }}
+                                    {{ Form::checkbox('ldap_tls', '1', old('ldap_tls', $setting->ldap_tls)) }}
                                     {{ trans('admin/settings/general.ldap_tls_help') }}
                                 </label>
                                 @error('ldap_tls')
-                                    <span class="alert-msg" aria-hidden="true">{{ $message }}</span>
+                                    <span class="alert-msg">
+                                         <x-icon type="x" />
+                                        {{ $message }}
+                                    </span>
                                 @enderror
+
                                 @if (config('app.lock_passwords')===true)
-                                    <p class="text-warning"><i class="fas fa-lock" aria-hidden="true"></i> {{ trans('general.feature_disabled') }}</p>
+                                    <p class="text-warning">
+                                        <x-icon type="locked" />
+                                        {{ trans('general.feature_disabled') }}
+                                    </p>
                                 @endif
                             </div>
                         </div>
@@ -222,15 +273,24 @@
                             </div>
                             <div class="col-md-8">
                                 <label class="form-control">
-                                    {{ Form::checkbox('ldap_server_cert_ignore', '1', old('ldap_server_cert_ignore', $setting->ldap_server_cert_ignore),['class' => $setting->demoMode, $setting->demoMode]) }}
+                                    {{ Form::checkbox('ldap_server_cert_ignore', '1', old('ldap_server_cert_ignore', $setting->ldap_server_cert_ignore)) }}
                                     {{ trans('admin/settings/general.ldap_server_cert_ignore') }}
                                 </label>
                                 @error('ldap_server_cert_ignore')
-                                    <span class="alert-msg" aria-hidden="true">{{ $message }}</span>
+                                    <span class="alert-msg">
+                                         <x-icon type="x" />
+                                        {{ $message }}
+                                    </span>
                                 @enderror
-                                <p class="help-block">{{ trans('admin/settings/general.ldap_server_cert_help') }}</p>
+
+                                <p class="help-block">
+                                    {{ trans('admin/settings/general.ldap_server_cert_help') }}
+                                </p>
                                 @if (config('app.lock_passwords')===true)
-                                    <p class="text-warning"><i class="fas fa-lock" aria-hidden="true"></i> {{ trans('general.feature_disabled') }}</p>
+                                    <p class="text-warning">
+                                        <x-icon type="locked" />
+                                        {{ trans('general.feature_disabled') }}
+                                    </p>
                                 @endif
                             </div>
                         </div>
@@ -241,11 +301,19 @@
                                 {{ Form::label('ldap_uname', trans('admin/settings/general.ldap_uname')) }}
                             </div>
                             <div class="col-md-8">
-                                {{ Form::text('ldap_uname', old('ldap_uname', $setting->ldap_uname), ['class' => 'form-control','autocomplete' => 'off', 'placeholder' => trans('general.example') .'binduser@example.com', $setting->demoMode]) }}
+                                {{ Form::text('ldap_uname', old('ldap_uname', $setting->ldap_uname), ['class' => 'form-control','autocomplete' => 'off', 'placeholder' => trans('general.example') .'binduser@example.com']) }}
                                 @error('ldap_uname')
-                                    <span class="alert-msg" aria-hidden="true">{{ $message }}</span>
-                                @enderror                                @if (config('app.lock_passwords')===true)
-                                    <p class="text-warning"><i class="fas fa-lock" aria-hidden="true"></i> {{ trans('general.feature_disabled') }}</p>
+                                    <span class="alert-msg">
+                                         <x-icon type="x" />
+                                        {{ $message }}
+                                    </span>
+                                @enderror
+
+                                @if (config('app.lock_passwords')===true)
+                                    <p class="text-warning">
+                                        <x-icon type="locked" />
+                                        {{ trans('general.feature_disabled') }}
+                                    </p>
                                 @endif
                             </div>
                         </div>
@@ -256,12 +324,19 @@
                                 {{ Form::label('ldap_pword', trans('admin/settings/general.ldap_pword')) }}
                             </div>
                             <div class="col-md-8">
-                                {{ Form::password('ldap_pword', ['class' => 'form-control', 'autocomplete' => 'off', 'onfocus' => "this.removeAttribute('readonly');", $setting->demoMode, ' readonly']) }}
+                                {{ Form::password('ldap_pword', ['class' => 'form-control', 'autocomplete' => 'off', 'onfocus' => "this.removeAttribute('readonly');", ' readonly']) }}
                                 @error('ldap_pword')
-                                    <span class="alert-msg" aria-hidden="true">{{ $message }}</span>
+                                    <span class="alert-msg">
+                                         <x-icon type="x" />
+                                        {{ $message }}
+                                    </span>
                                 @enderror
+
                                 @if (config('app.lock_passwords')===true)
-                                    <p class="text-warning"><i class="fas fa-lock" aria-hidden="true"></i> {{ trans('general.feature_disabled') }}</p>
+                                    <p class="text-warning">
+                                        <x-icon type="locked" />
+                                        {{ trans('general.feature_disabled') }}
+                                    </p>
                                 @endif
                             </div>
                         </div>
@@ -272,12 +347,19 @@
                                 {{ Form::label('ldap_basedn', trans('admin/settings/general.ldap_basedn')) }}
                             </div>
                             <div class="col-md-8">
-                                {{ Form::text('ldap_basedn', old('ldap_basedn', $setting->ldap_basedn), ['class' => 'form-control', 'placeholder' => trans('general.example') .'cn=users/authorized,dc=example,dc=com', $setting->demoMode]) }}
+                                {{ Form::text('ldap_basedn', old('ldap_basedn', $setting->ldap_basedn), ['class' => 'form-control', 'placeholder' => trans('general.example') .'cn=users/authorized,dc=example,dc=com']) }}
                                 @error('ldap_basedn')
-                                    <span class="alert-msg" aria-hidden="true">{{ $message }}</span>
+                                    <span class="alert-msg">
+                                        <x-icon type="x" />
+                                        {{ $message }}
+                                    </span>
                                 @enderror
+
                                 @if (config('app.lock_passwords')===true)
-                                    <p class="text-warning"><i class="fas fa-lock" aria-hidden="true"></i> {{ trans('general.feature_disabled') }}</p>
+                                    <p class="text-warning">
+                                        <x-icon type="locked" />
+                                        {{ trans('general.feature_disabled') }}
+                                    </p>
                                 @endif
                             </div>
                         </div>
@@ -290,10 +372,17 @@
                             <div class="col-md-8">
                                 <input type="text" name="ldap_filter" id="ldap_filter" value="{{  old('ldap_filter', $setting->ldap_filter) }}" class="form-control" placeholder="{{  trans('general.example') .'&(cn=*)' }}">
                                 @error('ldap_filter')
-                                    <span class="alert-msg" aria-hidden="true">{{ $message }}</span>
+                                    <span class="alert-msg">
+                                        <x-icon type="x" />
+                                        {{ $message }}
+                                    </span>
                                 @enderror
+
                                 @if (config('app.lock_passwords')===true)
-                                    <p class="text-warning"><i class="fas fa-lock" aria-hidden="true"></i> {{ trans('general.feature_disabled') }}</p>
+                                    <p class="text-warning">
+                                        <x-icon type="locked" />
+                                        {{ trans('general.feature_disabled') }}
+                                    </p>
                                 @endif
                             </div>
                         </div>
@@ -306,10 +395,17 @@
                             <div class="col-md-8">
                                 <input type="text" name="ldap_username_field" id="ldap_username_field" value="{{  old('ldap_username_field', $setting->ldap_username_field) }}" class="form-control" placeholder="{{  trans('general.example') .'samaccountname' }}">
                                 @error('ldap_username_field')
-                                    <span class="alert-msg" aria-hidden="true">{!! $message !!} </span>
+                                    <span class="alert-msg">
+                                        <x-icon type="x" />
+                                        {!! $message !!}
+                                    </span>
                                 @enderror
+
                                 @if (config('app.lock_passwords')===true)
-                                    <p class="text-warning"><i class="fas fa-lock" aria-hidden="true"></i> {{ trans('general.feature_disabled') }}</p>
+                                    <p class="text-warning">
+                                        <x-icon type="locked" />
+                                        {{ trans('general.feature_disabled') }}
+                                    </p>
                                 @endif
                             </div>
                         </div>
@@ -322,11 +418,15 @@
                             <div class="col-md-8">
                                 <input type="text" name="ldap_lname_field" id="ldap_lname_field" value="{{  old('ldap_lname_field', $setting->ldap_lname_field) }}" class="form-control" placeholder="{{  trans('general.example') .'sn' }}">
                                 @error('ldap_lname_field')
-                                    <span class="alert-msg" aria-hidden="true">{{ $message }}</span>
+                                    <span class="alert-msg">
+                                        <x-icon type="x" />
+                                        {{ $message }}
+                                    </span>
                                 @enderror
+
                                 @if (config('app.lock_passwords')===true)
                                     <p class="text-warning">
-                                        <i class="fas fa-lock" aria-hidden="true"></i>
+                                        <x-icon type="locked" />
                                         {{ trans('general.feature_disabled') }}
                                     </p>
                                 @endif
@@ -339,14 +439,19 @@
                                 {{ Form::label('ldap_fname_field', trans('admin/settings/general.ldap_fname_field')) }}
                             </div>
                             <div class="col-md-8">
-                                <input type="text" name="ldap_fname_field" id="ldap_fname_field" value="{{  old('ldap_fname_field', $setting->ldap_fname_field) }}" class="form-control" placeholder="{{ trans('general.example') .'givenname'  }}" {{ $setting->demoMode }}>
+                                <input type="text" name="ldap_fname_field" id="ldap_fname_field" value="{{  old('ldap_fname_field', $setting->ldap_fname_field) }}" class="form-control" placeholder="{{ trans('general.example') .'givenname'  }}">
                                 @error('ldap_fname_field')
-                                    <span class="alert-msg" aria-hidden="true">
+                                    <span class="alert-msg">
+                                        <x-icon type="x" />
                                         {{ $message }}
                                     </span>
-                                @enderror                                
+                                @enderror
+
                                 @if (config('app.lock_passwords')===true)
-                                    <p class="text-warning"><i class="fas fa-lock" aria-hidden="true"></i> {{ trans('general.feature_disabled') }}</p>
+                                    <p class="text-warning">
+                                        <x-icon type="locked" />
+                                        {{ trans('general.feature_disabled') }}
+                                    </p>
                                 @endif
                             </div>
                         </div>
@@ -358,14 +463,19 @@
                             </div>
                             <div class="col-md-8">
 
-                                <input type="text" name="ldap_auth_filter_query" id="ldap_auth_filter_query" value="{{  old('ldap_auth_filter_query', $setting->ldap_auth_filter_query) }}" class="form-control" placeholder="{{ trans('general.example') .'uid='  }}" {{ $setting->demoMode }}>
+                                <input type="text" name="ldap_auth_filter_query" id="ldap_auth_filter_query" value="{{  old('ldap_auth_filter_query', $setting->ldap_auth_filter_query) }}" class="form-control" placeholder="{{ trans('general.example') .'uid='  }}">
                                 @error('ldap_auth_filter_query')
-                                    <span class="alert-msg" aria-hidden="true">
+                                    <span class="alert-msg">
+                                        <x-icon type="x" />
                                         {!! $message !!}
                                     </span>
                                 @enderror
+
                                 @if (config('app.lock_passwords')===true)
-                                    <p class="text-warning"><i class="fas fa-lock" aria-hidden="true"></i> {{ trans('general.feature_disabled') }}</p>
+                                    <p class="text-warning">
+                                        <x-icon type="locked" />
+                                        {{ trans('general.feature_disabled') }}
+                                    </p>
                                 @endif
                             </div>
                         </div>
@@ -417,14 +527,21 @@
                                 {{ Form::label('ldap_active_flag', trans('admin/settings/general.ldap_active_flag')) }}
                             </div>
                             <div class="col-md-8">
-                                <input type="text" name="ldap_active_flag" id="ldap_active_flag" value="{{  old('ldap_active_flag', $setting->ldap_active_flag) }}" class="form-control" {{ $setting->demoMode }}>
+                                <input type="text" name="ldap_active_flag" id="ldap_active_flag" value="{{  old('ldap_active_flag', $setting->ldap_active_flag) }}" class="form-control">
                                 <p class="help-block">{!! trans('admin/settings/general.ldap_activated_flag_help') !!}</p>
 
                                 @error('ldap_active_flag')
-                                    <span class="alert-msg" aria-hidden="true">{{ $message }}</span>
+                                    <span class="alert-msg">
+                                        <x-icon type="x" />
+                                        {{ $message }}
+                                    </span>
                                 @enderror
+
                                 @if (config('app.lock_passwords')===true)
-                                    <p class="text-warning"><i class="fas fa-lock" aria-hidden="true"></i> {{ trans('general.feature_disabled') }}</p>
+                                    <p class="text-warning">
+                                        <x-icon type="locked" />
+                                        {{ trans('general.feature_disabled') }}
+                                    </p>
                                 @endif
                             </div>
                         </div>
@@ -435,12 +552,19 @@
                                 {{ Form::label('ldap_emp_num', trans('admin/settings/general.ldap_emp_num')) }}
                             </div>
                             <div class="col-md-8">
-                                {{ Form::text('ldap_emp_num', old('ldap_emp_num', $setting->ldap_emp_num), ['class' => 'form-control','placeholder' => trans('general.example') .'employeenumber/employeeid', $setting->demoMode]) }}
+                                {{ Form::text('ldap_emp_num', old('ldap_emp_num', $setting->ldap_emp_num), ['class' => 'form-control','placeholder' => trans('general.example') .'employeenumber/employeeid']) }}
                                 @error('ldap_emp_num')
-                                    <span class="alert-msg" aria-hidden="true">{{ $message }}</span>
+                                    <span class="alert-msg">
+                                        <x-icon type="x" />
+                                        {{ $message }}
+                                    </span>
                                 @enderror
+
                                 @if (config('app.lock_passwords')===true)
-                                    <p class="text-warning"><i class="fas fa-lock" aria-hidden="true"></i> {{ trans('general.feature_disabled') }}</p>
+                                    <p class="text-warning">
+                                        <x-icon type="locked" />
+                                        {{ trans('general.feature_disabled') }}
+                                    </p>
                                 @endif
                             </div>
                         </div>
@@ -450,12 +574,20 @@
                                 {{ Form::label('ldap_dept', trans('admin/settings/general.ldap_dept')) }}
                             </div>
                             <div class="col-md-8">
-                                {{ Form::text('ldap_dept', old('ldap_dept', $setting->ldap_dept), ['class' => 'form-control','placeholder' => trans('general.example') .'department', $setting->demoMode]) }}
+                                {{ Form::text('ldap_dept', old('ldap_dept', $setting->ldap_dept), ['class' => 'form-control','placeholder' => trans('general.example') .'department']) }}
+
                                 @error('ldap_dept')
-                                    <span class="alert-msg" aria-hidden="true">{{ $message }}</span>
+                                    <span class="alert-msg">
+                                        <x-icon type="x" />
+                                        {{ $message }}
+                                    </span>
                                 @enderror
+
                                 @if (config('app.lock_passwords')===true)
-                                    <p class="text-warning"><i class="fas fa-lock" aria-hidden="true"></i> {{ trans('general.feature_disabled') }}</p>
+                                    <p class="text-warning">
+                                        <x-icon type="locked" />
+                                        {{ trans('general.feature_disabled') }}
+                                    </p>
                                 @endif
                             </div>
                         </div>
@@ -465,12 +597,19 @@
                                 {{ Form::label('ldap_dept', trans('admin/settings/general.ldap_manager')) }}
                             </div>
                             <div class="col-md-8">
-                                {{ Form::text('ldap_manager', old('ldap_manager', $setting->ldap_manager), ['class' => 'form-control','placeholder' => trans('general.example') .'manager', $setting->demoMode]) }}
+                                {{ Form::text('ldap_manager', old('ldap_manager', $setting->ldap_manager), ['class' => 'form-control','placeholder' => trans('general.example') .'manager']) }}
                                 @error('ldap_manager')
-                                    <span class="alert-msg" aria-hidden="true">{{ $message }}</span>
+                                    <span class="alert-msg">
+                                        <x-icon type="x" />
+                                        {{ $message }}
+                                    </span>
                                 @enderror
+
                                 @if (config('app.lock_passwords')===true)
-                                    <p class="text-warning"><i class="fas fa-lock" aria-hidden="true"></i> {{ trans('general.feature_disabled') }}</p>
+                                    <p class="text-warning">
+                                        <x-icon type="locked" />
+                                        {{ trans('general.feature_disabled') }}
+                                    </p>
                                 @endif
                             </div>
                         </div>
@@ -481,12 +620,19 @@
                                 {{ Form::label('ldap_email', trans('admin/settings/general.ldap_email')) }}
                             </div>
                             <div class="col-md-8">
-                                {{ Form::text('ldap_email', old('ldap_email', $setting->ldap_email), ['class' => 'form-control','placeholder' => trans('general.example') .'mail', $setting->demoMode]) }}
+                                {{ Form::text('ldap_email', old('ldap_email', $setting->ldap_email), ['class' => 'form-control','placeholder' => trans('general.example') .'mail']) }}
                                 @error('ldap_email')
-                                    <span class="alert-msg" aria-hidden="true">{{ $message }}</span>
+                                    <span class="alert-msg">
+                                        <x-icon type="x" />
+                                        {{ $message }}
+                                    </span>
                                 @enderror
+
                                 @if (config('app.lock_passwords')===true)
-                                    <p class="text-warning"><i class="fas fa-lock" aria-hidden="true"></i> {{ trans('general.feature_disabled') }}</p>
+                                    <p class="text-warning">
+                                        <x-icon type="locked" />
+                                        {{ trans('general.feature_disabled') }}
+                                    </p>
                                 @endif
                             </div>
                         </div>
@@ -497,12 +643,19 @@
                                 {{ Form::label('ldap_phone', trans('admin/settings/general.ldap_phone')) }}
                             </div>
                             <div class="col-md-8">
-                                {{ Form::text('ldap_phone', old('ldap_phone', $setting->ldap_phone_field), ['class' => 'form-control','placeholder' => trans('general.example') .'telephonenumber', $setting->demoMode]) }}
+                                {{ Form::text('ldap_phone', old('ldap_phone', $setting->ldap_phone_field), ['class' => 'form-control','placeholder' => trans('general.example') .'telephonenumber']) }}
                                 @error('ldap_phone')
-                                    <span class="alert-msg" aria-hidden="true">{{ $message }}</span>
+                                    <span class="alert-msg">
+                                        <x-icon type="x" />
+                                        {{ $message }}
+                                    </span>
                                 @enderror
+
                                 @if (config('app.lock_passwords')===true)
-                                    <p class="text-warning"><i class="fas fa-lock" aria-hidden="true"></i> {{ trans('general.feature_disabled') }}</p>
+                                    <p class="text-warning">
+                                        <x-icon type="locked" />
+                                        {{ trans('general.feature_disabled') }}
+                                    </p>
                                 @endif
                             </div>
                         </div>
@@ -513,11 +666,19 @@
                                 {{ Form::label('ldap_jobtitle', trans('admin/settings/general.ldap_jobtitle')) }}
                             </div>
                             <div class="col-md-8">
-                                {{ Form::text('ldap_jobtitle', old('ldap_jobtitle', $setting->ldap_jobtitle), ['class' => 'form-control','placeholder' => trans('general.example') .'title', $setting->demoMode]) }}
+                                {{ Form::text('ldap_jobtitle', old('ldap_jobtitle', $setting->ldap_jobtitle), ['class' => 'form-control','placeholder' => trans('general.example') .'title']) }}
                                 @error('ldap_jobtitle')
-                                <span class="alert-msg" aria-hidden="true">{{ $message }}</span>
-                                @enderror                                    @if (config('app.lock_passwords')===true)
-                                    <p class="text-warning"><i class="fas fa-lock" aria-hidden="true"></i> {{ trans('general.feature_disabled') }}</p>
+                                    <span class="alert-msg">
+                                        <x-icon type="x" />
+                                        {{ $message }}
+                                    </span>
+                                @enderror
+
+                                @if (config('app.lock_passwords')===true)
+                                    <p class="text-warning">
+                                        <x-icon type="locked" />
+                                        {{ trans('general.feature_disabled') }}
+                                    </p>
                                 @endif
                             </div>
                         </div>
@@ -528,11 +689,19 @@
                                 {{ Form::label('ldap_country', trans('admin/settings/general.ldap_country')) }}
                             </div>
                             <div class="col-md-8">
-                                {{ Form::text('ldap_country', old('ldap_country', $setting->ldap_country), ['class' => 'form-control','placeholder' => trans('general.example') .'c', $setting->demoMode]) }}
+                                {{ Form::text('ldap_country', old('ldap_country', $setting->ldap_country), ['class' => 'form-control','placeholder' => trans('general.example') .'c']) }}
                                 @error('ldap_country')
-                                    <span class="alert-msg" aria-hidden="true">{{ $message }}</span>
-                                @enderror                                @if (config('app.lock_passwords')===true)
-                                    <p class="text-warning"><i class="fas fa-lock" aria-hidden="true"></i> {{ trans('general.feature_disabled') }}</p>
+                                    <span class="alert-msg">
+                                        <x-icon type="x" />
+                                        {{ $message }}
+                                    </span>
+                                @enderror
+
+                                @if (config('app.lock_passwords')===true)
+                                    <p class="text-warning">
+                                        <x-icon type="locked" />
+                                        {{ trans('general.feature_disabled') }}
+                                    </p>
                                 @endif
                             </div>
                         </div>
@@ -542,13 +711,20 @@
                                 {{ Form::label('ldap_location', trans('admin/settings/general.ldap_location')) }}
                             </div>
                             <div class="col-md-8">
-                                {{ Form::text('ldap_location', old('ldap_location', $setting->ldap_location), ['class' => 'form-control','placeholder' => trans('general.example') .'physicaldeliveryofficename', $setting->demoMode]) }}
+                                {{ Form::text('ldap_location', old('ldap_location', $setting->ldap_location), ['class' => 'form-control','placeholder' => trans('general.example') .'physicaldeliveryofficename']) }}
                                 <p class="help-block">{!! trans('admin/settings/general.ldap_location_help') !!}</p>
                                 @error('ldap_location')
-                                    <span class="alert-msg" aria-hidden="true">{{ $message }}</span>
+                                    <span class="alert-msg">
+                                         <x-icon type="x" />
+                                        {{ $message }}
+                                    </span>
                                 @enderror
+
                                 @if (config('app.lock_passwords')===true)
-                                    <p class="text-warning"><i class="fas fa-lock" aria-hidden="true"></i> {{ trans('general.feature_disabled') }}</p>
+                                    <p class="text-warning">
+                                        <x-icon type="locked" />
+                                        {{ trans('general.feature_disabled') }}
+                                    </p>
                                 @endif
                             </div>
                         </div>
@@ -560,7 +736,7 @@
                                     {{ Form::label('test_ldap_sync', 'Test LDAP Sync') }}
                                 </div>
                                 <div class="col-md-8" id="ldaptestrow">
-                                    <a {{ $setting->demoMode }} class="btn btn-default btn-sm" id="ldaptest" style="margin-right: 10px;">{{ trans('admin/settings/general.ldap_test_sync') }}</a>
+                                    <a class="btn btn-default btn-sm" id="ldaptest" style="margin-right: 10px;">{{ trans('admin/settings/general.ldap_test_sync') }}</a>
                                 </div>
                                 <div class="col-md-8 col-md-offset-3">
                                     <br />
@@ -569,7 +745,10 @@
                                 <div class="col-md-8 col-md-offset-3">
                                     <p class="help-block">{{ trans('admin/settings/general.ldap_login_sync_help') }}</p>
                                     @if (config('app.lock_passwords')===true)
-                                        <p class="text-warning"><i class="fas fa-lock" aria-hidden="true"></i> {{ trans('general.feature_disabled') }}</p>
+                                        <p class="text-warning">
+                                            <x-icon type="locked" />
+                                            {{ trans('general.feature_disabled') }}
+                                        </p>
                                     @endif
                                 </div>
 
@@ -615,13 +794,20 @@
                                 {{ Form::label('custom_forgot_pass_url', trans('admin/settings/general.custom_forgot_pass_url')) }}
                             </div>
                             <div class="col-md-8">
-                                {{ Form::text('custom_forgot_pass_url', old('custom_forgot_pass_url', $setting->custom_forgot_pass_url), ['class' => 'form-control','placeholder' => trans('general.example') .'https://my.ldapserver-forgotpass.com', $setting->demoMode]) }}
+                                {{ Form::text('custom_forgot_pass_url', old('custom_forgot_pass_url', $setting->custom_forgot_pass_url), ['class' => 'form-control','placeholder' => trans('general.example') .'https://my.ldapserver-forgotpass.com']) }}
                                 <p class="help-block">{{ trans('admin/settings/general.custom_forgot_pass_url_help') }}</p>
                                 @error('custom_forgot_pass_url')
-                                    <span class="alert-msg" aria-hidden="true">{{ $message }}</span>
+                                    <span class="alert-msg">
+                                        <x-icon type="x" />
+                                        {{ $message }}
+                                    </span>
                                 @enderror
+
                                 @if (config('app.lock_passwords')===true)
-                                    <p class="text-warning"><i class="fas fa-lock" aria-hidden="true"></i> {{ trans('general.feature_disabled') }}</p>
+                                    <p class="text-warning">
+                                        <x-icon type="locked" />
+                                        {{ trans('general.feature_disabled') }}
+                                    </p>
                                 @endif
                             </div>
                         </div><!-- LDAP Server -->
@@ -646,9 +832,10 @@
     {{Form::close()}}
 
 
-@stop
+@endsection
 
 @push('js')
+
     <script nonce="{{ csrf_token() }}">
 
 
@@ -657,7 +844,20 @@
          * Check to see if is_ad is checked, if not disable the ad_domain field
          */
         $(function() {
-            if( $('#is_ad').prop('checked') === false) {
+
+            // If the app is locked, disable all fields except the top search fields
+            @if (config('app.lock_passwords') === true)
+                $("input").prop('disabled', 'disabled');
+                $("textarea").prop('disabled', 'disabled');
+                $("button").prop('disabled', 'disabled');
+                $("#tagSearch").removeAttr("disabled");
+                $("#search").removeAttr("disabled");
+                $("#topSearchButton").removeAttr("disabled");
+            @endif
+
+
+
+            if ($('#is_ad').prop('checked') === false) {
                 $('#ad_domain').prop('disabled', 'disabled');
                 $("#ad_domain").prop('required',false);
             }
@@ -720,7 +920,7 @@
         $("#ldaptest").click(function () {
             $("#ldapad_test_results").removeClass('hidden text-success text-danger');
             $("#ldapad_test_results").html('');
-            $("#ldapad_test_results").html('<i class="fas fa-spinner spin"></i> {{ trans('admin/settings/message.ldap.testing') }}');
+            $("#ldapad_test_results").html('<x-icon type="spinner" /> {{ trans('admin/settings/message.ldap.testing') }}');
             $.ajax({
                 url: '{{ route('api.settings.ldaptest') }}',
                 type: 'GET',
@@ -769,8 +969,8 @@
          */
         function buildLdapTestResults(results) {
             let html = '<ul style="list-style: none;padding-left: 5px;">'
-            html += '<li class="text-success"><i class="fas fa-check" aria-hidden="true"></i> ' + results.login.message + ' </li>'
-            html += '<li class="text-success"><i class="fas fa-check" aria-hidden="true"></i> ' + results.bind.message + ' </li>'
+            html += '<li class="text-success"><i class="fas fa-check""></i> ' + results.login.message + ' </li>'
+            html += '<li class="text-success"><i class="fas fa-check""></i> ' + results.bind.message + ' </li>'
             html += '</ul>'
             html += '<div style="overflow:auto;">'
             html += '<div>{{ trans('admin/settings/message.ldap.sync_success') }}</div>'
@@ -815,7 +1015,7 @@
             $("#ldaptestloginrow").removeClass('text-danger');
             $("#ldaptestloginstatus").removeClass('text-danger');
             $("#ldaptestloginstatus").html('');
-            $("#ldaptestloginicon").html('<i class="fas fa-spinner spin"></i> {{ trans('admin/settings/message.ldap.testing_authentication') }}');
+            $("#ldaptestloginicon").html('<x-icon type="spinner" /> {{ trans('admin/settings/message.ldap.testing_authentication') }}');
             $.ajax({
                 url: '{{ route('api.settings.ldaptestlogin') }}',
                 type: 'POST',
@@ -875,9 +1075,6 @@
                     }
                 }
 
-
-
-
             });
         });
     </script>