From c1be811954b65350fc4319fc7f537ce4ed60980f Mon Sep 17 00:00:00 2001 From: zhoupzh Date: Tue, 2 Nov 2021 16:52:32 +0800 Subject: [PATCH 01/34] fix issue #497 --- templates/repo/view_file.tmpl | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/templates/repo/view_file.tmpl b/templates/repo/view_file.tmpl index 1216b5f40..7c98420d9 100644 --- a/templates/repo/view_file.tmpl +++ b/templates/repo/view_file.tmpl @@ -34,6 +34,21 @@ {{end}} + + {{if .ReadmeInList}} +
+
+ {{if .Repository.CanEnableEditor}} + {{if .CanEditFile}} + {{svg "octicon-pencil" 16}} + {{else}} + {{svg "octicon-pencil" 16}} + {{end}} + {{end}} +
+
+ {{end}} + {{if not .ReadmeInList}}
From ad2831e81a653e3cc554281eb45d5569262adc05 Mon Sep 17 00:00:00 2001 From: zhoupzh Date: Tue, 2 Nov 2021 17:45:29 +0800 Subject: [PATCH 02/34] fix issue --- templates/repo/view_file.tmpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/repo/view_file.tmpl b/templates/repo/view_file.tmpl index 7c98420d9..60777b5dd 100644 --- a/templates/repo/view_file.tmpl +++ b/templates/repo/view_file.tmpl @@ -63,7 +63,7 @@ {{.i18n.Tr "repo.file_history"}}
{{if .Repository.CanEnableEditor}} - {{if .CanEditFile}} + {{.CanEditFile}}{{if .CanEditFile}} {{svg "octicon-pencil" 16}} {{else}} {{svg "octicon-pencil" 16}} From 99f4bc4958733cbaaca20c548760f66fbf9f509f Mon Sep 17 00:00:00 2001 From: zhoupzh Date: Wed, 3 Nov 2021 11:21:22 +0800 Subject: [PATCH 03/34] fix issue --- public/img/git-logo.svg | 33 +++++++++++++++++++++++++++++++++ templates/base/head_navbar.tmpl | 8 ++++++++ 2 files changed, 41 insertions(+) create mode 100644 public/img/git-logo.svg diff --git a/public/img/git-logo.svg b/public/img/git-logo.svg new file mode 100644 index 000000000..c006bc090 --- /dev/null +++ b/public/img/git-logo.svg @@ -0,0 +1,33 @@ + + + + + + + + + + + + + + + + + diff --git a/templates/base/head_navbar.tmpl b/templates/base/head_navbar.tmpl index c22cb9fa7..57df408c9 100755 --- a/templates/base/head_navbar.tmpl +++ b/templates/base/head_navbar.tmpl @@ -7,6 +7,14 @@
+
+
+ + + +
+ + {{if .IsSigned}} {{.i18n.Tr "index"}} From 9538871d6e1bab29f4789fd0d2b14a5eda3a94df Mon Sep 17 00:00:00 2001 From: zhoupzh Date: Wed, 3 Nov 2021 17:45:51 +0800 Subject: [PATCH 04/34] change logo.svg --- public/img/git-logo.svg | 60 +++++++++++++++++++++++------------------ 1 file changed, 34 insertions(+), 26 deletions(-) diff --git a/public/img/git-logo.svg b/public/img/git-logo.svg index c006bc090..70e6ab484 100644 --- a/public/img/git-logo.svg +++ b/public/img/git-logo.svg @@ -1,33 +1,41 @@ + viewBox="0 0 96 17.3" style="enable-background:new 0 0 96 17.3;" xml:space="preserve"> - - - - - - - - - - - + + + + + + + From 0137f56d9920b91554801bbce7d6beb5d2e26418 Mon Sep 17 00:00:00 2001 From: zhoupzh Date: Thu, 4 Nov 2021 11:00:10 +0800 Subject: [PATCH 05/34] fix issue #596 --- options/locale/locale_en-US.ini | 1 + options/locale/locale_zh-CN.ini | 1 + templates/repo/header.tmpl | 95 +++++++++++++++++++++++---------- 3 files changed, 70 insertions(+), 27 deletions(-) diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini index 7fa8c7a4f..da43279f8 100644 --- a/options/locale/locale_en-US.ini +++ b/options/locale/locale_en-US.ini @@ -755,6 +755,7 @@ unit_disabled = The site administrator has disabled this repository section. language_other = Other datasets = Datasets datasets.desc = Enable Dataset +cloudbrain_helper=Use GPU/NPU resources to open notebooks, model training tasks, etc. debug=Debug stop=Stop diff --git a/options/locale/locale_zh-CN.ini b/options/locale/locale_zh-CN.ini index 81b4a8459..fffee7af8 100755 --- a/options/locale/locale_zh-CN.ini +++ b/options/locale/locale_zh-CN.ini @@ -757,6 +757,7 @@ unit_disabled=站点管理员已禁用此项目单元。 language_other=其它 datasets=数据集 datasets.desc=数据集功能 +cloudbrain_helper=使用GPU/NPU资源，开启Notebook、模型训练任务等 debug=调试 stop=停止 diff --git a/templates/repo/header.tmpl b/templates/repo/header.tmpl index c290de552..747857ce3 100755 --- a/templates/repo/header.tmpl +++ b/templates/repo/header.tmpl @@ -88,20 +88,69 @@ {{end}} +
{{if not .Repository.IsBeingCreated}}
{{if .Permission.CanRead $.UnitTypeCode}} +
- {{svg "octicon-code" 16}} {{.i18n.Tr "repo.code"}} + {{svg "octicon-code" 16}} {{.i18n.Tr "repo.code"}} +
+ {{if and (.Permission.CanRead $.UnitTypeReleases) (not .IsEmptyRepo) }} + + {{svg "octicon-tag" 16}} {{.i18n.Tr "repo.releases"}} {{.NumReleases}} + + {{end}} + {{if or (.Permission.CanRead $.UnitTypeWiki) (.Permission.CanRead $.UnitTypeExternalWiki)}} + + {{svg "octicon-book" 16}} {{.i18n.Tr "repo.wiki"}} + + {{end}} + {{if and (.Permission.CanReadAny $.UnitTypePullRequests $.UnitTypeIssues $.UnitTypeReleases) (not .IsEmptyRepo)}} + + {{svg "octicon-pulse" 16}} {{.i18n.Tr "repo.activity"}} + + {{end}} +
+
+ {{end}} + - {{if .Permission.CanRead $.UnitTypeDatasets}} - - {{svg "octicon-inbox" 16}} {{.i18n.Tr "datasets"}} - - {{end}} {{if .Permission.CanRead $.UnitTypeIssues}} @@ -109,11 +158,11 @@ {{end}} - {{if .Permission.CanRead $.UnitTypeExternalTracker}} + {{if and .Repository.CanEnablePulls (.Permission.CanRead $.UnitTypePullRequests)}} @@ -121,35 +170,22 @@ {{end}} - {{if and (.Permission.CanRead $.UnitTypeReleases) (not .IsEmptyRepo) }} - - {{svg "octicon-tag" 16}} {{.i18n.Tr "repo.releases"}} {{.NumReleases}} + {{if .Permission.CanRead $.UnitTypeDatasets}} + + {{svg "octicon-inbox" 16}} {{.i18n.Tr "datasets"}} {{end}} - - {{if or (.Permission.CanRead $.UnitTypeWiki) (.Permission.CanRead $.UnitTypeExternalWiki)}} - - {{svg "octicon-book" 16}} {{.i18n.Tr "repo.wiki"}} - - {{end}} - - {{if and (.Permission.CanReadAny $.UnitTypePullRequests $.UnitTypeIssues $.UnitTypeReleases) (not .IsEmptyRepo)}} - - {{svg "octicon-pulse" 16}} {{.i18n.Tr "repo.activity"}} - - {{end}} - {{if .Permission.CanRead $.UnitTypeCloudBrain}} - {{svg "octicon-server" 16}} {{.i18n.Tr "repo.cloudbrain"}} + {{svg "octicon-server" 16}} {{.i18n.Tr "repo.cloudbrain"}} {{end}} - {{if .IsSigned}} + {{template "custom/extra_tabs" .}} @@ -243,4 +279,9 @@ window.location.href = repolink + "/datasets?type=" + checked_radio }) }) + $('.question.circle.icon').hover(function(){ + $(this).popup('show') + $('.ui.popup.mini.top.center').css({"border-color":'rgba(50, 145, 248, 100)',"color":"rgba(3, 102, 214, 100)","border-radius":"5px"}) + }); + \ No newline at end of file From 0225e11724b24ff500a3ecb2a148a4a8f2a450aa Mon Sep 17 00:00:00 2001 From: zhoupzh Date: Thu, 4 Nov 2021 15:32:23 +0800 Subject: [PATCH 06/34] fix issue --- templates/repo/activity.tmpl | 16 ++++++++-- templates/repo/header.tmpl | 50 ++++---------------------------- templates/repo/release/list.tmpl | 6 +++- templates/repo/wiki/start.tmpl | 7 +++++ templates/repo/wiki/view.tmpl | 10 ++++++- web_src/less/openi.less | 31 ++++++++++++++++++++ 6 files changed, 71 insertions(+), 49 deletions(-) diff --git a/templates/repo/activity.tmpl b/templates/repo/activity.tmpl index 41f6be643..58da09e90 100644 --- a/templates/repo/activity.tmpl +++ b/templates/repo/activity.tmpl @@ -2,8 +2,18 @@
{{template "repo/header" .}}
-

