summaryrefslogtreecommitdiff
path: root/users/app/views
diff options
context:
space:
mode:
authorazul <azul@riseup.net>2012-12-22 04:37:42 -0800
committerazul <azul@riseup.net>2012-12-22 04:37:42 -0800
commit9a23a5d63b2b5bcb1994137a5de9f8ebd88142f1 (patch)
treee65b4c4f75e2e8313c67b77aacbd210efbfddd71 /users/app/views
parent6e90c173662583ca392ca1cefa7e7dcdc92dbf13 (diff)
parentc83ada50de6b9a7084a23037068ba7f12e09dfc9 (diff)
Merge pull request #7 from leapcode/feature/validate-email-domain
validating email domain and displaying it as the placeholder
Diffstat (limited to 'users/app/views')
-rw-r--r--users/app/views/users/_email_aliases.html.haml2
-rw-r--r--users/app/views/users/_email_field.html.haml2
2 files changed, 2 insertions, 2 deletions
diff --git a/users/app/views/users/_email_aliases.html.haml b/users/app/views/users/_email_aliases.html.haml
index 121acc4..e012429 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@#{request.domain}"
+ = e.input :email, :placeholder => "alias@#{APP_CONFIG[:domain]}"
diff --git a/users/app/views/users/_email_field.html.haml b/users/app/views/users/_email_field.html.haml
index 36bbeca..edf62c9 100644
--- a/users/app/views/users/_email_field.html.haml
+++ b/users/app/views/users/_email_field.html.haml
@@ -1 +1 @@
-= f.input :email
+= f.input :email, :placeholder => "me@#{APP_CONFIG[:domain]}"