Merge remote-tracking branch 'github/pull/349' into master

[chef.git] / cookbooks / dns / files / default / html / dns.js

diff --git a/cookbooks/dns/files/default/html/dns.js b/cookbooks/dns/files/default/html/dns.js
index 0677292a36c34ff466c0bc15a6cf414fec40c624..e5f5e2f5fcc24b52233df9a75377ef3a44497a37 100644 (file)
--- a/cookbooks/dns/files/default/html/dns.js
+++ b/cookbooks/dns/files/default/html/dns.js
@@ -3,8 +3,8 @@ function createMap(divName, jsonFile) {
   var map = L.map(divName);
 
   // Add OpenStreetMap layer
   var map = L.map(divName);
 
   // Add OpenStreetMap layer

-  L.tileLayer("http://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png", {
-    attribution: "© <a target=\"_parent\" href=\"http://www.openstreetmap.org\">OpenStreetMap</a> and contributors, under an <a target=\"_parent\" href=\"http://www.openstreetmap.org/copyright\">open license</a>",
+  L.tileLayer("https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png", {
+    attribution: "© <a target=\"_parent\" href=\"https://www.openstreetmap.org\">OpenStreetMap</a> and contributors, under an <a target=\"_parent\" href=\"https://www.openstreetmap.org/copyright\">open license</a>",

     maxZoom: 18
   }).addTo(map);
 
     maxZoom: 18
   }).addTo(map);
 


@@ -17,7 +17,7 @@ function createMap(divName, jsonFile) {
           return { color: feature.properties.colour, weight: 2, opacity: 1 }
         },
         onEachFeature: function (feature, layer) {
           return { color: feature.properties.colour, weight: 2, opacity: 1 }
         },
         onEachFeature: function (feature, layer) {

-          layer.bindPopup(feature.properties.country + " via " + feature.properties.server);
+          layer.bindPopup(feature.properties.origin + " via " + feature.properties.server);

           layer.on("mouseover", function () {
             this.setStyle({ weight: 5 });
           });
           layer.on("mouseover", function () {
             this.setStyle({ weight: 5 });
           });