diff --git a/app/assets/stylesheets/default/main.css.erb b/app/assets/stylesheets/default/main.css.erb index 9a19f633c9..43de2a2231 100644 --- a/app/assets/stylesheets/default/main.css.erb +++ b/app/assets/stylesheets/default/main.css.erb @@ -467,8 +467,6 @@ div#tab-content-memberships fieldset legend, div#tab-content-users fieldset legend { font-weight: bold; } div#tab-content-members .user.status_registered, div#tab-content-members label.status_registered { filter: alpha(opacity=80); -khtml-opacity: 0.8; opacity: 0.8; -moz-opacity: 0.8; } -table.members td.group { padding-left: 20px; background: url(<%= asset_path 'webalys/group.png' %>) no-repeat 0% 50%; } - input#user_search {width: 100%} * html div#tab-content-members fieldset div { height: 450px; } diff --git a/app/views/projects/settings/_members.html.erb b/app/views/projects/settings/_members.html.erb index 20acc9af77..be58347111 100644 --- a/app/views/projects/settings/_members.html.erb +++ b/app/views/projects/settings/_members.html.erb @@ -52,50 +52,52 @@ See doc/COPYRIGHT.rdoc for more details. <% if @members.any? %> <% authorized = authorize_for('members', 'update') %> - - - - - <%= call_hook(:view_projects_settings_members_table_header, :project => @project) %> - + + + + + + <%= call_hook(:view_projects_settings_members_table_header, :project => @project) %> + + - <% @members.each do |member| %> - <% next if member.new_record? %> - - - - <% end %> - - <%= call_hook(:view_projects_settings_members_table_row, { :project => @project, :member => member}) %> - -<% end; reset_cycle %> + <% @members.each do |member| %> + <% next if member.new_record? %> + + + + <% end %> + + <%= call_hook(:view_projects_settings_members_table_row, { :project => @project, :member => member}) %> + + <% end; reset_cycle %>
<%= User.model_name.human %> / <%= Group.model_name.human %><%= l(:label_role_plural) %>
<%= User.model_name.human %> / <%= Group.model_name.human %><%= l(:label_role_plural) %>
<%= link_to_user member.principal %> - <%=h member.roles.sort.collect(&:to_s).join(', ') %> - <% if authorized %> - <%= form_for(member, :url => {:controller => '/members', - :action => 'update', - :id => member, - :page => params[:page]}, - :method => :put, - :remote => true, - :html => { :id => "member-#{member.id}-roles-form", - :class => 'hol', - :style => 'display:none' }) do |f| %> -

<% roles.each do |role| %> -
- <% end %>

- <%= hidden_field_tag 'member[role_ids][]', '' %> -

<%= submit_tag l(:button_change), :class => "small" %> - <%= link_to_function l(:button_cancel), "$('member-#{member.id}-roles').show(); $('member-#{member.id}-roles-form').hide(); return false;" %>

- <% end %> -
- <%= link_to_function l(:button_edit), "$('member-#{member.id}-roles').hide(); $('member-#{member.id}-roles-form').show(); return false;", :class => 'icon icon-edit' %> - <%= link_to(l(:button_delete), {:controller => '/members', :action => 'destroy', :id => member, :page => params[:page]}, - :method => :delete, - :remote => true, - :confirm => ((!User.current.admin? && member.include?(User.current)) ? l(:text_own_membership_delete_confirmation) : nil), - :title => l(:button_delete), :class => 'icon icon-delete') if member.deletable? %> -
<%= link_to_user member.principal %> + <%=h member.roles.sort.collect(&:to_s).join(', ') %> + <% if authorized %> + <%= form_for(member, :url => {:controller => '/members', + :action => 'update', + :id => member, + :page => params[:page]}, + :method => :put, + :remote => true, + :html => { :id => "member-#{member.id}-roles-form", + :class => 'hol', + :style => 'display:none' }) do |f| %> +

<% roles.each do |role| %> +
+ <% end %>

+ <%= hidden_field_tag 'member[role_ids][]', '' %> +

<%= submit_tag l(:button_change), :class => "small" %> + <%= link_to_function l(:button_cancel), "$('member-#{member.id}-roles').show(); $('member-#{member.id}-roles-form').hide(); return false;" %>

+ <% end %> +
+ <%= link_to_function l(:button_edit), "$('member-#{member.id}-roles').hide(); $('member-#{member.id}-roles-form').show(); return false;", :class => 'icon icon-edit' %> + <%= link_to(l(:button_delete), {:controller => '/members', :action => 'destroy', :id => member, :page => params[:page]}, + :method => :delete, + :remote => true, + :confirm => ((!User.current.admin? && member.include?(User.current)) ? l(:text_own_membership_delete_confirmation) : nil), + :title => l(:button_delete), :class => 'icon icon-delete') if member.deletable? %> +