Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
24 changes: 12 additions & 12 deletions src/main/content/_assets/css/openliberty.scss
Original file line number Diff line number Diff line change
Expand Up @@ -547,6 +547,10 @@ footer {
color: #6F7878;
}

#footer_copyright{
margin-bottom: 0;
}

.vertical_bar {
margin: 0 4px;
}
Expand Down Expand Up @@ -622,19 +626,15 @@ footer {


#teconsent {
height: 40px;
background-color: rgb(255, 255, 255);
z-index: 2147483647;
bottom: 0px;
right: 0px;
margin: 0px;
padding: 0px 16px;
line-height: 40px;
vertical-align: middle;
box-shadow: rgba(0, 0, 0, 0.1) 0px 0px 10px 3px;
float: right;
margin-bottom: 10px;
margin-left: 10px;
display:contents !important;
a{
font-size: 11px;
color: #6F7878;
display: inline-block;
line-height: 1.5;
}
}


Expand Down Expand Up @@ -783,4 +783,4 @@ code .conum[data-value]+b {
opacity: 1;
}
}
}
}
2 changes: 2 additions & 0 deletions src/main/content/_includes/footer.html
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,8 @@
<a id="footer_license_link" href="https://github.com/OpenLiberty/open-liberty/blob/release/LICENSE" target="_blank" rel="noopener" class="left_footer_link">{% t footer.license %}</a>
<p class="vertical_bar">|</p>
<a id="footer_logos_link" href="https://github.com/OpenLiberty/logos" target="_blank" rel="noopener" class="left_footer_link">{% t footer.logos %}</a>
<p class="vertical_bar">|</p>
<span id="teconsent" style="display:none"></span>
</div>
<div id="footer_bottom_right_section">
<a id="footer_get_started_link" href="/start" aria-label="Open Liberty Get Started" class="right_footer_link blue_link_light_background">{% t pages.start %}</a>
Expand Down
24 changes: 23 additions & 1 deletion src/main/content/_includes/head.html
Original file line number Diff line number Diff line change
Expand Up @@ -77,4 +77,26 @@
{% endif %}

<script async defer src="https://buttons.github.io/buttons.js"></script>
</head>
<script type="text/javascript">
window._ibmAnalytics = {
"settings": {
"name": "Openliberty-io-website",
"tealiumProfileName": "ibm-web-app"
},
"digitalData.page.services.google.enabled": true
};
digitalData = {
"page": {
"pageInfo": {
"ibm": {
"siteId": "IBM_" + _ibmAnalytics.settings.name,
}
},
"category": {
"primaryCategory": "PC100"
}
}
};
</script>
<script src="//1.www.s81c.com/common/stats/ibm-common.js" type="text/javascript" async="async"></script>
</head>
6 changes: 4 additions & 2 deletions src/main/content/antora_ui/src/partials/footer-content.hbs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<footer>
<footer>
<div id="footer_gray_background">
<div id="footer_top_container" class="footer_container container-fluid">
<div id="footer_project_container">
Expand All @@ -23,6 +23,8 @@
<a id="footer_license_link" href="https://github.com/OpenLiberty/open-liberty/blob/release/LICENSE" target="_blank" rel="noopener" class="left_footer_link">License</a>
<p class="vertical_bar">|</p>
<a id="footer_logos_link" href="https://github.com/OpenLiberty/logos" target="_blank" rel="noopener" class="left_footer_link">Logos</a>
<p class="vertical_bar">|</p>
<span id="teconsent" style="display:none"></span>
</div>
<div id="footer_bottom_right_section">
<a id="footer_get_started_link" href="/start" aria-label="Open Liberty Get Started" class="right_footer_link blue_link_light_background">Get Started</a>
Expand All @@ -40,4 +42,4 @@
<img src="{{uiRootPath}}/img/Footer_StackO_Hover.svg" alt="Open-liberty Stack Overflow link">
<img src="{{uiRootPath}}/img/Footer_GroupsIO_Hover.svg" alt="Openliberty Groups IO link">
<img src="{{uiRootPath}}/img/footer_gitter_hover.svg" alt="Openliberty Gitter link">
</div>
</div>
23 changes: 23 additions & 0 deletions src/main/content/antora_ui/src/partials/head-scripts.hbs
Original file line number Diff line number Diff line change
Expand Up @@ -4,3 +4,26 @@
<script async src="{{uiRootPath}}/js/vendor/highlight.js "></script>
<script src="https://cdnjs.cloudflare.com/ajax/libs/jquery/3.3.1/jquery.min.js" integrity="sha512-+NqPlbbtM1QqiK8ZAo4Yrj2c4lNQoGv8P79DPtKzj++l5jnN39rHA/xsqn8zE9l0uSoxaCdrOgFs6yjyfbBxSg==" crossorigin="anonymous" referrerpolicy="no-referrer"></script>
<script src="https://cdn.jsdelivr.net/npm/[email protected]/dist/js/bootstrap.min.js" integrity="sha384-aJ21OjlMXNL5UyIl/XNwTMqvzeRMZH2w8c5cRVpzpU8Y5bApTppSuUkhZXN0VxHd" crossorigin="anonymous"></script>

