Commit 1a5459a8 authored by Silvio Rhatto's avatar Silvio Rhatto
Browse files

Merge branch 'feature/consent-ux' into 'main' 

Resolve "Consent UX styling and content"

Closes #67

See merge request tpo/onion-services/onion-launchpad!58
parents d78d0469 2a506d6a

.github/workflows/gh-pages.yml

+2 −0
Original line number Diff line number Diff line
@@ -34,6 +34,8 @@ env: 
  LEKTOR_ANALYTICS_SITE_ID: ${{ secrets.LEKTOR_ANALYTICS_SITE_ID }}

  LEKTOR_ANALYTICS_LINK_TRACKING: ${{ secrets.LEKTOR_ANALYTICS_LINK_TRACKING }}

  LEKTOR_ANALYTICS_BROWSER_DETECTION: ${{ secrets.LEKTOR_ANALYTICS_BROWSER_DETECTION }}

  LEKTOR_ANALYTICS_PRIVACY_POLICY_URL: ${{ secrets.LEKTOR_ANALYTICS_PRIVACY_POLICY_URL }}

  LEKTOR_ANALYTICS_BACKGROUND_COLOR: ${{ secrets.LEKTOR_ANALYTICS_BACKGROUND_COLOR }}

  LEKTOR_SERVICE_NAME_AM: ${{ secrets.LEKTOR_SERVICE_NAME_AM }}

  LEKTOR_SERVICE_NAME_AR: ${{ secrets.LEKTOR_SERVICE_NAME_AR }}

  LEKTOR_SERVICE_NAME_AZ: ${{ secrets.LEKTOR_SERVICE_NAME_AZ }}

.gitlab-ci-deployment.yml

+2 −0
Original line number Diff line number Diff line
@@ -27,6 +27,8 @@ variables: 
  LEKTOR_ANALYTICS_SITE_ID: '1'

  LEKTOR_ANALYTICS_LINK_TRACKING: ''

  LEKTOR_ANALYTICS_BROWSER_DETECTION: ''

  LEKTOR_ANALYTICS_PRIVACY_POLICY_URL: ''

  LEKTOR_ANALYTICS_BACKGROUND_COLOR: 'FCEDE1'



pages:

  script:

.gitlab-ci-test.yml

+2 −0
Original line number Diff line number Diff line
@@ -26,6 +26,8 @@ variables: 
  LEKTOR_ANALYTICS_SITE_ID: '1'

  LEKTOR_ANALYTICS_LINK_TRACKING: ''

  LEKTOR_ANALYTICS_BROWSER_DETECTION: ''

  LEKTOR_ANALYTICS_PRIVACY_POLICY_URL: ''

  LEKTOR_ANALYTICS_BACKGROUND_COLOR: 'FCEDE1'



pages:

  script:

.gitlab-ci.yml

+2 −0
Original line number Diff line number Diff line
@@ -18,6 +18,8 @@ variables: 
  LEKTOR_ANALYTICS_SITE_ID: '1'

  LEKTOR_ANALYTICS_LINK_TRACKING: ''

  LEKTOR_ANALYTICS_BROWSER_DETECTION: ''

  LEKTOR_ANALYTICS_PRIVACY_POLICY_URL: ''

  LEKTOR_ANALYTICS_BACKGROUND_COLOR: 'FCEDE1'



include:

  - project: tpo/tpa/ci-templates

README.md

+5 −0
Original line number Diff line number Diff line
@@ -480,6 +480,10 @@ The analytics functionality is controlled by these environment variables: 
  browser feature detection, otherwise enforces `disableBrowserFeatureDetection`.

  You might want to turn this on if your Matomo backend is too

  old, since [disabling of browser detection was implemented only recently][].

* `LEKTOR_ANALYTICS_PRIVACY_POLICY_URL`: an URL for the privacy policy, as per

  [best practices on analytics gathering][].

* `LEKTOR_ANALYTICS_BACKGROUND_COLOR`: the background color for the [consent UX][],

  in hexadecimal format (`ffffff`).



Check Matomo's [JavaScript Tracking Client][] documentation for details.
@@ -489,3 +493,4 @@ Check Matomo's [JavaScript Tracking Client][] documentation for details. 
[even if it's considered deprecated]: https://developer.mozilla.org/en-US/docs/Web/API/navigator/doNotTrack

[JavaScript Tracking Client]: https://developer.matomo.org/api-reference/tracking-javascript

[disabling of browser detection was implemented only recently]: https://github.com/matomo-org/matomo/pull/18599

[best practices on analytics gathering]: https://matomo.org/blog/2018/04/how-should-i-write-my-privacy-notice-for-matomo-analytics-under-gdpr/