Merge branch 'master' of bitbucket.org:venbainformationtechnology/golf_backend
This commit is contained in:
commit
d9c007fc4f
@ -105,7 +105,7 @@
|
|||||||
|
|
||||||
<!-- LOGO -->
|
<!-- LOGO -->
|
||||||
<div class="logo-box">
|
<div class="logo-box">
|
||||||
<a href="index.html" class="logo logo-dark text-center">
|
<a class="logo logo-dark text-center">
|
||||||
<span class="logo-sm">
|
<span class="logo-sm">
|
||||||
<img src="<?= base_url()."/public"; ?>/assets/images/logo-sm-dark.png" alt="" height="24">
|
<img src="<?= base_url()."/public"; ?>/assets/images/logo-sm-dark.png" alt="" height="24">
|
||||||
<!-- <span class="logo-lg-text-light">Minton</span> -->
|
<!-- <span class="logo-lg-text-light">Minton</span> -->
|
||||||
@ -116,7 +116,7 @@
|
|||||||
</span>
|
</span>
|
||||||
</a>
|
</a>
|
||||||
|
|
||||||
<a href="index.html" class="logo logo-light text-center">
|
<a class="logo logo-light text-center">
|
||||||
<span class="logo-sm">
|
<span class="logo-sm">
|
||||||
<img src="<?= base_url()."/public"; ?>/assets/images/company-logo/golf_logo_2.png" alt="" height="30">
|
<img src="<?= base_url()."/public"; ?>/assets/images/company-logo/golf_logo_2.png" alt="" height="30">
|
||||||
</span>
|
</span>
|
||||||
|
|||||||
@ -54,15 +54,15 @@
|
|||||||
if(!session()->has('token'))
|
if(!session()->has('token'))
|
||||||
echo base_url('membership');
|
echo base_url('membership');
|
||||||
else
|
else
|
||||||
echo base_url('/continue_membership/').session()->get('token');
|
echo base_url('/membership/').session()->get('token');
|
||||||
}
|
}
|
||||||
else if(session()->has('token'))
|
else if(session()->has('token'))
|
||||||
{
|
{
|
||||||
echo base_url('/continue_membership/').session()->get('token');
|
echo base_url('/membership/').session()->get('token');
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
echo base_url('/continue_membership/').md5($token);
|
echo base_url('/membership/').md5($token);
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
@ -70,7 +70,7 @@
|
|||||||
{
|
{
|
||||||
if(session()->has('token'))
|
if(session()->has('token'))
|
||||||
{
|
{
|
||||||
echo base_url('/continue_membership/').session()->get('token');
|
echo base_url('/membership/').session()->get('token');
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
|
|||||||
@ -320,7 +320,7 @@
|
|||||||
<div class="col-6 col-lg-6"></div>
|
<div class="col-6 col-lg-6"></div>
|
||||||
<div class="col-6 col-lg-6 mb-3 show-password1">
|
<div class="col-6 col-lg-6 mb-3 show-password1">
|
||||||
<label for="new_password">New Password</label><br>
|
<label for="new_password">New Password</label><br>
|
||||||
<span toggle="#new_password" id="toggle-password1" class="fa fa-fw fa-eye field-icon toggle-password"></span>
|
<span toggle="#new_password" id="toggle-password1" class="fa fa-fw fa-eye field-icon toggle-password"></span>
|
||||||
<input type="password" name="password" id="new_password"
|
<input type="password" name="password" id="new_password"
|
||||||
pattern="(?=.*\d)(?=.*[a-z])(?=.*[A-Z])(?=.*[^a-zA-Z0-9])(?!.*\s).{8,}"
|
pattern="(?=.*\d)(?=.*[a-z])(?=.*[A-Z])(?=.*[^a-zA-Z0-9])(?!.*\s).{8,}"
|
||||||
title="Must contain at least one number and one uppercase and lowercase letter, and at least 8 or more characters"
|
title="Must contain at least one number and one uppercase and lowercase letter, and at least 8 or more characters"
|
||||||
@ -340,6 +340,7 @@
|
|||||||
<div class="col-6 col-lg-6"></div>
|
<div class="col-6 col-lg-6"></div>
|
||||||
<div class="col-6 col-lg-6 mb-3">
|
<div class="col-6 col-lg-6 mb-3">
|
||||||
<label for="confirm_password">Confirm Password</label><br>
|
<label for="confirm_password">Confirm Password</label><br>
|
||||||
|
<span toggle="#new_password" id="toggle-password2" class="fa fa-fw fa-eye field-icon toggle-password"></span>
|
||||||
<input type="password" name="confirm_password" id="confirm_password" required>
|
<input type="password" name="confirm_password" id="confirm_password" required>
|
||||||
<span id="error_cp"></span>
|
<span id="error_cp"></span>
|
||||||
</div>
|
</div>
|
||||||
@ -488,6 +489,15 @@ $(document).ready(function(){
|
|||||||
input.attr("type", "password");
|
input.attr("type", "password");
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
$("#toggle-password2").click(function() {
|
||||||
|
$(this).toggleClass("fa-eye fa-eye-slash");
|
||||||
|
if ($('#confirm_password').attr("type") == "password") {
|
||||||
|
$('#confirm_password').attr("type", "text");
|
||||||
|
}
|
||||||
|
else {
|
||||||
|
$('#confirm_password').attr("type", "password");
|
||||||
|
}
|
||||||
|
});
|
||||||
</script>
|
</script>
|
||||||
</body>
|
</body>
|
||||||
</html>
|
</html>
|
||||||
Loading…
Reference in New Issue
Block a user