hazza/DSpace
1
0
Fork 0
mirror of https://github.com/DSpace/DSpace.git synced 2025-10-16 22:43:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

Adjust login form pages

Browse Source
This commit is contained in:
Pascarelli Luigi Andrea
2013-10-11 11:53:55 +02:00
parent 1612022e72
commit 96c268f2fb
3 changed files with 40 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
dspace-jspui/src/main/webapp/components/login-form.jsp
View File

@@ -14,16 +14,20 @@
<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" <%@ taglib uri="http://java.sun.com/jsp/jstl/fmt"
prefix="fmt" %> prefix="fmt" %>
<div class="panel-body"> <div class="panel-body">
<form name="loginform" class="form" id="loginform" method="post" action="<%= request.getContextPath() %>/password-login"> <form name="loginform" class="form-horizontal" id="loginform" method="post" action="<%= request.getContextPath() %>/password-login">
<p><strong><a href="<%= request.getContextPath() %>/register"><fmt:message key="jsp.components.login-form.newuser"/></a></strong></p> <p><strong><a href="<%= request.getContextPath() %>/register"><fmt:message key="jsp.components.login-form.newuser"/></a></strong></p>
<p><fmt:message key="jsp.components.login-form.enter"/></p> <p><fmt:message key="jsp.components.login-form.enter"/></p>
<div class="row"> <div class="form-group">
<label class="col-md-2" for="tlogin_email"><fmt:message key="jsp.components.login-form.email"/></label> <label class="col-md-2 control-label" for="tlogin_email"><fmt:message key="jsp.components.login-form.email"/></label>
<input class="col-md-3" type="text" name="login_email" id="tlogin_email" tabindex="1" /> <div class="col-md-6">
<input class="form-control" type="text" name="login_email" id="tlogin_email" tabindex="1" />
</div>
</div>
<div class="form-group">
<label class="col-md-2 control-label" for="tlogin_password"><fmt:message key="jsp.components.login-form.password"/></label>
<div class="col-md-6">
<input class="form-control" type="password" name="login_password" id="tlogin_password" tabindex="2" />
</div> </div>
<div class="row">
<label class="col-md-2" for="tlogin_password"><fmt:message key="jsp.components.login-form.password"/></label>
<input class="col-md-3" type="password" name="login_password" id="tlogin_password" tabindex="2" />
</div> </div>
<div class="row"> <div class="row">
<div class="col-md-6"> <div class="col-md-6">

24
dspace-jspui/src/main/webapp/login/incorrect.jsp
View File

@@ -22,26 +22,28 @@
<%@ page import="javax.servlet.jsp.jstl.fmt.LocaleSupport" %> <%@ page import="javax.servlet.jsp.jstl.fmt.LocaleSupport" %>
<dspace:layout navbar="off" <dspace:layout style="submission" navbar="default"
locbar="nolink" locbar="nolink"
titlekey="jsp.login.incorrect.title"> titlekey="jsp.login.incorrect.title">
<table border="0" width="90%">
<tr>
<td align="left">
<%-- <h1>Log In to DSpace</h1> --%> <%-- <h1>Log In to DSpace</h1> --%>
<h1><fmt:message key="jsp.login.incorrect.heading"/></h1> <h1><fmt:message key="jsp.login.incorrect.heading"/>
</td>
<td align="right" class="standard">
<dspace:popup page="<%= LocaleSupport.getLocalizedMessage(pageContext, \"help.index\") + \"#login\"%>"><fmt:message key="jsp.help"/></dspace:popup> <dspace:popup page="<%= LocaleSupport.getLocalizedMessage(pageContext, \"help.index\") + \"#login\"%>"><fmt:message key="jsp.help"/></dspace:popup>
</td> </h1>
</tr>
</table>
<%-- <p align="center"><strong>The e-mail address and password you supplied were not valid. Please try again, or have you <a href="<%= request.getContextPath() %>/forgot">forgotten your password</a>?</strong></p> --%> <%-- <p align="center"><strong>The e-mail address and password you supplied were not valid. Please try again, or have you <a href="<%= request.getContextPath() %>/forgot">forgotten your password</a>?</strong></p> --%>
<p align="center"><strong><fmt:message key="jsp.login.incorrect.text"> <p class="alert alert-warning"><strong><fmt:message key="jsp.login.incorrect.text">
<fmt:param><%= request.getContextPath() %>/forgot</fmt:param> <fmt:param><%= request.getContextPath() %>/forgot</fmt:param>
</fmt:message></strong></p> </fmt:message></strong></p>
<div class="panel panel-primary">
<div class="panel-heading"><fmt:message key="jsp.login.password.heading"/>
<span class="pull-right"><dspace:popup page="<%= LocaleSupport.getLocalizedMessage(pageContext, \"help.index\") + \"#login\"%>"><fmt:message key="jsp.help"/></dspace:popup></span>
</div>
<dspace:include page="/components/login-form.jsp" /> <dspace:include page="/components/login-form.jsp" />
</div>
</dspace:layout> </dspace:layout>

