diff options
| author | Azul <azul@leap.se> | 2013-01-17 15:09:58 +0100 |
|---|---|---|
| committer | Azul <azul@leap.se> | 2013-01-17 15:16:53 +0100 |
| commit | a8ec73a0307924610023525786bb3a9eb8b173e1 (patch) | |
| tree | 16d937bfea4d18a39aad1eec86edfd4f6467d708 /users/app/views | |
| parent | 7f7ba4f3d72104d67e9ecf839c9688c0580d4063 (diff) | |
unit tests passing
Diffstat (limited to 'users/app/views')
| -rw-r--r-- | users/app/views/users/_email_aliases.html.haml | 2 | ||||
| -rw-r--r-- | users/app/views/users/edit.html.haml | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/users/app/views/users/_email_aliases.html.haml b/users/app/views/users/_email_aliases.html.haml index e012429..faac2bc 100644 --- a/users/app/views/users/_email_aliases.html.haml +++ b/users/app/views/users/_email_aliases.html.haml @@ -3,4 +3,4 @@ =render @user.email_aliases .clearfix = f.simple_fields_for :email_aliases, @email_alias do |e| - = e.input :email, :placeholder => "alias@#{APP_CONFIG[:domain]}" + = e.input :username, :placeholder => "alias" diff --git a/users/app/views/users/edit.html.haml b/users/app/views/users/edit.html.haml index d5dc3b5..3f62e5f 100644 --- a/users/app/views/users/edit.html.haml +++ b/users/app/views/users/edit.html.haml @@ -7,7 +7,7 @@ - content_for :email do %legend=t :email_address Your email address is - =user.email_address + = 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] |