From 6d3e76bb9fc347697337e276b9c6b6b62eb74b34 Mon Sep 17 00:00:00 2001 From: zouap Date: Fri, 8 Apr 2022 09:08:58 +0800 Subject: [PATCH 01/28] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E6=A0=B7=E5=BC=8F?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: zouap --- web_src/less/openi.less | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web_src/less/openi.less b/web_src/less/openi.less index 4f25e5ffd..e324f7e6c 100644 --- a/web_src/less/openi.less +++ b/web_src/less/openi.less @@ -935,7 +935,7 @@ display: block; color: red; } .ui.list .list>.item>img.image+.content, .ui.list>.item>img.image+.content { - width: calc(100% - 4.0em); + width: calc(100%-4em); margin-left: 0; } From 12b6d6efe09ef477e08533d302d85a023a7c31e8 Mon Sep 17 00:00:00 2001 From: zouap Date: Fri, 8 Apr 2022 09:35:04 +0800 Subject: [PATCH 02/28] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E6=A0=B7=E5=BC=8F?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: zouap --- templates/user/settings/organization.tmpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/user/settings/organization.tmpl b/templates/user/settings/organization.tmpl index 00b73f94d..6e5cb3872 100644 --- a/templates/user/settings/organization.tmpl +++ b/templates/user/settings/organization.tmpl @@ -23,7 +23,7 @@ -
+
{{.Name}}
From f4df450f0435df5f8af60855b329fd6d4003f6ab Mon Sep 17 00:00:00 2001 From: zouap Date: Fri, 8 Apr 2022 09:35:33 +0800 Subject: [PATCH 03/28] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E6=A0=B7=E5=BC=8F?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: zouap --- web_src/less/openi.less | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/web_src/less/openi.less b/web_src/less/openi.less index e324f7e6c..af27172c2 100644 --- a/web_src/less/openi.less +++ b/web_src/less/openi.less @@ -934,8 +934,13 @@ display: block; .highlight{ color: red; } + + .ui.list .list>.item>img.image+.contentnew, .ui.list>.item>img.image+.contentnew { + margin-left: 0; + } + .ui.list .list>.item>img.image+.content, .ui.list>.item>img.image+.content { - width: calc(100%-4em); + width: calc(100%-4.0em); margin-left: 0; } From fe86b78aad6f0502e189afe1e45df111c16d1d14 Mon Sep 17 00:00:00 2001 From: zouap Date: Fri, 8 Apr 2022 09:46:25 +0800 Subject: [PATCH 04/28] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E6=A0=B7=E5=BC=8F?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: zouap --- web_src/less/openi.less | 1 + 1 file changed, 1 insertion(+) diff --git a/web_src/less/openi.less b/web_src/less/openi.less index af27172c2..bdadf559f 100644 --- a/web_src/less/openi.less +++ b/web_src/less/openi.less @@ -936,6 +936,7 @@ display: block; } .ui.list .list>.item>img.image+.contentnew, .ui.list>.item>img.image+.contentnew { + width: calc(100%-10em); margin-left: 0; } From 4b30c1bc56ff3f2d2dd96029eb3c982804696595 Mon Sep 17 00:00:00 2001 From: zouap Date: Fri, 8 Apr 2022 09:56:50 +0800 Subject: [PATCH 05/28] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E6=A0=B7=E5=BC=8F?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: zouap --- templates/user/settings/organization.tmpl | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/templates/user/settings/organization.tmpl b/templates/user/settings/organization.tmpl index 6e5cb3872..ae92218b0 100644 --- a/templates/user/settings/organization.tmpl +++ b/templates/user/settings/organization.tmpl @@ -16,16 +16,17 @@
{{range .Orgs}}
+ + +
+ {{.Name}} +
{{$.CsrfTokenHtml}}
- -
- {{.Name}} -
{{end}}
From 91d1458a06ad60db347ac3c961373a5202f4dd63 Mon Sep 17 00:00:00 2001 From: zouap Date: Fri, 8 Apr 2022 10:15:01 +0800 Subject: [PATCH 06/28] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E6=A0=B7=E5=BC=8F?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: zouap --- templates/user/settings/organization.tmpl | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/templates/user/settings/organization.tmpl b/templates/user/settings/organization.tmpl index ae92218b0..6e5cb3872 100644 --- a/templates/user/settings/organization.tmpl +++ b/templates/user/settings/organization.tmpl @@ -16,17 +16,16 @@
{{range .Orgs}}
- - -
- {{.Name}} -
{{$.CsrfTokenHtml}}
+ +
+ {{.Name}} +
{{end}}
From b7b56ec19636a594d25f51febf238e901e4647db Mon Sep 17 00:00:00 2001 From: zouap Date: Fri, 8 Apr 2022 15:25:53 +0800 Subject: [PATCH 07/28] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?= =?UTF-8?q?=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: zouap --- options/locale/locale_en-US.ini | 1 + options/locale/locale_zh-CN.ini | 1 + templates/repo/cloudbrain/show.tmpl | 18 ++++++++++++++++-- templates/user/settings/organization.tmpl | 2 +- 4 files changed, 19 insertions(+), 3 deletions(-) diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini index 58168d1e2..a4858dbb7 100755 --- a/options/locale/locale_en-US.ini +++ b/options/locale/locale_en-US.ini @@ -919,6 +919,7 @@ cloudbrain_helper=Use GPU/NPU resources to open notebooks, model training tasks, cloudbrain.exitinfo=Exit Information cloudbrain.platform=Platform cloudbrain.endtime=End Time +cloudbrain.runinfo=Task Runtime Information model_manager = Model model_noright=No right model_rename=Duplicate model name, please modify model name. diff --git a/options/locale/locale_zh-CN.ini b/options/locale/locale_zh-CN.ini index 28041428f..bec5000e1 100755 --- a/options/locale/locale_zh-CN.ini +++ b/options/locale/locale_zh-CN.ini @@ -966,6 +966,7 @@ cloudbrain.mirror_description = 镜像描述 cloudbrain.exitinfo=退出信息 cloudbrain.platform=平台 cloudbrain.endtime=结束时间 +cloudbrain.runinfo=任务运行简况 record_begintime_get_err=无法获取统计开始时间。 parameter_is_wrong=输入参数错误，请检查输入参数。 total_count_get_error=查询总页数失败。 diff --git a/templates/repo/cloudbrain/show.tmpl b/templates/repo/cloudbrain/show.tmpl index 781c66d67..6fbff5956 100755 --- a/templates/repo/cloudbrain/show.tmpl +++ b/templates/repo/cloudbrain/show.tmpl @@ -198,7 +198,7 @@ td, th {
- +
@@ -226,6 +226,7 @@ td, th {
{{$.i18n.Tr "repo.modelarts.train_job.config"}} + {{$.i18n.Tr "repo.cloudbrain.runinfo"}}
@@ -432,7 +433,20 @@ td, th {
- +
+
+ +
+ + {{$.result.JobStatus.AppExitDiagnostics}} + +
+ +
+ +
diff --git a/templates/user/settings/organization.tmpl b/templates/user/settings/organization.tmpl index 6e5cb3872..00b73f94d 100644 --- a/templates/user/settings/organization.tmpl +++ b/templates/user/settings/organization.tmpl @@ -23,7 +23,7 @@
-
+
{{.Name}}
From 7c9764bd7c03019cfc797b112d2b697de62c29f9 Mon Sep 17 00:00:00 2001 From: zouap Date: Fri, 8 Apr 2022 16:32:21 +0800 Subject: [PATCH 08/28] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?= =?UTF-8?q?=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: zouap --- templates/repo/cloudbrain/show.tmpl | 58 ++++++++++++++++------------- 1 file changed, 33 insertions(+), 25 deletions(-) diff --git a/templates/repo/cloudbrain/show.tmpl b/templates/repo/cloudbrain/show.tmpl index 6fbff5956..c22012d3b 100755 --- a/templates/repo/cloudbrain/show.tmpl +++ b/templates/repo/cloudbrain/show.tmpl @@ -226,7 +226,7 @@ td, th {
{{$.i18n.Tr "repo.modelarts.train_job.config"}} - {{$.i18n.Tr "repo.cloudbrain.runinfo"}} + >{{$.i18n.Tr "repo.cloudbrain.runinfo"}}
@@ -418,17 +418,6 @@ td, th {
-
-
- {{$.i18n.Tr "repo.cloudbrain.exitinfo"}} - -
-
-
- - {{$.result.JobStatus.AppExitDiagnostics}} - -
@@ -439,8 +428,9 @@ td, th {
- - {{$.result.JobStatus.AppExitDiagnostics}} + + +
@@ -499,17 +489,35 @@ td, th { jobName = urlArr.slice(-1)[0] }) - function loadLog(version_name){ - document.getElementById("mask").style.display = "block" - $.get(`/api/v1/repos/${userName}/${repoPath}/cloudbrain/${jobName}/log?version_name=${version_name}&lines=50&order=asc`, (data) => { - $('input[name=end_line]').val(data.EndLine) - $('input[name=start_line]').val(data.StartLine) - $(`#log_file${version_name}`).text(data.Content) - document.getElementById("mask").style.display = "none" - }).fail(function(err) { - console.log(err); - document.getElementById("mask").style.display = "none" - }); + function parseLog(){ + let jsonValue = document.getElementById("json_value").value; + let jsonObj = JSON.parse(jsonValue); + let podRoleName = jsonObj["podRoleName"]; + let html = ""; + if (podRoleName != null){ + let task0 = podRoleName["task1-0"]; + let podEvents = jsonObj["podEvents"]; + let podEventArray = podEvents[task0]; + if(podEventArray != null){ + for(int i=0; i < podEventArray.length;i++){ + html +="

" +podEventArray[i]["reason"] + "

"; + html +="

" +podEventArray[i]["message"] + "

"; + html +="

" +podEventArray[i]["action"] + "

"; + } + } + let extras= jsonObj["extras"]; + if(extras != null){ + html +="

" +extras["reason"] + "

"; + html +="

" +extras["message"] + "

"; + html +="

" +extras["action"] + "

"; + } + + document.getElementById("info_display").innerHTML=html; + } + + + } + From d08854f28470c5c9c52c38e08a34d269c8099863 Mon Sep 17 00:00:00 2001 From: zouap Date: Fri, 8 Apr 2022 16:33:33 +0800 Subject: [PATCH 09/28] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?= =?UTF-8?q?=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: zouap --- templates/repo/cloudbrain/show.tmpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/repo/cloudbrain/show.tmpl b/templates/repo/cloudbrain/show.tmpl index c22012d3b..3e2cc06be 100755 --- a/templates/repo/cloudbrain/show.tmpl +++ b/templates/repo/cloudbrain/show.tmpl @@ -226,7 +226,7 @@ td, th {
{{$.i18n.Tr "repo.modelarts.train_job.config"}} - >{{$.i18n.Tr "repo.cloudbrain.runinfo"}} + {{$.i18n.Tr "repo.cloudbrain.runinfo"}}
From 83652d406747c3ee8029c1c725e3ecf82acebe50 Mon Sep 17 00:00:00 2001 From: zouap Date: Fri, 8 Apr 2022 16:39:35 +0800 Subject: [PATCH 10/28] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?= =?UTF-8?q?=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: zouap --- templates/repo/cloudbrain/show.tmpl | 83 ++++++++++------------------- 1 file changed, 29 insertions(+), 54 deletions(-) diff --git a/templates/repo/cloudbrain/show.tmpl b/templates/repo/cloudbrain/show.tmpl index 3e2cc06be..3040fce8d 100755 --- a/templates/repo/cloudbrain/show.tmpl +++ b/templates/repo/cloudbrain/show.tmpl @@ -167,6 +167,34 @@ td, th { padding-top: 0.5rem ; } + +
@@ -226,7 +254,7 @@ td, th {
{{$.i18n.Tr "repo.modelarts.train_job.config"}} - {{$.i18n.Tr "repo.cloudbrain.runinfo"}} + {{$.i18n.Tr "repo.cloudbrain.runinfo"}}
@@ -468,56 +496,3 @@ td, th {
{{template "base/footer" .}} - From 4c307c9d8b124c13daba0dda412967f68009eaf9 Mon Sep 17 00:00:00 2001 From: zouap Date: Fri, 8 Apr 2022 16:41:55 +0800 Subject: [PATCH 11/28] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?= =?UTF-8?q?=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: zouap --- public/home/search.js | 26 ++++++++++++++++ templates/repo/cloudbrain/show.tmpl | 48 ++++++++++++++--------------- 2 files changed, 50 insertions(+), 24 deletions(-) diff --git a/public/home/search.js b/public/home/search.js index e23d27549..8a8e940cb 100644 --- a/public/home/search.js +++ b/public/home/search.js @@ -129,6 +129,32 @@ function search(){ } } +function parseLog(){ + let jsonValue = document.getElementById("json_value").value; + let jsonObj = JSON.parse(jsonValue); + let podRoleName = jsonObj["podRoleName"]; + let html = ""; + if (podRoleName != null){ + let task0 = podRoleName["task1-0"]; + let podEvents = jsonObj["podEvents"]; + let podEventArray = podEvents[task0]; + if(podEventArray != null){ + for(int i=0; i < podEventArray.length;i++){ + html +="

" +podEventArray[i]["reason"] + "

"; + html +="

" +podEventArray[i]["message"] + "

"; + html +="

" +podEventArray[i]["action"] + "

"; + } + } + let extras= jsonObj["extras"]; + if(extras != null){ + html +="

" +extras["reason"] + "

"; + html +="

" +extras["message"] + "

"; + html +="

" +extras["action"] + "

"; + } + document.getElementById("info_display").innerHTML=html; + } + } + function emptySearch(){ initDiv(false); initPageInfo(); diff --git a/templates/repo/cloudbrain/show.tmpl b/templates/repo/cloudbrain/show.tmpl index 3040fce8d..2a164e8de 100755 --- a/templates/repo/cloudbrain/show.tmpl +++ b/templates/repo/cloudbrain/show.tmpl @@ -168,31 +168,31 @@ td, th { }
From 6f06a8484204016406143c899c04eaa81ccc8ae6 Mon Sep 17 00:00:00 2001 From: zouap Date: Fri, 8 Apr 2022 16:48:36 +0800 Subject: [PATCH 12/28] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?= =?UTF-8?q?=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: zouap --- templates/repo/cloudbrain/show.tmpl | 63 ++++++++++++++++------------- 1 file changed, 36 insertions(+), 27 deletions(-) diff --git a/templates/repo/cloudbrain/show.tmpl b/templates/repo/cloudbrain/show.tmpl index 2a164e8de..ed17e6ec2 100755 --- a/templates/repo/cloudbrain/show.tmpl +++ b/templates/repo/cloudbrain/show.tmpl @@ -167,33 +167,7 @@ td, th { padding-top: 0.5rem ; } - +
@@ -496,3 +470,38 @@ td, th {
{{template "base/footer" .}} + \ No newline at end of file From f29ed8688115a1c5d235c5b560fd7083abd6751e Mon Sep 17 00:00:00 2001 From: zouap Date: Fri, 8 Apr 2022 16:52:10 +0800 Subject: [PATCH 13/28] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?= =?UTF-8?q?=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: zouap --- templates/repo/cloudbrain/show.tmpl | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/templates/repo/cloudbrain/show.tmpl b/templates/repo/cloudbrain/show.tmpl index ed17e6ec2..204362ddb 100755 --- a/templates/repo/cloudbrain/show.tmpl +++ b/templates/repo/cloudbrain/show.tmpl @@ -56,7 +56,7 @@ margin:10px 5px ; } .tab_2_content { - min-height: 560px; + min-height: 460px; margin-left: 10px; } .ac-grid { @@ -497,9 +497,11 @@ td, th { } let extras= jsonObj["extras"]; if(extras != null){ - html +="

" +extras["reason"] + "

"; - html +="

" +extras["message"] + "

"; - html +="

" +extras["action"] + "

"; + for(var i=0; i < extras.length;i++){ + html +="

" +extras[i]["reason"] + "

"; + html +="

" +extras[i]["message"] + "

"; + html +="

" +extras[i]["action"] + "

"; + } } } document.getElementById("info_display").innerHTML=html; From 8573b98eda977929fa2b00293cee61116a17333e Mon Sep 17 00:00:00 2001 From: zouap Date: Fri, 8 Apr 2022 16:56:45 +0800 Subject: [PATCH 14/28] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?= =?UTF-8?q?=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: zouap --- templates/repo/cloudbrain/show.tmpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/repo/cloudbrain/show.tmpl b/templates/repo/cloudbrain/show.tmpl index 204362ddb..986e1c0cc 100755 --- a/templates/repo/cloudbrain/show.tmpl +++ b/templates/repo/cloudbrain/show.tmpl @@ -56,7 +56,7 @@ margin:10px 5px ; } .tab_2_content { - min-height: 460px; + min-height: 360px; margin-left: 10px; } .ac-grid { From 5836f132090c6add7acd8905950e91f1929cba16 Mon Sep 17 00:00:00 2001 From: zouap Date: Fri, 8 Apr 2022 17:20:06 +0800 Subject: [PATCH 15/28] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?= =?UTF-8?q?=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: zouap --- templates/repo/cloudbrain/show.tmpl | 161 +++++++++++++++------------- 1 file changed, 89 insertions(+), 72 deletions(-) diff --git a/templates/repo/cloudbrain/show.tmpl b/templates/repo/cloudbrain/show.tmpl index 986e1c0cc..94e3dd4a5 100755 --- a/templates/repo/cloudbrain/show.tmpl +++ b/templates/repo/cloudbrain/show.tmpl @@ -258,20 +258,58 @@ td, th {
+ + + {{$.i18n.Tr "repo.cloudbrain_creator"}} + + + +
+ {{.User.Name}} +
+ + + + + 计算资源 + + +
+ CPU/GPU +
+ + + + + 任务类型 + + +
+ DEBUG +
+ + + + + {{$.i18n.Tr "cloudbrain.gpu_type"}} + + + +
+ {{$.resource_type}} +
+ + - {{$.i18n.Tr "repo.modelarts.train_job.start_time"}} + 创建时间
- {{if not (eq .StartTime 0)}} - {{TimeSinceUnix1 .StartTime}} - {{else}} {{TimeSinceUnix1 .CreatedUnix}} - {{end}}
@@ -287,132 +325,111 @@ td, th {
- - - {{$.i18n.Tr "cloudbrain.mirror"}} - - - -
- {{.Image}} -
- - - - - - {{$.i18n.Tr "cloudbrain.dataset_storage_path"}} - - - -
- {{$.dataset_path}} -
- - - - - - {{$.i18n.Tr "cloudbrain.code_storage_path"}} - + - -
- {{$.code_path}} -
- - - +
+ + - + + + - - - - + - + + @@ -490,7 +507,7 @@ td, th { let podEventArray = podEvents[task0]; if(podEventArray != null){ for(var i=0; i < podEventArray.length;i++){ - html +="

" +podEventArray[i]["reason"] + "

"; + html +="

[" +podEventArray[i]["reason"] + "]

"; html +="

" +podEventArray[i]["message"] + "

"; html +="

" +podEventArray[i]["action"] + "

"; } @@ -498,7 +515,7 @@ td, th { let extras= jsonObj["extras"]; if(extras != null){ for(var i=0; i < extras.length;i++){ - html +="

" +extras[i]["reason"] + "

"; + html +="

[" +extras[i]["reason"] + "]

"; html +="

" +extras[i]["message"] + "

"; html +="

" +extras[i]["action"] + "

"; } From e052756d25cb792b2f2a36a7f262af21ec7d06db Mon Sep 17 00:00:00 2001 From: zouap Date: Fri, 8 Apr 2022 17:50:13 +0800 Subject: [PATCH 16/28] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?= =?UTF-8?q?=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: zouap --- options/locale/locale_zh-CN.ini | 2 + templates/repo/cloudbrain/show.tmpl | 86 +++++++++++++---------------- 2 files changed, 39 insertions(+), 49 deletions(-) diff --git a/options/locale/locale_zh-CN.ini b/options/locale/locale_zh-CN.ini index bec5000e1..1d1d9ab0f 100755 --- a/options/locale/locale_zh-CN.ini +++ b/options/locale/locale_zh-CN.ini @@ -967,6 +967,8 @@ cloudbrain.exitinfo=退出信息 cloudbrain.platform=平台 cloudbrain.endtime=结束时间 cloudbrain.runinfo=任务运行简况 +cloudbrain.time.starttime=开始运行时间 +cloudbrain.time.endtime=结束运行时间 record_begintime_get_err=无法获取统计开始时间。 parameter_is_wrong=输入参数错误，请检查输入参数。 total_count_get_error=查询总页数失败。 diff --git a/templates/repo/cloudbrain/show.tmpl b/templates/repo/cloudbrain/show.tmpl index 94e3dd4a5..34104f3c7 100755 --- a/templates/repo/cloudbrain/show.tmpl +++ b/templates/repo/cloudbrain/show.tmpl @@ -271,7 +271,7 @@ td, th { + + - - - - - - - + + + + + - - + + + @@ -401,38 +408,19 @@ td, th { - - - - - - - + +
+ {{$.i18n.Tr "cloudbrain.mirror"}} + +
+ {{.Image}} +
+
- {{$.i18n.Tr "cloudbrain.gpu_type"}} + {{$.i18n.Tr "repo.modelarts.train_job.dataset"}} -
- {{$.resource_type}} +
+ {{$.datasetname}}
- ExitCode + {{$.i18n.Tr "repo.modelarts.train_job.standard"}}
- {{$.result.JobStatus.AppExitCode}} + {{$.i18n.Tr "cloudbrain.gpu_num"}}：{{$.GpuNum}}，{{$.i18n.Tr "cloudbrain.cpu_num"}}：{{$.CpuNum}}，{{$.i18n.Tr "cloudbrain.memory"}}(MB)：{{$.MemMiB}}，{{$.i18n.Tr "cloudbrain.shared_memory"}}(MB)：{{$.ShareMemMiB}}
- {{$.i18n.Tr "repo.cloudbrain.endtime"}} + {{$.i18n.Tr "cloudbrain.dataset_storage_path"}} -
- {{if not (eq .EndTime 0)}} - {{TimeSinceUnix1 .EndTime}} - {{else}} - -- - {{end}} +
+ {{$.dataset_path}}
- {{$.i18n.Tr "repo.modelarts.train_job.dataset"}} + {{$.i18n.Tr "cloudbrain.model_storage_path"}} -
- {{$.datasetname}} +
+ {{$.model_path}}
- {{$.i18n.Tr "repo.modelarts.train_job.standard"}} + {{$.i18n.Tr "cloudbrain.code_storage_path"}} -
- {{$.i18n.Tr "cloudbrain.gpu_num"}}：{{$.GpuNum}}，{{$.i18n.Tr "cloudbrain.cpu_num"}}：{{$.CpuNum}}，{{$.i18n.Tr "cloudbrain.memory"}}(MB)：{{$.MemMiB}}，{{$.i18n.Tr "cloudbrain.shared_memory"}}(MB)：{{$.ShareMemMiB}} +
+ {{$.code_path}}
- {{$.i18n.Tr "repo.cloudbrain_creator"}} + 开始运行时间 -
- {{.User.Name}} +
+ {{if not (eq .StartTime 0)}} + {{TimeSinceUnix1 .StartTime}} + {{else}} + -- + {{end}}
- {{$.i18n.Tr "cloudbrain.model_storage_path"}} + 结束运行时间 -
- {{$.model_path}} +
+ {{if not (eq .EndTime 0)}} + {{TimeSinceUnix1 .EndTime}} + {{else}} + -- + {{end}}
- 计算资源 + {{$.i18n.Tr "repo.modelarts.computing_resources"}}
@@ -281,7 +281,7 @@ td, th {
- 任务类型 + {{$.i18n.Tr "cloudbrain.task_type"}}
@@ -300,32 +300,39 @@ td, th {
+ {{$.i18n.Tr "repo.cloudbrain.time.starttime"}} +
- 创建时间 - -
- - {{TimeSinceUnix1 .CreatedUnix}} - -
-
- {{$.i18n.Tr "repo.modelarts.train_job.dura_time"}} - +
+ {{if not (eq .StartTime 0)}} + {{TimeSinceUnix1 .StartTime}} + {{else}} + -- + {{end}} +
+
+ {{$.i18n.Tr "repo.cloudbrain.time.endtime"}} + -
- {{$.duration}} -
-
+
+ {{if not (eq .EndTime 0)}} + {{TimeSinceUnix1 .EndTime}} + {{else}} + -- + {{end}} +
+
- 开始运行时间 - -
- {{if not (eq .StartTime 0)}} - {{TimeSinceUnix1 .StartTime}} - {{else}} - -- - {{end}} -
-
- 结束运行时间 + {{$.i18n.Tr "repo.modelarts.train_job.dura_time"}} -
- {{if not (eq .EndTime 0)}} - {{TimeSinceUnix1 .EndTime}} - {{else}} - -- - {{end}} +
+ {{$.duration}}
From 9e355ac65b8cecb657a280c27093ed481337c431 Mon Sep 17 00:00:00 2001 From: zouap Date: Fri, 8 Apr 2022 17:51:41 +0800 Subject: [PATCH 17/28] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?= =?UTF-8?q?=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: zouap --- options/locale/locale_en-US.ini | 2 ++ 1 file changed, 2 insertions(+) diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini index a4858dbb7..049454ddc 100755 --- a/options/locale/locale_en-US.ini +++ b/options/locale/locale_en-US.ini @@ -920,6 +920,8 @@ cloudbrain.exitinfo=Exit Information cloudbrain.platform=Platform cloudbrain.endtime=End Time cloudbrain.runinfo=Task Runtime Information +cloudbrain.time.starttime=Start run time +cloudbrain.time.endtime=End run time model_manager = Model model_noright=No right model_rename=Duplicate model name, please modify model name. From 2a65969622e2ec00b3b8b34e8079688016a45e7c Mon Sep 17 00:00:00 2001 From: zouap Date: Mon, 11 Apr 2022 10:11:48 +0800 Subject: [PATCH 18/28] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?= =?UTF-8?q?=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: zouap --- templates/repo/cloudbrain/show.tmpl | 7 +-- templates/repo/modelarts/notebook/show.tmpl | 68 ++++++++++++--------- 2 files changed, 42 insertions(+), 33 deletions(-) diff --git a/templates/repo/cloudbrain/show.tmpl b/templates/repo/cloudbrain/show.tmpl index 34104f3c7..f0de9c791 100755 --- a/templates/repo/cloudbrain/show.tmpl +++ b/templates/repo/cloudbrain/show.tmpl @@ -275,7 +275,7 @@ td, th {
- CPU/GPU + {{.ComputeResource}}
@@ -285,7 +285,7 @@ td, th {
- DEBUG + {{.JobType}}
@@ -331,10 +331,7 @@ td, th {
- - -
diff --git a/templates/repo/modelarts/notebook/show.tmpl b/templates/repo/modelarts/notebook/show.tmpl index 684ad99a1..3fdea7d07 100755 --- a/templates/repo/modelarts/notebook/show.tmpl +++ b/templates/repo/modelarts/notebook/show.tmpl @@ -256,38 +256,28 @@ td, th {
- - - {{$.i18n.Tr "repo.modelarts.train_job.start_time"}} - + + {{$.i18n.Tr "repo.cloudbrain_creator"}} + - -
- - {{if not (eq .StartTime 0)}} - {{TimeSinceUnix1 .StartTime}} - {{else}} - {{TimeSinceUnix1 .CreatedUnix}} - {{end}} - -
- + +
+ {{.User.Name}} +
+ - - {{$.i18n.Tr "admin.auths.updated"}} + {{$.i18n.Tr "repo.modelarts.computing_resources"}} - -
- - {{TimeSinceUnix1 .UpdatedUnix}} - +
+ {{.ComputeResource}}
- + + @@ -348,25 +338,47 @@ td, th {
+ + + {{$.i18n.Tr "repo.modelarts.train_job.start_time"}} + - + +
+
+ {{if not (eq .StartTime 0)}} + {{TimeSinceUnix1 .StartTime}} + {{else}} + -- + {{end}} +
+
+ + + + - {{$.i18n.Tr "repo.cloudbrain_creator"}} + {{$.i18n.Tr "repo.cloudbrain.time.endtime"}} -
- {{.User.Name}} +
+ {{if not (eq .EndTime 0)}} + {{TimeSinceUnix1 .EndTime}} + {{else}} + -- + {{end}}
+ {{$.i18n.Tr "cloudbrain.description"}} -
+
{{.Description}}
From 4a6dbb748be503f8709574bb904c642e3c84c4a4 Mon Sep 17 00:00:00 2001 From: zouap Date: Mon, 11 Apr 2022 10:19:43 +0800 Subject: [PATCH 19/28] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?= =?UTF-8?q?=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: zouap --- templates/repo/cloudbrain/show.tmpl | 4 ++-- templates/repo/modelarts/notebook/show.tmpl | 12 +++++++++++- 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/templates/repo/cloudbrain/show.tmpl b/templates/repo/cloudbrain/show.tmpl index f0de9c791..440843bfc 100755 --- a/templates/repo/cloudbrain/show.tmpl +++ b/templates/repo/cloudbrain/show.tmpl @@ -306,7 +306,7 @@ td, th { -
+
{{if not (eq .StartTime 0)}} {{TimeSinceUnix1 .StartTime}} {{else}} @@ -322,7 +322,7 @@ td, th { -
+
{{if not (eq .EndTime 0)}} {{TimeSinceUnix1 .EndTime}} {{else}} diff --git a/templates/repo/modelarts/notebook/show.tmpl b/templates/repo/modelarts/notebook/show.tmpl index 3fdea7d07..b9408a867 100755 --- a/templates/repo/modelarts/notebook/show.tmpl +++ b/templates/repo/modelarts/notebook/show.tmpl @@ -290,7 +290,17 @@ td, th {
- + + + 数据集下载地址 + + + +
+ {{$.datasetDownloadLink}} +
+ + From faa8253f04bdf1b15343af2f31801567ef7a04b2 Mon Sep 17 00:00:00 2001 From: zouap Date: Mon, 11 Apr 2022 10:39:07 +0800 Subject: [PATCH 20/28] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?= =?UTF-8?q?=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: zouap --- templates/repo/modelarts/notebook/show.tmpl | 36 +++++++++++++-------- 1 file changed, 23 insertions(+), 13 deletions(-) diff --git a/templates/repo/modelarts/notebook/show.tmpl b/templates/repo/modelarts/notebook/show.tmpl index b9408a867..9f99b3c64 100755 --- a/templates/repo/modelarts/notebook/show.tmpl +++ b/templates/repo/modelarts/notebook/show.tmpl @@ -101,6 +101,10 @@ line-height: 30px; padding-bottom: 20px; } +.ti-text-form-contentline60{ + line-height: 60px; + padding-bottom: 20px; +} .ti-form>tbody>tr>td { vertical-align: top; white-space: normal; @@ -114,6 +118,11 @@ td, th { text-overflow: ellipsis; white-space: nowrap; } +.text-span-new { + width: 450px; + overflow: hidden; + text-overflow: ellipsis; +} .redo-color{ color: #3291F8; } @@ -290,13 +299,24 @@ td, th {
- + - 数据集下载地址 + {{$.i18n.Tr "cloudbrain.description"}}
+ {{.Description}} +
+ + + + + 数据集下载地址 + + + +
{{$.datasetDownloadLink}}
@@ -382,17 +402,7 @@ td, th { - - - {{$.i18n.Tr "cloudbrain.description"}} - - - -
- {{.Description}} -
- - +
From 120c60b2728e6b6e5ef6d51ca7450c394b15ffaf Mon Sep 17 00:00:00 2001 From: zouap Date: Mon, 11 Apr 2022 10:54:19 +0800 Subject: [PATCH 21/28] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?= =?UTF-8?q?=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: zouap --- templates/repo/modelarts/notebook/show.tmpl | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/templates/repo/modelarts/notebook/show.tmpl b/templates/repo/modelarts/notebook/show.tmpl index 9f99b3c64..4c77a66da 100755 --- a/templates/repo/modelarts/notebook/show.tmpl +++ b/templates/repo/modelarts/notebook/show.tmpl @@ -119,9 +119,11 @@ td, th { white-space: nowrap; } .text-span-new { - width: 450px; + width: 800px; overflow: hidden; text-overflow: ellipsis; + height: 120px; + word-break: break-all; } .redo-color{ color: #3291F8; From 5b4a6d1b25a227d8e9ae8b5572cb15477ef3063f Mon Sep 17 00:00:00 2001 From: zouap Date: Mon, 11 Apr 2022 11:02:09 +0800 Subject: [PATCH 22/28] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?= =?UTF-8?q?=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: zouap --- options/locale/locale_en-US.ini | 1 + options/locale/locale_zh-CN.ini | 1 + templates/repo/modelarts/notebook/show.tmpl | 11 ++++------- 3 files changed, 6 insertions(+), 7 deletions(-) diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini index 049454ddc..661911883 100755 --- a/options/locale/locale_en-US.ini +++ b/options/locale/locale_en-US.ini @@ -922,6 +922,7 @@ cloudbrain.endtime=End Time cloudbrain.runinfo=Task Runtime Information cloudbrain.time.starttime=Start run time cloudbrain.time.endtime=End run time +cloudbrain.datasetdownload=Dataset download url model_manager = Model model_noright=No right model_rename=Duplicate model name, please modify model name. diff --git a/options/locale/locale_zh-CN.ini b/options/locale/locale_zh-CN.ini index 1d1d9ab0f..c30fbdf8c 100755 --- a/options/locale/locale_zh-CN.ini +++ b/options/locale/locale_zh-CN.ini @@ -969,6 +969,7 @@ cloudbrain.endtime=结束时间 cloudbrain.runinfo=任务运行简况 cloudbrain.time.starttime=开始运行时间 cloudbrain.time.endtime=结束运行时间 +cloudbrain.datasetdownload=数据集下载地址 record_begintime_get_err=无法获取统计开始时间。 parameter_is_wrong=输入参数错误，请检查输入参数。 total_count_get_error=查询总页数失败。 diff --git a/templates/repo/modelarts/notebook/show.tmpl b/templates/repo/modelarts/notebook/show.tmpl index 4c77a66da..fbf60caa3 100755 --- a/templates/repo/modelarts/notebook/show.tmpl +++ b/templates/repo/modelarts/notebook/show.tmpl @@ -101,10 +101,7 @@ line-height: 30px; padding-bottom: 20px; } -.ti-text-form-contentline60{ - line-height: 60px; - padding-bottom: 20px; -} + .ti-form>tbody>tr>td { vertical-align: top; white-space: normal; @@ -307,17 +304,17 @@ td, th { -
+
{{.Description}}
- 数据集下载地址 + {{$.i18n.Tr "repo.cloudbrain.datasetdownload"}} - +
{{$.datasetDownloadLink}}
From 929ed1b28ec66aab677431ca0a5f6f8ecd36c248 Mon Sep 17 00:00:00 2001 From: zouap Date: Mon, 11 Apr 2022 11:09:27 +0800 Subject: [PATCH 23/28] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?= =?UTF-8?q?=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: zouap --- templates/repo/modelarts/notebook/show.tmpl | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/templates/repo/modelarts/notebook/show.tmpl b/templates/repo/modelarts/notebook/show.tmpl index fbf60caa3..93c7068d3 100755 --- a/templates/repo/modelarts/notebook/show.tmpl +++ b/templates/repo/modelarts/notebook/show.tmpl @@ -298,29 +298,29 @@ td, th {
- + - {{$.i18n.Tr "cloudbrain.description"}} + {{$.i18n.Tr "repo.cloudbrain.datasetdownload"}}
- {{.Description}} + {{$.datasetDownloadLink}}
- + - {{$.i18n.Tr "repo.cloudbrain.datasetdownload"}} + {{$.i18n.Tr "cloudbrain.description"}}
- {{$.datasetDownloadLink}} + {{.Description}}
- - + +
From c72907b4a896d86474d926251f6eba9ae1649815 Mon Sep 17 00:00:00 2001 From: zouap Date: Mon, 11 Apr 2022 15:02:50 +0800 Subject: [PATCH 24/28] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?= =?UTF-8?q?=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: zouap --- templates/repo/cloudbrain/show.tmpl | 2 +- templates/repo/modelarts/notebook/show.tmpl | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/templates/repo/cloudbrain/show.tmpl b/templates/repo/cloudbrain/show.tmpl index 440843bfc..1decec169 100755 --- a/templates/repo/cloudbrain/show.tmpl +++ b/templates/repo/cloudbrain/show.tmpl @@ -56,7 +56,7 @@ margin:10px 5px ; } .tab_2_content { - min-height: 360px; + min-height: 380px; margin-left: 10px; } .ac-grid { diff --git a/templates/repo/modelarts/notebook/show.tmpl b/templates/repo/modelarts/notebook/show.tmpl index 93c7068d3..92f69cec7 100755 --- a/templates/repo/modelarts/notebook/show.tmpl +++ b/templates/repo/modelarts/notebook/show.tmpl @@ -119,7 +119,7 @@ td, th { width: 800px; overflow: hidden; text-overflow: ellipsis; - height: 120px; + height: 80px; word-break: break-all; } .redo-color{ From c18fae72d166294e319f031c0452f4c58369f28a Mon Sep 17 00:00:00 2001 From: zouap Date: Mon, 11 Apr 2022 15:06:06 +0800 Subject: [PATCH 25/28] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?= =?UTF-8?q?=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: zouap --- templates/repo/cloudbrain/show.tmpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/repo/cloudbrain/show.tmpl b/templates/repo/cloudbrain/show.tmpl index 1decec169..379e15536 100755 --- a/templates/repo/cloudbrain/show.tmpl +++ b/templates/repo/cloudbrain/show.tmpl @@ -431,7 +431,7 @@ td, th { -
+
From 1562809c87461c6d008e3d74a7d1bb1e8c0c8c60 Mon Sep 17 00:00:00 2001 From: zouap Date: Mon, 11 Apr 2022 15:07:21 +0800 Subject: [PATCH 26/28] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?= =?UTF-8?q?=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: zouap --- templates/repo/cloudbrain/show.tmpl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/templates/repo/cloudbrain/show.tmpl b/templates/repo/cloudbrain/show.tmpl index 379e15536..c2bd0744d 100755 --- a/templates/repo/cloudbrain/show.tmpl +++ b/templates/repo/cloudbrain/show.tmpl @@ -492,7 +492,7 @@ td, th { let podEventArray = podEvents[task0]; if(podEventArray != null){ for(var i=0; i < podEventArray.length;i++){ - html +="

[" +podEventArray[i]["reason"] + "]

"; + html +="

[" +podEventArray[i]["reason"] + "]

"; html +="

" +podEventArray[i]["message"] + "

"; html +="

" +podEventArray[i]["action"] + "

"; } @@ -500,7 +500,7 @@ td, th { let extras= jsonObj["extras"]; if(extras != null){ for(var i=0; i < extras.length;i++){ - html +="

[" +extras[i]["reason"] + "]

"; + html +="

[" +extras[i]["reason"] + "]

"; html +="

" +extras[i]["message"] + "

"; html +="

" +extras[i]["action"] + "

"; } From 5bda2a741365109251aa679fc30c5ce703b2be88 Mon Sep 17 00:00:00 2001 From: zouap Date: Mon, 11 Apr 2022 15:13:17 +0800 Subject: [PATCH 27/28] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E5=86=B2=E7=AA=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: zouap --- public/home/search.js | 26 -------------------------- 1 file changed, 26 deletions(-) diff --git a/public/home/search.js b/public/home/search.js index 8a8e940cb..e23d27549 100644 --- a/public/home/search.js +++ b/public/home/search.js @@ -129,32 +129,6 @@ function search(){ } } -function parseLog(){ - let jsonValue = document.getElementById("json_value").value; - let jsonObj = JSON.parse(jsonValue); - let podRoleName = jsonObj["podRoleName"]; - let html = ""; - if (podRoleName != null){ - let task0 = podRoleName["task1-0"]; - let podEvents = jsonObj["podEvents"]; - let podEventArray = podEvents[task0]; - if(podEventArray != null){ - for(int i=0; i < podEventArray.length;i++){ - html +="

" +podEventArray[i]["reason"] + "

"; - html +="

" +podEventArray[i]["message"] + "

"; - html +="

" +podEventArray[i]["action"] + "

"; - } - } - let extras= jsonObj["extras"]; - if(extras != null){ - html +="

" +extras["reason"] + "

"; - html +="

" +extras["message"] + "

"; - html +="

" +extras["action"] + "

"; - } - document.getElementById("info_display").innerHTML=html; - } - } - function emptySearch(){ initDiv(false); initPageInfo(); From 6f62ee768c18aa60a1acbd4f7890f2e75781dd1a Mon Sep 17 00:00:00 2001 From: zouap Date: Mon, 11 Apr 2022 15:15:34 +0800 Subject: [PATCH 28/28] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E5=86=B2=E7=AA=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: zouap --- web_src/less/openi.less | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/web_src/less/openi.less b/web_src/less/openi.less index bdadf559f..c59416cf0 100644 --- a/web_src/less/openi.less +++ b/web_src/less/openi.less @@ -935,13 +935,8 @@ display: block; color: red; } - .ui.list .list>.item>img.image+.contentnew, .ui.list>.item>img.image+.contentnew { - width: calc(100%-10em); - margin-left: 0; - } - .ui.list .list>.item>img.image+.content, .ui.list>.item>img.image+.content { - width: calc(100%-4.0em); + width: calc(100% - 4.0em); margin-left: 0; }