Use icon from icon font for group indicator

in project members view
pull/851/head
Christian Ratz 11 years ago
parent 6b61df7f2b
commit edb9aa8d97
  1. 2
      app/assets/stylesheets/default/main.css.erb
  2. 10
      app/views/projects/settings/_members.html.erb

@ -467,8 +467,6 @@ div#tab-content-memberships fieldset legend,
div#tab-content-users fieldset legend { font-weight: bold; } 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; } 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%} input#user_search {width: 100%}
* html div#tab-content-members fieldset div { height: 450px; } * html div#tab-content-members fieldset div { height: 450px; }

@ -52,17 +52,19 @@ See doc/COPYRIGHT.rdoc for more details.
<% if @members.any? %> <% if @members.any? %>
<% authorized = authorize_for('members', 'update') %> <% authorized = authorize_for('members', 'update') %>
<table class="list members"> <table class="list members">
<thead><tr> <thead>
<tr>
<th><%= User.model_name.human %> / <%= Group.model_name.human %></th> <th><%= User.model_name.human %> / <%= Group.model_name.human %></th>
<th><%= l(:label_role_plural) %></th> <th><%= l(:label_role_plural) %></th>
<th style="width:15%"></th> <th style="width:15%"></th>
<%= call_hook(:view_projects_settings_members_table_header, :project => @project) %> <%= call_hook(:view_projects_settings_members_table_header, :project => @project) %>
</tr></thead> </tr>
</thead>
<tbody> <tbody>
<% @members.each do |member| %> <% @members.each do |member| %>
<% next if member.new_record? %> <% next if member.new_record? %>
<tr id="member-<%= member.id %>" class="<%= cycle 'odd', 'even' %> member"> <tr id="member-<%= member.id %>" class="<%= cycle 'odd', 'even' %> member">
<td class="<%= member.principal.class.name.downcase %> <%= user_status_class member.principal%>" title="<%= user_status_i18n member.principal%>"><%= link_to_user member.principal %></td> <td class="<%= member.principal.class.name.downcase %> <%= 'icon-context icon-group' if member.principal.class.name.downcase == 'group' %> <%= user_status_class member.principal%>" title="<%= user_status_i18n member.principal%>"><%= link_to_user member.principal %></td>
<td class="roles"> <td class="roles">
<span id="member-<%= member.id %>-roles"><%=h member.roles.sort.collect(&:to_s).join(', ') %></span> <span id="member-<%= member.id %>-roles"><%=h member.roles.sort.collect(&:to_s).join(', ') %></span>
<% if authorized %> <% if authorized %>
@ -95,7 +97,7 @@ See doc/COPYRIGHT.rdoc for more details.
</td> </td>
<%= call_hook(:view_projects_settings_members_table_row, { :project => @project, :member => member}) %> <%= call_hook(:view_projects_settings_members_table_row, { :project => @project, :member => member}) %>
</tr> </tr>
<% end; reset_cycle %> <% end; reset_cycle %>
</tbody> </tbody>
</table> </table>

Loading…
Cancel
Save