Merge pull request #6819 from ORCID/8659-access-the-onetrust-widget-t…

…hrough-a-link-in-the-site-footer feature: Remove old banner and add one trus to index and link to footer
ORCID · Jun 19, 2023 · 6b44675 · 6b44675
2 parents 9d6ee87 + ce14773
commit 6b44675
Show file tree

Hide file tree

Showing 4 changed files with 39 additions and 13 deletions.
diff --git a/orcid-core/src/main/resources/i18n/layout_en.properties b/orcid-core/src/main/resources/i18n/layout_en.properties
@@ -12,3 +12,4 @@ wp-infosite-header.disputeProcedures=Dispute procedures
 wp-infosite-header.brandGuidelines=Brand Guidelines
 wp-infosite-header.aboutOrcid=About ORCID
 wp-infosite-header.contactSupport=Contact Support
+wp-infosite-header.cookieSettings=Cookie Settings
diff --git a/orcid-web/src/main/resources/freemarker/common/html-head.ftl b/orcid-web/src/main/resources/freemarker/common/html-head.ftl
@@ -73,6 +73,18 @@
         </#if>
     </script>
 
+    <script
+            type="text/javascript"
+            src="https://cdn.cookielaw.org/consent/5a6d60d3-b085-4e48-8afa-d707c7afc419-test/OtAutoBlock.js"
+    ></script>
+    <script
+            src="https://cdn.cookielaw.org/scripttemplates/otSDKStub.js"
+            data-domain-script="5a6d60d3-b085-4e48-8afa-d707c7afc419-test"
+    ></script>
+    <script type="text/javascript">
+        function OptanonWrapper() {}
+    </script>
+
     <#include "/macros/orcid_ga.ftl">
 
     <link rel="stylesheet" href="${staticCdn}/css/spinner.css"/>  
@@ -100,4 +112,4 @@
 
     <!-- Ng2 Templates - END -->
     <!-- ***************************************************** -->
-</head>
+</head>
diff --git a/orcid-web/src/main/resources/freemarker/includes/ng2_templates/alert-banner-ng2-template.ftl b/orcid-web/src/main/resources/freemarker/includes/ng2_templates/alert-banner-ng2-template.ftl
@@ -4,9 +4,4 @@
         ${springMacroRequestContext.getMessage("common.js.domain.warn.more_information")}</a></p>
         <button *ngIf="dismissTestSiteNotificationAllowed" (click)="dismissTestSiteNotification()" id="test-warn-dismiss" class="btn btn-primary">${springMacroRequestContext.getMessage("common.cookies.dismiss")}</button>
     </div>
-    <div id="cookie-alert" class="alert alert-banner" *ngIf="showCookieNotification">
-        <p><span *ngIf="!cookiesEnabled">${springMacroRequestContext.getMessage("common.cookies.required")}</span> ${springMacroRequestContext.getMessage("common.cookies.orcid_uses")} <a href="{{getBaseUri()}}/privacy-policy#TrackingTechnology" target="common.cookies.learn_more">
-        ${springMacroRequestContext.getMessage("common.cookies.learn_more")}</a>.</p>
-        <button (click)="dismissCookieNotification()" class="btn btn-primary">${springMacroRequestContext.getMessage("common.cookies.dismiss")}</button>
-    </div>
-</script>
+</script>
diff --git a/orcid-web/src/main/resources/freemarker/layout/public-layout.ftl b/orcid-web/src/main/resources/freemarker/layout/public-layout.ftl
@@ -17,6 +17,23 @@
             overflow: hidden;
             height: 1px;
         }
+        .ot-sdk-show-settings {
+            color: inherit !important;
+            line-height: inherit !important;
+            border-width: initial !important;
+            border-style: none !important;
+            border-color: initial !important;
+            border-image: initial !important;
+            margin: 0px auto !important;
+            padding: 7px 20px !important;
+            transition: inherit !important;
+            font-size: inherit !important;
+            font-weight: inherit !important;
+        }
+        .ot-sdk-show-settings:hover {
+            color: inherit !important;
+            background-color: inherit !important;
+        }
     </style>    
 
     <root-cmp role="presentation">
@@ -36,9 +53,7 @@
         <noscript>
             <div class="alert alert-banner">
                  ${springMacroRequestContext.getMessage("common.browser-checks.functionalityofthissite")} <a href="http://www.enable-javascript.com/" target="common.browser-checks.instructionhowtoadd">
-                 ${springMacroRequestContext.getMessage("common.browser-checks.instructionhowtoadd")}</a>.<br>
-                 ${springMacroRequestContext.getMessage("common.cookies.orcid_uses")} <a href="${baseUri}/privacy-policy#TrackingTechnology" target="common.cookies.learn_more">
-                 ${springMacroRequestContext.getMessage("common.cookies.learn_more")}</a>.
+                 ${springMacroRequestContext.getMessage("common.browser-checks.instructionhowtoadd")}</a>.
             </div>
             <style type="text/css"> 
             .app-loading {
@@ -163,9 +178,12 @@
                                             <li><a href="{{aboutUri}}/footer/privacy-policy"><@orcid.msg 'wp-infosite-header.privacyPolicy'/></a></li>
                                             <li><a href="{{aboutUri}}/content/orcid-terms-use"><@orcid.msg 'wp-infosite-header.termOfUse'/></a></li>
                                             <li><a href="{{aboutUri}}/content/orcid-accessibility-statement"><@orcid.msg 'wp-infosite-header.accesibilityStatement'/></a></li>
-                                            <li><a href="https://support.orcid.org/hc/en-us/requests/new"><@orcid.msg 'wp-infosite-header.contactSupport'/></a></li>
-                                            <li><a href="{{aboutUri}}/orcid-dispute-procedures"><@orcid.msg 'wp-infosite-header.disputeProcedures'/></a></li>
-                                            <li><a href="{{aboutUri}}/trademark-and-id-display-guidelines/"><@orcid.msg 'wp-infosite-header.brandGuidelines'/></a></li>
+                                    </ul>
+                                    <ul class="inline-list">
+                                        <li><a href="https://support.orcid.org/hc/en-us/requests/new"><@orcid.msg 'wp-infosite-header.contactSupport'/></a></li>
+                                        <li><a href="{{aboutUri}}/orcid-dispute-procedures"><@orcid.msg 'wp-infosite-header.disputeProcedures'/></a></li>
+                                        <li><a href="{{aboutUri}}/trademark-and-id-display-guidelines/"><@orcid.msg 'wp-infosite-header.brandGuidelines'/></a></li>
+                                        <li><a id="ot-sdk-btn" class="ot-sdk-show-settings"><@orcid.msg 'wp-infosite-header.cookieSettings'/></a></li>
                                     </ul>
                                     </nav>
                                 </div>