summaryrefslogtreecommitdiff
path: root/users
diff options
context:
space:
mode:
authorjessib <jessib@riseup.net>2013-01-24 09:51:50 -0800
committerjessib <jessib@riseup.net>2013-01-24 09:51:50 -0800
commit75442ad26f3d30519f747bc98bc83cdc76aff750 (patch)
tree7c5dfc371c7d596a3a3676bad6b24c4d6c5ab43a /users
parented1caa740f0e58cfd5f2d908946461154db68174 (diff)
parent4057fba83719687284a4fc5542d1d0cb6f1f86e9 (diff)
Merge pull request #21 from leapcode/feature/misc_cleanup
Feature/misc cleanup
Diffstat (limited to 'users')
-rw-r--r--users/app/views/users/edit.html.haml4
-rw-r--r--users/app/views/users/show.html.haml2
2 files changed, 3 insertions, 3 deletions
diff --git a/users/app/views/users/edit.html.haml b/users/app/views/users/edit.html.haml
index 03088d8..238c0eb 100644
--- a/users/app/views/users/edit.html.haml
+++ b/users/app/views/users/edit.html.haml
@@ -6,8 +6,8 @@
= render 'cancel_account' if @user == current_user
- content_for :email do
%legend=t :email_address
- Your email address is
- = render user.email_address, :as => :span
+ The associated email address is
+ = render @user.email_address, :as => :span
= user_form_with 'email_forward_field', :legend => :forward_email
= user_form_with 'email_aliases', :legend => :add_email_alias
= render 'tabs/tabs', :tabs => [:account, :email]
diff --git a/users/app/views/users/show.html.haml b/users/app/views/users/show.html.haml
index a1eeccb..056ed57 100644
--- a/users/app/views/users/show.html.haml
+++ b/users/app/views/users/show.html.haml
@@ -3,7 +3,7 @@
.small
= link_to 'edit', edit_user_path(@user)
%dl.offset1
- - fields = ['login', 'email', 'created_at', 'updated_at', 'email_forward']
+ - fields = ['login', 'email_address', 'created_at', 'updated_at', 'email_forward']
- fields.each do |field|
%dt
= field.titleize