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

NIHVIVO-2829: chages template, css and minor js addition for account profile association

Browse source
This commit is contained in:
tworrall 2011-07-08 20:47:31 +00:00
parent 53d6dc7019
commit a0e962774e
5 changed files with 131 additions and 56 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -74,7 +74,7 @@
<#if emailIsEnabled??>
<p class="note">
Note: An email will be sent to the address entered above
notifying the user that an account has been created.
notifying that an account has been created.
It will include instructions for activating the account and creating a password.
</p>
<#else>
@ -84,15 +84,16 @@
<label for="initial-password">Initial password<span class="requiredHint"> *</span></label>
<input type="password" name="initialPassword" value="${initialPassword}" id="initial-password" role="input "/>
</td>
<td>&nbsp;</td>
<td>
<label for="confirm-password">Confirm initial password<span class="requiredHint"> *</span></label>
<input type="password" name="confirmPassword" value="${confirmPassword}" id="confirm-password" role="input" />
</td>
</tr>
</table>
<p>Minimum of ${minimumLength} characters in length.</p>
<p class="explanatoryText" style="margin-top:-8px">Minimum of ${minimumLength} characters in length.</p>
</#if>
<br />
<input type="submit" name="submitAdd" value="Add new account" class="submit"/> or <a class="cancel" href="${formUrls.list}">Cancel</a>
<p class="requiredHint">* required fields</p>

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

@ -2,40 +2,50 @@
<#-- Template for setting the account reference field, which can also associate a profile with the user account -->
${stylesheets.add('<link rel="stylesheet" href="${urls.base}/edit/forms/css/autocomplete.css"" />',
'<link rel="stylesheet" href="${urls.base}/js/jquery-ui/css/smoothness/jquery-ui-1.8.9.custom.css"" />')}
${stylesheets.add('<link rel="stylesheet" href="${urls.base}/edit/forms/css/autocomplete.css" />',
'<link rel="stylesheet" href="${urls.base}/js/jquery-ui/css/smoothness/jquery-ui-1.8.9.custom.css" />')}
<label for="externalAuthId">External Auth. ID / Matching ID</label>
<input type="text" name="externalAuthId" value="${externalAuthId}" id="externalAuthId" role="input "/>
<span id="externalAuthIdInUse" style="display: none;" >This Account Reference is already in use.</span>
<p class="explanatoryText" style="margin-top:-8px">Can be used to associate the account with the user's profile via the matching property.</p>
<div id="associateProfileBackgroundOne">
<div style="margin-left:8px">
<label for="externalAuthId">External Auth. ID / Matching ID</label>
<input type="text" name="externalAuthId" value="${externalAuthId}" id="externalAuthId" role="input "/>
<span id="externalAuthIdInUse" style="display: none;" >This Account Reference is already in use.</span>
<p class="explanatoryText" style="margin-top:-8px">Can be used to associate the account with the user's profile via the matching property.</p>
</div>
</div>
<#-- If there is an associated profile, show these -->
<div id="associated">
<p>
<label for="associatedProfileName">Associated profile:</label>
<span class="acSelectionInfo" id="associatedProfileName"></span>
<a href="" id="verifyProfileLink">(verify this match)</a>
<a href="" id="changeProfileLink">(change profile)</a>
</p>
<input type="hidden" id="associatedProfileUri" name="associatedProfileUri" value="" />
<div id="associateProfileBackgroundTwo">
<p>
<label for="associatedProfileName">Associated profile:</label>
<span class="acSelectionInfo" id="associatedProfileName"></span>
<a href="" id="verifyProfileLink">(verify this match)</a>
<a href="" id="changeProfileLink">(change profile)</a>
</p>
<input type="hidden" id="associatedProfileUri" name="associatedProfileUri" value="" />
</div>
</div>
<#-- If we haven't selected one, show these instead -->
<div id="associationOptions">
<p>
<label for="associateProfileName">Select the associated profile</label>
<input type="text" id="associateProfileName" name="associateProfileName" class="acSelector" size="35">
</p>
<p> - or - </p>
<p>
<label for="">Create the associated profile</label>
<select name="degreeUri" id="degreeUri" >
<option value="" selected="selected">Select one</option>
<#list profileTypes?keys as key>
<option value="${key}" >${profileTypes[key]}</option>
</#list>
</select>
</p>
<div id="associateProfileBackgroundThree">
<p>
<label for="associateProfileName">Select the associated profile</label>
<input type="text" id="associateProfileName" name="associateProfileName" class="acSelector" size="35">
</p>
</div>
<div id="associateProfileBackgroundFour">
<p> - or - </p>
<p>
<label for="">Create the associated profile</label>
<select name="degreeUri" id="degreeUri" >
<option value="" selected="selected">Select one</option>
<#list profileTypes?keys as key>
<option value="${key}" >${profileTypes[key]}</option>
</#list>
</select>
</p>
</div>
</div>
<script type="text/javascript">

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

@ -89,16 +89,17 @@
<label for="new-password">New password<span class="requiredHint"> *</span></label>
<input type="password" name="newPassword" value="${newPassword}" id="new-password" role="input" />
</td>
<td>&nbsp;</td>
<td>
<label for="confirm-password">Confirm initial password<span class="requiredHint"> *</span></label>
<label for="confirm-password">Confirm new password<span class="requiredHint"> *</span></label>
<input type="password" name="confirmPassword" value="${confirmPassword}" id="confirm-password" role="input" />
</td>
</tr>
</table>
<p>Minimum of ${minimumLength} characters in length.</p>
<p>Leaving this blank means that the password will not be changed.</p>
<p class="explanatoryText" style="margin-top:-8px">Minimum of ${minimumLength} characters in length.</p>
<p class="explanatoryText">Leaving this blank means that the password will not be changed.</p>
</#if>
<br />
<input type="submit" name="submitEdit" value="Save changes" class="submit" /> or <a class="cancel" href="${formUrls.list}">Cancel</a>
<p class="requiredHint">* required fields</p>