0.3 unstable

git-svn-id: http://redmine.rubyforge.org/svn/trunk@12 e93f8b46-1217-0410-a6f0-8f06a7374b81

2 files changed, 18 insertions, 12 deletions

diff --git a/redmine/app/views/users/_form.rhtml b/redmine/app/views/users/_form.rhtml
index 6574cb026..84cc6f171 100644
--- a/redmine/app/views/users/_form.rhtml
+++ b/redmine/app/views/users/_form.rhtml
@@ -1,31 +1,37 @@
 <%= error_messages_for 'user' %>
 
+<div class="box">
 <!--[form:user]-->
-<p><label for="user_login"><%=_('Login')%></label><br/>
+<p><label for="user_login"><%=_('Login')%></label> <span class="required">*</span><br/>
 <%= text_field 'user', 'login', :size => 25  %></p>
 

-<p><label for="password"><%=_('Password')%></label><br/>
+<p><label for="password"><%=_('Password')%></label> <span class="required">*</span><br/>
 <%= password_field_tag 'password', nil, :size => 25  %></p>
 
-<p><label for="password_confirmation"><%=_('Confirmation')%></label><br/>
+<p><label for="password_confirmation"><%=_('Confirmation')%></label> <span class="required">*</span><br/>
 <%= password_field_tag 'password_confirmation', nil, :size => 25  %></p>
 
-<p><label for="user_firstname"><%=_('Firstname')%></label><br/>
+<p><label for="user_firstname"><%=_('Firstname')%></label> <span class="required">*</span><br/>
 <%= text_field 'user', 'firstname'  %></p>
 

-<p><label for="user_lastname"><%=_('Lastname')%></label><br/>
+<p><label for="user_lastname"><%=_('Lastname')%></label> <span class="required">*</span><br/>
 <%= text_field 'user', 'lastname'  %></p>
 
-<p><label for="user_mail"><%=_('Mail')%></label><br/>
+<p><label for="user_mail"><%=_('Mail')%></label> <span class="required">*</span><br/>
 <%= text_field 'user', 'mail'  %></p>

 

 <p><label for="user_language"><%=_('Language')%></label><br/>
-<%= select("user", "language", Localization.langs) %></p>

+<%= select("user", "language", Localization.langs.invert) %></p>

+

+<% for custom_value in @custom_values %>
+	<p><%= custom_field_tag_with_label custom_value %></p>
+<% end %>

+

+<div style="clear: both;"></div>

 
 <p><%= check_box 'user', 'admin' %> <label for="user_admin"><%=_('Administrator')%></label></p>

 

 <p><%= check_box 'user', 'mail_notification' %> <label for="user_mail_notification"><%=_('Mail notifications')%></label></p>

 

-<p><%= check_box 'user', 'locked' %> <label for="user_locked"><%=_('Locked')%></label></p>
 <!--[eoform:user]-->
-
+</div>
diff --git a/redmine/app/views/users/list.rhtml b/redmine/app/views/users/list.rhtml
index 3e3c21659..7263000aa 100644
--- a/redmine/app/views/users/list.rhtml
+++ b/redmine/app/views/users/list.rhtml
@@ -7,7 +7,7 @@
 	<%= sort_header_tag('lastname', :caption => _('Lastname')) %>

 	<th><%=_('Mail')%></th>

 	<%= sort_header_tag('admin', :caption => _('Admin')) %>

-	<%= sort_header_tag('locked', :caption => _('Locked')) %>

+	<%= sort_header_tag('status', :caption => _('Status')) %>

 	<%= sort_header_tag('created_on', :caption => _('Created on')) %>

 	<%= sort_header_tag('last_login_on', :caption => _('Last login')) %>

   <th></th>

@@ -25,10 +25,10 @@
   <td align="center">

     <%= start_form_tag :action => 'edit', :id => user %>

     <% if user.locked? %>

-      <%= hidden_field_tag 'user[locked]', 0 %>

+      <%= hidden_field_tag 'user[status]', User::STATUS_ACTIVE %>

       <%= submit_tag _('Unlock'), :class => "button-small"  %>

     <% else %>

-      <%= hidden_field_tag 'user[locked]', 1 %>

+      <%= hidden_field_tag 'user[status]', User::STATUS_LOCKED %>

       <%= submit_tag _('Lock'), :class => "button-small"  %>

     <% end %>

     <%= end_form_tag %>