Skip to content

P
PERFORMA_REPLICA
Commit 6a0a4a3e by Saliya Randunu
Options

S12519589 # Client - Incoming Issues (raised by Client) #Allow click on… 

S12519589 # Client - Incoming Issues (raised by Client) #Allow click on magnifying glass and Fix issue related job status dropdown
parent a969a3c9
Showing with 143 additions and 27 deletions
cmsWebApp/webroot/css/common.css
......@@ -66,6 +66,7 @@ header{
height: 65px;
z-index: 1000;
}
.relative-parent {position: relative;}
.clearboth {clear: both;}
.site-logo {
float: left;
......@@ -2830,17 +2831,126 @@ a.forgot-pass {
}
.search-input {
background-color: rgba(255,255,255,0.5);
padding-right: 32px;
padding-right: 40px;
border : solid 1px #e5e8eb;
background-image: url('../images/search-icon.png');
background-repeat: no-repeat;
background-position: right 10px center;
/* background-position: right 10px center;*/
font-size: 12px;
}
.search-icon-btn {
display: block; position: absolute ; right : 0; top:15px;
background: url('../images/search-icon.png') no-repeat center center;
width: 45px; height: 45px ; cursor: pointer;
}
.shorting-dropdown .search-input {
border : solid 1px #b9bbbd;
}
.select2type .dropdown-toggle {
font-size: 12px;
color: #4e5258;
background-image: linear-gradient(to bottom, #ffffff, #f5f5f5);
border: solid 1px #e5e8eb;
box-shadow: none;
height: 50px;
border-radius: 2px;
background-color: #fff;
box-sizing: border-box;
cursor: pointer;
display: block;
position: relative;
}
.select2type .dropdown-toggle .top-selected-item {
line-height: 50px;
padding: 0 14px;
color: #444;
display: block;
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
}
.select2type .select2type_arrow {
position: absolute;
top: 26px;
right: 10px;
width: 20px;
height: 50px;
width: 13px;
height: 8px;
background-repeat: no-repeat;
border: none;
margin-left: -15px;
margin-top: -4px;
background-image: url('../images/select-down-arrow.png');
}
.select2type.open .select2type_arrow{
background-image: url('../images/select-top-arrow.png');
}
.select2type .select2type_arrow b {
position: absolute;
top: 50%;
left: 50%;
}
.select2type-results {
max-height: 200px;
overflow-y: auto;
width: 100%;
padding: 0;
border:none;
margin: 0;
-webkit-box-shadow:none;
box-shadow: none;
border-top : 1px solid #e5e8eb;
border-left : 1px solid #e5e8eb;
border-right : 1px solid #e5e8eb;
}
.select2type-results a {
background-color: #f5f7f8;
color: #4e5258;
cursor: pointer;
padding: 12px 15px 12px 52px;
font-size: 12px;
border-bottom: solid 1px #e5e8eb;
display: block;
position: relative;
}
.select2type-results .dropdown-item:before{
position: absolute ;
display: block;
width: 20px; height: 20px;
background: url('../images/draft.png') no-repeat top left;
top: 11px;
left: 15px; content : '';
}
.select2type-results .icontype_open:before{
background: url('../images/open.png') no-repeat top left;
}
.select2type-results .icontype_draft:before{
background: url('../images/draft.png') no-repeat top left;
}
.select2type-results .icontype_closed:before{
background: url('../images/closed.png') no-repeat top left;
}
.select2type-results .icontype_filled:before{
background: url('../images/filled.png') no-repeat top left;
}
/*All Jobs Page End*/
/*View Applicants*/
......
cmsWebApp/webroot/extensions/adminportal/inc/job_list.jsp
......@@ -173,33 +173,31 @@
</div>
</div>
<div class="job-states jl-c wider-select">
<oneit:skin tagName="button_group">
<oneit:skin tagName="button_dropdown" label=" " class="btn btn-primary">
<li>
<oneit:button name="saveJob" value="<%= job.getJobStatus().getDescription() %>" skin="link" cssClass=""
requestAttribs="<%= CollectionUtils.mapEntry("Job", job)
.mapEntry("nextPage", homePage + "&JobStatus=" + (jobStatus != null ? jobStatus : "") + "&JobSortOption=" + jobSortOption)
.mapEntry("JobStatus", job.getJobStatus())
.toMap() %>" />
</li>
<div class="dropdown show select2type">
<a class="dropdown-toggle" href="#" role="button" id="dropdownMenuLink<%= job.getID() %>" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
<span class="top-selected-item"><img src="images/<%= job.getJobStatus().getDescription().toLowerCase() %>.png" class="userPic" /> <%= job.getJobStatus().getDescription() %></span>
<span class="select2type_arrow " role="presentation"><b role="presentation"></b></span>
</a>
<div class="dropdown-menu select2type-results" aria-labelledby="dropdownMenuLink<%= job.getID() %>">
<a href="#" class="dropdown-item icontype_<%= job.getJobStatus().getDescription().toLowerCase() %>"><%= job.getJobStatus().getDescription() %></a>
<%
for (JobStatus jStatus : job.getAvailableStatus(roleType))
{
%>
<li>
<oneit:button name="saveJob" value="<%= jStatus.getDescription() %>" skin="link" cssClass=""
<oneit:button name="saveJob" value="<%= jStatus.getDescription() %>" skin="link" cssClass="<%="dropdown-item icontype_" + jStatus.getDescription().toLowerCase() %>"
requestAttribs="<%= CollectionUtils.mapEntry("Job", job)
.mapEntry("nextPage", homePage + "&JobStatus=" + (jobStatus != null ? jobStatus : "") + "&JobSortOption=" + jobSortOption)
.mapEntry("JobStatus", jStatus)
.toMap() %>" />
</li>
<%
}
%>
</oneit:skin>
</oneit:skin>
<oneit:ormEnum obj="<%= job %>" attributeName="JobStatus" cssClass="form-control status-img job-status"
enums="<%= job.getAvailableStatus(roleType) %>"/>
</div>
</div>
<!-- <oneit:ormEnum obj="<%= job %>" attributeName="JobStatus" cssClass="form-control status-img job-status"
enums="<%= job.getAvailableStatus(roleType) %>"/>-->
</div>
<oneit:button name="saveJob" value="Save" cssClass="<%= "save-job" + job.getID().toString() + " hidden"%>"
requestAttribs="<%= CollectionUtils.mapEntry("Job", job).mapEntry("nextPage", homePage + "&JobStatus=" + jobStatus + "&JobSortOption=" + jobSortOption).toMap() %>" />
......
cmsWebApp/webroot/extensions/adminportal/list_jobs.jsp
......@@ -122,12 +122,19 @@
<oneit:form name="editJob" method="post" enctype="multipart/form-data">
<script type="text/javascript">
$('#searchText').keypress(function (e) {
if (e.which === 13) {
$('input[name = Search]').click();
return false;
}
// $('#searchText').keypress(function (e) {
// if (e.which === 13) {
// $('input[name = Search]').click();
// return false;
// }
// });
$(function(){
$('.search-icon-btn').click(function () {
$('.search-real-btn').click();
});
});
</script>
<div class="dashboard-content-area second-part">
......@@ -137,11 +144,12 @@
<div class="d-job-title all-jobs-title">
<%= jobStatus == null ? "All" : jobStatus.getDescription() %> Jobs
</div>
<div class="shorting-dropdown">
<div class="shorting-dropdown relative-parent">
<div class="order-label">Search Jobs</div>
<oneit:ormInput obj="<%= searchJob %>" type="text" attributeName="Details" cssClass="form-control search-input" id="searchText" />
<span class="search-icon-btn"></span>
</div>
<oneit:button value="Search" name="search" cssClass="btn btn-primary" style="display:none;"/>
<oneit:button value="Search" name="search" cssClass="btn btn-primary search-real-btn hidden" />
<%
if(jobs.length > 1)
......
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