From 7f7ba4f3d72104d67e9ecf839c9688c0580d4063 Mon Sep 17 00:00:00 2001 From: Azul Date: Wed, 16 Jan 2013 16:52:35 +0100 Subject: incomplete initial changes to make email address just login@domain.tld This involves a number of other changes like making sure the comparison between aliases and emails still works. Will do that by removing the @domain.tld from aliases as well. --- users/app/views/users/edit.html.haml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'users/app/views') diff --git a/users/app/views/users/edit.html.haml b/users/app/views/users/edit.html.haml index 820b80e..d5dc3b5 100644 --- a/users/app/views/users/edit.html.haml +++ b/users/app/views/users/edit.html.haml @@ -5,7 +5,9 @@ = user_form_with 'password_fields', :legend => :change_password = render 'cancel_account' if @user == current_user - content_for :email do - = user_form_with 'email_field', :legend => :set_email_address + %legend=t :email_address + Your email address is + =user.email_address = user_form_with 'email_forward_field', :legend => :forward_email = user_form_with 'email_aliases', :legend => :add_email_alias = render 'tabs/tabs', :tabs => [:account, :email] -- cgit v1.2.3 From a8ec73a0307924610023525786bb3a9eb8b173e1 Mon Sep 17 00:00:00 2001 From: Azul Date: Thu, 17 Jan 2013 15:09:58 +0100 Subject: unit tests passing --- users/app/views/users/_email_aliases.html.haml | 2 +- users/app/views/users/edit.html.haml | 2 +- 2 files changed, 2 insertions(+), 2 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 e012429..faac2bc 100644 --- a/users/app/views/users/_email_aliases.html.haml +++ b/users/app/views/users/_email_aliases.html.haml @@ -3,4 +3,4 @@ =render @user.email_aliases .clearfix = f.simple_fields_for :email_aliases, @email_alias do |e| - = e.input :email, :placeholder => "alias@#{APP_CONFIG[:domain]}" + = e.input :username, :placeholder => "alias" diff --git a/users/app/views/users/edit.html.haml b/users/app/views/users/edit.html.haml index d5dc3b5..3f62e5f 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 - =user.email_address + = user.email_address = user_form_with 'email_forward_field', :legend => :forward_email = user_form_with 'email_aliases', :legend => :add_email_alias = render 'tabs/tabs', :tabs => [:account, :email] -- cgit v1.2.3 From 247a6f14db14543773beb1a1e96f2c335800eb82 Mon Sep 17 00:00:00 2001 From: Azul Date: Thu, 17 Jan 2013 16:28:52 +0100 Subject: minor fixes to validation workflow --- users/app/views/emails/_email.html.haml | 11 +++++------ users/app/views/users/edit.html.haml | 2 +- 2 files changed, 6 insertions(+), 7 deletions(-) (limited to 'users/app/views') diff --git a/users/app/views/emails/_email.html.haml b/users/app/views/emails/_email.html.haml index 3feb6f0..f5eb2d0 100644 --- a/users/app/views/emails/_email.html.haml +++ b/users/app/views/emails/_email.html.haml @@ -1,6 +1,5 @@ -- if email.valid? - %li.pull-right - %code= email - = link_to(user_email_alias_path(@user, email), :method => :delete) do - %i.icon-remove - .clearfix +%li.pull-right + %code= email + = link_to(user_email_alias_path(@user, email), :method => :delete) do + %i.icon-remove +.clearfix diff --git a/users/app/views/users/edit.html.haml b/users/app/views/users/edit.html.haml index 3f62e5f..69864e5 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 - = user.email_address + = render user.email_address = user_form_with 'email_forward_field', :legend => :forward_email = user_form_with 'email_aliases', :legend => :add_email_alias = render 'tabs/tabs', :tabs => [:account, :email] -- cgit v1.2.3