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

NIHVIVO-1361

Browse source
This commit is contained in:
mb863 2010-11-29 18:26:16 +00:00
parent 150b8e1de2
commit d4b8a638af
2 changed files with 12 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

8
webapp/web/css/login.css
View file

@ -60,19 +60,19 @@ p.request-account {
font-size:0.9em; font-size:0.9em;
line-height:30px; line-height:30px;
} }
#confirmationAlert { #confirmation-alert {
color:#169f43; color:#169f43;
padding:0px; padding:0px;
margin-bottom:5px; margin-bottom:5px;
height:30px; height:30px;
} }
#confirmationAlert img { #confirmation-alert img {
float:left; float:left;
margin:0; margin:0;
padding:0; padding:0;
vertical-align:middle; vertical-align:middle;
} }
#confirmationAlert p { #confirmation-alert p {
padding-left:30px; padding-left:30px;
font-size:0.9em; font-size:0.9em;
line-height:30px; line-height:30px;
@ -83,7 +83,7 @@ p.request-account {
.red { .red {
color:#900; color:#900;
} }
p.passwordNote { p.password-note {
margin:0; margin:0;
padding:0; padding:0;
margin-top:-8px; margin-top:-8px;

14
webapp/web/templates/freemarker/widgets/widget-login.ftl
View file

@ -18,12 +18,10 @@
<h2>Log in</h2> <h2>Log in</h2>
<noscript> <noscript>
<section id="javascriptDisableWrapper"> <section id="error-alert">
<section id="javascriptDisableContent">
<img src="${urls.siteIcons}/iconAlertBig.png" alt="Alert Icon"/> <img src="${urls.siteIcons}/iconAlertBig.png" alt="Alert Icon"/>
<p>In order to edit VIVO content, you'll need to enable JavaScript.</p> <p>In order to edit VIVO content, you'll need to enable JavaScript.</p>
</section> </section>
</section>
</noscript> </noscript>
<#if infoMessage??> <#if infoMessage??>
@ -71,13 +69,13 @@
</#if> </#if>
<form role="form" id="login-form" action="${formAction}" method="post" name="login-form" required /> <form role="form" id="login-form" action="${formAction}" method="post" name="login-form" required />
<label for="newPassword">New Password</label> <label for="new-password">New Password</label>
<input id="newPassword" class="focus text-field" type="password" name="newPassword" required /> <input id="new-password" class="focus text-field" type="password" name="newPassword" required />
<p class="passwordNote">Minimum of 6 characters in length.</p> <p class="password-note">Minimum of 6 characters in length.</p>
<label for="confirmPassword">Confirm Password</label> <label for="confirm-password">Confirm Password</label>
<input id="confirmPassword" class="text-field" type="password" name="confirmPassword" /> <input id="confirm-password" class="text-field" type="password" name="confirmPassword" />
<p class="submit-password"><input name="passwordChangeForm" type="submit" class="green button" value="Log in"/> <span class="or">or <a class="cancel" href="${cancelUrl}">Cancel</a></span></p> <p class="submit-password"><input name="passwordChangeForm" type="submit" class="green button" value="Log in"/> <span class="or">or <a class="cancel" href="${cancelUrl}">Cancel</a></span></p>
</form> </form>