[java-identity-provider COMMIT] in /trunk/idp-conf/src/main/resources: messages/authn-messages.properties messages/co...

Sat Nov 22 01:15:05 EST 2014

Author: scantor
Date: Sat Nov 22 01:15:05 2014
New Revision: 6991

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=6991&view=rev
Log:
Prep login page for i18n and fix up login error display.

Added:
    trunk/idp-conf/src/main/resources/views/login-error.vm   (with props)
Modified:
    trunk/idp-conf/src/main/resources/messages/authn-messages.properties
    trunk/idp-conf/src/main/resources/messages/consent-messages.properties
    trunk/idp-conf/src/main/resources/views/login.vm

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=6991&r1=6990&r2=6991&view=diff
==============================================================================

--- trunk/idp-conf/src/main/resources/messages/authn-messages.properties (original)
+++ trunk/idp-conf/src/main/resources/messages/authn-messages.properties Sat Nov 22 01:15:05 2014
@@ -1,0 +1,28 @@
+# Login / Logout messages
+
+idp.login.loginTo = Login to
+
+idp.login.username = Username
+idp.login.password = Password
+
+idp.login.donotcache = Don't Remember Login
+
+idp.login.login = Login
+
+idp.login.forgotPassword = Forgot your password?
+idp.login.needHelp = Need Help?
+
+# Classified Error messages
+
+UnknownUsername = bad-username
+InvalidPassword = bad-password
+ExpiredPassword = expired-password
+AccountLocked = account-locked
+
+bad-username.message = The username you entered cannot be identified.
+
+bad-password.message = The password you entered was incorrect.
+
+expired-password.message = Your password has expired.
+
+account-locked.message = Your account is locked.

Modified: trunk/idp-conf/src/main/resources/messages/consent-messages.properties
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/messages/consent-messages.properties?rev=6991&r1=6990&r2=6991&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/messages/consent-messages.properties (original)
+++ trunk/idp-conf/src/main/resources/messages/consent-messages.properties Sat Nov 22 01:15:05 2014
@@ -41,6 +41,8 @@
 
 # Messages related to attribute release consent.
 
+idp.attribute-release.revoke					   = Clear prior granting of permission for release of your information to this service.
+
 idp.attribute-release.title                        = Information Release
 
 idp.attribute-release.attributesHeader             = Information to be Provided to Service

Modified: trunk/idp-conf/src/main/resources/views/login.vm
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/views/login.vm?rev=6991&r1=6990&r2=6991&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/views/login.vm (original)
+++ trunk/idp-conf/src/main/resources/views/login.vm Sat Nov 22 01:15:05 2014
@@ -5,72 +5,62 @@
 ## flowExecutionUrl - the form action location
 ## flowRequestContext - the Spring Web Flow RequestContext
 ## rpUIContext - the context with SP UI information from the metadata
-## flowExecutionKey - the SWF execution key (this is built into the flowExecutionUrl)
 ## encoder - HTMLEncoder class
 ## request - HttpServletRequest
 ## response - HttpServletResponse
-
-#set ( $username = $authenticationContext.getSubcontext('net.shibboleth.idp.authn.context.UsernamePasswordContext', true).getUsername() )
-#set ( $rpContext = $profileRequestContext.getSubcontext('net.shibboleth.idp.profile.context.RelyingPartyContext') )
+##
+#set ($rpContext = $profileRequestContext.getSubcontext('net.shibboleth.idp.profile.context.RelyingPartyContext'))
+#set ($username = $authenticationContext.getSubcontext('net.shibboleth.idp.authn.context.UsernamePasswordContext', true).getUsername())
 <html>
   	<head>
     	<meta charset="utf-8" />
-    	<title>Example Login Page</title>
+    	<title>#springMessageText("idp.title", "Web Login Service")</title>
     	<link rel="stylesheet" type="text/css" href="$request.getContextPath()/css/main.css"/>
   	</head>
-
   	<body>
     <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()/images/dummylogo.png" alt="#springMessageText("idp.logo.alt-text", "logo")"/>
         </header>
 
         <div class="content">
           <div class="column one">
             <form action="$flowExecutionUrl" method="post">
-              #if ( $authenticationErrorContext && $authenticationErrorContext.getClassifiedErrors().size() > 0 )
-                <p class="form-element form-error">
-                ERROR: $encoder.encodeForHTML($authenticationErrorContext.getClassifiedErrors().toString())
-                </p>
-              #elseif ( $authenticationErrorContext && $authenticationErrorContext.getExceptions().size() > 0 )

[... 93 lines stripped ...]
