diff --git a/wdfn-server/waterdata/templates/base.html b/wdfn-server/waterdata/templates/base.html index 9dcf6510e92199dab725d164629af80d8176ee8f..41fc48e6f5f84f8be1672a5c4197d94baa377ad3 100644 --- a/wdfn-server/waterdata/templates/base.html +++ b/wdfn-server/waterdata/templates/base.html @@ -4,9 +4,6 @@ <link rel="stylesheet" href="{{ 'main.css' | asset_url }}"> {% endblock %} -{% block bundle_script %} -{% endblock %} - {% block body %} {% include 'partials/base.html' %} <main id="main-content" class="grid-container content-container usa-prose"> diff --git a/wdfn-server/waterdata/templates/base_network.html b/wdfn-server/waterdata/templates/base_network.html index 64b716b050cb57e0b90c984edbee32c40b52a28c..f2d5a66d2ed53a85aa58d5cc4d77881138aff9c5 100644 --- a/wdfn-server/waterdata/templates/base_network.html +++ b/wdfn-server/waterdata/templates/base_network.html @@ -4,7 +4,7 @@ <link rel="stylesheet" href="{{ 'network.css' | asset_url }}"> {% endblock %} -{% block bundle_script %} +{% block page_script %} <script src="{{ 'scripts/vendor.js' | asset_url }}"></script> <script async src="{{ 'network-bundle.js' | asset_url }}"></script> {% endblock %} diff --git a/wdfn-server/waterdata/templates/base_plain.html b/wdfn-server/waterdata/templates/base_plain.html index 46777017cb61d6a2a9c982c0840c203fab20abd2..7ed4e1d1eeb37d8e0f90ff8baf51bde0a7e03132 100644 --- a/wdfn-server/waterdata/templates/base_plain.html +++ b/wdfn-server/waterdata/templates/base_plain.html @@ -38,8 +38,6 @@ } </script> - {% block bundle_script %} - {% endblock %} {% block page_script %}{% endblock %} <!-- Google Tag Manager --><script>(function(w,d,s,l,i){w[l]=w[l]||[];w[l].push({'gtm.start':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-TKQR8KP');</script> <title> diff --git a/wdfn-server/waterdata/templates/monitoring_location.html b/wdfn-server/waterdata/templates/monitoring_location.html index 7d9586bad59e3744b077a64ab4f7c42bec70efd1..06b6924141eb53bd06d505bbba2e7dc307e15a71 100644 --- a/wdfn-server/waterdata/templates/monitoring_location.html +++ b/wdfn-server/waterdata/templates/monitoring_location.html @@ -22,12 +22,9 @@ {% endif %} {% endblock %} -{% block bundle_script %} +{% block page_script %} <script src="{{ 'scripts/vendor.js' | asset_url }}"></script> <script async src="{{ 'bundle.js' | asset_url }}"></script> -{% endblock %}} - -{% block page_script %} {% if json_ld %} <script type="application/ld+json"> {{ json_ld }} diff --git a/wdfn-server/waterdata/templates/monitoring_location_embed.html b/wdfn-server/waterdata/templates/monitoring_location_embed.html index 10198ab449a7f65dc8f2031e535b065f6e5b54c9..0aa9c6a551420d1e8ff83b662f46826f948bbc51 100644 --- a/wdfn-server/waterdata/templates/monitoring_location_embed.html +++ b/wdfn-server/waterdata/templates/monitoring_location_embed.html @@ -4,7 +4,7 @@ <link rel="stylesheet" href="{{ 'main.css' | asset_url }}"> {% endblock page_css %} -{% block bundle_script %} +{% block page_script %} <script src="{{ 'scripts/vendor.js' | asset_url }}"></script> <script async src="{{ 'bundle.js' | asset_url }}"></script> {% endblock %}}