Browse Source

improve cb show page

tags/vopendata0.1.2
palytoxin 5 years ago
parent
commit
ba4de387c7
2 changed files with 97 additions and 16 deletions
  1. +3
    -0
      modules/templates/helper.go
  2. +94
    -16
      templates/repo/cloudbrain/show.tmpl

+ 3
- 0
modules/templates/helper.go View File

@@ -134,6 +134,9 @@ func NewFuncMap() []template.FuncMap {
"EscapePound": func(str string) string {
return strings.NewReplacer("%", "%25", "#", "%23", " ", "%20", "?", "%3F").Replace(str)
},
"nl2br": func(text string) template.HTML {
return template.HTML(strings.Replace(template.HTMLEscapeString(text), "\n", "<br>", -1))
},
"PathEscapeSegments": util.PathEscapeSegments,
"URLJoin": util.URLJoin,
"RenderCommitMessage": RenderCommitMessage,


+ 94
- 16
templates/repo/cloudbrain/show.tmpl View File

@@ -4,22 +4,100 @@
<div class="ui middle very relaxed page grid">
<div class="column">
{{template "base/alert" .}}
{{with .task}}
<p>jobname:</p>
<div id="id">{{.JobName}}</div>
<hr>
<p>jobid:</p>
<div id="id">{{.JobID}}</div>
<hr>
{{end}}
<p>taskRes:</p>
<div>{{.taskRes}}</div>
<p>err:</p>
<div>{{.error}}</div>
<hr>
<p>result:</p>
<div>{{.result}}</div>
<hr>

<h4 class="ui header" id="vertical-segment">
<a href="javascript:window.history.back();"><i class="arrow left icon"></i>返回</a>
</h4>
<div>
<div class="ui yellow segment">
{{with .task}}
<p>任务名称: {{.JobName}}</p>
{{end}}
</div>
<div class="ui green segment">
<p>任务结果:</p>
{{with .taskRes}}
{{range .TaskStatuses}}
<table class="ui celled striped table">
<tbody>
<tr>
<td class="four wide"> 状态 </td>
<td> {{.State}} </td>
</tr>
<tr>
<td> 开始时间 </td>
<td>{{.StartAt}}</td>
</tr>
<tr>
<td> 结束时间 </td>
<td>{{.FinishedAt}}</td>
</tr>
<tr>
<td> ExitCode </td>
<td>{{.ExitCode}}</td>
</tr>
<tr>
<td> 退出信息 </td>
<td>{{.ExitDiagnostics| nl2br}}</td>
</tr>
</tbody>
</table>
{{end}}
{{end}}
</div>
<div class="ui blue segment">
{{with .result}}
<table class="ui celled striped table">
<thead>
<tr> <th colspan="2"> 硬件信息 </th> </tr>
</thead>
<tbody>
<tr>
<td class="four wide"> CPU </td>
<td>{{.Resource.CPU}}</td>
</tr>
<tr>
<td> Memory </td>
<td>{{.Resource.Memory}}</td>
</tr>
<tr>
<td> NvidiaComGpu </td>
<td>{{.Resource.NvidiaComGpu}}</td>
</tr>
</tbody>
</table>

<table class="ui celled striped table">
<thead>
<tr> <th colspan="2"> 调试信息 </th> </tr>
</thead>
<tbody>
<tr>
<td class="four wide"> 状态 </td>
<td> {{.Platform}} </td>
</tr>
<tr>
<td> 开始时间 </td>
<td>{{.JobStatus.CreatedTime}}</td>
</tr>
<tr>
<td> 结束时间 </td>
<td>{{.JobStatus.CompletedTime}}</td>
</tr>
<tr>
<td> ExitCode </td>
<td>{{.JobStatus.AppExitCode}}</td>
</tr>
<tr>
<td> 退出信息 </td>
<td>{{.JobStatus.AppExitDiagnostics | nl2br}}</td>
</tr>
</tbody>
</table>
{{end}}
</div>
</div>

</div>
</div>
</div>


Loading…
Cancel
Save