diff options
| author | elijah <elijah@riseup.net> | 2013-07-02 23:17:44 -0700 |
|---|---|---|
| committer | elijah <elijah@riseup.net> | 2013-07-04 04:12:59 -0700 |
| commit | fa7b7425e7c53282472c1c9ce1cdc7272f55cfd4 (patch) | |
| tree | e5e1be6d8b273344e5297c2c97b9638ef66e8ba8 /users/app/views/emails | |
| parent | e996432cbd50f4dadaae0ff62ac3f286ab125b1f (diff) | |
users engine changes - rewrite of the views, separate email settings to a separate controller, make users_controller html only and v1/users_controller json only.
Diffstat (limited to 'users/app/views/emails')
| -rw-r--r-- | users/app/views/emails/_email.html.haml | 2 | ||||
| -rw-r--r-- | users/app/views/emails/edit.html.haml | 5 |
2 files changed, 1 insertions, 6 deletions
diff --git a/users/app/views/emails/_email.html.haml b/users/app/views/emails/_email.html.haml index c81b396..ea59cec 100644 --- a/users/app/views/emails/_email.html.haml +++ b/users/app/views/emails/_email.html.haml @@ -3,4 +3,4 @@ - 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/emails/edit.html.haml b/users/app/views/emails/edit.html.haml deleted file mode 100644 index b44b569..0000000 --- a/users/app/views/emails/edit.html.haml +++ /dev/null @@ -1,5 +0,0 @@ - - -= user_form_with 'public_key_field', :legend => :public_key -= user_form_with 'email_forward_field', :legend => :forward_email -= user_form_with 'email_aliases', :legend => :add_email_alias |