Browse Source

fix issue fix-455

pull/521/head
zhoupzh 3 years ago
parent
commit
352acdb8d1
3 changed files with 39 additions and 14 deletions
  1. +3
    -0
      options/locale/locale_en-US.ini
  2. +3
    -0
      options/locale/locale_zh-CN.ini
  3. +33
    -14
      templates/repo/cloudbrain/index.tmpl

+ 3
- 0
options/locale/locale_en-US.ini View File

@@ -771,6 +771,9 @@ cloudbrain_platform_selection = Select the cloudbrain platform you want to use:
confirm_choice = confirm confirm_choice = confirm
cloudbran1_tips = Only data in zip format can create cloudbrain tasks cloudbran1_tips = Only data in zip format can create cloudbrain tasks
cloudbrain_creator=Creator cloudbrain_creator=Creator
cloudbrain_task = Task Name
cloudbrain_operate = Operate
cloudbrain_status_createtime = Status/Createtime


template.items = Template Items template.items = Template Items
template.git_content = Git Content (Default Branch) template.git_content = Git Content (Default Branch)


+ 3
- 0
options/locale/locale_zh-CN.ini View File

@@ -773,6 +773,9 @@ cloudbrain_platform_selection=选择您准备使用的云脑平台:
confirm_choice=确定 confirm_choice=确定
cloudbran1_tips=只有zip格式的数据集才能发起云脑任务 cloudbran1_tips=只有zip格式的数据集才能发起云脑任务
cloudbrain_creator=创建者 cloudbrain_creator=创建者
cloudbrain_task=任务名称
cloudbrain_operate=操作
cloudbrain_status_createtime=状态/创建时间


template.items=模板选项 template.items=模板选项
template.git_content=Git数据(默认分支) template.git_content=Git数据(默认分支)


+ 33
- 14
templates/repo/cloudbrain/index.tmpl View File

@@ -241,31 +241,51 @@
<div class="ui sixteen wide column"> <div class="ui sixteen wide column">


<!-- 排序区 --> <!-- 排序区 -->
<div class="ui sixteen wide column">
<!-- <div class="ui sixteen wide column">
<div class="ui two column stackable grid"> <div class="ui two column stackable grid">
<div class="column"> <div class="column">
</div> </div>
<!-- <div class="column right aligned">
<div class="column right aligned">
<div class="ui right dropdown type jump item"> <div class="ui right dropdown type jump item">
<span class="text"> <span class="text">
{{.i18n.Tr "repo.issues.filter_sort"}}<i class="dropdown icon"></i> {{.i18n.Tr "repo.issues.filter_sort"}}<i class="dropdown icon"></i>
</span> </span>
</div> </div>
</div> -->
</div>
</div> </div>
</div>
</div> -->


<!-- 任务展示 --> <!-- 任务展示 -->

<!-- 表头 -->
<div class="dataset list"> <div class="dataset list">
<div class="ui grid stackable" style="background: #f0f0f0;;">
<div class="row">
<div class="five wide column">
<span style="margin:0 6px">{{$.i18n.Tr "repo.cloudbrain_task"}}</span>
</div>
<div class="three wide column">
<span>{{$.i18n.Tr "repo.cloudbrain_status_createtime"}}</span>
</div>
<div class="one wide column">
<span>{{$.i18n.Tr "repo.cloudbrain_creator"}}</span>
</div>
<div class="seven wide column text center">
<span>{{$.i18n.Tr "repo.cloudbrain_operate"}}</span>
</div>

</div>
</div>
{{range .Tasks}} {{range .Tasks}}
<div class="ui grid stackable item"> <div class="ui grid stackable item">
<div class="row"> <div class="row">


<!-- 任务名 --> <!-- 任务名 -->
<div class="five wide column"> <div class="five wide column">
<a class="title" href="{{$.Link}}/{{.JobID}}" title="{{.JobName}}">
<span class="fitted">{{svg "octicon-tasklist" 16}}</span>
<span class="fitted text_over" style="width: 90%;">{{.JobName}}</span>
<a class="title" href="{{$.Link}}/{{.JobID}}" title="{{.JobName}}" style="font-size: 15px;">
<span class="fitted" style="vertical-align: middle;">{{svg "octicon-tasklist" 16}}</span>
<span class="fitted text_over" style="width: 90%;vertical-align: middle;margin-left: 0.4rem;">{{.JobName}}</span>
</a> </a>
</div> </div>


@@ -279,7 +299,7 @@
{{else}} {{else}}
{{.Status}} {{.Status}}
{{end}} --> {{end}} -->
<span style="display:flex;position: relative; justify-content: flex-start;"><i class="{{.Status}}"></i><span style="margin-left: 0.4em;font-size: 12px;">{{.Status}}</span></span>
<span><i style="vertical-align: middle;" class="{{.Status}}"></i><span style="margin-left: 0.4em;font-size: 12px;">{{.Status}}</span></span>
</span> </span>
<!-- <span class="job-status" id="{{.JobID}}" data-repopath="{{$.RepoRelPath}}" data-jobid="{{.JobID}}" > <!-- <span class="job-status" id="{{.JobID}}" data-repopath="{{$.RepoRelPath}}" data-jobid="{{.JobID}}" >
{{if eq .Status "STOPPED"}} {{if eq .Status "STOPPED"}}
@@ -294,15 +314,14 @@
</span> --> </span> -->
<!-- 任务创建时间 --> <!-- 任务创建时间 -->
<span class="">{{TimeSinceUnix .Cloudbrain.CreatedUnix $.Lang}}</span>
<span style="font-size: 12px;margin-left: 0.4rem;" class="">{{TimeSinceUnix .Cloudbrain.CreatedUnix $.Lang}}</span>
</div> </div>


<div class="two wide column">
<span style="display: block;">{{$.i18n.Tr "repo.cloudbrain_creator"}}</span><span class="text_over" title="{{.User.Name}}">{{.User.Name}}</span>

<div class="one wide column">
<a href="{{AppSubUrl}}/{{.User.Name}}"><img class="ui avatar image" src="{{.User.Avatar}}"></a>
</div> </div>
<div class="six wide column text right">
<div class="ui compact buttons" style="margin-right:10px;">
<div class="seven wide column text right">
<div class="ui compact buttons">
{{if and (ne .Status "WAITING") (ne .JobType "DEBUG")}} {{if and (ne .Status "WAITING") (ne .JobType "DEBUG")}}
<a class="ui basic button" href="{{$.Link}}/{{.JobID}}/rate" target="_blank"> <a class="ui basic button" href="{{$.Link}}/{{.JobID}}/rate" target="_blank">
评分 评分


Loading…
Cancel
Save