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

Added new features for VITRO home page:

Browse source 
-Filtered search based in class groups (It needs to be wired. Just added HTML/CSS/JS)
-Class group stats (It needs to be wired. Just added HTML/CSS/JS)
-Improveed UX for signing when there is external authorization

Removed search box located in header in homepage.
This commit is contained in:
Manolo Bevia 2013-04-11 15:09:23 -04:00
parent 3997440944
commit c19df41bfd
9 changed files with 411 additions and 37 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -15,6 +15,9 @@
</#macro>
<#macro loginForm>
<#assign infoClassHide = ''/>
<#assign infoClassShow = ''/>
<#-- Don't display the JavaScript required to edit message on the home page even if JavaScript is unavailable -->
<#if currentServlet != 'home'>
<noscript>
@ -33,6 +36,8 @@
</#if>
<#if errorMessage??>
<#assign infoClassShow = ' id="vivoAccountError"'/>
<section id="error-alert" role="alert"><img src="${urls.images}/iconAlert.png" alert="Error alert icon" />
<p class="login-alert">${errorMessage}</p>
</section>
@ -40,25 +45,32 @@
<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}" title="external authentication name">${externalAuthName}</a></p>
<p class="or-auth">or</p>
<h3 class="internal-auth" >Log in using your ${siteName} account</h3>
</#if>
<label for="loginName">Email</label>
<input id="loginName" name="loginName" class="text-field focus" type="text" value="${loginName!}" autocapitalize="off" required autofocus />
<label for="loginPassword">Password</label>
<input id="loginPassword" name="loginPassword" class="text-field" type="password" required />
<#assign infoClassHide = 'class="vivoAccount"'/>
<p class="submit"><input name="loginForm" class="green button" type="submit" value="Log in"/></p>
<#-- NC: remember me won't be ready for r1.2
<input class="checkbox-remember-me" name="remember-me" type="checkbox" value="" />
<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="#" title="forgot password">Forgot your password?</a></p>
<p class="request-account"><a class="blue button" href="#" title="request an account">Request an account</a> </p> -->
<p class="external-auth"><a class="blue button" href="${externalAuthUrl}" title="external authentication name">${externalAuthName}</a></p>
<!--<p class="or-auth">or</p>-->
<h3 class="internal-auth"><!--Log in using your--> <b>or</b> ${siteName} account</h3>
</#if>
<div ${infoClassHide} ${infoClassShow}>
<label for="loginName">Email</label>
<input id="loginName" name="loginName" class="text-field focus" type="text" value="${loginName!}" autocapitalize="off" required autofocus />
<label for="loginPassword">Password</label>
<input id="loginPassword" name="loginPassword" class="text-field" type="password" required />
<p class="submit"><input name="loginForm" class="green button" type="submit" value="Log in"/></p>
<#-- NC: remember me won't be ready for r1.2
<input class="checkbox-remember-me" name="remember-me" type="checkbox" value="" />
<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="#" title="forgot password">Forgot your password?</a></p>
<p class="request-account"><a class="blue button" href="#" title="request an account">Request an account</a> </p> -->
</div>
</form>
</section><!-- #log-in -->