<script type="text/javascript">
window._ibmAnalytics = {
"settings": {
"name": "Openliberty-io-website",
"tealiumProfileName": "ibm-web-app"
},
"digitalData.page.services.google.enabled": true
};
digitalData = {
"page": {
"pageInfo": {
"ibm": {
"siteId": "IBM_" + _ibmAnalytics.settings.name,
}
},
"category": {
"primaryCategory": "PC100"
}
}
};
</script>
<script src="//1.www.s81c.com/common/stats/ibm-common.js" type="text/javascript" async="async"></script>
25 changes: 12 additions & 13 deletions src/main/content/antora_ui/src/sass/openliberty.scss
Original file line number Diff line number Diff line change
Expand Up @@ -512,6 +512,10 @@ footer {
color: #6F7878;
}

#footer_copyright{
margin-bottom: 0;
}

.vertical_bar {
margin: 0 4px;
}
Expand Down Expand Up @@ -587,19 +591,15 @@ footer {


#teconsent {
height: 40px;
background-color: rgb(255, 255, 255);
z-index: 2147483647;
bottom: 0px;
right: 0px;
margin: 0px;
padding: 0px 16px;
line-height: 40px;
vertical-align: middle;
box-shadow: rgba(0, 0, 0, 0.1) 0px 0px 10px 3px;
float: right;
margin-bottom: 10px;
margin-left: 10px;
display:contents !important;
a{
font-size: 11px;
color: #6F7878;
display: inline-block;
line-height: 1.5;
}
}


Expand Down Expand Up @@ -748,5 +748,4 @@ code .conum[data-value]+b {
opacity: 1;
}
}
}

}
2 changes: 1 addition & 1 deletion src/main/java/io/openliberty/website/SecurityFilter.java
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ public void doFilter(ServletRequest req, ServletResponse resp, FilterChain chain
response.setHeader("X-Content-Type-Options", "nosniff");
// Mitigating cross site scripting (XSS) from other domains.
response.setHeader("Content-Security-Policy",
"default-src 'self' 'unsafe-inline' 'unsafe-eval' cdn.jsdelivr.net ajax.googleapis.com code.jquery.com fonts.gstatic.com *.githubusercontent.com api.github.com www.googletagmanager.com tagmanager.google.com www.google-analytics.com cdnjs.cloudflare.com data: buttons.github.io www.youtube.com video.ibm.com https://start.openliberty.io/ gitlab.com starter-staging.rh9j6zz75er.us-east.codeengine.appdomain.cloud https://docs.oracle.com/javase/8/docs/api/ https://docs.oracle.com/en/java/javase/17/docs/api/");
"default-src 'self' 'unsafe-inline' 'unsafe-eval' cdn.jsdelivr.net ajax.googleapis.com code.jquery.com fonts.gstatic.com *.githubusercontent.com api.github.com www.googletagmanager.com tagmanager.google.com www.google-analytics.com cdnjs.cloudflare.com data: buttons.github.io www.youtube.com video.ibm.com https://start.openliberty.io/ gitlab.com starter-staging.rh9j6zz75er.us-east.codeengine.appdomain.cloud https://docs.oracle.com/javase/8/docs/api/ https://docs.oracle.com/en/java/javase/17/docs/api/ http://*.tealium.com https://*.tags.tiqcdn.com http://*.tags.tiqcdn.com http://*.trustarc.com https://*.trustarc.com https://*.prefmgr-cookie.truste-svc.net http://*.prefmgr-cookie.truste-svc.net https://www.ibm.com https://1.www.s81c.com/ https://www-api.ibm.com https://tags.tiqcdn.com");

// Limits the information sent cross-domain and does not send the origin name.
response.setHeader("Referrer-Policy", "no-referrer");
Expand Down
Loading