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

made changes for login

Browse source
This commit is contained in:
mb863 2010-07-09 19:36:41 +00:00
parent d69cf13311
commit 0de5829857
3 changed files with 30 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
webapp/web/js/login/loginUtils.js Normal file
View file

@ -0,0 +1,10 @@
/* $This file is distributed under the terms of the license in /doc/license.txt$ */
$(document).ready(function(){
$("#formLogin").removeClass("hidden");
});

6
webapp/web/templates/freemarker/body/login/login-forcedPasswordChange.ftl
View file

@ -9,13 +9,13 @@ ${stylesheets.addFromTheme("/login.css")}
<h2>Create Your New Password</h2> <h2>Create Your New Password</h2>
<#if errorMessage??> <#if errorMessage??>
<div id="errorAlert"><img src="${alertImageUrl}" width="24" height="24" alert="Error alert icon"/> <div id="errorAlert"><img src="${urls.siteIcons}/iconAlert.png" width="24" height="24" alert="Error alert icon"/>
<p>${errorMessage}</p> <p>${errorMessage}</p>
</div> </div>
</#if> </#if>
<form action="${formAction}" method="post" onsubmit="return isReasonableNewPassword(this)"> <form action="${formAction}" method="post">
<label for="newPassword">Password</label> <label for="newPassword">New Password</label>
<input type="password" name="newPassword" /> <input type="password" name="newPassword" />
<p class="passwordNote">Please enter a password with more than 5 characters</p> <p class="passwordNote">Please enter a password with more than 5 characters</p>
<label for="confirmPassword">Confirm Password</label> <label for="confirmPassword">Confirm Password</label>

22
webapp/web/templates/freemarker/body/login/login-form.ftl
View file

@ -2,10 +2,19 @@
<#-- Log in template for accessing site admin --> <#-- Log in template for accessing site admin -->
${stylesheets.addFromTheme("/login.css")}
<noscript><p class="alertNoJavaScript">JavaScript must be enabled in order for you to log in. However, it seems JavaScript is either disabled or not supported by your browser. Please enable JavaScript by changing your browser options.</p></noscript>
<div id="formLogin" class="pageBodyGroup">
${stylesheets.addFromTheme("/login.css")}
<noscript>
<div id="javascriptDisableWrapper">
<div id="javascriptDisableContent">
<img src="${urls.siteIcons}/iconAlertBig.png" alt="Alert Icon"/>
<p>In order to edit VIVO content, you'll need to enable JavaScript.</p>
</div>
</div>
</noscript>
<div id="formLogin" class="pageBodyGroup hidden" >
<h2>Log in</h2> <h2>Log in</h2>
@ -14,12 +23,12 @@ ${stylesheets.addFromTheme("/login.css")}
</#if> </#if>
<#if errorMessage??> <#if errorMessage??>
<div id="errorAlert"><img src="${alertImageUrl}" width="24" height="24" alert="Error alert icon"/> <div id="errorAlert"><img src="${urls.siteIcons}/iconAlert.png" alert="Error alert icon"/>
<p>${errorMessage}</p> <p>${errorMessage}</p>
</div> </div>
</#if> </#if>
<form action="${formAction}" method="post" onsubmit="return isValidLogin(this)"> <form action="${formAction}" method="post">
<label for="loginName">Email</label> <label for="loginName">Email</label>
<input name="loginName" type="text" value="${loginName}" /> <input name="loginName" type="text" value="${loginName}" />
<label for="loginPassword">Password</label> <label for="loginPassword">Password</label>
@ -28,3 +37,6 @@ ${stylesheets.addFromTheme("/login.css")}
</form> </form>
</div> </div>