diff options
| author | Azul <azul@leap.se> | 2012-12-13 17:17:30 +0100 |
|---|---|---|
| committer | Azul <azul@leap.se> | 2012-12-13 17:17:30 +0100 |
| commit | a77d5cf5fd2ff6cc335b586477d6d6e58f758591 (patch) | |
| tree | 32640ef2457ecce3a08f704f5b5b0ac00a37f9d8 /users/app/views | |
| parent | 961fe13b784e7f44e55f9cd0a106728c69354a0f (diff) | |
| parent | 32db6e2ee3ae449f2fe0f947f9ac4aafde340a9d (diff) | |
Merge branch 'master' into develop
Conflicts:
users/test/unit/user_test.rb
Diffstat (limited to 'users/app/views')
| -rw-r--r-- | users/app/views/emails/_email.html.haml | 4 | ||||
| -rw-r--r-- | users/app/views/users/_email_aliases.html.haml | 6 | ||||
| -rw-r--r-- | users/app/views/users/edit.html.haml | 1 |
3 files changed, 11 insertions, 0 deletions
diff --git a/users/app/views/emails/_email.html.haml b/users/app/views/emails/_email.html.haml new file mode 100644 index 0000000..f182ed9 --- /dev/null +++ b/users/app/views/emails/_email.html.haml @@ -0,0 +1,4 @@ +%li.pull-right + %code= email + %i.icon-remove +.clearfix diff --git a/users/app/views/users/_email_aliases.html.haml b/users/app/views/users/_email_aliases.html.haml new file mode 100644 index 0000000..646480e --- /dev/null +++ b/users/app/views/users/_email_aliases.html.haml @@ -0,0 +1,6 @@ +.span6 + %ul.unstyled + =render @user.email_aliases +.clearfix += f.simple_fields_for :email_aliases, Email.new do |e| + = e.input :email, :placeholder => "alias@#{request.domain}" diff --git a/users/app/views/users/edit.html.haml b/users/app/views/users/edit.html.haml index b33c19b..92ab71b 100644 --- a/users/app/views/users/edit.html.haml +++ b/users/app/views/users/edit.html.haml @@ -14,3 +14,4 @@ .tab-pane#email = user_form_with 'email_field', :legend => :set_email_address = user_form_with 'email_forward_field', :legend => :forward_email + = user_form_with 'email_aliases', :legend => :add_email_alias |