A free open source IT asset/license management system
Moved password visibility toggle to snipeit.js
snipe23c93473c823
diff --git a/resources/assets/js/snipeit.js b/resources/assets/js/snipeit.jsindex 9c5f62741c..6d72203119 100755--- a/resources/assets/js/snipeit.js+++ b/resources/assets/js/snipeit.js@@ -596,6 +596,18 @@ function htmlEntities(str) {})(jQuery);+$(document).ready(function () {+ $(".toggle-password").click(function () {+ $(this).toggleClass("fa-eye fa-eye-slash");+ var input = $($(this).attr("data-toggle"));+ if (input.attr("type") === "password") {+ input.attr("type", "text");+ } else {+ input.attr("type", "password");+ }+ });+});+/**diff --git a/resources/lang/en-US/general.php b/resources/lang/en-US/general.phpindex ca7fe9b744..0ec6ec6910 100644--- a/resources/lang/en-US/general.php+++ b/resources/lang/en-US/general.php@@ -521,6 +521,7 @@ return ['pre_flight' => 'Pre-Flight','skip_to_main_content' => 'Skip to main content','toggle_navigation' => 'Toggle navigation',+ 'toggle_password_visibility' => 'Toggle password visibility','alerts' => 'Alerts','tasks_view_all' => 'View all tasks','true' => 'True',diff --git a/resources/views/auth/login.blade.php b/resources/views/auth/login.blade.phpindex 2407506f3e..0c12d5b781 100755--- a/resources/views/auth/login.blade.php+++ b/resources/views/auth/login.blade.php@@ -76,7 +76,7 @@<input class="form-control" placeholder="{{ trans('admin/users/table.password') }}" name="password" type="password" id="password-field" autocomplete="{{ (config('auth.login_autocomplete') === true) ? 'on' : 'off' }}" autocorrect="off" autocapitalize="off" spellcheck="false"><span class="input-group-addon"><i data-toggle="#password-field" class="fa fa-fw fa-eye toggle-password" aria-hidden="true"></i>- <span class="sr-only">Toggle password visibility</span>+ <span class="sr-only">{{ trans('general.toggle_password_visibility') }}</span></span></div>diff --git a/resources/views/layouts/basic.blade.php b/resources/views/layouts/basic.blade.phpindex 244af2d488..72667ad28e 100644--- a/resources/views/layouts/basic.blade.php+++ b/resources/views/layouts/basic.blade.php@@ -64,18 +64,6 @@{{-- Javascript files --}}<script src="{{ url(mix('js/dist/all.js')) }}" nonce="{{ csrf_token() }}"></script>- <script>- $(".toggle-password").click(function () {- $(this).toggleClass("fa-eye fa-eye-slash");- var input = $($(this).attr("data-toggle"));- if (input.attr("type") === "password") {- input.attr("type", "text");- }- else {- input.attr("type", "password");- }- });- </script>@stack('js')</body>diff --git a/resources/views/users/edit.blade.php b/resources/views/users/edit.blade.phpindex b7a1f0e7be..cd8b86e03a 100755--- a/resources/views/users/edit.blade.php+++ b/resources/views/users/edit.blade.php@@ -130,8 +130,13 @@<div class="col-md-6">@if ($user->ldap_import!='1' || str_contains(Route::currentRouteName(), 'clone') )- <input type="password" name="password" class="form-control{{ (!Gate::allows('canEditAuthFields', $user)) || ((!Gate::allows('editableOnDemo') && ($user->id))) ? ' form-control--disabled' : '' }}" id="password" value="" maxlength="500" autocomplete="off" onfocus="this.removeAttribute('readonly');" readonly {{ ((Helper::checkIfRequired($user, 'password')) && (!$user->id)) ? ' required' : '' }}{!! (!Gate::allows('canEditAuthFields', $user)) || ((!Gate::allows('editableOnDemo')) && ($user->id)) ? ' style="cursor: not-allowed" disabled ' : '' !!}>- <span id="generated-password"></span>+ <div class="input-group">+ <input type="password" name="password" class="form-control{{ (!Gate::allows('canEditAuthFields', $user)) || ((!Gate::allows('editableOnDemo') && ($user->id))) ? ' form-control--disabled' : '' }}" id="password" value="" maxlength="500" autocomplete="off" onfocus="this.removeAttribute('readonly');" readonly {{ ((Helper::checkIfRequired($user, 'password')) && (!$user->id)) ? ' required' : '' }}{!! (!Gate::allows('canEditAuthFields', $user)) || ((!Gate::allows('editableOnDemo')) && ($user->id)) ? ' style="cursor: not-allowed" disabled ' : '' !!}>+ <span class="input-group-addon">+ <i data-toggle="#password" class="fa fa-fw fa-eye toggle-password" aria-hidden="true"></i>+ <span class="sr-only">{{ trans('general.toggle_password_visibility') }}</span>+ </span>+ </div>{!! $errors->first('password', '<span class="alert-msg" aria-hidden="true">:message</span>') !!}@else<p class="form-control-static">@@ -172,7 +177,13 @@{{ trans('admin/users/table.password_confirm') }}</label><div class="col-md-6">- <input type="password" name="password_confirmation" id="password_confirm" class="form-control" value="" maxlength="500" autocomplete="off" aria-label="password_confirmation" {{ (!$user->id) ? ' required' : '' }} onfocus="this.removeAttribute('readonly');" readonly {!! (!Gate::allows('canEditAuthFields', $user)) || ((!Gate::allows('editableOnDemo')) && ($user->id)) ? ' style="cursor: not-allowed" disabled ' : '' !!}>+ <div class="input-group">+ <input type="password" name="password_confirmation" id="password_confirm" class="form-control" value="" maxlength="500" autocomplete="off" aria-label="password_confirmation" {{ (!$user->id) ? ' required' : '' }} onfocus="this.removeAttribute('readonly');" readonly {!! (!Gate::allows('canEditAuthFields', $user)) || ((!Gate::allows('editableOnDemo')) && ($user->id)) ? ' style="cursor: not-allowed" disabled ' : '' !!}>+ <span class="input-group-addon">+ <i data-toggle="#password_confirm" class="fa fa-fw fa-eye toggle-password" aria-hidden="true"></i>+ <span class="sr-only">{{ trans('general.toggle_password_visibility') }}</span>+ </span>+ </div>@cannot('canEditAuthFields', $user)<p class="help-block">@@ -734,7 +745,6 @@ $(document).ready(function() {$('#genPassword').pGenerator({'bind': 'click','passwordElement': '#password',- 'displayElement': '#generated-password','passwordLength': {{ ($settings->pwd_secure_min + 9) }},'uppercase': true,'lowercase': true,