Commit c7952023 by Jason Jordan

ensure google analytics code goes in head tag

parent 26c7966d
......@@ -58,7 +58,9 @@
</script>
{% from 'google_analytics.html' import googleAnalytics %} {{ googleAnalytics(X, user, permissions, control) }}
</head>
<body role="document">
{% from 'page_navigation.html' import topNavigation,footer %}
{{ topNavigation(X, user, permissions, control) }}
......
......@@ -49,7 +49,10 @@
width: auto;
}
</style>
{% from 'google_analytics.html' import googleAnalytics %} {{ googleAnalytics(X, user, permissions, control) }}
</head>
<body role="document">
{% from 'page_navigation.html' import topNavigation,footer %}
{{ topNavigation(X, user, permissions, control) }}
......
......@@ -53,7 +53,10 @@
width: auto;
}
</style>
{% from 'google_analytics.html' import googleAnalytics %} {{ googleAnalytics(X, user, permissions, control) }}
</head>
<body role="document">
{% from 'page_navigation.html' import topNavigation,footer %}
{{ topNavigation(X, user, permissions, control) }}
......
......@@ -53,7 +53,10 @@ $(document).ready(function() {
$('.table').DataTable();
});
</script>
{% from 'google_analytics.html' import googleAnalytics %} {{ googleAnalytics(X, user, permissions, control) }}
</head>
<body role="document">
{% from 'page_navigation.html' import topNavigation,footer %}
{{ topNavigation(X, user, permissions, control) }}
......
......@@ -46,7 +46,10 @@ $(document).ready(function() {
});
});
</script>
{% from 'google_analytics.html' import googleAnalytics %} {{ googleAnalytics(X, user, permissions, control) }}
</head>
<body role="document">
{% from 'page_navigation.html' import topNavigation,footer %}
{{ topNavigation(X, user, permissions, control) }}
......
......@@ -72,7 +72,10 @@ $(document).ready(function() {
$('.table').DataTable();
});
</script>
{% from 'google_analytics.html' import googleAnalytics %} {{ googleAnalytics(X, user, permissions, control) }}
</head>
<body role="document">
{% from 'page_navigation.html' import topNavigation,footer %}
{{ topNavigation(X, user, permissions, control) }}
......
......@@ -53,7 +53,10 @@ $(document).ready(function() {
$('.table').DataTable();
});
</script>
{% from 'google_analytics.html' import googleAnalytics %} {{ googleAnalytics(X, user, permissions, control) }}
</head>
<body role="document">
{% from 'page_navigation.html' import topNavigation,footer %}
{{ topNavigation(X, user, permissions, control) }}
......
......@@ -52,7 +52,10 @@ h2 {
padding-top: 60px;
}
</style>
{% from 'google_analytics.html' import googleAnalytics %} {{ googleAnalytics(X, user, permissions, control) }}
</head>
<body role="document">
{% from 'page_navigation.html' import topNavigation,footer %}
{{ topNavigation(X, user, permissions, control) }}
......
......@@ -35,6 +35,7 @@
<script src="{{control.snacURL}}/javascript/html2canvas.js{{control.noCache}}"></script>
<script src="{{control.snacURL}}/javascript/feedback.js{{control.noCache}}"></script>
{% from 'google_analytics.html' import googleAnalytics %} {{ googleAnalytics(X, user, permissions, control) }}
</head>
<body role="document">
......
......@@ -35,6 +35,7 @@
<script src="{{control.snacURL}}/javascript/html2canvas.js{{control.noCache}}"></script>
<script src="{{control.snacURL}}/javascript/feedback.js{{control.noCache}}"></script>
{% from 'google_analytics.html' import googleAnalytics %} {{ googleAnalytics(X, user, permissions, control) }}
</head>
<body role="document">
......
......@@ -35,6 +35,7 @@
<script src="{{control.snacURL}}/javascript/html2canvas.js{{control.noCache}}"></script>
<script src="{{control.snacURL}}/javascript/feedback.js{{control.noCache}}"></script>
{% from 'google_analytics.html' import googleAnalytics %} {{ googleAnalytics(X, user, permissions, control) }}
</head>
<body role="document">
......
......@@ -91,6 +91,8 @@ $(document).ready(function() {
});
});
</script>
{% from 'google_analytics.html' import googleAnalytics %} {{ googleAnalytics(X, user, permissions, control) }}
</head>
......
......@@ -33,6 +33,8 @@
<script src="{{control.snacURL}}/javascript/select_loaders.js{{control.noCache}}"></script>
<script src="{{control.snacURL}}/javascript/html2canvas.js{{control.noCache}}"></script>
<script src="{{control.snacURL}}/javascript/feedback.js{{control.noCache}}"></script>
{% from 'google_analytics.html' import googleAnalytics %} {{ googleAnalytics(X, user, permissions, control) }}
</head>
<body role="document">
......
......@@ -42,7 +42,9 @@
<meta name="viewport" content="initial-scale = 1.0" />
{% from 'google_analytics.html' import googleAnalytics %} {{ googleAnalytics(X, user, permissions, control) }}
</head>
<body role="document">
{% from 'page_navigation.html' import topNavigation,footer %}
{{ topNavigation(X, user, permissions, control) }}
......
......@@ -22,7 +22,10 @@
<!-- SNAC Scripts -->
<script src="{{control.snacURL}}/javascript/html2canvas.js{{control.noCache}}"></script>
<script src="{{control.snacURL}}/javascript/feedback.js{{control.noCache}}"></script>
{% from 'google_analytics.html' import googleAnalytics %} {{ googleAnalytics(X, user, permissions, control) }}
</head>
<body role="document">
{% from 'page_navigation.html' import topNavigation,footer %}
{{ topNavigation(X, user, permissions, control) }}
......
......@@ -22,7 +22,10 @@
<!-- SNAC Scripts -->
<script src="{{control.snacURL}}/javascript/html2canvas.js{{control.noCache}}"></script>
<script src="{{control.snacURL}}/javascript/feedback.js{{control.noCache}}"></script>
{% from 'google_analytics.html' import googleAnalytics %} {{ googleAnalytics(X, user, permissions, control) }}
</head>
<body role="document">
{% from 'page_navigation.html' import topNavigation,footer %}
{{ topNavigation(X, user, permissions, control) }}
......
......@@ -60,6 +60,7 @@ $(document).ready(function() {
})
</script>
{% from 'google_analytics.html' import googleAnalytics %} {{ googleAnalytics(X, user, permissions, control) }}
</head>
......
......@@ -46,7 +46,10 @@ $.fn.modal.Constructor.prototype.enforceFocus = $.noop;
</script>
<meta name="viewport" content="initial-scale = 1.0" />
{% from 'google_analytics.html' import googleAnalytics %} {{ googleAnalytics(X, user, permissions, control) }}
</head>
<body role="document">
{% from 'page_navigation.html' import topNavigation,footer %}
{{ topNavigation(X, user, permissions, control) }}
......
......@@ -46,7 +46,10 @@ $.fn.modal.Constructor.prototype.enforceFocus = $.noop;
</script>
<meta name="viewport" content="initial-scale = 1.0" />
{% from 'google_analytics.html' import googleAnalytics %} {{ googleAnalytics(X, user, permissions, control) }}
</head>
<body role="document">
{% from 'page_navigation.html' import topNavigation,footer %}
{{ topNavigation(X, user, permissions, control) }}
......
......@@ -46,7 +46,10 @@ $.fn.modal.Constructor.prototype.enforceFocus = $.noop;
</script>
<meta name="viewport" content="initial-scale = 1.0" />
{% from 'google_analytics.html' import googleAnalytics %} {{ googleAnalytics(X, user, permissions, control) }}
</head>
<body role="document">
{% from 'page_navigation.html' import topNavigation,footer %}
{{ topNavigation(X, user, permissions, control) }}
......
......@@ -36,7 +36,10 @@
<script src="{{control.snacURL}}/javascript/uploadparse.js{{control.noCache}}"></script>
<meta name="viewport" content="initial-scale = 1.0" />
{% from 'google_analytics.html' import googleAnalytics %} {{ googleAnalytics(X, user, permissions, control) }}
</head>
<body role="document">
{% from 'page_navigation.html' import topNavigation,footer %}
{{ topNavigation(X, user, permissions, control) }}
......
......@@ -68,7 +68,10 @@ $.fn.modal.Constructor.prototype.enforceFocus = $.noop;
</script>
<meta name="viewport" content="initial-scale = 1.0" />
{% from 'google_analytics.html' import googleAnalytics %} {{ googleAnalytics(X, user, permissions, control) }}
</head>
<body role="document">
{% from 'page_navigation.html' import topNavigation,footer %}
{{ topNavigation(X, user, permissions, control) }}
......
......@@ -46,7 +46,10 @@ $.fn.modal.Constructor.prototype.enforceFocus = $.noop;
</script>
<meta name="viewport" content="initial-scale = 1.0" />
{% from 'google_analytics.html' import googleAnalytics %} {{ googleAnalytics(X, user, permissions, control) }}
</head>
<body role="document">
{% from 'page_navigation.html' import topNavigation,footer %}
{{ topNavigation(X, user, permissions, control) }}
......
......@@ -58,7 +58,10 @@ $.fn.modal.Constructor.prototype.enforceFocus = $.noop;
<link rel="stylesheet" href="{{control.snacURL}}/css/snac.css{{control.noCache}}">
<meta name="viewport" content="initial-scale = 1.0" />
{% from 'google_analytics.html' import googleAnalytics %} {{ googleAnalytics(X, user, permissions, control) }}
</head>
<body role="document">
{% import 'widgets.html' as widgets %}
{% import 'edit_components.html' as components %}
......
......@@ -54,7 +54,10 @@ $.fn.modal.Constructor.prototype.enforceFocus = $.noop;
<link rel="stylesheet" href="{{control.snacURL}}/css/snac.css{{control.noCache}}">
<meta name="viewport" content="initial-scale = 1.0" />
{% from 'google_analytics.html' import googleAnalytics %} {{ googleAnalytics(X, user, permissions, control) }}
</head>
<body role="document">
{% import 'widgets.html' as widgets %}
{% import 'edit_components.html' as components %}
......
......@@ -21,7 +21,10 @@
<!-- SNAC Stylesheet -->
<link rel="stylesheet" href="{{control.snacURL}}/css/snac.css{{control.noCache}}">
{% from 'google_analytics.html' import googleAnalytics %} {{ googleAnalytics(X, user, permissions, control) }}
</head>
<body role="document">
{% from 'page_navigation.html' import topNavigation,footer %}
{{ topNavigation(X, user, permissions, control) }}
......
......@@ -75,7 +75,10 @@
<style>
</style>
{% from 'google_analytics.html' import googleAnalytics %} {{ googleAnalytics(X, user, permissions, control) }}
</head>
<body role="document">
{% import 'widgets.html' as widgets %}
{% import 'edit_components.html' as components %}
......
......@@ -22,6 +22,8 @@
<!-- SNAC Javascript -->
<script src="{{control.snacURL}}/javascript/html2canvas.js{{control.noCache}}"></script>
<script src="{{control.snacURL}}/javascript/feedback.js{{control.noCache}}"></script>
{% from 'google_analytics.html' import googleAnalytics %} {{ googleAnalytics(X, user, permissions, control) }}
</head>
<body role="document">
......
{% macro googleAnalytics(X, user, permissions, control) %}
{# If there is a google analytics tracking ID, then insert the Google Analytics script #}
{% if control.googleAnalyticsID %}
<!-- Google tag (gtag.js) -->
<script async src="https://www.googletagmanager.com/gtag/js?id={{control.googleAnalyticsID}}"></script>
<script>
window.dataLayer = window.dataLayer || [];
function gtag(){dataLayer.push(arguments);}
gtag('js', new Date());
gtag('config', '{{control.googleAnalyticsID}}');
</script>
{% endif %}
{% endmacro %}
......@@ -187,7 +187,9 @@ $(document).ready(function() {
});
</script>
{% from 'google_analytics.html' import googleAnalytics %} {{ googleAnalytics(X, user, permissions, control) }}
</head>
<body role="document">
{% from 'page_navigation.html' import topNavigation, footer %}
......
......@@ -53,7 +53,10 @@ $(document).ready(function() {
$('.table').DataTable({ordering: false});
});
</script>
{% from 'google_analytics.html' import googleAnalytics %} {{ googleAnalytics(X, user, permissions, control) }}
</head>
<body role="document">
{% from 'page_navigation.html' import topNavigation,footer %}
{{ topNavigation(X, user, permissions, control) }}
......
......@@ -57,6 +57,8 @@
text-align: right;
}
</style>
{% from 'google_analytics.html' import googleAnalytics %} {{ googleAnalytics(X, user, permissions, control) }}
</head>
<body role="document">
......
......@@ -28,6 +28,8 @@
<script src="{{control.snacURL}}/javascript/search.js{{control.noCache}}"></script>
<script src="{{control.snacURL}}/javascript/html2canvas.js{{control.noCache}}"></script>
<script src="{{control.snacURL}}/javascript/feedback.js{{control.noCache}}"></script>
{% from 'google_analytics.html' import googleAnalytics %} {{ googleAnalytics(X, user, permissions, control) }}
</head>
<body role="document">
......
......@@ -240,6 +240,7 @@ $(document).ready(function() {
</script>
{% from 'google_analytics.html' import googleAnalytics %} {{ googleAnalytics(X, user, permissions, control) }}
</head>
<body role="document">
......
......@@ -87,6 +87,8 @@ function notSameAssert(icid1, icid2, id) {
</script>
<script src="{{control.snacURL}}/javascript/html2canvas.js{{control.noCache}}"></script>
<script src="{{control.snacURL}}/javascript/feedback.js{{control.noCache}}"></script>
{% from 'google_analytics.html' import googleAnalytics %} {{ googleAnalytics(X, user, permissions, control) }}
</head>
<body role="document">
......
......@@ -45,7 +45,9 @@
$.fn.modal.Constructor.prototype.enforceFocus = function() {};
</script>
{% from 'google_analytics.html' import googleAnalytics %} {{ googleAnalytics(X, user, permissions, control) }}
</head>
<body role="document">
{% from 'page_navigation.html' import topNavigation,footer %}
{{ topNavigation(X, user, permissions, control) }}
......
......@@ -54,6 +54,7 @@
<script src="{{control.snacURL}}/javascript/feedback.js{{control.noCache}}"></script>
{% from 'google_analytics.html' import googleAnalytics %} {{ googleAnalytics(X, user, permissions, control) }}
</head>
<body role="document">
......
......@@ -67,7 +67,9 @@ $(document).ready(function() {
<!-- SNAC Stylesheet -->
<link rel="stylesheet" href="{{control.snacURL}}/css/snac.css{{control.noCache}}">
{% from 'google_analytics.html' import googleAnalytics %} {{ googleAnalytics(X, user, permissions, control) }}
</head>
<body role="document">
{% import 'widgets.html' as widgets %}
{% import 'edit_components.html' as components %}
......
{% macro topNavigation(X, user, permissions, control) %}
{# If there is a google analytics tracking ID, then insert the Google Analytics script #}
{% if control.googleAnalyticsID %}
<!-- Google tag (gtag.js) -->
<script async src="https://www.googletagmanager.com/gtag/js?id={{control.googleAnalyticsID}}"></script>
<script>
window.dataLayer = window.dataLayer || [];
function gtag(){dataLayer.push(arguments);}
gtag('js', new Date());
gtag('config', '{{control.googleAnalyticsID}}');
</script>
{% endif %}
<script>
var snacUrl = "{{control.snacURL}}";
var restUrl = "{{control.restURL}}";
......
......@@ -23,7 +23,9 @@
<script src="{{control.snacURL}}/javascript/html2canvas.js{{control.noCache}}"></script>
<script src="{{control.snacURL}}/javascript/feedback.js{{control.noCache}}"></script>
{% from 'google_analytics.html' import googleAnalytics %} {{ googleAnalytics(X, user, permissions, control) }}
</head>
<body role="document">
{% from 'page_navigation.html' import topNavigation,footer %}
{{ topNavigation(X, user, permissions, control) }}
......
......@@ -25,7 +25,9 @@
<!-- SNAC Stylesheet -->
<link rel="stylesheet" href="{{control.snacURL}}/css/snac.css{{control.noCache}}">
{% from 'google_analytics.html' import googleAnalytics %} {{ googleAnalytics(X, user, permissions, control) }}
</head>
<body role="document">
{% from 'page_navigation.html' import topNavigation,footer %}
{{ topNavigation(X, user, permissions, control) }}
......
......@@ -72,7 +72,9 @@ $(document).ready(function() {
</style>
{% from 'google_analytics.html' import googleAnalytics %} {{ googleAnalytics(X, user, permissions, control) }}
</head>
<body role="document">
{% from 'page_navigation.html' import topNavigation,footer %}
......
......@@ -24,7 +24,10 @@
<!-- SNAC Javascript -->
<script src="{{control.snacURL}}/javascript/html2canvas.js{{control.noCache}}"></script>
<script src="{{control.snacURL}}/javascript/feedback.js{{control.noCache}}"></script>
{% from 'google_analytics.html' import googleAnalytics %} {{ googleAnalytics(X, user, permissions, control) }}
</head>
<body role="document">
{% from 'page_navigation.html' import topNavigation,footer %}
{{ topNavigation(X, user, permissions, control) }}
......
......@@ -66,7 +66,10 @@
width: auto;
}
</style>
{% from 'google_analytics.html' import googleAnalytics %} {{ googleAnalytics(X, user, permissions, control) }}
</head>
<body role="document">
{% from 'page_navigation.html' import topNavigation,footer %}
{{ topNavigation(X, user, permissions, control) }}
......
......@@ -62,7 +62,10 @@
width: auto;
}
</style>
{% from 'google_analytics.html' import googleAnalytics %} {{ googleAnalytics(X, user, permissions, control) }}
</head>
<body role="document">
{% from 'page_navigation.html' import topNavigation,footer %}
{{ topNavigation(X, user, permissions, control) }}
......
......@@ -66,7 +66,10 @@
width: auto;
}
</style>
{% from 'google_analytics.html' import googleAnalytics %} {{ googleAnalytics(X, user, permissions, control) }}
</head>
<body role="document">
{% from 'page_navigation.html' import topNavigation,footer %}
{{ topNavigation(X, user, permissions, control) }}
......
......@@ -78,7 +78,9 @@
</script>
{% from 'google_analytics.html' import googleAnalytics %} {{ googleAnalytics(X, user, permissions, control) }}
</head>
<body role="document">
{% import "resources/_resource_form.html" as resources %}
{% from 'page_navigation.html' import topNavigation,footer %}
......
......@@ -64,7 +64,9 @@
});
</script>
{% from 'google_analytics.html' import googleAnalytics %} {{ googleAnalytics(X, user, permissions, control) }}
</head>
<body role="document">
{% import "resources/_resource_form.html" as resources %}
{% from 'page_navigation.html' import topNavigation,footer %}
......
......@@ -51,7 +51,9 @@
});
</script>
{% from 'google_analytics.html' import googleAnalytics %} {{ googleAnalytics(X, user, permissions, control) }}
</head>
<body role="document">
{% import "resources/_resource_form.html" as resources %}
{% from 'page_navigation.html' import topNavigation,footer %}
......
......@@ -202,6 +202,7 @@
}
</script>
{% from 'google_analytics.html' import googleAnalytics %} {{ googleAnalytics(X, user, permissions, control) }}
</head>
<body role="document">
......
......@@ -64,6 +64,7 @@
})
</script>
{% from 'google_analytics.html' import googleAnalytics %} {{ googleAnalytics(X, user, permissions, control) }}
</head>
<body role="document">
......@@ -282,4 +283,4 @@
{{ footer(X, user, permissions, control) }}
</body>
</html>
\ No newline at end of file
</html>
......@@ -45,6 +45,7 @@
}
</style>
{% from 'google_analytics.html' import googleAnalytics %} {{ googleAnalytics(X, user, permissions, control) }}
</head>
<body role="document">
......
......@@ -111,18 +111,8 @@ body {
}
</style>
{# If there is a google analytics tracking ID, then insert the Google Analytics script #}
{% if control.googleAnalyticsID %}
<!-- Google tag (gtag.js) -->
<script async src="https://www.googletagmanager.com/gtag/js?id={{control.googleAnalyticsID}}"></script>
<script>
window.dataLayer = window.dataLayer || [];
function gtag(){dataLayer.push(arguments);}
gtag('js', new Date());
gtag('config', '{{control.googleAnalyticsID}}');
</script>
{% endif %}
{% from 'google_analytics.html' import googleAnalytics %} {{ googleAnalytics(X, user, permissions, control) }}
</head>
<body role="document">
......
......@@ -45,7 +45,10 @@ $.fn.modal.Constructor.prototype.enforceFocus = $.noop;
}
</style>
<meta name="viewport" content="initial-scale = 1.0" />
{% from 'google_analytics.html' import googleAnalytics %} {{ googleAnalytics(X, user, permissions, control) }}
</head>
<body role="document">
{% import 'widgets.html' as widgets %}
......
......@@ -28,6 +28,8 @@
<script src="{{control.snacURL}}/javascript/search.js{{control.noCache}}"></script>
<script src="{{control.snacURL}}/javascript/html2canvas.js{{control.noCache}}"></script>
<script src="{{control.snacURL}}/javascript/feedback.js{{control.noCache}}"></script>
{% from 'google_analytics.html' import googleAnalytics %} {{ googleAnalytics(X, user, permissions, control) }}
</head>
<body role="document">
......
......@@ -46,6 +46,8 @@ $(document).ready(function() {
});
});
</script>
{% from 'google_analytics.html' import googleAnalytics %} {{ googleAnalytics(X, user, permissions, control) }}
</head>
<body role="document">
......
......@@ -41,6 +41,8 @@
<!-- SNAC Javascript -->
<script src="{{control.snacURL}}/javascript/html2canvas.js{{control.noCache}}"></script>
<script src="{{control.snacURL}}/javascript/feedback.js{{control.noCache}}"></script>
{% from 'google_analytics.html' import googleAnalytics %} {{ googleAnalytics(X, user, permissions, control) }}
</head>
<style>
......
......@@ -673,6 +673,8 @@ $(document).ready(function() {
</script>
<meta name="viewport" content="initial-scale = 1.0" />
{% from 'google_analytics.html' import googleAnalytics %} {{ googleAnalytics(X, user, permissions, control) }}
</head>
<body role="document">
......
......@@ -93,8 +93,9 @@
}
</style>
{% from 'google_analytics.html' import googleAnalytics %} {{ googleAnalytics(X, user, permissions, control) }}
</head>
<body role="document">
{% from 'page_navigation.html' import topNavigation, footer %}
......
......@@ -111,7 +111,9 @@
</style>
{% from 'google_analytics.html' import googleAnalytics %} {{ googleAnalytics(X, user, permissions, control) }}
</head>
<body role="document">
{% from 'page_navigation.html' import topNavigation, footer %}
......
......@@ -28,7 +28,9 @@
<script src="{{control.snacURL}}/javascript/html2canvas.js{{control.noCache}}"></script>
<script src="{{control.snacURL}}/javascript/feedback.js{{control.noCache}}"></script>
{% from 'google_analytics.html' import googleAnalytics %} {{ googleAnalytics(X, user, permissions, control) }}
</head>
<body role="document">
{% from 'page_navigation.html' import topNavigation,footer %}
{{ topNavigation(X, user, permissions, control) }}
......
......@@ -64,7 +64,10 @@ $(document).ready(function() {
});
});
</script>
{% from 'google_analytics.html' import googleAnalytics %} {{ googleAnalytics(X, user, permissions, control) }}
</head>
<body role="document">
{% from 'page_navigation.html' import topNavigation,footer %}
{{ topNavigation(X, user, permissions, control) }}
......
......@@ -64,7 +64,10 @@ $(document).ready(function() {
});
});
</script>
{% from 'google_analytics.html' import googleAnalytics %} {{ googleAnalytics(X, user, permissions, control) }}
</head>
<body role="document">
{% from 'page_navigation.html' import topNavigation,footer %}
{{ topNavigation(X, user, permissions, control) }}
......
......@@ -129,7 +129,10 @@ $(document).ready(function() {
min-height: 500px;
}
</style>
{% from 'google_analytics.html' import googleAnalytics %} {{ googleAnalytics(X, user, permissions, control) }}
</head>
<body role="document">
{% from 'page_navigation.html' import topNavigation,footer %}
{{ topNavigation(X, user, permissions, control) }}
......
......@@ -85,7 +85,10 @@ $(document).ready(function() {
});
</script>
{% from 'google_analytics.html' import googleAnalytics %} {{ googleAnalytics(X, user, permissions, control) }}
</head>
<body role="document">
{% from 'page_navigation.html' import topNavigation,footer %}
{{ topNavigation(X, user, permissions, control) }}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment