From 5347d7984bf109a3de8a282791a79ef09a943d89 Mon Sep 17 00:00:00 2001 From: Seth Vargo Date: Thu, 17 Sep 2020 18:29:04 -0400 Subject: [PATCH] Switch to toasts for notices (#566) --- cmd/server/assets/_flash.html | 46 +++++++++++++++++++++++++++++++++++ cmd/server/assets/header.html | 29 +++++----------------- 2 files changed, 52 insertions(+), 23 deletions(-) create mode 100644 cmd/server/assets/_flash.html diff --git a/cmd/server/assets/_flash.html b/cmd/server/assets/_flash.html new file mode 100644 index 000000000..2b5bf12e4 --- /dev/null +++ b/cmd/server/assets/_flash.html @@ -0,0 +1,46 @@ +{{define "flash"}} +
+ {{range $msg := .flash.Errors}} + + {{end}} + {{range $msg := .flash.Warnings}} + + {{end}} + {{range $msg := .flash.Alerts}} + + {{end}} +
+{{end}} diff --git a/cmd/server/assets/header.html b/cmd/server/assets/header.html index 274a4469f..90f97d0e5 100644 --- a/cmd/server/assets/header.html +++ b/cmd/server/assets/header.html @@ -35,6 +35,10 @@ color: lightgray; pointer-events: none; } + + main.container[role=main] { + position: relative; + } {{end}} @@ -229,29 +233,6 @@ {{end}} -{{define "flash"}} -
- {{range $msg := .flash.Errors}} - - {{end}} - {{range $msg := .flash.Warnings}} - - {{end}} - {{range $msg := .flash.Alerts}} - - {{end}} -
-{{end}} - {{define "scripts"}} @@ -360,6 +341,8 @@ $this.tooltip('hide'); document.getSelection().removeAllRanges(); }); + + $('.toast').toast('show'); }); var $alerts = $('#alerts-container');