# HG changeset patch
# User Chris Cannam <chris.cannam@soundsoftware.ac.uk>
# Date 1310563604 -3600
# Node ID d7326bb4f6f0cda12bfdcf0fffed630c3208203e
# Parent  7a2bb9c5fb344070312dcd26122e16668773fb0c
Show styled member list in Members view for non-manager users; implement member editing partial in this view for manager users. Remove Members tab from Settings

diff -r 7a2bb9c5fb34 -r d7326bb4f6f0 app/controllers/members_controller.rb
--- a/app/controllers/members_controller.rb	Wed Jul 13 11:03:57 2011 +0100
+++ b/app/controllers/members_controller.rb	Wed Jul 13 14:26:44 2011 +0100
@@ -61,11 +61,11 @@
     respond_to do |format|
       if members.present? && members.all? {|m| m.valid? }
 
-        format.html { redirect_to :controller => 'projects', :action => 'settings', :tab => 'members', :id => @project }
+        format.html { redirect_to :action => 'index', :project_id => @project }
 
         format.js { 
           render(:update) {|page| 
-            page.replace_html "tab-content-members", :partial => 'projects/settings/members'
+            page.replace_html "memberlist", :partial => 'editlist'
             page << 'hideOnLoad()'
             members.each {|member| page.visual_effect(:highlight, "member-#{member.id}") }
           }
@@ -89,10 +89,10 @@
   def edit
     if request.post? and @member.update_attributes(params[:member])
   	 respond_to do |format|
-        format.html { redirect_to :controller => 'projects', :action => 'settings', :tab => 'members', :id => @project }
+        format.html { redirect_to :action => 'index', :project_id => @project }
         format.js { 
           render(:update) {|page| 
-            page.replace_html "tab-content-members", :partial => 'projects/settings/members'
+            page.replace_html "memberlist", :partial => 'editlist'
             page << 'hideOnLoad()'
             page.visual_effect(:highlight, "member-#{@member.id}")
           }
@@ -106,9 +106,9 @@
       @member.destroy
     end
     respond_to do |format|
-      format.html { redirect_to :controller => 'projects', :action => 'settings', :tab => 'members', :id => @project }
+      format.html { redirect_to :action => 'index', :project_id => @project }
       format.js { render(:update) {|page|
-          page.replace_html "tab-content-members", :partial => 'projects/settings/members'
+          page.replace_html "memberlist", :partial => 'editlist'
           page << 'hideOnLoad()'
         }
       }
diff -r 7a2bb9c5fb34 -r d7326bb4f6f0 app/helpers/projects_helper.rb
--- a/app/helpers/projects_helper.rb	Wed Jul 13 11:03:57 2011 +0100
+++ b/app/helpers/projects_helper.rb	Wed Jul 13 14:26:44 2011 +0100
@@ -25,7 +25,6 @@
     tabs = [{:name => 'info', :action => :edit_project, :partial => 'projects/edit', :label => :label_information_plural},
             {:name => 'overview', :action => :edit_project, :partial => 'projects/settings/overview', :label => :label_welcome_page},
             {:name => 'modules', :action => :select_project_modules, :partial => 'projects/settings/modules', :label => :label_module_plural},
-            {:name => 'members', :action => :manage_members, :partial => 'projects/settings/members', :label => :label_member_plural},
             {:name => 'versions', :action => :manage_versions, :partial => 'projects/settings/versions', :label => :label_version_plural},
             {:name => 'categories', :action => :manage_categories, :partial => 'projects/settings/issue_categories', :label => :label_issue_category_plural},
             {:name => 'wiki', :action => :manage_wiki, :partial => 'projects/settings/wiki', :label => :label_wiki},
diff -r 7a2bb9c5fb34 -r d7326bb4f6f0 app/views/members/_editlist.rhtml
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/app/views/members/_editlist.rhtml	Wed Jul 13 14:26:44 2011 +0100
@@ -0,0 +1,77 @@
+<%= error_messages_for 'member' %>
+
+<% roles = Role.find_all_givable
+   members = @project.member_principals.find(:all, :include => [:roles, :principal]).sort %>
+
+<% if members.any? %>
+<table class="list members">
+	<thead><tr>
+	  <th><%= l(:label_user) %></th>
+	  <th><%= l(:label_role_plural) %></th>
+          <th style="width:15%"></th>
+	</tr></thead>
+	<tbody>
+	<% members.each do |member| %>
+          <% next if member.new_record? %>
+          <tr id="member-<%= member.id %>" class="<%= cycle 'odd', 'even' %> member">
+          <td class="<%= member.principal.class.name.downcase %>"><%= link_to_user member.principal %></td>
+          <td class="roles">
+            <span id="member-<%= member.id %>-roles"><%=h member.roles.sort.collect(&:to_s).join(', ') %></span>
+            <% remote_form_for(:member, member, :url => {:controller => 'members', :action => 'edit', :id => member},
+      			 :method => :post, :html => { :id => "member-#{member.id}-roles-form", :class => 'hol' }) do |f| %>
+            <p><% roles.each do |role| %>
+              <label><%= check_box_tag 'member[role_ids][]', role.id, member.roles.include?(role), :disabled => member.member_roles.detect {|mr| mr.role_id == role.id && !mr.inherited_from.nil?} %> <%=h role %></label><br />
+             <% end %></p>
+        <%= hidden_field_tag 'member[role_ids][]', '' %>
+        <p><%= 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;" %></p>
+    <% end %>
+  </td>
+  <td class="buttons">
+      <%= 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_remote(l(:button_delete), { :url => {:controller => 'members', :action => 'destroy', :id => member},                                              
+                                              :method => :post,
+                                              :confirm => (!User.current.admin? && member.include?(User.current) ? l(:text_own_membership_delete_confirmation) : nil)
+                                            }, :title => l(:button_delete),
+                                               :class => 'icon icon-del') if member.deletable? %>
+  </td>
+	</tr>
+<% end; reset_cycle %>
+	</tbody>
+</table>
+<% else %>
+<p class="nodata"><%= l(:label_no_data) %></p>
+<% end %>
+
+<% content_for :sidebar do %>
+<% principals = Principal.active.find(:all, :limit => 100, :order => 'type, login, lastname ASC') - @project.principals %>
+
+<% if roles.any? && principals.any? %>
+  <% remote_form_for(:member, @member, :url => {:controller => 'members', :action => 'new', :id => @project}, :method => :post,
+									   :loading => '$(\'member-add-submit\').disable();',
+									   :complete => 'if($(\'member-add-submit\')) $(\'member-add-submit\').enable();') do |f| %>
+    <h3><%=l(:label_member_new)%></h3>
+    
+		<p><%= label_tag "principal_search", l(:label_principal_search) %><%= text_field_tag 'principal_search', nil %></p>
+		<%= observe_field(:principal_search,
+                 :frequency => 0.5,
+                 :update => :principals,
+                 :url => { :controller => 'members', :action => 'autocomplete_for_member', :id => @project },
+                 :with => 'q')
+                  %>
+
+		<div id="principals">
+		<% if params[:q] && params[:q].length > 1 %>
+  		  <%= principals_check_box_tags 'member[user_ids][]', @principals %>
+		<% end %>
+		</div>
+		
+    <p><%= l(:label_set_role_plural) %>:</p>
+    <% roles.each do |role| %>
+    	<label><%= check_box_tag 'member[role_ids][]', role.id %> <%=h role %> </label><div style="margin-left: 2em; margin-bottom: 0.5em"><i><%=l( 'label_' + role.name.downcase + "_description").to_sym %></i></div>
+   	<% end %>
+   	
+    <p><%= submit_tag l(:button_add), :id => 'member-add-submit' %></p>
+  <% end %>
+<% end %>
+<% end %>
diff -r 7a2bb9c5fb34 -r d7326bb4f6f0 app/views/members/_list.rhtml
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/app/views/members/_list.rhtml	Wed Jul 13 14:26:44 2011 +0100
@@ -0,0 +1,26 @@
+
+<% roles = Role.find_all_givable
+   members = @project.member_principals.find(:all, :include => [:roles, :principal]).sort %>
+
+<% if members.any? %>
+
+<div id="members">
+<dl>
+<% members.each do |member| %>
+<dt id="member-<%= member.id %>" class="member <%= member.principal.class.name.downcase %> <%= User.current.logged? && User.current == member.user ? 'me' : nil %>">
+<%= avatar(member.user, :size => "24") %>
+<span class="user"><%= link_to_user member.principal %></span>
+<span class="email"><%= member.user.mail %></span>
+<dd id="member-<%= member.id %>" class="roles <%= member.principal.class.name.downcase %> <%= User.current.logged? && User.current == member.user ? 'me' : nil %>">
+<span class="roles" id="member-<%= member.id %>-roles"><%=h member.roles.sort.collect(&:to_s).join(', ') %></span>
+</dd>
+<% end %>
+</dl>
+<% else %>
+<p class="nodata"><%= l(:label_no_data) %></p>
+<% end %>
+</div>
+
+<% content_for :sidebar do %>
+<% end %>
+
diff -r 7a2bb9c5fb34 -r d7326bb4f6f0 app/views/members/index.rhtml
--- a/app/views/members/index.rhtml	Wed Jul 13 11:03:57 2011 +0100
+++ b/app/views/members/index.rhtml	Wed Jul 13 14:26:44 2011 +0100
@@ -1,86 +1,13 @@
-<%= error_messages_for 'member' %>
-<% roles = Role.find_all_givable
-   members = @project.member_principals.find(:all, :include => [:roles, :principal]).sort %>
 
+<h2><%=l(:label_member_plural)%></h2> 
 
-<div class="splitcontentleft">
-<% if members.any? %>
-<table class="list members">
-	<thead><tr>
-	  <th><%= l(:label_user) %> / <%= l(:label_group) %></th>
-	  <th><%= l(:label_role_plural) %></th>
-	  <th style="width:15%"></th>
-          <%= call_hook(:view_projects_settings_members_table_header, :project => @project) %>
-	</tr></thead>
-	<tbody>
-	<% members.each do |member| %>
-          <% next if member.new_record? %>
-          <tr id="member-<%= member.id %>" class="<%= cycle 'odd', 'even' %> member">
-          <td class="<%= member.principal.class.name.downcase %>"><%= link_to_user member.principal %></td>
-          <td class="roles">
-            <span id="member-<%= member.id %>-roles"><%=h member.roles.sort.collect(&:to_s).join(', ') %></span>
-            <% if authorize_for('members', 'edit') %>
-            <% remote_form_for(:member, member, :url => {:controller => 'members', :action => 'edit', :id => member},
-      			 :method => :post, :html => { :id => "member-#{member.id}-roles-form", :class => 'hol' }) do |f| %>
-            <p><% roles.each do |role| %>
-              <label><%= check_box_tag 'member[role_ids][]', role.id, member.roles.include?(role),
-        																							 :disabled => member.member_roles.detect {|mr| mr.role_id == role.id && !mr.inherited_from.nil?} %> <%=h role %></label><br />
-              <% end %></p>
-        <%= hidden_field_tag 'member[role_ids][]', '' %>
-        <p><%= 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;" %></p>
-      <% end %>
-    <% end %>
-  </td>
-  <td class="buttons">
-      <%= 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_remote(l(:button_delete), { :url => {:controller => 'members', :action => 'destroy', :id => member},                                              
-                                              :method => :post,
-                                              :confirm => (!User.current.admin? && member.include?(User.current) ? l(:text_own_membership_delete_confirmation) : nil)
-                                            }, :title => l(:button_delete),
-                                               :class => 'icon icon-del') if member.deletable? %>
-  </td>
-  <%= call_hook(:view_projects_settings_members_table_row, { :project => @project, :member => member}) %>
-	</tr>
-<% end; reset_cycle %>
-	</tbody>
-</table>
+<% editable = authorize_for('members', 'edit') %>
+
+<div id="memberlist">
+<% if editable %>
+<%= render :partial => 'editlist' %>
 <% else %>
-<p class="nodata"><%= l(:label_no_data) %></p>
+<%= render :partial => 'list' %>
 <% end %>
 </div>
 
-
-<% principals = Principal.active.find(:all, :limit => 100, :order => 'type, login, lastname ASC') - @project.principals %>
-
-<div class="splitcontentright">
-<% if roles.any? && principals.any? %>
-  <% remote_form_for(:member, @member, :url => {:controller => 'members', :action => 'new', :id => @project}, :method => :post,
-									   :loading => '$(\'member-add-submit\').disable();',
-									   :complete => 'if($(\'member-add-submit\')) $(\'member-add-submit\').enable();') do |f| %>
-    <fieldset><legend><%=l(:label_member_new)%></legend>
-    
-		<p><%= label_tag "principal_search", l(:label_principal_search) %><%= text_field_tag 'principal_search', nil %></p>
-		<%= observe_field(:principal_search,
-                 :frequency => 0.5,
-                 :update => :principals,
-                 :url => { :controller => 'members', :action => 'autocomplete_for_member', :id => @project },
-                 :with => 'q')
-                  %>
-
-		<div id="principals">
-		<% if params[:q] && params[:q].length > 1 %>
-  		  <%= principals_check_box_tags 'member[user_ids][]', @principals %>
-		<% end %>
-		</div>
-		
-    <p><%= l(:label_set_role_plural) %>:</p>
-    <% roles.each do |role| %>
-    	<label><%= check_box_tag 'member[role_ids][]', role.id %> <%=h role %> </label><div style="margin-left: 2em; margin-bottom: 0.5em"><i><%=l( 'label_' + role.name.downcase + "_description").to_sym %></i></div>
-   	<% end %>
-   	
-    <p><%= submit_tag l(:button_add), :id => 'member-add-submit' %></p>
-		</fieldset>
-  <% end %>
-<% end %>
-</div>
diff -r 7a2bb9c5fb34 -r d7326bb4f6f0 app/views/projects/settings/_members.rhtml
--- a/app/views/projects/settings/_members.rhtml	Wed Jul 13 11:03:57 2011 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,86 +0,0 @@
-<%= error_messages_for 'member' %>
-<% roles = Role.find_all_givable
-   members = @project.member_principals.find(:all, :include => [:roles, :principal]).sort %>
-
-
-<div class="splitcontentleft">
-<% if members.any? %>
-<table class="list members">
-	<thead><tr>
-	  <th><%= l(:label_user) %> / <%= l(:label_group) %></th>
-	  <th><%= l(:label_role_plural) %></th>
-	  <th style="width:15%"></th>
-          <%= call_hook(:view_projects_settings_members_table_header, :project => @project) %>
-	</tr></thead>
-	<tbody>
-	<% members.each do |member| %>
-          <% next if member.new_record? %>
-          <tr id="member-<%= member.id %>" class="<%= cycle 'odd', 'even' %> member">
-          <td class="<%= member.principal.class.name.downcase %>"><%= link_to_user member.principal %></td>
-          <td class="roles">
-            <span id="member-<%= member.id %>-roles"><%=h member.roles.sort.collect(&:to_s).join(', ') %></span>
-            <% if authorize_for('members', 'edit') %>
-            <% remote_form_for(:member, member, :url => {:controller => 'members', :action => 'edit', :id => member},
-      			 :method => :post, :html => { :id => "member-#{member.id}-roles-form", :class => 'hol' }) do |f| %>
-            <p><% roles.each do |role| %>
-              <label><%= check_box_tag 'member[role_ids][]', role.id, member.roles.include?(role),
-        																							 :disabled => member.member_roles.detect {|mr| mr.role_id == role.id && !mr.inherited_from.nil?} %> <%=h role %></label><br />
-              <% end %></p>
-        <%= hidden_field_tag 'member[role_ids][]', '' %>
-        <p><%= 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;" %></p>
-      <% end %>
-    <% end %>
-  </td>
-  <td class="buttons">
-      <%= 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_remote(l(:button_delete), { :url => {:controller => 'members', :action => 'destroy', :id => member},                                              
-                                              :method => :post,
-                                              :confirm => (!User.current.admin? && member.include?(User.current) ? l(:text_own_membership_delete_confirmation) : nil)
-                                            }, :title => l(:button_delete),
-                                               :class => 'icon icon-del') if member.deletable? %>
-  </td>
-  <%= call_hook(:view_projects_settings_members_table_row, { :project => @project, :member => member}) %>
-	</tr>
-<% end; reset_cycle %>
-	</tbody>
-</table>
-<% else %>
-<p class="nodata"><%= l(:label_no_data) %></p>
-<% end %>
-</div>
-
-
-<% principals = Principal.active.find(:all, :limit => 100, :order => 'type, login, lastname ASC') - @project.principals %>
-
-<div class="splitcontentright">
-<% if roles.any? && principals.any? %>
-  <% remote_form_for(:member, @member, :url => {:controller => 'members', :action => 'new', :id => @project}, :method => :post,
-									   :loading => '$(\'member-add-submit\').disable();',
-									   :complete => 'if($(\'member-add-submit\')) $(\'member-add-submit\').enable();') do |f| %>
-    <fieldset><legend><%=l(:label_member_new)%></legend>
-    
-		<p><%= label_tag "principal_search", l(:label_principal_search) %><%= text_field_tag 'principal_search', nil %></p>
-		<%= observe_field(:principal_search,
-                 :frequency => 0.5,
-                 :update => :principals,
-                 :url => { :controller => 'members', :action => 'autocomplete_for_member', :id => @project },
-                 :with => 'q')
-                  %>
-
-		<div id="principals">
-		<% if params[:q] && params[:q].length > 1 %>
-  		  <%= principals_check_box_tags 'member[user_ids][]', @principals %>
-		<% end %>
-		</div>
-		
-    <p><%= l(:label_set_role_plural) %>:</p>
-    <% roles.each do |role| %>
-    	<label><%= check_box_tag 'member[role_ids][]', role.id %> <%=h role %> </label><div style="margin-left: 2em; margin-bottom: 0.5em"><i><%=l( 'label_' + role.name.downcase + "_description").to_sym %></i></div>
-   	<% end %>
-   	
-    <p><%= submit_tag l(:button_add), :id => 'member-add-submit' %></p>
-		</fieldset>
-  <% end %>
-<% end %>
-</div>
diff -r 7a2bb9c5fb34 -r d7326bb4f6f0 config/locales/en.yml
--- a/config/locales/en.yml	Wed Jul 13 11:03:57 2011 +0100
+++ b/config/locales/en.yml	Wed Jul 13 14:26:44 2011 +0100
@@ -506,7 +506,7 @@
   label_role_anonymous: Anonymous
   label_role_non_member: Non member
   label_member: Member
-  label_member_new: New member
+  label_member_new: Add new member
   label_member_plural: Members
   label_tracker: Tracker
   label_tracker_plural: Trackers
diff -r 7a2bb9c5fb34 -r d7326bb4f6f0 public/stylesheets/application.css
--- a/public/stylesheets/application.css	Wed Jul 13 11:03:57 2011 +0100
+++ b/public/stylesheets/application.css	Wed Jul 13 14:26:44 2011 +0100
@@ -315,6 +315,13 @@
 div#activity span.project:after, div#news span.project:after, #search-results span.project:after { content: " -"; }
 div#activity dd span.description, #search-results dd span.description { display:block; color: #808080; }
 
+div#members dl { margin-left: 2em; }
+div#members dd { margin-bottom: 1em; padding-left: 18px; font-size: 0.9em; }
+div#members dt { margin-bottom: 0px; padding-left: 20px; line-height: 18px; background-position: 0 50%; background-repeat: no-repeat; }
+div#members dt.me .email { border-bottom: 1px solid #999; }
+div#members dt .email { color: #777; font-size: 80%; }
+div#members dd .roles { font-style: italic; }
+
 .projects .latest .title { margin-right: 0.5em; }
 .tipoftheday .tip { margin-left: 2em; margin-top: 0.5em; }
 
@@ -954,7 +961,7 @@
 	vertical-align: top;
 }
 
-#activity dt img.gravatar {
+#activity dt img.gravatar, #members dt img.gravatar {
 	float: left;
 	margin: 0 1em 1em 0;
 }