Merge branch 'master' of github.com:tracim/tracim

tracim/tracim/public/assets/js/main.js

@@ -2,6 +2,15 @@ $(document).ready(function () {
 
   // add select2 for admin/workspace/<id> for user selection
   if ($('#add-role-from-existing-user-form').length > 0) {
-    $('#user_id').select2();
+    $('#user_id').select2({
+      "language": {
+        "noResults": function () {
+          return "Aucun résultats"
+        }
+      },
+      escapeMarkup: function (markup) {
+        return markup
+      }
+    })
   }
 })

tracim/tracim/templates/admin/workspace_getone.mak

@@ -75,7 +75,7 @@
                                     <form role="form" method="POST" action="${tg.url('/admin/workspaces/{}/roles'.format(result.workspace.id))}">
                                         <div class="form-group">
                                             <label for="user_id">${_('User')}</label>
-                                            <select name="user_id" id="user_id" class="form-control">
+                                            <select name="user_id" id="user_id" class="form-control" style="width:100%">
                                                 % for user in fake_api.users:
                                                     % if user.id not in (user.id for user in result.workspace.members):
                                                         <option value="${user.id}">${user.name}</option>