From 4e3e88c8ff4d9b532f392a138ce86db9fa1ea5dc Mon Sep 17 00:00:00 2001 From: OpenIhu Date: Wed, 15 Sep 2021 11:28:16 +0800 Subject: [PATCH 01/14] =?UTF-8?q?=E5=9C=A8=E7=94=A8=E6=88=B7=E4=B8=AA?= =?UTF-8?q?=E4=BA=BA=E4=B8=AD=E5=BF=83=E9=9A=90=E8=97=8F=E7=83=AD=E9=97=A8?= =?UTF-8?q?=E5=8F=8A=E6=B4=BB=E8=B7=83Tab?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- templates/explore/repo_list.tmpl | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/templates/explore/repo_list.tmpl b/templates/explore/repo_list.tmpl index decce4fbe..79c301ef7 100755 --- a/templates/explore/repo_list.tmpl +++ b/templates/explore/repo_list.tmpl @@ -39,6 +39,7 @@
+ {{if .IsLandingPageExplore}} 活跃{{.i18n.Tr "explore.repos"}} - + {{end}}
- {{if .IsLandingPageExplore}} + {{if .PageIsExplore}}
{{end}} {{if $.Permission.CanWrite $.UnitTypeDatasets}} - {{if $.Repository.IsPrivate}} + {{if (not .CanDel) or $.Repository.IsPrivate}}
{{$.i18n.Tr "dataset.private"}}
@@ -45,7 +45,7 @@
{{end}} -
+
{{$.i18n.Tr "dataset.delete"}}
{{end}} From 1d38b8a8acc3638acf7835e4e1f465920a62dc35 Mon Sep 17 00:00:00 2001 From: zhoupzh Date: Thu, 23 Sep 2021 15:51:35 +0800 Subject: [PATCH 06/14] fix #437 --- public/self/js/Director/detection.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/public/self/js/Director/detection.js b/public/self/js/Director/detection.js index 5bd98d1c2..b165e0ddc 100644 --- a/public/self/js/Director/detection.js +++ b/public/self/js/Director/detection.js @@ -712,7 +712,7 @@ function loadimg(){ reset_var(); var picturePath = labeltastresult[fileindex].pic_image_field; img.src = ip + "/getgiteaimage?filename=" + picturePath; - console.log("picturePath",picturePath) + var picIndex = picturePath.indexOf("/",70); if(picIndex != -1){ @@ -721,8 +721,8 @@ function loadimg(){ }else{ float_text_name = picturePath.substring(picturePath.lastIndexOf("/") + 1) } - console.log("float_text_name",float_text_name) - var html = float_text_name + "  "+ "(" + (tablePageData.current * pageSize + fileindex + 1) + "/" + tablePageData.total + ")" + + var html = float_text_name + "    "+ "(" + (tablePageData.current * pageSize + fileindex + 1) + "/" + tablePageData.total + ")" document.getElementById("float_text").innerHTML = html; } function save(){ From b2b217fa098704c895dc76a859c8ecdcb5b170d5 Mon Sep 17 00:00:00 2001 From: zhoupzh Date: Thu, 23 Sep 2021 16:08:12 +0800 Subject: [PATCH 07/14] test canvas size --- public/self/js/Director/detection.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/public/self/js/Director/detection.js b/public/self/js/Director/detection.js index b165e0ddc..c822d7515 100644 --- a/public/self/js/Director/detection.js +++ b/public/self/js/Director/detection.js @@ -2853,8 +2853,8 @@ function isJSON(str) { img.onload = function(){ loadFinished = false; // 初始设置画布大小，最大值宽和高 - canvas.width = maxWidth;//document.getElementById("tool0").offsetWidth; - canvas.height = maxHeight;//document.getElementById("tool0").offsetWidth/1280*720; + canvas.width = img.width;// maxWidth document.getElementById("tool0").offsetWidth; + canvas.height =img.height;//maxHeight document.getElementById("tool0").offsetWidth/1280*720; //调整画布大小 if ((img.width/img.height)<(canvas.width/canvas.height)){ canvas.width=canvas.height * img.width / img.height; From de13787e41f67175de9ff5f72a13f294b5082033 Mon Sep 17 00:00:00 2001 From: lewis <747342561@qq.com> Date: Thu, 23 Sep 2021 16:21:02 +0800 Subject: [PATCH 08/14] mod job detail --- templates/repo/cloudbrain/show.tmpl | 18 +----------------- 1 file changed, 1 insertion(+), 17 deletions(-) diff --git a/templates/repo/cloudbrain/show.tmpl b/templates/repo/cloudbrain/show.tmpl index fe4ec7ab3..842f629c9 100755 --- a/templates/repo/cloudbrain/show.tmpl +++ b/templates/repo/cloudbrain/show.tmpl @@ -24,22 +24,6 @@ 状态 {{.State}} - - 开始时间 - {{.StartTime}} - - - 结束时间 - {{.FinishedTime}} - - - ExitCode - {{.ExitCode}} - - - 退出信息 - {{.ExitDiagnostics| nl2br}} - {{end}} @@ -73,7 +57,7 @@ - 状态 + 平台 {{.Platform}} From ae4f8910c2980df6af326378bf67a018daf14343 Mon Sep 17 00:00:00 2001 From: zhoupzh Date: Thu, 23 Sep 2021 17:39:54 +0800 Subject: [PATCH 09/14] fix the image size over the canvas --- public/self/js/Director/detection.js | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/public/self/js/Director/detection.js b/public/self/js/Director/detection.js index c822d7515..361c9b60a 100644 --- a/public/self/js/Director/detection.js +++ b/public/self/js/Director/detection.js @@ -2856,11 +2856,17 @@ function isJSON(str) { canvas.width = img.width;// maxWidth document.getElementById("tool0").offsetWidth; canvas.height =img.height;//maxHeight document.getElementById("tool0").offsetWidth/1280*720; //调整画布大小 - if ((img.width/img.height)<(canvas.width/canvas.height)){ - canvas.width=canvas.height * img.width / img.height; + // if ((img.width/img.height)>(maxWidth/maxWidth)){ + // canvas.width=canvas.height * img.width / img.height; + // } + // else{ + // canvas.height=canvas.width * img.height / img.width; + // } + if(canvas.width>maxWidth){ + canvas.width = maxWidth } - else{ - canvas.height=canvas.width * img.height / img.width; + if(canvas.height>maxHeight){ + canvas.height=maxHeight } maxIdNum=0; From 861d75c2fe4de32b8f17f1bdf007c513ee3afd8c Mon Sep 17 00:00:00 2001 From: OpenIhu Date: Thu, 23 Sep 2021 17:40:40 +0800 Subject: [PATCH 10/14] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=BB=BB=E5=8A=A1#291?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- web_src/less/_organization.less | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/web_src/less/_organization.less b/web_src/less/_organization.less index 5a72017c2..e7ce91034 100644 --- a/web_src/less/_organization.less +++ b/web_src/less/_organization.less @@ -79,9 +79,11 @@ &.profile { .members { .ui.avatar { - width: 48px; - height: 48px; + width: 44px; + height: 44px; margin-right: 5px; + margin-bottom: 5px; + border-radius: 22px; } } } From 0708f715cb8fbdc75b02b92d97d81ab13a393242 Mon Sep 17 00:00:00 2001 From: OpenIhu Date: Thu, 23 Sep 2021 17:49:50 +0800 Subject: [PATCH 11/14] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E4=BB=BB=E5=8A=A1#329?= =?UTF-8?q?=EF=BC=8C=E4=BE=9D=E8=B5=96=E4=BB=BB=E5=8A=A1=E9=80=89=E6=8B=A9?= =?UTF-8?q?=E6=A1=86=E8=A1=8C=E9=AB=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- web_src/less/_repository.less | 2 ++ 1 file changed, 2 insertions(+) diff --git a/web_src/less/_repository.less b/web_src/less/_repository.less index 0ffe8d0ee..d3859da11 100644 --- a/web_src/less/_repository.less +++ b/web_src/less/_repository.less @@ -2764,6 +2764,8 @@ tbody.commit-list { .text { width: 100%; overflow: hidden; + height: 36px; + line-height: 36px; } } From 32fed97c7dcb7b38f20f82c728b14331e8579c2b Mon Sep 17 00:00:00 2001 From: zhoupzh Date: Thu, 23 Sep 2021 17:50:27 +0800 Subject: [PATCH 12/14] fix the image size over the canvas --- public/self/js/Director/detection.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/self/js/Director/detection.js b/public/self/js/Director/detection.js index 361c9b60a..a853cd076 100644 --- a/public/self/js/Director/detection.js +++ b/public/self/js/Director/detection.js @@ -2676,7 +2676,7 @@ function setPage(pageData,pageSize){ canvas = document.getElementById("myCanvas"); context = canvas.getContext("2d"); - maxWidth = document.getElementById("showPic").offsetWidth; + maxWidth = document.getElementById("showPic").offsetWidth-56; maxHeight = document.getElementById("showPic").offsetHeight-100; canvas.width = maxWidth; canvas.height = maxHeight; From a7e9ad1397b655b707aa7883a3ef155b34a81c67 Mon Sep 17 00:00:00 2001 From: OpenIhu Date: Thu, 23 Sep 2021 18:00:09 +0800 Subject: [PATCH 13/14] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E4=BB=BB=E5=8A=A1#357?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- templates/repo/create.tmpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/repo/create.tmpl b/templates/repo/create.tmpl index fa60e674a..ddf887b51 100644 --- a/templates/repo/create.tmpl +++ b/templates/repo/create.tmpl @@ -1,5 +1,5 @@ {{template "base/head" .}} -
+
From 1936e86a89f2260f907e25433ecf1d1392d7eb7a Mon Sep 17 00:00:00 2001 From: zhoupzh Date: Fri, 24 Sep 2021 10:26:34 +0800 Subject: [PATCH 14/14] fix create cloudbrain button --- templates/repo/cloudbrain/new.tmpl | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/templates/repo/cloudbrain/new.tmpl b/templates/repo/cloudbrain/new.tmpl index 2e098f862..c45776b89 100755 --- a/templates/repo/cloudbrain/new.tmpl +++ b/templates/repo/cloudbrain/new.tmpl @@ -258,9 +258,10 @@ $('#messageInfo p').text(str) return false } - if(!value_image || !value_data){ - return false - } + // if(!value_image || !value_data){ + // console.log("------------------------") + // return false + // } let min_value_task = value_task.toLowerCase() $("input[name='job_name']").attr("value",min_value_task) document.getElementById("mask").style.display = "block"