{{ .L.GlobalMap.Header }} // SAYA TODAY

diff --git a/views/pages/global-map.html b/views/pages/global-map.html index 2459ca1..aa6ddfd 100644 --- a/views/pages/global-map.html +++ b/views/pages/global-map.html @@ -1,306 +1,412 @@ - + - - - - - - - - - {{ .L.GlobalMap.Header }} // SAYA TODAY - - - - - {{ block "header" . }}{{ end }} - - - - - - - - - - - - -

- - - - - -

+ + + + + + - - + const largerDimension = Math.max(viewportWidth, viewportHeight); - - - + + - - + 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: color, + fillColor: color, + fillOpacity: 0.15, + radius: relativeErrorMeters + }).addTo(map); + } + + var marker = L.marker([x, y], { + icon: createCustomIcon(color), + title: title, + }).bindPopup(` +

+ ${title}
${x}, ${y} +

`); + + markers.addLayer(marker); + } + + document.addEventListener('DOMContentLoaded', () => { + initLocationMap(); + {{- range .MapMarkers }} + mapAddMarker({{ .Lat }}, {{ .Long }}, {{ .AccuracyMeters }}, {{ .Title }}, {{ .PageLink }}, {{ .Thumbnail }}, {{ fdiv .Index (len $.MapMarkers) }}); + {{- end }} + }); + + window.addEventListener('resize', function() { + setTimeout(() => { + map.invalidateSize(); + }, 100); + }); + + diff --git a/views/pages/unsubscribe-page.html b/views/pages/unsubscribe-page.html index bb5d64b..c9de473 100644 --- a/views/pages/unsubscribe-page.html +++ b/views/pages/unsubscribe-page.html @@ -1,34 +1,65 @@ - + - - - - - {{ .L.UnsubscribePage.Header }} // SAYA TODAY - - + + + + + {{ .L.UnsubscribePage.Header }} // SAYA.UZ + + - + +

+ {{ .StatusEmoji }} +

- -

- - +

+ {{ .StatusText }} +

+ diff --git a/views/partials/general-page-footer.html b/views/partials/general-page-footer.html index 3001d5d..3f5f9ee 100644 --- a/views/partials/general-page-footer.html +++ b/views/partials/general-page-footer.html @@ -1,7 +1,23 @@ {{ block "footer" . }}{{ end }} -

- All the photos on saya.today are licensed under CC BY-SA 4.0 by Saya Andy © {{ .PublishedYear }} +

+ All the photos on saya.uz are licensed under + CC BY-SA 4.0 + by Saya Andy © {{ .PublishedYear }}

\ No newline at end of file +

diff --git a/views/partials/general-page-header.html b/views/partials/general-page-header.html index ad11ffb..995ebf3 100644 --- a/views/partials/general-page-header.html +++ b/views/partials/general-page-header.html @@ -1,5 +1,9 @@ -{{ .Title }} // SAYA TODAY +{{ .Title }} // SAYA.UZ

{{ block "header" . }}{{ end }} -

\ No newline at end of file +

+ {{ .Title }} +

-- cgit v1.3.1+13