diff options
| author | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2011-03-20 11:49:29 +0000 |
|---|---|---|
| committer | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2011-03-20 11:49:29 +0000 |
| commit | 6424155f59c3d561b4ae039b4db6cdf84dc05834 (patch) | |
| tree | 55c7f071466635fb19bf20c5dec8a1013810afb6 | |
| parent | 50cb77cfbb09750dad7809f46914b8f81dc0c13a (diff) | |
| download | redmine-6424155f59c3d561b4ae039b4db6cdf84dc05834.tar.gz redmine-6424155f59c3d561b4ae039b4db6cdf84dc05834.zip | |
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
| -rw-r--r-- | app/views/users/_form.rhtml | 14 | ||||
| -rw-r--r-- | public/stylesheets/application.css | 2 |
2 files changed, 12 insertions, 4 deletions
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' %> +<div id="user_form"> <!--[form:user]--> +<div class="splitcontentleft"> +<h3><%=l(:label_information_plural)%></h3> <div class="box tabular"> <p><%= f.text_field :login, :required => true, :size => 25 %></p> <p><%= f.text_field :firstname, :required => true %></p> @@ -19,8 +22,8 @@ <%= call_hook(:view_users_form, :user => @user, :form => f) %> </div> -<div class="box tabular"> <h3><%=l(:label_authentication)%></h3> +<div class="box tabular"> <% unless @auth_sources.empty? %> <p><%= 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');}" %></p> <% end %> @@ -30,14 +33,19 @@ <p><%= f.password_field :password_confirmation, :required => true, :size => 25 %></p> </div> </div> +</div> -<div class="box"> +<div class="splitcontentright"> <h3><%=l(:field_mail_notification)%></h3> +<div class="box"> <%= render :partial => 'users/mail_notifications' %> </div> -<div class="box tabular"> <h3><%=l(:label_preferences)%></h3> +<div class="box tabular"> <%= render :partial => 'users/preferences' %> </div> +</div> +</div> +<div style="clear:left;"></div> <!--[eoform:user]--> 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; } |