diff --git a/CHANGELOG.md b/CHANGELOG.md index 4b93a3baad964f45b0b8748ada07405a551f20d5..3df0d6f54b7eec6e25d49181e52c1d73c6bc0679 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,6 +9,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0. - Hydrograph can now show either last 7 days, last 30 days, or the last year of data for the selected timeseries. The Show last year feature also works for the three date ranges. - The beginnings of a node.js-based graph server was added. +- Content group tag wdfn_tng to the google analytics script. ### Changed @@ -17,6 +18,7 @@ the selected timeseries. The Show last year feature also works for the three dat - Date labels moved to and centered in areas between midnight tick marks - Projects were isolated in separate directories with Makefiles binding them together. - Change incorrect spelling "timeseries" to "time series" +- Label change on toggle from "Show last year" to "Compare to last year" ### Fixed @@ -30,7 +32,6 @@ the selected timeseries. The Show last year feature also works for the three dat - Basic meta tags, title and description, for Twitter card and Open Graph - Rough draft for USGS logo watermark - ### Changed - Timeseries graph legend now shows markers with the appropriate colors representing Approved, Estimated, and Provisional for the lines that are currently visible on the graph. @@ -40,7 +41,6 @@ Provisional for the lines that are currently visible on the graph. slice reducers for the different parts. - Location metadata table placed in an accordion - ### Fixed - Tooltip is redrawn correctly when changing from portrait to landscape on mobile. - Handle tooltips on touch devices @@ -59,7 +59,6 @@ slice reducers for the different parts. - Limit y-axis lower bound to nearest power of 10 on logarithmic scales - Site Summary table includes site visits, peak values, annual data reports, and groundwater network sites - ### Fixed - Timeseries SVG has the correct title and desc tag contents. - Series with no points are not considered when determining the default parameter. diff --git a/assets/src/scripts/components/hydrograph/index.js b/assets/src/scripts/components/hydrograph/index.js index 51d3cedb80fdaf6775ce2535b86c671ff18ea31d..e30620af6a9d0e71a7293bf9210cc41ee09a929f 100644 --- a/assets/src/scripts/components/hydrograph/index.js +++ b/assets/src/scripts/components/hydrograph/index.js @@ -376,7 +376,7 @@ const graphControls = function(elem) { compareControlDiv.append('label') .attr('id', 'last-year-label') .attr('for', 'last-year-checkbox') - .text('Show last year'); + .text('Compare to last year'); }; /** diff --git a/wdfn-server/waterdata/templates/partials/google_analytics.html b/wdfn-server/waterdata/templates/partials/google_analytics.html index 12ceed0b65ae0f85fa58c3bc8914dd79770d3e04..9c896dd83951bde6b260ae300b6f8edcb25669ed 100644 --- a/wdfn-server/waterdata/templates/partials/google_analytics.html +++ b/wdfn-server/waterdata/templates/partials/google_analytics.html @@ -2,8 +2,8 @@ <script> window.ga=window.ga||function(){(ga.q=ga.q||[]).push(arguments)};ga.l=+new Date; ga('create', "{{ config.GA_TRACKING_CODE }}", 'auto'); + ga('set', 'contentGroup1', 'wdfn_tng'); ga('send', 'pageview'); - ga('require', 'outboundLinkTracker'); ga('require', 'eventTracker'); </script>