diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini index d29740037..a722ea671 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 bcc8a2ef6..e89c3dcde 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/routers/org/members.go b/routers/org/members.go old mode 100644 new mode 100755 diff --git a/routers/repo/view.go b/routers/repo/view.go old mode 100644 new mode 100755 index 9477b27dd..f85ab07cf --- a/routers/repo/view.go +++ b/routers/repo/view.go @@ -243,6 +243,11 @@ func renderDirectory(ctx *context.Context, treeLink string) { ctx.Data["ReadmeInList"] = true ctx.Data["ReadmeExist"] = true ctx.Data["FileIsSymlink"] = readmeFile.isSymlink + ctx.Data["ReadmeName"] = readmeFile.name + + if ctx.Repo.CanEnableEditor() { + ctx.Data["CanEditFile"] = true + } dataRc, err := readmeFile.blob.DataAsync() if err != nil { diff --git a/routers/routes/routes.go b/routers/routes/routes.go index a78a354cf..a4b8f8aa1 100755 --- a/routers/routes/routes.go +++ b/routers/routes/routes.go @@ -615,6 +615,11 @@ func RegisterRoutes(m *macaron.Macaron) { //reqRepoBlockChainWriter := context.RequireRepoWriter(models.UnitTypeBlockChain) // ***** START: Organization ***** + m.Group("/org", func() { + m.Group("/:org", func() { + m.Get("/members", org.Members) + }, context.OrgAssignment()) + }) m.Group("/org", func() { m.Group("", func() { m.Get("/create", org.Create) @@ -625,7 +630,7 @@ func RegisterRoutes(m *macaron.Macaron) { m.Get("/dashboard", user.Dashboard) m.Get("/^:type(issues|pulls)$", user.Issues) m.Get("/milestones", reqMilestonesDashboardPageEnabled, user.Milestones) - m.Get("/members", org.Members) + //m.Get("/members", org.Members) m.Post("/members/action/:action", org.MembersAction) m.Get("/teams", org.Teams) diff --git a/templates/org/home.tmpl b/templates/org/home.tmpl old mode 100644 new mode 100755 index a81e8ac17..ad5a8e02d --- a/templates/org/home.tmpl +++ b/templates/org/home.tmpl @@ -38,11 +38,12 @@

{{.i18n.Tr "org.people"}} - {{if .IsOrganizationMember}} -
- {{.Org.NumMembers}} {{svg "octicon-chevron-right" 16}} -
- {{end}} +
+ {{.Org.NumMembers}} {{svg "octicon-chevron-right" 16}} +
+ + +

{{$isMember := .IsOrganizationMember}} diff --git a/templates/org/navber.tmpl b/templates/org/navber.tmpl index 9ff92845e..7bb2ff69c 100755 --- a/templates/org/navber.tmpl +++ b/templates/org/navber.tmpl @@ -3,10 +3,10 @@ {{svg "octicon-home" 16}} {{$.i18n.Tr "org.home"}} + + {{svg "octicon-organization" 16}} {{$.i18n.Tr "org.people"}} + {{if or ($.IsOrganizationMember) ($.IsOrganizationOwner)}} - - {{svg "octicon-organization" 16}} {{$.i18n.Tr "org.people"}} - {{svg "octicon-jersey" 16}} {{$.i18n.Tr "org.teams"}} @@ -23,10 +23,10 @@ {{svg "octicon-home" 16}} {{$.i18n.Tr "org.home"}} {{end}} + + {{svg "octicon-organization" 16}} {{$.i18n.Tr "org.people"}} + {{if or ($.IsOrganizationMember) ($.IsOrganizationOwner)}} - - {{svg "octicon-organization" 16}} {{$.i18n.Tr "org.people"}} - {{svg "octicon-jersey" 16}} {{$.i18n.Tr "org.teams"}} 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 c290de552..6dc4d8ee5 100755 --- a/templates/repo/header.tmpl +++ b/templates/repo/header.tmpl @@ -92,16 +92,27 @@ {{if not .Repository.IsBeingCreated}}
{{if .Permission.CanRead $.UnitTypeCode}} - - {{svg "octicon-code" 16}} {{.i18n.Tr "repo.code"}} +
+ + {{svg "octicon-code" 16}} {{.i18n.Tr "repo.code"}} - {{end}} +
+ + {{svg "octicon-tag" 16}} {{.i18n.Tr "repo.releases"}} {{.NumReleases}} + + + {{svg "octicon-book" 16}} {{.i18n.Tr "repo.wiki"}} + + + {{svg "octicon-pulse" 16}} {{.i18n.Tr "repo.activity"}} + - {{if .Permission.CanRead $.UnitTypeDatasets}} - - {{svg "octicon-inbox" 16}} {{.i18n.Tr "datasets"}} - +
+
+ {{end}} + + {{if .Permission.CanRead $.UnitTypeIssues}} @@ -109,11 +120,11 @@ {{end}} - {{if .Permission.CanRead $.UnitTypeExternalTracker}} + {{if and .Repository.CanEnablePulls (.Permission.CanRead $.UnitTypePullRequests)}} @@ -121,35 +132,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 +241,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 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/view_file.tmpl b/templates/repo/view_file.tmpl old mode 100644 new mode 100755 index 1216b5f40..a0cae31f3 --- 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}}
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}}