From 0680405f4d52038e96334b92b09e70b8cf0b6b58 Mon Sep 17 00:00:00 2001 From: snipe Date: Tue, 9 May 2023 22:34:46 -0700 Subject: [PATCH] Tightened up some layout issues, checkbox issues in LDAP settings Signed-off-by: snipe --- resources/views/settings/ldap.blade.php | 224 ++++++++++++------------ 1 file changed, 113 insertions(+), 111 deletions(-) diff --git a/resources/views/settings/ldap.blade.php b/resources/views/settings/ldap.blade.php index 078b09cad5..b3070e13e1 100644 --- a/resources/views/settings/ldap.blade.php +++ b/resources/views/settings/ldap.blade.php @@ -60,12 +60,33 @@
- {{ Form::label('ldap_integration', trans('admin/settings/general.ldap_integration')) }} + {{ Form::label('ldap_enabled', trans('admin/settings/general.ldap_integration')) }}
-
+
- {{ Form::checkbox('ldap_enabled', '1', Request::old('ldap_enabled', $setting->ldap_enabled), [((config('app.lock_passwords')===true)) ? 'disabled ': '', 'class' => 'minimal '. $setting->demoMode, $setting->demoMode]) }} + + @if (config('app.lock_passwords')===true) +

{{ trans('general.feature_disabled') }}

+ @endif +
+
+ + + +
+
+ {{ Form::label('is_ad', trans('admin/settings/general.ad')) }} +
+
+ + {!! $errors->first('is_ad', '') !!} + @if (config('app.lock_passwords')===true)

{{ trans('general.feature_disabled') }}

@endif @@ -77,10 +98,11 @@
{{ Form::label('ldap_pw_sync', trans('admin/settings/general.ldap_pw_sync')) }}
-
- +
+

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

{!! $errors->first('ldap_pw_sync_help', '') !!} @@ -91,75 +113,12 @@
- - -
-
- {{ Form::label('ldap_default_group', trans('admin/settings/general.ldap_default_group')) }} -
- -
- - @if ($groups->count()) - @if ((Config::get('app.lock_passwords') || (!Auth::user()->isSuperUser()))) -
    - @foreach ($groups as $id => $group) - {!! '
  • '.e($group).'
    • ' !!} - @endforeach -
- - - {{ trans('admin/users/general.group_memberships_helpblock') }} - @else -
- - - - {{ trans('admin/settings/general.ldap_default_group_info') }} - -
- @endif - @else -

No groups have been created yet. Visit Admin Settings > Permission Groups to add one.

- @endif - -
-
- - -
-
- {{ Form::label('is_ad', trans('admin/settings/general.ad')) }} -
-
- {{ Form::checkbox('is_ad', '1', Request::old('is_ad', $setting->is_ad), [((config('app.lock_passwords')===true)) ? 'disabled ': '', 'class' => 'minimal '. $setting->demoMode, $setting->demoMode]) }} - {{ trans('admin/settings/general.is_ad') }} - {!! $errors->first('is_ad', '') !!} - - @if (config('app.lock_passwords')===true) -

{{ trans('general.feature_disabled') }}

- @endif -
-
-
{{ Form::label('ad_domain', trans('admin/settings/general.ad_domain')) }}
-
+
{{ Form::text('ad_domain', Request::old('ad_domain', $setting->ad_domain), ['class' => 'form-control','placeholder' => trans('general.example') .'example.com', $setting->demoMode]) }}

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

{!! $errors->first('ad_domain', '') !!} @@ -174,7 +133,7 @@
{{ Form::label('ad_append_domain', trans('admin/settings/general.ad_append_domain_label')) }}
-
+
{{ Form::checkbox('ad_append_domain', '1', Request::old('ad_append_domain', $setting->ad_append_domain),['class' => 'minimal '. $setting->demoMode, $setting->demoMode]) }} {{ trans('admin/settings/general.ad_append_domain') }}

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

@@ -190,7 +149,7 @@
{{ Form::label('ldap_client_tls_key', trans('admin/settings/general.ldap_client_tls_key')) }}
-
+
{{ Form::textarea('ldap_client_tls_key', Request::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]) }} {!! $errors->first('ldap_client_tls_key', '') !!} @@ -205,7 +164,7 @@
{{ Form::label('ldap_client_tls_cert', trans('admin/settings/general.ldap_client_tls_cert')) }}
-
+
{{ Form::textarea('ldap_client_tls_cert', Request::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]) }}

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

