Commit ceb2a060 by Nilu Committed by Harsh Shah

**Header** - Notifications - _No_ badge

**Header** - Notifications - If clicked, notifications overlay reveals "No new notifications"

HT001

Row - Job - Clicking the Job name goes to HT003 in its default view

Row - Job - Clicking (actual) number of Shortlisted goes to HT003 (Applicants per Job) with 'Shortlist' tab selected
parent e71941a8
...@@ -178,6 +178,11 @@ header{ ...@@ -178,6 +178,11 @@ header{
left: initial; left: initial;
margin-top: 15px; margin-top: 15px;
} }
.tack-center .dropdown-menu{
right: 0;
left: initial;
margin-top: 15px;
}
ul.profile-dropdown { ul.profile-dropdown {
width: 243px; width: 243px;
margin: 0; margin: 0;
......
...@@ -10,6 +10,10 @@ ...@@ -10,6 +10,10 @@
<body> <body>
<% <%
Article home = WebUtils.getArticleByShortCut(objTran, WebUtils.ADMIN_HOME);
String homeUrl = home.getLink(request);
String signoutUrl = "logout.jsp?nextURL=" + homeUrl;
if(clientUser != null) if(clientUser != null)
{ {
%> %>
...@@ -26,10 +30,15 @@ ...@@ -26,10 +30,15 @@
<div class="fl-right"> <div class="fl-right">
<div class="notification-bar"> <div class="notification-bar">
<div class="tack-center"> <div class="tack-center">
<a href="#"> <a href="#" data-toggle="dropdown">
<span class="notification-label">1</span> <!--TODO: enable when there are notifications-->
<!--<span class="notification-label"></span>-->
<img src="images/notification-icon.svg"> <img src="images/notification-icon.svg">
</a> </a>
<ul class="profile-dropdown dropdown-menu">
<span class="arrow-up"></span>
<li><a href="#">No new notifications</a></li>
</ul>
</div> </div>
</div> </div>
<div class="user-profile-dropdown"> <div class="user-profile-dropdown">
...@@ -39,10 +48,9 @@ ...@@ -39,10 +48,9 @@
</a> </a>
<ul class="profile-dropdown dropdown-menu"> <ul class="profile-dropdown dropdown-menu">
<span class="arrow-up"></span> <span class="arrow-up"></span>
<li><a href="#">Menu item</a></li> <!--Redirect to HT016-->
<li><a href="#">Menu item</a></li> <li><a href="#">My Details</a></li>
<li><a href="#">Menu item</a></li> <li><a href="<%= signoutUrl %>">Sign Out</a></li>
<li><a href="#">Menu item</a></li>
</ul> </ul>
</div> </div>
<div class="create-job-btn"> <div class="create-job-btn">
......
...@@ -9,6 +9,7 @@ ...@@ -9,6 +9,7 @@
JobStatus jobStatus = (JobStatus) getData(request, "JobStatus"); JobStatus jobStatus = (JobStatus) getData(request, "JobStatus");
String nextPage = (String) getData(request, "NextPage"); String nextPage = (String) getData(request, "NextPage");
String homePage = (String) getData(request, "HomePage"); String homePage = (String) getData(request, "HomePage");
String shortlistPage = (String) getData(request, "ShortlistPage");
%> %>
<oneit:dynIncluded> <oneit:dynIncluded>
...@@ -52,11 +53,12 @@ ...@@ -52,11 +53,12 @@
<div class="job-row" > <div class="job-row" >
<div class="job-post jl-c eq-second-height" style="height: 107px;"> <div class="job-post jl-c eq-second-height" style="height: 107px;">
<div class="job-post-name"> <div class="job-post-name">
<oneit:toString value="<%= job.getJobTitle() %>" mode="EscapeHTML" /> <oneit:button value=" " name="gotoPage" skin="link"
<oneit:button value="EDIT" name="gotoPage" cssClass="<%= job.getID() + " hidden"%>" skin="link"
requestAttribs="<%= CollectionUtils.mapEntry("nextPage", nextPage) requestAttribs="<%= CollectionUtils.mapEntry("nextPage", nextPage)
.mapEntry("procParams", CollectionUtils.mapEntry("Job", job).toMap()) .mapEntry("procParams", CollectionUtils.mapEntry("Job", job).toMap())
.toMap() %>"/> .toMap() %>">
<oneit:toString value="<%= job.getJobTitle() %>" mode="EscapeHTML" />
</oneit:button>
</div> </div>
<div class="job-company-name"> <div class="job-company-name">
<span class="superlaw">SUPERLAW</span> <span class="superlaw">SUPERLAW</span>
...@@ -100,9 +102,14 @@ ...@@ -100,9 +102,14 @@
</div> </div>
</div> </div>
<div class="ja-count"> <div class="ja-count">
<oneit:toString value="<%= shortlisted %>" mode="Integer" nullValue="0"/>/ <oneit:button value=" " name="gotoPage" skin="link"
requestAttribs="<%= CollectionUtils.mapEntry("nextPage", shortlistPage)
.mapEntry("procParams", CollectionUtils.mapEntry("Job", job).toMap())
.toMap() %>">
<oneit:toString value="<%= shortlisted %>" mode="Integer" nullValue="0"/>
</oneit:button>
/
<oneit:toString value="<%= maxShortlist %>" mode="Integer" nullValue="0"/> <oneit:toString value="<%= maxShortlist %>" mode="Integer" nullValue="0"/>
<span class="grey-span">shortlisted</span> <span class="grey-span">shortlisted</span>
</div> </div>
</div> </div>
......
...@@ -8,6 +8,7 @@ ...@@ -8,6 +8,7 @@
<% <%
ObjectTransaction objTran = process.getTransaction (); ObjectTransaction objTran = process.getTransaction ();
String nextPage = WebUtils.getSamePageInRenderMode(request, WebUtils.VIEW_APPLICANTS); String nextPage = WebUtils.getSamePageInRenderMode(request, WebUtils.VIEW_APPLICANTS);
String shortlistPage = WebUtils.getSamePageInRenderMode(request, WebUtils.APPLICANTS_SHORTLIST);
String homePage = WebUtils.getSamePageInRenderMode(request, "Page"); String homePage = WebUtils.getSamePageInRenderMode(request, "Page");
JobStatus jobStatus = (JobStatus) process.getAttribute("JobStatus"); JobStatus jobStatus = (JobStatus) process.getAttribute("JobStatus");
JobSortOption jobSortOpt = (JobSortOption) process.getAttribute("JobSortOption"); JobSortOption jobSortOpt = (JobSortOption) process.getAttribute("JobSortOption");
...@@ -98,7 +99,7 @@ ...@@ -98,7 +99,7 @@
</div> </div>
</div> </div>
<oneit:dynInclude page="/extensions/adminportal/inc/job_list.jsp" data="<%= CollectionUtils.EMPTY_MAP%>" <oneit:dynInclude page="/extensions/adminportal/inc/job_list.jsp" data="<%= CollectionUtils.EMPTY_MAP%>" ShortlistPage="<%= shortlistPage %>"
NextPage="<%= nextPage%>" HomePage="<%= homePage%>" Jobs="<%= sortedJobs.toArray(new Job[0]) %>" JobStatus="<%= jobStatus %>" /> NextPage="<%= nextPage%>" HomePage="<%= homePage%>" Jobs="<%= sortedJobs.toArray(new Job[0]) %>" JobStatus="<%= jobStatus %>" />
</div> </div>
......
...@@ -13,6 +13,7 @@ ...@@ -13,6 +13,7 @@
Article jobsArticle = WebUtils.getArticleByShortCut(transaction, WebUtils.JOBS); Article jobsArticle = WebUtils.getArticleByShortCut(transaction, WebUtils.JOBS);
String nextPage = jobsArticle.getLink(request, CollectionUtils.mapEntry("cms.rm", WebUtils.VIEW_APPLICANTS).toMap()); String nextPage = jobsArticle.getLink(request, CollectionUtils.mapEntry("cms.rm", WebUtils.VIEW_APPLICANTS).toMap());
String shortlistPage = jobsArticle.getLink(request, CollectionUtils.mapEntry("cms.rm", WebUtils.APPLICANTS_SHORTLIST).toMap());
String homePage = WebUtils.getSamePageInRenderMode(request, "Page"); String homePage = WebUtils.getSamePageInRenderMode(request, "Page");
String jobsPage = jobsArticle.getLink(request, CollectionUtils.mapEntry("cms.rm", "Page").toMap()); String jobsPage = jobsArticle.getLink(request, CollectionUtils.mapEntry("cms.rm", "Page").toMap());
...@@ -67,7 +68,7 @@ ...@@ -67,7 +68,7 @@
<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="d-job-title">Open Jobs</div> <div class="d-job-title">Open Jobs</div>
<oneit:dynInclude page="/extensions/adminportal/inc/job_list.jsp" data="<%= CollectionUtils.EMPTY_MAP%>" <oneit:dynInclude page="/extensions/adminportal/inc/job_list.jsp" data="<%= CollectionUtils.EMPTY_MAP%>" ShortlistPage="<%= shortlistPage %>"
NextPage="<%= nextPage%>" HomePage="<%= homePage%>" Jobs="<%= jobs %>"/> NextPage="<%= nextPage%>" HomePage="<%= homePage%>" Jobs="<%= jobs %>"/>
</div> </div>
</div> </div>
......
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