diff --git a/e107_admin/header.php b/e107_admin/header.php index dad7d14dd..6f9f048db 100644 --- a/e107_admin/header.php +++ b/e107_admin/header.php @@ -45,12 +45,22 @@ if(e_PAGE != 'menus.php') // Quick fix for Menu Manager inactive drop-down probl e107::css('core', 'bootstrap-editable/css/bootstrap-editable.css', 'jquery'); e107::js('core', 'bootstrap-editable/js/bootstrap-editable.min.js', 'jquery', 2); +e107::css('core', 'bootstrap-select/bootstrap-select.min.css', 'jquery'); +e107::js('core', 'bootstrap-select/bootstrap-select.min.js', 'jquery', 2); + +e107::css('core', 'bootstrap-multiselect/css/bootstrap-multiselect.css', 'jquery'); +e107::js('core', 'bootstrap-multiselect/js/bootstrap-multiselect.js', 'jquery', 2); + +//e107::css('core', 'bootstrap-datetimepicker/css/bootstrap-datetimepicker.min.css', 'jquery'); +//e107::js('core', 'bootstrap-datetimepicker/js/bootstrap-datetimepicker.min.js', 'jquery', 2); + e107::js('core', 'jquery.elastic.js', 'jquery', 2); + e107::js('core', 'jquery-ui-timepicker-addon.js', 'jquery', 2); -e107::css('core', 'chosen/chosen.css', 'jquery'); -e107::js('core', 'chosen/chosen.jquery.min.js', 'jquery', 2); +//e107::css('core', 'chosen/chosen.css', 'jquery'); +//e107::js('core', 'chosen/chosen.jquery.min.js', 'jquery', 2); e107::js('core', 'password/jquery.pwdMeter.js', 'jquery', 2); diff --git a/e107_admin/prefs.php b/e107_admin/prefs.php index cbd675a1a..575e76ab3 100644 --- a/e107_admin/prefs.php +++ b/e107_admin/prefs.php @@ -432,7 +432,7 @@ $text .= "
=0||c.html.indexOf("[")===0){e=c.html.replace(/\[|\]/g,"").split(" ");if(e.length)for(p=0,r=e.length;p"+c.html.substr(l+k.length),m=m.substr(0,l)+""+m.substr(l)):m=c.html,h.html(m),this.result_activate(h),c.group_array_index!=null&&a("#"+this.results_data[c.group_array_index].dom_id).css("display","list-item")):(this.result_highlight&&i===this.result_highlight.attr("id")&&this.result_clear_highlight(),this.result_deactivate(h))}}return j<1&&k.length?this.no_results(k):this.winnow_results_set_highlight()},e.prototype.winnow_results_clear=function(){var b,c,d,e,f;this.search_field.val(""),c=this.search_results.find("li"),f=[];for(d=0,e=c.length;d'+this.results_none_found+' ""'),c.find("span").first().html(b),this.search_results.append(c)},e.prototype.no_results_clear=function(){return this.search_results.find(".no-results").remove()},e.prototype.keydown_arrow=function(){var b,c;this.result_highlight?this.results_showing&&(c=this.result_highlight.nextAll("li.active-result").first(),c&&this.result_do_highlight(c)):(b=this.search_results.find("li.active-result").first(),b&&this.result_do_highlight(a(b)));if(!this.results_showing)return this.results_show()},e.prototype.keyup_arrow=function(){var a;if(!this.results_showing&&!this.is_multiple)return this.results_show();if(this.result_highlight)return a=this.result_highlight.prevAll("li.active-result"),a.length?this.result_do_highlight(a.first()):(this.choices>0&&this.results_hide(),this.result_clear_highlight())},e.prototype.keydown_backstroke=function(){return this.pending_backstroke?(this.choice_destroy(this.pending_backstroke.find("a").first()),this.clear_backstroke()):(this.pending_backstroke=this.search_container.siblings("li.search-choice").last(),this.pending_backstroke.addClass("search-choice-focus"))},e.prototype.clear_backstroke=function(){return this.pending_backstroke&&this.pending_backstroke.removeClass("search-choice-focus"),this.pending_backstroke=null},e.prototype.keydown_checker=function(a){var b,c;b=(c=a.which)!=null?c:a.keyCode,this.search_field_scale(),b!==8&&this.pending_backstroke&&this.clear_backstroke();switch(b){case 8:this.backstroke_length=this.search_field.val().length;break;case 9:this.results_showing&&!this.is_multiple&&this.result_select(a),this.mouse_on_container=!1;break;case 13:a.preventDefault();break;case 38:a.preventDefault(),this.keyup_arrow();break;case 40:this.keydown_arrow()}},e.prototype.search_field_scale=function(){var b,c,d,e,f,g,h,i,j;if(this.is_multiple){d=0,h=0,f="position:absolute; left: -1000px; top: -1000px; display:none;",g=["font-size","font-style","font-weight","font-family","line-height","text-transform","letter-spacing"];for(i=0,j=g.length;i",{style:f}),c.text(this.search_field.val()),a("body").append(c),h=c.width()+25,c.remove(),h>this.f_width-10&&(h=this.f_width-10),this.search_field.css({width:h+"px"}),b=this.container.height(),this.dropdown.css({top:b+"px"})}},e.prototype.generate_random_id=function(){var b;b="sel"+this.generate_random_char()+this.generate_random_char()+this.generate_random_char();while(a("#"+b).length>0)b+=this.generate_random_char();return b},e}(AbstractChosen),c=function(a){var b;return b=a.outerWidth()-a.width()},d.get_side_border_padding=c}.call(this); \ No newline at end of file diff --git a/e107_web/js/core/admin.jquery.js b/e107_web/js/core/admin.jquery.js index 8dcf9e63a..37c8a70cc 100644 --- a/e107_web/js/core/admin.jquery.js +++ b/e107_web/js/core/admin.jquery.js @@ -49,6 +49,10 @@ $(document).ready(function() }); + $(".e-multiselect").multiselect(); + + $('.e-select').selectpicker(); + // $(".e-spinner").spinner(); //FIXME breaks tooltips etc. @@ -61,7 +65,7 @@ $(document).ready(function() $(".e-tags").tagit(); - $(".e-multiselect").chosen(); + // $(".e-multiselect").chosen();