Merge pull request #261 from alphagov/fix-default-text-for-global-coo…

…kie-message

Fix default text for global cookie message

app/config.js

@@ -0,0 +1,10 @@
+// Use this file to change prototype configuration.
+
+// Note: this config can be overridden using environment variables (eg on heroku)
+
+module.exports = {
+
+  // Cookie warning
+  cookieText: 'GOV.UK uses cookies to make the site simpler. <a href="https://www.gov.uk/help/cookies" title="Find out more about cookies">Find out more about cookies</a>'
+
+};

app/views/layout.html

@@ -7,6 +7,10 @@
   {% include "includes/snippets_scripts.html" %}
 {% endblock %}
 
+{% block cookie_message %}
+  <p>{{cookieText | safe }}</p>
+{% endblock %}
+
 {% block proposition_header %}
   {% include "includes/service_manual_navigation.html" %}
 {% endblock %}

app/views/layout_example.html

@@ -32,6 +32,10 @@
   {% include "includes/elements_tracking.html" %}
 {% endblock %}
 
+{% block cookie_message %}
+  <p>{{cookieText | safe }}</p>
+{% endblock %}
+
 {% block proposition_header %}
   {% include "includes/service_manual_navigation.html" %}
 {% endblock %}

server.js

@@ -1,4 +1,5 @@
 var bodyParser = require('body-parser'),
+    config = require(__dirname + '/app/config.js'),
     express = require('express'),
     nunjucks = require('express-nunjucks'),
     path = require('path'),
@@ -34,6 +35,12 @@ app.use(function (req, res, next) {
   next();
 });
 
+// Add variables that are available in all views
+app.use(function (req, res, next) {
+  res.locals.cookieText=config.cookieText;
+  next();
+});
+
 // routes (found in routes.js)
 
 routes.bind(app, '/public/');