[java-identity-provider COMMIT] in /trunk/idp-war/src/main/webapp: index.jsp x509-prompt.jsp

Tue May 5 22:13:17 EDT 2015

Author: scantor
Date: Tue May  5 22:13:17 2015
New Revision: 7495

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=7495&view=rev
Log:
IDP-681 - index.jsp in webapp needs property replacement for logo

Modified:
    trunk/idp-war/src/main/webapp/index.jsp
    trunk/idp-war/src/main/webapp/x509-prompt.jsp

Modified: trunk/idp-war/src/main/webapp/index.jsp
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-war/src/main/webapp/index.jsp?rev=7495&r1=7494&r2=7495&view=diff
==============================================================================

--- trunk/idp-war/src/main/webapp/index.jsp	(original)
+++ trunk/idp-war/src/main/webapp/index.jsp	Tue May  5 22:13:17 2015
@@ -4,7 +4,7 @@
 <html>
   <head>
     <meta charset="utf-8">
-    <title><spring:message code="${root.title}" text="Shibboleth IdP" /></title>
+    <title><spring:message code="root.title" text="Shibboleth IdP" /></title>
     <link rel="stylesheet" type="text/css" href="<%= request.getContextPath()%>/css/main.css">
   </head>
 
@@ -12,17 +12,17 @@
     <div class="wrapper">
       <div class="container">
         <header>
-          <a class="logo" href="../images/dummylogo.png"><img src="<%= request.getContextPath() %>/images/dummylogo.png" alt="Replace or remove this logo"></a>
+          <img src="<%= request.getContextPath() %><spring:message code="idp.logo" />" alt="<spring:message code="idp.logo.alt-text" text="logo" />">
         </header>
     
         <div class="content">
-          <h2><spring:message code="${root.message}" text="No services are available at this location." /></h2>
+          <h2><spring:message code="root.message" text="No services are available at this location." /></h2>
         </div>
       </div>
 
       <footer>
         <div class="container container-footer">
-          <p><spring:message code="${root.footer}" text="Insert your footer text here." /></p>
+          <p class="footer-text"><spring:message code="root.footer" text="Insert your footer text here." /></p>
         </div>
       </footer>
     </div>

Modified: trunk/idp-war/src/main/webapp/x509-prompt.jsp
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-war/src/main/webapp/x509-prompt.jsp?rev=7495&r1=7494&r2=7495&view=diff
==============================================================================
--- trunk/idp-war/src/main/webapp/x509-prompt.jsp	(original)
+++ trunk/idp-war/src/main/webapp/x509-prompt.jsp	Tue May  5 22:13:17 2015
@@ -1,3 +1,4 @@
+<%@ taglib uri="http://www.springframework.org/tags" prefix="spring" %>
 <%@ taglib uri="urn:mace:shibboleth:2.0:idp:ui" prefix="idpui" %>
 <%@ page import="javax.servlet.http.Cookie" %>
 <%@ page import="org.opensaml.profile.context.ProfileRequestContext" %>
@@ -30,7 +31,7 @@
 <html>
   <head>
     <meta charset="utf-8">
-    <title>Example Login Page</title>
+    <title><spring:message code="idp.title" text="Web Login Service" /></title>
     <link rel="stylesheet" type="text/css" href="<%= request.getContextPath()%>/css/main.css">
   </head>
 
@@ -38,7 +39,7 @@
     <div class="wrapper">
       <div class="container">
         <header>
-          <a class="logo" href="../images/dummylogo.png"><img src="<%= request.getContextPath() %>/images/dummylogo.png" alt="Replace or remove this logo"></a>
+          <img src="<%= request.getContextPath() %><spring:message code="idp.logo" />" alt="<spring:message code="idp.logo.alt-text" text="logo" />">
         </header>
     
         <div class="content">
@@ -50,7 +51,7 @@
 
               <% if (identifiedRP) { %>
                 <legend>
-                  Log in to <idpui:serviceName uiContext="<%= rpUIContext %>"/>
+                  <spring:message code="idp.login.loginTo" text="Login to" /> <idpui:serviceName uiContext="<%= rpUIContext %>"/>
                 </legend>
               <% } %>
               
@@ -102,7 +103,7 @@
 
       <footer>
         <div class="container container-footer">
-          <p class="footer-text">Insert your footer text here.</p>
+          <p class="footer-text"><spring:message code="root.footer" text="Insert your footer text here." /></p>
         </div>
       </footer>
     </div>