{!! $errors->first('ldap_client_tls_cert', '') !!} @@ -220,7 +179,7 @@
{{ Form::label('ldap_server', trans('admin/settings/general.ldap_server')) }}
-
+
{{ Form::text('ldap_server', Request::old('ldap_server', $setting->ldap_server), ['class' => 'form-control','placeholder' => trans('general.example') .'ldap://ldap.example.com', $setting->demoMode]) }}

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

{!! $errors->first('ldap_server', '') !!} @@ -235,9 +194,11 @@
{{ Form::label('ldap_tls', trans('admin/settings/general.ldap_tls')) }}
-
- {{ Form::checkbox('ldap_tls', '1', Request::old('ldap_tls', $setting->ldap_tls),['class' => 'minimal '. $setting->demoMode, $setting->demoMode]) }} - {{ trans('admin/settings/general.ldap_tls_help') }} +
+ {!! $errors->first('ldap_tls', '') !!} @if (config('app.lock_passwords')===true)

{{ trans('general.feature_disabled') }}

@@ -250,9 +211,11 @@
{{ Form::label('ldap_server_cert_ignore', trans('admin/settings/general.ldap_server_cert')) }}
-
- {{ Form::checkbox('ldap_server_cert_ignore', '1', Request::old('ldap_server_cert_ignore', $setting->ldap_server_cert_ignore),['class' => 'minimal '. $setting->demoMode, $setting->demoMode]) }} - {{ trans('admin/settings/general.ldap_server_cert_ignore') }} +
+ {!! $errors->first('ldap_server_cert_ignore', '') !!}

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

