Merge remote-tracking branch 'klokantech/master' into public_url

# Conflicts: # src/main.js # src/server.js
2018-12-19 09:53:40 +01:00
parent dc6be5047c 243bdbdaa0
commit c99a1a5425
22 changed files with 1297 additions and 554 deletions
@@ -40,8 +40,8 @@
              {{#if serving_rendered}}
                {{#if serving_data}}| {{/if}}<a href="{{public_url}}styles/{{@key}}.json{{&../key_query}}">TileJSON</a>
              {{/if}}
-              {{#if wmts_link}}
-                | <a href="{{&wmts_link}}">WMTS</a>
+              {{#if serving_rendered}}
+                | <a href="/styles/{{@key}}/wmts.xml{{&../key_query}}">WMTS</a>
              {{/if}}
              {{#if xyz_link}}
                | <a href="#" onclick="return toggle_xyz('xyz_style_{{@key}}');">XYZ</a>
@@ -110,4 +110,4 @@
    </p>
  </footer>
 </body>
-</html>
+</html>