doop 0.0.4.1 → 0.0.4.2

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    YThjZGUzODA4ZDUzMzM2YWYyMTI5NDk0Yjc1NDUwZWZhYmYzMGYyMQ==
+    ODYyNmE1ZGQwMjhjNTU4YmMwMjE3NDczZTIyYTIxZDk0Mzg4ZThmYg==
   data.tar.gz: !binary |-
-    Yjc2YTZjMDU0ZWQ1NjU0ZWI1ODVhZTQ5MDQyOThiMzI5ZGFmOTZhZQ==
+    MTNjN2MwOTY5ODdkOGNiYThhZmVhYTg4NjY3NmJkMTIyNzI4OGUwMA==
 SHA512:
   metadata.gz: !binary |-
-    YTYwNGJjYzkxOTAzYjQzMGI0OGE5MzdiZTI1ZjQzMmNmN2YxYzUyMmNmOWFi
-    M2Y3MGVlNGM4ZWNlM2Q3MWQzZThmOTU1NzA5MWU2MjA3NDAyZTZiZjAzN2U4
-    ZDcyYTBiZDJlNWE5NjI1ZmY2MDM2MjEyMDNmNTJmMjQ1NDI2YWE=
+    ZDU0NjI5ZGE2NDZhOGE5ZThmMzU0MzAwNTQ3NTM2NWE3ZWU3MmU2OGUxZmUx
+    YWU3YjA4YWI1YzZkZTlkZmM3M2EzOTA4YWIxOWI0NTZkNjRjOTBkMmRhNzM3
+    ODdmZmNlOTgyYzE3MzhlNjZiY2RhNzdkOTk5MDQwMzJmNzkxYTQ=
   data.tar.gz: !binary |-
-    YTAxMDk5MzBkMTM4NjBkNmFlOGZlYzI0MjhlMDNhNTBiYjc0OWM1ZGM5NTQ2
-    ZjQ5Y2U5ZTI4ZTg5ZWRmNjQ5NmQ3NTI0ZGViZTAwNTRmNWY5ZWFhNjkzOGJm
-    YzYyNzc5ZWM4Yzg0YWY0ODEwYTA3NGVmOTVkZWQyM2Q4ODg3NDU=
+    YTc3ZWU5MTYxNTU0ZTgyMDM0MjRjNTM3Yjg4MmE4MDQzYzc1ZTkwMDgyOGVl
+    YmVmZmNiNzZiNzI1YmMwYzQyYzFiNGM0YjdiZjc1NmQ0Y2Y2ZDBmY2JhNmM1
+    Mzg0YmNmZGQwYzFkOTRlOWQxMzcyMTJlYTgyODhmMGU3NzRiMGM=

data/README.md

@@ -2,9 +2,11 @@
 
 A question framework for govuk sites, inspired by the great work GDS have done to standardize the cross government internet presence.
 
+## [Doopgovuk demo](http://blooming-wave-8670.herokuapp.com)
+
 Try out a demo... it's hosted on heroku so there may be a initial pause while heroku fires up the demo:
 
-## [Doopgovuk demo](http://blooming-wave-8670.herokuapp.com)
+
 
 # Quick start
 

data/doop.gemspec

@@ -11,6 +11,7 @@ if !Dir['doop_demo/*'].empty?
   FileUtils.cp "doop_demo/app/assets/stylesheets/demo/application.css", "#{dest}/app/assets/stylesheets/demo/application.css"
   FileUtils.cp "doop_demo/app/assets/javascripts/demo.js.coffee", "#{dest}/app/assets/javascripts/demo.js.coffee"
   FileUtils.cp "doop_demo/app/assets/javascripts/demo/application.js", "#{dest}/app/assets/javascripts/demo/application.js"
+  FileUtils.cp "doop_demo/app/assets/javascripts/demo/analytics.js.erb", "#{dest}/app/assets/javascripts/demo/analytics.js.erb"
   FileUtils.cp "doop_demo/app/controllers/demo_controller.rb", "#{dest}/app/controllers/demo_controller.rb"
   FileUtils.cp "doop_demo/app/views/layouts/application.html.erb", "#{dest}/app/views/layouts/application.html.erb"
   FileUtils.cp_r "doop_demo/app/views/doop", "#{dest}/app/views"

data/lib/doop/version.rb

@@ -1,3 +1,3 @@
 module Doop
-  VERSION = "0.0.4.1"
+  VERSION = "0.0.4.2"
 end

data/lib/generators/doopgovuk/doopgovuk_generator.rb

@@ -8,6 +8,7 @@ class DoopgovukGenerator < Rails::Generators::Base
     copy_file "app/assets/stylesheets/demo/application.css", "app/assets/stylesheets/#{name}/application.css"
     copy_file "app/assets/javascripts/demo.js.coffee", "app/assets/javascripts/#{name}.js.coffee"
     copy_file "app/assets/javascripts/demo/application.js", "app/assets/javascripts/#{name}/application.js"
