Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update to have the tiles visible again #7

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Update to have the tiles visible again #7

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
9458afe
FIX: correct last archive corrections
signalwerk Nov 18, 2022
9a49d64
MOD: remove old social media networks
signalwerk Nov 18, 2022
e5d3db4
MOD: change to the official tile.openstreetmap.org
signalwerk Nov 18, 2022
7f484eb
ADD: a ribbon to indicate archived status
signalwerk Nov 18, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 11 additions & 0 deletions docs/graphics/ribbon.svg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 1 addition & 3 deletions docs/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@
<!--[if lt IE 9]><script type="text/javascript" src="lib/polyfills/respond.min.js"></script><![endif]-->
</head>
<body>
<img style="position: absolute; top: 0; left: 0; border: 0; z-index:9999" src="https://opendatacity.github.io/db-netzradar/ribbon-archiviert-2017.png">
<img style="position: absolute; top: 0; left: 0; border: 0; z-index:9999" src="./graphics/ribbon.svg">

<div id="container">
<div id="languages">Andere Sprachen: <a href="index_en.html">English</a>, <b>Deutsch</b>, <a href="index_fr.html">Français</a>, <a href="index_es.html">Español</a>, <a href="https://github.com/opendatacity/vds-suisse/tree/master/generator/languages">Other language</a></div>
Expand All @@ -58,8 +58,6 @@ <h1>Vorratsdaten&shy;speicherung in der Schweiz</h1>
<li><a class="embed-pop embed" id="button-share" href="javascript:;" title="Einbetten"><i class="fa fa-share"></i> <span>Einbetten</span></a></li>
<li><a class="share-pop twitter"><i class="fa fa-twitter"></i><span> Twitter</span></a>
<li><a class="share-pop facebook"><i class="fa fa-facebook"></i><span> Facebook</span></a>
<li><a class="share-pop google"><i class="fa fa-google-plus"></i><span> Google+</span></a>
<li><a class="share-pop adn"><i class="fa fa-adn"></i><span> App.net</span></a>
</ul>
</div>
<div class="info">
Expand Down
4 changes: 1 addition & 3 deletions docs/index_en.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@
<!--[if lt IE 9]><script type="text/javascript" src="lib/polyfills/respond.min.js"></script><![endif]-->
</head>
<body>
<img style="position: absolute; top: 0; left: 0; border: 0; z-index:9999" src="https://opendatacity.github.io/db-netzradar/ribbon-archiviert-2017.png">
<img style="position: absolute; top: 0; left: 0; border: 0; z-index:9999" src="./graphics/ribbon.svg">

<div id="container">
<div id="languages">Other languages: <b>English</b>, <a href="index.html">Deutsch</a>, <a href="index_fr.html">Français</a>, <a href="index_es.html">Español</a>, <a href="https://github.com/opendatacity/vds-suisse/tree/master/generator/languages">Other language</a></div>
Expand All @@ -58,8 +58,6 @@ <h1>Data retention in Switzerland</h1>
<li><a class="embed-pop embed" id="button-share" href="javascript:;" title="Embed"><i class="fa fa-share"></i> <span>Embed</span></a></li>
<li><a class="share-pop twitter"><i class="fa fa-twitter"></i><span> Twitter</span></a>
<li><a class="share-pop facebook"><i class="fa fa-facebook"></i><span> Facebook</span></a>
<li><a class="share-pop google"><i class="fa fa-google-plus"></i><span> Google+</span></a>
<li><a class="share-pop adn"><i class="fa fa-adn"></i><span> App.net</span></a>
</ul>
</div>
<div class="info">
Expand Down
4 changes: 1 addition & 3 deletions docs/index_es.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@
<!--[if lt IE 9]><script type="text/javascript" src="lib/polyfills/respond.min.js"></script><![endif]-->
</head>
<body>
<img style="position: absolute; top: 0; left: 0; border: 0; z-index:9999" src="https://opendatacity.github.io/db-netzradar/ribbon-archiviert-2017.png">
<img style="position: absolute; top: 0; left: 0; border: 0; z-index:9999" src="./graphics/ribbon.svg">