36
dspace-jspui/src/main/webapp/register/forgot-password.jsp
View File

@@ -41,39 +41,31 @@
%> %>
<%-- <p><strong>The e-mail address you entered was not recognized. Please <%-- <p><strong>The e-mail address you entered was not recognized. Please
try again.</strong></p> --%> try again.</strong></p> --%>
<p><strong><fmt:message key="jsp.register.forgot-password.info1"/></strong></p> <p class="alert alert-warning"><fmt:message key="jsp.register.forgot-password.info1"/></p>
<% <%
} }
%> %>
<%-- <p>Please enter your e-mail <%-- <p>Please enter your e-mail
address in the box below and click "I Forgot My Password". You'll be sent address in the box below and click "I Forgot My Password". You'll be sent
an e-mail which will allow you to set a new password.</p> --%> an e-mail which will allow you to set a new password.</p> --%>
<p><fmt:message key="jsp.register.forgot-password.info2"/></p> <p class="alert alert-info"><fmt:message key="jsp.register.forgot-password.info2"/></p>
<form action="<%= request.getContextPath() %>/forgot" method="post"> <form class="form-horizontal" action="<%= request.getContextPath() %>/forgot" method="post">
<input type="hidden" name="step" value="<%= RegisterServlet.ENTER_EMAIL_PAGE %>"/> <input type="hidden" name="step" value="<%= RegisterServlet.ENTER_EMAIL_PAGE %>"/>
<center>
<table class="miscTable">
<tr>
<td class="oddRowEvenCol">
<table border="0" cellpadding="5">
<tr>
<%-- <td class="standard"><strong>E-mail Address:</strong></td> --%> <%-- <td class="standard"><strong>E-mail Address:</strong></td> --%>
<td class="standard"><strong><label for="temail"><fmt:message key="jsp.register.forgot-password.email.field"/></strong></label></td> <div class="form-group">
<td class="standard"><input type="text" name="email" id="temail" /></td> <label class="col-md-2 control-label" for="temail"><fmt:message key="jsp.register.forgot-password.email.field"/></label>
</tr> <div class="col-md-6">
<tr> <input class="form-control" type="text" name="email" id="temail" />
<td align="center" colspan="2"> </div>
</div>
<div class="row">
<div class="col-md-6">
<%-- <input type="submit" name="submit" value="I Forgot My Password"> --%> <%-- <input type="submit" name="submit" value="I Forgot My Password"> --%>
<input type="submit" name="submit" value="<fmt:message key="jsp.register.forgot-password.forgot.button"/>" /> <input class="btn btn-success pull-right" type="submit" name="submit" value="<fmt:message key="jsp.register.forgot-password.forgot.button"/>" />
</td> </div>
</tr> </div>
</table>
</td>
</tr>
</table>
</center>
</form> </form>
</dspace:layout> </dspace:layout>