diff options
| author | zeripath <art27@cantab.net> | 2019-11-30 08:40:22 -0600 |
|---|---|---|
| committer | Lauris BH <lauris@nix.lv> | 2019-11-30 16:40:22 +0200 |
| commit | 60c5339042a605076482320313e8f9498dd72af9 (patch) | |
| tree | bef1e4a0fb9565140fbf142f13d3b7e5f334031d /templates/admin | |
| parent | 8f8c250ddbe8dfe785340cb45cbae71c4833acf3 (diff) | |
| download | gitea-60c5339042a605076482320313e8f9498dd72af9.tar.gz gitea-60c5339042a605076482320313e8f9498dd72af9.zip | |
Graceful: Cancel Process on monitor pages & HammerTime (#9213)
* Graceful: Create callbacks to with contexts
* Graceful: Say when Gitea is completely finished
* Graceful: Git and Process within HammerTime
Force all git commands to terminate at HammerTime
Force all process commands to terminate at HammerTime
Move almost all git processes to run as git Commands
* Graceful: Always Hammer after Shutdown
* ProcessManager: Add cancel functionality
* Fix tests
* Make sure that process.Manager.Kill() cancels
* Make threadsafe access to Processes and remove own unused Kill
* Remove cmd from the process manager as it is no longer used
* the default context is the correct context
* get rid of double till
Diffstat (limited to 'templates/admin')
| -rw-r--r-- | templates/admin/monitor.tmpl | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/templates/admin/monitor.tmpl b/templates/admin/monitor.tmpl index 6cc927d68f..38402fece2 100644 --- a/templates/admin/monitor.tmpl +++ b/templates/admin/monitor.tmpl @@ -42,6 +42,7 @@ <th>{{.i18n.Tr "admin.monitor.desc"}}</th> <th>{{.i18n.Tr "admin.monitor.start"}}</th> <th>{{.i18n.Tr "admin.monitor.execute_time"}}</th> + <th></th> </tr> </thead> <tbody> @@ -51,6 +52,7 @@ <td>{{.Description}}</td> <td>{{DateFmtLong .Start}}</td> <td>{{TimeSince .Start $.Lang}}</td> + <td><a class="delete-button" href="" data-url="{{$.Link}}/cancel/{{.PID}}" data-id="{{.PID}}" data-name="{{.Description}}"><i class="close icon text red"></i></a></td> </tr> {{end}} </tbody> @@ -58,4 +60,15 @@ </div> </div> </div> +<div class="ui small basic delete modal"> + <div class="ui icon header"> + <i class="close icon"></i> + {{.i18n.Tr "admin.monitor.process.cancel"}} + </div> + <div class="content"> + <p>{{$.i18n.Tr "admin.monitor.process.cancel_notices" `<span class="name"></span>` | Safe}}</p> + <p>{{$.i18n.Tr "admin.monitor.process.cancel_desc"}}</p> + </div> + {{template "base/delete_modal_actions" .}} +</div> {{template "base/footer" .}} |