From 4b7f3d32023a063b61624144a1c020a2a18b9d03 Mon Sep 17 00:00:00 2001
From: Daniel Palafox <dp852@hotmail.com>
Date: Tue, 4 Jul 2023 20:04:21 +0700
Subject: [PATCH 1/2] fix: Add link back and fix styles

---
 .../freemarker/layout/public-layout.ftl       | 23 +++++++++++++++----
 1 file changed, 18 insertions(+), 5 deletions(-)

diff --git a/orcid-web/src/main/resources/freemarker/layout/public-layout.ftl b/orcid-web/src/main/resources/freemarker/layout/public-layout.ftl
index 2ad5ba8c24c..ea2141788f9 100644
--- a/orcid-web/src/main/resources/freemarker/layout/public-layout.ftl
+++ b/orcid-web/src/main/resources/freemarker/layout/public-layout.ftl
@@ -18,17 +18,17 @@
             height: 1px;
         }
         .ot-sdk-show-settings {
-            color: inherit !important;
+            color: rgba(0,0,0,0.87) !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;
+            margin: 0 !important;
+            padding: 0 !important;
             transition: inherit !important;
-            font-size: inherit !important;
-            font-weight: inherit !important;
+            font-size: 14px !important;
+            font-weight: 700 !important;
         }
         .ot-sdk-show-settings:hover {
             color: inherit !important;
@@ -178,10 +178,23 @@
                                         <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>
+                                     </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>
+                                        <ul class="inline-list">
+                                            <li><a href="https://info.qa.orcid.org/about">About ORCID</a></li>
+                                            <li><a href="https://info.qa.orcid.org/footer/privacy-policy">Privacy Policy </a></li>
+                                            <li><a href="https://info.qa.orcid.org/content/orcid-terms-use">Terms of Use</a></li>
+                                            <li><a href="https://info.qa.orcid.org/content/orcid-accessibility-statement">Accessibility Statement</a></li>
+                                            <li><a href="https://support.orcid.org/hc/en-us/requests/new">Contact Support</a></li>
+                                            <li><a href="https://info.qa.orcid.org/orcid-dispute-procedures">Dispute procedures</a></li>
+                                            <li><a href="https://info.qa.orcid.org/trademark-and-id-display-guidelines/">Brand Guidelines</a></li>
+
+                                        </ul>
                                     </nav>
                                 </div>
                             </div>

From 406abe46be39ef2975b47e5c3a6d606e4c0009aa Mon Sep 17 00:00:00 2001
From: Daniel Palafox <dp852@hotmail.com>
Date: Tue, 4 Jul 2023 20:13:45 +0700
Subject: [PATCH 2/2] fix: Remove duplicated links

---
 .../freemarker/layout/public-layout.ftl       | 30 +++++++------------
 1 file changed, 10 insertions(+), 20 deletions(-)

diff --git a/orcid-web/src/main/resources/freemarker/layout/public-layout.ftl b/orcid-web/src/main/resources/freemarker/layout/public-layout.ftl
index ea2141788f9..05ece394930 100644
--- a/orcid-web/src/main/resources/freemarker/layout/public-layout.ftl
+++ b/orcid-web/src/main/resources/freemarker/layout/public-layout.ftl
@@ -173,27 +173,17 @@
                                     <p role="presentation">
                                         <a rel="license noreferrer" target="footer.copyright_cc0" href="http://creativecommons.org/publicdomain/zero/1.0/" ><img *ngIf="assetsPath != null" src="{{assetsPath + '/img/cc0_80x15.png'}}" style="border-style: none; margin-right: 4px;" alt="CC0" /></a> <@orcid.msg 'footer.copyright_cc0_1'/> <a rel="license noreferrer" target="footer.copyright_cc0" class="footer-url" href="http://creativecommons.org/publicdomain/zero/1.0/"><@orcid.msg 'footer.copyright_cc0_2'/></a><@orcid.msg 'common.period'/> <@orcid.msg 'footer.copyright_cc0_3'/><@orcid.msg 'common.period'/></p>
                                     <nav>
-                                    <ul class="inline-list">
-                                        <li><a href="{{aboutUri}}/about"><@orcid.msg 'wp-infosite-header.aboutOrcid'/></a></li>
-                                        <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>
-                                     </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>
                                         <ul class="inline-list">
-                                            <li><a href="https://info.qa.orcid.org/about">About ORCID</a></li>
-                                            <li><a href="https://info.qa.orcid.org/footer/privacy-policy">Privacy Policy </a></li>
-                                            <li><a href="https://info.qa.orcid.org/content/orcid-terms-use">Terms of Use</a></li>
-                                            <li><a href="https://info.qa.orcid.org/content/orcid-accessibility-statement">Accessibility Statement</a></li>
-                                            <li><a href="https://support.orcid.org/hc/en-us/requests/new">Contact Support</a></li>
-                                            <li><a href="https://info.qa.orcid.org/orcid-dispute-procedures">Dispute procedures</a></li>
-                                            <li><a href="https://info.qa.orcid.org/trademark-and-id-display-guidelines/">Brand Guidelines</a></li>
-
+                                            <li><a href="{{aboutUri}}/about"><@orcid.msg 'wp-infosite-header.aboutOrcid'/></a></li>
+                                            <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>
+                                         </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>