From bcd16cec63207a627c0c3708afb2796353a907e8 Mon Sep 17 00:00:00 2001
From: John Olheiser <john.olheiser@gmail.com>
Date: Wed, 26 Feb 2020 10:25:54 -0600
Subject: [PATCH] Fix admin notices (#10480)

Signed-off-by: jolheiser <john.olheiser@gmail.com>
---
 routers/routes/routes.go    | 2 +-
 templates/admin/notice.tmpl | 5 ++++-
 web_src/less/_admin.less    | 2 +-
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/routers/routes/routes.go b/routers/routes/routes.go
index df39d9e37..9859ebc53 100644
--- a/routers/routes/routes.go
+++ b/routers/routes/routes.go
@@ -487,7 +487,7 @@ func RegisterRoutes(m *macaron.Macaron) {
 		m.Group("/notices", func() {
 			m.Get("", admin.Notices)
 			m.Post("/delete", admin.DeleteNotices)
-			m.Get("/empty", admin.EmptyNotices)
+			m.Post("/empty", admin.EmptyNotices)
 		})
 	}, adminReq)
 	// ***** END: Admin *****
diff --git a/templates/admin/notice.tmpl b/templates/admin/notice.tmpl
index 93fc8ccc2..8e56713ec 100644
--- a/templates/admin/notice.tmpl
+++ b/templates/admin/notice.tmpl
@@ -40,7 +40,10 @@
 								<th></th>
 								<th colspan="5">
 									<div class="ui right">
-										<a class="ui red small button" href="{{AppSubUrl}}/admin/notices/empty">{{.i18n.Tr "admin.notices.delete_all"}}</a>
+										<form method="post" action="{{AppSubUrl}}/admin/notices/empty">
+											{{.CsrfTokenHtml}}
+											<button type="submit" class="ui red small button">{{.i18n.Tr "admin.notices.delete_all"}}</button>
+										</form>
 									</div>
 									<div class="ui floating upward dropdown small button">
 										<span class="text">{{.i18n.Tr "admin.notices.actions"}}</span>
diff --git a/web_src/less/_admin.less b/web_src/less/_admin.less
index 2f9410512..5fb071236 100644
--- a/web_src/less/_admin.less
+++ b/web_src/less/_admin.less
@@ -29,7 +29,7 @@
             }
         }
 
-        form button[type='submit'] {
+        form tbody button[type='submit'] {
             padding: 5px 8px;
         }
     }