Merge branch 'seeddms-5.0.x' into seeddms-5.1.x

This commit is contained in:
Uwe Steinmann 2016-11-04 15:43:00 +01:00
commit 42bb8b4bf6

View File

@ -35,8 +35,18 @@ $(document).ready( function() {
return $newstate; return $newstate;
} }
}); });
$(".chzn-select-deselect").select({ $(".chzn-select-deselect").select2({
allowClear:true allowClear:true,
width: '100%',
templateResult: function (state) {
var subtitle = $(state.element).data('subtitle');
var html = '<span>'+state.text+'';
if(subtitle)
html += '<br /><i>'+subtitle+'</i>';
html += '</span>';
var $newstate = $(html);
return $newstate;
}
}); });
/* change the color and length of the bar graph showing the password /* change the color and length of the bar graph showing the password