From 258814413b9de7d5838d269428dbd5f24b950777 Mon Sep 17 00:00:00 2001 From: Linh Pham Date: Wed, 31 Jul 2024 16:54:50 -0700 Subject: [PATCH] Move Google and Umami analytics to base.html --- CHANGELOG.md | 6 ++++ app/templates/base.html | 15 ---------- app/templates/core/head.html | 55 +++++++++++++++++++++++------------- app/version.py | 2 +- 4 files changed, 42 insertions(+), 36 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 66476ad..c0667cd 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,11 @@ # Changes +## 2.10.1 + +### Application Changes + +- Move web analytics tags out of `base.html` into `head.html` + ## 2.10.0 ### Application Changes diff --git a/app/templates/base.html b/app/templates/base.html index 66abf6f..f45ff70 100644 --- a/app/templates/base.html +++ b/app/templates/base.html @@ -3,21 +3,6 @@ {% block title %}{% endblock %} | Wait Wait Don't Tell Me! Graphs {% include "core/head.html" with context %} - - {% if ga_property_code %} - - - {% endif %} - - {% if umami_analytics %} - - {{ umami_analytics|safe }} - {% endif %} {% include "core/nav.html" %} diff --git a/app/templates/core/head.html b/app/templates/core/head.html index c4ab161..731e6de 100644 --- a/app/templates/core/head.html +++ b/app/templates/core/head.html @@ -1,25 +1,40 @@ - - - - -{% if site_url and request.path %} - -{% endif %} + + + + + {% if site_url and request.path %} + + {% endif %} - - - + + + - - + + - - + + - -{% if use_latest_plotly %} - -{% else %} - -{% endif %} + + {% if use_latest_plotly %} + + {% else %} + + {% endif %} + + {% if ga_property_code %} + + + {% endif %} + + {% if umami_analytics %} + + {{ umami_analytics|safe }} + {% endif %} diff --git a/app/version.py b/app/version.py index 7180397..3ae3716 100644 --- a/app/version.py +++ b/app/version.py @@ -5,4 +5,4 @@ # vim: set noai syntax=python ts=4 sw=4: """Application Version for Wait Wait Graphs Site.""" -APP_VERSION = "2.10.0" +APP_VERSION = "2.10.1"