Mercurial > hg > soundsoftware-site
annotate .svn/pristine/48/48ff18e334062d6b11594a2a05769b3f109ed7d6.svn-base @ 1519:afce8026aaeb redmine-2.4-integration
Merge from branch "live"
| author | Chris Cannam |
|---|---|
| date | Tue, 09 Sep 2014 09:34:53 +0100 |
| parents | 038ba2d95de8 |
| children |
| rev | line source |
|---|---|
| Chris@1296 | 1 <% if @user.auth_source %> |
| Chris@1296 | 2 <p><%= l(:mail_body_account_information_external, h(@user.auth_source.name)) %></p> |
| Chris@1296 | 3 <% else %> |
| Chris@1296 | 4 <p><%= l(:mail_body_account_information) %>:</p> |
| Chris@1296 | 5 <ul> |
| Chris@1296 | 6 <li><%= l(:field_login) %>: <%=h @user.login %></li> |
| Chris@1296 | 7 <li><%= l(:field_password) %>: <%=h @password %></li> |
| Chris@1296 | 8 </ul> |
| Chris@1296 | 9 <% end %> |
| Chris@1296 | 10 |
| Chris@1296 | 11 <p><%= l(:label_login) %>: <%= link_to h(@login_url), @login_url %></p> |