github
/
OpenID-Connect-Java-Spring-Server
mirror of https://github.com/mitreid-connect/OpenID-Connect-Java-Spring-Server
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix date printing in approval page.

pull/763/head
Fredrik Jönsson 2015-02-05 11:01:28 +01:00
parent 323a860210
commit 86e4f4afe1
3 changed files with 21 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
openid-connect-server-webapp/src/main/resources/messages_en.properties
View File

@ -66,14 +66,11 @@ manage.title=Management Console
approve.title=Approve Access
approve.error.not_granted=Access could not be granted.
approve.required_for=Approval Required for
approve.dynamically_registered=This client was dynamically registered <span id="registrationTime"></span>.
approve.dynamically_registered=This client was dynamically registered
approve.caution=Caution
approve.caution.message.none=This software was dynamically registered <span id="registrationTime" class="label"></span> \
and it has never been approved previously.
approve.caution.message.singular=This software was dynamically registered <span id="registrationTime" class="label"></span> \
and it has been approved <span class="label">{0}</span> time previously.
approve.caution.message.plural=This software was dynamically registered <span id="registrationTime" class="label"></span> \
and it has been approved <span class="label">{0}</span> times previously.
approve.caution.message.none=It has never been approved previously.
approve.caution.message.singular=It has been approved <span class="label">{0}</span> time previously.
approve.caution.message.plural=It has been approved <span class="label">{0}</span> times previously.
approve.more_information=more information
approve.home_page=Home page
approve.policy=Policy

11
openid-connect-server-webapp/src/main/resources/messages_sv.properties
View File

@ -71,14 +71,11 @@ manage.title=Administrationsgränssnitt
approve.title=Medge åtkomst
approve.error.not_granted=Åtkomst kunde inte medges.
approve.required_for=Åtkomst måste medges för
approve.dynamically_registered=Denna klient blev registrerad dynamiskt <span id="registrationTime"></span>.
approve.dynamically_registered=Denna klient blev registrerad dynamiskt
approve.caution=Försiktigt
approve.caution.message.none=Denna klient blev registrerad dynamiskt <span id="registrationTime" class="label"></span> \
och har aldrig tidigare blivit medgiven åtkomst.
approve.caution.message.singular=Denna klient blev registrerad dynamiskt <span id="registrationTime" class="label"></span> \
och har tidigare blivit medgiven åtkomst <span class="label">{0}</span> gång.
approve.caution.message.plural=Denna klient blev registrerad dynamiskt <span id="registrationTime" class="label"></span> \
och har tidigare blivit medgiven åtkomst <span class="label">{0}</span> gånger.
approve.caution.message.none=Den har aldrig tidigare blivit medgiven åtkomst.
approve.caution.message.singular=Den har tidigare blivit medgiven åtkomst <span class="label">{0}</span> gång.
approve.caution.message.plural=Den har tidigare blivit medgiven åtkomst <span class="label">{0}</span> gånger.
approve.more_information=mer information
approve.home_page=Hemsida
approve.policy=Policy

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

@ -3,6 +3,7 @@
<%@ 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="fmt" uri="http://java.sun.com/jsp/jstl/fmt"%>
<%@ taglib prefix="o" tagdir="/WEB-INF/tags"%>
<%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions" %>
<%@ taglib prefix="spring" uri="http://www.springframework.org/tags"%>
@ -23,7 +24,7 @@
<c:remove scope="session" var="SPRING_SECURITY_LAST_EXCEPTION" />
<div class="well" style="text-align: center">
<h1><spring:message code="approve.required_for"/>
<h1><spring:message code="approve.required_for"/>&nbsp;
<c:choose>
<c:when test="${empty client.clientName}">
<em><c:out value="${client.clientId}" /></em>
@ -39,12 +40,19 @@
<div class="row">
<div class="span5 offset1 well-small" style="text-align: left">
<c:if test="${ client.dynamicallyRegistered }">
<fmt:formatDate type="both" value="${client.createdAt}" var="titleRegistrationTime"/>
<fmt:formatDate type="date" value="${client.createdAt}" var="registrationTime"/>
<c:choose>
<c:when test="${ gras }">
<!-- client is "generally recognized as safe, display a more muted block -->
<div><p class="alert alert-info"><i class="icon-globe"></i> <spring:message code="approve.dynamically_registered"/></p></div>
<div>
<p class="alert alert-info">
<i class="icon-globe"></i>
<spring:message code="approve.dynamically_registered"/>
<span id="registrationTime" title='<c:out value="${titleRegistrationTime}"/>'><c:out value="${registrationTime}"/></span>.
</p>
</div>
</c:when>
<c:otherwise>
<!-- client is dynamically registered -->
@ -52,6 +60,8 @@
<h4>
<i class="icon-globe"></i> <spring:message code="approve.caution"/>:
</h4>
<spring:message code="approve.dynamically_registered"/>
<span id="registrationTime" title='<c:out value="${titleRegistrationTime}"/>'><c:out value="${registrationTime}"/></span>.
<c:choose>
<c:when test="${count == 0}">
<spring:message code="approve.caution.message.none" arguments="${count}"/>
@ -284,25 +294,6 @@ $(document).ready(function() {
$('#toggleMoreInformation i').attr('class', 'icon-chevron-down');
}
});
var creationDate = "<c:out value="${ client.createdAt }" />";
var displayCreationDate = "Unknown";
var hoverCreationDate = "";
if (creationDate == null || !moment(creationDate).isValid()) {
displayCreationDate = "Unknown";
hoverCreationDate = "";
} else {
creationDate = moment(creationDate);
if (moment().diff(creationDate, 'months') < 6) {
displayCreationDate = creationDate.fromNow();
} else {
displayCreationDate = "on " + creationDate.format("MMMM Do, YYYY");
}
hoverCreationDate = creationDate.format("MMMM Do, YYYY [at] h:mmA")
}
$('#registrationTime').html(displayCreationDate);
$('#registrationTime').attr('title', hoverCreationDate);
});
//-->