Browse Source

edit display

tags/v1.21.12.1
Gitea 4 years ago
parent
commit
98e58fe387
4 changed files with 134 additions and 191 deletions
  1. +20
    -119
      templates/repo/modelarts/notebook/index.tmpl
  2. +104
    -67
      templates/repo/modelarts/trainjob/index.tmpl
  3. +0
    -1
      templates/repo/modelarts/trainjob/new.tmpl
  4. +10
    -4
      templates/repo/modelarts/trainjob/show.tmpl

+ 20
- 119
templates/repo/modelarts/notebook/index.tmpl View File

@@ -1,92 +1,9 @@
<!-- 头部导航栏 -->
{{template "base/head" .}}

<style>
/* #deletemodel {
#deletemodel {
width: 100%;
height: 100%;
}
/* 弹窗 */

/* #mask {
position: fixed;
top: 0px;
left: 0px;
right: 0px;
bottom: 0px;
filter: alpha(opacity=60);
background-color: #777;
z-index: 1000;
display: none;
opacity: 0.8;
-moz-opacity: 0.5;
padding-top: 100px;
color: #000000
}

#loadingPage {
margin: 200px auto;
width: 50px;
height: 40px;
text-align: center;
font-size: 10px;
display: block;
}

#loadingPage>div {
background-color: green;
height: 100%;
width: 6px;
display: inline-block;
-webkit-animation: sk-stretchdelay 1.2s infinite ease-in-out;
animation: sk-stretchdelay 1.2s infinite ease-in-out;
}

#loadingPage .rect2 {
-webkit-animation-delay: -1.1s;
animation-delay: -1.1s;
}

#loadingPage .rect3 {
-webkit-animation-delay: -1.0s;
animation-delay: -1.0s;
}

#loadingPage .rect4 {
-webkit-animation-delay: -0.9s;
animation-delay: -0.9s;
}

#loadingPage .rect5 {
-webkit-animation-delay: -0.8s;
animation-delay: -0.8s;
}

@-webkit-keyframes sk-stretchdelay {
0%,
40%,
100% {
-webkit-transform: scaleY(0.4)
}
20% {
-webkit-transform: scaleY(1.0)
}
}

@keyframes sk-stretchdelay {
0%,
40%,
100% {
transform: scaleY(0.4);
-webkit-transform: scaleY(0.4);
}
20% {
transform: scaleY(1.0);
-webkit-transform: scaleY(1.0);
}
} */
/* 消息框 */

.alert {
display: none;
position: fixed;
@@ -137,14 +54,14 @@
}
</style>
<div class="modelarts">
<div class="alert"></div>

<div class="repository release dataset-list view">
<div class="repository release dataset-list view container">
<div class="alert"></div>
{{template "repo/header" .}}
<div class="ui container">
<div class="ui grid">
<!-- 左侧边栏 -->
<div class="computer three wide computer column">
<div class="three wide column">
<div class="ui grid">
<div class="sixteen wide column ui secondary sticky pointing tabular vertical menu">
<a class="activate item" href="{{.RepoLink}}/modelarts/notebook">
@@ -157,31 +74,22 @@
</div>
</div>
<!-- 右侧 -->
<div class="ui thirteen wide computer column">
<!-- 中间云脑和新建任务按钮 -->
<div class="ui three column stack able grid">
<div class="ui thirteen wide column">
<div class="ui three column stackable grid">
<div class="column">
<h2>{{.i18n.Tr "repo.cloudbrain2"}}</h2>
</div>

<div class="column">
</div>

<div class="column right aligned">
{{if .Permission.CanWrite $.UnitTypeCloudBrain}}
<a class="ui green button" href="{{.RepoLink}}/modelarts/notebook/create">{{.i18n.Tr "repo.cloudbrain.new"}}</a> {{end}}
</div>
</div>

<!-- 中间分割线 -->
<div class="ui divider"></div>

<!-- 中下列表展示区 -->
<div class="ui grid">
<div class="row">
<div class="ui sixteen wide column">

<!-- 排序区 -->
<div class="ui sixteen wide column">
<div class="ui two column stackable grid">
<div class="column">
@@ -201,27 +109,26 @@
{{range .Tasks}}
<div class="ui grid stackable item">
<div class="row">

