annotate .svn/pristine/11/11f49f2c53a5591216f2864d819f2860ef3e3885.svn-base @ 1061:01076ed49ffc
luisf
Merge from live site's latest changes.
| author |
luisf <luis.figueira@eecs.qmul.ac.uk> |
| date |
Mon, 19 Nov 2012 19:50:04 +0000 |
| parents |
cbb26bc654de |
| children |
|
| rev |
line source |
|
Chris@909
|
1 <% if @user.auth_source %><%= l(:mail_body_account_information_external, @user.auth_source.name) %>
|
|
Chris@909
|
2 <% else %><%= l(:mail_body_account_information) %>:
|
|
Chris@909
|
3 * <%= l(:field_login) %>: <%= @user.login %>
|
|
Chris@909
|
4 * <%= l(:field_password) %>: <%= @password %>
|
|
Chris@909
|
5 <% end %>
|
|
Chris@909
|
6 <%= l(:label_login) %>: <%= @login_url %>
|
