Mercurial > hg > soundsoftware-site
diff app/views/users/.svn/text-base/_form.rhtml.svn-base @ 441:cbce1fd3b1b7 redmine-1.2
Update to Redmine 1.2-stable branch (Redmine SVN rev 6000)
author | Chris Cannam |
---|---|
date | Mon, 06 Jun 2011 14:24:13 +0100 |
parents | 8661b858af72 |
children |
line wrap: on
line diff
--- a/app/views/users/.svn/text-base/_form.rhtml.svn-base Thu Mar 03 11:42:28 2011 +0000 +++ b/app/views/users/.svn/text-base/_form.rhtml.svn-base Mon Jun 06 14:24:13 2011 +0100 @@ -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> +<h3><%=l(:label_authentication)%></h3> <div class="box tabular"> -<h3><%=l(:label_authentication)%></h3> <% 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="splitcontentright"> +<h3><%=l(:field_mail_notification)%></h3> <div class="box"> -<h3><%=l(:field_mail_notification)%></h3> <%= render :partial => 'users/mail_notifications' %> </div> +<h3><%=l(:label_preferences)%></h3> <div class="box tabular"> -<h3><%=l(:label_preferences)%></h3> <%= render :partial => 'users/preferences' %> </div> +</div> +</div> +<div style="clear:left;"></div> <!--[eoform:user]-->