admin/Facilitor
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

FCLT#63805 Weg met die popup in het login scherm

Browse Source 
svn path=/Website/trunk/; revision=54735
This commit is contained in:
Gijs Wassink
2022-01-28 12:11:53 +00:00
parent eaae676fee
commit 97793e44a3
2 changed files with 77 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

118
APPL/AUT/login.asp
View File

@@ -60,9 +60,9 @@ checkUserAgent(); // heeft device capability bits gezet
{
if (json.success && json.otp_prompt)
{
$("#langtoggle, .loginname, .loginpass, .remember").hide(); // Ingevulde usernaam/ wachtwoord laten we bewust staan
$(".otp").show(); // en submitten we een tweede keer maar dan met otpcode
$(".otp").find("label").html(json.otp_prompt);
$("[name=ifl_f]").hide(); // Ingevulde usernaam/ wachtwoord laten we bewust staan
$("[name=ifl_f_otp]").show(); // en submitten we een tweede keer maar dan met otpcode
$("[name=ifl_f_otp]").find("label").html(json.otp_prompt);
$("#otpcode").focus();
}
else if (json.success)
@@ -108,20 +108,18 @@ checkUserAgent(); // heeft device capability bits gezet
function passwrd2mail()
{
currentMode = "passwrd2mail"
$("#langtoggle, .loginname, .loginpass, .remember, .vertical li").hide();
$(".passtomail").show();
$("#sendpasswrd2mail, #toHome, #btnreturn").removeClass('hidden').show();
$("form[name='ifl_f'").hide();
$("form[name='ifl_f_pm'").show();
}
function sendpasswrd2mail()
{
var hasempty = false;
var decoded = decodeURIComponent($("[name=ifl_f]").serialize().split("RVT_token=")[1]);
var email = $("#vismail").val();
var data = { mode: "A"
, email: email
, RVT_token: decoded
};
<% protectRequest.dataToken("data"); %>
if (!validateForm("u2"))
@@ -133,20 +131,18 @@ checkUserAgent(); // heeft device capability bits gezet
function token2mail()
{
currentMode = "token2mail"
$("#langtoggle, .loginname, .loginpass, .remember, .vertical li").hide();
$(".tokentomail").show();
$("#sendtoken2mail, #toHome, #btnreturn").removeClass('hidden').show();
$("form[name='ifl_f'").hide();
$("form[name='ifl_f_tm'").show();
}
function sendtoken2mail()
{
var hasempty = false;
var decoded = decodeURIComponent($("[name=ifl_f]").serialize().split("RVT_token=")[1]);
var email = $("#vistoken").val();
var data = { mode: "B"
, email: email
, RVT_token: decoded
};
<% protectRequest.dataToken("data"); %>
if (!validateForm("u2"))
@@ -158,15 +154,13 @@ checkUserAgent(); // heeft device capability bits gezet
function selfregister()
{
currentMode = "selfregister"
$("#langtoggle, .loginname, .loginpass, .remember, .vertical li").hide();
$(".selfregister").show();
$("#sendselfregister, #toHome, #btnreturn").removeClass('hidden').show();
$("form[name='ifl_f'").hide();
$("form[name='ifl_f_sr'").show();
}
function sendselfregister()
{
var hasempty = false;
var decoded = decodeURIComponent(decodeURIComponent($("[name=ifl_f]").serialize().split("RVT_token=")[1]));
var prs_email = $('input[name="prs_email"]').val();
var password1 = $('input[name="password1"]').val();
var password2 = $('input[name="password2"]').val();
@@ -180,13 +174,14 @@ checkUserAgent(); // heeft device capability bits gezet
, prs_naam: prs_naam
, prs_vrnaam: prs_vrnaam
, prs_telnr: prs_telnr
, RVT_token: decoded
};
<% protectRequest.dataToken("data"); %>
if (!validateForm("u2"))
return;
$.post("<%=rooturl%>/appl/prs/self_register_save.asp?", data, FcltCallback, "json");
$.post($("form[name=ifl_f_sr]")[0].action, data, FcltCallback, "json");
}
function toHome()
@@ -227,36 +222,15 @@ checkUserAgent(); // heeft device capability bits gezet
%></div>
<% } %>
<div class="form-group loginname">
<input class="form-control required" type="text" maxlength="200" id="visname" name="vis_name" value="<%=safe.jsstring(prs_email)%>" placeholder="<%=L("lcl_vis_log_name")%>">
<input class="form-control required" type="text" maxlength="200" id="visname" name="vis_name" autocomplete="off" value="<%=safe.jsstring(prs_email)%>" placeholder="<%=L("lcl_vis_log_name")%>">
</div>
<div class="form-group loginpass">
<input class="form-control" type="password" <%=(S("mobile_password") == 1?" readonly ":"")%> maxlength="50" id="vispswd" name="vis_pswd" placeholder="<%=L("lcl_vis_log_psw")%>">
<input class="form-control" type="password" <%=(S("mobile_password") == 1?" readonly ":"")%> maxlength="50" id="vispswd" autocomplete="off" name="vis_pswd" placeholder="<%=L("lcl_vis_log_psw")%>">
</div>
<div class="form-group passtomail" style="display:none">
<input class="form-control required" type="text" maxlength="200" id="vismail" name="vis_mail" placeholder="<%=L("lcl_noti_sendbymail")%>">
</div>
<div class="form-group tokentomail" style="display:none">
<input class="form-control required" type="text" maxlength="200" id="vistoken" name="vis_token" placeholder="<%=L("lcl_token2email")%>">
</div>
<div class="form-group selfregister" style="display:none">
<input class="form-control required" type="text" maxlength="200" id="visselfregister" name="prs_naam" placeholder="<%=L("lcl_prs_person_name")%>">
<input class="form-control required" type="text" maxlength="200" id="visselfregister" name="prs_vrnaam" placeholder="<%=L("lcl_prs_person_voornaam")%>">
<input class="form-control required" type="text" maxlength="200" id="visselfregister" name="prs_email" placeholder="<%=L("lcl_prs_person_email")%>">
<input class="form-control required" type="text" maxlength="200" id="visselfregister" name="prs_telnr" placeholder="<%=L("lcl_prs_person_phone")%>">
<input class="form-control required" type="password" maxlength="200" id="visselfregister" name="password1" placeholder="<%=L("lcl_ch_password_new")%>">
<input class="form-control required" type="password" maxlength="200" id="visselfregister" name="password2" placeholder="<%=L("lcl_ch_password_con")%>">
</div>
<div class="form-group otp" style="display:none">
<label for="otpcode"></label>
<input class="form-control" type="text" maxlength="6" id="otpcode" name="otpcode">
</div>
<% if (S("login_remember_days") > 0)
<%
if (S("login_remember_days") > 0)
{
%><div class="form-group remember">
<%
@@ -265,29 +239,71 @@ checkUserAgent(); // heeft device capability bits gezet
%><span class="details mobkey fontsizeFix" id="mobbutton" title="<%=L("lcl_password_to_mobile")%>" alt="SMS" onClick="passwrd2mobile();"><%=I("fa-sms fa-lg")%></span><%
}
%>
<input type="checkbox" id="remember" name="remember"><span class="fontsizeFix" for="remember"><%=L("lcl_login_remember")%></span>
<input type="checkbox" id="remember" name="remember"><label class="fontsizeFix rememberme" for="remember"><%=L("lcl_login_remember")%></label>
</div><%
}
var buttons = [ { title: L("lcl_logon"), action: "do_submit()", importance: 1, icon: "fa-sign-in" } ];
if (S("fac_emailtoken_auth_expire") > 0 && device.test(device.isMobile))
{
buttons.push ({ title: L("lcl_token2email"), action: "token2mail()", importance: 1, icon: "fa-envelope" });
buttons.push ({ title: L("lcl_mes_send"), action: "sendtoken2mail()", importance: 3, icon: "fa-envelope", xclass: "hidden", id: "sendtoken2mail" });
}
else if (S("email_password") > 0)
{
buttons.push ({ title: L("lcl_password_to_email"), action: "passwrd2mail()", importance: 3, icon: "fa-envelope" });
buttons.push ({ title: L("lcl_mes_send"), action: "sendpasswrd2mail()", importance: 1, icon: "fa-envelope", xclass: "hidden", id: "sendpasswrd2mail" });
}
if (S("self_register") == 1)
{
buttons.push ({ title: L("lcl_self_register"), action: "selfregister()", importance: 3, icon: "fa-handshake" });
buttons.push ({ title: L("lcl_self_register"), action: "sendselfregister()", importance: 1, icon: "fa-envelope", xclass: "hidden", id: "sendselfregister" });
}
buttons.push ({ title: L("lcl_back"), action: "toHome()", importance: 1, icon: "fa-home", xclass: "hidden", id: "btnreturn" });
CreateButtons(buttons, { entersubmit: true, vertical: true, showIcons: true, display: "flex" });
IFACE.FORM_END(); %>
%>
<%IFACE.FORM_END();%>
</form>
<form name="ifl_f_pm" action="<%=rooturl%>/appl/aut/pass2mail_save.asp" method="post" onsubmit="do_submit();return false;" autocomplete="off" hidden>
<div class="form-group passtomail">
<input class="form-control required" type="text" maxlength="200" id="vismail" name="vis_mail" placeholder="<%=L("lcl_noti_sendbymail")%>">
</div>
<%
var buttons = [ {title: L("lcl_mes_send"), action: "sendpasswrd2mail()", importance: 1, icon: "fa-envelope", id: "sendpasswrd2mail" }];
buttons.push ({ title: L("lcl_back"), action: "toHome()", importance: 1, icon: "fa-home", id: "btnreturn" });
CreateButtons(buttons, { entersubmit: true, vertical: true, showIcons: true, display: "flex" });
%>
</form>
<form name="ifl_f_tm" action="<%=rooturl%>/appl/aut/pass2mail_save.asp" method="post" onsubmit="do_submit();return false;" autocomplete="off" hidden>
<div class="form-group tokentomail">
<input class="form-control required" type="text" maxlength="200" id="vistoken" name="vis_token" placeholder="<%=L("lcl_token2email")%>">
</div>
<%
var buttons = [{ title: L("lcl_mes_send"), action: "sendtoken2mail()", importance: 3, icon: "fa-envelope", id: "sendtoken2mail" }];
buttons.push ({ title: L("lcl_back"), action: "toHome()", importance: 1, icon: "fa-home", id: "btnreturn" });
CreateButtons(buttons, { entersubmit: true, vertical: true, showIcons: true, display: "flex" });
%>
</form>
<form name="ifl_f_sr" action="<%=rooturl%>/appl/prs/self_register_save.asp?" method="post" onsubmit="do_submit();return false;" autocomplete="off" hidden>
<div class="form-group selfregister">
<input class="form-control required visselfregister" type="text" maxlength="200" autocomplete="off" name="prs_naam" placeholder="<%=L("lcl_prs_person_name")%>">
<input class="form-control required visselfregister" type="text" maxlength="200" name="prs_vrnaam" placeholder="<%=L("lcl_prs_person_voornaam")%>">
<input class="form-control required visselfregister" type="text" maxlength="200" name="prs_email" placeholder="<%=L("lcl_prs_person_email")%>">
<input class="form-control required visselfregister" type="text" maxlength="200" autocomplete="off" name="prs_telnr" placeholder="<%=L("lcl_prs_person_phone")%>">
<input class="form-control required visselfregister" type="password" maxlength="200" autocomplete="off" name="password1" placeholder="<%=L("lcl_ch_password_new")%>">
<input class="form-control required visselfregister" type="password" maxlength="200" autocomplete="off" name="password2" placeholder="<%=L("lcl_ch_password_con")%>">
</div>
<%
var buttons = [ { title: L("lcl_self_register"), action: "sendselfregister()", importance: 1, icon: "fa-envelope", id: "sendselfregister" } ];
buttons.push ({ title: L("lcl_back"), action: "toHome()", importance: 1, icon: "fa-home", id: "btnreturn" });
CreateButtons(buttons, { entersubmit: true, vertical: true, showIcons: true, display: "flex" });
%>
</form>
<form name="ifl_f_otp" action="<%=rooturl%>/appl/aut/login_save.asp" method="post" onsubmit="do_submit();return false;" autocomplete="off" hidden>
<div class="form-group otp">
<label for="otpcode"></label>
<input class="form-control" type="text" maxlength="6" id="otpcode" name="otpcode">
</div>
<%
var buttons = [{ title: L("lcl_back"), action: "toHome()", importance: 1, icon: "fa-home", id: "btnreturn" }];
CreateButtons(buttons, { entersubmit: true, vertical: true, showIcons: true, display: "flex" });
%>
</form>
</div>

13
APPL/Shared/default.csx
View File

@@ -421,7 +421,7 @@ i.btn_disabled
}
#loginbody form .form-control {
background: none;
background: none !important; /* als die color dat is, dan deze ook, anders ios wit-op-wit */
border: none;
border-bottom: 1px solid rgba(0,0,0,0.7);
border-radius: 0;
@@ -441,7 +441,7 @@ i.btn_disabled
#logindiv #vispswd,
#logindiv #vismail,
#logindiv #vistoken,
#logindiv #visselfregister,
#logindiv .visselfregister,
#logindiv #otpcode,
#logindiv #prsemail,
#logindiv #remember {
@@ -453,7 +453,7 @@ i.btn_disabled
#logindiv #vispswd,
#logindiv #vismail,
#logindiv #vistoken,
#logindiv #visselfregister,
#logindiv .visselfregister,
#logindiv #otpcode,
#logindiv #prsemail {
width: 100%;
@@ -1249,6 +1249,13 @@ h3 {
text-align:left;
}
/* voor login "onthoud mij" label */
.rememberme {
color: #ffffff !important;
}
.rememberme:hover {
color: #00c !important;;
}
/* ******* QUALIFIERS, algemene verbijzonderingen ***** */
.labelextra {