Skip to content

P
PERFORMA_REPLICA
Commit ab63f7e2 by Nilu
Options

S12532305 # Client - Incoming Issues (raised by Client) #Google Password thinks… 

S12532305 # Client - Incoming Issues (raised by Client) #Google Password thinks that phone number is login

S13220410 # Client - Incoming Issues (raised by Client) #Google Password manager - HT member invited
parent 56189925
Showing with 57 additions and 74 deletions
cmsWebApp/webroot/extensions/adminportal/inc/company_user_data.jsp
...@@ -13,6 +13,7 @@ ...@@ -13,6 +13,7 @@
<% <%
CompanyUser companyUser = (CompanyUser) getData(request, "CompanyUser"); CompanyUser companyUser = (CompanyUser) getData(request, "CompanyUser");
Boolean includePrivacy = (Boolean) getData(request, "IncludePrivacyStatements"); Boolean includePrivacy = (Boolean) getData(request, "IncludePrivacyStatements");
Boolean includePassword = (Boolean) getData(request, "IncludePassword");
Debug.assertion(companyUser != null, "Invalid CompanyUser in admin portal"); Debug.assertion(companyUser != null, "Invalid CompanyUser in admin portal");
...@@ -37,6 +38,39 @@ ...@@ -37,6 +38,39 @@
} }
%> %>
</div> </div>
<%
if(CollectionUtils.equals(includePassword, Boolean.TRUE))
{
String key = Utils.getPwdKeyOfSecUser(request, secUser, true);
%>
<script type="text/javascript">
$(document).ready(function() {
$('#myPassword').strength_meter({
"inputName" : "<%= key %>"
});
});
</script>
<style>
.email input[name$="Email"] {
opacity: 0;
position: absolute;
}
</style>
<div class="form-group text-left email">
<label style="display: none;"><oneit:ormlabel obj="<%= secUser %>" field="Email" /></label>
<oneit:ormInput obj="<%= secUser %>" type="text" attributeName="Email" cssClass="form-control"/>
</div>
<div class="form-group text-left" id="myPassword">
<label>Password</label>
</div>
<div class="form-group text-left">
<label>Confirm password</label>
<oneit:input type="password" name="<%= key + 2 %>" class="form-control second-style reset-pw"/>
</div>
<%
}
%>
<div class="row"> <div class="row">
<div class="form-group text-left col-sm-6 col-xs-12"> <div class="form-group text-left col-sm-6 col-xs-12">
<label><oneit:ormlabel obj="<%= secUser %>" field="FirstName" /></label> <label><oneit:ormlabel obj="<%= secUser %>" field="FirstName" /></label>
......
cmsWebApp/webroot/extensions/adminportal/sign_up.jsp
...@@ -102,7 +102,7 @@ ...@@ -102,7 +102,7 @@
<div class="main-box-layout login-box"> <div class="main-box-layout login-box">
<oneit:dynInclude page="/extensions/adminportal/inc/company_user_data.jsp" data="<%= CollectionUtils.EMPTY_MAP%>" CompanyUser="<%= companyUser %>" <oneit:dynInclude page="/extensions/adminportal/inc/company_user_data.jsp" data="<%= CollectionUtils.EMPTY_MAP%>" CompanyUser="<%= companyUser %>"
IncludePrivacyStatements="<%= Boolean.TRUE%>"/> IncludePrivacyStatements="<%= Boolean.TRUE%>" IncludePassword="<%= Boolean.FALSE%>"/>
<oneit:button value="Sign up" name="send" cssClass="box-btn send-btn" <oneit:button value="Sign up" name="send" cssClass="box-btn send-btn"
requestAttribs="<%= CollectionUtils.mapEntry("nextPage", "verification_sent.jsp") requestAttribs="<%= CollectionUtils.mapEntry("nextPage", "verification_sent.jsp")
......
cmsWebApp/webroot/extensions/adminportal/sign_up_eap.jsp
...@@ -84,7 +84,7 @@ ...@@ -84,7 +84,7 @@
<div class="main-box-layout login-box"> <div class="main-box-layout login-box">
<oneit:dynInclude page="/extensions/adminportal/inc/company_user_data.jsp" data="<%= CollectionUtils.EMPTY_MAP%>" CompanyUser="<%= companyUser %>" <oneit:dynInclude page="/extensions/adminportal/inc/company_user_data.jsp" data="<%= CollectionUtils.EMPTY_MAP%>" CompanyUser="<%= companyUser %>"
IncludePrivacyStatements="<%= Boolean.TRUE%>"/> IncludePrivacyStatements="<%= Boolean.TRUE%>" IncludePassword="<%= Boolean.FALSE%>"/>
<oneit:button value="Sign up" name="send" cssClass="box-btn send-btn" <oneit:button value="Sign up" name="send" cssClass="box-btn send-btn"
requestAttribs="<%= CollectionUtils.mapEntry("nextPage", "verification_sent.jsp") requestAttribs="<%= CollectionUtils.mapEntry("nextPage", "verification_sent.jsp")
......
cmsWebApp/webroot/extensions/adminportal/verify_company.jsp
...@@ -66,17 +66,9 @@ ...@@ -66,17 +66,9 @@
opacity: 0.6; opacity: 0.6;
background-color: #0582ba; background-color: #0582ba;
} }
input[name$="UserName"] {
opacity: 0;
position: absolute;
}
</style> </style>
<oneit:form name="verify" method="post"> <oneit:form name="verify" method="post">
<%
String key = Utils.getPwdKeyOfSecUser(request, secUser, true);
%>
<script type="text/javascript"> <script type="text/javascript">
$(document.body).addClass('bg-color'); $(document.body).addClass('bg-color');
...@@ -85,10 +77,6 @@ ...@@ -85,10 +77,6 @@
validate(); validate();
$('input').on('change keyup', function() { validate() }); $('input').on('change keyup', function() { validate() });
interval = setInterval(function() { validate(); }, 500); interval = setInterval(function() { validate(); }, 500);
$('#myPassword').strength_meter({
"inputName" : "<%= key %>"
});
}); });
function validate() { function validate() {
...@@ -110,31 +98,17 @@ ...@@ -110,31 +98,17 @@
$('.verify-btn').attr('disabled', 'disabled'); $('.verify-btn').attr('disabled', 'disabled');
} else { } else {
$('.verify-btn').removeAttr('disabled'); $('.verify-btn').removeAttr('disabled');
// clearInterval(interval);
} }
} }
</script> </script>
<oneit:dynInclude page="/extensions/applicantportal/inc/multifieldtext.jsp" data="<%= CollectionUtils.EMPTY_MAP%>"/> <oneit:dynInclude page="/extensions/applicantportal/inc/multifieldtext.jsp" data="<%= CollectionUtils.EMPTY_MAP%>"/>
<div class="main-box-layout login-box"> <div class="main-box-layout login-box">
<oneit:dynInclude page="/extensions/adminportal/inc/company_user_data.jsp" data="<%= CollectionUtils.EMPTY_MAP%>" CompanyUser="<%= companyUser %>" <oneit:dynInclude page="/extensions/adminportal/inc/company_user_data.jsp" data="<%= CollectionUtils.EMPTY_MAP%>" CompanyUser="<%= companyUser %>"
IncludePrivacyStatements="<%= Boolean.FALSE %>"/> IncludePrivacyStatements="<%= companyUser.getCompany().getAddedByUser() != companyUser %>" IncludePassword="<%= !socialLogin %>"/>
<% <%
if(!socialLogin)
{
%>
<oneit:ormInput obj="<%= secUser %>" type="text" attributeName="UserName" />
<div class="form-group text-left" id="myPassword">
<label>Password</label>
</div>
<div class="form-group text-left">
<label>Confirm password</label>
<oneit:input type="password" name="<%= key + 2 %>" class="form-control second-style reset-pw"/>
</div>
<%
}
if(companyUser.getCompany().getAddedByUser() == companyUser) if(companyUser.getCompany().getAddedByUser() == companyUser)
{ {
%> %>
...@@ -147,33 +121,6 @@ ...@@ -147,33 +121,6 @@
{ {
%> %>
<div class="form-group text-left">
<div class="styled_checkboxes">
<div class="checkbox checkbox-primary">
<oneit:ormInput obj="<%= companyUser %>" id="privacy-policy-agreed" attributeName="PrivacyPolicyAgreed" type="checkbox" />
<oneit:recalcClass htmlTag="span" classScript="companyUser.showPrivacyPolicyAgreed() ? 'checked': 'unchecked'" companyUser="<%= companyUser %>">
<label for="privacy-policy-agreed">
<oneit:label GUIName="I have read and agree to the " />
<a href="https://www.talentology.com/privacy/" target="_blank" class="privacy-link">Privacy Policy</a>
</label>
</oneit:recalcClass>
</div>
</div>
</div>
<div class="form-group text-left">
<div class="styled_checkboxes">
<div class="checkbox checkbox-primary">
<oneit:ormInput obj="<%= companyUser %>" id="conditions-agreed" attributeName="ConditionsAgreed" type="checkbox" />
<oneit:recalcClass htmlTag="span" classScript="companyUser.showConditionsAgreed() ? 'checked': 'unchecked'" companyUser="<%= companyUser %>">
<label for="conditions-agreed">
<oneit:label GUIName="I have read and agree to the " />
<a href="https://www.talentology.com/terms-of-service/" target="_blank" class="privacy-link">Terms & Conditions</a>
</label>
</oneit:recalcClass>
</div>
</div>
</div>
<oneit:button value="Sign up" name="sendCompanyUserInvites" cssClass="box-btn verify-btn" <oneit:button value="Sign up" name="sendCompanyUserInvites" cssClass="box-btn verify-btn"
requestAttribs="<%= CollectionUtils.mapEntry("CompanyUser", companyUser) requestAttribs="<%= CollectionUtils.mapEntry("CompanyUser", companyUser)
.mapEntry("nextPage", homePage) .mapEntry("nextPage", homePage)
......
cmsWebApp/webroot/extensions/applicantportal/verify_identity.jsp
...@@ -79,7 +79,7 @@ ...@@ -79,7 +79,7 @@
background-color: #0582ba; background-color: #0582ba;
} }
input[name$="UserName"] { .email input[name$="Email"] {
opacity: 0; opacity: 0;
position: absolute; position: absolute;
} }
...@@ -155,6 +155,24 @@ ...@@ -155,6 +155,24 @@
<label>Email Address</label> <label>Email Address</label>
<oneit:ormInput obj="<%= secUser %>" type="text" attributeName="Email" cssClass="form-control second-style" disabled="true" readonly="true"/> <oneit:ormInput obj="<%= secUser %>" type="text" attributeName="Email" cssClass="form-control second-style" disabled="true" readonly="true"/>
</div> </div>
<%
if(isVerify)
{
%>
<div class="form-group text-left email">
<label style="display: none;"><oneit:ormlabel obj="<%= secUser %>" field="Email" /></label>
<oneit:ormInput obj="<%= secUser %>" type="text" attributeName="Email" cssClass="form-control"/>
</div>
<div class="form-group text-left" id="myPassword">
<label>Password</label>
</div>
<div class="form-group text-left">
<label>Confirm password</label>
<oneit:input type="password" name="<%= passkey + 2 %>" class="form-control second-style reset-pw"/>
</div>
<%
}
%>
<div class="row"> <div class="row">
<div class="form-group text-left col-sm-6 col-xs-12"> <div class="form-group text-left col-sm-6 col-xs-12">
<label><oneit:ormlabel obj="<%= secUser %>" field="FirstName" /></label> <label><oneit:ormlabel obj="<%= secUser %>" field="FirstName" /></label>
...@@ -208,22 +226,6 @@ ...@@ -208,22 +226,6 @@
<span class="warning-icon"></span> <span class="warning-icon"></span>
</div> </div>
</oneit:recalcClass> </oneit:recalcClass>
<%
if(isVerify)
{
%>
<oneit:ormInput obj="<%= secUser %>" type="text" attributeName="UserName"/>
<div class="form-group text-left" id="myPassword">
<label>Password</label>
</div>
<div class="form-group text-left">
<label>Confirm password</label>
<oneit:input type="password" name="<%= passkey + 2 %>" class="form-control second-style reset-pw"/>
</div>
<%
}
%>
<div class="form-group text-left"> <div class="form-group text-left">
<div class="styled_checkboxes"> <div class="styled_checkboxes">
<div class="checkbox checkbox-primary"> <div class="checkbox checkbox-primary">
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment