Merge pull request #5861 from Sanjaybhattwebkul/Add-viewPassword-option
view-Password-added-default
This commit is contained in:
Glenn Hermans
GitHub
commit
e5635e85f4
|
|
@ -158,6 +158,7 @@ return [
|
|||
'verify-first' => 'الرجاء قم بتفعيل حسابك.',
|
||||
'not-activated' => 'التنشيط الخاص بك يسعى للحصول على موافقة المشرف',
|
||||
'resend-verification' => 'إعادة إرسال البريد الإلكتروني للتحقق مرة أخرى',
|
||||
'show-password' => 'عرض كلمة المرور',
|
||||
],
|
||||
|
||||
'forgot-password' => [
|
||||
|
|
|
|||
|
|
@ -158,6 +158,7 @@ return [
|
|||
'verify-first' => 'Bestätigung Sie zuerst Ihr E-Mail-Konto.',
|
||||
'not-activated' => 'Ihre Aktivierung erfordert die Genehmigung des Administrators',
|
||||
'resend-verification' => 'Senden Sie die Bestätigungsmail erneut',
|
||||
'show-password' => 'Laat wachtwoord zien',
|
||||
],
|
||||
|
||||
'forgot-password' => [
|
||||
|
|
|
|||
|
|
@ -159,6 +159,8 @@ return [
|
|||
'verify-first' => 'Verify your email account first.',
|
||||
'not-activated' => 'Your activation seeks admin approval',
|
||||
'resend-verification' => 'Resend verification mail again',
|
||||
'show-password' => 'Show Password',
|
||||
|
||||
],
|
||||
|
||||
'forgot-password' => [
|
||||
|
|
|
|||
|
|
@ -158,6 +158,7 @@ return [
|
|||
'verify-first' => 'Verifica tu correo electrónico primero',
|
||||
'not-activated' => 'La activación de la cuenta será aprovada por el administrador',
|
||||
'resend-verification' => 'Se ha reenviado un correo de verificación',
|
||||
'show-password' => 'Montru Pasvorton',
|
||||
],
|
||||
|
||||
'forgot-password' => [
|
||||
|
|
|
|||
|
|
@ -155,6 +155,7 @@ return [
|
|||
'verify-first' => 'ابتدا حساب ایمیل خود را تأیید کنید',
|
||||
'not-activated' => 'فعال سازی شما به دنبال تأیید سرپرست است',
|
||||
'resend-verification' => 'مجدداً نامه تأیید را دوباره ارسال کنید',
|
||||
'show-password' => 'montrer le mot de passe',
|
||||
],
|
||||
|
||||
'forgot-password' => [
|
||||
|
|
|
|||
|
|
@ -157,6 +157,7 @@ return [
|
|||
'verify-first' => 'Vérifiez d\'abord votre compte de messagerie.',
|
||||
'not-activated' => 'Votre activation demande l\'approbation de l\'administrateur',
|
||||
'resend-verification' => 'Renvoyer à nouveau l\'e-mail de vérification',
|
||||
'show-password' => 'montrer le mot de passe',
|
||||
],
|
||||
|
||||
'forgot-password' => [
|
||||
|
|
|
|||
|
|
@ -156,6 +156,7 @@ return [
|
|||
'verify-first' => 'Verifica prima il tuo account email.',
|
||||
'not-activated' => 'La tua attivazione richiede l\'approvazione di un amministratore',
|
||||
'resend-verification' => 'Reinvia l\'email di verifica',
|
||||
'show-password' => 'mostra password',
|
||||
],
|
||||
|
||||
'forgot-password' => [
|
||||
|
|
|
|||
|
|
@ -155,6 +155,7 @@ return [
|
|||
'verify-first' => 'メールアドレスを認証してください',
|
||||
'not-activated' => 'このアカウントは管理者の認証が出来次第、有効になります',
|
||||
'resend-verification' => 'アカウント確認メールが再送信',
|
||||
'show-password' => '顯示密碼',
|
||||
],
|
||||
|
||||
'forgot-password' => [
|
||||
|
|
|
|||
|
|
@ -163,6 +163,7 @@ return [
|
|||
'verify-first' => 'Verifieer eerst uw e-mailaccount.',
|
||||
'not-activated' => 'Uw activering vraagt om goedkeuring van de beheerder.',
|
||||
'resend-verification' => 'Verzend de verificatie-e-mail opnieuw',
|
||||
'show-password' => 'Vis passord',
|
||||
],
|
||||
|
||||
'forgot-password' => [
|
||||
|
|
|
|||
|
|
@ -156,6 +156,7 @@ return [
|
|||
'verify-first' => 'Najpierw zweryfikuj swoje konto e-mail.',
|
||||
'not-activated' => 'Twoja aktywacja wymaga zgody administratora',
|
||||
'resend-verification' => 'Wyślij ponownie wiadomość weryfikacyjną',
|
||||
'show-password' => 'Pokaż hasło',
|
||||
],
|
||||
|
||||
'forgot-password' => [
|
||||
|
|
|
|||
|
|
@ -156,6 +156,7 @@ return [
|
|||
'invalid-creds' => 'Por favor, verifique suas credenciais e tente novamente',
|
||||
'verify-first' => 'Verifique seu e-mail primeiro',
|
||||
'resend-verification' => 'Reenviar email de verificação novamente',
|
||||
'show-password' => 'show-password',
|
||||
],
|
||||
|
||||
'forgot-password' => [
|
||||
|
|
|
|||
|
|
@ -155,6 +155,7 @@ return [
|
|||
'verify-first' => 'Öncelikle mail adresinizi doğrulayınız.',
|
||||
'not-activated' => 'Yönetici aktivasyonu gerekiyor.',
|
||||
'resend-verification' => 'Doğrulama mailini yeniden gönder',
|
||||
'show-password' => 'Şifreyi göster',
|
||||
],
|
||||
|
||||
'forgot-password' => [
|
||||
|
|
|
|||
|
|
@ -158,7 +158,8 @@ return [
|
|||
'invalid-creds' => '请检查您的凭据并重试.',
|
||||
'verify-first' => '首先验证您的电子邮件帐户.',
|
||||
'not-activated' => '您的激活需要管理员批准',
|
||||
'resend-verification' => '重新发送验证邮件'
|
||||
'resend-verification' => '重新发送验证邮件',
|
||||
'show-password' => '显示密码',
|
||||
],
|
||||
|
||||
'forgot-password' => [
|
||||
|
|
|
|||
|
|
@ -30,19 +30,26 @@
|
|||
<div class="control-group" :class="[errors.has('password') ? 'has-error' : '']">
|
||||
<label for="password" class="required">{{ __('shop::app.customer.login-form.password') }} </label>
|
||||
<input type="password" v-validate="'required|min:6'" class="control" id="password" name="password" data-vv-as=""{{ __('admin::app.users.sessions.password') }}"" value=""/>
|
||||
<i refer="#password" class="icon eye-icon toggle-password-icon icon-position"></i>
|
||||
<span class="control-error" v-if="errors.has('password')">@{{ errors.first('password') }}</span>
|
||||
<span class="control-error" v-if="errors.has('password')">@{{ errors.first('password') }}</span>
|
||||
</div>
|
||||
|
||||
<div class="forgot-password-link">
|
||||
<a href="{{ route('customer.forgot-password.create') }}">{{ __('shop::app.customer.login-form.forgot_pass') }}</a>
|
||||
<div class="row">
|
||||
<div class="col-md-6">
|
||||
<input type="checkbox" id="shoPassword" >{{ __('shop::app.customer.login-form.show-password') }}
|
||||
</div>
|
||||
|
||||
<div class="mt-10">
|
||||
@if (Cookie::has('enable-resend'))
|
||||
@if (Cookie::get('enable-resend') == true)
|
||||
<a href="{{ route('customer.resend.verification-email', Cookie::get('email-for-resend')) }}">{{ __('shop::app.customer.login-form.resend-verification') }}</a>
|
||||
@endif
|
||||
@endif
|
||||
<div class="col-md-6">
|
||||
<div class="forgot-password-link">
|
||||
<a href="{{ route('customer.forgot-password.create') }}">{{ __('shop::app.customer.login-form.forgot_pass') }}</a>
|
||||
|
||||
<div class="mt-10">
|
||||
@if (Cookie::has('enable-resend'))
|
||||
@if (Cookie::get('enable-resend') == true)
|
||||
<a href="{{ route('customer.resend.verification-email', Cookie::get('email-for-resend')) }}">{{ __('shop::app.customer.login-form.resend-verification') }}</a>
|
||||
@endif
|
||||
@endif
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
|
@ -67,17 +74,16 @@
|
|||
|
||||
{!! Captcha::renderJS() !!}
|
||||
<script>
|
||||
$(document).ready(function(){
|
||||
$(".toggle-password-icon").click(function() {
|
||||
$(this).toggleClass("icon eye-icon rango-eye-hide");
|
||||
var input = $($(this).attr("refer"));
|
||||
if (input.attr("type") == "password") {
|
||||
input.attr("type", "text");
|
||||
} else {
|
||||
input.attr("type", "password");
|
||||
}
|
||||
});
|
||||
$(document).ready(function(){
|
||||
$("#shoPassword").click(function() {
|
||||
var input = $('#password').attr("type");
|
||||
if (input == "password") {
|
||||
$('#password').attr("type", "text");
|
||||
} else {
|
||||
$('#password').attr("type", "password");
|
||||
}
|
||||
});
|
||||
</script>
|
||||
});
|
||||
</script>
|
||||
|
||||
@endpush
|
||||
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
|
|
@ -1,10 +1,10 @@
|
|||
{
|
||||
"/js/jquery-ez-plus.js": "/js/jquery-ez-plus.js?id=839a8f4f976c7cb12580c31185296bdb",
|
||||
"/js/jquery-ez-plus.js": "/js/jquery-ez-plus.js?id=ba3c7cada62de152fd8fce211d0b1b70",
|
||||
"/js/velocity-core.js": "/js/velocity-core.js?id=8010dfb021a49555afa74bf3bf25b33e",
|
||||
"/js/velocity.js": "/js/velocity.js?id=8467110c3c1ee5e363d02172acbf1a3f",
|
||||
"/js/velocity.js": "/js/velocity.js?id=41ab97a1e8fa27ba1e09e915c792190c",
|
||||
"/js/manifest.js": "/js/manifest.js?id=3cded37ef514b0fb89b10e7109801248",
|
||||
"/js/components.js": "/js/components.js?id=f536199f308a82f48041993dd85acdd3",
|
||||
"/css/velocity.css": "/css/velocity.css?id=8e689eb5ae9b5579e1ebd24452040362",
|
||||
"/js/components.js": "/js/components.js?id=4390fa88845ac905ec54dc849367c604",
|
||||
"/css/velocity.css": "/css/velocity.css?id=3b5f85c69aa3aea98f82a473a90ace3e",
|
||||
"/css/velocity-admin.css": "/css/velocity-admin.css?id=b67a82956e53163b5e3ff45a44f9778f",
|
||||
"/images/icon-calendar.svg": "/images/icon-calendar.svg?id=870d0f733a58377422766f3152e15486",
|
||||
"/images/icon-camera.svg": "/images/icon-camera.svg?id=b2fd2f9e17e1ccee96e29f6c6cec91e8",
|
||||
|
|
|
|||
|
|
@ -1138,3 +1138,7 @@ i.within-circle {
|
|||
.main-content-wrapper .content-list ul {
|
||||
width: 101.2% !important;
|
||||
}
|
||||
|
||||
.show-password {
|
||||
margin-top:10px !important;
|
||||
}
|
||||
|
|
@ -72,11 +72,11 @@
|
|||
v-validate="'required'"
|
||||
value="{{ old('password') }}"
|
||||
data-vv-as=""{{ __('shop::app.customer.login-form.password') }}"" />
|
||||
<input type="checkbox" onclick="myFunction()">Show Password
|
||||
<input type="checkbox" onclick="myFunction()" id="shoPassword" class="show-password"> {{ __('shop::app.customer.login-form.show-password') }}
|
||||
<span class="control-error" v-if="errors.has('password')" v-text="errors.first('password')"></span>
|
||||
|
||||
<a href="{{ route('customer.forgot-password.create') }}" class="float-right">
|
||||
{{ __('shop::app.customer.login-form.forgot_pass') }}
|
||||
<a href="{{ route('customer.forgot-password.create') }}" class=" show-password float-right">
|
||||
{{ __('shop::app.customer.login-form.forgot_pass') }}
|
||||
</a>
|
||||
|
||||
<div class="mt10">
|
||||
|
|
@ -111,11 +111,8 @@
|
|||
|
||||
{!! Captcha::renderJS() !!}
|
||||
|
||||
@endpush
|
||||
|
||||
|
||||
<script>
|
||||
function myFunction() {
|
||||
function myFunction() {
|
||||
var x = document.getElementById("password");
|
||||
if (x.type === "password") {
|
||||
x.type = "text";
|
||||
|
|
@ -123,4 +120,10 @@ function myFunction() {
|
|||
x.type = "password";
|
||||
}
|
||||
}
|
||||
|
||||
</script>
|
||||
|
||||
@endpush
|
||||
|
||||
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue