summaryrefslogtreecommitdiff
path: root/users/app/views
diff options
context:
space:
mode:
authorazul <azul@riseup.net>2013-01-17 22:45:39 -0800
committerazul <azul@riseup.net>2013-01-17 22:45:39 -0800
commit168c36b578d675c99aad62a350aa68cc1b6d1316 (patch)
treecd1df0a9a7d3f0a9812b512cfb93db0f79b0421f /users/app/views
parent19d563e2e2db98ecc5143229f554df6a09bc457e (diff)
parent27730c7e665ed64e691fdf6dbeebc39c8bfbbc4b (diff)
Merge pull request #18 from leapcode/feature/fixed-email-address
make email address just login@domain.tld
Diffstat (limited to 'users/app/views')
-rw-r--r--users/app/views/emails/_email.html.haml13
-rw-r--r--users/app/views/users/_email_aliases.html.haml2
-rw-r--r--users/app/views/users/edit.html.haml4
3 files changed, 10 insertions, 9 deletions
diff --git a/users/app/views/emails/_email.html.haml b/users/app/views/emails/_email.html.haml
index 948d847..e96385d 100644
--- a/users/app/views/emails/_email.html.haml
+++ b/users/app/views/emails/_email.html.haml
@@ -1,7 +1,6 @@
-- if email.valid?
- %li.pull-right
- %code= email
- - if params[:action] == 'edit'
- = link_to(user_email_alias_path(@user, email), :method => :delete) do
- %i.icon-remove
- .clearfix
+%li.pull-right
+ %code= email
+ - if params[:action] == 'edit'
+ = 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 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 820b80e..69864e5 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
+ = 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]