styling changes. modifications to job application screens based on changes done on zeplin

cmsWebApp/webroot/css/common.css

@@ -58,7 +58,7 @@ p{
     margin-left: -10px;
 }
 header{
-	background: #ffffff;
+	/*background: #ffffff;*/
         position: fixed;
         left : 0;
         top: 0;
@@ -1685,6 +1685,7 @@ table.pos-table{
     line-height: 1.57;
     color: #4a4a4a;
     font-size: 14px;
+    font-family: "Usual-Light";
 }
 .verify-i-title{
     font-size: 20px;
@@ -1743,7 +1744,7 @@ table.pos-table{
 
 .main-application-outline {
     margin: 60px auto 0;
-    width: 68.377%;
+    width: 75%;
 }
 .welcome-title{
     color: #4990e2;    
@@ -1758,9 +1759,13 @@ table.pos-table{
     font-weight: bold;
     margin: 12px 0 42px;
 }
+.appli-aust-title span{
+    font-family: "Usual-Bold";  
+}
 .appli-content{
     color: #4a4a4a;
     width: 70%;
+    font-family: "Usual-Light;"
 }
 .app-block {
     border: solid 2px #d3d3d3;
@@ -1789,16 +1794,13 @@ table.pos-table{
 .app-block-title{
     color: #4a4a4a;
     font-size: 14px;
-    font-weight: bold;
+    font-family: "Usual-Bold";
 }
 .estimated-time{
     font-size: 12px;
     color: #4a4a4a;
     margin: 11px 0 10px;
 }
-.estimated-time span{
-    font-weight: bold;
-}
 .app-block p{
     color: #4a4a4a; 
     font-size: 12px;
@@ -1845,8 +1847,9 @@ table.pos-table{
 .section-c-title{
     color: #4a4a4a;
     font-size: 26px;
-    font-weight: bold;   
     margin-bottom: 49px;     
+    margin-top: 59px;   
+    font-family: "Usual-Bold";
 }
 .section-c-title span{
     float: right;
@@ -1870,6 +1873,7 @@ table.pos-table{
 }
 .main-sc-section p{
     margin-bottom: 0;
+    font-family: "Usual-Light";
 }
 .selection-form-title{
     font-size: 18px;
@@ -1976,6 +1980,7 @@ ul.security-level {
     margin-bottom: 6px;
     float: left;
     width: 100%;
+    font-family: "Usual-Light";
 }
 .main-rate-section{
     padding: 53px 70px 68px;
@@ -1983,24 +1988,28 @@ ul.security-level {
 }
 .rateing-title {
     font-size: 18px;
-    font-weight: bold;
     margin-bottom: 39px;
+    font-family: "Usual-Bold";
 }
 .rateing-title span{
     float: right;
     color: #4990e2;
     font-size: 14px;
+    font-family: "Usual-Bold";
+    font-weight: bold;
 }
 .rating-box-title{
     border-radius: 3px;
     background-color: #4a4a4a;
     color: #ffffff;
-    font-weight: bold;
     line-height: 52px;
     text-align: center;
     position: relative;
     z-index: 10;
 }
+.rating-box-title span{
+    font-family: "Usual-Bold";      
+}
 .ratting-box{
     border-radius: 3px;
     background-color: #ffffff;
@@ -2087,31 +2096,30 @@ ul.security-level {
   color: #ffffff;
 }
 span.left-s-label{
-  float: left;
-  font-weight: bold;
-  color: #4a4a4a;
-  font-size: 12px;  
-  margin-left: 26px;
-  margin-right: 0;
-  width: 150px;
-  text-align: center;
-  display: table;
+    float: left;
+    color: #4a4a4a;
+    font-size: 12px;  
+    margin-left: 26px;
+    margin-right: 0;
+    width: 150px;
+    text-align: center;
+    display: table;
 }
 span.right-s-label{
-  float: right;
-  font-weight: bold;
-  color: #4a4a4a;
-  font-size: 12px;
-  margin-right: 26px;
-  margin-left: 0;
-  width: 150px;
-  text-align: center;
-  display: table;
+    float: right;
+    color: #4a4a4a;
+    font-size: 12px;
+    margin-right: 26px;
+    margin-left: 0;
+    width: 150px;
+    text-align: center;
+    display: table; 
 }
 .left-s-label div,.right-s-label div {
     display: table-cell;
     vertical-align: middle;
     height: 40px;
+    font-family: "Usual-Bold";
 }
 .ips-box{
   margin-bottom: 26px;
@@ -4431,6 +4439,10 @@ label, label .label-title span {
     font-weight: 500;
 }
 
+.text-left label
+{
+    font-family: "Usual-Regular";
+}
 .assessment-criteria p{
     font-family: "Usual-Light";
 }
@@ -4442,4 +4454,10 @@ label, label .label-title span {
 .review-medium-title, .review-label{
     font-family: "Usual-Medium";
     font-size: 14px;
-}
+}
\ No newline at end of file
+.mobile-hide{
+    font-family: "Usual-Medium";
+}
+.estimated-time-20{
+    font-family: "Usual-Bold";
+}

cmsWebApp/webroot/extensions/adminportal/edit_job.jsp

@@ -36,12 +36,9 @@
                                     <label><oneit:ormlabel  obj="<%= job %>"    field="JobDescription" /></label>
                                     <oneit:ormtextarea    obj="<%= job %>"  attributeName="JobDescription"  cssClass="form-control textarea-box"/>
                                 </div>
-                                <div class="row">
-                                    <div class="col-sm-6 col-xs-12 form-group">
-                                        <label>Role Type</label>
-                                        <!--TODO: Levels are not named properly. apply styling form-control class-->
-                                        <tagfile:ormsingleasso_select  obj="<%= job %>" assocName="Level"   options="<%= job.getAllLevels() %>"/>
-                                    </div>
+                                <div class="form-group">
+                                    <label><oneit:ormlabel  obj="<%= job %>"    field="JobType" /></label>
+                                    <oneit:ormEnum  obj="<%= job %>"    attributeName="JobType" cssClass="form-control"/>
                                 </div>
                                 <div class="optional-title">OPTIONAL</div>
                                 <div class="row">

cmsWebApp/webroot/extensions/adminportal/messages/fieldnamesOverride.txt

@@ -6,6 +6,7 @@ Job.SaveAssessmentTemplate  =   Save these requirements as a template
 Job.SaveCultureTemplate     =   Save this Culture as a template
 Job.AssessmentTemplateName  =   Template Name
 Job.CultureTemplateName     =   Template Name
+Job.JobType                 =   Job Type
 
 CultureCriteria.Importance              =   Rate Importance
 CultureCriteria.CultureElementRating    =   Rating

cmsWebApp/webroot/extensions/adminportal/workplace_culture.jsp

@@ -77,7 +77,7 @@
                 <div class="create-job">
                     <div class="assessment-criteria">
                         <div class="form-group">
-                            <label class="label-16 work-title">Workplace Culture</label>
+                            <label class="label-16 work-title">Culture</label>
                             <p>
                               Lorem ipsum dolor sit amet, consectetuer adipiscing elit, sed diam nonummy nibh euismod tincidunt ut laoreet dolore magna aliquam erat volutpat. Ut wisi enim ad minim veniam, quis nostrud exerci tation ullamcorper suscipit lobortis nisl ut aliquip ex ea commodo consequat. Duis autem vel eum iriure dolor in hendrerit.
                             </p>      

cmsWebApp/webroot/extensions/applicantportal/application_outline.jsp

@@ -44,7 +44,7 @@
         <div class="three-block">
             <div class="col-sm-4 col-xs-12 app-block eq-height">
                 <div class="block-icon"><img src="images/selection-assessment.svg" /></div>
-                <div class="app-block-title">Selection Criteria</div>
+                <div class="app-block-title">Requirements</div>
                 <div class="estimated-time">Estimated time to complete: <span>5 mins</span></div>
                 <p>
                     Lorem ipsum dolor sit amet,
@@ -56,7 +56,7 @@
               </div>
             <div class="col-sm-4 col-xs-12 app-block app-second-block eq-height">
                 <div class="block-icon"><img src="images/workplace-culture.svg" /></div>
-                <div class="app-block-title">Workplace Culture</div>
+                <div class="app-block-title">Culture</div>
                 <div class="estimated-time">Estimated time to complete: <span>5 mins</span></div>
                 <p>
                     Lorem ipsum dolor sit amet,
@@ -68,7 +68,7 @@
             </div>
             <div class="col-sm-4 col-xs-12 app-block eq-height last-border">
                 <div class="block-icon"><img src="images/job-match-icon.svg" /></div>
-                <div class="app-block-title">Job Match Assessment</div>
+                <div class="app-block-title">Profile Assessment</div>
                 <div class="estimated-time">Estimated time to complete: <span>20 mins</span></div>
                 <p>
                     Lorem ipsum dolor sit amet,

cmsWebApp/webroot/extensions/applicantportal/inc/application_main_tabs.jsp

@@ -27,7 +27,7 @@
                                                                     .mapEntry("procParams", CollectionUtils.mapEntry("JobApplication", jobApplication).toMap())
                                                                     .toMap() %>">
                         <span><%= jobApplication.selectionCompleted() ? "<img src=\"images/right-mark.png\" />" : "1"%></span>
-                        <div class="mobile-hide">Selection Criteria</div>
+                        <div class="mobile-hide">Requirements</div>
                     </oneit:button>
                 </li>
         <%
@@ -39,7 +39,7 @@
                                                                 .mapEntry("procParams", CollectionUtils.mapEntry("JobApplication", jobApplication).toMap())
                                                                 .toMap() %>">
                     <span><%= jobApplication.cultureCompleted() ? "<img src=\"images/right-mark.png\" />" : (includeAssessment ? "2" : "1")%></span>
-                    <div class="mobile-hide">Workplace Culture</div>
+                    <div class="mobile-hide">Culture</div>
                 </oneit:button>
             </li>
             <li class="<%= pageNumber == "3" ? "active" :  jobApplication.assessmentCompleted() ? "complate" : ""%>">
@@ -48,7 +48,7 @@
                                                                 .mapEntry("procParams", CollectionUtils.mapEntry("JobApplication", jobApplication).toMap())
                                                                 .toMap() %>">
                     <span><%= jobApplication.assessmentCompleted() ? "<img src=\"images/right-mark.png\" />" : (includeAssessment ? "3" : "2")%></span>
-                    <div class="mobile-hide">Job Match Assessment</div>
+                    <div class="mobile-hide">Profile Assessment</div>
                 </oneit:button>
             </li>
             <li><a href="#"><span><%= includeAssessment ? "4" : "3" %></span><div class="mobile-hide">Submit Application</div></a></li>

cmsWebApp/webroot/extensions/applicantportal/job_match_assessment.jsp

@@ -46,13 +46,16 @@
             <span><oneit:toString value="<%= job.getJobTitle() %>"  mode="EscapeHTML"/></span>
         </div>
         <div class="show-mobile-title">
-            <div class="mobile-title-page">Section <oneit:toString value="<%= sectionNo %>" mode="EscapeHTML"/> - Job Match Assessment</div>
-            <div class="mobile-estimated">Estimated time to complete: <b>20 mins</b></div>
+            <div class="mobile-title-page">Profile Assessment</div>
+            <div class="mobile-estimated">Estimated time to complete: 
+                <span class="estimated-time-20">&nbsp;20 mins</span>
+            </div>
         </div>
-        <div class="section-title m-hide">Section <oneit:toString value="<%= sectionNo %>" mode="EscapeHTML"/></div>
         <div class="section-c-title m-hide">
-            Job Match Assessment
-            <span>Estimated time to complete: <b>20 mins</b></span>
+            Profile Assessment
+            <span>Estimated time to complete: 
+                <span class="estimated-time-20">&nbsp;20 mins</span>
+            </span>
         </div>
         <div class="section-tab-view">
             

cmsWebApp/webroot/extensions/applicantportal/selection_criteria.jsp

@@ -22,13 +22,13 @@
             <span><oneit:toString value="<%= job.getJobTitle() %>"  mode="EscapeHTML"/></span>
         </div>
         <div class="show-mobile-title">
-            <div class="mobile-title-page">Section 1 - Selection Criteria</div>
             <div class="mobile-estimated">Estimated time to complete: <b>5 mins</b></div>
         </div>
-        <div class="section-title m-hide">Section 1</div>
         <div class="section-c-title m-hide">
-            Selection Criteria
-        <span>Estimated time to complete: <b>5 mins</b></span>
+            Requirements
+        <span class="estimated-time">Estimated time to complete:
+            <span>5 mins</span>
+        </span>
         </div>
         <div class="section-tab-view">
             

cmsWebApp/webroot/extensions/applicantportal/workplace_culture.jsp

@@ -32,13 +32,16 @@
             <span><oneit:toString value="<%= job.getJobTitle() %>"  mode="EscapeHTML"/></span>
         </div>
         <div class="show-mobile-title">
-            <div class="mobile-title-page">Section <oneit:toString value="<%= sectionNo %>" mode="EscapeHTML"/> - Workplace Culture</div>
-            <div class="mobile-estimated">Estimated time to complete: <b>5 mins</b></div>
+            <div class="mobile-title-page">Culture</div>
+            <div class="mobile-estimated">Estimated time to complete:
+                <span class="estimated-time-20">&nbsp;5 mins</span>
+            </div>
         </div>
-        <div class="section-title m-hide">Section <oneit:toString value="<%= sectionNo %>" mode="EscapeHTML"/></div>
         <div class="section-c-title m-hide">
-            Workplace Culture
-            <span>Estimated time to complete: <b>5 mins</b></span>
+            Culture
+            <span class="estimated-time">Estimated time to complete: 
+                <span class="estimated-time-20">&nbsp;20 mins</span>
+            </span>
         </div>
         <div class="section-tab-view">