Skip to content

Commit

Permalink
Bug IET-OU#51, configurable privacy policy URL in tool-footer [iet:10…
Browse files Browse the repository at this point in the history
…364720]
  • Loading branch information
nfreear committed Oct 21, 2018
1 parent 05f34cd commit c005146
Show file tree
Hide file tree
Showing 6 changed files with 28 additions and 9 deletions.
1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
11 changes: 7 additions & 4 deletions docs/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -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 _(9466 kB)_, #41;
* Add compress/minified version of Javascript _(10070 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][]

Expand Down Expand Up @@ -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/

Expand Down
2 changes: 2 additions & 0 deletions src/config.js
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
10 changes: 5 additions & 5 deletions src/partials/attribute.html
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@
<a href="https://iet-ou.github.io/our-journey/">our-journey</a>
v<i>__VERSION__</i>
|
© 2018 <a href="http://www.open.ac.uk/">The Open University</a>
(<a href="https://iet.open.ac.uk/" title="Institute of Educational Technology">IET</a>).
|
License: <a href="https://gnu.org/licenses/gpl-3.0.en.html" title="GNU General Public License, version 3 or later.">GPL 3.0+</a>.
© <a href="http://www.open.ac.uk/" title='Copyright © 2018 The Open University'>The Open University</a>
| <a href="https://iet.open.ac.uk/" title='Developed by the Institute of Educational Technology (IET)'>IET</a>
<a rel='license' href="https://gnu.org/licenses/gpl-3.0.en.html" title="GNU General Public License, version 3 or later [GPL-3.0+]">License</a>
<a class='p' href='{privacyUrl}' title='Privacy policy, and terms of service'>Privacy</a>
</p>

<p class="footer-logos">
Expand All @@ -29,4 +29,4 @@
https://buttons.github.io/
<a class="github-button" href="https://github.com/IET-OU/our-journey/fork" data-size="large" aria-label="Fork IET-OU/our-journey on GitHub">Fork</a>
<script async defer src="https://buttons.github.io/buttons.js"></script>
-->
-->
1 change: 1 addition & 0 deletions src/views.js
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@ function setup () {
function partial (partialContent) {
return UTIL.replace(partialContent, {
'{assets}': UTIL.config('assetUrl'),
'{privacyUrl}': UTIL.config('privacyUrl') || '',
'{helpUrl}': UTIL.config('helpUrl')
});
}
Expand Down
12 changes: 12 additions & 0 deletions style/journeystyle.css
Original file line number Diff line number Diff line change
Expand Up @@ -207,6 +207,18 @@ svg#journey-canvas .card.orient-vert > rect {
margin-top: 65px;
}

.footer-copy .p:before,
.footer-copy [ rel = license ]:before {
color: #000;
content: '|';
margin: 0 .25rem;
text-decoration: none;
}

.footer-copy .p[ href = '' ] {
display: none;
}

.footer-logos {
float: right;
}
Expand Down

0 comments on commit c005146

Please sign in to comment.