This is an automated email from the ASF dual-hosted git repository.
ntimofeev pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/cayenne-website.git
The following commit(s) were added to refs/heads/master by this push:
new 5ded7d2e7 Adjustments to comply with Apache privacy policy and content
requirements: - remove Google Analytics - remove GitHub API call - add lazy
loading of YouTube content - add link to the Apache privacy policy page - add
current Apache Event banner
5ded7d2e7 is described below
commit 5ded7d2e740e37b366de4aa212e756d809cd7f7c
Author: stariy95 <[email protected]>
AuthorDate: Wed Nov 15 19:30:49 2023 +0400
Adjustments to comply with Apache privacy policy and content requirements:
- remove Google Analytics
- remove GitHub API call
- add lazy loading of YouTube content
- add link to the Apache privacy policy page
- add current Apache Event banner
---
src/main/assets/images/cayenne-tutorial-preview.png | Bin 0 -> 39156 bytes
src/main/assets/scripts/main.js | 8 --------
src/main/site/config.yaml | 2 +-
src/main/site/content/_index.html | 10 +++++++++-
src/main/site/layouts/partials/footer.html | 3 ++-
src/main/site/layouts/partials/head.html | 1 +
src/main/site/layouts/partials/header.html | 4 +++-
7 files changed, 16 insertions(+), 12 deletions(-)
diff --git a/src/main/assets/images/cayenne-tutorial-preview.png
b/src/main/assets/images/cayenne-tutorial-preview.png
new file mode 100644
index 000000000..c6354f565
Binary files /dev/null and
b/src/main/assets/images/cayenne-tutorial-preview.png differ
diff --git a/src/main/assets/scripts/main.js b/src/main/assets/scripts/main.js
index 19faa1d51..cd48db834 100644
--- a/src/main/assets/scripts/main.js
+++ b/src/main/assets/scripts/main.js
@@ -40,13 +40,6 @@ function initHljs() {
hljs.initHighlightingOnLoad();
}
-function initGitHubBadge() {
- var ghUrl = "https://api.github.com/repos/apache/cayenne";;
- $.getJSON(ghUrl, function ghCallback(ghData) {
- $(".stargazers_count").text(ghData.stargazers_count || '');
- });
-}
-
function initAnchors() {
var anchors = new anchorJS();
anchors
@@ -59,7 +52,6 @@ function initAnchors() {
$(document).ready(function () {
initAnchors();
- initGitHubBadge();
});
initHljs();
diff --git a/src/main/site/config.yaml b/src/main/site/config.yaml
index 16b7a360d..39780732c 100644
--- a/src/main/site/config.yaml
+++ b/src/main/site/config.yaml
@@ -26,7 +26,7 @@ disableKinds: ['RSS']
disableHugoGeneratorInject: true
disablePathToLower: true
enableRobotsTXT: true
-googleAnalytics: 'UA-7036673-1'
+#googleAnalytics: 'UA-7036673-1' # disabled per Apache privacy policy
mediaTypes:
application/rdf:
diff --git a/src/main/site/content/_index.html
b/src/main/site/content/_index.html
index 1db77b4ca..1aaab011c 100644
--- a/src/main/site/content/_index.html
+++ b/src/main/site/content/_index.html
@@ -12,8 +12,16 @@
</h1>
<p class="d-inline-block mw-460px small font-italic
mb-0">Apache Cayenne™ is an open source Java object-to-relational mapping
framework</p>
<div class="embed-responsive mw-560px mt-3 mx-auto
embed-responsive-16by9">
- <iframe class="embed-responsive-item"
src="https://www.youtube.com/embed/0H5HIA03xFc?html5=1&controls=1&showinfo=0&fs=1&rel=0";
frameborder="0" allowfullscreen></iframe>
+ <iframe class="embed-iframe"
+
srcdoc="<style>*{padding:0;margin:0;overflow:hidden}</style>
+ <a
href=https://www.youtube.com/embed/0H5HIA03xFc?html5=1&controls=1&autoplay=1&showinfo=0&fs=1&rel=0>
+ <img src=img/cayenne-tutorial-preview.png alt='Play
Cayenne video tutorial'>
+ </a>"
+ allowfullscreen
+ title="Play Cayenne video
tutorial"
+ ></iframe>
</div>
+ <p class="xsmall">Clicking on this link will load and
send data from and to Google.</p>
</div>
</div>
diff --git a/src/main/site/layouts/partials/footer.html
b/src/main/site/layouts/partials/footer.html
index 32f10fd2f..70b0be8c9 100644
--- a/src/main/site/layouts/partials/footer.html
+++ b/src/main/site/layouts/partials/footer.html
@@ -32,7 +32,8 @@
</div>
<hr class="mt-0 mb-3" />
<p class="copy xsmall text-center mw-75 mx-auto mb-0">
- Copyright © 2001-{{ now.Year }} Apache Software Foundation. Apache
Cayenne, Cayenne, Apache, the Apache feather logo, and the Apache Cayenne
project logo are trademarks of The Apache Software Foundation. <a href="{{ ref
. "privacy-policy.md" | safeURL }}">Privacy policy</a>.
+ Copyright © 2001-{{ now.Year }} Apache Software Foundation. Apache
Cayenne, Cayenne, Apache, the Apache feather logo, and the Apache Cayenne
project logo are trademarks of The Apache Software Foundation.
+ <a href="https://cayenne.apache.org/privacy-policy.html";>Privacy
policy</a>.
<img class="d-block mx-auto mt-2" src="/img/logo_mono.svg"
alt="Apache Cayenne" />
</p>
</div>
diff --git a/src/main/site/layouts/partials/head.html
b/src/main/site/layouts/partials/head.html
index dacd720a3..ed5432218 100644
--- a/src/main/site/layouts/partials/head.html
+++ b/src/main/site/layouts/partials/head.html
@@ -15,6 +15,7 @@
<meta name="theme-color" content="#ffffff">
<link rel="stylesheet" href="{{ "css/styles.css" | absURL }}"/>
<script src="{{ "js/bundle.js" | absURL }}"></script>
+ <script
src="https://www.apachecon.com/event-images/snippet.js";></script>
{{ if .Title -}}
<title>{{ .Title }} · {{ .Site.Title }}</title>
{{- else -}}
diff --git a/src/main/site/layouts/partials/header.html
b/src/main/site/layouts/partials/header.html
index 8abf47689..410e8b64d 100644
--- a/src/main/site/layouts/partials/header.html
+++ b/src/main/site/layouts/partials/header.html
@@ -10,6 +10,7 @@
<a class="dropdown-item"
href="https://www.apache.org/foundation/sponsorship.html";>Sponsorship</a>
<a class="dropdown-item"
href="https://www.apache.org/foundation/thanks.html";>Thanks</a>
<a class="dropdown-item"
href="https://www.apache.org/security/";>Security</a>
+ <a class="ml-1 mt-1 acevent" data-format="wide" data-mode="dark"
data-width="120"></a>
</div>
</li>
<!--<li class="breadcrumb-item d-none d-lg-flex"><span>Apache
Cayenne</span></li>-->
@@ -35,7 +36,8 @@
<ul class="navbar-nav flex-row justify-content-center mt-2 mt-lg-0
mb-2 mb-lg-0 " id="social-links-menu">
<li class="nav-item d-flex">
<a class="nav-link d-flex justify-content-center
align-items-center" href="https://github.com/apache/cayenne";>
- <img src="/img/icon_octocat_stars.svg" alt="GitHub" /><span
class="stargazers_count ml-1l2"></span></a>
+ <img src="/img/icon_octocat_stars.svg" alt="GitHub" />
+ </a>
</li>
<li class="nav-item d-flex">
<a class="nav-link d-flex justify-content-center
align-items-center" href="https://twitter.com/ApacheCayenne";>
