diff --git a/docs/graphics/ribbon.svg b/docs/graphics/ribbon.svg new file mode 100644 index 0000000..db26b32 --- /dev/null +++ b/docs/graphics/ribbon.svg @@ -0,0 +1,11 @@ + + + + + + + + + + + diff --git a/docs/index.html b/docs/index.html index 2539568..2517c69 100644 --- a/docs/index.html +++ b/docs/index.html @@ -42,7 +42,7 @@ - +
Andere Sprachen: English, Deutsch, Français, Español, Other language
@@ -58,8 +58,6 @@

Vorratsdaten­speicherung in der Schweiz

  • Einbetten
  • -
  • -
    • diff --git a/docs/index_en.html b/docs/index_en.html index 6caf1aa..98ba912 100644 --- a/docs/index_en.html +++ b/docs/index_en.html @@ -42,7 +42,7 @@ - +
    Other languages: English, Deutsch, Français, Español, Other language
    @@ -58,8 +58,6 @@

    Data retention in Switzerland

  • Embed
  • -
  • -
    • diff --git a/docs/index_es.html b/docs/index_es.html index d9cbec7..ebe3f99 100644 --- a/docs/index_es.html +++ b/docs/index_es.html @@ -42,7 +42,7 @@ - +
    Otros idiomas: English, Deutsch, Français, Español, Other language
    @@ -58,8 +58,6 @@

    Retención de datos en Suiza

  • Embed
  • -
  • -
    • diff --git a/docs/index_fr.html b/docs/index_fr.html index 176e5b9..40b71da 100644 --- a/docs/index_fr.html +++ b/docs/index_fr.html @@ -42,7 +42,7 @@ - +
    Autres langues: English, Deutsch, Français, Español, Other language
    @@ -58,8 +58,6 @@

    Conservation des données personnelles en Suisse

  • Intégrer
  • -
  • -
    • diff --git a/docs/index_ws.html b/docs/index_ws.html index 4f235a8..08010ba 100644 --- a/docs/index_ws.html +++ b/docs/index_ws.html @@ -42,6 +42,8 @@ + +
    @@ -56,8 +58,6 @@

  • -
  • -
    • diff --git a/docs/script/index.js b/docs/script/index.js index f5dac0b..2c1ef29 100644 --- a/docs/script/index.js +++ b/docs/script/index.js @@ -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){ diff --git a/docs/script/modules.js b/docs/script/modules.js index a1d3424..5d83686 100644 --- a/docs/script/modules.js +++ b/docs/script/modules.js @@ -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 © OpenStreetMap contributors, CC-BY-SA' }).addTo(map); diff --git a/generator/generate.js b/generator/generate.js index 33d0e5f..980711e 100644 --- a/generator/generate.js +++ b/generator/generate.js @@ -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, ''); diff --git a/generator/templates/index.html b/generator/templates/index.html index 6ce6562..6736ab1 100644 --- a/generator/templates/index.html +++ b/generator/templates/index.html @@ -42,6 +42,8 @@ + +
    {{other_languages}}: {{languagelist}}
    @@ -56,8 +58,6 @@

    {{heading}}

  • {{embed}}
  • -
  • -