Skip to content

Commit

Permalink
Merge branch 'hotfix/v0.21.2'
Browse files Browse the repository at this point in the history
  • Loading branch information
rubenarslan committed Jun 2, 2024
2 parents 138931b + 08ddc72 commit 44c8f67
Show file tree
Hide file tree
Showing 31 changed files with 8,424 additions and 4 deletions.
35 changes: 35 additions & 0 deletions webroot/assets/bower_components/cookieconsent/.bower.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
{
"name": "cookieconsent",
"version": "3.1.1",
"homepage": "http://cookieconsent.osano.com/",
"authors": [
"Osano"
],
"description": "Osano cookie consent plugin",
"main": [
"build/cookieconsent.min.js",
"build/cookieconsent.min.css"
],
"keywords": [
"cookieconsent",
"cookie",
"law"
],
"license": "MIT",
"ignore": [
"**/.*",
"node_modules",
"bower_components",
"test",
"tests"
],
"_release": "3.1.1",
"_resolution": {
"type": "version",
"tag": "3.1.1",
"commit": "2b3191a39c7df4479a1f23053e3b31424089520e"
},
"_source": "git://github.com/insites/cookieconsent.git",
"_target": "*",
"_originalSource": "git://github.com/insites/cookieconsent"
}
51 changes: 51 additions & 0 deletions webroot/assets/bower_components/cookieconsent/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,51 @@
# Change Log

All notable changes to this project will be documented in this file.

