Skip to content

P
PERFORMA_REPLICA
Commit 8b501fde by chenith
Options

Updated invite users page.

parent 34dfe523
Showing with 133 additions and 53 deletions
cmsWebApp/webroot/css/common.css
...@@ -4889,7 +4889,7 @@ label, label .label-title span { ...@@ -4889,7 +4889,7 @@ label, label .label-title span {
/* End of Clients HT010 */ /* End of Clients HT010 */
.hire-the-right-candi { .hire-the-right-candi {
height: 24px; height: 75px;
font-family: Usual-Medium; font-family: Usual-Medium;
font-size: 20px; font-size: 20px;
font-weight: 500; font-weight: 500;
...@@ -4930,4 +4930,106 @@ label, label .label-title span { ...@@ -4930,4 +4930,106 @@ label, label .label-title span {
.content-to-center { .content-to-center {
text-align: center; text-align: center;
}
.hello-company-name{
height: 75px;
color: #4a4a4a;
font-weight: 500;
font-size: 20px;
}
.main-company-profile {
margin: 60px auto 0;
width: 47.009%;
}
.main-compony-section{
display: inline-block;
width: 100%;
padding: 45px 50px 20px;
}
.company-radio-btn .form-group{
margin-bottom: 20px;
}
.company-profile-btn input.btn.btn-primary{
width: 280px;
}
.company-profile-btn {
border-top: 1px solid #ededef;
padding: 45px 0 25px;
margin-bottom: 55px;
}
.company-select-box label{
margin: 0 0 10px;
}
.set-margin-space{
margin-top: 27px;
}
.company-radio-btn .radio label{
padding-left: 10px;
}
.hello-company-name{
color: #4a4a4a;
font-weight: 500;
font-size: 20px;
}
.main-company-pro-logo {
text-align: center;
}
.company-pro-logo {
margin: 11% 0 2.9%;
}
.main-invite-friend{
display: inline-block;
width: 100%;
padding: 59px 50px 46px;
}
.main-invite-friend .form-group{
margin-bottom: 20px;
position: relative;
}
.add-input-box{
text-align: center;
margin-top: 5px;
display: inline-block;
width: 100%;
}
.remove-input-field {
width: 28px;
height: 28px;
background-color: #ffffff;
border: solid 2px #9b9b9b;
position: absolute;
right: -14px;
top: 50%;
border-radius: 100px;
text-align: center;
cursor: pointer;
transform: translateY(-50%);
}
.remove-input-field span {
display: inline-block;
width: 12px;
border: solid 1px #8e97a0;
position: relative;
top: -2px;
}
.add-more-input-field {
cursor: pointer;
letter-spacing: 1px;
color: #ffffff;
font-size: 11px;
font-weight: 500;
border-radius: 100px;
background-color: #667281;
display: inline-block;
min-height: 45px;
line-height: 45px;
padding: 0 23.37px;
text-transform: uppercase;
}
.add-more-input-field img {
margin-right: 6px;
position: relative;
top: -1px;
} }
\ No newline at end of file
cmsWebApp/webroot/extensions/adminportal/company_profile.jsp
...@@ -20,29 +20,14 @@ ...@@ -20,29 +20,14 @@
process.setAttribute("Company", company); process.setAttribute("Company", company);
%> %>
<div class="hire-the-right-candi" style="height: 77px">Hello, <%= secUser.getFirstName() %></div> <div class="hello-company-name">Hello, <%= secUser.getFirstName() %></div>
<div class="section-tab-view"> <div class="section-tab-view">
<div class="main-tab-form"> <div class="main-tab-form">
<ul class="nav nav-pills nav-justified"> <ul class="nav nav-pills nav-justified">
<li class="active"> <li class="active"><a href="#"><span>1</span><div>Company Profile</div></a></li>
<a href="#"> <li><a href="#"><span>2</span><div>Invite Users</div></a></li>
<span>1</span> <li><a href="#"><span>3</span><div>Create a Job</div></a></li>
<div>Company Profile</div>
</a>
</li>
<li class="2">
<a href="#">
<span>2</span>
<div>Invite Users</div>
</a>
</li>
<li class="">
<a href="#">
<span>3</span>
<div>Create a Job</div>
</a>
</li>
</ul> </ul>
</div> </div>
...@@ -84,16 +69,16 @@ ...@@ -84,16 +69,16 @@
<label><oneit:label GUIName="Time zone" /></label> <label><oneit:label GUIName="Time zone" /></label>
<oneit:ormEnum obj="<%= company %>" attributeName="TimeZone" cssClass="form-control"/> <oneit:ormEnum obj="<%= company %>" attributeName="TimeZone" cssClass="form-control"/>
</div> </div>
</div>
<div class="form-group content-to-center"> <div class="text-center company-profile-btn">
<oneit:button value="Confirm details & invite users" name="gotoPage" cssClass="box-btn send-btn" <oneit:button value="Confirm details & invite users" name="gotoPage" cssClass="btn btn-primary box-btn"
requestAttribs="<%= CollectionUtils.mapEntry("nextPage", nextPage) requestAttribs="<%= CollectionUtils.mapEntry("nextPage", nextPage).toMap() %>"/>
.mapEntry("procParams", CollectionUtils.mapEntry("pageNumber", 2).toMap())
.toMap() %>"/>
</div>
</div> </div>
</div> </div>
</oneit:form> </oneit:form>
</div> </div>
</oneit:dynIncluded> </oneit:dynIncluded>
......
cmsWebApp/webroot/extensions/adminportal/inc/invite_user_add.jsp
...@@ -12,7 +12,7 @@ ...@@ -12,7 +12,7 @@
CompanyUser companyUser = (CompanyUser) getData(request, "CompanyUser"); CompanyUser companyUser = (CompanyUser) getData(request, "CompanyUser");
SecUser secUser = null; SecUser secUser = null;
if(request.getParameter("newuser") != null) if(companyUser==null || request.getParameter("newuser") != null)
{ {
secUser = SecUser.createSecUser(objTran); secUser = SecUser.createSecUser(objTran);
companyUser = secUser.getExtensionOrCreate(CompanyUser.REFERENCE_CompanyUser); companyUser = secUser.getExtensionOrCreate(CompanyUser.REFERENCE_CompanyUser);
...@@ -39,7 +39,7 @@ ...@@ -39,7 +39,7 @@
FormTag.setVariable (request, deleteVarKey, "jqToDelete", "#" + secUser.getID()); FormTag.setVariable (request, deleteVarKey, "jqToDelete", "#" + secUser.getID());
%> %>
<div class="main-user-invite" id="<%= companyUser.getID() %>"> <div class="main-user-invite" id="<%= secUser.getID() %>">
<span class="delete-company-user" onclick="return deleteUser (<%= deleteVarKey %>)"><span></span></span> <span class="delete-company-user" onclick="return deleteUser (<%= deleteVarKey %>)"><span></span></span>
<oneit:ormInput obj="<%= secUser %>" type="text" attributeName="Email" cssClass="form-control" /> <oneit:ormInput obj="<%= secUser %>" type="text" attributeName="Email" cssClass="form-control" />
</div> </div>
......
cmsWebApp/webroot/extensions/adminportal/invite_users.jsp
...@@ -32,7 +32,7 @@ ...@@ -32,7 +32,7 @@
return false; return false;
} }
</script> </script>
<div class="hire-the-right-candi" style="height: 77px">You're nearly there...</div> <div class="hire-the-right-candi" style="">You're nearly there...</div>
<oneit:form name="companyProfile" method="post" enctype="multipart/form-data"> <oneit:form name="companyProfile" method="post" enctype="multipart/form-data">
...@@ -41,26 +41,9 @@ ...@@ -41,26 +41,9 @@
<div class="section-tab-view"> <div class="section-tab-view">
<div class="main-tab-form"> <div class="main-tab-form">
<ul class="nav nav-pills nav-justified"> <ul class="nav nav-pills nav-justified">
<li class="complate"> <li class="complate"><a href="#"><span><img src="images/right-mark.svg"/></span><div>Company Profile</div></a></li>
<a href="#"> <li class="active"><a href="#"><span>2</span><div>Invite Users</div></a></li>
<span> <li><a href="#"><span>3</span><div>Create a Job</div></a></li>
<img src="images/right-mark.svg"/>
</span>
<div>Company Profile</div>
</a>
</li>
<li class="active">
<a href="#">
<span>2</span>
<div>Invite Users</div>
</a>
</li>
<li class="">
<a href="#">
<span>3</span>
<div>Create a Job</div>
</a>
</li>
</ul> </ul>
</div> </div>
...@@ -69,10 +52,12 @@ ...@@ -69,10 +52,12 @@
<div class="form-group"> <div class="form-group">
<div id="usersSection"> <div id="usersSection">
<% <%
Boolean firtUser = Boolean.TRUE;
for (CompanyUser cUser : company.getUsersSet()) for (CompanyUser cUser : company.getUsersSet())
{ {
if(!CollectionUtils.equals(cUser, companyUser)) if(!CollectionUtils.equals(cUser, companyUser))
{ {
firtUser = Boolean.FALSE;
%> %>
<oneit:dynInclude page="/extensions/adminportal/inc/invite_user_add.jsp" <oneit:dynInclude page="/extensions/adminportal/inc/invite_user_add.jsp"
CompanyUser="<%= cUser %>" CompanyUser="<%= cUser %>"
...@@ -80,6 +65,15 @@ ...@@ -80,6 +65,15 @@
<% <%
} }
} }
if(firtUser)
{
%>
<oneit:dynInclude page="/extensions/adminportal/inc/invite_user_add.jsp"
CompanyUser="<%= null %>"
data="<%= CollectionUtils.EMPTY_MAP%>"/>
<%
}
%> %>
</div> </div>
</div> </div>
...@@ -91,10 +85,8 @@ ...@@ -91,10 +85,8 @@
requestAttribs="<%= CollectionUtils.EMPTY_MAP %>"/> requestAttribs="<%= CollectionUtils.EMPTY_MAP %>"/>
</div> </div>
<div class="selection-br-line"></div> <div class="main-sc-section text-center company-profile-btn">
<oneit:button value="Send invites & proceed" name="sendCompanyUserInvites" cssClass="btn btn-primary box-btn"
<div class="main-sc-section form-group content-to-center">
<oneit:button value="Send invites & proceed" name="sendCompanyUserInvites" cssClass="box-btn send-btn"
requestAttribs="<%= CollectionUtils.mapEntry("nextPage", nextPage) requestAttribs="<%= CollectionUtils.mapEntry("nextPage", nextPage)
.mapEntry("procParams", CollectionUtils.mapEntry("Company", company).toMap()) .mapEntry("procParams", CollectionUtils.mapEntry("Company", company).toMap())
.toMap() %>"/> .toMap() %>"/>
......
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