Commit d1f1ac7d by Nilu

fix styling issues

parent 76b4093a
...@@ -4737,7 +4737,7 @@ img.alert-icon {float: left;} ...@@ -4737,7 +4737,7 @@ img.alert-icon {float: left;}
.wc-question-y-n label.second-label{font-size: 12px; margin-bottom: 17px;} .wc-question-y-n label.second-label{font-size: 12px; margin-bottom: 17px;}
.textarea-box textarea{margin-bottom: 32px;font-size: 12px;} .textarea-box textarea{margin-bottom: 32px;font-size: 12px;}
.section-br-inside{margin: 25px 0 22px;} .section-br-inside{margin: 25px 0 22px;}
.section-btn .box-btn-gray {margin-right: 0; border-radius: 100px 0 0 100px;font-size: 13px;margin-right: -2.5px;border-right: none;padding: 0 0;width: 128px;} .section-btn .box-btn-gray.half-btn{margin-right: 0; border-radius: 100px 0 0 100px;font-size: 13px;margin-right: -2.5px;border-right: none;padding: 0 0;width: 128px;}
.section-btn .box-btn{font-size: 13px;border-radius: 0 100px 100px 0;margin-left: -2.5px;border:1px solid #03a0e7;padding: 0 0;width: 128px;} .section-btn .box-btn{font-size: 13px;border-radius: 0 100px 100px 0;margin-left: -2.5px;border:1px solid #03a0e7;padding: 0 0;width: 128px;}
.second-radio-primary.radio label{font-size: 12px;} .second-radio-primary.radio label{font-size: 12px;}
.section-btn {margin: 1px 0 7px;} .section-btn {margin: 1px 0 7px;}
...@@ -4756,7 +4756,8 @@ img.alert-icon {float: left;} ...@@ -4756,7 +4756,8 @@ img.alert-icon {float: left;}
.rateing-title span {font-size: 12px;position: absolute;right: 30px;top: 6px;} .rateing-title span {font-size: 12px;position: absolute;right: 30px;top: 6px;}
.rating-box-title {font-size: 12px;line-height: 20px;padding: 16px 0;border-radius: 0;} .rating-box-title {font-size: 12px;line-height: 20px;padding: 16px 0;border-radius: 0;}
.ratting-number {left: 0;margin: 0;padding-left: 0;position: absolute;right: 0;top: 0;width: 100%;} .ratting-number {left: 0;margin: 0;padding-left: 0;position: absolute;right: 0;top: 0;width: 100%;}
.pagination.ratting-number > li > a, .pagination.ratting-number > li > span{float: left;margin-left: 0;width: 14.28%;border-left: 0 none;} .pagination.ratting-number > li.scaler > a, .pagination.ratting-number > li.scaler> span{float: left;margin-left: 0;width: 14.28%;border-left: 0 none;}
.pagination.ratting-number > li.ipsative > a, .pagination.ratting-number > li.ipsative > span{float: left;margin-left: 0;width: 20%;border-left: 0 none;}
.ratting-number a label{padding: 14px 0;} .ratting-number a label{padding: 14px 0;}
.pagination.ratting-number > li:first-child > a, .pagination.ratting-number > li:first-child > span{border-bottom-left-radius: 0;border-top-left-radius: 0;border-left: 0;} .pagination.ratting-number > li:first-child > a, .pagination.ratting-number > li:first-child > span{border-bottom-left-radius: 0;border-top-left-radius: 0;border-left: 0;}
.pagination.ratting-number > li:last-child > a, .pagination.ratting-number > li:last-child > span{border-bottom-right-radius: 0;border-top-right-radius: 0;border-right: 0;} .pagination.ratting-number > li:last-child > a, .pagination.ratting-number > li:last-child > span{border-bottom-right-radius: 0;border-top-right-radius: 0;border-right: 0;}
...@@ -5801,3 +5802,7 @@ input{ ...@@ -5801,3 +5802,7 @@ input{
float: right; float: right;
} }
.textarea-box textarea::placeholder {
color: #9b9b9b;
font-family: "Usual-Light";
}
...@@ -210,10 +210,10 @@ ...@@ -210,10 +210,10 @@
<% <%
for(int index=1; index <= (questionType == QuestionType.SCALAR ? 7 : 5); index++) for(int index=1; index <= (questionType == QuestionType.SCALAR ? 7 : 5); index++)
{ {
String activeStr = (CollectionUtils.equals(String.valueOf(index), formValue) ? "active" : ""); String activeStr = (CollectionUtils.equals(String.valueOf(index), formValue) ? "active " : "");
String selectedStr = (CollectionUtils.equals(String.valueOf(index), formValue) ? "checked" : ""); String selectedStr = (CollectionUtils.equals(String.valueOf(index), formValue) ? "checked" : "");
%> %>
<li class="<%= activeStr %>"> <li class="<%= activeStr + ((questionType == QuestionType.SCALAR) ? "scaler" : "ipsative")%>">
<a href="javascript:void(0);"> <a href="javascript:void(0);">
<input type="radio" name="<%= optionKey %>" id="<%= index %>" onchange="gotoNextQuestion();" class="answer_radio" value="<%= answer.getFinalAnswerValue(index) %>" <%= selectedStr %>> <input type="radio" name="<%= optionKey %>" id="<%= index %>" onchange="gotoNextQuestion();" class="answer_radio" value="<%= answer.getFinalAnswerValue(index) %>" <%= selectedStr %>>
<label for="<%= index %>"><%= index %></label> <label for="<%= index %>"><%= index %></label>
...@@ -238,7 +238,12 @@ ...@@ -238,7 +238,12 @@
} }
%> %>
</div> </div>
<div> <div class="section-btn text-center">
<oneit:button value="Save and exit" name="saveAndExitWorkStyle" cssClass="box-btn-gray"
requestAttribs="<%= CollectionUtils.mapEntry("nextPage", exitPage)
.mapEntry ("JobApplication", jobApplication)
.mapEntry(UpdateMappedObjFP.FAIL_VALIDATION_ERRORS, Boolean.FALSE)
.toMap() %>"/>
<% <%
if(questionNumber + 1 < allQuestions.size()) if(questionNumber + 1 < allQuestions.size())
{ {
...@@ -267,13 +272,6 @@ ...@@ -267,13 +272,6 @@
} }
%> %>
<div class="auto-save"> <div class="auto-save">
<span style="float: left">
<oneit:button value="Save and exit" name="saveAndExitWorkStyle" cssClass="box-btn-gray"
requestAttribs="<%= CollectionUtils.mapEntry("nextPage", exitPage)
.mapEntry ("JobApplication", jobApplication)
.mapEntry(UpdateMappedObjFP.FAIL_VALIDATION_ERRORS, Boolean.FALSE)
.toMap() %>"/>
</span>
<%-- <div>Autosaved 1 min ago.</div> --%> <%-- <div>Autosaved 1 min ago.</div> --%>
</div> </div>
</div> </div>
......
...@@ -38,6 +38,8 @@ ...@@ -38,6 +38,8 @@
$(document).ready(function() $(document).ready(function()
{ {
recalcFunction = setupRecalc ($("form"), {'recalcOnError':true}); recalcFunction = setupRecalc ($("form"), {'recalcOnError':true});
$('.first-element-focus').focus();
}); });
$(document.body).addClass('bg-color'); $(document.body).addClass('bg-color');
...@@ -86,6 +88,7 @@ ...@@ -86,6 +88,7 @@
<% <%
FormTag applicationForm = FormTag.getActiveFormTag(request); FormTag applicationForm = FormTag.getActiveFormTag(request);
FormBuilder formBuilder = applicationForm.getFormBuilder(); FormBuilder formBuilder = applicationForm.getFormBuilder();
boolean first = true;
for(CriteriaType ct: CriteriaType.getCriteriaTypeArray()) for(CriteriaType ct: CriteriaType.getCriteriaTypeArray())
{ {
...@@ -115,7 +118,7 @@ ...@@ -115,7 +118,7 @@
<oneit:toString value="<%= answer.getAssessmentCriteria() %>" mode="EscapeHTML"/> <oneit:toString value="<%= answer.getAssessmentCriteria() %>" mode="EscapeHTML"/>
</label> </label>
<div class="radio radio-primary second-radio-primary"> <div class="radio radio-primary second-radio-primary">
<input type="radio" name="<%= optionKey %>" value="true" id="<%= trueID%>" <%= trueSelected %>/> <input type="radio" name="<%= optionKey %>" value="true" id="<%= trueID%>" <%= trueSelected %> class="<%= first ? "first-element-focus" : ""%>"/>
<label for="<%= trueID%>"> <label for="<%= trueID%>">
Yes Yes
</label> </label>
...@@ -135,6 +138,8 @@ ...@@ -135,6 +138,8 @@
</div> </div>
</oneit:recalcClass> </oneit:recalcClass>
<% <%
first = false;
if(answerNo++<total) if(answerNo++<total)
{ {
%> %>
...@@ -153,7 +158,7 @@ ...@@ -153,7 +158,7 @@
<div class="selection-br-line"></div> <div class="selection-br-line"></div>
<div class="main-sc-section-bottom btn-remove-padd"> <div class="main-sc-section-bottom btn-remove-padd">
<div class="section-btn text-center"> <div class="section-btn text-center">
<oneit:button value="Save and exit" name="saveAndExitExperienece" cssClass="box-btn-gray" <oneit:button value="Save and exit" name="saveAndExitExperienece" cssClass="box-btn-gray half-btn"
requestAttribs="<%= CollectionUtils.mapEntry("nextPage", exitPage) requestAttribs="<%= CollectionUtils.mapEntry("nextPage", exitPage)
.mapEntry ("JobApplication", jobApplication) .mapEntry ("JobApplication", jobApplication)
.mapEntry(UpdateMappedObjFP.FAIL_VALIDATION_ERRORS, Boolean.FALSE) .mapEntry(UpdateMappedObjFP.FAIL_VALIDATION_ERRORS, Boolean.FALSE)
...@@ -173,7 +178,12 @@ ...@@ -173,7 +178,12 @@
else else
{ {
%> %>
<oneit:button value="Proceed to next step" name="gotoPage" cssClass="box-btn"
<oneit:button value="Proceed to next step" name="gotoPage" cssClass="box-btn m-hide"
requestAttribs="<%= CollectionUtils.mapEntry("nextPage", nextPage)
.mapEntry("procParams", CollectionUtils.mapEntry("JobApplication", jobApplication).toMap())
.toMap() %>"/>
<oneit:button value="Proceed" name="gotoPage" cssClass="box-btn show-mobile"
requestAttribs="<%= CollectionUtils.mapEntry("nextPage", nextPage) requestAttribs="<%= CollectionUtils.mapEntry("nextPage", nextPage)
.mapEntry("procParams", CollectionUtils.mapEntry("JobApplication", jobApplication).toMap()) .mapEntry("procParams", CollectionUtils.mapEntry("JobApplication", jobApplication).toMap())
.toMap() %>"/> .toMap() %>"/>
......
...@@ -43,7 +43,7 @@ ...@@ -43,7 +43,7 @@
} }
int total = candidate.getCultureCriteriaAnswersCount(); int total = candidate.getCultureCriteriaAnswersCount();
boolean isLast = total == cultureQuestionNo; boolean isLast = total == cultureQuestionNo + 1;
if(isLast) if(isLast)
{ {
...@@ -163,7 +163,7 @@ ...@@ -163,7 +163,7 @@
<% <%
} }
%> %>
<oneit:button value="Save and exit" name="saveAndExitCulture" cssClass="box-btn-gray" <oneit:button value="Save and exit" name="saveAndExitCulture" cssClass="<%= (!isLast) ? "box-btn-gray" : "box-btn-gray half-btn" %>"
requestAttribs="<%= CollectionUtils.mapEntry("nextPage", exitPage) requestAttribs="<%= CollectionUtils.mapEntry("nextPage", exitPage)
.mapEntry ("JobApplication", jobApplication) .mapEntry ("JobApplication", jobApplication)
.mapEntry(UpdateMappedObjFP.FAIL_VALIDATION_ERRORS, Boolean.FALSE) .mapEntry(UpdateMappedObjFP.FAIL_VALIDATION_ERRORS, Boolean.FALSE)
......
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