From e58fd0550b4a29fac9d52dc8a78d04333ccc8c06 Mon Sep 17 00:00:00 2001 From: elijah Date: Mon, 17 Jun 2013 01:27:55 -0700 Subject: new ui - initial user changes --- users/app/views/emails/edit.html.haml | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 users/app/views/emails/edit.html.haml (limited to 'users/app/views/emails') diff --git a/users/app/views/emails/edit.html.haml b/users/app/views/emails/edit.html.haml new file mode 100644 index 0000000..b44b569 --- /dev/null +++ b/users/app/views/emails/edit.html.haml @@ -0,0 +1,5 @@ + + += 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 -- cgit v1.2.3 From fa7b7425e7c53282472c1c9ce1cdc7272f55cfd4 Mon Sep 17 00:00:00 2001 From: elijah Date: Tue, 2 Jul 2013 23:17:44 -0700 Subject: 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. --- users/app/views/emails/_email.html.haml | 2 +- users/app/views/emails/edit.html.haml | 5 ----- 2 files changed, 1 insertion(+), 6 deletions(-) delete mode 100644 users/app/views/emails/edit.html.haml (limited to 'users/app/views/emails') 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 -- cgit v1.2.3