+    copy_file "app/assets/javascripts/demo/analytics.js.erb", "app/assets/javascripts/#{name}/analytics.js.erb"
     template "app/controllers/demo_controller.rb", "app/controllers/#{name}_controller.rb"
     copy_file "app/views/layouts/application.html.erb",  "app/views/layouts/application.html.erb"
     directory "app/views/doop"

data/lib/generators/doopgovuk/templates/app/assets/javascripts/demo.js.coffee

@@ -12,5 +12,5 @@ $( () ->
     if e.ctrlKey && e.keyCode == 89
       $('#doop_debug').dialog( "open")
     
-  
+  bind_ga_events()  
 )

data/lib/generators/doopgovuk/templates/app/assets/javascripts/demo/analytics.js.erb

@@ -0,0 +1,45 @@
+
+<% if Rails.env.production? %>
+
+
+(function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
+    (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
+  m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
+    })(window,document,'script','//www.google-analytics.com/analytics.js','ga');
+
+ga('create', 'UA-56515200-1', 'auto');
+ga('send', 'pageview');
+
+
+function bind_ga_events() {
+
+  $("#back_a_page").click( function() {
+    ga( 'send', 'event', 'button', 'click', 'back-button' )
+  })
+
+  $("[id$=-change]").click( function() {
+    id = $(this).attr('id')
+    ga( 'send', 'event', 'question', 'reopened', id.replace( '-change', '' ) )
+  })
+
+  $("[id$=-nav]").click( function() {
+    id = $(this).attr('id')
+    ga( 'send', 'event', 'page', 'changed', id.replace( '-nav' ,'' ) )
+  })
+
+  $( ".question-open > button").each( function() {
+
+    id = $(this).parent().attr( "id" )
+    $(this).click( function() {
+      ga( 'send', 'event', 'question', 'answered', id.replace( '-open', '' ) )
+    })
+
+  })
+
+}
+
+<% else %>
+  function bind_ga_events() {
+  }
+<% end %>
+

data/lib/generators/doopgovuk/templates/app/assets/javascripts/demo/application.js

@@ -1,2 +1,3 @@
 //
 //= require jquery-ui/dialog
+//= require_tree .

data/lib/generators/doopgovuk/templates/app/assets/stylesheets/demo.css.scss

@@ -146,13 +146,14 @@ button {
 }
 
 .error {
+  padding: 5px 0 7px 0;
+  span{
     color: red;
     border: 1px solid #B01117;
     background-color: #FFF3CF;
     padding: 2px 5px 2px 5px;
     border-radius: 5px;
-    margin: 10px 0 10px 0;
-    width: auto;
+  }
 }
 
 .navbar {

data/lib/generators/doopgovuk/templates/app/views/demo/_before_you_begin.html.erb

@@ -45,7 +45,7 @@
     the demo.</p>
 
     <h3>Test Harness</h3>
-    <p>The demo includes a <strong><a href="harness">test harness</a></strong>, which allows you to directly render a YAML config.  The quickest way
+    <p>The demo includes a <strong><a href="/demo/harness">test harness</a></strong>, which allows you to directly render a YAML config.  The quickest way
     to try this put is to hit Ctrl-Y, copy the YAML, then paste it into the test harness.</p>
 
 

data/lib/generators/doopgovuk/templates/app/views/demo/index.js.erb

@@ -2,3 +2,4 @@ $("#question_section").html( "<%= escape_javascript( render res[:page], :doop =>
 $("#doop_debug").html( "<%= escape_javascript( render 'doop/debug', :doop => doop, :res => res ) %>" )
 $("#nav_path").val("")
 $("#back_a_page").val("")
+bind_ga_events()

data/lib/generators/doopgovuk/templates/app/views/doop/_error.html.erb

@@ -1 +1,3 @@
-  <span class="error"><%= msg %></span>
+<div class="error">
+  <span><%= msg %></span>
+</div>

data/lib/generators/doopgovuk/templates/app/views/doop/_textfield.html.erb

@@ -10,5 +10,6 @@
   <% if !label.nil? %>
     <label for="<%=name%>"><%=label%></label>
   <% end %>
-  <input id="<%=name%>" name="b_<%=name%>" type="text" value="<%=val%>"/><%=error res, "#{name}_error".to_sym %>
+  <%=error res, "#{name}_error".to_sym %>
+  <input id="<%=name%>" name="b_<%=name%>" type="text" value="<%=val%>"/>
 </div>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: doop
 version: !ruby/object:Gem::Version
-  version: 0.0.4.1
+  version: 0.0.4.2
 platform: ruby
 authors:
 - Mark Middleton
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-06 00:00:00.000000000 Z
+date: 2014-11-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -97,6 +97,7 @@ files:
 - lib/generators/doopgovuk/USAGE
 - lib/generators/doopgovuk/doopgovuk_generator.rb
 - lib/generators/doopgovuk/templates/app/assets/javascripts/demo.js.coffee
+- lib/generators/doopgovuk/templates/app/assets/javascripts/demo/analytics.js.erb
 - lib/generators/doopgovuk/templates/app/assets/javascripts/demo/application.js
 - lib/generators/doopgovuk/templates/app/assets/stylesheets/demo.css.scss
 - lib/generators/doopgovuk/templates/app/assets/stylesheets/demo/application.css