From 3b7acae626e077ace5499acd6ddecf30bf3808f8 Mon Sep 17 00:00:00 2001
From: OpenIhu <hujl@pcl.ac.cn>
Date: Sun, 26 Sep 2021 19:15:18 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=BA=91=E8=84=91=E4=BB=BB?=
 =?UTF-8?q?=E5=8A=A1=E5=88=97=E8=A1=A8=E9=95=9C=E5=83=8F=E5=BC=B9=E7=AA=97?=
 =?UTF-8?q?=E9=94=99=E8=AF=AF=E5=8F=8A=E6=8C=89=E9=92=AE=E9=AB=98=E5=BA=A6?=
 =?UTF-8?q?=EF=BC=8C=E4=BA=91=E8=84=912=E4=BB=BB=E5=8A=A1=E5=81=9C?=
 =?UTF-8?q?=E6=AD=A2=E6=8C=89=E9=92=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 templates/repo/cloudbrain/index.tmpl | 96 ++++++++++++++--------------
 templates/repo/modelarts/index.tmpl  | 56 ++++------------
 2 files changed, 60 insertions(+), 92 deletions(-)

diff --git a/templates/repo/cloudbrain/index.tmpl b/templates/repo/cloudbrain/index.tmpl
index 78232a8d7..acb87b74b 100755
--- a/templates/repo/cloudbrain/index.tmpl
+++ b/templates/repo/cloudbrain/index.tmpl
@@ -256,7 +256,7 @@
                             <div class="row">
 
                                 <!-- 任务名 -->
-                                <div class="seven wide column">
+                                <div class="six wide column">
                                     <a class="title" href="{{$.Link}}/{{.JobID}}">
                                         <span class="fitted">{{svg "octicon-tasklist" 16}}</span>
                                         <span class="fitted">{{.JobName}}</span>
@@ -265,15 +265,15 @@
 
                                 <div class="three wide column">
                                     <!--任务状态 -->
-                                    <span class="mini ui compact button job-status" id="{{.JobID}}" data-repopath="{{$.RepoRelPath}}" data-jobid="{{.JobID}}">
+                                    <span class="ui compact button job-status" id="{{.JobID}}" data-repopath="{{$.RepoRelPath}}" data-jobid="{{.JobID}}">
                                         {{.Status}}
                                     </span>
                                     <!-- 任务创建时间 -->
                                     <span class="">{{TimeSinceUnix .CreatedUnix $.Lang}}</span>
                                 </div>
 
-                                <div class="six wide column text right">
-                                    <div class="mini ui compact buttons">  
+                                <div class="seven wide column text right">
+                                    <div class="ui compact buttons" style="margin-right:10px;">  
                                         {{if and (ne .Status "WAITING") (ne .JobType "DEBUG")}}
                                         <a class="ui basic button" href="{{$.Link}}/{{.JobID}}/rate" target="_blank">
                                             评分
@@ -285,74 +285,76 @@
                                             调试
                                         </a>
                                         
-                                        <form id="stopForm-{{.JobID}}" action="{{if eq .Status "STOPPED"}}javascript:void(0){{else}}{{$.Link}}/{{.JobID}}/stop{{end}}" method="post">
+                                        <form id="stopForm-{{.JobID}}" action="{{if eq .Status "STOPPED"}}javascript:void(0){{else}}{{$.Link}}/{{.JobID}}/stop{{end}}" method="post" style="margin-left:-1px;">
                                             {{$.CsrfTokenHtml}}
                                             <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">
+                                    <div class="ui compact buttons" style="margin-right:10px;">
                                         <!-- 模型下载 -->
                                         <a class="ui basic blue button" href="{{$.Link}}/{{.JobID}}/models" target="_blank">
                                             模型下载
                                         </a>
