From fc0bf8fc2e61c15398f430ff65d23860a109f41c Mon Sep 17 00:00:00 2001
From: OpenIhu <hujl@pcl.ac.cn>
Date: Sun, 26 Sep 2021 18:04:32 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=BA=91=E8=84=912=E4=BB=BB?=
 =?UTF-8?q?=E5=8A=A1=E5=88=97=E8=A1=A8=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 templates/repo/cloudbrain/index.tmpl | 22 ++++++------
 templates/repo/modelarts/index.tmpl  | 68 ++++++++++++++----------------------
 web_src/less/_dataset.less           |  5 ++-
 3 files changed, 39 insertions(+), 56 deletions(-)

diff --git a/templates/repo/cloudbrain/index.tmpl b/templates/repo/cloudbrain/index.tmpl
index 897b104b5..78232a8d7 100755
--- a/templates/repo/cloudbrain/index.tmpl
+++ b/templates/repo/cloudbrain/index.tmpl
@@ -284,14 +284,13 @@
                                         <a class="ui basic {{if not .CanDebug}}disabled {{else}}blue {{end}}button" href="{{$.Link}}/{{.JobID}}/debug" target="_blank">
                                             调试
                                         </a>
-
-                                        <!-- 停止 -->
+                                        
                                         <form id="stopForm-{{.JobID}}" action="{{if eq .Status "STOPPED"}}javascript:void(0){{else}}{{$.Link}}/{{.JobID}}/stop{{end}}" method="post">
                                             {{$.CsrfTokenHtml}}
-                                        </form>
-                                        <a class="ui basic {{if eq .Status "STOPPED"}}disabled {{else}}blue {{end}}button" onclick="document.getElementById('stopForm-{{.JobID}}').submit();">
-                                            停止
-                                        </a>
+                                            <a class="ui basic {{if eq .Status "STOPPED"}}disabled {{else}}blue {{end}}button" onclick="document.getElementById('stopForm-{{.JobID}}').submit();">
+                                                停止
+                                            </a>
+                                        </form>                                        
                                     </div>
                                     <div class="mini ui compact buttons">
                                         <!-- 模型下载 -->
@@ -306,16 +305,15 @@
                                     </div>
 
                                     <!-- 删除镜像 -->
-                                    <form id="delForm-{{.JobID}}" action="{{if ne .Status "STOPPED"}}javascript:void(0){{else}}{{$.Link}}/{{.JobID}}/del{{end}}" method="post">
+                                    <form class="mini ui compact buttons" id="delForm-{{.JobID}}" action="{{if ne .Status "STOPPED"}}javascript:void(0){{else}}{{$.Link}}/{{.JobID}}/del{{end}}" method="post">
                                         {{$.CsrfTokenHtml}}
+                                        <a class="ui compact {{if ne .Status "STOPPED"}}disabled {{else}}red {{end}}button" onclick="assertDelete(this)">
+                                            删除
+                                        </a>
                                     </form>
-                                    <a class="mini ui compact {{if ne .Status "STOPPED"}}disabled {{else}}red {{end}}button" onclick="assertDelete(this)">
-                                        删除
-                                    </a>
+                                    
                                 </div>
 
-
-                                
                                 <!-- 镜像列表弹窗 -->
                                 <div id="imageModal" class="modal" style="display: none;">
                                     <div class="modal-content">
diff --git a/templates/repo/modelarts/index.tmpl b/templates/repo/modelarts/index.tmpl
index 4aade2d0b..12d173bf0 100755
--- a/templates/repo/modelarts/index.tmpl
+++ b/templates/repo/modelarts/index.tmpl
@@ -247,61 +247,47 @@
                         {{range .Tasks}}
                         <div class="ui grid stackable item">
                             <div class="row">
-
+                            
                                 <!-- 任务名 -->
-                                <div class="four wide column">
+                                <div class="seven wide column">
                                     <a class="title" href="{{$.Link}}/{{.JobID}}">
                                         <span class="fitted">{{svg "octicon-tasklist" 16}}</span>
                                         <span class="fitted">{{.JobName}}</span>
                                     </a>
                                 </div>
 
-                                <!--任务状态 -->
-                                <div class="three wide column job-status" id="{{.JobID}}" data-repopath="{{$.RepoRelPath}}" data-jobid="{{.JobID}}">
-                                    {{.Status}}
-                                </div>
-
-                                <!-- 任务创建时间 -->
                                 <div class="three wide column">