@if (config('app.lock_passwords')===true) @@ -266,7 +229,7 @@
{{ Form::label('ldap_uname', trans('admin/settings/general.ldap_uname')) }}
-
+
{{ Form::text('ldap_uname', Request::old('ldap_uname', $setting->ldap_uname), ['class' => 'form-control','placeholder' => trans('general.example') .'binduser@example.com', $setting->demoMode]) }} {!! $errors->first('ldap_uname', '') !!} @if (config('app.lock_passwords')===true) @@ -280,7 +243,7 @@
{{ Form::label('ldap_pword', trans('admin/settings/general.ldap_pword')) }}
-
+
{{ Form::password('ldap_pword', ['class' => 'form-control','placeholder' => trans('general.example') .' binduserpassword', $setting->demoMode]) }} {!! $errors->first('ldap_pword', '') !!} @if (config('app.lock_passwords')===true) @@ -294,7 +257,7 @@
{{ Form::label('ldap_basedn', trans('admin/settings/general.ldap_basedn')) }}
-
+
{{ Form::text('ldap_basedn', Request::old('ldap_basedn', $setting->ldap_basedn), ['class' => 'form-control', 'placeholder' => trans('general.example') .'cn=users/authorized,dc=example,dc=com', $setting->demoMode]) }} {!! $errors->first('ldap_basedn', '') !!} @if (config('app.lock_passwords')===true) @@ -308,7 +271,7 @@
{{ Form::label('ldap_filter', trans('admin/settings/general.ldap_filter')) }}
-
+
{{ Form::text('ldap_filter', Request::old('ldap_filter', $setting->ldap_filter), ['class' => 'form-control','placeholder' => trans('general.example') .'&(cn=*)', $setting->demoMode]) }} {!! $errors->first('ldap_filter', '') !!} @if (config('app.lock_passwords')===true) @@ -322,7 +285,7 @@
{{ Form::label('ldap_username_field', trans('admin/settings/general.ldap_username_field')) }}
-
+
{{ Form::text('ldap_username_field', Request::old('ldap_username_field', $setting->ldap_username_field), ['class' => 'form-control','placeholder' => trans('general.example') .'samaccountname', $setting->demoMode]) }} {!! $errors->first('ldap_username_field', '') !!} @if (config('app.lock_passwords')===true) @@ -336,7 +299,7 @@
{{ Form::label('ldap_lname_field', trans('admin/settings/general.ldap_lname_field')) }}
-
+
{{ Form::text('ldap_lname_field', Request::old('ldap_lname_field', $setting->ldap_lname_field), ['class' => 'form-control','placeholder' => trans('general.example') .'sn', $setting->demoMode]) }} {!! $errors->first('ldap_lname_field', '') !!} @if (config('app.lock_passwords')===true) @@ -350,7 +313,7 @@
{{ Form::label('ldap_fname_field', trans('admin/settings/general.ldap_fname_field')) }}
-
+
{{ Form::text('ldap_fname_field', Request::old('ldap_fname_field', $setting->ldap_fname_field), ['class' => 'form-control', 'placeholder' => trans('general.example') .'givenname', $setting->demoMode]) }} {!! $errors->first('ldap_fname_field', '') !!} @if (config('app.lock_passwords')===true) @@ -364,7 +327,7 @@
{{ Form::label('ldap_auth_filter_query', trans('admin/settings/general.ldap_auth_filter_query')) }}
-
+
{{ Form::text('ldap_auth_filter_query', Request::old('ldap_auth_filter_query', $setting->ldap_auth_filter_query), ['class' => 'form-control','placeholder' => trans('general.example') .'uid=', $setting->demoMode]) }} {!! $errors->first('ldap_auth_filter_query', '') !!} @if (config('app.lock_passwords')===true) @@ -373,17 +336,45 @@
- -
+ + +
- {{ Form::label('ldap_version', trans('admin/settings/general.ldap_version')) }} + {{ Form::label('ldap_default_group', trans('admin/settings/general.ldap_default_group')) }}
-
- {{ Form::text('ldap_version', Request::old('ldap_version', $setting->ldap_version), ['class' => 'form-control','placeholder' => '3', $setting->demoMode]) }} - {!! $errors->first('ldap_version', '') !!} - @if (config('app.lock_passwords')===true) -

{{ trans('general.feature_disabled') }}

