Project

General

Profile

« Previous | Next » 

Revision 7394

integrate ecoinformatics login with the CIlogon identity mapping flow so that a user is directed through the process with no manual navigation needed (at least in the url bar). https://redmine.dataone.org/issues/1480

View differences:

index.jsp
54 54
}
55 55
if (sessionId == null || !SessionService.getInstance().isSessionRegistered(sessionId)) {
56 56
	// redirect to the login page
57
	response.sendRedirect(STYLE_SKINS_URL + "/dev/login.html");
57
	response.sendRedirect(STYLE_SKINS_URL + "/dataone/login.jsp");
58 58
	return;
59 59
}
60 60
String userName = SessionService.getInstance().getRegisteredSession(sessionId).getUserName();
......
156 156
	<ul></ul>
157 157

  
158 158
	<div id="mapping">
159
		<p>Use this form to connect your old KNB account to your new DataONE identity. 
159
		<p>
160
		Use this form to connect your old <i>ecoinformatics</i> account to your new DataONE identity.
161
		</p>
162

  
163
		<p>
160 164
		You will need to be logged into both systems at the same time in order for the mapping to take place.
161 165
		</p>
162
		
163
		Your current KNB account:
166

  
167
		<br/>
168

  
169
		Your current ecoinformatics account (<a href="<%=SERVLET_URL %>?action=logout&qformat=dataone">logout</a>):
164 170
		<div>
165 171
		<%=userName %>
166 172
		</div>
173

  
167 174
		<br/>
168 175

  
169 176
		Will be mapped to this DataONE account*: 

Also available in: Unified diff