From e4c7f2fb8fa2833037508f1b88f802944855fd77 Mon Sep 17 00:00:00 2001
From: Azul <azul@leap.se>
Date: Mon, 10 Dec 2012 10:38:48 +0100
Subject: actually allow adding email aliases

---
 users/app/views/users/_email_aliases.html.haml | 20 ++++++++++----------
 users/app/views/users/edit.html.haml           |  2 +-
 2 files changed, 11 insertions(+), 11 deletions(-)

(limited to 'users/app/views')

diff --git a/users/app/views/users/_email_aliases.html.haml b/users/app/views/users/_email_aliases.html.haml
index 54eac0f..41d4f9e 100644
--- a/users/app/views/users/_email_aliases.html.haml
+++ b/users/app/views/users/_email_aliases.html.haml
@@ -1,10 +1,10 @@
-%legend= t(:email_aliases)
-%ul
-  - @user.email_aliases.each do |email|
-    %li= email
-= email_alias_form do |f|
-  =f.input :email, :placeholder => "alias@#{request.domain}"
-  .pull-right
-    %button{:type => :submit, :class => 'btn'}
-      %i.icon-plus
-      Add Email Alias
+.span6
+  %ul.unstyled
+    - @user.email_aliases.each do |email_alias|
+      %li.pull-right
+        %code= email_alias.email
+        %i.icon-remove
+      .clearfix
+.clearfix
+= f.simple_fields_for :email_aliases, EmailAlias.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 eb1bca4..92ab71b 100644
--- a/users/app/views/users/edit.html.haml
+++ b/users/app/views/users/edit.html.haml
@@ -14,4 +14,4 @@
     .tab-pane#email
       = user_form_with 'email_field', :legend => :set_email_address
       = user_form_with 'email_forward_field', :legend => :forward_email
-      = render 'email_aliases'
+      = user_form_with 'email_aliases', :legend => :add_email_alias
-- 
cgit v1.2.3