Skip to content

P
PERFORMA_REPLICA
Commit 16d9d579 by Nilu Committed by Harsh Shah
Options

styling changes and fonts

parent a63ce734
Showing with 48 additions and 43 deletions
cmsWebApp/src/performa/orm/Job.java
......@@ -176,29 +176,6 @@ public class Job extends BaseJob
}
public String getDaysTillClose()
{
StringBuilder sb = new StringBuilder();
if(getApplyBy()!=null)
{
int dateDiff = getNoOfDaystoClosed();
sb.append(dateDiff);
if(dateDiff==1)
{
sb.append(" day till close");
}
else
{
sb.append(" days till close");
}
}
return sb.toString();
}
public String getClosingInText()
{
StringBuilder sb = new StringBuilder("Closing in ");
......
cmsWebApp/src/performa/orm/types/Importance.java
......@@ -22,14 +22,14 @@ public class Importance extends AbstractEnumerated
public static final Importance NOT_APPLICABLE = new Importance ("NOT_APPLICABLE", "NOT_APPLICABLE", "Not Applicable", false);
public static final Importance ESSENTIAL = new Importance ("ESSENTIAL", "ESSENTIAL", "Essential", false);
public static final Importance DESIRABLE = new Importance ("DESIRABLE", "DESIRABLE", "Desirable", false);
public static final Importance HIGHLY_DESIRABLE = new Importance ("HIGHLY_DESIRABLE", "HIGHLY_DESIRABLE", "Highly Desirable", false);
public static final Importance DESIRABLE = new Importance ("DESIRABLE", "DESIRABLE", "Desirable", false);
public static final Importance ESSENTIAL = new Importance ("ESSENTIAL", "ESSENTIAL", "Essential", false);
private static final Importance[] allImportances =
new Importance[] { NOT_APPLICABLE,ESSENTIAL,HIGHLY_DESIRABLE,DESIRABLE};
new Importance[] { NOT_APPLICABLE,DESIRABLE,HIGHLY_DESIRABLE,ESSENTIAL};
private static Importance[] getAllImportances ()
......@@ -117,9 +117,9 @@ public class Importance extends AbstractEnumerated
public static void defineAdditionalData ()
{
NOT_APPLICABLE.ConsiderForAssessment = false;
ESSENTIAL.ConsiderForAssessment = true;
HIGHLY_DESIRABLE.ConsiderForAssessment = true;
DESIRABLE.ConsiderForAssessment = true;
HIGHLY_DESIRABLE.ConsiderForAssessment = true;
ESSENTIAL.ConsiderForAssessment = true;
}
......
cmsWebApp/src/performa/orm/types/Importance.xml
......@@ -6,9 +6,9 @@
<DATA name="ConsiderForAssessment" type="boolean" />
<VALUE name="NOT_APPLICABLE" description="Not Applicable" ConsiderForAssessment="false"/>
<VALUE name="ESSENTIAL" description="Essential" ConsiderForAssessment="true"/>
<VALUE name="HIGHLY_DESIRABLE" description="Highly Desirable" ConsiderForAssessment="true"/>
<VALUE name="DESIRABLE" description="Desirable" ConsiderForAssessment="true"/>
<VALUE name="HIGHLY_DESIRABLE" description="Highly Desirable" ConsiderForAssessment="true"/>
<VALUE name="ESSENTIAL" description="Essential" ConsiderForAssessment="true"/>
</CONSTANT>
</ROOT>
\ No newline at end of file
cmsWebApp/webroot/extensions/adminportal/inc/applicant_view_tabs.jsp
......@@ -15,10 +15,9 @@
<oneit:dynIncluded>
<div class="dashboard-content-area" style="padding: 0px">
<oneit:dynInclude page="/extensions/applicantportal/inc/multifieldtext.jsp" data="<%= CollectionUtils.EMPTY_MAP%>"/>
</div>
<div class="dashboard-content-area first-part">
<div class="first-part">
<oneit:dynInclude page="/extensions/adminportal/inc/job_title_bar.jsp" data="<%= CollectionUtils.EMPTY_MAP%>"/>
......
cmsWebApp/webroot/extensions/adminportal/inc/job_list.jsp
......@@ -59,7 +59,15 @@
</div>
<div class="job-company-name">
<span class="superlaw">SUPERLAW</span>
<span class="calendar"><oneit:toString value="<%= job.getDaysTillClose() %>" mode="EscapeHTML"/></span>
<span class="calendar">
<%
int daysToClose = job.getNoOfDaystoClosed();
%>
<span class="number">
<oneit:toString value="<%= daysToClose %>" mode="Integer"/>
</span>
<oneit:toString value="<%= (daysToClose == 1 ? "day" : "days") + " until close" %>" mode="EscapeHTML"/>
</span>
</div>
</div>
<div class="job-application jl-c eq-second-height" style="height: 107px;">
......@@ -92,7 +100,7 @@
</div>
</div>
<div class="job-states jl-c">
<oneit:ormEnum obj="<%= job %>" attributeName="JobStatus" cssClass="form-control status-img job-status"
<oneit:ormEnum obj="<%= job %>" attributeName="JobStatus" cssClass="form-control status-img job-status wider-select"
enums="<%= Arrays.asList(new JobStatus[]{JobStatus.OPEN, JobStatus.COMPLETE}) %>"/>
</div>
<oneit:button name="save" value="Save" cssClass="<%= "save-job" + job.getID().toString() + " hidden"%>"
......
cmsWebApp/webroot/extensions/adminportal/inc/menuinclude.jsp
......@@ -7,7 +7,7 @@
Article apAricle = WebUtils.getArticleByShortCut(objTran, WebUtils.ADMIN_PORTAL);
NavigationBar apSiteNavbar = navbar.getChildNavBarFor(apAricle);
%>
<div class="sidebar-menu">
<div class="sidebar-menu fixed">
<div class="main-menu">
<div class="mobile-toggle-menu">
<button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#navbar-collapse-1">
......
cmsWebApp/webroot/extensions/adminportal/job_match_assessment.jsp
......@@ -59,7 +59,7 @@
<div class="radio radio-primary job-match-radio">
<input type="radio" name="<%= assessmentTypeKey %>" id="<%= assessmentTypeId %>" class="type_radio" value="<%= assessmentType.getName() %>" <%= selectedStr %>/>
<label for="<%= assessmentTypeId %>">
<b><oneit:toString value="<%= assessmentType %>" mode="EscapeHTML" /></b>
<span class="label-title"><oneit:toString value="<%= assessmentType %>" mode="EscapeHTML" /></span>
<oneit:toString value="<%= assessmentType.getHeaderDesc() %>" mode="EscapeHTML"/>
<oneit:toString value="<%= assessmentType.getQuestionDetails() %>" mode="EscapeHTML"/><br />
<span class="sub-radio-title"><oneit:toString value="<%= assessmentType.getAdditionalDesc() %>" mode="EscapeHTML" /></span>
......
cmsWebApp/webroot/extensions/adminportal/job_review_submit.jsp
......@@ -42,7 +42,7 @@
</div>
<div class="form-group">
<div class="review-medium-title">
<oneit:ormlabel obj="<%= job %>" field="JobTitle" />
<oneit:ormlabel obj="<%= job %>" field="JobTitle"/>
<span class="skill-label">
<oneit:toString value="<%= job.getJobTitle() %>" mode="EscapeHTML" />
</span>
......
cmsWebApp/webroot/extensions/adminportal/page_admin_home.jsp
......@@ -17,7 +17,8 @@
%>
<oneit:form name="editJob" method="post" enctype="multipart/form-data">
<div class="dashboard-content-area first-part">
<div class="dashboard-content-area">
<div class="dashboard-first-part">
<div class="welcome-box">
<div class="dashboard-welcome">
<div class="welcome-text"> Welcome <br/> back <oneit:toString value="<%= SecUserToNameTransform.INSTANCE.transform(SecUser.getTXUser(transaction)) + "!" %>" mode="EscapeHTML"/></div>
......@@ -38,11 +39,12 @@
</div>
</div>
</div>
<div class="dashboard-content-area second-part">
<div class="second-part">
<div class="d-job-title">Open Jobs</div>
<oneit:dynInclude page="/extensions/adminportal/inc/job_list.jsp" data="<%= CollectionUtils.EMPTY_MAP%>"
NextPage="<%= nextPage%>" HomePage="<%= homePage%>" Jobs="<%= jobs %>"/>
</div>
</div>
</oneit:form>
</oneit:dynIncluded>
\ No newline at end of file
cmsWebApp/webroot/extensions/adminportal/view_applicants.jsp
......@@ -24,9 +24,10 @@
<oneit:form name="viewApplicants" method="post" enctype="multipart/form-data">
<div class="dashboard-content-area">
<oneit:dynInclude page="/extensions/adminportal/inc/applicant_view_tabs.jsp" TabNumber="1" data="<%= CollectionUtils.EMPTY_MAP%>"/>
<div class="dashboard-content-area second-part view-app-area">
<div class="second-part view-app-area">
<div class="five-boxs">
<%
int index = 0;
......@@ -189,5 +190,6 @@
%>
</div>
</div>
</div>
</oneit:form>
</oneit:dynIncluded>
\ No newline at end of file
cmsWebApp/webroot/extensions/adminportal/view_applicants_shortlist.jsp
......@@ -17,9 +17,11 @@
<oneit:form name="viewApplicants" method="post" enctype="multipart/form-data">
<div class="dashboard-content-area">
<oneit:dynInclude page="/extensions/adminportal/inc/applicant_view_tabs.jsp" TabNumber="2" data="<%= CollectionUtils.EMPTY_MAP%>"/>
<div class="dashboard-content-area second-part view-app-area">
<div class="second-part view-app-area">
<oneit:dynInclude page="/extensions/adminportal/inc/shortlist_tabs.jsp" TabNumber="1" data="<%= CollectionUtils.EMPTY_MAP%>"/>
......@@ -92,5 +94,6 @@
%>
</div>
</div>
</div>
</oneit:form>
</oneit:dynIncluded>
\ No newline at end of file
cmsWebApp/webroot/extensions/adminportal/view_applicants_shortlist_grid.jsp
......@@ -55,9 +55,11 @@
<oneit:form name="viewApplicants" method="post" enctype="multipart/form-data">
<div class="dashboard-content-area">
<oneit:dynInclude page="/extensions/adminportal/inc/applicant_view_tabs.jsp" TabNumber="2" data="<%= CollectionUtils.EMPTY_MAP%>"/>
<div class="dashboard-content-area second-part view-app-area">
<div class="second-part view-app-area">
<oneit:dynInclude page="/extensions/adminportal/inc/shortlist_tabs.jsp" TabNumber="2" data="<%= CollectionUtils.EMPTY_MAP%>"/>
......@@ -150,5 +152,6 @@
%>
</div>
</div>
</div>
</oneit:form>
</oneit:dynIncluded>
\ No newline at end of file
cmsWebApp/webroot/images/calendar-icon.svg 0 → 100644
<svg xmlns="http://www.w3.org/2000/svg" width="16" height="18" viewBox="0 0 16 18">
<g fill="#7D7F82" fill-rule="evenodd">
<path d="M12.811 17.053H3.096A2.637 2.637 0 0 1 .47 14.41V6.063h14.878a.23.23 0 0 0 .089-.018v8.365a2.637 2.637 0 0 1-2.626 2.643m0-15.539a.236.236 0 0 0-.235.237c0 .131.105.237.235.237a2.637 2.637 0 0 1 2.626 2.643v.976a.23.23 0 0 0-.089-.018H.47v-.958a2.637 2.637 0 0 1 2.626-2.643c.13 0 .235-.106.235-.237a.236.236 0 0 0-.235-.237C1.389 1.514 0 2.912 0 4.631v9.779c0 1.718 1.389 3.116 3.096 3.116h9.715c1.707 0 3.096-1.398 3.096-3.116V4.63c0-1.718-1.389-3.116-3.096-3.116"/>
<path d="M6.133 1.988H9.74c.13 0 .235-.106.235-.237a.236.236 0 0 0-.235-.236H6.133a.236.236 0 0 0-.235.236c0 .131.105.237.235.237M12.374 9.953h-8.84a.236.236 0 0 0-.236.237c0 .131.105.237.236.237h8.84c.13 0 .235-.106.235-.237a.236.236 0 0 0-.235-.237M9.89 12.67H6.126a.236.236 0 0 0-.236.237c0 .13.106.237.236.237H9.89c.13 0 .235-.107.235-.237a.236.236 0 0 0-.235-.237M4.596 3.83c.13 0 .235-.107.235-.237V.237a.236.236 0 1 0-.47 0v3.356c0 .13.105.236.235.236M11.312 3.83c.13 0 .235-.107.235-.237V.237a.236.236 0 1 0-.47 0v3.356c0 .13.105.236.235.236"/>
</g>
</svg>
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