diff options
| author | zeripath <art27@cantab.net> | 2020-07-05 20:38:03 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-07-05 22:38:03 +0300 |
| commit | 217647f33170d469ed392e3284cc1149047c1b74 (patch) | |
| tree | 44b06b44d2872b90f873eb3ac7cca6e8e0e6494c /templates/admin | |
| parent | 0d03fbf2ca4d1110c913647cb6906a7d51e46db8 (diff) | |
| download | gitea-217647f33170d469ed392e3284cc1149047c1b74.tar.gz gitea-217647f33170d469ed392e3284cc1149047c1b74.zip | |
Multiple small admin dashboard fixes (#12153)
* Remove spurious spacing between Maintenance Operations and its table on dashboard
* Prevent (EXTRA string) comments in Task headers
* Redirect tasks started from monitor page back to monitor
* Fix #12107 - redirects from process cancel should use AppSubUrl
* When wrapping queues set the name correctly
Signed-off-by: Andrew Thornton <art27@cantab.net>
Diffstat (limited to 'templates/admin')
| -rw-r--r-- | templates/admin/dashboard.tmpl | 10 | ||||
| -rw-r--r-- | templates/admin/monitor.tmpl | 1 |
2 files changed, 6 insertions, 5 deletions
diff --git a/templates/admin/dashboard.tmpl b/templates/admin/dashboard.tmpl index c1ac8fb489..f6acc9457f 100644 --- a/templates/admin/dashboard.tmpl +++ b/templates/admin/dashboard.tmpl @@ -14,9 +14,9 @@ <h4 class="ui top attached header"> {{.i18n.Tr "admin.dashboard.operations"}} </h4> - <div class="ui attached table segment"> - <form method="post" action="{{AppSubUrl}}/admin"> - {{.CsrfTokenHtml}} + <form method="post" action="{{AppSubUrl}}/admin"> + {{.CsrfTokenHtml}} + <div class="ui attached table segment"> <table class="ui very basic table"> <tbody> <tr> @@ -62,8 +62,8 @@ </tr> </tbody> </table> - </form> - </div> + </div> + </form> <h4 class="ui top attached header"> {{.i18n.Tr "admin.dashboard.system_status"}} diff --git a/templates/admin/monitor.tmpl b/templates/admin/monitor.tmpl index 2980a2e9d8..8dd0d939d7 100644 --- a/templates/admin/monitor.tmpl +++ b/templates/admin/monitor.tmpl @@ -8,6 +8,7 @@ </h4> <div class="ui attached table segment"> <form method="post" action="{{AppSubUrl}}/admin"> + <input type="hidden" name="from" value="monitor"/> {{.CsrfTokenHtml}} <table class="ui very basic striped table"> <thead> |