<div id="container">
<div id="languages">Otros idiomas: <a href="index_en.html">English</a>, <a href="index.html">Deutsch</a>, <a href="index_fr.html">Français</a>, <b>Español</b>, <a href="https://github.com/opendatacity/vds-suisse/tree/master/generator/languages">Other language</a></div>
Expand All @@ -58,8 +58,6 @@ <h1>Retención de datos en Suiza</h1>
<li><a class="embed-pop embed" id="button-share" href="javascript:;" title="Embed"><i class="fa fa-share"></i> <span>Embed</span></a></li>
<li><a class="share-pop twitter"><i class="fa fa-twitter"></i><span> Twitter</span></a>
<li><a class="share-pop facebook"><i class="fa fa-facebook"></i><span> Facebook</span></a>
<li><a class="share-pop google"><i class="fa fa-google-plus"></i><span> Google+</span></a>
<li><a class="share-pop adn"><i class="fa fa-adn"></i><span> App.net</span></a>
</ul>
</div>
<div class="info">
Expand Down
4 changes: 1 addition & 3 deletions docs/index_fr.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@
<!--[if lt IE 9]><script type="text/javascript" src="lib/polyfills/respond.min.js"></script><![endif]-->
</head>
<body>
<img style="position: absolute; top: 0; left: 0; border: 0; z-index:9999" src="https://opendatacity.github.io/db-netzradar/ribbon-archiviert-2017.png">
<img style="position: absolute; top: 0; left: 0; border: 0; z-index:9999" src="./graphics/ribbon.svg">

<div id="container">
<div id="languages">Autres langues: <a href="index_en.html">English</a>, <a href="index.html">Deutsch</a>, <b>Français</b>, <a href="index_es.html">Español</a>, <a href="https://github.com/opendatacity/vds-suisse/tree/master/generator/languages">Other language</a></div>
Expand All @@ -58,8 +58,6 @@ <h1>Conservation des données personnelles en Suisse</h1>
<li><a class="embed-pop embed" id="button-share" href="javascript:;" title="Intégrer"><i class="fa fa-share"></i> <span>Intégrer</span></a></li>
<li><a class="share-pop twitter"><i class="fa fa-twitter"></i><span> Twitter</span></a>
<li><a class="share-pop facebook"><i class="fa fa-facebook"></i><span> Facebook</span></a>
<li><a class="share-pop google"><i class="fa fa-google-plus"></i><span> Google+</span></a>
<li><a class="share-pop adn"><i class="fa fa-adn"></i><span> App.net</span></a>
</ul>
</div>
<div class="info">
Expand Down
4 changes: 2 additions & 2 deletions docs/index_ws.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,8 @@
<!--[if lt IE 9]><script type="text/javascript" src="lib/polyfills/respond.min.js"></script><![endif]-->
</head>
<body>
<img style="position: absolute; top: 0; left: 0; border: 0; z-index:9999" src="./graphics/ribbon.svg">

