Skip to content

P
PERFORMA_REPLICA
Commit e2bca0e1 by Harsh Shah
Options

Minor styling fixes, Error/Success notification changes fixes

parent 39e25434
Showing with 47 additions and 44 deletions
cmsWebApp/webroot/css/common.css
...@@ -58,13 +58,13 @@ p{ ...@@ -58,13 +58,13 @@ p{
margin-left: -10px; margin-left: -10px;
} }
header{ header{
/*background: #ffffff;*/ background: #ffffff;
position: fixed; position: fixed;
left : 0; left : 0;
top: 0; top: 0;
width: 100%; width: 100%;
height: 65px; height: 65px;
z-index: 1000; z-index: 1000;
} }
.site-logo { .site-logo {
float: left; float: left;
...@@ -117,6 +117,11 @@ header{ ...@@ -117,6 +117,11 @@ header{
left: 32px; left: 32px;
top: 24px; top: 24px;
} }
.search-bar, .fl-right{
box-shadow: inset 1px 0 0 0 #eff0f2;
}
.fl-right{ .fl-right{
float: right; float: right;
width: 27.673%; width: 27.673%;
......
cmsWebApp/webroot/extensions/adminportal/edit_job.jsp
...@@ -6,22 +6,22 @@ ...@@ -6,22 +6,22 @@
<%@ include file="/extensions/performa/inc/stdimports.jsp" %> <%@ include file="/extensions/performa/inc/stdimports.jsp" %>
<oneit:dynIncluded> <oneit:dynIncluded>
<!--TODO: Set correct navigation to this page (Not yet decided where this page will be accessed from, hence added the navigation from home page)-->
<% <%
Job job = (Job) process.getAttribute("Job"); boolean toRedirect = GenericObjDF.getOrCreateObject (request, "Job", Job.REFERENCE_Job);
Job job = (Job) process.getAttribute("Job");
Debug.assertion(job != null, "Job is null in admin portal create job"); Debug.assertion(job != null && !toRedirect, "Invalid job in admin portal edit job");
String nextPage = WebUtils.getSamePageInRenderMode(request, "Page"); String nextPage = WebUtils.getSamePageInRenderMode(request, "Page");
%> %>
<oneit:form name="editJob" method="post" enctype="multipart/form-data"> <div class="container-fluid">
<div class="container-fluid"> <div class="row content">
<div class="main-content-area">
<oneit:dynInclude page="/extensions/applicantportal/inc/multifieldtext.jsp" data="<%= CollectionUtils.EMPTY_MAP%>"/> <h1 class="page-title">Edit Job</h1>
<oneit:form name="editJob" method="post" enctype="multipart/form-data">
<div class="row content"> <div style="padding-left: 15px; padding-right: 15px;">
<div class="main-content-area"> <oneit:dynInclude page="/extensions/applicantportal/inc/multifieldtext.jsp" data="<%= CollectionUtils.EMPTY_MAP%>"/>
<h1 class="page-title">Edit Job</h1> </div>
<div class="form-page-area"> <div class="form-page-area">
<div class="create-job"> <div class="create-job">
<div class="assessment-criteria"> <div class="assessment-criteria">
...@@ -95,11 +95,11 @@ ...@@ -95,11 +95,11 @@
</div> </div>
<% } %> <% } %>
<div class="form-brack-line-sub"></div> <div class="form-brack-line-sub"></div>
<div class="form-group"> <div class="form-group">
<label class="label-16">Culture</label> <label class="label-16">Culture</label>
</div> </div>
<% <%
for(CultureClass cultureClass : CultureClass.getCultureClassArray()) for(CultureClass cultureClass : CultureClass.getCultureClassArray())
{ {
...@@ -128,21 +128,22 @@ ...@@ -128,21 +128,22 @@
</div> </div>
<% } %> <% } %>
<div class="form-brack-line-sub"></div> <div class="form-brack-line-sub"></div>
<div class="form-group"> <div class="form-group">
<label class="label-16">Job Match Assessment</label> <label class="label-16">Job Match Assessment</label>
</div> </div>
<div class="form-group"> <div class="form-group">
<div class="beloning job-match-ass"> <div class="beloning job-match-ass">
<oneit:toString value="<%= job.getAssessmentType() %>" mode="EscapeHTML"/> <oneit:toString value="<%= job.getAssessmentType().getQuestionDetails() %>" mode="EscapeHTML"/> <oneit:toString value="<%= job.getAssessmentType() %>" mode="EscapeHTML"/> <oneit:toString value="<%= job.getAssessmentType().getQuestionDetails() %>" mode="EscapeHTML"/>
</div>
</div> </div>
</div> </div>
</div> </div>
</div> </div>
</div> </div>
</div> </oneit:form>
</div> </div>
</div> </div>
</oneit:form> </div>
</oneit:dynIncluded> </oneit:dynIncluded>
cmsWebApp/webroot/extensions/adminportal/inc/job_list.jsp
...@@ -104,9 +104,7 @@ ...@@ -104,9 +104,7 @@
enums="<%= Arrays.asList(new JobStatus[]{JobStatus.OPEN, JobStatus.COMPLETE}) %>"/> enums="<%= Arrays.asList(new JobStatus[]{JobStatus.OPEN, JobStatus.COMPLETE}) %>"/>
</div> </div>
<oneit:button name="save" value="Save" cssClass="<%= "save-job" + job.getID().toString() + " hidden"%>" <oneit:button name="save" value="Save" cssClass="<%= "save-job" + job.getID().toString() + " hidden"%>"
requestAttribs="<%= CollectionUtils.mapEntry("nextPage", homePage+ (jobStatus != null ? "&JobStatus=" + jobStatus : "")) requestAttribs="<%= CollectionUtils.mapEntry("nextPage", homePage+ (jobStatus != null ? "&JobStatus=" + jobStatus : "")).toMap() %>" />
.mapEntry("Job", job)
.toMap() %>" />
</div> </div>
<% <%
} }
......
cmsWebApp/webroot/extensions/adminportal/inc/job_title_bar.jsp
...@@ -32,9 +32,9 @@ ...@@ -32,9 +32,9 @@
</span> </span>
<span class="edit-btn-dropdown"> <span class="edit-btn-dropdown">
<oneit:button value=" " name="gotoPage" skin="link" <oneit:button value=" " name="gotoPage" skin="link"
requestAttribs="<%= CollectionUtils.mapEntry("nextPage", editJobPage) requestAttribs="<%= CollectionUtils.mapEntry("nextPage", editJobPage + "&JobID=" + job.getObjectID())
.mapEntry("procParams", CollectionUtils.mapEntry("Job", job).toMap()) .mapEntry("cancelProcess", true)
.toMap() %>"> .toMap() %>">
EDIT EDIT
<span><img src="images/edit-dropdown-arrow.svg" /></span> <span><img src="images/edit-dropdown-arrow.svg" /></span>
</oneit:button> </oneit:button>
......
cmsWebApp/webroot/extensions/adminportal/list_jobs.jsp
...@@ -22,13 +22,12 @@ ...@@ -22,13 +22,12 @@
process.setAttribute("JobStatus", jobStatus); process.setAttribute("JobStatus", jobStatus);
%> %>
<oneit:form name="editJob" method="post" enctype="multipart/form-data"> <oneit:form name="editJob" method="post" enctype="multipart/form-data">
<oneit:dynInclude page="/extensions/applicantportal/inc/multifieldtext.jsp" data="<%= CollectionUtils.EMPTY_MAP%>"/>
<div class="dashboard-content-area second-part"> <div class="dashboard-content-area second-part">
<oneit:dynInclude page="/extensions/applicantportal/inc/multifieldtext.jsp" data="<%= CollectionUtils.EMPTY_MAP%>"/>
<div class="jobs-list-shorting"> <div class="jobs-list-shorting">
<div class="d-job-title all-jobs-title">All Jobs</div> <div class="d-job-title all-jobs-title">All Jobs</div>
<div class="job-filter"> <div class="job-filter">
......
cmsWebApp/webroot/extensions/adminportal/page_admin_home.jsp
...@@ -40,6 +40,7 @@ ...@@ -40,6 +40,7 @@
</div> </div>
</div> </div>
<div class="second-part"> <div class="second-part">
<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%>"
......
cmsWebApp/webroot/extensions/adminportal/view_applicants.jsp
...@@ -11,7 +11,6 @@ ...@@ -11,7 +11,6 @@
Debug.assertion(job != null, "Job is null in admin portal view applicants"); Debug.assertion(job != null, "Job is null in admin portal view applicants");
String editJobPage = WebUtils.getSamePageInRenderMode(request, WebUtils.EDIT_JOB);
String applicationPage = WebUtils.getSamePageInRenderMode(request, WebUtils.VIEW_APPLICATION); String applicationPage = WebUtils.getSamePageInRenderMode(request, WebUtils.VIEW_APPLICATION);
int closingInDays = DateDiff.getDateDiff(Calendar.DATE, DateDiff.getToday(), job.getApplyBy()); int closingInDays = DateDiff.getDateDiff(Calendar.DATE, DateDiff.getToday(), job.getApplyBy());
%> %>
......
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