The format is based on [Keep a Changelog](http://keepachangelog.com/)
and this project adheres to [Semantic Versioning](http://semver.org/).

## [3.0.2] - 2016-10-17

### Added

- Accessibility
- :focus effects
- ARIA rules for accessibility
- GoogleOff/GoogleOn tags for all content inside the banner. This prevents Google registering CookieConsent text as site content.

## [3.0.1] - 2016-09-21

### Added

- Changelog
- Application written to support:
- geolocation
- callback hooks
- different consent types
- new and easy to customise stylings

## [3.1.0] - 2018-07-17

### Added

- Secure cookies (must use the `secure` flag) in the `cookie` option
- Added a onNoCookieLaw hook
- Added a few `content` options like `policy` and `target`
- Added `dismissOnWindowClick` option (with an `ignoreClickFrom`) option which blacklists any clicks

### Fixed

- Icons (plus anything else) now allowed in buttons
- Dont call location service again if user has already chosen their privacy level
- Revoke option bug (fixed bug where revoke option wouldn't show on refresh after user has picked choice)

### Random

- Lowered console log level from error to warning when location service fails
- Removed non-standard X-Requested-By header from XxmHttpRequest
- Removed Maxmind as a default service, but you can still add it yourself (you need to whitelist a domain with maxmind)

### Deprecated

- Removed deprecated FreeGeoIP
79 changes: 79 additions & 0 deletions webroot/assets/bower_components/cookieconsent/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,79 @@
[![Build Status](https://travis-ci.org/osano/cookieconsent.svg?branch=master)](https://travis-ci.org/osano/cookieconsent)

## What is Cookie Consent?

[Cookie Consent](https://cookieconsent.osano.com/) is a lightweight JavaScript plugin for alerting users about the use of cookies on your website.

It is designed to help you comply with the hideous EU Cookie Law and not make you want to kill yourself in the process. So we made it fast, free, and relatively painless.

## Warning: Phishing attempt

Several users have been emailed with a phishing attempt trying to get them to move the URL they link to from the cdnjs link that is provided on our website as cdnjs is "going away". This is not associated with us and will most likely result in malicious sideloaded code on your website.

## Version 3.0

Version 3.0 is a complete rewrite from version 2. The most substantial new features are:

- the ability to GeoLocate and only show the addon to people in the relevant countries
- callback hooks for showing/accepting/revoking the banner
- support for different types of compliance, giving you the flexibility to obey even the strictest cookie laws
- easy no-fuss themes and customisable styles

## Installation

The easiest way to get up and running is to use our [wizard](https://cookieconsent.osano.com/download/).

You can also install this project through [npm](https://www.npmjs.com/):

```sh
npm install cookieconsent
```

Or through [Bower](https://bower.io/):

```sh
bower install cookieconsent
```

Or via a jsDelivr:

```html
<script src="https://cdn.jsdelivr.net/npm/cookieconsent@3/build/cookieconsent.min.js"></script>
```

## Documentation

See our [full documentation](https://cookieconsent.osano.com/documentation/).

## Contributing

Feel free to improve the plugin and send us a pull request.

The easiest way to develop is to host the files with a local webserver. e.g.

```sh
python -m SimpleHTTPServer
```

We use Gulp to compile the SCSS and minify the JavaScript. You can run a build with:

```sh
gulp build
```

## License

Code released under the [MIT licence](http://opensource.org/licenses/MIT).

## Credits

Cookie Consent v3

- Alex Morley-Finch (@alexmorleyfinch) - JavaScript
- Piiu Pilt - JavaScript
- Oliver Emberton (@oliveremberton) - a couple of lines of CSS, maybe

Cookie Consent v2

- David Ball (@drball) - CSS / themes
- Adam Hutchinson (@adjohu) - JavaScript
11 changes: 11 additions & 0 deletions webroot/assets/bower_components/cookieconsent/bower.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
{
"name": "cookieconsent",
"version": "3.1.1",
"homepage": "http://cookieconsent.osano.com/",
"authors": ["Osano"],
"description": "Osano cookie consent plugin",
"main": ["build/cookieconsent.min.js", "build/cookieconsent.min.css"],
"keywords": ["cookieconsent", "cookie", "law"],
"license": "MIT",
"ignore": ["**/.*", "node_modules", "bower_components", "test", "tests"]
}

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
@@ -0,0 +1,72 @@
.cc-window {
color: black;
}

.cc-banner .cc-message {
width: auto;
background: white;
padding: 20px 76px 20px 16px;
border-radius: 10px;
margin-right: -70px;
margin-left: 10%;
}

.cc-link,
.cc-link:visited {
color: red;
}

.cc-btn {
background: #0000ff;
background: -moz-radial-gradient(
center,
ellipse cover,
#0000ff 0%,
#99007c 100%
);
background: -webkit-radial-gradient(
center,
ellipse cover,
#0000ff 0%,
#99007c 100%
);
background: radial-gradient(ellipse at center, #0000ff 0%, #99007c 100%);
filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#0000ff', endColorstr='#99007c',GradientType=1 );
padding: 58px 0;
color: red;
border: 4px dotted red;
border-radius: 100px;
-webkit-animation: spin 4s linear infinite;
-moz-animation: spin 4s linear infinite;
animation: spin 4s linear infinite;
height: 150px;
width: 150px;
padding: 0;
line-height: 10;
}

.cc-btn:hover {
background: #99007c;
-webkit-animation: none;
-moz-animation: none;
animation: none;
}

@-moz-keyframes spin {
100% {
-moz-transform: rotate(360deg);
}
}

@-webkit-keyframes spin {
100% {
-webkit-transform: rotate(360deg);
}
}

@keyframes spin {
100% {
-webkit-transform: rotate(360deg);
transform: rotate(360deg);
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,108 @@
<!DOCTYPE html>
<html lang="en">

<head>
<base href="../">
<meta charset="UTF-8" />
<meta name="viewport" content="width=device-width, initial-scale=1">

<title>Demo 1 - Themes</title>

<link href="examples/style.css" rel="stylesheet">
<link href="build/cookieconsent.min.css" rel="stylesheet">

<body role="document">

<div class="center-outer fit">
<div class="center-inner">
<div class="example-window" role="main">

<h1>
<span>Demo 1</span> Themes</h1>

<p>
See what you can do with some of
<a href="http://cookieconsent.insites.com/">Cookie Consent's</a> themes:
</p>

<ul class="example-selector"></ul>

<a href="examples/example-2-custom-theme.html" class="page-switcher page-switcher-next" title="Next demo">&#9654;</a>

</div>
</div>
</div>

<script src="examples/script.js"></script>
<script src="build/cookieconsent.min.js"></script>
<script>

(function (C, U) {

var palettes = {
honeybee: { "popup": { "background": '#000' }, "button": { "background": '#f1d600', padding: '5px 25px' } },
blurple: { "popup": { "background": '#3937a3' }, "button": { "background": '#e62576' } },
mono: { "popup": { "background": "#237afc" }, "button": { "background": "transparent", "border": "#fff", "text": "#fff", padding: '5px 40px' } },
nuclear: { "popup": { "background": "#aa0000", "text": "#ffdddd" }, "button": { "background": "#ff0000" } },
cosmo: { "popup": { "background": "#383b75" }, "button": { "background": "#f1d600", padding: '5px 50px' } },
neon: { "popup": { "background": "#1d8a8a" }, "button": { "background": "#62ffaa" } },
corporate: { "popup": { "background": "#edeff5", "text": "#838391" }, "button": { "background": "#4b81e8" } }
};

cookiePopups = U.initialisePopupSelector({
cookieconsent: C,
selector: document.querySelector('.example-selector'),
popups: {
'Mono': {
type: 'info',
position: 'bottom',
palette: palettes.mono,
},
'Honeybee': {
type: 'info',
position: 'top',
palette: palettes.honeybee,
},
'Blurple': {
type: 'opt-out',
position: 'bottom-left',
palette: palettes.blurple,
content: {
"message": "You can override the text that appears in an alert too.",
"dismiss": "Awesome"
}
},
'Nuclear': {
type: 'info',
position: 'bottom-right',
theme: "edgeless",
palette: palettes.nuclear,
content: {
"dismiss": "I accept certain doom"
}
},
'Cosmo': {
type: 'opt-out',
position: 'bottom',
palette: palettes.cosmo,
},
'Neon': {
type: 'info',
theme: "classic",
position: 'bottom-left',
palette: palettes.neon,
},
'Corporate': {
type: 'info',
position: 'top',
palette: palettes.corporate,
static: true,
content: {
"dismiss": "Dismiss"
}
}
},
});
}(window.cookieconsent, window.cookieconsent_example_util));

</script>
Loading

0 comments on commit 44c8f67

Please sign in to comment.