Skip to content

Commit

Permalink
Merge pull request #20 from schalkt/develop
Browse files Browse the repository at this point in the history
Updated demo and package files
  • Loading branch information
schalkt authored Mar 28, 2024
2 parents a63accf + 025c1db commit fe66f98
Show file tree
Hide file tree
Showing 10 changed files with 95 additions and 96 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -4,3 +4,4 @@
/node_modules
*manifest.json
*.log
/demo/index.html
10 changes: 5 additions & 5 deletions demo/index-bootstrap.html → demo/demo-bootstrap.html
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@
<script src="https://code.jquery.com/jquery-3.5.1.slim.min.js" integrity="sha384-DfXdz2htPH0lsSSs5nCTpuj/zy4C+OGpamoFVy38MVBnE+IbbVYUew+OrCXaRkfj" crossorigin="anonymous"></script>
<script src="https://cdn.jsdelivr.net/npm/[email protected]/dist/js/bootstrap.bundle.min.js" integrity="sha384-ho+j7jyWK8fNQe+A12Hb8AhRq26LrZ/JpcUGGOn+Y7RsweNrtN/tE3MoK7ZeZDyx" crossorigin="anonymous"></script>

<link rel="stylesheet" href="./index.css">
<script src="./index.js"></script>
<link rel="stylesheet" href="./demo.css">
<script src="./demo.js"></script>

<script id="cookieScript" type="text/javascript" src="./../dist/cookie-warn.js" data-debug="true"></script>

Expand All @@ -27,9 +27,9 @@ <h1>EU cookie warning example</h1>
<br>
<h2>More examples</h2>
<ul>
<li><a href="./index.html">Basic example</a></li>
<li><a href="./index-params.html">Different style and all parameters with reject info</a></li>
<li><a href="./index-bootstrap.html">Bootstrap example</a></li>
<li><a href="./demo.html">Basic example</a></li>
<li><a href="./demo-params.html">Different style and all parameters with reject info</a></li>
<li><a href="./demo-bootstrap.html">Bootstrap example</a></li>
</ul>
<div id="output"></div>
</div>
Expand Down
10 changes: 5 additions & 5 deletions demo/index-params.html → demo/demo-params.html
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
<title>EU Cookie Law warning message demo page</title>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />

<link rel="stylesheet" href="./index.css">
<script src="./index.js"></script>
<link rel="stylesheet" href="./demo.css">
<script src="./demo.js"></script>

<script id="cookieScript" type="text/javascript" src="./../dist/cookie-warn.js"
data-lang-en="{
Expand Down Expand Up @@ -42,9 +42,9 @@ <h1>EU cookie warning example</h1>
<br>
<h2>More examples</h2>
<ul>
<li><a href="./index.html">Basic example</a></li>
<li><a href="./index-params.html">Different style and all parameters with reject info</a></li>
<li><a href="./index-bootstrap.html">Bootstrap example</a></li>
<li><a href="./demo.html">Basic example</a></li>
<li><a href="./demo-params.html">Different style and all parameters with reject info</a></li>
<li><a href="./demo-bootstrap.html">Bootstrap example</a></li>
</ul>
<div id="output"></div>
</div>
Expand Down
File renamed without changes.
12 changes: 5 additions & 7 deletions demo/index.html → demo/demo.html
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
<title>EU Cookie Law warning message demo page</title>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />

<link rel="stylesheet" href="./index.css">
<script src="./index.js"></script>
<link rel="stylesheet" href="./demo.css">
<script src="./demo.js"></script>

<script id="cookieScript" type="text/javascript" src="./../dist/cookie-warn.js"></script>

Expand All @@ -23,14 +23,12 @@ <h1>EU cookie warning example</h1>
<br>
<h2>More examples</h2>
<ul>
<li><a href="./index.html">Basic example</a></li>
<li><a href="./index-params.html">Different style and all parameters with reject info</a></li>
<li><a href="./index-bootstrap.html">Bootstrap example</a></li>
<li><a href="./demo.html">Basic example</a></li>
<li><a href="./demo-params.html">Different style and all parameters with reject info</a></li>
<li><a href="./demo-bootstrap.html">Bootstrap example</a></li>
</ul>
<div id="output"></div>
</div>

<script async src="https://stat.schalk.hu:52222/sping1.js?token=oUQxyJxR695lzBa7qrSUrP1Q2H8qILMoAo7LCCX" id="schtat" server="https://stat.schalk.hu:52222" delay="1" key="iH86fnFbyJpprnegz9IB2jc8LOh37Sky4g2MDLxG5GrmCrBKfktqxXQid49uzSG6HYha3EvZ"></script>

</body>

Expand Down
File renamed without changes.
2 changes: 1 addition & 1 deletion dist/cookie-warn.js.LICENSE.txt
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/**
* @preserve cookie-warn - EU cookie warn
*
* @version v3.2.16
* @version v3.2.17
* @link https://projects.schalk.hu/cookie-warn/demo/index.html
* @author Tamas Schalk (https://github.com/schalkt)
* @license MIT
Expand Down
152 changes: 76 additions & 76 deletions package-lock.json

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "cookie-warn",
"version": "3.2.16",
"version": "3.2.17",
"description": "EU cookie warn",
"homepage": "https://projects.schalk.hu/cookie-warn/demo/index.html",
"repository": {
Expand Down
2 changes: 1 addition & 1 deletion src/cookie-warn.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/**
* @preserve cookie-warn - EU cookie warn
*
* @version v3.2.16
* @version v3.2.17
* @link https://projects.schalk.hu/cookie-warn/demo/index.html
* @author Tamas Schalk (https://github.com/schalkt)
* @license MIT
Expand Down

0 comments on commit fe66f98

Please sign in to comment.