<!-- 任务名 -->
<div class="four wide column">
<div class="four wide center column">
<a class="title" href="{{$.Link}}/{{.JobID}}">
<span class="fitted">{{svg "octicon-tasklist" 16}}</span>
<!-- <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}}">
<div class="two wide center column job-status" id="{{.JobID}}" data-repopath="{{$.RepoRelPath}}" data-jobid="{{.JobID}}">
{{.Status}}
</div>

<!-- 任务创建时间 -->
<div class="three wide column">
<div class="two wide center column">
<span class="ui text center">{{svg "octicon-flame" 16}} {{TimeSinceUnix .CreatedUnix $.Lang}}</span>
</div>

<!-- 查看 -->
<div class="one wide column">
<div class="two wide center column">
<span class="ui text clipboard">
<a class="title" href="{{$.Link}}/{{.JobID}}">
<span class="fitted">查看</span>
@@ -230,7 +137,7 @@
</div>

<!-- 删除任务 -->
<div class="one wide column">
<div class="two wide center 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}}
@@ -240,7 +147,7 @@
</div>

<!-- 调试 -->
<div class="one wide column">
<div class="two wide center 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>
@@ -249,7 +156,7 @@
</div>

<!-- 停止 -->
<div class="one wide column">
<div class="two wide center column">
<div class="ui text center clipboard">
<form id="stopForm-{{.JobID}}" action="{{if ne .Status "RUNNING"}}javascript:void(0){{else}}{{$.Link}}/{{.JobID}}/stop{{end}}" method="post">
{{$.CsrfTokenHtml}}
@@ -295,6 +202,10 @@
{{template "base/footer" .}}

<script>
$(".vertical.menu a").click(function(){
$(this).siblings().removeClass("activate")
$(this).addClass("activate")
})
// 调试和评分新开窗口
function stop(obj) {
if (obj.style.color != "rgb(204, 204, 204)") {
@@ -349,14 +260,4 @@
});
});
});

$('.ui.green.button').click(function(){
})
// 超链接
$(".vertical.menu a").click(function(){
$(this).siblings().removeClass("activate")
$(this).addClass("activate")
})
</script>

+ 104
- 67
templates/repo/modelarts/trainjob/index.tmpl View File

@@ -2,7 +2,39 @@
<style>
#deletemodel {
width: 100%;
height: 100%;
height: 100%;
}
.alert {
display: none;
position: fixed;
width: 100%;
z-index: 1001;
padding: 15px;
border: 1px solid transparent;
border-radius: 4px;
text-align: center;
font-weight: bold;
}

.alert-success {
color: #3c763d;
background-color: #dff0d8;
border-color: #d6e9c6;
}

.alert-danger {
color: #a94442;
background-color: #f2dede;
border-color: #ebccd1;
}

.dis {
margin-bottom: 20px;
}

.disabled {
cursor: pointer;
pointer-events: none;
}

.ui.segment.bottom.attached {
@@ -21,10 +53,13 @@
font-weight: 700;
}
</style>
<div class="repository view">
{{template "repo/header" .}}
<div class="modelarts train_job container">
<div class="modelarts">
<div class="repository release modelarts train_job view container">
<div class="alert"></div>
{{template "repo/header" .}}
<div class="ui container">
<div class="ui grid">
<div class="three wide column">
<div class="ui grid">
@@ -37,11 +72,9 @@
</a>
</div>
</div>
</div>
</div>
<!-- 右侧 -->
<div class="ui thirteen wide column">
{{template "base/alert" .}}
<div class="ui thirteen wide column">
<div class="ui three column stackable grid">
<div class="column">
<h2>{{.i18n.Tr "repo.modelarts.train_job"}}</h2>
@@ -53,72 +86,76 @@
</div>
</div>
<div class="ui divider"></div>
<div class="ui sixteen wide column">
<div class="ui sixteen wide column">
<div class="ui two column stackable grid">
<div class="column">
</div>
<div class="column right aligned">
<div class="ui right dropdown type jump item">
<span class="text">
{{.i18n.Tr "repo.issues.filter_sort"}}<i class="dropdown icon"></i>
</span>
<div class="ui grid">
<div class="row">
<div class="ui sixteen wide column">
<div class="ui sixteen wide column">
<div class="ui two column stackable grid">
<div class="column">
</div>
<div class="column right aligned">
<div class="ui right dropdown type jump item">
<span class="text">
{{.i18n.Tr "repo.issues.filter_sort"}}<i class="dropdown icon"></i>
</span>
</div>
</div>
</div>
</div>
</div>
</div>
<!-- 任务展示 -->
<div class="train_job list">
{{range .Tasks}}
<div class="ui grid stackable item">
<div class="row">
<!-- 任务名 -->
<div class="four 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="two wide column job-status" id="{{.JobID}}" data-repopath="{{$.RepoRelPath}}" data-jobid="{{.JobID}}">
{{.Status}}
</div>
<!-- 任务展示 -->
<div class="dataset list">
{{range .Tasks}}
<div class="ui grid stackable item">
<div class="row">
<!-- 任务名 -->
<div class="four wide center column">
<a class="title" href="{{$.Link}}/{{.JobID}}">
<!-- <span class="fitted">{{svg "octicon-tasklist" 16}}</span> -->
<span class="fitted">{{.JobName}}</span>
</a>
</div>
<!--任务状态 -->
<div class="five wide center column job-status" id="{{.JobID}}" data-repopath="{{$.RepoRelPath}}" data-jobid="{{.JobID}}">
{{.Status}}
</div>

