Changeset 35999

Timestamp:

2022-01-13T14:59:13+13:00 (2 years ago)

Author:

cstephen

Message:

Begin adding cookie consent manager
Fix gs object initialization

Location:

main/trunk/greenstone3/web/interfaces/default_wip

Files:

• js/cookieconsent-init.js (added)
• js/cookieconsent.js (added)
• style/cookieconsent.css (added)
• transform/javascript-global-setup.xsl (modified) (1 diff)
• transform/layouts/header.xsl (modified) (2 diffs)
• transform/pages/pref.xsl (modified) (1 diff)

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

@@ -9 +9 @@
     <xsl:template name="setup-gs-variable">
         <script type="text/javascript">
-            gs = new Array();
-            gs.cgiParams = new Array();
-            gs.xsltParams = new Array();
-            gs.siteMetadata = new Array();
-            gs.collectionMetadata = new Array();
-            gs.documentMetadata = new Array();
-            gs.imageURLs = new Array();
-            gs.variables = new Array();
-            gs.requestInformation = new Array();
+            <xsl:text disable-output-escaping="yes">
+                if (typeof gs === "undefined" ) {
+                    gs={};
+                }
+                gs.cgiParams ??= {};
+                gs.xsltParams ??= {};
+                gs.siteMetadata ??= {};
+                gs.collectionMetadata ??= {};
+                gs.documentMetadata ??= {};
+                gs.imageURLs ??= {};
+                gs.variables ??= {};
+                gs.requestInformation ??= {};
+            </xsl:text>
         </script>
         <xsl:call-template name="populate-cgi-param-values"/>

main/trunk/greenstone3/web/interfaces/default_wip/transform/layouts/header.xsl

@@ -122 +122 @@
     <script type="text/javascript" src="interfaces/{$interface_name}/js/jquery.blockUI.js"><xsl:text> </xsl:text></script>
     <script type="text/javascript" src="interfaces/{$interface_name}/js/ace/ace.js"><xsl:text> </xsl:text></script>
-    
+    
+    <link rel="stylesheet" href="interfaces/{$interface_name}/style/cookieconsent.css" type="text/css"/>
+    <gslib:langfrag name="ccm" />
+    <script defer="true" type="text/javascript" src="interfaces/{$interface_name}/js/cookieconsent.js"><xsl:text> </xsl:text></script>
+    <script defer="true" type="text/javascript" src="interfaces/{$interface_name}/js/cookieconsent-init.js"><xsl:text> </xsl:text></script>
+
     <script type="text/javascript" src="interfaces/{$interface_name}/js/zoomer.js"><xsl:text> </xsl:text></script>
 
@@ -157 +162 @@
     <xsl:call-template name="setup-gs-variable"/>
     <xsl:if test="/page/pageRequest/@action ='p' and /page/pageRequest/@subaction='pref'">
-      <script type="text/javascript">
-    <xsl:value-of disable-output-escaping="yes" select="util:getInterfaceStringsAsJavascript($interface_name, /page/@lang, 'pref')"/>
-      </script>
-      <script type="text/javascript" src="interfaces/{$interface_name}/js/jquery.themeswitcher.min.js"><xsl:text> </xsl:text></script>
+        <gslib:langfrag name="pref" />
+        <script type="text/javascript" src="interfaces/{$interface_name}/js/jquery.themeswitcher.min.js"><xsl:text> </xsl:text></script>
     </xsl:if>
     <xsl:call-template name="define-js-macro-variables"/>

main/trunk/greenstone3/web/interfaces/default_wip/transform/pages/pref.xsl

@@ -34 +34 @@
     <input type='hidden' name='c' value="{$collName}"/>
 
+    <button type="button" data-cc="c-settings" class="cc-link">Cookie Consent Manager</button>
     <p id="SaveInstructions" style="color:red; text-align:center; display:none;"><xsl:value-of select="util:getInterfaceText($interface_name, /page/@lang, 'pref.set_prefs_help')"/></p>
     <xsl:call-template name="presentation-prefs"/>