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

NIHVIVO-1492: Style external authentication in the VITRO core when active

Browse source
This commit is contained in:
mb863 2010-12-21 15:11:50 +00:00
parent 1c0aa39da5
commit 0329dc7cc0
4 changed files with 38 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -42,6 +42,25 @@ p.request-account {
} }
#login-form p.external-auth { #login-form p.external-auth {
margin-left: 36px; margin-left: 36px;
margin-top: 1em;
}
.or-auth{
margin-left: 135px;
width: 30px;
height: 30px;
background: #fff 0 0 url(../images/login-or.png) no-repeat;
margin-bottom: 0;
padding-left: 8px;
padding-top: 5px;
color: #fff;
font-size: .8em;
}
h3.internal-auth{
margin-left: 38px;
color: #5F6464;
font-size: 1em;
margin-bottom: 0;
padding-bottom: 0;
} }
#error-alert{ #error-alert{
color: #900; color: #900;

BIN
webapp/web/images/login-or.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 481 B

9
webapp/web/js/login/loginUtils.js
View file

@ -9,10 +9,9 @@ $(document).ready(function(){
$('.focus').focus(); $('.focus').focus();
// fade out error alerts // fade out error alerts
//$('#error-alert').css('display', 'none'); $('section#error-alert').css('display', 'none').fadeIn(1500);
//$('#error-alert).fadeIn(500);
// fade out fash-message when user log out
$('section#flash-message').css('display', 'none').fadeIn(1500);
}); });

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

@ -29,12 +29,22 @@
</#if> </#if>
<#if errorMessage??> <#if errorMessage??>
<div id="error-alert"><img src="${urls.images}/iconAlert.png" alert="Error alert icon"/> <section id="error-alert" role="alert"><img src="${urls.images}/iconAlert.png" alert="Error alert icon" />
<p>${errorMessage}</p> <p>${errorMessage}</p>
</div> </section>
</#if> </#if>
<form role="form" id="login-form" action="${formAction}" method="post" name="login-form" /> <form role="form" id="login-form" action="${formAction}" method="post" name="login-form" />
<#if externalAuthUrl??>
<p class="external-auth">
<a class="blue button" href="${externalAuthUrl}">${externalAuthName}</a>
</p>
</#if>
<p class="or-auth">or</p>
<h3 class="internal-auth" >Login using a different account</h3>
<label for="email">Email</label> <label for="email">Email</label>
<input class="text-field" name="loginName" id="loginName" type="text" value="${loginName!}" required /> <input class="text-field" name="loginName" id="loginName" type="text" value="${loginName!}" required />
@ -48,13 +58,6 @@
<#-- mb863: forgot password and request an account won't be part of VIVO r1.2 <#-- 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??>
<p class="external-auth">
<a class="green button" href="${externalAuthUrl}">${externalAuthName}</a>
</p>
</#if>
</form> </form>
</section><!-- #log-in --> </section><!-- #log-in -->