<div id="container">
<div id="languages">: <a href="index_en.html">English</a>, <a href="index.html">Deutsch</a>, <a href="index_fr.html">Français</a>, <a href="index_es.html">Español</a>, <a href="https://github.com/opendatacity/vds-suisse/tree/master/generator/languages">Other language</a></div>
<div class="jumbotron">
Expand All @@ -56,8 +58,6 @@ <h1></h1>
<li><a class="embed-pop embed" id="button-share" href="javascript:;" title=""><i class="fa fa-share"></i> <span></span></a></li>
<li><a class="share-pop twitter"><i class="fa fa-twitter"></i><span> Twitter</span></a>
<li><a class="share-pop facebook"><i class="fa fa-facebook"></i><span> Facebook</span></a>
<li><a class="share-pop google"><i class="fa fa-google-plus"></i><span> Google+</span></a>
<li><a class="share-pop adn"><i class="fa fa-adn"></i><span> App.net</span></a>
</ul>
</div>
<div class="info">
Expand Down
2 changes: 0 additions & 2 deletions docs/script/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,6 @@ $(document).ready(function () {
/* set urls for share buttons */
$('.share-pop.twitter').attr('href', "https://twitter.com/intent/tweet?url=" + encodeURIComponent(where_to) + '&text=' + encodeURIComponent(title_long));
$('.share-pop.facebook').attr('href', "http://www.facebook.com/sharer/sharer.php?u=" + encodeURIComponent(where_to) + '&t=' + encodeURIComponent(title_long));
$('.share-pop.google').attr('href',"https://plus.google.com/share?url=" + encodeURIComponent(where_to) + '&text=' + encodeURIComponent(title_long));
$('.share-pop.adn').attr('href',"https://alpha.app.net/intent/post?text=" +encodeURIComponent(title_long +' '+where_to));

/* social media link */
$('.share-pop').click(function(evt){
Expand Down
2 changes: 1 addition & 1 deletion docs/script/modules.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -305,7 +305,7 @@ function Map() {
}).setView([47, 7.5], 7);

// add an OpenStreetMap tile layer
L.tileLayer('//{s}.tilt.odcdn.de/suisse/{z}/{x}/{y}.png', {
L.tileLayer('//{s}.tile.openstreetmap.org/{z}/{x}/{y}.png', {
attribution: 'Map data &copy; <a href="http://openstreetmap.org" target="_blank">OpenStreetMap</a> contributors, <a href="http://creativecommons.org/licenses/by-sa/2.0/" target="_blank">CC-BY-SA</a>'
}).addTo(map);

Expand Down
6 changes: 3 additions & 3 deletions generator/generate.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,10 @@ var indexHtml = fs.readFileSync('templates/index.html', 'utf8');

languages.forEach(function (lang) {
lang.sourceFileName = 'languages/'+lang.code+'.json';
lang.indexFileName = '../web/index' + ((lang.code == 'de') ? '' : '_'+lang.code) + '.html';
lang.indexFileName = '../docs/index' + ((lang.code == 'de') ? '' : '_'+lang.code) + '.html';
lang.indexUrl = 'index' + ((lang.code == 'de') ? '' : '_'+lang.code) + '.html';
lang.frameFileName = '../web/frame_' + lang.code + '.html';
lang.jsObjFileName = '../web/script/language_'+lang.code+'.js';
lang.frameFileName = '../docs/frame_' + lang.code + '.html';
lang.jsObjFileName = '../docs/script/language_'+lang.code+'.js';

var dict = fs.readFileSync(lang.sourceFileName, 'utf8');
dict = dict.replace(/\/\*.*?\*\//gm, '');
Expand Down
4 changes: 2 additions & 2 deletions generator/templates/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,8 @@
<!--[if lt IE 9]><script type="text/javascript" src="lib/polyfills/respond.min.js"></script><![endif]-->
</head>
<body>
<img style="position: absolute; top: 0; left: 0; border: 0; z-index:9999" src="./graphics/ribbon.svg">

<div id="container">
<div id="languages">{{other_languages}}: {{languagelist}}</div>
<div class="jumbotron">
Expand All @@ -56,8 +58,6 @@ <h1>{{heading}}</h1>
<li><a class="embed-pop embed" id="button-share" href="javascript:;" title="{{embed}}"><i class="fa fa-share"></i> <span>{{embed}}</span></a></li>
<li><a class="share-pop twitter"><i class="fa fa-twitter"></i><span> Twitter</span></a>
<li><a class="share-pop facebook"><i class="fa fa-facebook"></i><span> Facebook</span></a>
<li><a class="share-pop google"><i class="fa fa-google-plus"></i><span> Google+</span></a>
<li><a class="share-pop adn"><i class="fa fa-adn"></i><span> App.net</span></a>
</ul>
</div>
<div class="info">
Expand Down