Merge 2f1052df1a into 976616b47b

app/assets/javascripts/application.js

@@ -40,6 +40,8 @@
 //= require osem-commercials
 //= require unobtrusive_flash
 //= require unobtrusive_flash_bootstrap
+//= require bootstrap-select
+//= require osem-selectpicker
 
 $(document).ready(function() {
     $('a[disabled=disabled]').click(function(event){

app/assets/javascripts/osem-selectpicker.js

@@ -0,0 +1,3 @@
+$(function () {
+  $('.selectpicker').selectpicker();
+});

app/assets/stylesheets/application.css

@@ -14,4 +14,6 @@
  *= require bootstrap-datetimepicker
  *= require leaflet
  *= require bootstrap3-switch
+ *= require bootstrap-select
+ *= require osem-selectpicker
 */

app/assets/stylesheets/osem-selectpicker.css

@@ -0,0 +1,2 @@
+/* Align  bootstrap-select  with the Add button */
+.add-user-role > .select { display: inline; }