+
+                                        <!-- 镜像列表弹窗 -->
+                                        <div id="imageModal" class="modal" style="display: none;">
+                                            <div class="modal-content">                                                
+
+                                                <!-- 表格 -->
+                                                <div class="ui form">
+                                                    <form id="commitImageForm" action="{{$.Link}}/{{.JobID}}/commit_image" method="post" target="iframeContent">
+                                                        {{$.CsrfTokenHtml}}
+                                                        <div class="row">
+                                                            <p style="display: inline;">提交任务镜像</p>
+                                                            <span class="close">&times;</span>
+                                                        </div>
+                                                        
+                                                        <div class="ui divider"></div>
+            
+                                                        <div class="inline required field dis">
+                                                            <label>镜像标签：</label>
+                                                            <input name="tag" id="image_tag" tabindex="3" autofocus required maxlength="255" style="width:75%">
+                                                        </div>
+            
+                                                        <div class="inline field">
+                                                            <label class="label_after">镜像描述：</label>
+                                                            <textarea name="description" rows="8" style="width:75%;margin-left: 0.2em;"></textarea>
+                                                        </div>
+            
+                                                        <div class="ui divider"></div>
+            
+                                                        <div class="inline field">
+                                                            <label></label>
+                                                            <button class="ui green button" onclick="showmask()">
+                                                                {{$.i18n.Tr "repo.cloudbrain.commit_image"}}
+                                                            </button>
+                                                        </div>
+                                                    </form>
+                                                </div>
+                                                
+                                            </div>
+                                        </div>
                                         
                                         <!-- 接收结果 -->
                                         <iframe src="" frameborder="0" name="iframeContent" style="display: none;"></iframe>
-                                        <a class="mini ui basic {{if not .CanDebug}}disabled {{else}}blue {{end}}button" value="{{.CanDebug}}">提交镜像</a>
+                                        <a class="imageBtn ui basic {{if not .CanDebug}}disabled {{else}}blue {{end}}button" value="{{.CanDebug}}">提交镜像</a>
 
                                     </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">
+                                    <form class="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 class="ui compact {{if ne .Status "STOPPED"}}disabled {{else}}red {{end}}button" onclick="assertDelete(this)" style="border-radius: .28571429rem;">
                                             删除
                                         </a>
                                     </form>
                                     
                                 </div>
 
-                                <!-- 镜像列表弹窗 -->
-                                <div id="imageModal" class="modal" style="display: none;">
-                                    <div class="modal-content">
-                                        
 
-                                        <!-- 表格 -->
-                                        <div class="ui form">
-                                            <form id="commitImageForm" action="{{$.Link}}/{{.JobID}}/commit_image" method="post" target="iframeContent">
-                                                {{$.CsrfTokenHtml}}
-                                                <div class="row">
-                                                    <p style="display: inline;">提交任务镜像</p>
-                                                    <span class="close">&times;</span>
-                                                </div>
-                                                
-                                                <div class="ui divider"></div>
-    
-                                                <div class="inline required field dis">
-                                                    <label>镜像标签：</label>
-                                                    <input name="tag" id="image_tag" tabindex="3" autofocus required maxlength="255" style="width:75%">
-                                                </div>
-    
-                                                <div class="inline field">
-                                                    <label class="label_after">镜像描述：</label>
-                                                    <textarea name="description" rows="8" style="width:75%;margin-left: 0.2em;"></textarea>
-                                                </div>
-    
-                                                <div class="ui divider"></div>
-    
-                                                <div class="inline field">
-                                                    <label></label>
-                                                    <button class="ui green button" onclick="showmask()">
-                                                        {{$.i18n.Tr "repo.cloudbrain.commit_image"}}
-                                                    </button>
-                                                </div>
-                                            </form>
-                                        </div>
-                                        
-                                    </div>
-                                </div>
+                                
 
                             </div>
                         </div>
diff --git a/templates/repo/modelarts/index.tmpl b/templates/repo/modelarts/index.tmpl
index 12d173bf0..838b24eef 100755
--- a/templates/repo/modelarts/index.tmpl
+++ b/templates/repo/modelarts/index.tmpl
@@ -249,7 +249,7 @@
                             <div class="row">
                             
                                 <!-- 任务名 -->
