From c005146c00832963b3865d6f0ae3587867f61a95 Mon Sep 17 00:00:00 2001
From: Nick Freear
Date: Sun, 21 Oct 2018 19:07:40 +0100
Subject: [PATCH] Bug #51, configurable privacy policy URL in tool-footer
[iet:10364720]
---
README.md | 1 +
docs/CHANGELOG.md | 11 +++++++----
src/config.js | 2 ++
src/partials/attribute.html | 10 +++++-----
src/views.js | 1 +
style/journeystyle.css | 12 ++++++++++++
6 files changed, 28 insertions(+), 9 deletions(-)
diff --git a/README.md b/README.md
index 77497d8..9334b9e 100644
--- a/README.md
+++ b/README.md
@@ -48,6 +48,7 @@ npm start
npm run pa11y-ci
npm run fix
npm run jsdoc # Generate documentation in /jsdoc/ directory.
+npx eslint src # browserslist-based test.
```
## API
diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md
index 500e78f..b2517ac 100644
--- a/docs/CHANGELOG.md
+++ b/docs/CHANGELOG.md
@@ -24,21 +24,23 @@ See [spreadsheet][gdoc].
* Add browser compatibility-checking Javascript _(error message in Internet Explorer)_, #7;
* Add default configuration; extend configuration options, including callbacks, #43;
* Switch the file-save function to create a redirecting HTML file, #42;
- * Add compress/minified version of Javascript _(94 → 66 kB)_, #41;
+ * Add compress/minified version of Javascript _(100 → 70 kB)_, #41;
* Fix — identify the '_Add more cards_' arrow button as a button, #47;
* Add `?zoom=75` URL parameter to aid embedding, #17;
* Add `?bg=wheat` URL parameter (`background-color`);
* Swap the '_tool_' page back to GitHub Pages, #48;
+ * Configurable privacy policy link, #51;
* Start [JSDoc][] documentation, #49;
* Add [browserslist][] / eslint test, #7;
- * _... Anything else ...?_
+ * Favicon, #52;
* Added `CHANGELOG`, #45;
+ * _.. Anything else ..?_
## v[1.3.4][]
* _2 October 2018;_
* Fixed post-it display bug;
- * _What else changed ...?_
+ * _.. Anything else ..?_
## v[1.3.3][]
@@ -98,7 +100,8 @@ See [spreadsheet][gdoc].
"Browserify lets you require('modules') in the browser by bundling up all of your dependencies."
[stringify]: https://npmjs.com/package/stringify
"Browserify plugin to require() text / HTML files ... inside your client-side JavaScript."
-[browserslist]: https://browsersl.ist/
+[browserslist]: https://browsersl.ist/?q=last+1+version%2C+%3E+1%25%2C+not+dead%2C+not+ie+%3C+99
+ "A page to display compatible browsers from a browserslist string."
[travis-ci]: https://travis-ci.org/IET-OU/our-journey
[jsdoc]: http://usejsdoc.org/
diff --git a/src/config.js b/src/config.js
index c4e3614..1f24d40 100644
--- a/src/config.js
+++ b/src/config.js
@@ -10,6 +10,8 @@ module.exports.DEFAULTS = {
assetUrl: 'https://unpkg.com/our-journey@^1/assets',
// URL of the help page, to use in HTML links.
helpUrl: 'https://iet-ou.github.io/our-journey/help.html',
+ // @prop {string} privacyUrl Link to a privacy policy, and terms.
+ privacyUrl: null, // 'https://iet-ou.github.io/our-journey/privacy.html' or 'https://www.open.ac.uk/privacy',
// Load a demonstration journey (Default: false)
demo: UTIL.param(/[?&]demo=(1)/, false),
// Use the floating or fixed editor (Default: floating)
diff --git a/src/partials/attribute.html b/src/partials/attribute.html
index c5296ad..1e5a78a 100644
--- a/src/partials/attribute.html
+++ b/src/partials/attribute.html
@@ -3,10 +3,10 @@
our-journey
v__VERSION__
|
- © 2018 The Open University
- (IET).
- |
- License: GPL 3.0+.
+ © The Open University
+ | IET
+ License
+ Privacy