Merged trunk r1773.

git-svn-id: http://redmine.rubyforge.org/svn/branches/work@1774 e93f8b46-1217-0410-a6f0-8f06a7374b81

groups/app/views/users/_form.rhtml

@@ -2,7 +2,6 @@
 
 <!--[form:user]-->
 <div class="box">
-<h3><%=l(:label_information_plural)%></h3>
 <p><%= f.text_field :login, :required => true, :size => 25  %></p>
 <p><%= f.text_field :firstname, :required => true %></p>
 <p><%= f.text_field :lastname, :required => true %></p>
@@ -12,11 +11,11 @@
 <% end -%>
 <p><%= f.select :language, lang_options_for_select %></p>
 
-<% for @custom_value in @custom_values %>
-	<p><%= custom_field_tag_with_label @custom_value %></p>
-<% end if @custom_values%>
+<% @user.custom_field_values.each do |value| %>
+	<p><%= custom_field_tag_with_label :user, value %></p>
+<% end %>
 
-<p><%= f.check_box :admin %></p>
+<p><%= f.check_box :admin, :disabled => (@user == User.current) %></p>
 </div>
 
 <div class="box">

groups/app/views/users/_general.rhtml

@@ -0,0 +1,4 @@
+<% labelled_tabular_form_for :user, @user, :url => { :action => "edit" } do |f| %>
+<%= render :partial => 'form', :locals => { :f => f } %>
+<%= submit_tag l(:button_save) %>
+<% end %>

groups/app/views/users/_memberships.rhtml

@@ -1,33 +1,40 @@
-<div class="box" style="margin-top: 16px;">
-<h3><%= l(:label_project_plural) %></h3>
-
-<% @user.memberships.select {|m| m.inherited_from.nil? }.each do |membership| %>
-<% form_tag({ :action => 'edit_membership', :id => @user, :membership_id => membership }, :class => "tabular") do %>
-<p style="margin:0;padding-top:0;">
-    <label><%= membership.project.name %></label>
-    <select name="membership[role_id]">
-    <%= options_from_collection_for_select @roles, "id", "name", membership.role_id %>
-    </select>
-    <%= submit_tag l(:button_change), :class => "button-small" %>
-    <%= link_to l(:button_delete), {:action => 'destroy_membership', :id => @user, :membership_id => membership }, :confirm => l(:text_are_you_sure), :method => :post, :class => 'icon icon-del' %>
-</p>
-<% end %>
+<% if @memberships.any? %>
+<table class="list memberships">
+	<thead>
+	  <th><%= l(:label_project) %></th>
+	  <th><%= l(:label_role) %></th>
+	  <th style="width:15%"></th>
+	</thead>
+	<tbody>
+	<% @memberships.each do |membership| %>
+	<% next if membership.new_record? %>
+	<tr class="<%= cycle 'odd', 'even' %>">
+	<td><%=h membership.project %></td>
+    <td align="center">
+    <% form_tag({ :action => 'edit_membership', :id => @user, :membership_id => membership }) do %>
+        <%= select_tag 'membership[role_id]', options_from_collection_for_select(@roles, "id", "name", membership.role_id) %>
+        <%= submit_tag l(:button_change), :class => "small" %>
+    <% end %>
+    </td>
+    <td align="center">
+      <%= link_to l(:button_delete), {:action => 'destroy_membership', :id => @user, :membership_id => membership }, :method => :post, :class => 'icon icon-del' %>
+    </td>
+	</tr>
+	</tbody>
+<% end; reset_cycle %>
+</table>
+<% else %>
+<p class="nodata"><%= l(:label_no_data) %></p>
 <% end %>
 
-<% unless @projects.empty? || @roles.empty? %>
-<hr />
+<% if @projects.any? %>
 <p>
 <label><%=l(:label_project_new)%></label><br/>
 <% form_tag({ :action => 'edit_membership', :id => @user }) do %>
-<select name="membership[project_id]">
-<%= options_from_collection_for_select @projects, "id", "name", @membership.project_id %>
-</select>
+<%= select_tag 'membership[project_id]', projects_options_for_select(@projects) %>
 <%= l(:label_role) %>:
-<select name="membership[role_id]">
-<%= options_from_collection_for_select @roles, "id", "name", @membership.role_id %>
-</select>
+<%= select_tag 'membership[role_id]', options_from_collection_for_select(@roles, "id", "name") %>
 <%= submit_tag l(:button_add) %>
 <% end %>
 </p>
 <% end %>
-</div>

groups/app/views/users/edit.rhtml

@@ -1,8 +1,27 @@
-<h2><%=l(:label_user)%></h2>
+<div class="contextual">
+<%= change_status_link(@user) %>
+</div>
 
-<% labelled_tabular_form_for :user, @user, :url => { :action => "edit" } do |f| %>
-<%= render :partial => 'form', :locals => { :f => f } %>
-<%= submit_tag l(:button_save) %>
-<% end %>
+<h2><%=l(:label_user)%>: <%=h @user.login %></h2>
 
-<%= render :partial => 'memberships' %>
+<% selected_tab = params[:tab] ? params[:tab].to_s : user_settings_tabs.first[:name] %>
+
+<div class="tabs">
+<ul>
+<% user_settings_tabs.each do |tab| -%>
+    <li><%= link_to l(tab[:label]), { :tab => tab[:name] },
+                                    :id => "tab-#{tab[:name]}",
+                                    :class => (tab[:name] != selected_tab ? nil : 'selected'),
+                                    :onclick => "showTab('#{tab[:name]}'); this.blur(); return false;" %></li>
+<% end -%>
+</ul>
+</div>
+
+<% user_settings_tabs.each do |tab| -%>
+<%= content_tag('div', render(:partial => tab[:partial]), 
+                       :id => "tab-content-#{tab[:name]}",
+                       :style => (tab[:name] != selected_tab ? 'display:none' : nil),
+                       :class => 'tab-content') %>
+<% end -%>
+
+<% html_title(l(:label_user), @user.login, l(:label_administration)) -%>

groups/app/views/users/list.rhtml

@@ -7,7 +7,7 @@
 <% form_tag({}, :method => :get) do %>
 <fieldset><legend><%= l(:label_filter_plural) %></legend>
 <label><%= l(:field_status) %> :</label>
-<%= select_tag 'status', status_options_for_select(@status), :class => "small", :onchange => "this.form.submit(); return false;"  %>
+<%= select_tag 'status', users_status_options_for_select(@status), :class => "small", :onchange => "this.form.submit(); return false;"  %>
 </fieldset>
 <% end %>
 &nbsp;
@@ -27,10 +27,10 @@
   <tbody>
 <% for user in @users -%>
   <tr class="user <%= cycle("odd", "even") %> <%= %w(anon active registered locked)[user.status] %>">
-	<td class="username"><%= link_to user.login, :action => 'edit', :id => user %></td>
-	<td class="firstname"><%=h user.firstname %></td>
-	<td class="lastname"><%=h user.lastname %></td>
-	<td class="email"><%=h user.mail %></td>
+	<td class="username"><%= link_to h(user.login), :action => 'edit', :id => user %></td>
+	<td class="firstname"><%= h(user.firstname) %></td>
+	<td class="lastname"><%= h(user.lastname) %></td>
+	<td class="email"><%= mail_to(h(user.mail)) %></td>
 	<td class="group"><%=h user.group %></td>
 	<td align="center"><%= image_tag('true.png') if user.admin? %></td>
 	<td class="created_on" align="center"><%= format_time(user.created_on) %></td>