merging branch updates for NIHVIVO-2992 and NIHVIVO-2995

This commit is contained in:
tworrall 2011-07-20 19:21:48 +00:00
parent c1d5f4aac3
commit 885e8f83de
3 changed files with 16 additions and 20 deletions

View file

@ -64,7 +64,7 @@
<#include "userAccounts-associateProfilePanel.ftl">
<p><input id="externalAuthChkBox" type="checkbox" name="externalAuthOnly" <#if externalAuthOnly?? >checked</#if> /><span>Externally Authenticated Only</span></p>
<p><input id="externalAuthChkBox" type="checkbox" name="externalAuthOnly" <#if externalAuthOnly?? >checked</#if> />Externally Authenticated Only</p>
<p>Roles<span class="requiredHint"> *</span></p>
<#list roles as role>
<input type="radio" name="role" value="${role.uri}" role="radio" <#if selectedRole = role.uri>checked</#if> />

View file

@ -64,7 +64,7 @@
<#include "userAccounts-associateProfilePanel.ftl">
<p><input id="externalAuthChkBox" type="checkbox" name="externalAuthOnly" <#if externalAuthOnly?? >checked</#if> /><span>Externally Authenticated Only</span></p>
<p><input id="externalAuthChkBox" type="checkbox" name="externalAuthOnly" <#if externalAuthOnly?? >checked</#if> />Externally Authenticated Only</p>
<#if roles?has_content>
<p>Roles<span class="requiredHint"> *</span></p>
<#list roles as role>