From: Jean-Philippe Lang Date: Sun, 20 Mar 2011 11:49:29 +0000 (+0000) Subject: Makes the user form look like account form. X-Git-Tag: 1.2.0~671 X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=6424155f59c3d561b4ae039b4db6cdf84dc05834;p=redmine.git Makes the user form look like account form. git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@5172 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- diff --git a/app/views/users/_form.rhtml b/app/views/users/_form.rhtml index 4e788f6ca..f23635693 100644 --- a/app/views/users/_form.rhtml +++ b/app/views/users/_form.rhtml @@ -1,6 +1,9 @@ <%= error_messages_for 'user' %> +
+
+

<%=l(:label_information_plural)%>

<%= f.text_field :login, :required => true, :size => 25 %>

<%= f.text_field :firstname, :required => true %>

@@ -19,8 +22,8 @@ <%= call_hook(:view_users_form, :user => @user, :form => f) %>
-

<%=l(:label_authentication)%>

+
<% unless @auth_sources.empty? %>

<%= f.select :auth_source_id, ([[l(:label_internal), ""]] + @auth_sources.collect { |a| [a.name, a.id] }), {}, :onchange => "if (this.value=='') {Element.show('password_fields');} else {Element.hide('password_fields');}" %>

<% end %> @@ -30,14 +33,19 @@

<%= f.password_field :password_confirmation, :required => true, :size => 25 %>

+
-
+

<%=l(:field_mail_notification)%>

+
<%= render :partial => 'users/mail_notifications' %>
-

<%=l(:label_preferences)%>

+
<%= render :partial => 'users/preferences' %>
+
+
+
diff --git a/public/stylesheets/application.css b/public/stylesheets/application.css index d3420205b..e45863417 100644 --- a/public/stylesheets/application.css +++ b/public/stylesheets/application.css @@ -364,7 +364,7 @@ ul.properties li span {font-style:italic;} .total-hours span.hours-int { font-size: 120%; } .autoscroll {overflow-x: auto; padding:1px; margin-bottom: 1.2em;} -#user_firstname, #user_lastname, #user_mail, #my_account_form select { width: 90%; } +#user_login, #user_firstname, #user_lastname, #user_mail, #my_account_form select, #user_form select { width: 90%; } #workflow_copy_form select { width: 200px; }