diff --git a/main.go b/main.go index 3cd44b1..04e0840 100644 --- a/main.go +++ b/main.go @@ -29,7 +29,7 @@ import ( "time" ) -const VERSION = "v34" +const VERSION = "v33" var ( logger *slog.Logger diff --git a/page.go b/page.go index a83ed12..38ff22c 100644 --- a/page.go +++ b/page.go @@ -2,7 +2,7 @@ package main import ( // External - werr "git.gibonuddevalla.se/go/wrappederror" + we "git.gibonuddevalla.se/go/wrappederror" // Standard "fmt" @@ -25,7 +25,7 @@ type Page struct { func (p *Page) Render(w http.ResponseWriter, r *http.Request) { tmpl, err := getPage(p.LAYOUT, p.PAGE) if err != nil { - httpError(w, werr.Wrap(err).Log()) + httpError(w, we.Wrap(err).Log()) return } @@ -58,6 +58,6 @@ func (p *Page) Render(w http.ResponseWriter, r *http.Request) { err = tmpl.Execute(w, data) if err != nil { - httpError(w, werr.Wrap(err).Log()) + httpError(w, we.Wrap(err).Log()) } } diff --git a/static/css/default_light/gruvbox.css b/static/css/default_light/gruvbox.css index 4420fef..f2b59e8 100644 --- a/static/css/default_light/gruvbox.css +++ b/static/css/default_light/gruvbox.css @@ -20,4 +20,5 @@ input[type="datetime-local"] { background-color: #1b4e78; color: #ccc; border: 1px solid #535353; + padding: 6px; } diff --git a/static/css/default_light/main.css b/static/css/default_light/main.css index 0a92050..37b0e9d 100644 --- a/static/css/default_light/main.css +++ b/static/css/default_light/main.css @@ -262,7 +262,7 @@ label { top: 16px; right: 16px; display: grid; - grid-template-columns: 8px repeat(2, min-content) 8px min-content 8px 1px 8px repeat(3, min-content) 8px repeat(3, min-content) 8px 1px 8px repeat(2, min-content) 8px; + grid-template-columns: 8px repeat(2, min-content) 8px 1px 8px repeat(3, min-content) 8px repeat(3, min-content) 8px 1px 8px repeat(2, min-content) 8px; grid-gap: 6px 8px; align-items: center; width: min-content; diff --git a/static/css/default_light/notifications.css b/static/css/default_light/notifications.css index e9f86ba..f294e27 100644 --- a/static/css/default_light/notifications.css +++ b/static/css/default_light/notifications.css @@ -1,8 +1,11 @@ +input[type="datetime-local"] { + padding: 6px; +} #notifications { display: grid; grid-template-columns: repeat(5, min-content); grid-gap: 4px 16px; - margin-top: 96px; + margin-top: 32px; margin-bottom: 32px; background-color: #2979b8; padding: 16px 24px; diff --git a/static/css/gruvbox/gruvbox.css b/static/css/gruvbox/gruvbox.css index 6acdbc0..400e861 100644 --- a/static/css/gruvbox/gruvbox.css +++ b/static/css/gruvbox/gruvbox.css @@ -20,4 +20,5 @@ input[type="datetime-local"] { background-color: #202020; color: #ccc; border: 1px solid #535353; + padding: 6px; } diff --git a/static/css/gruvbox/main.css b/static/css/gruvbox/main.css index 9a5edea..4853b99 100644 --- a/static/css/gruvbox/main.css +++ b/static/css/gruvbox/main.css @@ -262,7 +262,7 @@ label { top: 16px; right: 16px; display: grid; - grid-template-columns: 8px repeat(2, min-content) 8px min-content 8px 1px 8px repeat(3, min-content) 8px repeat(3, min-content) 8px 1px 8px repeat(2, min-content) 8px; + grid-template-columns: 8px repeat(2, min-content) 8px 1px 8px repeat(3, min-content) 8px repeat(3, min-content) 8px 1px 8px repeat(2, min-content) 8px; grid-gap: 6px 8px; align-items: center; width: min-content; diff --git a/static/css/gruvbox/notifications.css b/static/css/gruvbox/notifications.css index 75d8d89..601d899 100644 --- a/static/css/gruvbox/notifications.css +++ b/static/css/gruvbox/notifications.css @@ -1,8 +1,11 @@ +input[type="datetime-local"] { + padding: 6px; +} #notifications { display: grid; grid-template-columns: repeat(5, min-content); grid-gap: 4px 16px; - margin-top: 96px; + margin-top: 32px; margin-bottom: 32px; background-color: #333; padding: 16px 24px; diff --git a/static/images/default_light/forward.svg b/static/images/default_light/forward.svg deleted file mode 100644 index 538498a..0000000 --- a/static/images/default_light/forward.svg +++ /dev/null @@ -1,69 +0,0 @@ - - - - - - - - - - image/svg+xml - - - - - - alert - arrow-right-bold-circle - - - diff --git a/static/images/gruvbox/forward.svg b/static/images/gruvbox/forward.svg deleted file mode 100644 index 538498a..0000000 --- a/static/images/gruvbox/forward.svg +++ /dev/null @@ -1,69 +0,0 @@ - - - - - - - - - - image/svg+xml - - - - - - alert - arrow-right-bold-circle - - - diff --git a/static/less/gruvbox.less b/static/less/gruvbox.less index 25e8829..7fa24ef 100644 --- a/static/less/gruvbox.less +++ b/static/less/gruvbox.less @@ -29,4 +29,5 @@ input[type="datetime-local"] { background-color: @bg2; color: #ccc; border: 1px solid #535353; + padding: 6px; } diff --git a/static/less/main.less b/static/less/main.less index dd38af3..33d6845 100644 --- a/static/less/main.less +++ b/static/less/main.less @@ -297,7 +297,7 @@ label { right: 16px; display: grid; - grid-template-columns: 8px repeat(2,min-content) 8px min-content 8px 1px 8px repeat(3,min-content) 8px repeat(3,min-content) 8px 1px 8px repeat(2,min-content) 8px; + grid-template-columns: 8px repeat(2,min-content) 8px 1px 8px repeat(3,min-content) 8px repeat(3,min-content) 8px 1px 8px repeat(2,min-content) 8px; grid-gap: 6px 8px; align-items: center; diff --git a/static/less/notifications.less b/static/less/notifications.less index d168327..6c9ee4e 100644 --- a/static/less/notifications.less +++ b/static/less/notifications.less @@ -1,10 +1,14 @@ @import "theme-@{THEME}.less"; +input[type="datetime-local"] { + padding: 6px; +} + #notifications { display: grid; grid-template-columns: repeat(5, min-content); grid-gap: 4px 16px; - margin-top: 96px; + margin-top: 32px; margin-bottom: 32px; background-color: @bg3; padding: 16px 24px; diff --git a/views/components/timefilter.gotmpl b/views/components/timefilter.gotmpl index 4c97cb8..df24df0 100644 --- a/views/components/timefilter.gotmpl +++ b/views/components/timefilter.gotmpl @@ -11,11 +11,6 @@ el.value = seconds el.form.submit() } - - function enterHandler(evt) { - if (evt.key == 'Enter') - document.getElementById('form-time-selector').submit() - } @@ -24,32 +19,29 @@
- {{/* ====== Row 1 ====== */}} + + {{/* Row 1 */}}
-
Date and time
+
Date and time
-
 
+
 
-
Offsets
+
Offsets
-
+
-
Presets
+
Presets
- - - {{/* ====== Row 2 ====== */}} + {{/* Row 2 */}}
From
- -
-
+
{{/* Vertical line */}} @@ -74,14 +66,10 @@
- - - {{/* ====== Row 3 ====== */}} + {{/* Row 3 */}}
To
- -
-
+
{{/* Vertical line */}} @@ -107,12 +95,57 @@
- - - {{/* ====== Row 4 ====== */}} + {{/* Row 4 */}}
-
-
+
+
+ + + {{/* +
From
+
To
+ +
+
+
+ + + + + +
+
Presets
+
Offsets
+ +
Last hour
+ +
◀
+
Hour
+
▶
+ +
Last 24 hours
+ +
◀
+
Day
+
▶
+ +
Last 7 days
+ +
◀
+
Week
+
▶
+ +
Last 31 days
+
Last 24 hours
+
Last 24 hours
+ +
◀
+
Month
+
▶
+
+ + + */}}
{{ end }}