diff options
| author | azul <azul@riseup.net> | 2013-01-20 23:41:11 -0800 |
|---|---|---|
| committer | azul <azul@riseup.net> | 2013-01-20 23:41:11 -0800 |
| commit | ed1caa740f0e58cfd5f2d908946461154db68174 (patch) | |
| tree | d4481ebc868bb1169ba40f7bf9f21d984e3e0560 /users/app/views | |
| parent | 168c36b578d675c99aad62a350aa68cc1b6d1316 (diff) | |
| parent | b348f9dbf3b8298e0e76bda6a9da973da25ed9bd (diff) | |
Merge pull request #19 from leapcode/feature/partial-refactor
more flexible email partial
Diffstat (limited to 'users/app/views')
| -rw-r--r-- | users/app/views/emails/_email.html.haml | 6 | ||||
| -rw-r--r-- | users/app/views/users/_email_aliases.html.haml | 2 | ||||
| -rw-r--r-- | users/app/views/users/edit.html.haml | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/users/app/views/emails/_email.html.haml b/users/app/views/emails/_email.html.haml index e96385d..c81b396 100644 --- a/users/app/views/emails/_email.html.haml +++ b/users/app/views/emails/_email.html.haml @@ -1,6 +1,6 @@ -%li.pull-right - %code= email - - if params[:action] == 'edit' += wrapped(email, local_assigns) do + = email + - if local_assigns[:with].try(:include?, :delete) = link_to(user_email_alias_path(@user, email), :method => :delete) do %i.icon-remove .clearfix diff --git a/users/app/views/users/_email_aliases.html.haml b/users/app/views/users/_email_aliases.html.haml index faac2bc..6e32700 100644 --- a/users/app/views/users/_email_aliases.html.haml +++ b/users/app/views/users/_email_aliases.html.haml @@ -1,6 +1,6 @@ .span6 %ul.unstyled - =render @user.email_aliases + = render @user.email_aliases, :as => :li, :with => [:delete] .clearfix = f.simple_fields_for :email_aliases, @email_alias do |e| = e.input :username, :placeholder => "alias" diff --git a/users/app/views/users/edit.html.haml b/users/app/views/users/edit.html.haml index 69864e5..03088d8 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 - = render user.email_address + = render user.email_address, :as => :span = user_form_with 'email_forward_field', :legend => :forward_email = user_form_with 'email_aliases', :legend => :add_email_alias = render 'tabs/tabs', :tabs => [:account, :email] |