Commit ae054701 by Saliya Randunu

S12522329 # Client - Incoming Issues (raised by Client) #Icon and step name broken

parent 7ea3038b
...@@ -4912,6 +4912,7 @@ span.right-img { ...@@ -4912,6 +4912,7 @@ span.right-img {
img.alert-icon {float: left;} img.alert-icon {float: left;}
.close-alert {float: right;margin-top: 3px;cursor: pointer;} .close-alert {float: right;margin-top: 3px;cursor: pointer;}
.appli-status-short{width: 170px;} .appli-status-short{width: 170px;}
.select-img-wrap select{width:100%;}
.complete-page-footer {margin-bottom: 109px;} .complete-page-footer {margin-bottom: 109px;}
.userPic {margin-right: 16px;position: relative;top: -1px;} .userPic {margin-right: 16px;position: relative;top: -1px;}
.mobile-hide {display: inline-block;} .mobile-hide {display: inline-block;}
......
...@@ -109,7 +109,7 @@ ...@@ -109,7 +109,7 @@
<option>Excel</option> <option>Excel</option>
</select> </select>
</span> </span>
<span class="appli-status-short"> <span class="appli-status-short select-img-wrap">
<tagfile:ormsingleasso_select obj="<%= jobApplication %>" assocName="WorkFlow" cssClass="form-control app-process" <tagfile:ormsingleasso_select obj="<%= jobApplication %>" assocName="WorkFlow" cssClass="form-control app-process"
options="<%= sortedWorkFlows.toArray(new WorkFlow[0]) %>"/> options="<%= sortedWorkFlows.toArray(new WorkFlow[0]) %>"/>
......
...@@ -5,11 +5,18 @@ $(document).ready(function () { ...@@ -5,11 +5,18 @@ $(document).ready(function () {
$('select').select2({ $('select').select2({
minimumResultsForSearch: Infinity minimumResultsForSearch: Infinity
}); });
$('.status-img').select2({ $('.status-img').select2({
minimumResultsForSearch: Infinity, minimumResultsForSearch: Infinity,
templateResult: addUserPic, templateResult: addUserPic,
templateSelection: addUserPic templateSelection: addUserPic
}); });
$('.select-img-wrap select').select2({
dropdownAutoWidth : true,
minimumResultsForSearch: Infinity,
templateResult: addUserPic,
templateSelection: addUserPic
});
$('.navbar-toggle').click(function () { $('.navbar-toggle').click(function () {
$('.main-menu ul').slideToggle(); $('.main-menu ul').slideToggle();
}); });
...@@ -42,19 +49,22 @@ function setTabingSideBarHeight(){ ...@@ -42,19 +49,22 @@ function setTabingSideBarHeight(){
} }
function addUserPic(opt) { function addUserPic(opt) {
if (!opt.id) { if (!opt.id) {
return opt.text; return opt.text;
} }
var optimage = $(opt.element).data('image'); var optimage = $(opt.element).data('image');
if (!optimage) { if (!optimage) {
var $opt = $( var $opt = $(
'<span class="userName"><img src="images/' + $(opt.element).text().toLowerCase() + '.png" class="userPic" /> ' + $(opt.element).text() + '</span>' '<span class="userName "><img src="images/' + $(opt.element).text().toLowerCase() + '.png" class="userPic" /> ' + $(opt.element).text() + '</span>'
); );
return $opt; return $opt;
} else { } else {
var $opt = $( var $opt = $(
'<span class="userName"><img src="' + optimage + '" class="userPic" /> ' + $(opt.element).text() + '</span>' '<span class="userName tst"><img src="' + optimage + '" class="userPic" /> ' + $(opt.element).text() + '</span>'
); );
return $opt; return $opt;
} }
......
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