Diff
Modified: branches/rails2/app/views/mailer/forgot_password.rhtml (2762 => 2763)
--- branches/rails2/app/views/mailer/forgot_password.rhtml 2011-10-25 15:51:10 UTC (rev 2762)
+++ branches/rails2/app/views/mailer/forgot_password.rhtml 2011-10-25 18:02:47 UTC (rev 2763)
@@ -8,6 +8,7 @@
<%= url_for : false,
:controller => 'users',
+ :host => Conf.hostname,
:action ="" 'reset_password',
:reset_code => @reset_code %>
Modified: branches/rails2/app/views/mailer/friendship_invite_new_user.rhtml (2762 => 2763)
--- branches/rails2/app/views/mailer/friendship_invite_new_user.rhtml 2011-10-25 15:51:10 UTC (rev 2762)
+++ branches/rails2/app/views/mailer/friendship_invite_new_user.rhtml 2011-10-25 18:02:47 UTC (rev 2763)
@@ -13,12 +13,12 @@
<% end -%>
-You can find out more about me (<%= @name -%>) from my profile page: <%= url_for : false, :controller => 'users', :id => @user_id, :action ="" 'show' %>
+You can find out more about me (<%= @name -%>) from my profile page: <%= url_for : false, :controller => 'users', :host => Conf.hostname, :id => @user_id, :action ="" 'show' %>
To become my friend you will have to follow these simple steps:
-1. Register for <%= indefinite_article(Conf.sitename) %> <%= Conf.sitename %> account at: <%= url_for : false, :controller => 'users', :action ="" 'new', :token => @token %>
+1. Register for <%= indefinite_article(Conf.sitename) %> <%= Conf.sitename %> account at: <%= url_for : false, :controller => 'users', :host => Conf.hostname, :action ="" 'new', :token => @token %>
2. Confirm your email address as instructed during the registration process.
3. Accept my friendship request that you will receive directly to your account once the registration is complete.
Modified: branches/rails2/app/views/mailer/group_invite_new_user.rhtml (2762 => 2763)
--- branches/rails2/app/views/mailer/group_invite_new_user.rhtml 2011-10-25 15:51:10 UTC (rev 2762)
+++ branches/rails2/app/views/mailer/group_invite_new_user.rhtml 2011-10-25 18:02:47 UTC (rev 2763)
@@ -15,12 +15,12 @@
You can find out more:
--> about this group : <%= Conf.base_uri + group_path(@group_id) %>
---> and about me (<%= @name -%>) from my profile page : <%= url_for : false, :controller => 'users', :id => @user_id, :action ="" 'show' %>
+--> and about me (<%= @name -%>) from my profile page : <%= url_for : false, :controller => 'users', :host => Conf.hostname, :id => @user_id, :action ="" 'show' %>
To join the group you will have to follow these simple steps:
-1. Register for <%= indefinite_article(Conf.sitename) %> <%= Conf.sitename %> account at: <%= url_for : false, :controller => 'users', :action ="" 'new', :token => @token %>
+1. Register for <%= indefinite_article(Conf.sitename) %> <%= Conf.sitename %> account at: <%= url_for : false, :controller => 'users', :host => Conf.hostname, :action ="" 'new', :token => @token %>
2. Confirm your email address as instructed during the registration process.
3. Accept the group membership request that you will receive directly to your account once the registration is complete.
Modified: branches/rails2/app/views/mailer/invite_new_user.rhtml (2762 => 2763)
--- branches/rails2/app/views/mailer/invite_new_user.rhtml 2011-10-25 15:51:10 UTC (rev 2762)
+++ branches/rails2/app/views/mailer/invite_new_user.rhtml 2011-10-25 18:02:47 UTC (rev 2763)
@@ -11,11 +11,11 @@
---------------------------------------------------------------------------
<% end -%>
-Join us at: <%= url_for : false, :controller => 'users', :action ="" 'new' %>
+Join us at: <%= url_for : false, :controller => 'users', :host => Conf.hostname, :action ="" 'new' %>
You can find out more:
--> about <%= Conf.sitename -%>: <%= Conf.base_uri %>
---> and about me: <%= url_for : false, :controller => 'users', :id => @user_id, :action ="" 'show' %>
+--> and about me: <%= url_for : false, :controller => 'users', :host => Conf.hostname, :id => @user_id, :action ="" 'show' %>
Best regards,
Modified: branches/rails2/app/views/mailer/update_email_address.rhtml (2762 => 2763)
--- branches/rails2/app/views/mailer/update_email_address.rhtml 2011-10-25 15:51:10 UTC (rev 2762)
+++ branches/rails2/app/views/mailer/update_email_address.rhtml 2011-10-25 18:02:47 UTC (rev 2763)
@@ -8,6 +8,7 @@
<%= url_for : false,
:controller => 'users',
+ :host => Conf.hostname,
:action ="" 'confirm_email',
:hash => @hash %>