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

NIHVIVO-638 Check in first phase of changes to the Login form and backend.

Browse source
This commit is contained in:
jeb228 2010-07-07 19:35:46 +00:00
parent 2253f889ed
commit 74c7660321
12 changed files with 999 additions and 342 deletions
Download patch file Download diff file Expand all files Collapse all files

2
webapp/web/templates/edit/specific/user_retry.jsp
View file

@ -6,7 +6,7 @@
<tr class="editformcell">
<td valign="bottom" colspan="2">
<b>User Name*</b><br/>
<b>Email address*</b><br/>
<input type="text" name="Username" value="${formValue['Username']}" size="60" maxlength="120" />
<span class="warning"><form:error name="Username"/></span>
</td>

27
webapp/web/templates/freemarker/body/login/forcedPasswordChange.ftl Normal file
View file

@ -0,0 +1,27 @@
<#-- $This file is distributed under the terms of the license in /doc/license.txt$ -->
<#-- Crop the replacement main image for an Individual, to produce a thumbnail. -->
<h2>Forced password change</h2>
${stylesheets.addFromTheme("/login.css")}
<div id="formLogin" class="pageBodyGroup">
<h2>Create Your New Password</h2>
<#if errorMessage??>
<div id="errorAlert"><img src="${alertImageUrl}" width="32" height="31" alert="Error alert icon"/>
<p>${errorMessage}</p>
</div>
</#if>
<form action="${formAction}" method="post" onsubmit="return isReasonableNewPassword(this)">
<label for="newPassword">Password</label>
<input type="password" name="newPassword" />
<label for="confirmPassword">Confirm Password</label>
<input type="password" name="confirmPassword" />
<br />
<input name="passwordChangeForm" type="submit" class="submit" value="Save Changes"/>
</form>
</div>

29
webapp/web/templates/freemarker/body/login/login.ftl Normal file
View file

@ -0,0 +1,29 @@
<#-- $This file is distributed under the terms of the license in /doc/license.txt$ -->
<#-- Crop the replacement main image for an Individual, to produce a thumbnail. -->
${stylesheets.addFromTheme("/login.css")}
<div id="formLogin" class="pageBodyGroup">
<h2>Log in</h2>
<#if infoMessage??>
<h3>${infoMessage}</h3>
</#if>
<#if errorMessage??>
<div id="errorAlert"><img src="${alertImageUrl}" width="32" height="31" alert="Error alert icon"/>
<p>${errorMessage}</p>
</div>
</#if>
<form action="${formAction}" method="post" onsubmit="return isValidLogin(this)">
<label for="loginName">Email</label>
<input name="loginName" type="text" value="${loginName}" />
<label for="loginPassword">Password</label>
<input type="password" name="loginPassword" />
<br />
<input name="loginForm" type="submit" class="submit" value="Log in"/>
</form>
</div>