govuk_admin_template 5.0.1 → 6.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 838f7c3c2aba8f89b0e1bf945a28a6ece5da23e2
-  data.tar.gz: 80b85e2ba37a358f18b404009e334bcfb1661167
+  metadata.gz: 8ff47dba41a87bdfbeb518c142cb0b9e3e7ebbfc
+  data.tar.gz: 6e45a0200c7fd797d1221ec7dc5e71ba454ecd70
 SHA512:
-  metadata.gz: 5debf727db1e0ece53135fb019bbbcbe837a7ddd5d4a27e726b565d9383eaf134eef539f232bd98b1e14fd864ebbcf23c9630137034d242c15e031475497904b
-  data.tar.gz: a3b6b529a8f8649effde43b2aa178dd6cd62b3fe038dc1071b5cc29375eaba154a3d387b0d3c47f3229100b2301a1f9b83eb8434dbffd527b066671ae15ac273
+  metadata.gz: 60e732a58b171cbb10c45b2cdb1e1264b07a787dba43e38ddef3e67f50f4b03fd3ae61c8cc2df744343feb0992fdd8661f0fe26fa2e663fb3bd0054b494ba24b
+  data.tar.gz: a24372fafa8c064552547e3dad18c33e51876b788e4cc1f18e9e1ad996bd44a9238b5a8f9c65d4f259d985458b60c017f4680960c48cd9256846528e9e92afea

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+# 6.0.0
+
+* Changes method call from `GOVUKAdmin.trackEvent(action, label, value)` to `GOVUKAdmin.trackEvent(category, action, options)`. Categories are now mandatory. Calls to `GOVUKAdmin.trackEvent` should be changed to use the latest method signature.  
+
 # 5.0.1
 
 * Compile correct favicon for production.

data/JAVASCRIPT.md

@@ -94,7 +94,7 @@ Modules should have their own tests, whether they’re being included with the g
 
 ## Included modules
 
-Found in the [app/assets/javascripts/modules](app/assets/javascripts/modules) directory, with tests in [spec/javascripts/spec/](spec/javascripts/spec/).
+Found in the [app/assets/javascripts/govuk-admin-template/modules](app/assets/javascripts/govuk-admin-template/modules) directory, with tests in [spec/javascripts/spec/](spec/javascripts/spec/).
 
 File   | Module | Attribute | Description
 ------ | ------ | --------- | -----------

data/README.md

