summaryrefslogtreecommitdiff
path: root/users/app/views
diff options
context:
space:
mode:
authorAzul <azul@leap.se>2013-01-16 16:52:35 +0100
committerAzul <azul@leap.se>2013-01-16 16:52:35 +0100
commit7f7ba4f3d72104d67e9ecf839c9688c0580d4063 (patch)
treed0f4fbe470c0971d86b8cc58fbe73c1a29ba06f3 /users/app/views
parentee2ea4ac8f4c6b0c3b09be6ed49e7a1faec7a9c1 (diff)
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.
Diffstat (limited to 'users/app/views')
-rw-r--r--users/app/views/users/edit.html.haml4
1 files changed, 3 insertions, 1 deletions
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]