From 7f7ba4f3d72104d67e9ecf839c9688c0580d4063 Mon Sep 17 00:00:00 2001 From: Azul Date: Wed, 16 Jan 2013 16:52:35 +0100 Subject: incomplete initial changes to make email address just login@domain.tld This involves a number of other changes like making sure the comparison between aliases and emails still works. Will do that by removing the @domain.tld from aliases as well. --- users/app/views/users/edit.html.haml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'users/app/views') diff --git a/users/app/views/users/edit.html.haml b/users/app/views/users/edit.html.haml index 820b80e..d5dc3b5 100644 --- a/users/app/views/users/edit.html.haml +++ b/users/app/views/users/edit.html.haml @@ -5,7 +5,9 @@ = user_form_with 'password_fields', :legend => :change_password = render 'cancel_account' if @user == current_user - content_for :email do - = user_form_with 'email_field', :legend => :set_email_address + %legend=t :email_address + Your email address is + =user.email_address = user_form_with 'email_forward_field', :legend => :forward_email = user_form_with 'email_aliases', :legend => :add_email_alias = render 'tabs/tabs', :tabs => [:account, :email] -- cgit v1.2.3