Mercurial > hg > soundsoftware-site
diff app/views/users/.svn/text-base/_form.rhtml.svn-base @ 37:94944d00e43c
* Update to SVN trunk rev 4411
| author | Chris Cannam <chris.cannam@soundsoftware.ac.uk> |
|---|---|
| date | Fri, 19 Nov 2010 13:24:41 +0000 |
| parents | 513646585e45 |
| children | af80e5618e9b |
line wrap: on
line diff
--- a/app/views/users/.svn/text-base/_form.rhtml.svn-base Fri Sep 24 14:06:04 2010 +0100 +++ b/app/views/users/.svn/text-base/_form.rhtml.svn-base Fri Nov 19 13:24:41 2010 +0000 @@ -32,4 +32,14 @@ <%= password_field_tag 'password_confirmation', nil, :size => 25 %></p> </div> </div> + +<div class="box"> +<h3><%=l(:field_mail_notification)%></h3> +<%= render :partial => 'users/mail_notifications' %> +</div> + +<div class="box tabular"> +<h3><%=l(:label_preferences)%></h3> +<%= render :partial => 'users/preferences' %> +</div> <!--[eoform:user]-->