Fixed formatting in JSPs

openid-connect-server/src/main/webapp/WEB-INF/views/approve.jsp

@@ -1,11 +1,7 @@
-<%@ page
+<%@ page import="org.springframework.security.core.AuthenticationException"%>
-	import="org.springframework.security.core.AuthenticationException"%>
+<%@ page import="org.springframework.security.oauth2.common.exceptions.UnapprovedClientAuthenticationException"%>
-<%@ page
+<%@ page import="org.springframework.security.web.authentication.AbstractAuthenticationProcessingFilter"%>
-	import="org.springframework.security.oauth2.common.exceptions.UnapprovedClientAuthenticationException"%>
+<%@ taglib prefix="authz" uri="http://www.springframework.org/security/tags"%>
-<%@ page
-	import="org.springframework.security.web.authentication.AbstractAuthenticationProcessingFilter"%>
-<%@ taglib prefix="authz"
-	uri="http://www.springframework.org/security/tags"%>
 <%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%>
 <%@ taglib prefix="o" tagdir="/WEB-INF/tags"%>
 <o:header title="Approve Access" />
@@ -15,9 +11,8 @@
 	<div class="alert-message error">
 		<a href="#" class="close">&times;</a>
 
-		<p>
+		<p><strong>Access could not be granted.</strong> 
-			<strong>Access could not be granted.</strong> (<%= ((AuthenticationException) session.getAttribute(AbstractAuthenticationProcessingFilter.SPRING_SECURITY_LAST_EXCEPTION_KEY)).getMessage() %>
+			(<%= ((AuthenticationException) session.getAttribute(AbstractAuthenticationProcessingFilter.SPRING_SECURITY_LAST_EXCEPTION_KEY)).getMessage() %>)
-			)
 		</p>
 	</div>
 	<% } %>
@@ -52,30 +47,29 @@
 							</li>
 						</ul>
 					</c:if>
-					Do you authorize "
+					Do you authorize 
-					<c:choose>
+					"<c:choose>
 						<c:when test="${empty client.clientName}">
 							<c:out value="${client.clientId}" />
 						</c:when>
 						<c:otherwise>
 							<c:out value="${client.clientName}" />
 						</c:otherwise>
-					</c:choose>
+					</c:choose>"
-					" to sign you into their site using your identity?
+					to sign you into their site using your identity?
 					<c:if test="${not empty client.clientDescription}">
 						<div>
-							<a class="small" href="#"
+							<a class="small" href="#"onclick="$('#description').toggle('fast'); return false;"><i class="icon-chevron-right"></i> more information</a>
-								onclick="$('#description').toggle('fast'); return false;"><i
-								class="icon-chevron-right"></i> more information</a>
 						</div>
 						<p>
 							<blockquote id="description" style="display: none">
-							${client.clientDescription}</blockquote>
+								${client.clientDescription}
+							</blockquote>
 						</p>
 					</c:if>
 					<div>
-						<small> <strong>Redirect URI: </strong>
+						<small> 
-						<c:out value="${redirect_uri}" />
+							<strong>Redirect URI: </strong><c:out value="${redirect_uri}" />
 						</small>
 					</div>
 				</div>
@@ -85,13 +79,12 @@
 
 						<c:forEach var="scope" items="${ scopes }">
 
-							<label for="scope_${ scope.value }" class="checkbox"> <input
+							<label for="scope_${ scope.value }" class="checkbox"> 
-								type="checkbox" name="scope_${ scope.value }"
+								<input type="checkbox" name="scope_${ scope.value }" id="scope_${ scope.value }" value="${ scope.value }" checked="checked"> 
-								id="scope_${ scope.value }" value="${ scope.value }"
+								<c:if test="${ not empty scope.icon }">
-								checked="checked"> <c:if
-									test="${ not empty scope.icon }">
 									<i class="icon-${ scope.icon }"></i>
-								</c:if> <c:choose>
+								</c:if> 
+								<c:choose>
 									<c:when test="${ not empty scope.description }">
 										${ scope.description }
 									</c:when>
@@ -107,15 +100,16 @@
 
 					<fieldset style="text-align: left" class="well">
 						<legend style="margin-bottom: 0;">Remember this decision:</legend>
-						<label for="remember-forever" class="radio"> <input
+						<label for="remember-forever" class="radio"> 
-							type="radio" name="remember" id="remember-forever"
+						<input type="radio" name="remember" id="remember-forever" value="until-revoked" checked="checked"> 
-							value="until-revoked" checked="checked"> remember this
+							remember this decision until I revoke it
-							decision until I revoke it
+						</label> 
-						</label> <label for="remember-hour" class="radio"> <input
+						<label for="remember-hour" class="radio"> 
-							type="radio" name="remember" id="remember-hour" value="one-hour">
+						<input type="radio" name="remember" id="remember-hour" value="one-hour">
 							remember this decision for one hour
-						</label> <label for="remember-not" class="radio"> <input
+						</label> 
-							type="radio" name="remember" id="remember-not" value="none">
+						<label for="remember-not" class="radio"> 
+						<input type="radio" name="remember" id="remember-not" value="none">
 							prompt me again next time
 						</label>
 					</fieldset>
@@ -123,21 +117,17 @@
 
 			</div>
 
-
 			<div class="row">
-				<input id="user_oauth_approval" name="user_oauth_approval"
+				<input id="user_oauth_approval" name="user_oauth_approval" value="true" type="hidden" /> 
-					value="true" type="hidden" /> <input name="authorize"
+					<input name="authorize" value="Authorize" type="submit"
-					value="Authorize" type="submit"
+					onclick="$('#user_oauth_approval').attr('value',true)" class="btn btn-success btn-large" /> 
-					onclick="$('#user_oauth_approval').attr('value',true)"
+					&nbsp; 
-					class="btn btn-success btn-large" /> &nbsp; <input name="deny"
+					<input name="deny" value="Deny" type="submit" onclick="$('#user_oauth_approval').attr('value',false)"
-					value="Deny" type="submit"
-					onclick="$('#user_oauth_approval').attr('value',false)"
 					class="btn btn-secondary btn-large" />
 			</div>
 
 		</form>
 
-
 	</div>
 </div>
 <o:footer/>

openid-connect-server/src/main/webapp/WEB-INF/views/home.jsp

@@ -1,7 +1,6 @@
 <%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%>
 <%@ taglib prefix="o" tagdir="/WEB-INF/tags"%>
-<%@ taglib prefix="security"
+<%@ taglib prefix="security" uri="http://www.springframework.org/security/tags"%>
-	uri="http://www.springframework.org/security/tags"%>
 
 <o:header title="welcome" />
 <o:topbar />

openid-connect-server/src/main/webapp/WEB-INF/views/login.jsp

@@ -1,5 +1,4 @@
-<%@ taglib prefix="authz"
+<%@ taglib prefix="authz" uri="http://www.springframework.org/security/tags"%>
-	uri="http://www.springframework.org/security/tags"%>
 <%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%>
 <%@ taglib prefix="o" tagdir="/WEB-INF/tags"%>
 <o:header title="Log In" />
@@ -18,8 +17,7 @@ $(document).ready(function() {
 	<h1>Login with Username and Password</h1>
 
 	<c:if test="${ param.error != null }">
-		<div class="alert alert-error">The system was unable to log you
+		<div class="alert alert-error">The system was unable to log you in. Please try again.</div>
-			in. Please try again.</div>
 	</c:if>