-                                    <span class="ui text center">{{svg "octicon-flame" 16}} {{TimeSinceUnix .CreatedUnix $.Lang}}</span>
-                                </div>
-
-                                <!-- 查看 -->
-                                <div class="one wide column">
-                                    <span class="ui text  clipboard">
-                                        <a class="title" href="{{$.Link}}/{{.JobID}}">
-                                            <span class="fitted">查看</span>
-                                    </a>
+                                    <!--任务状态 -->
+                                    <span class="mini ui compact button job-status" id="{{.JobID}}" data-repopath="{{$.RepoRelPath}}" data-jobid="{{.JobID}}">
+                                        {{.Status}}
                                     </span>
+                                    <!-- 任务创建时间 -->
+                                    <span class="">{{TimeSinceUnix .CreatedUnix $.Lang}}</span>
                                 </div>
 
-                                <!-- 删除任务 -->
-                                <div class="one wide column">
-                                    <div class="ui text center clipboard">
-                                        <form id="delForm-{{.JobID}}" action="{{if ne .Status "STOPPED"}}javascript:void(0){{else}}{{$.Link}}/{{.JobID}}/del{{end}}" method="post">
-                                            {{$.CsrfTokenHtml}}
-                                            <a class="fitted" onclick="assertDelete(this)" style="{{if ne .Status "STOPPED"}}color:#CCCCCC{{end}}; font-size:16px; font-weight:bold">删除</a>
-                                        </form>
-                                    </div>
-                                </div>
-
-                                <!-- 调试 -->
-                                <div class="one wide column">
-                                    <div class="ui text center clipboard">
-                                        <a class="title" onclick="stop(this)" href="{{if not .CanDebug}}javascript:void(0){{else}}{{$.Link}}/{{.JobID}}/debug{{end}}" style="{{if not .CanDebug}}color:#CCCCCC{{end}}">
-                                            <span class="fitted">调试</span>
-                                    </a>
-                                    </div>
-                                </div>
-
-                                <!-- 停止 -->
-                                <div class="one wide column">
-                                    <div class="ui text center clipboard">
+                                <div class="six wide column text right">
+                                    <div class="mini ui compact buttons">
+                                        <a class="ui basic button" href="{{$.Link}}/{{.JobID}}">
+                                            查看
+                                        </a>
+                                        <a class="ui basic {{if not .CanDebug}}disabled {{else}}blue {{end}}button" href="{{$.Link}}/{{.JobID}}/debug">
+                                            调试
+                                        </a>
                                         <form id="stopForm-{{.JobID}}" action="{{if ne .Status "RUNNING"}}javascript:void(0){{else}}{{$.Link}}/{{.JobID}}/stop{{end}}" method="post">
                                             {{$.CsrfTokenHtml}}
-                                            <a class="fitted" onclick="document.getElementById('stopForm-{{.JobID}}').submit();" style="{{if ne .Status "RUNNING"}}color:#CCCCCC{{end}}; font-size:16px; font-weight:bold">停止</a>
-                                        </form>
+                                            <a class="ui basic {{if eq .Status "RUNNING"}}disabled {{else}}blue {{end}}" onclick="document.getElementById('stopForm-{{.JobID}}').submit();">
+                                                停止
+                                            </a>
+                                        </form> 
                                     </div>
+
+                                    <!-- 删除任务 -->
+                                    <form class="mini ui compact buttons" id="delForm-{{.JobID}}" action="{{if ne .Status "STOPPED"}}javascript:void(0){{else}}{{$.Link}}/{{.JobID}}/del{{end}}" method="post">
+                                        {{$.CsrfTokenHtml}}
+                                        <a class="ui compact {{if ne .Status "STOPPED"}}disabled {{else}}red {{end}}button" onclick="assertDelete(this)">
+                                            删除
+                                        </a>
+                                    </form>
                                 </div>
 
                                 <!-- 镜像列表弹窗 -->
diff --git a/web_src/less/_dataset.less b/web_src/less/_dataset.less
index 67911186a..79acbf524 100644
--- a/web_src/less/_dataset.less
+++ b/web_src/less/_dataset.less
@@ -143,10 +143,9 @@
         }
     }
     .item {
-        padding-top: 15px;
-        padding-bottom: 10px;
-        border-bottom: 1px dashed #aaaaaa;
+        border-bottom: 1px solid rgba(34,36,38,.15);
     }
+    
     .ui.grid > .row {
         align-items: center;
     }