+ +
+ + @if ($groups->count()) + @if ((Config::get('app.lock_passwords') || (!Auth::user()->isSuperUser()))) +
    + @foreach ($groups as $id => $group) + {!! '
  • '.e($group).'
    • ' !!} + @endforeach +
+ + + {{ trans('admin/users/general.group_memberships_helpblock') }} + @else +
+ + + + {{ trans('admin/settings/general.ldap_default_group_info') }} + +
+ @endif + @else +

No groups have been created yet. Visit Admin Settings > Permission Groups to add one.

@endif +
@@ -392,7 +383,7 @@
{{ Form::label('ldap_active_flag', trans('admin/settings/general.ldap_active_flag')) }}
-
+
{{ Form::text('ldap_active_flag', Request::old('ldap_active_flag', $setting->ldap_active_flag), ['class' => 'form-control', $setting->demoMode]) }}

{!! trans('admin/settings/general.ldap_activated_flag_help') !!}

@@ -409,7 +400,7 @@
{{ Form::label('ldap_emp_num', trans('admin/settings/general.ldap_emp_num')) }}
-
+
{{ Form::text('ldap_emp_num', Request::old('ldap_emp_num', $setting->ldap_emp_num), ['class' => 'form-control','placeholder' => trans('general.example') .'employeenumber/employeeid', $setting->demoMode]) }} {!! $errors->first('ldap_emp_num', '') !!} @if (config('app.lock_passwords')===true) @@ -422,7 +413,7 @@
{{ Form::label('ldap_dept', trans('admin/settings/general.ldap_dept')) }}
-
+
{{ Form::text('ldap_dept', Request::old('ldap_dept', $setting->ldap_dept), ['class' => 'form-control','placeholder' => trans('general.example') .'department', $setting->demoMode]) }} {!! $errors->first('ldap_dept', '') !!} @if (config('app.lock_passwords')===true) @@ -435,7 +426,7 @@
{{ Form::label('ldap_dept', trans('admin/settings/general.ldap_manager')) }}
-
+
{{ Form::text('ldap_manager', Request::old('ldap_manager', $setting->ldap_manager), ['class' => 'form-control','placeholder' => trans('general.example') .'manager', $setting->demoMode]) }} {!! $errors->first('ldap_manager', '') !!} @if (config('app.lock_passwords')===true) @@ -449,7 +440,7 @@
{{ Form::label('ldap_email', trans('admin/settings/general.ldap_email')) }}
-
+
{{ Form::text('ldap_email', Request::old('ldap_email', $setting->ldap_email), ['class' => 'form-control','placeholder' => trans('general.example') .'mail', $setting->demoMode]) }} {!! $errors->first('ldap_email', '') !!} @if (config('app.lock_passwords')===true) @@ -463,7 +454,7 @@
{{ Form::label('ldap_phone', trans('admin/settings/general.ldap_phone')) }}
-
+
{{ Form::text('ldap_phone', Request::old('ldap_phone', $setting->ldap_phone_field), ['class' => 'form-control','placeholder' => trans('general.example') .'telephonenumber', $setting->demoMode]) }} {!! $errors->first('ldap_phone', '') !!} @if (config('app.lock_passwords')===true) @@ -477,7 +468,7 @@
{{ Form::label('ldap_jobtitle', trans('admin/settings/general.ldap_jobtitle')) }}
-
+
{{ Form::text('ldap_jobtitle', Request::old('ldap_jobtitle', $setting->ldap_jobtitle), ['class' => 'form-control','placeholder' => trans('general.example') .'title', $setting->demoMode]) }} {!! $errors->first('ldap_jobtitle', '') !!} @if (config('app.lock_passwords')===true) @@ -491,7 +482,7 @@
{{ Form::label('ldap_country', trans('admin/settings/general.ldap_country')) }}
-
+
{{ Form::text('ldap_country', Request::old('ldap_country', $setting->ldap_country), ['class' => 'form-control','placeholder' => trans('general.example') .'c', $setting->demoMode]) }} {!! $errors->first('ldap_country', '') !!} @if (config('app.lock_passwords')===true) @@ -504,7 +495,7 @@
{{ Form::label('ldap_location', trans('admin/settings/general.ldap_location')) }}
-
+
{{ Form::text('ldap_location', Request::old('ldap_location', $setting->ldap_location), ['class' => 'form-control','placeholder' => trans('general.example') .'physicaldeliveryofficename', $setting->demoMode]) }}

{!! trans('admin/settings/general.ldap_location_help') !!}

{!! $errors->first('ldap_location', '') !!} @@ -520,14 +511,14 @@
{{ Form::label('test_ldap_sync', 'Test LDAP Sync') }}
-
+ -
+

-
+

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

@if (config('app.lock_passwords')===true)

{{ trans('general.feature_disabled') }}

@@ -541,7 +532,7 @@
{{ Form::label('test_ldap_login', 'Test LDAP Login') }}
-
+
@@ -556,12 +547,12 @@
-
+
-
+

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

@@ -575,7 +566,7 @@
{{ Form::label('custom_forgot_pass_url', trans('admin/settings/general.custom_forgot_pass_url')) }}
-
+
{{ Form::text('custom_forgot_pass_url', Request::old('custom_forgot_pass_url', $setting->custom_forgot_pass_url), ['class' => 'form-control','placeholder' => trans('general.example') .'https://my.ldapserver-forgotpass.com', $setting->demoMode]) }}

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

{!! $errors->first('custom_forgot_pass_url', '') !!} @@ -610,6 +601,8 @@ @push('js')