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

NIHVIVO-1361: Removed Forgot your password and request account features from widget-login.ftl template. This feature won't hit 1.2

Browse source
This commit is contained in:
mb863 2010-11-30 20:21:52 +00:00
parent 7b6c3237d4
commit 25edf03517
2 changed files with 53 additions and 52 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -6,92 +6,92 @@
#login-form input.text, #login-form input.text,
#login-form #password, #login-form #password,
#login-form #confirmPassword{ #login-form #confirmPassword{
display:block; display: block;
} }
#login-form label.label-remember-me{ #login-form label.label-remember-me{
display:block; display: block;
} }
#login-form p.submit { #login-form p.submit {
float:left; float: left;
margin-bottom:0; margin-bottom: 0;
} }
#login-form input.checkbox-remember-me { #login-form input.checkbox-remember-me {
float:left; float: left;
height:14px; height: 14px;
padding:0; padding: 0;
margin-top:13px; margin-top: 13px;
margin-left:20px; margin-left: 20px;
} }
#login-form .label-remember-me { #login-form .label-remember-me {
display:block; display: block;
float:left; float: left;
width:100px; width: 100px;
margin:0; margin: 0;
padding:0; padding: 0;
margin-top:10px; margin-top: 10px;
margin-right:25px; margin-right: 25px;
padding-right:10px; padding-right: 10px;
} }
p.forgot-password { p.forgot-password {
clear:both; clear:both;
margin-bottom:0; margin-bottom: 0;
} }
p.request-account { p.request-account {
width:219px; width: 219px;
float:left; float: left;
} }
#login-form p.external-auth { #login-form p.external-auth {
margin-left: 36px; margin-left: 36px;
} }
#error-alert{ #error-alert{
color:#900; color: #900;
padding:10px; padding: 10px;
margin-bottom:5px; margin-bottom: 5px;
height:30px; height: 30px;
} }
#error-alert img { #error-alert img {
float:left; float:left;
margin:0; margin: 0;
padding:0; padding: 0;
vertical-align:middle; vertical-align: middle;
} }
#error-alert p { #error-alert p {
padding-left:30px; padding-left: 30px;
font-size:0.9em; font-size: 0.9em;
line-height:30px; line-height: 30px;
} }
#confirmation-alert { #confirmation-alert {
color:#169f43; color: #169f43;
padding:0px; padding: 0px;
margin-bottom:5px; margin-bottom: 5px;
height:30px; height: 30px;
} }
#confirmation-alert img { #confirmation-alert img {
float:left; float: left;
margin:0; margin: 0;
padding:0; padding: 0;
vertical-align:middle; vertical-align: middle;
} }
#confirmation-alert p { #confirmation-alert p {
padding-left:30px; padding-left: 30px;
font-size:0.9em; font-size: 0.9em;
line-height:30px; line-height: 30px;
} }
.formFieldAlert { .formFieldAlert {
border:2px solid #900; border: 2px solid #900;
} }
.red { .red {
color:#900; color: #900;
} }
p.password-note { p.password-note {
margin:0; margin: 0;
padding:0; padding: 0;
margin-top:-8px; margin-top: -8px;
font-size:0.8em; font-size: 0.8em;
color:#615e5e; color: #615e5e;
padding-top:15px; padding-top: 15px;
} }
.or { .or {
display:inline; display: inline;
vertical-align:middle; vertical-align: middle;
} }

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

@ -44,8 +44,9 @@
<p class="submit"><input name="loginForm" type="submit" class="green button" value="Log in"/></p> <p class="submit"><input name="loginForm" type="submit" class="green button" value="Log in"/></p>
<input class="checkbox-remember-me" name="remember-me" type="checkbox" value="" /> <input class="checkbox-remember-me" name="remember-me" type="checkbox" value="" />
<label class="label-remember-me" for="remember-me">Remember me</label> <label class="label-remember-me" for="remember-me">Remember me</label>
<#-- mb863: forgot password and request an account won't be part of VIVO r1.2
<p class="forgot-password"><a href="#">Forgot your password?</a></p> <p class="forgot-password"><a href="#">Forgot your password?</a></p>
<p class="request-account"><a class="blue button" href="#">Request an account</a> </p> <p class="request-account"><a class="blue button" href="#">Request an account</a> </p> -->
<#if externalAuthUrl??> <#if externalAuthUrl??>
<p class="external-auth"> <p class="external-auth">