CFID-346: hide approval buttons if there is an error

Change-Id: Ib37a6dbe20f8a30821a06205d7c4949e58b87eac
cloudfoundry · Jul 21, 2012 · 41a9f0e · 41a9f0e
1 parent ec5774a
commit 41a9f0e
Showing 1 changed file with 35 additions and 32 deletions.
diff --git a/uaa/src/main/webapp/WEB-INF/jsp/access_confirmation.jsp b/uaa/src/main/webapp/WEB-INF/jsp/access_confirmation.jsp
@@ -104,41 +104,44 @@ img.gsc-branding-img,img.gsc-branding-img-noclear,img.gcsc-branding-img,img.gcsc
 					<p>${error}</p>
 				</div>
 			</c:if>
+			<c:if test="${error==null}">
 
-			<h2>Please Confirm</h2>
+				<h2>Please Confirm</h2>
 
-			<div class="confirm">
-				<p>
-					Do you authorize the application '${client.clientId}' at <a
-						href="${redirect_uri}">${redirect_uri}</a> to access your Cloud
-					Foundry resources?
-				</p>
-				<ul>
-					<c:forEach items="${scopes}" var="scope">
-						<li><spring:message code="${scope['code']}"
-								text="${scope['text']}" /></li>
-					</c:forEach>
-				</ul>
-				<p>If you do not recognize the application or the URL in the
-					link above you should deny access.</p>
-			</div>
-
-			<form id="confirmationForm" name="confirmationForm"
-				action="${options.confirm.path}" method="POST">
-				<input name="${options.confirm.key}"
-					value="${options.confirm.value}" type="hidden" />
-				<div class="buttons">
-					<button class="orange-button" type="submit">Authorize</button>
-				</div>
-			</form>
-			<form id="denialForm" name="denialForm" action="${options.deny.path}"
-				method="POST">
-				<input name="${options.deny.key}" value="${options.deny.value}"
-					type="hidden" />
-				<div class="buttons">
-					<button class="gray-button" type="submit">Deny</button>
+				<div class="confirm">
+					<p>
+						Do you authorize the application '${client.clientId}' at <a
+							href="${redirect_uri}">${redirect_uri}</a> to access your Cloud
+						Foundry resources?
+					</p>
+					<ul>
+						<c:forEach items="${scopes}" var="scope">
+							<li><spring:message code="${scope['code']}"
+									text="${scope['text']}" /></li>
+						</c:forEach>
+					</ul>
+					<p>If you do not recognize the application or the URL in the
+						link above you should deny access.</p>
 				</div>
-			</form>
+
+				<form id="confirmationForm" name="confirmationForm"
+					action="${options.confirm.path}" method="POST">
+					<input name="${options.confirm.key}"
+						value="${options.confirm.value}" type="hidden" />
+					<div class="buttons">
+						<button class="orange-button" type="submit">Authorize</button>
+					</div>
+				</form>
+				<form id="denialForm" name="denialForm"
+					action="${options.deny.path}" method="POST">
+					<input name="${options.deny.key}" value="${options.deny.value}"
+						type="hidden" />
+					<div class="buttons">
+						<button class="gray-button" type="submit">Deny</button>
+					</div>
+				</form>
+
+			</c:if>
 
 		</div>
 		<div class="footer"