From 925c0337186eebc2b0037fbe1fd4919930034ea2 Mon Sep 17 00:00:00 2001 From: zhoupzh Date: Mon, 21 Feb 2022 18:43:47 +0800 Subject: [PATCH] fix issue --- options/locale/locale_en-US.ini | 6 + options/locale/locale_zh-CN.ini | 8 +- templates/admin/cloudbrain/list.tmpl | 302 +----------------- templates/admin/cloudbrain/search.tmpl | 46 +++ .../repo/cloudbrain/benchmark/index.tmpl | 181 +---------- templates/repo/debugjob/index.tmpl | 182 +---------- .../repo/modelarts/inferencejob/index.tmpl | 122 +------ templates/repo/modelarts/trainjob/index.tmpl | 166 +--------- templates/repo/modelarts/trainjob/show.tmpl | 1 + web_src/js/features/cloudrbanin.js | 236 ++++++++++++++ web_src/js/index.js | 2 + web_src/less/openi.less | 11 +- 12 files changed, 350 insertions(+), 913 deletions(-) create mode 100644 templates/admin/cloudbrain/search.tmpl create mode 100644 web_src/js/features/cloudrbanin.js diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini index 318348d56..fb2b2cd2d 100755 --- a/options/locale/locale_en-US.ini +++ b/options/locale/locale_en-US.ini @@ -2342,6 +2342,12 @@ datasets.owner=Owner datasets.name=name datasets.private=Private +cloudbrain.all_task_types=All Task Types +cloudbrain.all_computing_resources=All Computing Resources +cloudbrain.all_status=All Status +cloudbrain.download_report=Download Report +cloudbrain.cloudbrain_name=Cloudbrain Name + hooks.desc = Webhooks automatically make HTTP POST requests to a server when certain openi events trigger. Webhooks defined here are defaults and will be copied into all new repositories. Read more in the webhooks guide. hooks.add_webhook = Add Default Webhook hooks.update_webhook = Update Default Webhook diff --git a/options/locale/locale_zh-CN.ini b/options/locale/locale_zh-CN.ini index 58b0b79b3..782335033 100755 --- a/options/locale/locale_zh-CN.ini +++ b/options/locale/locale_zh-CN.ini @@ -2352,6 +2352,12 @@ datasets.owner=所有者 datasets.name=名称 datasets.private=私有 +cloudbrain.all_task_types=全部任务类型 +cloudbrain.all_computing_resources=全部计算资源 +cloudbrain.all_status=全部状态 +cloudbrain.download_report=下载此报告 +cloudbrain.cloudbrain_name=云脑侧名称 + hooks.desc=当某些 openi 事件触发时, Web 钩子会自动向服务器发出 HTTP POST 请求。此处定义的 Web 钩子是默认值, 将复制到所有新建项目中。参阅 Web钩子指南 获取更多内容。 hooks.add_webhook=新增默认Web钩子 hooks.update_webhook=更新默认Web钩子 @@ -2418,7 +2424,7 @@ auths.sspi_auto_activate_users_helper=允许 SSPI 认证自动激活新用户 auths.sspi_strip_domain_names=从用户名中删除域名部分 auths.sspi_strip_domain_names_helper=如果选中此项，域名将从登录名中删除(例如，"DOMAIN\user"和"user@example.org"，两者都将变成只是“用户”)。 auths.sspi_separator_replacement=要使用的分隔符代替\, / 和 @ -auths.sspi_separator_replacement_helper=用于替换下级登录名称分隔符的字符 (例如) "DOMAIN\user") 中的 \ 和用户主名字(如"user@example.org中的 @ )。 +auths.sspi_separator_replacement_helper=用于替换下级登录名称分隔符的字符 (例如) "DOMAIN\user") 中的 \ 和用户主名字(如"user@example.org"中的 @ )。 auths.sspi_default_language=默认语言 auths.sspi_default_language_helper=SSPI 认证方法为用户自动创建的默认语言。如果您想要自动检测到语言，请留空。 auths.tips=帮助提示 diff --git a/templates/admin/cloudbrain/list.tmpl b/templates/admin/cloudbrain/list.tmpl index 84a8a75cc..0a09230eb 100644 --- a/templates/admin/cloudbrain/list.tmpl +++ b/templates/admin/cloudbrain/list.tmpl @@ -1,23 +1,3 @@ - {{template "base/head" .}}
@@ -35,64 +15,15 @@ {{template "admin/navbar" .}}
{{template "base/alert" .}} - -
+
-
-
-
- - -
-
-
-
-
-
全部任务类型
- -
- 全部任务类型 - DEBUG - TRAIN - INFERENCE -
-
-
-
全部计算资源
- -
- 全部计算资源 - CPU/GPU - NPU -
-
-
-
全部状态
- -
- 全部状态 - STARTING - RESTARTING - START_FAILED - STOPPING - STOPPED - WAITING - COMPLETED - FAILED - OTHER - -
-
-
+ {{template "admin/cloudbrain/search" .}}
- - 下载此报告 + {{.i18n.Tr "admin.cloudbrain.download_report"}}
-
-
@@ -100,7 +31,7 @@ {{$.i18n.Tr "repo.cloudbrain_task"}}
- 任务类型 + {{$.i18n.Tr "repo.cloudbrain_task_type"}}
{{$.i18n.Tr "repo.modelarts.status"}} @@ -118,21 +49,19 @@ {{$.i18n.Tr "repo.cloudbrain_creator"}}
- 项目 + {{$.i18n.Tr "repository"}}
- 云脑侧名称 + {{.i18n.Tr "admin.cloudbrain.cloudbrain_name"}}
{{$.i18n.Tr "repo.cloudbrain_operate"}}
- {{range .Tasks}}
-
- +
{{if eq .JobType "DEBUG"}} @@ -154,7 +83,6 @@ {{end}}
-
{{.JobType}}
@@ -190,21 +118,19 @@
- {{.JobName}}
-
{{if eq .JobType "DEBUG"}}
{{$.CsrfTokenHtml}} {{if eq .Status "RUNNING" "WAITING" "CREATING" "STARTING"}} - + {{$.i18n.Tr "repo.debug"}} {{else}} - + {{$.i18n.Tr "repo.debug_again"}} {{end}} @@ -216,34 +142,20 @@ {{if eq .JobType "DEBUG" "BENCHMARK"}} {{$.CsrfTokenHtml}} - + {{$.i18n.Tr "repo.stop"}}
{{else}} - + {{$.i18n.Tr "repo.stop"}} {{end}}
- - -
+ {{$.CsrfTokenHtml}} - + {{$.i18n.Tr "repo.delete"}}
@@ -270,7 +182,6 @@
-
@@ -292,198 +203,17 @@
- {{template "base/footer" .}} - diff --git a/templates/admin/cloudbrain/search.tmpl b/templates/admin/cloudbrain/search.tmpl new file mode 100644 index 000000000..bbd45e550 --- /dev/null +++ b/templates/admin/cloudbrain/search.tmpl @@ -0,0 +1,46 @@ +
+
+
+ + +
+
+
+
+
+
{{.i18n.Tr "admin.cloudbrain.all_task_types"}}
+ +
+ {{.i18n.Tr "admin.cloudbrain.all_task_types"}} + DEBUG + TRAIN + INFERENCE +
+
+
+
{{.i18n.Tr "admin.cloudbrain.all_computing_resources"}}
+ +
+ {{.i18n.Tr "admin.cloudbrain.all_computing_resources"}} + CPU/GPU + NPU +
+
+
+
{{.i18n.Tr "admin.cloudbrain.all_status"}}
+ +
+ {{.i18n.Tr "admin.cloudbrain.all_status"}} + STARTING + RESTARTING + START_FAILED + STOPPING + STOPPED + WAITING + COMPLETED + FAILED + OTHER + +
+
+
\ No newline at end of file diff --git a/templates/repo/cloudbrain/benchmark/index.tmpl b/templates/repo/cloudbrain/benchmark/index.tmpl index ea8af1053..dd6dc7af3 100644 --- a/templates/repo/cloudbrain/benchmark/index.tmpl +++ b/templates/repo/cloudbrain/benchmark/index.tmpl @@ -106,7 +106,7 @@
- + {{.Status}}
@@ -137,10 +137,9 @@
{{$.CsrfTokenHtml}} {{if .CanDel}} - - - {{$.i18n.Tr "repo.stop"}} - + + {{$.i18n.Tr "repo.stop"}} + {{else}} @@ -148,26 +147,21 @@ {{end}}
- - 评分 - -
{{$.CsrfTokenHtml}} {{if .CanDel}} - + {{$.i18n.Tr "repo.delete"}} {{else}} - + {{$.i18n.Tr "repo.delete"}} - {{end}}
@@ -221,166 +215,3 @@
{{template "base/footer" .}} - - \ No newline at end of file diff --git a/templates/repo/debugjob/index.tmpl b/templates/repo/debugjob/index.tmpl index d45df324e..eaf1823f1 100755 --- a/templates/repo/debugjob/index.tmpl +++ b/templates/repo/debugjob/index.tmpl @@ -293,7 +293,7 @@
- + {{.Status}}
@@ -324,11 +324,11 @@ {{$.CsrfTokenHtml}} {{if .CanDebug}} {{if eq .Status "RUNNING" "WAITING" "CREATING" "STARTING"}} - + {{$.i18n.Tr "repo.debug"}} {{else}} - + {{$.i18n.Tr "repo.debug_again"}} {{end}} @@ -349,15 +349,9 @@
{{$.CsrfTokenHtml}} {{if .CanDel}} - {{if eq .ComputeResource "CPU/GPU" }} - - {{$.i18n.Tr "repo.stop"}} - - {{else}} - - {{$.i18n.Tr "repo.stop"}} - - {{end}} + + {{$.i18n.Tr "repo.stop"}} + {{else}} {{$.i18n.Tr "repo.stop"}} @@ -369,19 +363,16 @@ {{$.CsrfTokenHtml}} {{if .CanDel}} - + {{$.i18n.Tr "repo.delete"}} {{else}} - - {{$.i18n.Tr "repo.delete"}} + + {{$.i18n.Tr "repo.delete"}} - {{end}}
-
- - +
{{end}} -
@@ -487,7 +477,6 @@ {{template "base/footer" .}} - diff --git a/templates/repo/modelarts/trainjob/index.tmpl b/templates/repo/modelarts/trainjob/index.tmpl index 9a3c32ce9..c376e0e8a 100755 --- a/templates/repo/modelarts/trainjob/index.tmpl +++ b/templates/repo/modelarts/trainjob/index.tmpl @@ -113,7 +113,7 @@
- + {{.Status}}
@@ -143,11 +143,11 @@
{{$.CsrfTokenHtml}} {{if .CanDel}} - + {{$.i18n.Tr "repo.stop"}} {{else}} - + {{$.i18n.Tr "repo.stop"}} {{end}} @@ -157,7 +157,7 @@
{{$.CsrfTokenHtml}} {{if .CanDel}} - + {{$.i18n.Tr "repo.delete"}} {{else}} @@ -204,161 +204,5 @@
- -{{template "base/footer" .}} - - \ No newline at end of file +{{template "base/footer" .}} \ No newline at end of file diff --git a/templates/repo/modelarts/trainjob/show.tmpl b/templates/repo/modelarts/trainjob/show.tmpl index 81d36c1e9..4fad02830 100755 --- a/templates/repo/modelarts/trainjob/show.tmpl +++ b/templates/repo/modelarts/trainjob/show.tmpl @@ -518,6 +518,7 @@ td, th { + {{template "base/footer" .}}