From 32d462694fda7fd11abaee12495e64f72be008a2 Mon Sep 17 00:00:00 2001 From: dandimeo Date: Mon, 2 Oct 2023 15:42:44 +0200 Subject: [PATCH 01/19] create tracking partisls --- .../partials/shortcodes/tracking/ga.html | 22 +++++++++++++++++++ .../partials/shortcodes/tracking/gtag.html | 7 ++++++ .../partials/shortcodes/tracking/gtm.html | 6 +++++ .../shortcodes/tracking/linkedin.html | 11 ++++++++++ .../partials/shortcodes/tracking/twitter.html | 7 ++++++ .../shortcodes/tracking/zoominfo.html | 12 ++++++++++ 6 files changed, 65 insertions(+) create mode 100644 site/themes/arangodb-docs-theme/layouts/partials/shortcodes/tracking/ga.html create mode 100644 site/themes/arangodb-docs-theme/layouts/partials/shortcodes/tracking/gtag.html create mode 100644 site/themes/arangodb-docs-theme/layouts/partials/shortcodes/tracking/gtm.html create mode 100644 site/themes/arangodb-docs-theme/layouts/partials/shortcodes/tracking/linkedin.html create mode 100644 site/themes/arangodb-docs-theme/layouts/partials/shortcodes/tracking/twitter.html create mode 100644 site/themes/arangodb-docs-theme/layouts/partials/shortcodes/tracking/zoominfo.html diff --git a/site/themes/arangodb-docs-theme/layouts/partials/shortcodes/tracking/ga.html b/site/themes/arangodb-docs-theme/layouts/partials/shortcodes/tracking/ga.html new file mode 100644 index 0000000000..e9452e7296 --- /dev/null +++ b/site/themes/arangodb-docs-theme/layouts/partials/shortcodes/tracking/ga.html @@ -0,0 +1,22 @@ + \ No newline at end of file diff --git a/site/themes/arangodb-docs-theme/layouts/partials/shortcodes/tracking/gtag.html b/site/themes/arangodb-docs-theme/layouts/partials/shortcodes/tracking/gtag.html new file mode 100644 index 0000000000..26513d48c8 --- /dev/null +++ b/site/themes/arangodb-docs-theme/layouts/partials/shortcodes/tracking/gtag.html @@ -0,0 +1,7 @@ + + \ No newline at end of file diff --git a/site/themes/arangodb-docs-theme/layouts/partials/shortcodes/tracking/gtm.html b/site/themes/arangodb-docs-theme/layouts/partials/shortcodes/tracking/gtm.html new file mode 100644 index 0000000000..30ce11c7b3 --- /dev/null +++ b/site/themes/arangodb-docs-theme/layouts/partials/shortcodes/tracking/gtm.html @@ -0,0 +1,6 @@ + \ No newline at end of file diff --git a/site/themes/arangodb-docs-theme/layouts/partials/shortcodes/tracking/linkedin.html b/site/themes/arangodb-docs-theme/layouts/partials/shortcodes/tracking/linkedin.html new file mode 100644 index 0000000000..a4fbcf0f26 --- /dev/null +++ b/site/themes/arangodb-docs-theme/layouts/partials/shortcodes/tracking/linkedin.html @@ -0,0 +1,11 @@ + \ No newline at end of file diff --git a/site/themes/arangodb-docs-theme/layouts/partials/shortcodes/tracking/twitter.html b/site/themes/arangodb-docs-theme/layouts/partials/shortcodes/tracking/twitter.html new file mode 100644 index 0000000000..5785cfb6d2 --- /dev/null +++ b/site/themes/arangodb-docs-theme/layouts/partials/shortcodes/tracking/twitter.html @@ -0,0 +1,7 @@ + \ No newline at end of file diff --git a/site/themes/arangodb-docs-theme/layouts/partials/shortcodes/tracking/zoominfo.html b/site/themes/arangodb-docs-theme/layouts/partials/shortcodes/tracking/zoominfo.html new file mode 100644 index 0000000000..688cc8ff33 --- /dev/null +++ b/site/themes/arangodb-docs-theme/layouts/partials/shortcodes/tracking/zoominfo.html @@ -0,0 +1,12 @@ + + \ No newline at end of file From 93a58b418bbff84a17db40175d8516990ca28f1e Mon Sep 17 00:00:00 2001 From: dandimeo Date: Mon, 2 Oct 2023 15:43:04 +0200 Subject: [PATCH 02/19] add tracking partials call to head --- site/themes/arangodb-docs-theme/layouts/partials/head.html | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/site/themes/arangodb-docs-theme/layouts/partials/head.html b/site/themes/arangodb-docs-theme/layouts/partials/head.html index 89dd33578e..be3dfa6628 100644 --- a/site/themes/arangodb-docs-theme/layouts/partials/head.html +++ b/site/themes/arangodb-docs-theme/layouts/partials/head.html @@ -8,5 +8,11 @@ {{- partial "javascript.html" . }} + {{- partial "gtag.html" . }} + {{- partial "gtm.html" . }} + {{- partial "ga.html" . }} + {{- partial "twitter.html" . }} + {{- partial "linkedin.html" . }} + {{- partial "zoominfo.html" . }} \ No newline at end of file From b8ce439510978145dc97ce691a05104a5c251f08 Mon Sep 17 00:00:00 2001 From: dandimeo Date: Mon, 2 Oct 2023 15:46:54 +0200 Subject: [PATCH 03/19] fix tracking partials invoke --- .../arangodb-docs-theme/layouts/partials/head.html | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/site/themes/arangodb-docs-theme/layouts/partials/head.html b/site/themes/arangodb-docs-theme/layouts/partials/head.html index be3dfa6628..625f854a5d 100644 --- a/site/themes/arangodb-docs-theme/layouts/partials/head.html +++ b/site/themes/arangodb-docs-theme/layouts/partials/head.html @@ -8,11 +8,11 @@ {{- partial "javascript.html" . }} - {{- partial "gtag.html" . }} - {{- partial "gtm.html" . }} - {{- partial "ga.html" . }} - {{- partial "twitter.html" . }} - {{- partial "linkedin.html" . }} - {{- partial "zoominfo.html" . }} + {{- partial "shortcodes/tracking/gtag.html" . }} + {{- partial "shortcodes/tracking/gtm.html" . }} + {{- partial "shortcodes/tracking/ga.html" . }} + {{- partial "shortcodes/tracking/twitter.html" . }} + {{- partial "shortcodes/tracking/linkedin.html" . }} + {{- partial "shortcodes/tracking/zoominfo.html" . }} \ No newline at end of file From 39d4c3642004a9ba00b072094b49acb3e9ab9801 Mon Sep 17 00:00:00 2001 From: dandimeo Date: Mon, 2 Oct 2023 15:49:09 +0200 Subject: [PATCH 04/19] add body start and end tracking managers --- .../arangodb-docs-theme/layouts/_default/index.html | 4 ++++ .../arangodb-docs-theme/layouts/_default/list.html | 9 ++++++--- .../arangodb-docs-theme/layouts/_default/single.html | 8 ++++++-- 3 files changed, 16 insertions(+), 5 deletions(-) diff --git a/site/themes/arangodb-docs-theme/layouts/_default/index.html b/site/themes/arangodb-docs-theme/layouts/_default/index.html index d816384d37..2e5a180277 100644 --- a/site/themes/arangodb-docs-theme/layouts/_default/index.html +++ b/site/themes/arangodb-docs-theme/layouts/_default/index.html @@ -5,6 +5,8 @@ {{- partial "head.html" . }} + +
{{ partial "search.html" . }} + + diff --git a/site/themes/arangodb-docs-theme/layouts/_default/list.html b/site/themes/arangodb-docs-theme/layouts/_default/list.html index d565c56a66..000033643e 100644 --- a/site/themes/arangodb-docs-theme/layouts/_default/list.html +++ b/site/themes/arangodb-docs-theme/layouts/_default/list.html @@ -7,7 +7,9 @@ {{- partial "head.html" . }} - + + +
@@ -25,6 +27,7 @@
{{- partialCached "back-to-top.html" . }} {{ partial "search.html" . }} - - + + + \ No newline at end of file diff --git a/site/themes/arangodb-docs-theme/layouts/_default/single.html b/site/themes/arangodb-docs-theme/layouts/_default/single.html index bbb87f4f8b..3d47b7b92f 100644 --- a/site/themes/arangodb-docs-theme/layouts/_default/single.html +++ b/site/themes/arangodb-docs-theme/layouts/_default/single.html @@ -7,7 +7,9 @@ {{- partial "head.html" . }} - + + +
@@ -25,5 +27,7 @@
{{- partial "back-to-top.html" . }} {{ partial "search.html" . }} - + + + \ No newline at end of file From 73f7c09e5883fa70222616dfecf2bfe8055e0771 Mon Sep 17 00:00:00 2001 From: dandimeo Date: Mon, 16 Oct 2023 17:18:26 +0200 Subject: [PATCH 05/19] use tracking managers only when site is production --- .../arangodb-docs-theme/layouts/partials/head.html | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/site/themes/arangodb-docs-theme/layouts/partials/head.html b/site/themes/arangodb-docs-theme/layouts/partials/head.html index 625f854a5d..165f428aa5 100644 --- a/site/themes/arangodb-docs-theme/layouts/partials/head.html +++ b/site/themes/arangodb-docs-theme/layouts/partials/head.html @@ -8,11 +8,13 @@ {{- partial "javascript.html" . }} - {{- partial "shortcodes/tracking/gtag.html" . }} - {{- partial "shortcodes/tracking/gtm.html" . }} - {{- partial "shortcodes/tracking/ga.html" . }} - {{- partial "shortcodes/tracking/twitter.html" . }} - {{- partial "shortcodes/tracking/linkedin.html" . }} - {{- partial "shortcodes/tracking/zoominfo.html" . }} + {{ if eq site.BaseURL "https://docs.arangodb.com" }} + {{- partial "shortcodes/tracking/gtag.html" . }} + {{- partial "shortcodes/tracking/gtm.html" . }} + {{- partial "shortcodes/tracking/ga.html" . }} + {{- partial "shortcodes/tracking/twitter.html" . }} + {{- partial "shortcodes/tracking/linkedin.html" . }} + {{- partial "shortcodes/tracking/zoominfo.html" . }} + {{ end }} \ No newline at end of file From b5a27838b06e99e058fa534cc79bdbd2cb120447 Mon Sep 17 00:00:00 2001 From: Simran Spiller Date: Tue, 17 Oct 2023 11:16:07 +0200 Subject: [PATCH 06/19] Factor out body tracking code, fix/cleanup layout --- .../layouts/_default/index.html | 41 +++++---------- .../layouts/_default/list.html | 48 ++++++++--------- .../layouts/_default/single.html | 51 ++++++++----------- .../layouts/partials/head.html | 32 ++++++------ .../layouts/partials/tracking/body-end.html | 2 + .../layouts/partials/tracking/body-start.html | 2 + .../{shortcodes => }/tracking/ga.html | 0 .../{shortcodes => }/tracking/gtag.html | 0 .../{shortcodes => }/tracking/gtm.html | 0 .../{shortcodes => }/tracking/linkedin.html | 0 .../{shortcodes => }/tracking/twitter.html | 0 .../{shortcodes => }/tracking/zoominfo.html | 0 12 files changed, 74 insertions(+), 102 deletions(-) create mode 100644 site/themes/arangodb-docs-theme/layouts/partials/tracking/body-end.html create mode 100644 site/themes/arangodb-docs-theme/layouts/partials/tracking/body-start.html rename site/themes/arangodb-docs-theme/layouts/partials/{shortcodes => }/tracking/ga.html (100%) rename site/themes/arangodb-docs-theme/layouts/partials/{shortcodes => }/tracking/gtag.html (100%) rename site/themes/arangodb-docs-theme/layouts/partials/{shortcodes => }/tracking/gtm.html (100%) rename site/themes/arangodb-docs-theme/layouts/partials/{shortcodes => }/tracking/linkedin.html (100%) rename site/themes/arangodb-docs-theme/layouts/partials/{shortcodes => }/tracking/twitter.html (100%) rename site/themes/arangodb-docs-theme/layouts/partials/{shortcodes => }/tracking/zoominfo.html (100%) diff --git a/site/themes/arangodb-docs-theme/layouts/_default/index.html b/site/themes/arangodb-docs-theme/layouts/_default/index.html index 58912ad337..f4f9a2ec6f 100644 --- a/site/themes/arangodb-docs-theme/layouts/_default/index.html +++ b/site/themes/arangodb-docs-theme/layouts/_default/index.html @@ -1,43 +1,26 @@ -{{- partial "shortcodes/version.html" (dict "page" .Page ) }} - +{{ partial "shortcodes/version.html" (dict "page" .Page) -}} - - {{- partial "head.html" . }} - + + {{ partial "head.html" . -}} - - -
+ {{ if eq site.BaseURL "https://docs.arangodb.com" }}{{ partial "tracking/body-start.html" . }}{{ end -}} +
- {{ partial "header.html" . }} - - + {{ partial "header.html" . -}} +
- {{ partial "breadcrumbs.html" . }} {{- partial - "output-partial.hugo" (dict "base" "body" "page" . "parameter" - (dict "page" . "content" (partial "output-partial.hugo" (dict - "base" "content" "page" . "parameter" .)))) }} {{ partial - "toc.html" . }} + {{ partial "breadcrumbs.html" . -}} + {{ partial "output-partial.hugo" (dict "base" "body" "page" . "parameter" (dict "page" . "content" (partial "output-partial.hugo" (dict "base" "content" "page" . "parameter" .)))) }} + {{ partial "toc.html" . -}}
- {{ partial "search.html" . }} - - + {{ partial "search.html" . -}} + {{ if eq site.BaseURL "https://docs.arangodb.com" }}{{ partial "tracking/body-end.html" . }}{{ end -}} diff --git a/site/themes/arangodb-docs-theme/layouts/_default/list.html b/site/themes/arangodb-docs-theme/layouts/_default/list.html index 000033643e..851de38a05 100644 --- a/site/themes/arangodb-docs-theme/layouts/_default/list.html +++ b/site/themes/arangodb-docs-theme/layouts/_default/list.html @@ -1,33 +1,27 @@ -{{- partial "shortcodes/version.html" (dict - "page" .Page -) }} +{{- partial "shortcodes/version.html" (dict "page" .Page) -}} - - {{- partial "head.html" . }} - + {{ partial "head.html" . -}} - - + {{ if eq site.BaseURL "https://docs.arangodb.com" }}{{ partial "tracking/body-start.html" . }}{{ end -}}
-
-
- {{ partial "header.html" . }} - - - -
-
- {{ if gt (len .Page.Ancestors) 1 }}{{ partial "breadcrumbs.html" . }}{{ end }} - {{- partial "output-partial.hugo" (dict "base" "body" "page" . "parameter" (dict "page" . "content" (partial "output-partial.hugo" (dict "base" "content" "page" . "parameter" .)))) }} - {{ partial "toc.html" . }} -
- -
- {{- partialCached "back-to-top.html" . }} - {{ partial "search.html" . }} - - +
+
+ {{ partial "header.html" . -}} + +
+
+ {{ if gt (len .Page.Ancestors) 1 }}{{ partial "breadcrumbs.html" . }}{{ end -}} + {{ partial "output-partial.hugo" (dict "base" "body" "page" . "parameter" (dict "page" . "content" (partial "output-partial.hugo" (dict "base" "content" "page" . "parameter" .)))) -}} + {{ partial "toc.html" . -}} +
+
+
+
+
+ {{ partialCached "back-to-top.html" . -}} + {{ partial "search.html" . -}} + {{ if eq site.BaseURL "https://docs.arangodb.com" }}{{ partial "tracking/body-end.html" . }}{{ end -}} - \ No newline at end of file + diff --git a/site/themes/arangodb-docs-theme/layouts/_default/single.html b/site/themes/arangodb-docs-theme/layouts/_default/single.html index 9a373d74f1..1b768cd92b 100644 --- a/site/themes/arangodb-docs-theme/layouts/_default/single.html +++ b/site/themes/arangodb-docs-theme/layouts/_default/single.html @@ -1,34 +1,27 @@ -{{- partial "shortcodes/version.html" (dict - "page" .Page -) }} - +{{ partial "shortcodes/version.html" (dict "page" .Page) -}} - - {{- partial "head.html" . }} - + {{ partial "head.html" . -}} - - + {{ if eq site.BaseURL "https://docs.arangodb.com" }}{{ partial "tracking/body-start.html" . }}{{ end -}}
-
-
- {{ partial "header.html" . }} - - - -
-
- {{ partial "breadcrumbs.html" . }} - {{- partial "output-partial.hugo" (dict "base" "body" "page" . "parameter" (dict "page" . "content" (partial "output-partial.hugo" (dict "base" "content" "page" . "parameter" .)))) }} - {{ partial "toc.html" . }} -
- -
- {{- partial "back-to-top.html" . }} - {{ partial "search.html" . }} - - - - \ No newline at end of file +
+
+ {{ partial "header.html" . -}} + +
+
+ {{ partial "breadcrumbs.html" . -}} + {{ partial "output-partial.hugo" (dict "base" "body" "page" . "parameter" (dict "page" . "content" (partial "output-partial.hugo" (dict "base" "content" "page" . "parameter" .)))) -}} + {{ partial "toc.html" . -}} +
+
+
+
+
+ {{ partial "back-to-top.html" . -}} + {{ partial "search.html" . -}} + {{ if eq site.BaseURL "https://docs.arangodb.com" }}{{ partial "tracking/body-end.html" . }}{{ end -}} + + diff --git a/site/themes/arangodb-docs-theme/layouts/partials/head.html b/site/themes/arangodb-docs-theme/layouts/partials/head.html index 165f428aa5..5ace87421d 100644 --- a/site/themes/arangodb-docs-theme/layouts/partials/head.html +++ b/site/themes/arangodb-docs-theme/layouts/partials/head.html @@ -1,20 +1,18 @@ - {{- partial "stylesheet.html" . }} + {{ partial "stylesheet.html" . -}} - {{- partial "meta.html" . }} - {{- $link := "" }} - {{ if and .Title (not (eq .Title .Site.Title)) }}{{ .Title | markdownify | plainify | safeHTML }} {{ default "::" .Site.Params.titleSeparator }} {{ end }}{{ .Site.Title }} + {{ partial "meta.html" . -}} + {{ $link := "" -}} + {{ if and .Title (not (eq .Title .Site.Title)) }}{{ .Title | markdownify | plainify | safeHTML }} {{ default "::" .Site.Params.titleSeparator }} {{ end }}{{ .Site.Title }} + + {{ partial "javascript.html" . -}} - - {{- partial "javascript.html" . }} - - {{ if eq site.BaseURL "https://docs.arangodb.com" }} - {{- partial "shortcodes/tracking/gtag.html" . }} - {{- partial "shortcodes/tracking/gtm.html" . }} - {{- partial "shortcodes/tracking/ga.html" . }} - {{- partial "shortcodes/tracking/twitter.html" . }} - {{- partial "shortcodes/tracking/linkedin.html" . }} - {{- partial "shortcodes/tracking/zoominfo.html" . }} - {{ end }} - - \ No newline at end of file + {{ if eq site.BaseURL "https://docs.arangodb.com" -}} + {{- partial "shortcodes/tracking/gtag.html" . -}} + {{- partial "shortcodes/tracking/gtm.html" . -}} + {{- partial "shortcodes/tracking/ga.html" . -}} + {{- partial "shortcodes/tracking/twitter.html" . -}} + {{- partial "shortcodes/tracking/linkedin.html" . -}} + {{- partial "shortcodes/tracking/zoominfo.html" . -}} + {{ end -}} + diff --git a/site/themes/arangodb-docs-theme/layouts/partials/tracking/body-end.html b/site/themes/arangodb-docs-theme/layouts/partials/tracking/body-end.html new file mode 100644 index 0000000000..608882c57e --- /dev/null +++ b/site/themes/arangodb-docs-theme/layouts/partials/tracking/body-end.html @@ -0,0 +1,2 @@ + + diff --git a/site/themes/arangodb-docs-theme/layouts/partials/tracking/body-start.html b/site/themes/arangodb-docs-theme/layouts/partials/tracking/body-start.html new file mode 100644 index 0000000000..3c8d1bca72 --- /dev/null +++ b/site/themes/arangodb-docs-theme/layouts/partials/tracking/body-start.html @@ -0,0 +1,2 @@ + + diff --git a/site/themes/arangodb-docs-theme/layouts/partials/shortcodes/tracking/ga.html b/site/themes/arangodb-docs-theme/layouts/partials/tracking/ga.html similarity index 100% rename from site/themes/arangodb-docs-theme/layouts/partials/shortcodes/tracking/ga.html rename to site/themes/arangodb-docs-theme/layouts/partials/tracking/ga.html diff --git a/site/themes/arangodb-docs-theme/layouts/partials/shortcodes/tracking/gtag.html b/site/themes/arangodb-docs-theme/layouts/partials/tracking/gtag.html similarity index 100% rename from site/themes/arangodb-docs-theme/layouts/partials/shortcodes/tracking/gtag.html rename to site/themes/arangodb-docs-theme/layouts/partials/tracking/gtag.html diff --git a/site/themes/arangodb-docs-theme/layouts/partials/shortcodes/tracking/gtm.html b/site/themes/arangodb-docs-theme/layouts/partials/tracking/gtm.html similarity index 100% rename from site/themes/arangodb-docs-theme/layouts/partials/shortcodes/tracking/gtm.html rename to site/themes/arangodb-docs-theme/layouts/partials/tracking/gtm.html diff --git a/site/themes/arangodb-docs-theme/layouts/partials/shortcodes/tracking/linkedin.html b/site/themes/arangodb-docs-theme/layouts/partials/tracking/linkedin.html similarity index 100% rename from site/themes/arangodb-docs-theme/layouts/partials/shortcodes/tracking/linkedin.html rename to site/themes/arangodb-docs-theme/layouts/partials/tracking/linkedin.html diff --git a/site/themes/arangodb-docs-theme/layouts/partials/shortcodes/tracking/twitter.html b/site/themes/arangodb-docs-theme/layouts/partials/tracking/twitter.html similarity index 100% rename from site/themes/arangodb-docs-theme/layouts/partials/shortcodes/tracking/twitter.html rename to site/themes/arangodb-docs-theme/layouts/partials/tracking/twitter.html diff --git a/site/themes/arangodb-docs-theme/layouts/partials/shortcodes/tracking/zoominfo.html b/site/themes/arangodb-docs-theme/layouts/partials/tracking/zoominfo.html similarity index 100% rename from site/themes/arangodb-docs-theme/layouts/partials/shortcodes/tracking/zoominfo.html rename to site/themes/arangodb-docs-theme/layouts/partials/tracking/zoominfo.html From 931431eee51a7e1043921a7fbd3251f834da1d47 Mon Sep 17 00:00:00 2001 From: Simran Spiller Date: Tue, 17 Oct 2023 11:17:19 +0200 Subject: [PATCH 07/19] Fix tracking partial path --- .../arangodb-docs-theme/layouts/partials/head.html | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/site/themes/arangodb-docs-theme/layouts/partials/head.html b/site/themes/arangodb-docs-theme/layouts/partials/head.html index 5ace87421d..6c3840bbdf 100644 --- a/site/themes/arangodb-docs-theme/layouts/partials/head.html +++ b/site/themes/arangodb-docs-theme/layouts/partials/head.html @@ -8,11 +8,11 @@ {{ partial "javascript.html" . -}} {{ if eq site.BaseURL "https://docs.arangodb.com" -}} - {{- partial "shortcodes/tracking/gtag.html" . -}} - {{- partial "shortcodes/tracking/gtm.html" . -}} - {{- partial "shortcodes/tracking/ga.html" . -}} - {{- partial "shortcodes/tracking/twitter.html" . -}} - {{- partial "shortcodes/tracking/linkedin.html" . -}} - {{- partial "shortcodes/tracking/zoominfo.html" . -}} + {{- partial "tracking/gtag.html" . -}} + {{- partial "tracking/gtm.html" . -}} + {{- partial "tracking/ga.html" . -}} + {{- partial "tracking/twitter.html" . -}} + {{- partial "tracking/linkedin.html" . -}} + {{- partial "tracking/zoominfo.html" . -}} {{ end -}} From 4fab5b7e2bc313d1718a8864e50b04a237912c32 Mon Sep 17 00:00:00 2001 From: Simran Spiller Date: Tue, 17 Oct 2023 11:20:42 +0200 Subject: [PATCH 08/19] Whitespace --- .../layouts/partials/tracking/ga.html | 42 +++++++++---------- .../layouts/partials/tracking/gtag.html | 2 +- .../layouts/partials/tracking/gtm.html | 10 ++--- .../layouts/partials/tracking/linkedin.html | 21 +++++----- .../layouts/partials/tracking/twitter.html | 12 +++--- .../layouts/partials/tracking/zoominfo.html | 20 ++++----- 6 files changed, 54 insertions(+), 53 deletions(-) diff --git a/site/themes/arangodb-docs-theme/layouts/partials/tracking/ga.html b/site/themes/arangodb-docs-theme/layouts/partials/tracking/ga.html index e9452e7296..576aed8dea 100644 --- a/site/themes/arangodb-docs-theme/layouts/partials/tracking/ga.html +++ b/site/themes/arangodb-docs-theme/layouts/partials/tracking/ga.html @@ -1,22 +1,22 @@ \ No newline at end of file + (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){ + (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o), + m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m) + })(window,document,'script','https://www.google-analytics.com/analytics.js','ga'); + + ga('provide', 'adblockTracker', function(tracker, opts) { + var ad = document.createElement('ins'); + ad.className = 'AdSense'; + ad.style.display = 'block'; + ad.style.position = 'absolute'; + ad.style.top = '-1px'; + ad.style.height = '1px'; + document.body.appendChild(ad); + tracker.set('dimension' + opts.dimensionIndex, !ad.clientHeight); + document.body.removeChild(ad); + }); + + ga('create', 'UA-81053435-6', 'auto'); + ga('require', 'adblockTracker', {dimensionIndex: 1}); + ga('send', 'pageview'); + diff --git a/site/themes/arangodb-docs-theme/layouts/partials/tracking/gtag.html b/site/themes/arangodb-docs-theme/layouts/partials/tracking/gtag.html index 26513d48c8..3eb91b9ed4 100644 --- a/site/themes/arangodb-docs-theme/layouts/partials/tracking/gtag.html +++ b/site/themes/arangodb-docs-theme/layouts/partials/tracking/gtag.html @@ -4,4 +4,4 @@ function gtag(){dataLayer.push(arguments);} gtag('js', new Date()); gtag('config', 'UA-81053435-1'); - \ No newline at end of file + diff --git a/site/themes/arangodb-docs-theme/layouts/partials/tracking/gtm.html b/site/themes/arangodb-docs-theme/layouts/partials/tracking/gtm.html index 30ce11c7b3..66f8aa8550 100644 --- a/site/themes/arangodb-docs-theme/layouts/partials/tracking/gtm.html +++ b/site/themes/arangodb-docs-theme/layouts/partials/tracking/gtm.html @@ -1,6 +1,6 @@ \ No newline at end of file + new Date().getTime(),event:'gtm.js'});var f=d.getElementsByTagName(s)[0], + j=d.createElement(s),dl=l!='dataLayer'?'&l='+l:'';j.async=true;j.src= + 'https://www.googletagmanager.com/gtm.js?id='+i+dl;f.parentNode.insertBefore(j,f); + })(window,document,'script','dataLayer','GTM-5LQ7HC'); + diff --git a/site/themes/arangodb-docs-theme/layouts/partials/tracking/linkedin.html b/site/themes/arangodb-docs-theme/layouts/partials/tracking/linkedin.html index a4fbcf0f26..795c95d968 100644 --- a/site/themes/arangodb-docs-theme/layouts/partials/tracking/linkedin.html +++ b/site/themes/arangodb-docs-theme/layouts/partials/tracking/linkedin.html @@ -1,11 +1,12 @@ \ No newline at end of file + _linkedin_partner_id = "499017"; + window._linkedin_data_partner_ids = window._linkedin_data_partner_ids || []; + window._linkedin_data_partner_ids.push(_linkedin_partner_id); + + diff --git a/site/themes/arangodb-docs-theme/layouts/partials/tracking/twitter.html b/site/themes/arangodb-docs-theme/layouts/partials/tracking/twitter.html index 5785cfb6d2..f6c4bc6300 100644 --- a/site/themes/arangodb-docs-theme/layouts/partials/tracking/twitter.html +++ b/site/themes/arangodb-docs-theme/layouts/partials/tracking/twitter.html @@ -1,7 +1,7 @@ \ No newline at end of file + !function(e,t,n,s,u,a){e.twq||(s=e.twq=function(){s.exe?s.exe.apply(s,arguments):s.queue.push(arguments); + },s.version='1.1',s.queue=[],u=t.createElement(n),u.async=!0,u.src='//static.ads-twitter.com/uwt.js', + a=t.getElementsByTagName(n)[0],a.parentNode.insertBefore(u,a))}(window,document,'script'); + twq('init','nz793'); + twq('track','PageView'); + diff --git a/site/themes/arangodb-docs-theme/layouts/partials/tracking/zoominfo.html b/site/themes/arangodb-docs-theme/layouts/partials/tracking/zoominfo.html index 688cc8ff33..0bac1924d3 100644 --- a/site/themes/arangodb-docs-theme/layouts/partials/tracking/zoominfo.html +++ b/site/themes/arangodb-docs-theme/layouts/partials/tracking/zoominfo.html @@ -1,12 +1,12 @@ \ No newline at end of file + (function () { + var zi = document.createElement('script'); + zi.type = 'text/javascript'; + zi.async = true; + zi.referrerPolicy = 'unsafe-url'; + zi.src = 'https://ws.zoominfo.com/pixel/60e5aeed1cb467001537be54'; + var s = document.getElementsByTagName('script')[0]; + s.parentNode.insertBefore(zi, s); + })(); + From 6737c41f40a4d5949865e7094c5f850efeac32e1 Mon Sep 17 00:00:00 2001 From: Simran Spiller Date: Tue, 17 Oct 2023 11:32:40 +0200 Subject: [PATCH 09/19] Remove tracking (utm_*) from cloud.arangodb.com/home links in local and preview builds --- .../layouts/_default/_markup/render-link.html | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/site/themes/arangodb-docs-theme/layouts/_default/_markup/render-link.html b/site/themes/arangodb-docs-theme/layouts/_default/_markup/render-link.html index 614aa0ba49..29a6577b89 100644 --- a/site/themes/arangodb-docs-theme/layouts/_default/_markup/render-link.html +++ b/site/themes/arangodb-docs-theme/layouts/_default/_markup/render-link.html @@ -11,7 +11,11 @@ {{- $isRemote := ne $url.Scheme "" }} {{ if $isRemote -}} - {{ $permalink = .Destination -}} + {{ if and (ne site.BaseURL "https://docs.arangodb.com") (eq .Destination "https://cloud.arangodb.com/home?utm_source=docs&utm_medium=cluster_pages&utm_campaign=docs_traffic") -}} + {{ $permalink = "https://cloud.arangodb.com/home" -}} + {{ else -}} + {{ $permalink = .Destination -}} + {{ end -}} {{ else -}} {{ $isOnlyFragment := findRE `(?m)^#` $link }} {{ if $isOnlyFragment }} From dfb4822eea8e32f3c012c7f09dd429bdab648bd4 Mon Sep 17 00:00:00 2001 From: Simran Spiller Date: Tue, 17 Oct 2023 12:20:51 +0200 Subject: [PATCH 10/19] Refactor page tracking --- .../arangodb-docs-theme/static/js/theme.js | 46 ++++++++++--------- 1 file changed, 24 insertions(+), 22 deletions(-) diff --git a/site/themes/arangodb-docs-theme/static/js/theme.js b/site/themes/arangodb-docs-theme/static/js/theme.js index a76b8303c9..ebbe8ecbfb 100644 --- a/site/themes/arangodb-docs-theme/static/js/theme.js +++ b/site/themes/arangodb-docs-theme/static/js/theme.js @@ -27,7 +27,7 @@ function menuEntryClickListener() { return } console.log(event.target) - updateHistory("", event.target.getAttribute('href')) + updateHistory(event.target.getAttribute('href')) $('#sidebar.mobile').removeClass("active") }); @@ -109,17 +109,15 @@ function replaceArticle(href, newDoc) { } -function updateHistory(title, url) { - console.log("Update History " + url) - if (url == window.location.href) { +function updateHistory(urlPath) { + console.log("Update History " + urlPath) + if (urlPath == window.location.pathname + window.location.hash) { return } - window.history.pushState("navchange", "ArangoDB Documentation", url); + window.history.pushState("navchange", "ArangoDB Documentation", urlPath); + trackPageView(document.title, urlPath); - var _hsq = window._hsq = window._hsq || []; - _hsq.push(['setPath', url]); - _hsq.push(['trackPageView']); var popStateEvent = new PopStateEvent('popstate', { state: "navchange" }); dispatchEvent(popStateEvent); } @@ -181,7 +179,7 @@ function internalLinkListener() { return; } event.preventDefault(); - updateHistory("", event.target.getAttribute('href')) + updateHistory(event.target.getAttribute('href')) }) } @@ -193,7 +191,18 @@ function codeShowMoreListener() { }) } +function trackPageView(title, urlPath) { + if (window.gtag) { + gtag('config', 'UA-81053435-1', { + 'page_title': title, + 'page_path': urlPath + }); + } + var _hsq = window._hsq = window._hsq || []; + _hsq.push(['setPath', urlPath]); + _hsq.push(['trackPageView']); +} function initArticle(url) { restoreTabSelections(); @@ -220,11 +229,7 @@ $(window).on('popstate', function (e) { $(window).on('hashchange', function (e) { window.history.pushState("popstate", "ArangoDB Documentation", window.location.href); - - var _hsq = window._hsq = window._hsq || []; - _hsq.push(['setPath', window.location.href]); - _hsq.push(['trackPageView']); - + trackPageView(document.title, url); scrollToFragment() }); @@ -419,9 +424,9 @@ function changeVersion() { } - var newUrl = window.location.href.replace(getVersionByURL(), getVersionInfo(newVersion).alias) + var newUrl = window.location.pathname.replace(getVersionByURL(), getVersionInfo(newVersion).alias) + window.location.hash; console.log("Change Version URL " + newUrl) - updateHistory("", newUrl); + updateHistory(newUrl); } @@ -517,8 +522,8 @@ const goToTop = (event) => { function goToHomepage(event){ event.preventDefault(); - var homepage = window.location.origin + "/" + getVersionByURL() + "/"; - updateHistory("", homepage); + var homepage = "/" + getVersionByURL() + "/"; + updateHistory(homepage); } function copyURI(evt) { @@ -544,10 +549,7 @@ function toggleExpandShortcode(event) { window.onload = () => { window.history.pushState("popstate", "ArangoDB Documentation", window.location.href); - - var _hsq = window._hsq = window._hsq || []; - _hsq.push(['setPath', window.location.href]); - _hsq.push(['trackPageView']); + trackPageView(document.title, window.location.pathname); var iframe = document.getElementById('menu-iframe'); var iFrameBody = iframe.contentDocument || iframe.contentWindow.document; From d9f828a2d9e95c0453ee27ceed3fdd418abc0f20 Mon Sep 17 00:00:00 2001 From: Simran Spiller Date: Tue, 17 Oct 2023 12:21:31 +0200 Subject: [PATCH 11/19] Don't track hashchange event --- site/themes/arangodb-docs-theme/static/js/theme.js | 1 - 1 file changed, 1 deletion(-) diff --git a/site/themes/arangodb-docs-theme/static/js/theme.js b/site/themes/arangodb-docs-theme/static/js/theme.js index ebbe8ecbfb..129374cdb7 100644 --- a/site/themes/arangodb-docs-theme/static/js/theme.js +++ b/site/themes/arangodb-docs-theme/static/js/theme.js @@ -229,7 +229,6 @@ $(window).on('popstate', function (e) { $(window).on('hashchange', function (e) { window.history.pushState("popstate", "ArangoDB Documentation", window.location.href); - trackPageView(document.title, url); scrollToFragment() }); From 230df3fbc9f0d9cc10eca03244dec1c52656f2a7 Mon Sep 17 00:00:00 2001 From: Simran Spiller Date: Tue, 17 Oct 2023 12:36:15 +0200 Subject: [PATCH 12/19] Remove unnecessary use of base URL --- .../arangodb-docs-theme/layouts/_default/home.notfound.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/site/themes/arangodb-docs-theme/layouts/_default/home.notfound.html b/site/themes/arangodb-docs-theme/layouts/_default/home.notfound.html index 6e46d38208..550daa1843 100644 --- a/site/themes/arangodb-docs-theme/layouts/_default/home.notfound.html +++ b/site/themes/arangodb-docs-theme/layouts/_default/home.notfound.html @@ -12,7 +12,7 @@

Oops… Avocados are not growing here

- Back to Home + Back to Home

From 2e1ed9a87afa8b4cba6d67745a5ed1ac70a1c34d Mon Sep 17 00:00:00 2001 From: Simran Spiller Date: Tue, 17 Oct 2023 12:36:42 +0200 Subject: [PATCH 13/19] Exclude hash-only changes from tracking in updateHistory() --- site/themes/arangodb-docs-theme/static/js/theme.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/site/themes/arangodb-docs-theme/static/js/theme.js b/site/themes/arangodb-docs-theme/static/js/theme.js index 129374cdb7..3b8b20aef8 100644 --- a/site/themes/arangodb-docs-theme/static/js/theme.js +++ b/site/themes/arangodb-docs-theme/static/js/theme.js @@ -116,7 +116,7 @@ function updateHistory(urlPath) { } window.history.pushState("navchange", "ArangoDB Documentation", urlPath); - trackPageView(document.title, urlPath); + if (!urlPath.startsWith("#")) trackPageView(document.title, urlPath); var popStateEvent = new PopStateEvent('popstate', { state: "navchange" }); dispatchEvent(popStateEvent); From 97e71629c35df12e24631fd8b018f47f3957b87f Mon Sep 17 00:00:00 2001 From: Simran Spiller Date: Tue, 17 Oct 2023 12:43:51 +0200 Subject: [PATCH 14/19] Use $isProduction variable to be self-descriptive --- .../layouts/_default/_markup/render-link.html | 3 ++- site/themes/arangodb-docs-theme/layouts/_default/index.html | 6 +++--- site/themes/arangodb-docs-theme/layouts/_default/list.html | 5 +++-- .../themes/arangodb-docs-theme/layouts/_default/single.html | 5 +++-- site/themes/arangodb-docs-theme/layouts/partials/head.html | 3 ++- 5 files changed, 13 insertions(+), 9 deletions(-) diff --git a/site/themes/arangodb-docs-theme/layouts/_default/_markup/render-link.html b/site/themes/arangodb-docs-theme/layouts/_default/_markup/render-link.html index 29a6577b89..a40b74161b 100644 --- a/site/themes/arangodb-docs-theme/layouts/_default/_markup/render-link.html +++ b/site/themes/arangodb-docs-theme/layouts/_default/_markup/render-link.html @@ -11,7 +11,8 @@ {{- $isRemote := ne $url.Scheme "" }} {{ if $isRemote -}} - {{ if and (ne site.BaseURL "https://docs.arangodb.com") (eq .Destination "https://cloud.arangodb.com/home?utm_source=docs&utm_medium=cluster_pages&utm_campaign=docs_traffic") -}} + {{ $isProduction := eq site.BaseURL "https://docs.arangodb.com" }} + {{ if and (not $isProduction) (eq .Destination "https://cloud.arangodb.com/home?utm_source=docs&utm_medium=cluster_pages&utm_campaign=docs_traffic") -}} {{ $permalink = "https://cloud.arangodb.com/home" -}} {{ else -}} {{ $permalink = .Destination -}} diff --git a/site/themes/arangodb-docs-theme/layouts/_default/index.html b/site/themes/arangodb-docs-theme/layouts/_default/index.html index f4f9a2ec6f..55b9af5b09 100644 --- a/site/themes/arangodb-docs-theme/layouts/_default/index.html +++ b/site/themes/arangodb-docs-theme/layouts/_default/index.html @@ -1,10 +1,10 @@ {{ partial "shortcodes/version.html" (dict "page" .Page) -}} - +{{ $isProduction := eq site.BaseURL "https://docs.arangodb.com" -}} {{ partial "head.html" . -}} - {{ if eq site.BaseURL "https://docs.arangodb.com" }}{{ partial "tracking/body-start.html" . }}{{ end -}} + {{ if $isProduction }}{{ partial "tracking/body-start.html" . }}{{ end -}}
@@ -21,6 +21,6 @@
{{ partial "search.html" . -}} - {{ if eq site.BaseURL "https://docs.arangodb.com" }}{{ partial "tracking/body-end.html" . }}{{ end -}} + {{ if $isProduction }}{{ partial "tracking/body-end.html" . }}{{ end -}} diff --git a/site/themes/arangodb-docs-theme/layouts/_default/list.html b/site/themes/arangodb-docs-theme/layouts/_default/list.html index 851de38a05..7455bbad77 100644 --- a/site/themes/arangodb-docs-theme/layouts/_default/list.html +++ b/site/themes/arangodb-docs-theme/layouts/_default/list.html @@ -1,10 +1,11 @@ {{- partial "shortcodes/version.html" (dict "page" .Page) -}} +{{ $isProduction := eq site.BaseURL "https://docs.arangodb.com" -}} {{ partial "head.html" . -}} - {{ if eq site.BaseURL "https://docs.arangodb.com" }}{{ partial "tracking/body-start.html" . }}{{ end -}} + {{ if $isProduction }}{{ partial "tracking/body-start.html" . }}{{ end -}}
@@ -22,6 +23,6 @@
{{ partialCached "back-to-top.html" . -}} {{ partial "search.html" . -}} - {{ if eq site.BaseURL "https://docs.arangodb.com" }}{{ partial "tracking/body-end.html" . }}{{ end -}} + {{ if $isProduction }}{{ partial "tracking/body-end.html" . }}{{ end -}} diff --git a/site/themes/arangodb-docs-theme/layouts/_default/single.html b/site/themes/arangodb-docs-theme/layouts/_default/single.html index 1b768cd92b..ace65db200 100644 --- a/site/themes/arangodb-docs-theme/layouts/_default/single.html +++ b/site/themes/arangodb-docs-theme/layouts/_default/single.html @@ -1,10 +1,11 @@ {{ partial "shortcodes/version.html" (dict "page" .Page) -}} +{{ $isProduction := eq site.BaseURL "https://docs.arangodb.com" -}} {{ partial "head.html" . -}} - {{ if eq site.BaseURL "https://docs.arangodb.com" }}{{ partial "tracking/body-start.html" . }}{{ end -}} + {{ if $isProduction }}{{ partial "tracking/body-start.html" . }}{{ end -}}
@@ -22,6 +23,6 @@
{{ partial "back-to-top.html" . -}} {{ partial "search.html" . -}} - {{ if eq site.BaseURL "https://docs.arangodb.com" }}{{ partial "tracking/body-end.html" . }}{{ end -}} + {{ if $isProduction }}{{ partial "tracking/body-end.html" . }}{{ end -}} diff --git a/site/themes/arangodb-docs-theme/layouts/partials/head.html b/site/themes/arangodb-docs-theme/layouts/partials/head.html index 6c3840bbdf..d48b0dba0d 100644 --- a/site/themes/arangodb-docs-theme/layouts/partials/head.html +++ b/site/themes/arangodb-docs-theme/layouts/partials/head.html @@ -7,7 +7,8 @@ {{ partial "javascript.html" . -}} - {{ if eq site.BaseURL "https://docs.arangodb.com" -}} + {{ $isProduction := eq site.BaseURL "https://docs.arangodb.com" -}} + {{ if $isProduction -}} {{- partial "tracking/gtag.html" . -}} {{- partial "tracking/gtm.html" . -}} {{- partial "tracking/ga.html" . -}} From 239f75bf9daf093dcfd89aa6aa2e88e4d9fcc20b Mon Sep 17 00:00:00 2001 From: Simran Spiller Date: Tue, 17 Oct 2023 12:45:36 +0200 Subject: [PATCH 15/19] Temporarily invert logic for testing --- .../layouts/_default/_markup/render-link.html | 2 +- site/themes/arangodb-docs-theme/layouts/_default/index.html | 2 +- site/themes/arangodb-docs-theme/layouts/_default/list.html | 2 +- site/themes/arangodb-docs-theme/layouts/_default/single.html | 2 +- site/themes/arangodb-docs-theme/layouts/partials/head.html | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/site/themes/arangodb-docs-theme/layouts/_default/_markup/render-link.html b/site/themes/arangodb-docs-theme/layouts/_default/_markup/render-link.html index a40b74161b..6c40581ca7 100644 --- a/site/themes/arangodb-docs-theme/layouts/_default/_markup/render-link.html +++ b/site/themes/arangodb-docs-theme/layouts/_default/_markup/render-link.html @@ -11,7 +11,7 @@ {{- $isRemote := ne $url.Scheme "" }} {{ if $isRemote -}} - {{ $isProduction := eq site.BaseURL "https://docs.arangodb.com" }} + {{ $isProduction := ne site.BaseURL "https://docs.arangodb.com" }} {{ if and (not $isProduction) (eq .Destination "https://cloud.arangodb.com/home?utm_source=docs&utm_medium=cluster_pages&utm_campaign=docs_traffic") -}} {{ $permalink = "https://cloud.arangodb.com/home" -}} {{ else -}} diff --git a/site/themes/arangodb-docs-theme/layouts/_default/index.html b/site/themes/arangodb-docs-theme/layouts/_default/index.html index 55b9af5b09..168c71ea4e 100644 --- a/site/themes/arangodb-docs-theme/layouts/_default/index.html +++ b/site/themes/arangodb-docs-theme/layouts/_default/index.html @@ -1,5 +1,5 @@ {{ partial "shortcodes/version.html" (dict "page" .Page) -}} -{{ $isProduction := eq site.BaseURL "https://docs.arangodb.com" -}} +{{ $isProduction := ne site.BaseURL "https://docs.arangodb.com" -}} {{ partial "head.html" . -}} diff --git a/site/themes/arangodb-docs-theme/layouts/_default/list.html b/site/themes/arangodb-docs-theme/layouts/_default/list.html index 7455bbad77..a9cdff6d00 100644 --- a/site/themes/arangodb-docs-theme/layouts/_default/list.html +++ b/site/themes/arangodb-docs-theme/layouts/_default/list.html @@ -1,5 +1,5 @@ {{- partial "shortcodes/version.html" (dict "page" .Page) -}} -{{ $isProduction := eq site.BaseURL "https://docs.arangodb.com" -}} +{{ $isProduction := ne site.BaseURL "https://docs.arangodb.com" -}} diff --git a/site/themes/arangodb-docs-theme/layouts/_default/single.html b/site/themes/arangodb-docs-theme/layouts/_default/single.html index ace65db200..8a4522900f 100644 --- a/site/themes/arangodb-docs-theme/layouts/_default/single.html +++ b/site/themes/arangodb-docs-theme/layouts/_default/single.html @@ -1,5 +1,5 @@ {{ partial "shortcodes/version.html" (dict "page" .Page) -}} -{{ $isProduction := eq site.BaseURL "https://docs.arangodb.com" -}} +{{ $isProduction := ne site.BaseURL "https://docs.arangodb.com" -}} diff --git a/site/themes/arangodb-docs-theme/layouts/partials/head.html b/site/themes/arangodb-docs-theme/layouts/partials/head.html index d48b0dba0d..17e6b4a2ad 100644 --- a/site/themes/arangodb-docs-theme/layouts/partials/head.html +++ b/site/themes/arangodb-docs-theme/layouts/partials/head.html @@ -7,7 +7,7 @@ {{ partial "javascript.html" . -}} - {{ $isProduction := eq site.BaseURL "https://docs.arangodb.com" -}} + {{ $isProduction := ne site.BaseURL "https://docs.arangodb.com" -}} {{ if $isProduction -}} {{- partial "tracking/gtag.html" . -}} {{- partial "tracking/gtm.html" . -}} From 3113c9b13d97593b4456a6c8d3f1a1601b7ba94e Mon Sep 17 00:00:00 2001 From: Simran Spiller Date: Wed, 18 Oct 2023 11:21:21 +0200 Subject: [PATCH 16/19] Remove ZoomInfo --- .../arangodb-docs-theme/layouts/partials/head.html | 1 - .../layouts/partials/tracking/body-end.html | 1 - .../layouts/partials/tracking/zoominfo.html | 12 ------------ 3 files changed, 14 deletions(-) delete mode 100644 site/themes/arangodb-docs-theme/layouts/partials/tracking/zoominfo.html diff --git a/site/themes/arangodb-docs-theme/layouts/partials/head.html b/site/themes/arangodb-docs-theme/layouts/partials/head.html index 17e6b4a2ad..40ef67d3b3 100644 --- a/site/themes/arangodb-docs-theme/layouts/partials/head.html +++ b/site/themes/arangodb-docs-theme/layouts/partials/head.html @@ -14,6 +14,5 @@ {{- partial "tracking/ga.html" . -}} {{- partial "tracking/twitter.html" . -}} {{- partial "tracking/linkedin.html" . -}} - {{- partial "tracking/zoominfo.html" . -}} {{ end -}} diff --git a/site/themes/arangodb-docs-theme/layouts/partials/tracking/body-end.html b/site/themes/arangodb-docs-theme/layouts/partials/tracking/body-end.html index 608882c57e..b263f38353 100644 --- a/site/themes/arangodb-docs-theme/layouts/partials/tracking/body-end.html +++ b/site/themes/arangodb-docs-theme/layouts/partials/tracking/body-end.html @@ -1,2 +1 @@ - diff --git a/site/themes/arangodb-docs-theme/layouts/partials/tracking/zoominfo.html b/site/themes/arangodb-docs-theme/layouts/partials/tracking/zoominfo.html deleted file mode 100644 index 0bac1924d3..0000000000 --- a/site/themes/arangodb-docs-theme/layouts/partials/tracking/zoominfo.html +++ /dev/null @@ -1,12 +0,0 @@ - - From 631cb0f75bb95fd1ff474d5669ff979680979688 Mon Sep 17 00:00:00 2001 From: Simran Spiller Date: Wed, 18 Oct 2023 11:21:42 +0200 Subject: [PATCH 17/19] Cleanup --- site/themes/arangodb-docs-theme/layouts/_default/single.html | 2 +- site/themes/arangodb-docs-theme/layouts/partials/head.html | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/site/themes/arangodb-docs-theme/layouts/_default/single.html b/site/themes/arangodb-docs-theme/layouts/_default/single.html index 8a4522900f..a78b7e2d92 100644 --- a/site/themes/arangodb-docs-theme/layouts/_default/single.html +++ b/site/themes/arangodb-docs-theme/layouts/_default/single.html @@ -21,7 +21,7 @@ - {{ partial "back-to-top.html" . -}} + {{ partialCached "back-to-top.html" . -}} {{ partial "search.html" . -}} {{ if $isProduction }}{{ partial "tracking/body-end.html" . }}{{ end -}} diff --git a/site/themes/arangodb-docs-theme/layouts/partials/head.html b/site/themes/arangodb-docs-theme/layouts/partials/head.html index 40ef67d3b3..b4b53453f8 100644 --- a/site/themes/arangodb-docs-theme/layouts/partials/head.html +++ b/site/themes/arangodb-docs-theme/layouts/partials/head.html @@ -2,7 +2,6 @@ {{ partial "stylesheet.html" . -}} {{ partial "meta.html" . -}} - {{ $link := "" -}} {{ if and .Title (not (eq .Title .Site.Title)) }}{{ .Title | markdownify | plainify | safeHTML }} {{ default "::" .Site.Params.titleSeparator }} {{ end }}{{ .Site.Title }} {{ partial "javascript.html" . -}} From 39fc3e196c7d34bb120b131f4bbc7240afee06e3 Mon Sep 17 00:00:00 2001 From: Simran Spiller Date: Wed, 18 Oct 2023 11:21:46 +0200 Subject: [PATCH 18/19] Revert "Temporarily invert logic for testing" This reverts commit 239f75bf9daf093dcfd89aa6aa2e88e4d9fcc20b. --- .../layouts/_default/_markup/render-link.html | 2 +- site/themes/arangodb-docs-theme/layouts/_default/index.html | 2 +- site/themes/arangodb-docs-theme/layouts/_default/list.html | 2 +- site/themes/arangodb-docs-theme/layouts/_default/single.html | 2 +- site/themes/arangodb-docs-theme/layouts/partials/head.html | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/site/themes/arangodb-docs-theme/layouts/_default/_markup/render-link.html b/site/themes/arangodb-docs-theme/layouts/_default/_markup/render-link.html index 6c40581ca7..a40b74161b 100644 --- a/site/themes/arangodb-docs-theme/layouts/_default/_markup/render-link.html +++ b/site/themes/arangodb-docs-theme/layouts/_default/_markup/render-link.html @@ -11,7 +11,7 @@ {{- $isRemote := ne $url.Scheme "" }} {{ if $isRemote -}} - {{ $isProduction := ne site.BaseURL "https://docs.arangodb.com" }} + {{ $isProduction := eq site.BaseURL "https://docs.arangodb.com" }} {{ if and (not $isProduction) (eq .Destination "https://cloud.arangodb.com/home?utm_source=docs&utm_medium=cluster_pages&utm_campaign=docs_traffic") -}} {{ $permalink = "https://cloud.arangodb.com/home" -}} {{ else -}} diff --git a/site/themes/arangodb-docs-theme/layouts/_default/index.html b/site/themes/arangodb-docs-theme/layouts/_default/index.html index 168c71ea4e..55b9af5b09 100644 --- a/site/themes/arangodb-docs-theme/layouts/_default/index.html +++ b/site/themes/arangodb-docs-theme/layouts/_default/index.html @@ -1,5 +1,5 @@ {{ partial "shortcodes/version.html" (dict "page" .Page) -}} -{{ $isProduction := ne site.BaseURL "https://docs.arangodb.com" -}} +{{ $isProduction := eq site.BaseURL "https://docs.arangodb.com" -}} {{ partial "head.html" . -}} diff --git a/site/themes/arangodb-docs-theme/layouts/_default/list.html b/site/themes/arangodb-docs-theme/layouts/_default/list.html index a9cdff6d00..7455bbad77 100644 --- a/site/themes/arangodb-docs-theme/layouts/_default/list.html +++ b/site/themes/arangodb-docs-theme/layouts/_default/list.html @@ -1,5 +1,5 @@ {{- partial "shortcodes/version.html" (dict "page" .Page) -}} -{{ $isProduction := ne site.BaseURL "https://docs.arangodb.com" -}} +{{ $isProduction := eq site.BaseURL "https://docs.arangodb.com" -}} diff --git a/site/themes/arangodb-docs-theme/layouts/_default/single.html b/site/themes/arangodb-docs-theme/layouts/_default/single.html index a78b7e2d92..1a6d699ff5 100644 --- a/site/themes/arangodb-docs-theme/layouts/_default/single.html +++ b/site/themes/arangodb-docs-theme/layouts/_default/single.html @@ -1,5 +1,5 @@ {{ partial "shortcodes/version.html" (dict "page" .Page) -}} -{{ $isProduction := ne site.BaseURL "https://docs.arangodb.com" -}} +{{ $isProduction := eq site.BaseURL "https://docs.arangodb.com" -}} diff --git a/site/themes/arangodb-docs-theme/layouts/partials/head.html b/site/themes/arangodb-docs-theme/layouts/partials/head.html index b4b53453f8..7ae62a1a00 100644 --- a/site/themes/arangodb-docs-theme/layouts/partials/head.html +++ b/site/themes/arangodb-docs-theme/layouts/partials/head.html @@ -6,7 +6,7 @@ {{ partial "javascript.html" . -}} - {{ $isProduction := ne site.BaseURL "https://docs.arangodb.com" -}} + {{ $isProduction := eq site.BaseURL "https://docs.arangodb.com" -}} {{ if $isProduction -}} {{- partial "tracking/gtag.html" . -}} {{- partial "tracking/gtm.html" . -}} From e3aa4964482343ccb4df26b9d6e5c0b51a9624a4 Mon Sep 17 00:00:00 2001 From: Simran Spiller Date: Wed, 18 Oct 2023 11:32:55 +0200 Subject: [PATCH 19/19] Add noscript remark that JavaScript is required --- site/themes/arangodb-docs-theme/layouts/404.html | 1 + site/themes/arangodb-docs-theme/layouts/_default/index.html | 1 + site/themes/arangodb-docs-theme/layouts/_default/list.html | 1 + site/themes/arangodb-docs-theme/layouts/_default/single.html | 1 + 4 files changed, 4 insertions(+) diff --git a/site/themes/arangodb-docs-theme/layouts/404.html b/site/themes/arangodb-docs-theme/layouts/404.html index 406ea81e0b..45358a7e33 100644 --- a/site/themes/arangodb-docs-theme/layouts/404.html +++ b/site/themes/arangodb-docs-theme/layouts/404.html @@ -10,6 +10,7 @@ +
diff --git a/site/themes/arangodb-docs-theme/layouts/_default/index.html b/site/themes/arangodb-docs-theme/layouts/_default/index.html index 55b9af5b09..6e4803efbd 100644 --- a/site/themes/arangodb-docs-theme/layouts/_default/index.html +++ b/site/themes/arangodb-docs-theme/layouts/_default/index.html @@ -5,6 +5,7 @@ {{ partial "head.html" . -}} {{ if $isProduction }}{{ partial "tracking/body-start.html" . }}{{ end -}} +
diff --git a/site/themes/arangodb-docs-theme/layouts/_default/list.html b/site/themes/arangodb-docs-theme/layouts/_default/list.html index 7455bbad77..bfaf7288da 100644 --- a/site/themes/arangodb-docs-theme/layouts/_default/list.html +++ b/site/themes/arangodb-docs-theme/layouts/_default/list.html @@ -6,6 +6,7 @@ {{ partial "head.html" . -}} {{ if $isProduction }}{{ partial "tracking/body-start.html" . }}{{ end -}} +
diff --git a/site/themes/arangodb-docs-theme/layouts/_default/single.html b/site/themes/arangodb-docs-theme/layouts/_default/single.html index 1a6d699ff5..6fc173a323 100644 --- a/site/themes/arangodb-docs-theme/layouts/_default/single.html +++ b/site/themes/arangodb-docs-theme/layouts/_default/single.html @@ -6,6 +6,7 @@ {{ partial "head.html" . -}} {{ if $isProduction }}{{ partial "tracking/body-start.html" . }}{{ end -}} +