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

[DS-2701] Correct login JSPs.

Browse Source
This commit is contained in:
Mark H. Wood
2015-09-17 16:25:49 -04:00
parent 322d25f3c7
commit 0e715acd80
1 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
dspace-jspui/src/main/webapp/login/chooser.jsp
View File

@@ -24,7 +24,8 @@
<%@ page import="org.dspace.app.webui.util.JSPManager" %>
<%@ page import="org.dspace.app.webui.util.UIUtil" %>
<%@ page import="org.dspace.authenticate.AuthenticationServiceImpl" %>
<%@ page import="org.dspace.authenticate.factory.AuthenticateServiceFactory" %>
<%@ page import="org.dspace.authenticate.service.AuthenticationService" %>
<%@ page import="org.dspace.authenticate.AuthenticationMethod" %>
<%@ page import="org.dspace.core.Context" %>
<%@ page import="org.dspace.core.LogManager" %>
@@ -39,11 +40,10 @@
<table border="0" width="90%">
<tr>
<td align="left">
<%-- <H1>Log In to DSpace</H1> --%>
<h1><fmt:message key="jsp.login.chooser.heading"/></h1>
</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>
</tr>
</table>
@@ -54,7 +54,8 @@
<h2><fmt:message key="jsp.login.chooser.chooseyour"/></h2>
<ul>
<%
Iterator ai = AuthenticationServiceImpl.authenticationMethodIterator();
AuthenticationService authenticationService = AuthenticateServiceFactory.getInstance().getAuthenticationService();
Iterator ai = authenticationService.authenticationMethodIterator();
AuthenticationMethod am;
Context context = null;
try
@@ -64,9 +65,9 @@
String url = null;
while (ai.hasNext())
{
am = (AuthenticationMethod)ai.next();
if ((url = am.loginPageURL(context, request, response)) != null)
{
am = (AuthenticationMethod)ai.next();
if ((url = am.loginPageURL(context, request, response)) != null)
{
%>
<li><p><strong><a href="<%= url %>">
<%-- This kludge is necessary because fmt:message won't
@@ -74,7 +75,7 @@
<%= javax.servlet.jsp.jstl.fmt.LocaleSupport.getLocalizedMessage(pageContext, am.loginPageTitle(context)) %>
</a></strong></p></li>
<%
}
}
}
}
catch(SQLException se)