code.ivysaur.me/webcmd
1
0
Fork 0
Code Issues 1 Pull Requests Releases 2 Activity

webcmd: cosmetic fixes to the taskinfo page

Browse Source
This commit is contained in:
mappu 2017-03-25 16:06:13 +13:00
parent 68c25fa139
commit 8f0782b829
1 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
tpl_Taskinfo.go
View File

@ -24,10 +24,8 @@ func (this *App) Serve_TaskInfo(w http.ResponseWriter, task_ref string) {
fmt.Fprintf(w, ` fmt.Fprintf(w, `
<ul> <ul>
<li>Type: %s</li>
<li>Start time: %s</li> <li>Start time: %s</li>
`, `,
"???",
hesc(time.Unix(taskinfo.started, 0).Format(time.RFC822Z)), hesc(time.Unix(taskinfo.started, 0).Format(time.RFC822Z)),
) )
@ -39,6 +37,8 @@ func (this *App) Serve_TaskInfo(w http.ResponseWriter, task_ref string) {
hesc(time.Unix(taskinfo.stopped, 0).Format(time.RFC822Z)), hesc(time.Unix(taskinfo.stopped, 0).Format(time.RFC822Z)),
taskinfo.exitCode, taskinfo.exitCode,
) )
} else {
fmt.Fprint(w, `<li>Currently running</li>`)
} }
fmt.Fprint(w, ` fmt.Fprint(w, `
@ -69,13 +69,18 @@ func (this *App) Serve_TaskInfo(w http.ResponseWriter, task_ref string) {
fmt.Fprintf(w, ` fmt.Fprintf(w, `
</tbody> </tbody>
</table> </table>
`)
if !taskinfo.Finished() {
fmt.Fprintf(w, `
<form method="POST" action="/x-abandon-task"> <form method="POST" action="/x-abandon-task">
<input type="hidden" name="task_ref" value="%s"> <input type="hidden" name="task_ref" value="%s">
<input type="submit" value="Cancel &raquo;"> <input type="submit" value="Cancel &raquo;">
</form> </form>
`, `,
hesc(task_ref), hesc(task_ref),
) )
}
this.ServePartial_Footer(w) this.ServePartial_Footer(w)
} }