<!-- 运行时长 -->
<div class="two wide column">
<span class="ui text center">{{svg "octicon-clock" 16}} {{TimeSinceUnix .CreatedUnix $.Lang}}</span>
</div>
<!-- 任务创建时间 -->
<!-- <div class="three wide column">
<span class="ui text center">{{svg "octicon-flame" 16}} {{TimeSinceUnix .CreatedUnix $.Lang}}</span>
</div> -->
<!-- 删除 -->
<div class="two wide column">
<div class="ui text center clipboard">
<form id="delForm-{{.JobID}}" action="{{$.Link}}/{{.JobID}}/del" method="post">
{{$.CsrfTokenHtml}}
<a class="fitted" onclick="assertDelete(this)" style="font-size:16px; font-weight:bold">删除</a>
</form>
<!-- 运行时长 -->
<div class="three wide center column">
<span class="ui text center">{{svg "octicon-clock" 16}} {{TimeSinceUnix .CreatedUnix $.Lang}}</span>
</div>
<!-- 任务创建时间 -->
<!-- <div class="three wide column">
<span class="ui text center">{{svg "octicon-flame" 16}} {{TimeSinceUnix .CreatedUnix $.Lang}}</span>
</div> -->
<!-- 删除 -->
<div class="two wide center column">
<div class="ui text center clipboard">
<form id="delForm-{{.JobID}}" action="{{$.Link}}/{{.JobID}}/del" method="post">
{{$.CsrfTokenHtml}}
<a class="fitted" onclick="assertDelete(this)" style="font-size:16px; font-weight:bold">删除</a>
</form>
</div>
</div>
<!-- 停止 -->
<div class="two wide column">
<div class="ui text center clipboard">
<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>
</div>
</div>
</div>
</div>
<!-- 停止 -->
<div class="two wide column">
<div class="ui text center clipboard">
<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>
</div>
</div>
{{end}} {{template "base/paginate" .}}
</div>
</div>
{{end}} {{template "base/paginate" .}}
</div>
</div>
</div>


+ 0
- 1
templates/repo/modelarts/trainjob/new.tmpl View File

@@ -400,7 +400,6 @@

$('.ui.create_train_job.green.button').click(function(e) {
send_run_para()
return
validate()
})
</script>

+ 10
- 4
templates/repo/modelarts/trainjob/show.tmpl View File

@@ -5,9 +5,18 @@
<div class="column">
{{template "base/alert" .}}
<h4 class="ui top attached header">
{{$.i18n.Tr "repo.modelarts.version_manage"}}
<div class="ui two column grid">
<div class="column">
{{$.i18n.Tr "repo.modelarts.version_manage"}}
</div>
<div class="column right aligned">
<a href="javascript:window.history.back();">{{svg "octicon-reply" 16}}{{$.i18n.Tr "repo.modelarts.back"}}</a>
</div>
</div>
</h4>

<div class="ui attached segment">
<div class="ui style accordion">
<div class="title active">
<i class="dropdown icon"></i>
@@ -21,9 +30,6 @@
<!-- <a class="item" data-tab="resources">资源占用情况</a> -->
</div>
<div class="ui bottom attached tab segment active" data-tab="configs">
<h4 class="ui header" id="vertical-segment">
<a href="javascript:window.history.back();"><i class="arrow left icon"></i>{{$.i18n.Tr "repo.modelarts.back"}}</a>
</h4>
<div>
<div class="ui yellow segment">
<table class="ui celled striped table">


Loading…
Cancel
Save