diff --git a/app/assets/stylesheets/default/application.css.erb b/app/assets/stylesheets/default/application.css.erb index 189737d2e5..e7f87eb057 100644 --- a/app/assets/stylesheets/default/application.css.erb +++ b/app/assets/stylesheets/default/application.css.erb @@ -600,7 +600,9 @@ input#user_search {width: 100%} * html div#tab-content-members fieldset div { height: 450px; } -div#tab-content-members fieldset div.select-boxes label { +div#tab-content-members fieldset div.select-boxes label, +div#tab-content-members fieldset div#principal_results div.roles, +div#tab-content-members fieldset div#principal_results div.principals { display: inline-block; width: 350px; /* max-width of select2boxes */ } diff --git a/app/views/members/_autocomplete_for_member.html.erb b/app/views/members/_autocomplete_for_member.html.erb index 8cb4d78046..d082b8b853 100644 --- a/app/views/members/_autocomplete_for_member.html.erb +++ b/app/views/members/_autocomplete_for_member.html.erb @@ -9,17 +9,22 @@ modify it under the terms of the GNU General Public License version 3. See doc/COPYRIGHT.rdoc for more details. ++#%> - -
- <% if principals.size > 20 %> -

<%= simple_format(l('notice_to_many_principals_to_display'))%>

-
- <% elsif principals.size == 0 %> -

<%= l('notice_no_principals_found')%>

+
+
+ <% if principals.size > 20 %> +

<%= simple_format(l('notice_to_many_principals_to_display'))%>

+
- <% else %> - <%= principals_check_box_tags 'member[user_ids][]', principals %> + <% elsif principals.size == 0 %> +

<%= l('notice_no_principals_found')%>

+ + <% else %> +

+ <%= "#{l(:label_user_plural)}/#{l(:label_group_plural)}" %>: + <%= principals_check_box_tags 'member[user_ids][]', principals %> +

+

<%= l(:label_role_plural) %>: @@ -30,7 +35,7 @@ See doc/COPYRIGHT.rdoc for more details. <% end %>

- +

<%= submit_tag l(:button_add), :id => 'member-add-submit' %>

<% end %>