{{.DateFrom}} - {{.DateUntil}} -
+
+
+
+ {{.i18n.Tr "repo.code"}} +
/
+
{{.i18n.Tr "repo.activity"}}
+
+
+
+ {{.DateFrom}} - {{.DateUntil}} +
+
@@ -23,7 +33,7 @@
-

+
{{if (or (.Permission.CanRead $.UnitTypeIssues) (.Permission.CanRead $.UnitTypePullRequests))}} diff --git a/templates/repo/header.tmpl b/templates/repo/header.tmpl index 747857ce3..6dc4d8ee5 100755 --- a/templates/repo/header.tmpl +++ b/templates/repo/header.tmpl @@ -88,63 +88,25 @@
{{end}} -
{{if not .Repository.IsBeingCreated}}
{{if .Permission.CanRead $.UnitTypeCode}}
- + {{svg "octicon-code" 16}} {{.i18n.Tr "repo.code"}}
- {{if and (.Permission.CanRead $.UnitTypeReleases) (not .IsEmptyRepo) }} - + {{svg "octicon-tag" 16}} {{.i18n.Tr "repo.releases"}} {{.NumReleases}} - {{end}} - {{if or (.Permission.CanRead $.UnitTypeWiki) (.Permission.CanRead $.UnitTypeExternalWiki)}} - + {{svg "octicon-book" 16}} {{.i18n.Tr "repo.wiki"}} - {{end}} - {{if and (.Permission.CanReadAny $.UnitTypePullRequests $.UnitTypeIssues $.UnitTypeReleases) (not .IsEmptyRepo)}} - + {{svg "octicon-pulse" 16}} {{.i18n.Tr "repo.activity"}} - - {{end}} + +
diff --git a/templates/repo/release/list.tmpl b/templates/repo/release/list.tmpl index d0b160a1c..59f076f02 100644 --- a/templates/repo/release/list.tmpl +++ b/templates/repo/release/list.tmpl @@ -4,7 +4,11 @@
{{template "base/alert" .}}