@@ -16,7 +16,6 @@ This gem provides (via a Rails engine):
 * [Collections publisher](https://github.com/alphagov/collections-publisher)
 * [Imminence](https://github.com/alphagov/imminence)
 * [Maslow](https://github.com/alphagov/maslow)
-* [Panopticon](https://github.com/alphagov/panopticon)
 * [Publisher](https://github.com/alphagov/publisher)
 * [Search admin](https://github.com/alphagov/search-admin)
 * [Sign on](https://github.com/alphagov/signonotron2)

data/app/assets/javascripts/govuk-admin-template/govuk-admin.js

@@ -85,32 +85,37 @@
 
   // Google Analytics event tracking
   // Label and value are optional
-  GOVUKAdmin.trackEvent = function(action, label, value) {
-
+  GOVUKAdmin.trackEvent = function(category, action, options) {
+    // Possible values for params: category: 'category', action: 'action', label: 'label', value: 10
     // https://developers.google.com/analytics/devguides/collection/analyticsjs/events
     // Default category to the page an event occurs on
     // Uses sendBeacon for all events
     // https://developers.google.com/analytics/devguides/collection/analyticsjs/field-reference#transport
+
+    options = options || {}
+    var value;
     var eventAnalytics = {
           hitType: 'event',
           transport: 'beacon',
-          eventCategory: root.location.pathname,
+          eventCategory: category,
           eventAction: redactEmails(action)
-        };
+    };
 
     // Label is optional
-    if (typeof label === "string") {
-      eventAnalytics.eventLabel = redactEmails(label);
+    if (typeof options.label === "string") {
+      eventAnalytics.eventLabel = redactEmails(options.label);
+      delete options.label;
     }
 
     // Value is optional, but when used must be an
     // integer, otherwise the event will be invalid
     // and not logged
-    if (value) {
-      value = parseInt(value, 10);
+    if (options.value) {
+      value = parseInt(options.value, 10);
       if (typeof value === "number" && !isNaN(value)) {
         eventAnalytics.eventValue = value;
       }
+      delete options.value;
     }
 
     if (typeof root.ga === "function") {

data/app/assets/javascripts/govuk-admin-template/modules/auto_track_event.js

@@ -4,11 +4,12 @@
   Modules.AutoTrackEvent = function() {
     var that = this;
     that.start = function(element) {
-      var action = element.data('track-action'),
+      var category = element.data('track-category'),
+          action = element.data('track-action'),
           label = element.data('track-label'),
           value = element.data('track-value');
 
-      GOVUKAdmin.trackEvent(action, label, value);
+      GOVUKAdmin.trackEvent(category, action, { label: label, value: value });
     }
   };
 

data/app/assets/javascripts/govuk-admin-template/modules/track_click.js

@@ -6,10 +6,11 @@
 
     that.start = function(container) {
       var trackClick = function() {
-        var action = container.data("track-action") || "button-pressed",
+        var category = container.data("track-category"),
+            action = container.data("track-action") || "button-pressed",
             label = $(this).data("track-label") || $(this).text();
 
-        GOVUKAdmin.trackEvent(action, label);
+        GOVUKAdmin.trackEvent(category, action, { label: label });
       };
 
       container.on("click", ".js-track", trackClick);

data/app/views/layouts/govuk_admin_template.html.erb

@@ -55,12 +55,12 @@
           <div class="navbar-header">
             <% if has_navbar_content %>
               <%# Bootstrap toggle for collapsed navbar content, used at smaller widths %>
-              <a class="navbar-toggle" data-toggle="collapse" data-target="header .navbar-collapse">
+              <button class="navbar-toggle" data-toggle="collapse" data-target="#navbar-header-menu-items" aria-expanded="false">
                 <span class="sr-only">Toggle navigation</span>
                 <span class="icon-bar"></span>
                 <span class="icon-bar"></span>
                 <span class="icon-bar"></span>
-              </a>
+              </button>
             <% end %>
             <%= link_to app_title, app_home_path, :class => 'navbar-brand' %>
             <% if environment_label %>
@@ -70,7 +70,7 @@
             <% end %>
           </div>
           <% if has_navbar_content %>
-            <nav role="navigation" class="collapse navbar-collapse">
+            <nav role="navigation" class="collapse navbar-collapse" id="navbar-header-menu-items">
               <% if content_for?(:navbar_items) %>
                 <ul class="nav navbar-nav">
                   <%= yield :navbar_items %>

data/lib/govuk_admin_template/version.rb

@@ -1,3 +1,3 @@
 module GovukAdminTemplate
-  VERSION = "5.0.1"
+  VERSION = "6.0.0".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: govuk_admin_template
 version: !ruby/object:Gem::Version
-  version: 5.0.1
+  version: 6.0.0
 platform: ruby
 authors:
 - GOV.UK Dev
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-12-20 00:00:00.000000000 Z
+date: 2017-04-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -95,33 +95,33 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 2.4.4
 - !ruby/object:Gem::Dependency
-  name: gem_publisher
+  name: jasmine
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.3.1
+        version: 2.4.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.3.1
+        version: 2.4.0
 - !ruby/object:Gem::Dependency
-  name: jasmine
+  name: govuk-lint
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.4.0
+        version: 1.2.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.4.0
+        version: 1.2.1
 description: Styles, scripts and templates for GOV.UK admin applications
 email:
 - govuk-dev@digital.cabinet-office.gov.uk