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

NIHVIVO-2829: template and css changes for account-profile association

Browse source
This commit is contained in:
tworrall 2011-07-07 20:25:20 +00:00
parent 816ac0d466
commit 1f8428f488
2 changed files with 65 additions and 45 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -150,3 +150,33 @@ padding-right: 5px;
#reset-password p.note { #reset-password p.note {
margin-top: 0; margin-top: 0;
} }
/* ASSOCIATE PROFILE ------> */
.explanatoryText {
color:#999;
font-size:.8em;
font-style:bold;
width:280px;
margin-left:10px;
line-height:15px;
}
#associated {
float:right;
margin-top:-98px;
margin-right:80px;
display:none;
}
#associated label {
margin-bottom:5px;
}
#associationOptions {
float:right;
margin-top:-98px;
margin-right:80px;
display:none;
}
#verifyProfileLink {
margin-left:10px;
}
#externalAuthIdInUse {
color: #f70;
}

26
webapp/web/templates/freemarker/body/accounts/userAccounts-associateProfilePanel.ftl
View file

@ -2,19 +2,13 @@
<#-- Template for setting the account reference field, which can also associate a profile with the user account --> <#-- Template for setting the account reference field, which can also associate a profile with the user account -->
<table> ${stylesheets.add('<link rel="stylesheet" href="${urls.base}/edit/forms/css/autocomplete.css"" />',
<tr> '<link rel="stylesheet" href="${urls.base}/js/jquery-ui/css/smoothness/jquery-ui-1.8.9.custom.css"" />')}
<td>
<label for="externalAuthId">Account Reference</label> <label for="externalAuthId">External Auth. ID / Matching ID</label>
<input type="text" name="externalAuthId" value="${externalAuthId}" id="externalAuthId" role="input "/> <input type="text" name="externalAuthId" value="${externalAuthId}" id="externalAuthId" role="input "/>
<p> <span id="externalAuthIdInUse" style="display: none;" >This Account Reference is already in use.</span>
External Auth. ID or other unique ID. Can associate the account to the user's profile. <p class="explanatoryText" style="margin-top:-8px">Can be used to associate the account with the user's profile via the matching property.</p>
</p>
<p id="externalAuthIdInUse">
That Account Reference is already in use.
</p>
</td>
<td>
<#-- If there is an associated profile, show these --> <#-- If there is an associated profile, show these -->
<div id="associated"> <div id="associated">
<p> <p>
@ -29,12 +23,12 @@
<#-- If we haven't selected one, show these instead --> <#-- If we haven't selected one, show these instead -->
<div id="associationOptions"> <div id="associationOptions">
<p> <p>
<label for="associateProfileName">Select an existing profile</label> <label for="associateProfileName">Select the associated profile</label>
<input type="text" id="associateProfileName" name="associateProfileName" class="acSelector" size="35"> <input type="text" id="associateProfileName" name="associateProfileName" class="acSelector" size="35">
</p> </p>
<p> - or - </p> <p> - or - </p>
<p> <p>
<label for="">Create an associated profile</label> <label for="">Create the associated profile</label>
<select name="degreeUri" id="degreeUri" > <select name="degreeUri" id="degreeUri" >
<option value="" selected="selected">Select one</option> <option value="" selected="selected">Select one</option>
<#list profileTypes?keys as key> <#list profileTypes?keys as key>
@ -44,10 +38,6 @@
</p> </p>
</div> </div>
</td>
</tr>
</table>
<script type="text/javascript"> <script type="text/javascript">
var associateProfileFieldsData = { var associateProfileFieldsData = {
<#if userUri??> <#if userUri??>