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

[noreply at shibboleth.net]

Author: scantor
Date: Mon Feb  9 21:33:50 2015
New Revision: 7331

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=7331&view=rev
Log:
IDP-560 - make "defaultlogo.png" file name settable by property

Modified:
    trunk/idp-conf/src/main/resources/messages/error-messages.properties
    trunk/idp-conf/src/main/resources/views/error.vm
    trunk/idp-conf/src/main/resources/views/expiring-password.vm
    trunk/idp-conf/src/main/resources/views/intercept/attribute-release.vm
    trunk/idp-conf/src/main/resources/views/intercept/terms-of-use.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/messages/error-messages.properties
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/messages/error-messages.properties?rev=7331&r1=7330&r2=7331&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/messages/error-messages.properties (original)
+++ trunk/idp-conf/src/main/resources/messages/error-messages.properties Mon Feb  9 21:33:50 2015
@@ -3,6 +3,7 @@
 # General strings
 idp.title = Web Login Service
 idp.title.suffix = Error
+idp.logo = /images/dummylogo.png
 idp.logo.alt-text = Replace or remove this logo
 idp.message = An unidentified error occurred.
 idp.footer = Insert your footer text here.

Modified: trunk/idp-conf/src/main/resources/views/error.vm
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/views/error.vm?rev=7331&r1=7330&r2=7331&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/views/error.vm (original)
+++ trunk/idp-conf/src/main/resources/views/error.vm Mon Feb  9 21:33:50 2015
@@ -48,7 +48,7 @@
     <div class="wrapper">
     	<div class="container">
         	<header>
-				<img src="$request.getContextPath()/images/dummylogo.png" alt="#springMessageText("idp.logo.alt-text", "logo")">
+				<img src="$request.getContextPath()#springMessage("idp.logo")" alt="#springMessageText("idp.logo.alt-text", "logo")">
 				<h3>$title - $titleSuffix</h3>
 			</header>
 		

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=7331&r1=7330&r2=7331&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/views/expiring-password.vm (original)
+++ trunk/idp-conf/src/main/resources/views/expiring-password.vm Mon Feb  9 21:33:50 2015
@@ -28,7 +28,7 @@
       <div class="wrapper">
         <div class="container">
             <header>
-                <img src="$request.getContextPath()/images/dummylogo.png" alt="#springMessageText("idp.logo.alt-text", "logo")">
+                <img src="$request.getContextPath()#springMessage("idp.logo")" alt="#springMessageText("idp.logo.alt-text", "logo")">
                 <h3>#springMessageText("idp.login.expiringSoon", "Your password will be expiring soon!")</h3>
             </header>
         

Modified: trunk/idp-conf/src/main/resources/views/intercept/attribute-release.vm
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/views/intercept/attribute-release.vm?rev=7331&r1=7330&r2=7331&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/views/intercept/attribute-release.vm (original)
+++ trunk/idp-conf/src/main/resources/views/intercept/attribute-release.vm Mon Feb  9 21:33:50 2015
@@ -35,7 +35,7 @@
         <form action="$flowExecutionUrl" method="post" style="padding:10px" >
             <div class="box">
                 <header>
-                    <img src="$request.getContextPath()/images/dummylogo.png" alt="#springMessageText("idp.logo.alt-text", "logo")" class="federation_logo">
+                    <img src="$request.getContextPath()#springMessage("idp.logo")" alt="#springMessageText("idp.logo.alt-text", "logo")" class="federation_logo">
                     #if ($rpOrganizationLogo)
                         <img src="$encoder.encodeForHTMLAttribute($rpOrganizationLogo)" alt="logo for $encoder.encodeForHTMLAttribute($serviceName)" class="organization_logo">
                     #end

Modified: trunk/idp-conf/src/main/resources/views/intercept/terms-of-use.vm
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/views/intercept/terms-of-use.vm?rev=7331&r1=7330&r2=7331&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/views/intercept/terms-of-use.vm (original)
+++ trunk/idp-conf/src/main/resources/views/intercept/terms-of-use.vm Mon Feb  9 21:33:50 2015
@@ -26,7 +26,7 @@
     <body>
         <div class="box">
             <header>

[... 36 lines stripped ...]