From 0a9de353b2456505b0b8214fab4a7c844d31735c Mon Sep 17 00:00:00 2001 From: SayaAndy Date: Sun, 29 Mar 2026 02:05:06 +0700 Subject: fix: add page metadata correctly feat: link marker fill saturation and brightness in the global map to the publication date --- views/layouts/general-page.html | 4 +++- views/pages/blog-catalogue.html | 5 ----- views/pages/blog-page.html | 7 ------- views/pages/global-map.html | 27 ++++++++++++--------------- views/pages/home-page.html | 6 ------ views/pages/language-pick.html | 5 ----- views/pages/user-page.html | 5 ----- 7 files changed, 15 insertions(+), 44 deletions(-) (limited to 'views') diff --git a/views/layouts/general-page.html b/views/layouts/general-page.html index 2bf548f..3f5bcfd 100644 --- a/views/layouts/general-page.html +++ b/views/layouts/general-page.html @@ -3,7 +3,9 @@ - {{ block "meta" . }}{{ end }} + {{- range $k, $v := .Meta }} + + {{- end }} diff --git a/views/pages/blog-catalogue.html b/views/pages/blog-catalogue.html index 349e58f..d2c74ae 100644 --- a/views/pages/blog-catalogue.html +++ b/views/pages/blog-catalogue.html @@ -1,8 +1,3 @@ -{{ define "meta" }} - - -{{ end }} - {{ define "body" }}
diff --git a/views/pages/blog-page.html b/views/pages/blog-page.html index 241ef43..c81406f 100644 --- a/views/pages/blog-page.html +++ b/views/pages/blog-page.html @@ -1,10 +1,3 @@ -{{ define "meta" }} - - - - -{{ end }} - {{ define "body" }}
diff --git a/views/pages/global-map.html b/views/pages/global-map.html index a19f3fa..4b07bd2 100644 --- a/views/pages/global-map.html +++ b/views/pages/global-map.html @@ -245,35 +245,32 @@ map.addLayer(markers); } - function stringToColor(str) { + function markerToHsl(str, newCoef) { let hash = 0; - for (let i = 0; i < str.length; i++) { + for (let i = 0; i < str.length / 2; i++) { hash = str.charCodeAt(i) + ((hash << 5) - hash); + hash = str.charCodeAt(str.length - i - 1) + ((hash << 5) - hash); + hash %= 360; } - let color = '#'; - for (let i = 0; i < 3; i++) { - const value = (hash >> (i * 8)) & 0xFF; - color += ('00' + value.toString(16)).substr(-2); - } - - return color; + return [hash, (20 + newCoef * 80).toFixed(0), (20 + newCoef * 75).toFixed(0)]; } - function mapAddMarker(x, y, relativeErrorMeters = 0, title = "", link = "", thumbnail = "") { - const titleColor = stringToColor(title); + function mapAddMarker(x, y, relativeErrorMeters = 0, title = "", link = "", thumbnail = "", newCoef = 1) { + const [h, s, l] = markerToHsl(title, newCoef); + const color = `hsl(${h} ${s}% ${l}%)`; if (relativeErrorMeters != 0) { var circle = L.circle([x, y], { - color: titleColor, - fillColor: titleColor, + color: color, + fillColor: color, fillOpacity: 0.15, radius: relativeErrorMeters }).addTo(map); } var marker = L.marker([x, y], { - icon: createCustomIcon(titleColor), + icon: createCustomIcon(color), title: title, }).bindPopup(`
@@ -287,7 +284,7 @@ document.addEventListener('DOMContentLoaded', () => { initLocationMap(); {{- range .MapMarkers }} - mapAddMarker({{ .Lat }}, {{ .Long }}, {{ .AccuracyMeters }}, {{ .Title }}, {{ .PageLink }}, {{ .Thumbnail }}); + mapAddMarker({{ .Lat }}, {{ .Long }}, {{ .AccuracyMeters }}, {{ .Title }}, {{ .PageLink }}, {{ .Thumbnail }}, {{ fdiv .Index (len $.MapMarkers) }}); {{- end }} }); diff --git a/views/pages/home-page.html b/views/pages/home-page.html index 4ba6b8e..6d397fa 100644 --- a/views/pages/home-page.html +++ b/views/pages/home-page.html @@ -1,9 +1,3 @@ -{{ define "meta" }} - - - -{{ end }} - {{ define "body" }}
diff --git a/views/pages/language-pick.html b/views/pages/language-pick.html index 3f6f672..775c18e 100644 --- a/views/pages/language-pick.html +++ b/views/pages/language-pick.html @@ -1,8 +1,3 @@ -{{ define "meta" }} - - -{{ end }} - {{ define "body" }}
{{- range .AvailableLanguages }} diff --git a/views/pages/user-page.html b/views/pages/user-page.html index c9f7373..fda7e66 100644 --- a/views/pages/user-page.html +++ b/views/pages/user-page.html @@ -1,8 +1,3 @@ -{{ define "meta" }} - - -{{ end }} - {{ define "body" }}
-- cgit v1.3.1+13