- {{.i18n.Tr "repo.release.releases"}} +
+ {{.i18n.Tr "repo.code"}} +
/
+
{{.i18n.Tr "repo.releases"}}
+
{{if .CanCreateRelease}}
diff --git a/templates/repo/wiki/start.tmpl b/templates/repo/wiki/start.tmpl index d8de0fcb7..78b1ddafc 100644 --- a/templates/repo/wiki/start.tmpl +++ b/templates/repo/wiki/start.tmpl @@ -2,6 +2,13 @@
{{template "repo/header" .}}
+

+
+ {{.i18n.Tr "repo.code"}} +
/
+
{{.i18n.Tr "repo.wiki"}}
+
+

{{svg "octicon-book" 32}}

{{.i18n.Tr "repo.wiki.welcome"}}

diff --git a/templates/repo/wiki/view.tmpl b/templates/repo/wiki/view.tmpl index e9d02d508..ea132e3ac 100644 --- a/templates/repo/wiki/view.tmpl +++ b/templates/repo/wiki/view.tmpl @@ -3,6 +3,14 @@ {{template "repo/header" .}} {{ $title := .title}}
+

+
+ {{.i18n.Tr "repo.code"}} +
/
+
{{.i18n.Tr "repo.wiki"}}
+
+

+
@@ -28,7 +36,7 @@
-
+
{{if not $.DisableHTTP}}