[java-identity-provider COMMIT] in /trunk/idp-conf/src/main/resources: system/views/client-storage/client-storage-rea...

noreply at shibboleth.net noreply at shibboleth.net
Thu Mar 31 15:27:24 EDT 2016 

Author: scantor
Date: Thu Mar 31 15:27:23 2016
New Revision: 8189

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=8189&view=rev
Log:
IDP-919 - Customization of client-storage views isn't practical

https://issues.shibboleth.net/jira/browse/IDP-919

Added:
    trunk/idp-conf/src/main/resources/system/views/client-storage/read.vm
      - copied, changed from r8183, trunk/idp-conf/src/main/resources/system/views/client-storage/client-storage-read.vm
    trunk/idp-conf/src/main/resources/system/views/client-storage/write.vm
      - copied, changed from r8183, trunk/idp-conf/src/main/resources/system/views/client-storage/client-storage-write.vm
    trunk/idp-conf/src/main/resources/views/client-storage/
    trunk/idp-conf/src/main/resources/views/client-storage/client-storage-read.vm   (with props)
    trunk/idp-conf/src/main/resources/views/client-storage/client-storage-write.vm   (with props)
Modified:
    trunk/idp-conf/src/main/resources/system/views/client-storage/client-storage-read.vm
    trunk/idp-conf/src/main/resources/system/views/client-storage/client-storage-write.vm

Copied: trunk/idp-conf/src/main/resources/system/views/client-storage/read.vm (from r8183, trunk/idp-conf/src/main/resources/system/views/client-storage/client-storage-read.vm)
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/system/views/client-storage/read.vm?p2=trunk/idp-conf/src/main/resources/system/views/client-storage/read.vm&p1=trunk/idp-conf/src/main/resources/system/views/client-storage/client-storage-read.vm&r1=8183&r2=8189&rev=8189&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/system/views/client-storage/client-storage-read.vm	(original)
+++ trunk/idp-conf/src/main/resources/system/views/client-storage/read.vm	Thu Mar 31 15:27:23 2016
@@ -11,64 +11,34 @@
 ## request - HttpServletRequest
 ## response - HttpServletResponse
 ## environment - Spring Environment object for property resolution
-#set ($title = $springMacroRequestContext.getMessage("idp.title", "Web Login Service"))
-#set ($titleSuffix = $springMacroRequestContext.getMessage("idp.client-storage-read.suffix", "Loading Session Information"))
 ##
-<!DOCTYPE html>
-<html>
-    <head>
-        <meta charset="utf-8" />
-        <title>$title - $titleSuffix</title>
-        <link rel="stylesheet" type="text/css" href="$request.getContextPath()/css/main.css">
-        <script>
-        <!--
-        #include( "client-storage/local-storage-read.js" )
+## This is the generated form containing a field set for each storage service,
+## pairing with the doLoad() function that populates the fields.
+##
+<form name="form1" action="${flowExecutionUrl}" method="post">
+    #foreach ($key in $loadContext.getStorageKeys())
+        <input name="shib_idp_ls_exception.$key" type="hidden" />
+        <input name="shib_idp_ls_success.$key" type="hidden" value="false" />
+        <input name="shib_idp_ls_value.$key" type="hidden" />
+    #end
+    <input name="shib_idp_ls_supported" type="hidden" />
+    <input name="_eventId_proceed" type="hidden" />
+    <noscript>
+        <input type="submit" value="Continue" />
+    </noscript>
+</form>
 
-        function doLoad() {
-            var localStorageSupported = isLocalStorageSupported();
-            document.form1["shib_idp_ls_supported"].value = localStorageSupported;
-            if (localStorageSupported) {
-            #foreach ($key in $loadContext.getStorageKeys())
-                readLocalStorage("$key");
-            #end
-            }
-            document.form1.submit();
-        }
-        // -->
-        </script>
-    </head>
-    <body onload="doLoad()">
-        <div class="wrapper">
-            <div class="container">
-                <header>
-                    <h3>$title - $titleSuffix</h3>
-                </header>
-                <div class="content">
-                $springMacroRequestContext.getMessage("idp.client-storage-read.text", "Loading login session information from the browser...")
-                </div>
-                <noscript>
-                    <div class="content">
-                    $springMacroRequestContext.getMessage("idp.client-storage.no-js", "Since your browser does not support JavaScript, you must press the Continue button once to proceed.")
-                    </div>
-                </noscript>
-                <form name="form1" action="${flowExecutionUrl}" method="post">
-                    #foreach ($key in $loadContext.getStorageKeys())
-                        <input name="shib_idp_ls_exception.$key" type="hidden" />
-                        <input name="shib_idp_ls_success.$key" type="hidden" value="false" />
-                        <input name="shib_idp_ls_value.$key" type="hidden" />
-                    #end
-                    <input name="shib_idp_ls_supported" type="hidden" />
-                    <input name="_eventId_proceed" type="hidden" />
-                    <noscript>
-                        <input type="submit" value="Continue" />

[... 116 lines stripped ...]

More information about the commits mailing list