Merge pull request #158 from mapnik/issue-157

Fix mixed-content warnings

Author: artemp

Makefile

@@ -4,7 +4,7 @@ build:
 	node scripts/make-datasource-ref.js
 
 check test: build
-	python scripts/test.py
+	python3 scripts/test.py
 	node scripts/lint.js
 	npm test
 
@@ -14,4 +14,4 @@ testpack:
 	tar -ztvf *tgz
 	rm -f ./*tgz
 
-.PHONY: test build
+.PHONY: test build

index.html

@@ -12,10 +12,10 @@
         <meta name="DC.description" content="Mapnik is a toolkit for developing GIS applications" />
         <meta name="DC.creator" content="Artem Pavlenko, artem at mapnik" />
 
-        <link href="http://mapnik.org/css/mapnik.css" rel="stylesheet" type="text/css" media="screen" />
+        <link href="https://mapnik.org/css/mapnik.css" rel="stylesheet" type="text/css" media="screen" />
         <link href="./site/main.css" rel="stylesheet" type="text/css" media="screen" />
-        <link rel="shortcut icon" href="http://mapnik.org/images/favicon.ico" />
-        <link href='http://fonts.googleapis.com/css?family=Maven+Pro&subset=latin,latin-ext' rel='stylesheet' type='text/css'>
+        <link rel="shortcut icon" href="https://mapnik.org/images/favicon.ico" />
+        <link href='https://fonts.googleapis.com/css?family=Maven+Pro&subset=latin,latin-ext' rel='stylesheet' type='text/css'>
         <script src='./site/nanoajax.min.js'></script>
 
         <meta charset=utf-8 />
@@ -27,7 +27,7 @@
         <header class='sticky'>
             <div id="navbar">
                 <div class='col12 clearfix prose'>
-                    <div class='col3 margin2'><a href='http://mapnik.org'><h2 class='space-top2 fancy dark'>mapnik</h1></a></div>
+                    <div class='col3 margin2'><a href='https://mapnik.org'><h2 class='space-top2 fancy dark'>mapnik</h1></a></div>
                     <div class='col6 dark pad4y prose'>API reference<span id="version"></span></div>
                 </div>
             </div>
@@ -46,7 +46,7 @@ <h2 class='space-bottom2 big'>API Reference</h2>
                 </div>
         </div>
        <div class='content col12 center caption small fill-sea dark pad1y'>
-            Copyright © 2017 Artem Pavlenko  |  <a href='http://mapnik.org/pages/downloads.html'>Downloads</a>  | <a href='http://mapnik.org/pages/license.html'>License</a>  |  <a href='http://mapnik.org/pages/media.html'>Media</a>
+            Copyright © 2026 Artem Pavlenko  |  <a href='https://mapnik.org/pages/downloads.html'>Downloads</a>  | <a href='https://mapnik.org/pages/license.html'>License</a>  |  <a href='https://mapnik.org/pages/media.html'>Media</a>
         </div>
         <script src='./site/main.js'></script>
         <script type="text/javascript">

package.json

@@ -12,7 +12,7 @@
   },
   "devDependencies": {
     "glob": "4.x",
-    "mocha": "1.x"
+    "mocha": "^1.21.5"
   },
   "dependencies": {
     "lodash": "^4.11.0",