Fixed formatting in JSPs
Amanda Anganes
parent
6e2baa3ec4
commit
5beac9d50d
|
|
@ -1,11 +1,7 @@
|
|||
<%@ page
|
||||
import="org.springframework.security.core.AuthenticationException"%>
|
||||
<%@ page
|
||||
import="org.springframework.security.oauth2.common.exceptions.UnapprovedClientAuthenticationException"%>
|
||||
<%@ page
|
||||
import="org.springframework.security.web.authentication.AbstractAuthenticationProcessingFilter"%>
|
||||
<%@ taglib prefix="authz"
|
||||
uri="http://www.springframework.org/security/tags"%>
|
||||
<%@ page import="org.springframework.security.core.AuthenticationException"%>
|
||||
<%@ page import="org.springframework.security.oauth2.common.exceptions.UnapprovedClientAuthenticationException"%>
|
||||
<%@ 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">×</a>
|
||||
|
||||
<p>
|
||||
<strong>Access could not be granted.</strong> (<%= ((AuthenticationException) session.getAttribute(AbstractAuthenticationProcessingFilter.SPRING_SECURITY_LAST_EXCEPTION_KEY)).getMessage() %>
|
||||
)
|
||||
<p><strong>Access could not be granted.</strong>
|
||||
(<%= ((AuthenticationException) session.getAttribute(AbstractAuthenticationProcessingFilter.SPRING_SECURITY_LAST_EXCEPTION_KEY)).getMessage() %>)
|
||||
</p>
|
||||
</div>
|
||||
<% } %>
|
||||
|
|
@ -52,30 +47,29 @@
|
|||
</li>
|
||||
</ul>
|
||||
</c:if>
|
||||
Do you authorize "
|
||||
<c:choose>
|
||||
Do you authorize
|
||||
"<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>
|
||||
" to sign you into their site using your identity?
|
||||
</c:choose>"
|
||||
to sign you into their site using your identity?
|
||||
<c:if test="${not empty client.clientDescription}">
|
||||
<div>
|
||||
<a class="small" href="#"
|
||||
onclick="$('#description').toggle('fast'); return false;"><i
|
||||
class="icon-chevron-right"></i> more information</a>
|
||||
<a class="small" href="#"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>
|
||||
<blockquote id="description" style="display: none">
|
||||
${client.clientDescription}
|
||||
</blockquote>
|
||||
</p>
|
||||
</c:if>
|
||||
<div>
|
||||
<small> <strong>Redirect URI: </strong>
|
||||
<c:out value="${redirect_uri}" />
|
||||
<small>
|
||||
<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
|
||||
type="checkbox" name="scope_${ scope.value }"
|
||||
id="scope_${ scope.value }" value="${ scope.value }"
|
||||
checked="checked"> <c:if
|
||||
test="${ not empty scope.icon }">
|
||||
<label for="scope_${ scope.value }" class="checkbox">
|
||||
<input type="checkbox" name="scope_${ scope.value }" id="scope_${ scope.value }" value="${ scope.value }" 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
|
||||
type="radio" name="remember" id="remember-forever"
|
||||
value="until-revoked" checked="checked"> remember this
|
||||
decision until I revoke it
|
||||
</label> <label for="remember-hour" class="radio"> <input
|
||||
type="radio" name="remember" id="remember-hour" value="one-hour">
|
||||
<label for="remember-forever" class="radio">
|
||||
<input type="radio" name="remember" id="remember-forever" value="until-revoked" checked="checked">
|
||||
remember this decision until I revoke it
|
||||
</label>
|
||||
<label for="remember-hour" class="radio">
|
||||
<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
|
||||
type="radio" name="remember" id="remember-not" value="none">
|
||||
</label>
|
||||
<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"
|
||||
value="true" type="hidden" /> <input name="authorize"
|
||||
value="Authorize" type="submit"
|
||||
onclick="$('#user_oauth_approval').attr('value',true)"
|
||||
class="btn btn-success btn-large" /> <input name="deny"
|
||||
value="Deny" type="submit"
|
||||
onclick="$('#user_oauth_approval').attr('value',false)"
|
||||
<input id="user_oauth_approval" name="user_oauth_approval" value="true" type="hidden" />
|
||||
<input name="authorize" value="Authorize" type="submit"
|
||||
onclick="$('#user_oauth_approval').attr('value',true)" class="btn btn-success btn-large" />
|
||||
|
||||
<input name="deny" value="Deny" type="submit" onclick="$('#user_oauth_approval').attr('value',false)"
|
||||
class="btn btn-secondary btn-large" />
|
||||
</div>
|
||||
|
||||
</form>
|
||||
|
||||
|
||||
</div>
|
||||
</div>
|
||||
<o:footer/>
|
||||
|
|
|
|||
|
|
@ -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"
|
||||
uri="http://www.springframework.org/security/tags"%>
|
||||
<%@ taglib prefix="security" uri="http://www.springframework.org/security/tags"%>
|
||||
|
||||
<o:header title="welcome" />
|
||||
<o:topbar />
|
||||
|
|
|
|||
|
|
@ -1,5 +1,4 @@
|
|||
<%@ taglib prefix="authz"
|
||||
uri="http://www.springframework.org/security/tags"%>
|
||||
<%@ 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="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
|
||||
in. Please try again.</div>
|
||||
<div class="alert alert-error">The system was unable to log you in. Please try again.</div>
|
||||
</c:if>
|
||||
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue