Skip to content

P
PERFORMA_REPLICA
Commit 716a1260 by Saliya Randunu
Options

ui changes in create job page culture section

parent 9329f531
Showing with 64 additions and 30 deletions
cmsWebApp/webroot/css/common.css
...@@ -812,13 +812,17 @@ span.checkbox.checked + .slider:before {-webkit-transform: translateX(18px);-ms- ...@@ -812,13 +812,17 @@ span.checkbox.checked + .slider:before {-webkit-transform: translateX(18px);-ms-
margin-bottom: 15px; margin-bottom: 15px;
} }
.form-page-area { .form-page-area {
padding: 65px 10.5%;
background: #fff; background: #fff;
float: left; float: left;
width: 100%; width: 100%;
max-width: 1300px; max-width: 1300px;
} }
.form-page-area.darkbg { .form-page-section {
padding: 65px 10.5%;
background: #fff;;
}
.form-page-section.darkbg {
background-color: #F5F7F8; background-color: #F5F7F8;
} }
.form-brack-line{ .form-brack-line{
...@@ -835,6 +839,28 @@ span.checkbox.checked + .slider:before {-webkit-transform: translateX(18px);-ms- ...@@ -835,6 +839,28 @@ span.checkbox.checked + .slider:before {-webkit-transform: translateX(18px);-ms-
margin-top: 5px; margin-top: 5px;
margin-bottom: 30px; margin-bottom: 30px;
} }
.criteria_section {
}
.criteria_section fieldset {
border: 1px solid #DBDBDF;
border-radius: 2px;
background-color: #FFFFFF;
padding: 10px 25px;
position: relative;
margin-bottom: 30px;
}
.criteria_section fieldset legend{
width: auto;
color: #03A0E7; font-size: 12px; line-height: 14px; font-weight: 500; letter-spacing: 1.09px;
border:0;
text-transform: uppercase;
}
.criteria_section fieldset .switch {
position: absolute; right: 25px ; top : -5px;
}
.optional-title { .optional-title {
float: left; float: left;
width: 100%; width: 100%;
...@@ -1234,7 +1260,11 @@ span.skill-label span{ ...@@ -1234,7 +1260,11 @@ span.skill-label span{
color: #4e5258; color: #4e5258;
font-size: 16px; font-size: 16px;
font-weight: 500; font-weight: 500;
margin-bottom: 40px; margin-bottom: 20px;
}
.critarea-desc {
margin-bottom: 30px;
} }
.work-belonging span{ .work-belonging span{
font-family: "Usual-Medium"; font-family: "Usual-Medium";
...@@ -1274,10 +1304,9 @@ input.btn.btn-primary.top-margin-25{ ...@@ -1274,10 +1304,9 @@ input.btn.btn-primary.top-margin-25{
background: #eff0f2; background: #eff0f2;
padding: 15px 20px; padding: 15px 20px;
display: inline-block; display: inline-block;
width: 100%;
font-size: 13px; font-size: 13px;
position: relative; position: relative;
margin: 10px 0; margin: 10px -25px;
} }
.rate-toggle { .rate-toggle {
float: right; float: right;
......
cmsWebApp/webroot/extensions/adminportal/assessment_criteria.jsp
...@@ -76,7 +76,7 @@ ...@@ -76,7 +76,7 @@
<div class="form-page-area"> <div class="form-page-area">
<div class="create-job"> <div class="create-job">
<div class="assessment-criteria"> <div class="form-page-section">
<div class="form-group"> <div class="form-group">
<label>Include Requirements for this Job? <a href="#" title="description gose here" class="info-icon"><img src="images/info-icon.png" /></a> </label> <label>Include Requirements for this Job? <a href="#" title="description gose here" class="info-icon"><img src="images/info-icon.png" /></a> </label>
<span class="pull-right"> <span class="pull-right">
...@@ -195,7 +195,8 @@ ...@@ -195,7 +195,8 @@
</div> </div>
</oneit:recalcClass> </oneit:recalcClass>
</oneit:recalcClass> </oneit:recalcClass>
</div>
<div class="text-center"> <div class="text-center">
<oneit:button value="Save as draft" name="saveJob" cssClass="btn btn-primary top-margin-25 largeBtn greyBtn" <oneit:button value="Save as draft" name="saveJob" cssClass="btn btn-primary top-margin-25 largeBtn greyBtn"
requestAttribs="<%= CollectionUtils.mapEntry("nextPage", jobPage) requestAttribs="<%= CollectionUtils.mapEntry("nextPage", jobPage)
...@@ -209,5 +210,6 @@ ...@@ -209,5 +210,6 @@
</div> </div>
</div> </div>
</div> </div>
</div>
</oneit:form> </oneit:form>
</oneit:dynIncluded> </oneit:dynIncluded>
\ No newline at end of file
cmsWebApp/webroot/extensions/adminportal/job_detail.jsp
...@@ -54,8 +54,9 @@ ...@@ -54,8 +54,9 @@
<% <%
job.setCompletedDetails(Boolean.TRUE); job.setCompletedDetails(Boolean.TRUE);
%> %>
<div class="create-job">
<div class="form-page-area"> <div class="form-page-area">
<div class="create-job">
<div class="form-page-section">
<% <%
if(jobs.length > 0) if(jobs.length > 0)
...@@ -112,7 +113,7 @@ ...@@ -112,7 +113,7 @@
</div> </div>
</div> </div>
<div class="form-page-area darkbg"> <div class="form-page-section darkbg">
<div class="form-group row"> <div class="form-group row">
<div class="col-md-12"> <div class="col-md-12">
...@@ -159,7 +160,7 @@ ...@@ -159,7 +160,7 @@
</div> </div>
</div> </div>
<div class="form-page-area"> <div class="form-page-section">
<div class="form-group row"> <div class="form-group row">
<div class="col-md-12"> <div class="col-md-12">
...@@ -250,7 +251,7 @@ ...@@ -250,7 +251,7 @@
String levelValue = formBuilder.fieldValue (levelKey, job.getLevel() == null ? "" : String.valueOf(job.getLevelID())); String levelValue = formBuilder.fieldValue (levelKey, job.getLevel() == null ? "" : String.valueOf(job.getLevelID()));
%> %>
</div> </div>
<div class="form-page-area darkbg"> <div class="form-page-section darkbg">
<div class="form-group row"> <div class="form-group row">
<div class="col-md-12"> <div class="col-md-12">
<label class="label-16">Applicant Workflow</label> <label class="label-16">Applicant Workflow</label>
...@@ -285,5 +286,6 @@ ...@@ -285,5 +286,6 @@
</div> </div>
</div> </div>
</div> </div>
</div>
</oneit:form> </oneit:form>
</oneit:dynIncluded> </oneit:dynIncluded>
cmsWebApp/webroot/extensions/adminportal/job_review_submit.jsp
...@@ -53,10 +53,10 @@ ...@@ -53,10 +53,10 @@
} }
%> %>
</h1> </h1>
<div class="form-page-area">
<div class="create-job"> <div class="create-job">
<div class="assessment-criteria"> <div class="assessment-criteria">
<div class="form-page-area">
<div class="form-group"> <div class="form-group">
<label class="label-16">Job Details</label> <label class="label-16">Job Details</label>
<oneit:button value="EDIT" name="gotoPage" cssClass="add-more-btn review-edit-btn pull-right" skin="link" <oneit:button value="EDIT" name="gotoPage" cssClass="add-more-btn review-edit-btn pull-right" skin="link"
...@@ -211,8 +211,9 @@ ...@@ -211,8 +211,9 @@
</span> </span>
</div> </div>
</div> </div>
</div>
<div class="form-page-area darkbg">
<div class="form-brack-line-sub"></div>
<div class="form-group"> <div class="form-group">
<label class="label-16">Requirements</label> <label class="label-16">Requirements</label>
...@@ -257,7 +258,8 @@ ...@@ -257,7 +258,8 @@
<% } <% }
} }
%> %>
</div>
<div class="form-page-area">
<div class="form-group"> <div class="form-group">
<label class="label-16">Culture</label> <label class="label-16">Culture</label>
<oneit:button value="EDIT" name="gotoPage" cssClass="add-more-btn review-edit-btn pull-right" skin="link" <oneit:button value="EDIT" name="gotoPage" cssClass="add-more-btn review-edit-btn pull-right" skin="link"
......
cmsWebApp/webroot/extensions/adminportal/workplace_culture.jsp
...@@ -83,11 +83,10 @@ ...@@ -83,11 +83,10 @@
requestAttribs="<%= CollectionUtils.mapEntry ("Job", job) requestAttribs="<%= CollectionUtils.mapEntry ("Job", job)
.mapEntry (UpdateMappedObjFP.FAIL_VALIDATION_ERRORS, Boolean.FALSE) .mapEntry (UpdateMappedObjFP.FAIL_VALIDATION_ERRORS, Boolean.FALSE)
.toMap() %>" /> .toMap() %>" />
<div class="form-page-area">
<div class="create-job"> <div class="create-job">
<div class="assessment-criteria"> <div class="assessment-criteria">
<div class="form-page-area"> <div class="form-page-section">
<div class="form-group"> <div class="form-group">
<label class="label-16 work-title">Culture</label> <label class="label-16 work-title">Culture</label>
<p> <p>
...@@ -107,14 +106,13 @@ ...@@ -107,14 +106,13 @@
} }
%> %>
</div> </div>
<div class="form-page-section darkbg">
<div class="form-page-area darkbg">
<div class="form-group"> <div class="form-group">
<label><oneit:label GUIName="Organisation Culture Statement" /> <a href="#" title="Note description gose here." class="info-icon"><img src="images/info-icon.png" /></a></label> <label><oneit:label GUIName="Organisation Culture Statement" /> <a href="#" title="Note description gose here." class="info-icon"><img src="images/info-icon.png" /></a></label>
<oneit:ormtextarea obj="<%= job %>" attributeName="CultureStatement" cssClass="form-control textarea-box"/> <oneit:ormtextarea obj="<%= job %>" attributeName="CultureStatement" cssClass="form-control textarea-box"/>
</div> </div>
</div> </div>
<div class="form-page-area"> <div class="form-page-section">
<% <%
FormTag jobForm = FormTag.getActiveFormTag(request); FormTag jobForm = FormTag.getActiveFormTag(request);
FormBuilder formBuilder = jobForm.getFormBuilder(); FormBuilder formBuilder = jobForm.getFormBuilder();
...@@ -128,7 +126,7 @@ ...@@ -128,7 +126,7 @@
<div class="work-belonging"> <div class="work-belonging">
<oneit:toString value="<%= cultureClass %>" mode="EscapeHTML"/> <oneit:toString value="<%= cultureClass %>" mode="EscapeHTML"/>
</div> </div>
<div><%= cultureClass.getClassDescription()%></div> <div class="critarea-desc"><%= cultureClass.getClassDescription()%></div>
<% <%
for(CultureCriteria criteria : job.getCultureCriteriasForClass(cultureClass)) for(CultureCriteria criteria : job.getCultureCriteriasForClass(cultureClass))
{ {
...@@ -136,17 +134,18 @@ ...@@ -136,17 +134,18 @@
String formValue = formBuilder.fieldValue (optionKey, criteria.getCultureElementRating() == null ? "" : String.valueOf(criteria.getCultureElementRatingID())); String formValue = formBuilder.fieldValue (optionKey, criteria.getCultureElementRating() == null ? "" : String.valueOf(criteria.getCultureElementRatingID()));
%> %>
<div class="criteria_section culture-margin-bottom"> <div class="criteria_section culture-margin-bottom">
<div class="work-radio-title"> <fieldset >
<legend>
<oneit:toString value="<%= criteria.getCultureElement() %>" mode="EscapeHTML"/> <oneit:toString value="<%= criteria.getCultureElement() %>" mode="EscapeHTML"/>
</div> </legend>
<span class="pull-right">
<label class="switch"> <label class="switch">
<oneit:recalcClass htmlTag="span" classScript="criteria.getIsApplicable() ? 'checkbox checked': 'checkbox unchecked'" criteria="<%= criteria %>"> <oneit:recalcClass htmlTag="span" classScript="criteria.getIsApplicable() ? 'checkbox checked': 'checkbox unchecked'" criteria="<%= criteria %>">
<oneit:ormInput obj="<%= criteria %>" attributeName="IsApplicable" type="checkbox"/> <oneit:ormInput obj="<%= criteria %>" attributeName="IsApplicable" type="checkbox"/>
</oneit:recalcClass> </oneit:recalcClass>
<div class="slider round"></div> <div class="slider round"></div>
</label> </label>
</span>
<oneit:recalcClass htmlTag="div" classScript="criteria.getIsApplicable() ? 'show': 'hide'" criteria="<%= criteria %>"> <oneit:recalcClass htmlTag="div" classScript="criteria.getIsApplicable() ? 'show': 'hide'" criteria="<%= criteria %>">
<% <%
for (CultureElementRating rating : criteria.getCultureElement().getRatingsSet()) for (CultureElementRating rating : criteria.getCultureElement().getRatingsSet())
...@@ -197,8 +196,9 @@ ...@@ -197,8 +196,9 @@
</span> </span>
</div> </div>
</div> </div>
</fieldset>
</div> </div>
<div class="form-brack-line-sub"></div> <!--<div class="form-brack-line-sub"></div>-->
<% <%
} }
%> %>
...@@ -207,7 +207,7 @@ ...@@ -207,7 +207,7 @@
} }
%> %>
</div> </div>
<div class="form-page-area"> <div class="form-page-section">
<div class="form-group"> <div class="form-group">
<div class="styled_checkboxes"> <div class="styled_checkboxes">
<div class="checkbox checkbox-primary"> <div class="checkbox checkbox-primary">
...@@ -248,6 +248,5 @@ ...@@ -248,6 +248,5 @@
</div> </div>
</div> </div>
</div> </div>
</div>
</oneit:form> </oneit:form>
</oneit:dynIncluded> </oneit:dynIncluded>
\ No newline at end of file
cmsWebApp/webroot/images/warning.png
cmsWebApp/webroot/images/warning.png

864 Bytes | W: | H:

cmsWebApp/webroot/images/warning.png

864 Bytes | W: | H:

cmsWebApp/webroot/images/warning.png
cmsWebApp/webroot/images/warning.png
cmsWebApp/webroot/images/warning.png
cmsWebApp/webroot/images/warning.png
  • 2-up
  • Swipe
  • Onion skin
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