litvinovg/vitro
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

merging branch updates for NIHVIVO-2992 and NIHVIVO-2995

Browse source
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
Show stats Download patch file Download diff file Expand all files Collapse all files

22
webapp/web/css/account/account.css
View file

@ -193,11 +193,11 @@ padding-right: 5px;
} }
#associateProfileBackgroundOne { #associateProfileBackgroundOne {
background-color:#fff; background-color:#fff;
padding:5px 0 5px 0; padding:7px 0 5px 0;
margin-left:-8px; margin-left:-8px;
margin-right:-8px; margin-right:-8px;
padding-top:7px; width:500px;
width:100%; z-index:10;
border:none; border:none;
border-right:none; border-right:none;
border-bottom-left-radius: 5px; border-bottom-left-radius: 5px;
@ -209,11 +209,10 @@ padding-right: 5px;
} }
#associateProfileBackgroundTwo { #associateProfileBackgroundTwo {
background-color:#f1f2ee; background-color:#f1f2ee;
padding-top:7px; padding:7px 94px 42px 0;
padding-bottom:42px;
padding-right:94px;
margin-top:-112px; margin-top:-112px;
margin-right:-8px; margin-right:-8px;
z-index:-100;
border:1px solid #ccc; border:1px solid #ccc;
border-left:none; border-left:none;
border-top-right-radius: 5px; border-top-right-radius: 5px;
@ -225,13 +224,11 @@ padding-right: 5px;
} }
#associateProfileBackgroundThree { #associateProfileBackgroundThree {
background-color:#f1f2ee; background-color:#f1f2ee;
padding-left:12px; padding:7px 94px 26px 12px;
padding-top:7px;
padding-bottom:26px;
padding-right:94px;
margin-top:-112px; margin-top:-112px;
margin-left:-12px; margin-left:-12px;
margin-right:-8px; margin-right:-8px;
z-index:-100;
border:1px solid #ccc; border:1px solid #ccc;
border-left:none; border-left:none;
border-bottom:none; border-bottom:none;
@ -241,12 +238,11 @@ padding-right: 5px;
} }
#associateProfileBackgroundFour { #associateProfileBackgroundFour {
background-color:#f1f2ee; background-color:#f1f2ee;
padding-left:12px; padding:0 94px 26px 12px;
padding-bottom:26px;
padding-right:94px;
margin-top:-8px; margin-top:-8px;
margin-left:-12px; margin-left:-12px;
margin-right:-8px; margin-right:-8px;
z-index:-100;
border:1px solid #ccc; border:1px solid #ccc;
border-top:none; border-top:none;
border-bottom-left-radius: 5px; border-bottom-left-radius: 5px;

2
webapp/web/templates/freemarker/body/accounts/userAccounts-add.ftl
View file

@ -64,7 +64,7 @@
<#include "userAccounts-associateProfilePanel.ftl"> <#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> <p>Roles<span class="requiredHint"> *</span></p>
<#list roles as role> <#list roles as role>
<input type="radio" name="role" value="${role.uri}" role="radio" <#if selectedRole = role.uri>checked</#if> /> <input type="radio" name="role" value="${role.uri}" role="radio" <#if selectedRole = role.uri>checked</#if> />

2
webapp/web/templates/freemarker/body/accounts/userAccounts-edit.ftl
View file

@ -64,7 +64,7 @@
<#include "userAccounts-associateProfilePanel.ftl"> <#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> <#if roles?has_content>
<p>Roles<span class="requiredHint"> *</span></p> <p>Roles<span class="requiredHint"> *</span></p>
<#list roles as role> <#list roles as role>