Changeset 36914 for main

Timestamp:

2022-11-22T14:53:10+13:00 (17 months ago)

Author:

kjdon

Message:

dynamically decide on cookie-consent path - use cookie_path if it is set (in servlets.xml) otherwise use servlet_context - set by LibraryServlet in config_params,a nd then passed in to xslt

Location:

main/trunk/greenstone3/web/interfaces/default

Files:

• js/cookieconsent-init.js (modified) (1 diff)
• transform/gslib.xsl (modified) (2 diffs)
• transform/javascript-global-setup.xsl (modified) (1 diff)

main/trunk/greenstone3/web/interfaces/default/js/cookieconsent-init.js

@@ -16 +16 @@
     autoclear_cookies: false,                  // default: false
     page_scripts: true,                        // default: false
-    cookie_path: '/greenstone3',               // default: root ( / )
+    cookie_path: gs.xsltParams.cookie_path,               // default: root ( / )
     gui_options: {
         consent_modal: {

main/trunk/greenstone3/web/interfaces/default/transform/gslib.xsl

@@ -21 +21 @@
   <xsl:param name="library_name"/>
   <xsl:param name="servlet_url_prefix"/>
+  <xsl:param name="servlet_context"/>
   <xsl:param name="site_name"/>
   <xsl:param name="use_client_side_xslt"/>
@@ -28 +29 @@
   <xsl:param name="favouritebasket"/>
   <xsl:param name="documentbasket"/>
-
+  <xsl:param name="cookie_path"/>
   <xsl:variable name="unselected_favourite_icon">favourite-star-transparent-unselected32.png</xsl:variable>
   <xsl:variable name="selected_favourite_icon">favourite-star-transparent-selected32.png</xsl:variable>

main/trunk/greenstone3/web/interfaces/default/transform/javascript-global-setup.xsl

@@ -52 +52 @@
             <xsl:text disable-output-escaping="yes">gs.xsltParams.use_client_side_xslt = "</xsl:text><xsl:value-of select="$use_client_side_xslt"/><xsl:text disable-output-escaping="yes">";</xsl:text>
             <xsl:text disable-output-escaping="yes">gs.xsltParams.filepath = "</xsl:text><xsl:value-of select="$filepath"/><xsl:text disable-output-escaping="yes">";</xsl:text>
+            <xsl:text disable-output-escaping="yes">gs.xsltParams.cookie_path = "</xsl:text><xsl:choose><xsl:when test="$cookie_path"><xsl:value-of select="$cookie_path"/></xsl:when><xsl:otherwise><xsl:value-of select="$servlet_context"/></xsl:otherwise></xsl:choose><xsl:text disable-output-escaping="yes">";</xsl:text>
         </script>
     </xsl:template>