From fe760d1a4118f80ab84c2eab1c6571ff157a8884 Mon Sep 17 00:00:00 2001 From: jampukka Date: Thu, 22 Oct 2026 09:10:20 +0300 Subject: [PATCH] Update Bootstrap, Leaflet, proj4 and swagger-ui CDN versions in HTML templates --- CHANGELOG.md | 1 + .../src/main/resources/fi/nls/hakunapi/html/api.ftl | 4 ++-- .../fi/nls/hakunapi/html/collectionInfo.ftl | 6 +++--- .../resources/fi/nls/hakunapi/html/collections.ftl | 6 +++--- .../resources/fi/nls/hakunapi/html/conformance.ftl | 6 +++--- .../main/resources/fi/nls/hakunapi/html/feature.ftl | 13 ++++--------- .../fi/nls/hakunapi/html/featureCollection.ftl | 13 ++++--------- .../main/resources/fi/nls/hakunapi/html/mapLibs.ftl | 7 +++++++ .../resources/fi/nls/hakunapi/html/queryables.ftl | 6 +++--- .../main/resources/fi/nls/hakunapi/html/root.ftl | 6 +++--- 10 files changed, 33 insertions(+), 35 deletions(-) create mode 100644 src/hakunapi-html/src/main/resources/fi/nls/hakunapi/html/mapLibs.ftl diff --git a/CHANGELOG.md b/CHANGELOG.md index f150cce2..0555dfae 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -78,6 +78,7 @@ description, and links to the collection's schema. `collections.ftl` lists entries as `collection_id (Title)`. - The HTML collection page links to the collection schema and shows the spatial and temporal extent when available (#185). +- HTML templates: Bootstrap 5.0.0-beta3 -> 5.3.8, Leaflet 1.7.1 -> 1.9.4, proj4 2.7.5 -> 2.22.0 and swagger-ui 3.45.1 -> 5.29.1 (still loaded from CDNs, with updated SRI hashes). The Leaflet and proj4 imports now live in `mapLibs.ftl`, shared by `featureCollection.ftl` and `feature.ftl`; a custom template directory that overrides these two templates keeps its own versions (#199). ## 2.0.0 diff --git a/src/hakunapi-html/src/main/resources/fi/nls/hakunapi/html/api.ftl b/src/hakunapi-html/src/main/resources/fi/nls/hakunapi/html/api.ftl index ec8354c1..7df7cda9 100644 --- a/src/hakunapi-html/src/main/resources/fi/nls/hakunapi/html/api.ftl +++ b/src/hakunapi-html/src/main/resources/fi/nls/hakunapi/html/api.ftl @@ -3,7 +3,7 @@ Swagger UI - + @@ -42,7 +37,7 @@
  • - JSON + JSON
  • @@ -110,7 +105,7 @@ if (langSelect) { }); } - + - <#if bgProj4?has_content> - - - + + <#include "mapLibs.ftl"> ${(featureType.title)!(featureType.name)} - Items @@ -40,7 +35,7 @@
  • - JSON + JSON
  • @@ -153,7 +148,7 @@ if (langSelect) { }); } - + + <#if bgProj4?has_content> + + + diff --git a/src/hakunapi-html/src/main/resources/fi/nls/hakunapi/html/queryables.ftl b/src/hakunapi-html/src/main/resources/fi/nls/hakunapi/html/queryables.ftl index 2a9df88a..60b65e24 100644 --- a/src/hakunapi-html/src/main/resources/fi/nls/hakunapi/html/queryables.ftl +++ b/src/hakunapi-html/src/main/resources/fi/nls/hakunapi/html/queryables.ftl @@ -3,7 +3,7 @@ - + ${service.title!""} - ${(model.title)!(model.collectionId)} queryables @@ -29,7 +29,7 @@
  • - JSON + JSON
  • @@ -71,6 +71,6 @@ if (langSelect) { }); } - + \ No newline at end of file diff --git a/src/hakunapi-html/src/main/resources/fi/nls/hakunapi/html/root.ftl b/src/hakunapi-html/src/main/resources/fi/nls/hakunapi/html/root.ftl index 6b2cb4df..4d0e101d 100644 --- a/src/hakunapi-html/src/main/resources/fi/nls/hakunapi/html/root.ftl +++ b/src/hakunapi-html/src/main/resources/fi/nls/hakunapi/html/root.ftl @@ -3,7 +3,7 @@ - + ${model.title!""} - Home @@ -26,7 +26,7 @@
  • - JSON + JSON
  • @@ -92,6 +92,6 @@ if (langSelect) { }); } - + \ No newline at end of file