annotate .svn/pristine/48/48ff18e334062d6b11594a2a05769b3f109ed7d6.svn-base @ 1298:4f746d8966dd redmine_2.3_integration

Merge from redmine-2.3 branch to create new branch redmine-2.3-integration
author Chris Cannam
date Fri, 14 Jun 2013 09:28:30 +0100
parents 622f24f53b42
children
rev   line source
Chris@1295 1 <% if @user.auth_source %>
Chris@1295 2 <p><%= l(:mail_body_account_information_external, h(@user.auth_source.name)) %></p>
Chris@1295 3 <% else %>
Chris@1295 4 <p><%= l(:mail_body_account_information) %>:</p>
Chris@1295 5 <ul>
Chris@1295 6 <li><%= l(:field_login) %>: <%=h @user.login %></li>
Chris@1295 7 <li><%= l(:field_password) %>: <%=h @password %></li>
Chris@1295 8 </ul>
Chris@1295 9 <% end %>
Chris@1295 10
Chris@1295 11 <p><%= l(:label_login) %>: <%= link_to h(@login_url), @login_url %></p>