[java-identity-provider COMMIT] in /trunk/idp-conf/src/main/resources: flows/authn/conditions/expiring-password/expir...

[noreply at shibboleth.net]

Author: scantor
Date: Sun Nov 23 15:18:08 2014
New Revision: 6993

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=6993&view=rev
Log:
Add i18n to more templates, fix up some comments.

Modified:
    trunk/idp-conf/src/main/resources/flows/authn/conditions/expiring-password/expiring-password-flow.xml
    trunk/idp-conf/src/main/resources/messages/authn-messages.properties
    trunk/idp-conf/src/main/resources/views/expiring-password.vm
    trunk/idp-conf/src/main/resources/views/login.vm
    trunk/idp-conf/src/main/resources/views/logout.vm

Modified: trunk/idp-conf/src/main/resources/flows/authn/conditions/expiring-password/expiring-password-flow.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/flows/authn/conditions/expiring-password/expiring-password-flow.xml?rev=6993&r1=6992&r2=6993&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/flows/authn/conditions/expiring-password/expiring-password-flow.xml (original)
+++ trunk/idp-conf/src/main/resources/flows/authn/conditions/expiring-password/expiring-password-flow.xml Sun Nov 23 15:18:08 2014
@@ -2,7 +2,11 @@
       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
       xsi:schemaLocation="http://www.springframework.org/schema/webflow http://www.springframework.org/schema/webflow/spring-webflow.xsd">
 
-    <!-- This is a placeholder flow that does nothing out of the box but reserves a subflow ID. -->
+    <!--
+    This is an example flow that displays a view template in response to an expiring password.
+    The view might display a pointer to the password change portal while automatically continuing
+    after a few seconds.
+    -->
 
     <!-- Rudimentary impediment to direct execution of subflow. -->
     <input name="calledAsSubflow" type="boolean" required="true" />

Modified: trunk/idp-conf/src/main/resources/messages/authn-messages.properties
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/messages/authn-messages.properties?rev=6993&r1=6992&r2=6993&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/messages/authn-messages.properties (original)
+++ trunk/idp-conf/src/main/resources/messages/authn-messages.properties Sun Nov 23 15:18:08 2014
@@ -12,7 +12,15 @@
 idp.login.forgotPassword = Forgot your password?
 idp.login.needHelp = Need Help?
 
-# Classified Error messages
+# Expiring password example messages
+
+idp.login.expiringSoon = Your password will be expiring soon!
+idp.login.changePassword = To create a new password now, go to
+idp.login.proceedBegin = Your login will proceed in 20 seconds or you may click
+idp.login.proceedHere = here
+idp.login.proceedEnd = to continue
+
+# Classified Login Error messages
 
 UnknownUsername = bad-username
 InvalidPassword = bad-password

Modified: trunk/idp-conf/src/main/resources/views/expiring-password.vm
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/views/expiring-password.vm?rev=6993&r1=6992&r2=6993&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/views/expiring-password.vm (original)
+++ trunk/idp-conf/src/main/resources/views/expiring-password.vm Sun Nov 23 15:18:08 2014
@@ -2,7 +2,14 @@
 ## Velocity Template for expiring password view
 ##
 ## Velocity context will contain the following properties
+## flowExecutionUrl - the form action location
 ## flowRequestContext - the Spring Web Flow RequestContext
+## flowExecutionKey - the SWF execution key (this is built into the flowExecutionUrl)
+## profileRequestContext - root of context tree
+## authenticationContext - context with authentication request information
+## authenticationErrorContext - context with login error state
+## authenticationWarningContext - context with login warning state
+## ldapResponseContext - context with LDAP state (if using native LDAP)
 ## encoder - HTMLEncoder class
 ## request - HttpServletRequest
 ## response - HttpServletResponse
@@ -10,7 +17,7 @@
 <html>
     <head>
         <meta charset="utf-8" />
-        <title>Web Login Service</title>
+        <title>#springMessageText("idp.title", "Web Login Service")</title>
         <link rel="stylesheet" type="text/css" href="$request.getContextPath()/css/main.css"/>
         <meta http-equiv="refresh" content="20;url=$flowExecutionUrl&_eventId_proceed=1"/>
     </head>
@@ -19,23 +26,23 @@
       <div class="wrapper">
         <div class="container">
             <header>
-                <img src="$request.getContextPath()/images/dummylogo.png" alt="Replace or remove this logo"/>
-                <h3>Your password will be expiring soon!</h3>
+                <img src="$request.getContextPath()/images/dummylogo.png" alt="#springMessageText("idp.logo.alt-text", "logo")"/>
+                <h3>#springMessageText("idp.login.expiringSoon", "Your password will be expiring soon!")</h3>
             </header>

[... 138 lines stripped ...]