From fd8579db9b9b59c52ad7717654620c36fd213d43 Mon Sep 17 00:00:00 2001
From: Gitea <gitea@fake.local>
Date: Wed, 27 Oct 2021 09:39:17 +0800
Subject: [PATCH] update

---
 options/locale/locale_en-US.ini              |  1 +
 options/locale/locale_zh-CN.ini              |  1 +
 templates/repo/modelarts/notebook/index.tmpl | 12 ++++++++
 templates/repo/modelarts/trainjob/index.tmpl | 31 ++++++++++++++++++--
 4 files changed, 42 insertions(+), 3 deletions(-)

diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini
index 94af7c4c5..18ca21925 100644
--- a/options/locale/locale_en-US.ini
+++ b/options/locale/locale_en-US.ini
@@ -774,6 +774,7 @@ cloudbrain_creator=Creator
 cloudbrain_task = Task Name
 cloudbrain_operate = Operate
 cloudbrain_status_createtime = Status/Createtime
+cloudbrain_status_runtime = Running Time
 
 
 modelarts.notebook=Debug Job
diff --git a/options/locale/locale_zh-CN.ini b/options/locale/locale_zh-CN.ini
index 9b5c0808a..62b502866 100755
--- a/options/locale/locale_zh-CN.ini
+++ b/options/locale/locale_zh-CN.ini
@@ -776,6 +776,7 @@ cloudbrain_creator=创建者
 cloudbrain_task=任务名称
 cloudbrain_operate=操作
 cloudbrain_status_createtime=状态/创建时间
+cloudbrain_status_runtime = 运行时长
 
 modelarts.notebook=调试作业
 modelarts.train_job=训练作业
diff --git a/templates/repo/modelarts/notebook/index.tmpl b/templates/repo/modelarts/notebook/index.tmpl
index ae38d375e..465d53874 100755
--- a/templates/repo/modelarts/notebook/index.tmpl
+++ b/templates/repo/modelarts/notebook/index.tmpl
@@ -321,6 +321,18 @@
                                         </form>
                                     </div>
 
+                                    <div class="ui compact buttons" style="margin-right:10px;">
+                                            <!-- 模型下载 -->
+                                            <a class="ui basic blue button" href="{{$.Link}}/{{.JobID}}/models" target="_blank">
+                                                模型下载
+                                            </a>
+                                            
+                                            <!-- 接收结果 -->
+                                            <!-- <iframe src="" frameborder="0" name="iframeContent" style="display: none;"></iframe>
+                                            <a class="imageBtn ui basic {{if not .CanDebug}}disabled {{else}}blue {{end}}button" value="{{.CanDebug}}">提交镜像</a> -->
+    
+                                    </div>
+
                                     <!-- 删除任务 -->
                                     <form class="ui compact buttons" id="delForm-{{.JobID}}" action="{{if not .CanDel}}javascript:void(0){{else}}{{$.Link}}/{{.JobID}}/del{{end}}" method="post">
                                         {{$.CsrfTokenHtml}}
diff --git a/templates/repo/modelarts/trainjob/index.tmpl b/templates/repo/modelarts/trainjob/index.tmpl
index d32ee4fee..199332e01 100755
--- a/templates/repo/modelarts/trainjob/index.tmpl
+++ b/templates/repo/modelarts/trainjob/index.tmpl
@@ -283,10 +283,13 @@
                                 <div class="three wide column">
                                     <span>{{$.i18n.Tr "repo.cloudbrain_status_createtime"}}</span>
                                 </div>
+                                <div class="three wide column">
+                                    <span>{{$.i18n.Tr "repo.cloudbrain_status_runtime"}}</span>
+                                </div>
                                 <div class="one wide column">
                                     <span>{{$.i18n.Tr "repo.cloudbrain_creator"}}</span> 
                                 </div>
-                                <div class="seven wide column text center">
+                                <div class="four wide column text center">
                                     <span style="margin-left: 10rem;">{{$.i18n.Tr "repo.cloudbrain_operate"}}</span>
                                 </div>
 
@@ -320,6 +323,18 @@
                                     <span style="font-size: 12px;margin-left: 0.4rem;" class="">{{TimeSinceUnix .Cloudbrain.CreatedUnix $.Lang}}</span>
                                 </div>
 
+                                <div class="three wide column">
+                                        <!--任务状态 -->
+                                        <!-- <span class="ui compact button job-status" id="{{.JobID}}" data-repopath="{{$.RepoRelPath}}" data-jobid="{{.JobID}}">
+                                            {{.Status}}
+                                        </span> -->
+                                        <span class="job-status" id="{{.JobID}}" data-repopath="{{$.RepoRelPath}}" data-jobid="{{.JobID}}">
+                                                <span><i style="vertical-align: middle;" class="{{.Status}}"></i><span style="margin-left: 0.4em;font-size: 12px;">{{.Status}}</span></span>
+                                        </span>
+                                        <!-- 任务创建时间 -->
+                                        <span style="font-size: 12px;margin-left: 0.4rem;" class="">{{TimeSinceUnix .Cloudbrain.CreatedUnix $.Lang}}</span>
+                                </div>
+
                                 <div class="one wide column">
                                     {{if .User.Name}}
                                         <a href="{{AppSubUrl}}/{{.User.Name}}" title="{{.User.Name}}"><img class="ui avatar image" src="{{.User.RelAvatarLink}}"></a>
@@ -328,7 +343,7 @@
                                     {{end}}
                                 </div>
 
-                                <div class="seven wide column text right">
+                                <div class="four wide column text right">
                                     <div class="ui compact buttons" style="margin-right:10px;">
                                         <a class="ui basic blue button" href="{{$.Link}}/{{.JobID}}">
                                             查看
@@ -343,7 +358,17 @@
                                             </a>
                                         </form>
                                     </div>
-
+                                    <div class="ui compact buttons" style="margin-right:10px;">
+                                            <!-- 模型下载 -->
+                                            <a class="ui basic blue button" href="{{$.Link}}/{{.JobID}}/models" target="_blank">
+                                                模型下载
+                                            </a>
+                                            
+                                            <!-- 接收结果 -->
+                                            <!-- <iframe src="" frameborder="0" name="iframeContent" style="display: none;"></iframe>
+                                            <a class="imageBtn ui basic {{if not .CanDebug}}disabled {{else}}blue {{end}}button" value="{{.CanDebug}}">提交镜像</a> -->
+    
+                                    </div>
                                     <!-- 删除任务 -->
                                     <form class="ui compact buttons" id="delForm-{{.JobID}}" action="{{if not .CanDel}}javascript:void(0){{else}}{{$.Link}}/{{.JobID}}/del{{end}}" method="post">
                                         {{$.CsrfTokenHtml}}