-                                <div class="seven wide column">
+                                <div class="six wide column">
                                     <a class="title" href="{{$.Link}}/{{.JobID}}">
                                         <span class="fitted">{{svg "octicon-tasklist" 16}}</span>
                                         <span class="fitted">{{.JobName}}</span>
@@ -258,74 +258,40 @@
 
                                 <div class="three wide column">
                                     <!--任务状态 -->
-                                    <span class="mini ui compact button job-status" id="{{.JobID}}" data-repopath="{{$.RepoRelPath}}" data-jobid="{{.JobID}}">
+                                    <span class="ui compact button job-status" id="{{.JobID}}" data-repopath="{{$.RepoRelPath}}" data-jobid="{{.JobID}}">
                                         {{.Status}}
                                     </span>
                                     <!-- 任务创建时间 -->
                                     <span class="">{{TimeSinceUnix .CreatedUnix $.Lang}}</span>
                                 </div>
 
-                                <div class="six wide column text right">
-                                    <div class="mini ui compact buttons">
-                                        <a class="ui basic button" href="{{$.Link}}/{{.JobID}}">
+                                <div class="seven wide column text right">
+                                    <div class="ui compact buttons" style="margin-right:10px;">
+                                        <a class="ui basic blue 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">
+                                        <form id="stopForm-{{.JobID}}" action="{{if ne .Status "RUNNING"}}javascript:void(0){{else}}{{$.Link}}/{{.JobID}}/stop{{end}}" method="post" style="margin-left:-1px;">
                                             {{$.CsrfTokenHtml}}
-                                            <a class="ui basic {{if eq .Status "RUNNING"}}disabled {{else}}blue {{end}}" onclick="document.getElementById('stopForm-{{.JobID}}').submit();">
+                                            <a class="ui basic {{if ne .Status "RUNNING"}}disabled {{else}}blue {{end}}button" onclick="document.getElementById('stopForm-{{.JobID}}').submit();">
                                                 停止
                                             </a>
-                                        </form> 
+                                        </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">
+                                    <form class="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 class="ui compact {{if ne .Status "STOPPED"}}disabled {{else}}red {{end}}button" onclick="assertDelete(this)" style="border-radius: .28571429rem;">
                                             删除
                                         </a>
                                     </form>
                                 </div>
 
-                                <!-- 镜像列表弹窗 -->
-                                <div id="imageModal" class="modal" style="display: none;">
-                                    <div class="modal-content">
-                                        <span class="close">&times;</span>
 
-                                        <!-- 表格 -->
-                                        <form id="commitImageForm" action="{{$.Link}}/{{.JobID}}/commit_image" method="post" target="iframeContent">
-                                            {{$.CsrfTokenHtml}}
-                                            <p>提交任务镜像</p>
-                                            <div class="ui divider"></div>
-
-                                            <div class="inline required field dis">
-                                                <label>镜像标签：</label>
-                                                <input name="tag" id="image_tag" tabindex="3" autofocus required maxlength="255" style="width:75%">
-                                            </div>
-
-                                            <div class="inline required field" style="position:relative;height:180px;">
-                                                <div style="height:20px;width:75px;">
-                                                    <label>镜像描述：</label>
-                                                </div>
-                                                <div style="position:absolute;left:75px;top:0;width:75%">
-                                                    <textarea name="description" rows="10" style="width:100%"></textarea>
-                                                </div>
-                                            </div>
-
-                                            <div class="ui divider"></div>
-
-                                            <div class="inline field">
-                                                <label></label>
-                                                <button class="ui green button" onclick="showmask()">
-                                                    {{$.i18n.Tr "repo.cloudbrain.commit_image"}}
-                                                </button>
-                                            </div>
-                                        </form>
-                                    </div>
-                                </div>
+                                
 
                             </div>
                         </div>