Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feature: Remove old banner and add one trus to index and link to footer #6819

Merged
merged 1 commit into from
Jun 19, 2023
Merged

feature: Remove old banner and add one trus to index and link to footer #6819

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions orcid-core/src/main/resources/i18n/layout_en.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
14 changes: 13 additions & 1 deletion orcid-web/src/main/resources/freemarker/common/html-head.ftl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"/>
Expand Down Expand Up @@ -100,4 +112,4 @@

<!-- Ng2 Templates - END -->
<!-- ***************************************************** -->
</head>
</head>
7 changes: 1 addition & 6 deletions orcid-web/src/main/resources/freemarker/includes/ng2_templates/alert-banner-ng2-template.ftl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
30 changes: 24 additions & 6 deletions orcid-web/src/main/resources/freemarker/layout/public-layout.ftl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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">
Expand All @@ -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 {
Expand Down Expand Up @@ -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>
Expand Down