From 35d21b2712a8ef6f000e0cb4dba9c9f0223f81b7 Mon Sep 17 00:00:00 2001 From: yp05327 <576951401@qq.com> Date: Mon, 6 Nov 2023 08:52:49 +0000 Subject: [PATCH 01/34] first change --- modules/context/repo.go | 10 + options/locale/locale_en-US.ini | 7 + routers/web/repo/view.go | 1 + templates/repo/home.tmpl | 278 +++++++++++++------------- templates/repo/sidebar/repo_info.tmpl | 60 ++++++ web_src/css/repo.css | 49 +++++ 6 files changed, 267 insertions(+), 138 deletions(-) create mode 100644 templates/repo/sidebar/repo_info.tmpl diff --git a/modules/context/repo.go b/modules/context/repo.go index 9efa2ab3c0827..adffe0b1c61b6 100644 --- a/modules/context/repo.go +++ b/modules/context/repo.go @@ -553,6 +553,16 @@ func RepoAssignment(ctx *Context) context.CancelFunc { ctx.ServerError("GetReleaseCountByRepoID", err) return nil } + release, err := repo_model.GetLatestReleaseByRepoID(ctx, ctx.Repo.Repository.ID) + if err != nil { + ctx.ServerError("GetLatestReleaseByRepoID", err) + return nil + } + if err = release.LoadAttributes(ctx); err != nil { + ctx.ServerError("release.LoadAttributes", err) + return nil + } + ctx.Data["LatestRelease"] = release ctx.Data["Title"] = owner.Name + "/" + repo.Name ctx.Data["Repository"] = repo diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini index a7a7a4f4c50f9..2aab3e525e80c 100644 --- a/options/locale/locale_en-US.ini +++ b/options/locale/locale_en-US.ini @@ -1053,6 +1053,13 @@ form.reach_limit_of_creation_n = The owner has already reached the limit of %d r form.name_reserved = The repository name "%s" is reserved. form.name_pattern_not_allowed = The pattern "%s" is not allowed in a repository name. +sidebar.readme = Readme +sidebar.stars = stars +sidebar.forks = forks +sidebar.watching = watching +sidebar.contributors = Contributors +latest_release = Latest + need_auth = Authorization migrate_options = Migration Options migrate_service = Migration Service diff --git a/routers/web/repo/view.go b/routers/web/repo/view.go index 4dfa01d8e2a73..38082a4e3a59b 100644 --- a/routers/web/repo/view.go +++ b/routers/web/repo/view.go @@ -1026,6 +1026,7 @@ func renderCode(ctx *context.Context) { } ctx.Data["Paths"] = paths + ctx.Data["IsHomePage"] = len(paths) == 0 ctx.Data["TreeLink"] = treeLink ctx.Data["TreeNames"] = treeNames ctx.Data["BranchLink"] = branchLink diff --git a/templates/repo/home.tmpl b/templates/repo/home.tmpl index d3f0ead729999..20c4af36f0684 100644 --- a/templates/repo/home.tmpl +++ b/templates/repo/home.tmpl @@ -4,54 +4,6 @@
{{template "base/alert" .}} {{template "repo/code/recently_pushed_new_branches" .}} - {{if and (not .HideRepoInfo) (not .IsBlame)}} -
-
- {{$description := .Repository.DescriptionHTML $.Context}} - {{if $description}}{{$description | RenderCodeBlock}}{{else if .IsRepositoryAdmin}}{{ctx.Locale.Tr "repo.no_desc"}}{{end}} - {{.Repository.Website}} -
- {{if .RepoSearchEnabled}} -
-
-
-
- - {{if .CodeIndexerUnavailable}} - {{svg "octicon-alert"}} - {{end}} - -
-
-
-
- {{end}} -
-
- {{range .Topics}}{{.Name}}{{end}} - {{if and .Permission.IsAdmin (not .Repository.IsArchived)}}{{end}} -
- {{end}} - {{if and .Permission.IsAdmin (not .Repository.IsArchived)}} -
-
-
- - {{range .Topics}} - {{/* keey the same layout as Fomantic UI generated labels */}} - {{.Name}}{{svg "octicon-x" 16 "delete icon"}} - {{end}} -
-
-
-
- - -
-
- {{end}} {{if .Repository.IsArchived}}
{{if .Repository.ArchivedUnix.IsZero}} @@ -61,105 +13,155 @@ {{end}}
{{end}} - {{template "repo/sub_menu" .}} -
-
- {{template "repo/branch_dropdown" dict "root" . "ContainerClasses" "gt-mr-2"}} - {{if and .CanCompareOrPull .IsViewBranch (not .Repository.IsArchived)}} - {{$cmpBranch := ""}} - {{if ne .Repository.ID .BaseRepo.ID}} - {{$cmpBranch = printf "%s/%s:" (.Repository.OwnerName|PathEscape) (.Repository.Name|PathEscape)}} - {{end}} - {{$cmpBranch = print $cmpBranch (.BranchName|PathEscapeSegments)}} - {{$compareLink := printf "%s/compare/%s...%s" .BaseRepo.Link (.BaseRepo.DefaultBranch|PathEscapeSegments) $cmpBranch}} - - {{svg "octicon-git-pull-request"}} - - {{end}} - - {{$n := len .TreeNames}} - {{$l := Eval $n "-" 1}} - {{if eq $n 0}} - {{ctx.Locale.Tr "repo.find_file.go_to_file"}} - {{end}} - - {{if and .CanWriteCode .IsViewBranch (not .Repository.IsMirror) (not .Repository.IsArchived) (not .IsViewFile)}} - - {{end}} + {{end}} + + {{$n := len .TreeNames}} + {{$l := Eval $n "-" 1}} + {{if eq $n 0}} + {{ctx.Locale.Tr "repo.find_file.go_to_file"}} + {{end}} - {{if and (eq $n 0) (.Repository.IsTemplate)}} - - {{ctx.Locale.Tr "repo.use_template"}} - - {{end}} - {{if ne $n 0}} - - {{StringUtils.EllipsisString .Repository.Name 30}} - {{- range $i, $v := .TreeNames -}} - / - {{- if eq $i $l -}} - {{StringUtils.EllipsisString $v 30}} - {{- else -}} - {{$p := index $.Paths $i}}{{StringUtils.EllipsisString $v 30}} - {{- end -}} - {{- end -}} - - {{end}} -
-
- - {{if eq $n 0}} -
- {{template "repo/clone_buttons" .}} - + {{end}} + + {{if and (eq $n 0) (.Repository.IsTemplate)}} + + {{ctx.Locale.Tr "repo.use_template"}} + + {{end}} + {{if ne $n 0}} + + {{StringUtils.EllipsisString .Repository.Name 30}} + {{- range $i, $v := .TreeNames -}} + / + {{- if eq $i $l -}} + {{StringUtils.EllipsisString $v 30}} + {{- else -}} + {{$p := index $.Paths $i}}{{StringUtils.EllipsisString $v 30}} + {{- end -}} + {{- end -}} + + {{end}} +
+
+ + {{if eq $n 0}} +
+ {{template "repo/clone_buttons" .}} + + {{template "repo/clone_script" .}}{{/* the script will update `.js-clone-url` and related elements */}}
- - {{template "repo/clone_script" .}}{{/* the script will update `.js-clone-url` and related elements */}} + {{template "repo/cite/cite_modal" .}} + {{end}} + {{if and (ne $n 0) (not .IsViewFile) (not .IsBlame)}} + + {{svg "octicon-history" 16 "gt-mr-3"}}{{ctx.Locale.Tr "repo.file_history"}} + + {{end}}
- {{template "repo/cite/cite_modal" .}} - {{end}} - {{if and (ne $n 0) (not .IsViewFile) (not .IsBlame)}} - - {{svg "octicon-history" 16 "gt-mr-3"}}{{ctx.Locale.Tr "repo.file_history"}} - +
+ {{if .IsViewFile}} + {{template "repo/view_file" .}} + {{else if .IsBlame}} + {{template "repo/blame" .}} + {{else}} + {{template "repo/view_list" .}} {{end}}
+ +
+
+ {{template "repo/sidebar/repo_info" .}} + +
+
+ {{if .ReadmeExist}} +
+ + {{svg "octicon-book"}}{{ctx.Locale.Tr "repo.sidebar.readme"}} + +
+ {{end}} +
+ {{svg "octicon-star"}}{{CountFmt .Repository.NumStars}} {{ctx.Locale.Tr "repo.sidebar.stars"}} +
+
+ {{svg "octicon-repo-forked"}}{{CountFmt .Repository.NumForks}} {{ctx.Locale.Tr "repo.sidebar.forks"}} +
+
+ {{svg "octicon-eye"}}{{CountFmt .Repository.NumWatches}} {{ctx.Locale.Tr "repo.sidebar.watching"}} +
+
+
+ + {{if .LatestRelease}} +
+
+
+ + {{ctx.Locale.Tr "repo.releases"}} + + {{CountFmt .NumReleases}} +
+
+ + {{svg "octicon-tag" 16 "gt-mr-2"}}{{.LatestRelease.TagName}} + + {{ctx.Locale.Tr "repo.latest_release"}} +
+
+
+ {{end}} +
+
- {{if .IsViewFile}} - {{template "repo/view_file" .}} - {{else if .IsBlame}} - {{template "repo/blame" .}} - {{else}} - {{template "repo/view_list" .}} - {{end}} {{template "base/footer" .}} diff --git a/templates/repo/sidebar/repo_info.tmpl b/templates/repo/sidebar/repo_info.tmpl new file mode 100644 index 0000000000000..e02d614140312 --- /dev/null +++ b/templates/repo/sidebar/repo_info.tmpl @@ -0,0 +1,60 @@ +{{if and (not .HideRepoInfo) (not .IsBlame)}} +
+
+
+ {{ctx.Locale.Tr "repo.repo_desc"}} +
+
+
+
+ {{$description := .Repository.DescriptionHTML $.Context}} + {{if $description}}{{$description | RenderCodeBlock}}{{else if .IsRepositoryAdmin}}{{ctx.Locale.Tr "repo.no_desc"}}{{end}} + {{.Repository.Website}} +
+ + {{if .RepoSearchEnabled}} +
+
+
+
+ + {{if .CodeIndexerUnavailable}} + {{svg "octicon-alert"}} + {{end}} + +
+
+
+
+ {{end}} +
+
+
+
+ {{range .Topics}}{{.Name}}{{end}} + {{if and .Permission.IsAdmin (not .Repository.IsArchived)}}{{end}} +
+ {{if and .Permission.IsAdmin (not .Repository.IsArchived)}} +
+
+
+ + {{range .Topics}} + {{/* keey the same layout as Fomantic UI generated labels */}} + {{.Name}}{{svg "octicon-x" 16 "delete icon"}} + {{end}} +
+
+
+
+ + +
+
+ {{end}} +
+
+
+{{end}} \ No newline at end of file diff --git a/web_src/css/repo.css b/web_src/css/repo.css index e4995d42298b6..0179c4472690b 100644 --- a/web_src/css/repo.css +++ b/web_src/css/repo.css @@ -106,6 +106,51 @@ white-space: nowrap; } +.repo-content { + display: flex; + align-items: flex-start; + gap: 16px; +} + +@media (max-width: 767.98px) { + .repo-content { + flex-direction: column; + } +} + +.repo-content-main[data-home="true"] { + margin: 0 !important; + width: calc(100% - 316px); +} + +.repo-content-main[data-home="false"] { + margin: 0 !important; + width: 100%; +} + +@media (max-width: 767.98px) { + .repo-content-main[data-home="true"] { + margin: 0 !important; + width: 100%; + } +} + +.repo-content-sidebar[data-home="true"] { + margin: 0 !important; + width: 300px; +} + +.repo-content-sidebar[data-home="false"] { + display: none; +} + +@media (max-width: 767.98px) { + .repo-content-sidebar[data-home="true"] { + margin: 0 !important; + width: 100%; + } +} + .repository .header-wrapper { background-color: var(--color-header-wrapper); } @@ -3140,3 +3185,7 @@ tbody.commit-list { #cherry-pick-modal .scrolling.menu { max-height: 200px; } + +#repo-desc .description { + max-height: 150px; +} From e688cfd6d1ee9cacb91822afcf0ae64d55d22431 Mon Sep 17 00:00:00 2001 From: yp05327 <576951401@qq.com> Date: Mon, 6 Nov 2023 08:58:09 +0000 Subject: [PATCH 02/34] fix 500 error in empty repo --- modules/context/repo.go | 24 ++++++++++++++---------- 1 file changed, 14 insertions(+), 10 deletions(-) diff --git a/modules/context/repo.go b/modules/context/repo.go index adffe0b1c61b6..9252f2fc48a33 100644 --- a/modules/context/repo.go +++ b/modules/context/repo.go @@ -545,7 +545,7 @@ func RepoAssignment(ctx *Context) context.CancelFunc { ctx.ServerError("GetReleaseCountByRepoID", err) return nil } - ctx.Data["NumReleases"], err = repo_model.GetReleaseCountByRepoID(ctx, ctx.Repo.Repository.ID, repo_model.FindReleasesOptions{ + numReleases, err := repo_model.GetReleaseCountByRepoID(ctx, ctx.Repo.Repository.ID, repo_model.FindReleasesOptions{ // only show draft releases for users who can write, read-only users shouldn't see draft releases. IncludeDrafts: ctx.Repo.CanWrite(unit_model.TypeReleases), }) @@ -553,16 +553,20 @@ func RepoAssignment(ctx *Context) context.CancelFunc { ctx.ServerError("GetReleaseCountByRepoID", err) return nil } - release, err := repo_model.GetLatestReleaseByRepoID(ctx, ctx.Repo.Repository.ID) - if err != nil { - ctx.ServerError("GetLatestReleaseByRepoID", err) - return nil - } - if err = release.LoadAttributes(ctx); err != nil { - ctx.ServerError("release.LoadAttributes", err) - return nil + ctx.Data["NumReleases"] = numReleases + + if numReleases > 0 { + release, err := repo_model.GetLatestReleaseByRepoID(ctx, ctx.Repo.Repository.ID) + if err != nil { + ctx.ServerError("GetLatestReleaseByRepoID", err) + return nil + } + if err = release.LoadAttributes(ctx); err != nil { + ctx.ServerError("release.LoadAttributes", err) + return nil + } + ctx.Data["LatestRelease"] = release } - ctx.Data["LatestRelease"] = release ctx.Data["Title"] = owner.Name + "/" + repo.Name ctx.Data["Repository"] = repo From f1f0647e1ec030b4b8301c934c2a3e2c6a418431 Mon Sep 17 00:00:00 2001 From: yp05327 <576951401@qq.com> Date: Tue, 7 Nov 2023 09:11:11 +0900 Subject: [PATCH 03/34] Update templates/repo/sidebar/repo_info.tmpl Co-authored-by: silverwind --- templates/repo/sidebar/repo_info.tmpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/repo/sidebar/repo_info.tmpl b/templates/repo/sidebar/repo_info.tmpl index e02d614140312..fe8ea4b11a8c0 100644 --- a/templates/repo/sidebar/repo_info.tmpl +++ b/templates/repo/sidebar/repo_info.tmpl @@ -57,4 +57,4 @@ -{{end}} \ No newline at end of file +{{end}} From 7b27f1f83fdb3c3e25557124f90db5635e83234d Mon Sep 17 00:00:00 2001 From: yp05327 <576951401@qq.com> Date: Tue, 7 Nov 2023 05:29:08 +0000 Subject: [PATCH 04/34] fix conflicts come from #27925 --- templates/repo/sidebar/repo_info.tmpl | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/templates/repo/sidebar/repo_info.tmpl b/templates/repo/sidebar/repo_info.tmpl index fe8ea4b11a8c0..b33f4539c9db6 100644 --- a/templates/repo/sidebar/repo_info.tmpl +++ b/templates/repo/sidebar/repo_info.tmpl @@ -37,9 +37,9 @@ {{if and .Permission.IsAdmin (not .Repository.IsArchived)}}{{end}} {{if and .Permission.IsAdmin (not .Repository.IsArchived)}} -
-
-
+
+
+
{{range .Topics}} {{/* keey the same layout as Fomantic UI generated labels */}} From bc67a30868f363d10f97a93d4241b3f95b1b5939 Mon Sep 17 00:00:00 2001 From: yp05327 <576951401@qq.com> Date: Tue, 7 Nov 2023 06:38:49 +0000 Subject: [PATCH 05/34] improve latest release --- options/locale/locale_en-US.ini | 11 ++++------- templates/repo/home.tmpl | 27 ++++++++++++--------------- web_src/css/repo.css | 15 +++++++++++++++ 3 files changed, 31 insertions(+), 22 deletions(-) diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini index 2aab3e525e80c..c904d93c4c42e 100644 --- a/options/locale/locale_en-US.ini +++ b/options/locale/locale_en-US.ini @@ -141,6 +141,10 @@ confirm_delete_selected = Confirm to delete all selected items? name = Name value = Value +readme = Readme +contributors = Contributors +latest = Latest + [aria] navbar = Navigation Bar footer = Footer @@ -1053,13 +1057,6 @@ form.reach_limit_of_creation_n = The owner has already reached the limit of %d r form.name_reserved = The repository name "%s" is reserved. form.name_pattern_not_allowed = The pattern "%s" is not allowed in a repository name. -sidebar.readme = Readme -sidebar.stars = stars -sidebar.forks = forks -sidebar.watching = watching -sidebar.contributors = Contributors -latest_release = Latest - need_auth = Authorization migrate_options = Migration Options migrate_service = Migration Service diff --git a/templates/repo/home.tmpl b/templates/repo/home.tmpl index 20c4af36f0684..82482ac565b2b 100644 --- a/templates/repo/home.tmpl +++ b/templates/repo/home.tmpl @@ -120,26 +120,17 @@
{{template "repo/sidebar/repo_info" .}} + {{if .ReadmeExist}}
- {{if .ReadmeExist}}
- {{svg "octicon-book"}}{{ctx.Locale.Tr "repo.sidebar.readme"}} + {{svg "octicon-book"}}{{ctx.Locale.Tr "readme"}}
- {{end}} -
- {{svg "octicon-star"}}{{CountFmt .Repository.NumStars}} {{ctx.Locale.Tr "repo.sidebar.stars"}} -
-
- {{svg "octicon-repo-forked"}}{{CountFmt .Repository.NumForks}} {{ctx.Locale.Tr "repo.sidebar.forks"}} -
-
- {{svg "octicon-eye"}}{{CountFmt .Repository.NumWatches}} {{ctx.Locale.Tr "repo.sidebar.watching"}} -
+ {{end}} {{if .LatestRelease}}
@@ -151,10 +142,16 @@ {{CountFmt .NumReleases}}
- - {{svg "octicon-tag" 16 "gt-mr-2"}}{{.LatestRelease.TagName}} + +
+ {{svg "octicon-tag" 16}} +
+ {{.LatestRelease.TagName}} +
+ {{ctx.Locale.Tr "latest"}} +
+ {{TimeSinceUnix .LatestRelease.CreatedUnix ctx.Locale}} - {{ctx.Locale.Tr "repo.latest_release"}}
diff --git a/web_src/css/repo.css b/web_src/css/repo.css index 0179c4472690b..98101fb3d1210 100644 --- a/web_src/css/repo.css +++ b/web_src/css/repo.css @@ -151,6 +151,21 @@ } } +.latest-release { + text-decoration-line: none; + margin: 1rem; +} + +.latest-release-tag { + display: flex; + align-items: center; + gap: .5rem; +} + +.latest-release .time{ + margin-left: 1.6rem; +} + .repository .header-wrapper { background-color: var(--color-header-wrapper); } From 78e36e0f25ad5b6ec0b09ef3489abbdfebee9de3 Mon Sep 17 00:00:00 2001 From: yp05327 <576951401@qq.com> Date: Tue, 7 Nov 2023 06:49:42 +0000 Subject: [PATCH 06/34] improve readme --- templates/repo/home.tmpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/repo/home.tmpl b/templates/repo/home.tmpl index 82482ac565b2b..7f134f8e6d860 100644 --- a/templates/repo/home.tmpl +++ b/templates/repo/home.tmpl @@ -124,7 +124,7 @@
- + {{svg "octicon-book"}}{{ctx.Locale.Tr "readme"}}
From fa922772e28df75d66ae5997f7fee71f04653d5e Mon Sep 17 00:00:00 2001 From: yp05327 <576951401@qq.com> Date: Wed, 8 Nov 2023 04:28:46 +0000 Subject: [PATCH 07/34] fix conflicts come from #27924 --- templates/repo/sidebar/repo_info.tmpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/repo/sidebar/repo_info.tmpl b/templates/repo/sidebar/repo_info.tmpl index b33f4539c9db6..fe154baf305bd 100644 --- a/templates/repo/sidebar/repo_info.tmpl +++ b/templates/repo/sidebar/repo_info.tmpl @@ -5,7 +5,7 @@ {{ctx.Locale.Tr "repo.repo_desc"}}
-
+
{{$description := .Repository.DescriptionHTML $.Context}} {{if $description}}{{$description | RenderCodeBlock}}{{else if .IsRepositoryAdmin}}{{ctx.Locale.Tr "repo.no_desc"}}{{end}} From 9281a58bda95ea3ba7f4f74c64c4203fbf4532b7 Mon Sep 17 00:00:00 2001 From: yp05327 <576951401@qq.com> Date: Wed, 8 Nov 2023 04:40:05 +0000 Subject: [PATCH 08/34] move language bar to sidebar --- templates/repo/home.tmpl | 33 +++++++++++++++++++++++++++++++++ templates/repo/sub_menu.tmpl | 22 ---------------------- web_src/css/repo.css | 24 ++++++++++++++++++++++-- 3 files changed, 55 insertions(+), 24 deletions(-) diff --git a/templates/repo/home.tmpl b/templates/repo/home.tmpl index 7f134f8e6d860..c92c1a103c30f 100644 --- a/templates/repo/home.tmpl +++ b/templates/repo/home.tmpl @@ -156,6 +156,39 @@
{{end}} + + {{if and (.Permission.CanRead $.UnitTypeCode) (not .IsEmptyRepo) .LanguageStats}} +
+
+
+ {{ctx.Locale.Tr "repo.repo_lang"}} +
+ +
+
+ {{range .LanguageStats}} +
+ {{end}} +
+
+ {{range .LanguageStats}} +
+ + + {{if eq .Language "other"}} + {{ctx.Locale.Tr "repo.language_other"}} + {{else}} + {{.Language}} + {{end}} + + {{.Percentage}}% +
+ {{end}} +
+
+
+
+ {{end}}
diff --git a/templates/repo/sub_menu.tmpl b/templates/repo/sub_menu.tmpl index 8edb0c151646a..0d5515245b699 100644 --- a/templates/repo/sub_menu.tmpl +++ b/templates/repo/sub_menu.tmpl @@ -20,27 +20,5 @@ {{end}}
- {{if and (.Permission.CanRead $.UnitTypeCode) (not .IsEmptyRepo) .LanguageStats}} -
- {{range .LanguageStats}} -
- - - {{if eq .Language "other"}} - {{ctx.Locale.Tr "repo.language_other"}} - {{else}} - {{.Language}} - {{end}} - - {{.Percentage}}% -
- {{end}} -
- - {{range .LanguageStats}} -
- {{end}} - - {{end}}
{{end}} diff --git a/web_src/css/repo.css b/web_src/css/repo.css index 92259e86682ad..960083aa955c0 100644 --- a/web_src/css/repo.css +++ b/web_src/css/repo.css @@ -272,7 +272,8 @@ justify-content: space-between; align-items: center; gap: 5px; - margin-bottom: 5px; + margin-top: 1rem; + margin-bottom: 1rem; } @media (max-width: 767.98px) { @@ -2111,7 +2112,7 @@ background: var(--color-secondary); } -.repository .repository-summary .segment.language-stats { +.language-stats { display: flex; gap: 2px; padding: 0; @@ -2119,6 +2120,25 @@ white-space: nowrap; border-radius: 0 0 3px 3px !important; overflow: hidden; + width: 100%; + margin-top: 1rem; + margin-bottom: 5px; +} + +.language-stats-details { + display: flex; + flex-wrap: wrap; +} + +.language-stats-details .item { + height: 30px; + line-height: var(--line-height-default); + display: inline-block; + align-items: center; + justify-content: center; + gap: 0.25em; + padding: 0 0.5em; /* make the UI look better for narrow (mobile) view */ + text-decoration: none; } #cite-repo-modal #citation-panel { From 99a45f9941fa944b1e6423c93ad7666c798f5c04 Mon Sep 17 00:00:00 2001 From: yp05327 <576951401@qq.com> Date: Wed, 8 Nov 2023 04:42:17 +0000 Subject: [PATCH 09/34] fix citation error #27958 --- routers/web/repo/view.go | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/routers/web/repo/view.go b/routers/web/repo/view.go index 38082a4e3a59b..e1dd4ff834e9b 100644 --- a/routers/web/repo/view.go +++ b/routers/web/repo/view.go @@ -716,14 +716,11 @@ func checkCitationFile(ctx *context.Context, entry *git.TreeEntry) { return } defer dataRc.Close() - buf := make([]byte, 1024) - n, err := util.ReadAtMost(dataRc, buf) + ctx.PageData["citationFileContent"], err = blob.GetBlobContent(setting.UI.MaxDisplayFileSize) if err != nil { - ctx.ServerError("ReadAtMost", err) + ctx.ServerError("GetBlobContent", err) return } - buf = buf[:n] - ctx.PageData["citationFileContent"] = string(buf) break } } From a63947a0b81608236afb43ce028631241947a583 Mon Sep 17 00:00:00 2001 From: yp05327 <576951401@qq.com> Date: Wed, 8 Nov 2023 04:49:48 +0000 Subject: [PATCH 10/34] move citation to sidebar --- templates/repo/home.tmpl | 15 --------------- templates/repo/sidebar/repo_info.tmpl | 22 +++++++++++++++++++--- web_src/css/repo.css | 2 -- 3 files changed, 19 insertions(+), 20 deletions(-) diff --git a/templates/repo/home.tmpl b/templates/repo/home.tmpl index c92c1a103c30f..1c2f3af05b2a6 100644 --- a/templates/repo/home.tmpl +++ b/templates/repo/home.tmpl @@ -89,9 +89,6 @@ {{svg "octicon-file-zip" 16 "gt-mr-3"}}{{ctx.Locale.Tr "repo.download_zip"}} {{svg "octicon-file-zip" 16 "gt-mr-3"}}{{ctx.Locale.Tr "repo.download_tar"}} {{svg "octicon-package" 16 "gt-mr-3"}}{{ctx.Locale.Tr "repo.download_bundle"}} - {{if .CitiationExist}} - {{svg "octicon-cross-reference" 16 "gt-mr-3"}}{{ctx.Locale.Tr "repo.cite_this_repo"}} - {{end}} {{end}} {{svg "gitea-vscode" 16 "gt-mr-3"}}{{ctx.Locale.Tr "repo.clone_in_vsc"}}
@@ -119,18 +116,6 @@
{{template "repo/sidebar/repo_info" .}} - - {{if .ReadmeExist}} -
-
-
- - {{svg "octicon-book"}}{{ctx.Locale.Tr "readme"}} - -
-
-
- {{end}} {{if .LatestRelease}}
diff --git a/templates/repo/sidebar/repo_info.tmpl b/templates/repo/sidebar/repo_info.tmpl index fe154baf305bd..c43cc98071473 100644 --- a/templates/repo/sidebar/repo_info.tmpl +++ b/templates/repo/sidebar/repo_info.tmpl @@ -4,14 +4,15 @@
{{ctx.Locale.Tr "repo.repo_desc"}}
-
+ +
{{$description := .Repository.DescriptionHTML $.Context}} {{if $description}}{{$description | RenderCodeBlock}}{{else if .IsRepositoryAdmin}}{{ctx.Locale.Tr "repo.no_desc"}}{{end}} {{.Repository.Website}}
- + {{if .RepoSearchEnabled}}
@@ -31,7 +32,8 @@ {{end}}
-
+ +
{{range .Topics}}{{.Name}}{{end}} {{if and .Permission.IsAdmin (not .Repository.IsArchived)}}{{end}} @@ -55,6 +57,20 @@
{{end}}
+ + {{if .ReadmeExist}} +
+ + {{svg "octicon-book"}}{{ctx.Locale.Tr "readme"}} + +
+ {{end}} + + {{if .CitiationExist}} +
+ {{svg "octicon-cross-reference" 16 "gt-mr-3"}}{{ctx.Locale.Tr "repo.cite_this_repo"}} +
+ {{end}}
{{end}} diff --git a/web_src/css/repo.css b/web_src/css/repo.css index 960083aa955c0..fedeb5af7fe83 100644 --- a/web_src/css/repo.css +++ b/web_src/css/repo.css @@ -272,8 +272,6 @@ justify-content: space-between; align-items: center; gap: 5px; - margin-top: 1rem; - margin-bottom: 1rem; } @media (max-width: 767.98px) { From 491866888957736e3796d6d820922d3b06c1f5e0 Mon Sep 17 00:00:00 2001 From: yp05327 <576951401@qq.com> Date: Wed, 8 Nov 2023 04:54:45 +0000 Subject: [PATCH 11/34] improve --- web_src/css/repo.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web_src/css/repo.css b/web_src/css/repo.css index fedeb5af7fe83..5527703aea9ff 100644 --- a/web_src/css/repo.css +++ b/web_src/css/repo.css @@ -2131,7 +2131,7 @@ .language-stats-details .item { height: 30px; line-height: var(--line-height-default); - display: inline-block; + display: flex; align-items: center; justify-content: center; gap: 0.25em; From ff05ac90ee47d8a6e678586db78aedd1f6d791d5 Mon Sep 17 00:00:00 2001 From: yp05327 <576951401@qq.com> Date: Wed, 8 Nov 2023 05:11:39 +0000 Subject: [PATCH 12/34] remove whitespace --- templates/repo/home.tmpl | 2 +- templates/repo/sidebar/repo_info.tmpl | 6 +++--- web_src/css/helpers.css | 8 ++++++++ 3 files changed, 12 insertions(+), 4 deletions(-) diff --git a/templates/repo/home.tmpl b/templates/repo/home.tmpl index 1c2f3af05b2a6..c30f087e250bf 100644 --- a/templates/repo/home.tmpl +++ b/templates/repo/home.tmpl @@ -116,7 +116,7 @@
{{template "repo/sidebar/repo_info" .}} - + {{if .LatestRelease}}
diff --git a/templates/repo/sidebar/repo_info.tmpl b/templates/repo/sidebar/repo_info.tmpl index c43cc98071473..733845817c4ca 100644 --- a/templates/repo/sidebar/repo_info.tmpl +++ b/templates/repo/sidebar/repo_info.tmpl @@ -1,5 +1,5 @@ {{if and (not .HideRepoInfo) (not .IsBlame)}} -
+
{{ctx.Locale.Tr "repo.repo_desc"}} @@ -69,8 +69,8 @@ {{if .CitiationExist}}
{{svg "octicon-cross-reference" 16 "gt-mr-3"}}{{ctx.Locale.Tr "repo.cite_this_repo"}} -
- {{end}} +
+ {{end}}
{{end}} diff --git a/web_src/css/helpers.css b/web_src/css/helpers.css index 27b32139bae3b..75831590257cd 100644 --- a/web_src/css/helpers.css +++ b/web_src/css/helpers.css @@ -279,3 +279,11 @@ only use: * showElem/hideElem/toggleElem functions in "utils/dom.js" */ .gt-hidden { display: none !important; } + +@media (max-width: 767.98px) { + .gt-hidden-mobile { display: none !important; } +} + +@media (min-width: 767.98px) { + .gt-hidden-desktop { display: none !important; } +} \ No newline at end of file From 765a59c8360321a73e1f24952969c0925a98f386 Mon Sep 17 00:00:00 2001 From: yp05327 <576951401@qq.com> Date: Thu, 9 Nov 2023 01:50:32 +0000 Subject: [PATCH 13/34] improve UI --- templates/repo/sidebar/repo_info.tmpl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/templates/repo/sidebar/repo_info.tmpl b/templates/repo/sidebar/repo_info.tmpl index 733845817c4ca..5f54ea36167ff 100644 --- a/templates/repo/sidebar/repo_info.tmpl +++ b/templates/repo/sidebar/repo_info.tmpl @@ -33,7 +33,7 @@
-
+
{{range .Topics}}{{.Name}}{{end}} {{if and .Permission.IsAdmin (not .Repository.IsArchived)}}{{end}} @@ -59,7 +59,7 @@
{{if .ReadmeExist}} -
+
{{svg "octicon-book"}}{{ctx.Locale.Tr "readme"}} From ab22d31ab4fad2702b81c979bfd78d6d40ff5fe7 Mon Sep 17 00:00:00 2001 From: yp05327 <576951401@qq.com> Date: Thu, 9 Nov 2023 02:10:59 +0000 Subject: [PATCH 14/34] fix 500 error when get latest release --- modules/context/repo.go | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/modules/context/repo.go b/modules/context/repo.go index 9252f2fc48a33..970e6865581fb 100644 --- a/modules/context/repo.go +++ b/modules/context/repo.go @@ -557,15 +557,17 @@ func RepoAssignment(ctx *Context) context.CancelFunc { if numReleases > 0 { release, err := repo_model.GetLatestReleaseByRepoID(ctx, ctx.Repo.Repository.ID) - if err != nil { + if err != nil && !repo_model.IsErrReleaseNotExist(err) { ctx.ServerError("GetLatestReleaseByRepoID", err) return nil } - if err = release.LoadAttributes(ctx); err != nil { - ctx.ServerError("release.LoadAttributes", err) - return nil + if release != nil { + if err = release.LoadAttributes(ctx); err != nil { + ctx.ServerError("release.LoadAttributes", err) + return nil + } + ctx.Data["LatestRelease"] = release } - ctx.Data["LatestRelease"] = release } ctx.Data["Title"] = owner.Name + "/" + repo.Name From a1caf2ca93fb570160f2407e60ebadc295914d54 Mon Sep 17 00:00:00 2001 From: yp05327 <576951401@qq.com> Date: Thu, 9 Nov 2023 02:28:43 +0000 Subject: [PATCH 15/34] improve mobile view --- templates/repo/home.tmpl | 3 +- templates/repo/sidebar/repo_info.tmpl | 50 ++++++++++++++------------- web_src/css/helpers.css | 4 +-- 3 files changed, 30 insertions(+), 27 deletions(-) diff --git a/templates/repo/home.tmpl b/templates/repo/home.tmpl index c30f087e250bf..c1b4a9929f516 100644 --- a/templates/repo/home.tmpl +++ b/templates/repo/home.tmpl @@ -15,6 +15,7 @@ {{end}}
+ {{template "repo/sidebar/repo_info" dict "ctxData" . "HiddenInMobileView" false}} {{template "repo/sub_menu" .}}
@@ -115,7 +116,7 @@
- {{template "repo/sidebar/repo_info" .}} + {{template "repo/sidebar/repo_info" dict "ctxData" . "HiddenInMobileView" true}} {{if .LatestRelease}}
diff --git a/templates/repo/sidebar/repo_info.tmpl b/templates/repo/sidebar/repo_info.tmpl index 5f54ea36167ff..b82d05546d34c 100644 --- a/templates/repo/sidebar/repo_info.tmpl +++ b/templates/repo/sidebar/repo_info.tmpl @@ -1,28 +1,30 @@ -{{if and (not .HideRepoInfo) (not .IsBlame)}} -
+{{if and (not .ctxData.HideRepoInfo) (not .ctxData.IsBlame)}} +
-
- {{ctx.Locale.Tr "repo.repo_desc"}} -
+ {{if .HiddenInMobileView}} +
+ {{ctx.Locale.Tr "repo.repo_desc"}} +
+ {{end}} -
+
- {{$description := .Repository.DescriptionHTML $.Context}} - {{if $description}}{{$description | RenderCodeBlock}}{{else if .IsRepositoryAdmin}}{{ctx.Locale.Tr "repo.no_desc"}}{{end}} - {{.Repository.Website}} + {{$description := .ctxData.Repository.DescriptionHTML $.ctxData.Context}} + {{if $description}}{{$description | RenderCodeBlock}}{{else if .ctxData.IsRepositoryAdmin}}{{ctx.Locale.Tr "repo.no_desc"}}{{end}} + {{.ctxData.Repository.Website}}
- {{if .RepoSearchEnabled}} + {{if .ctxData.RepoSearchEnabled}}
- +
-
- - {{if .CodeIndexerUnavailable}} +
+ + {{if .ctxData.CodeIndexerUnavailable}} {{svg "octicon-alert"}} {{end}} -
@@ -35,15 +37,15 @@
- {{range .Topics}}{{.Name}}{{end}} - {{if and .Permission.IsAdmin (not .Repository.IsArchived)}}{{end}} + {{range .ctxData.Topics}}{{.Name}}{{end}} + {{if and .ctxData.Permission.IsAdmin (not .ctxData.Repository.IsArchived)}}{{end}}
- {{if and .Permission.IsAdmin (not .Repository.IsArchived)}} + {{if and .ctxData.Permission.IsAdmin (not .ctxData.Repository.IsArchived)}}
- - {{range .Topics}} + + {{range .ctxData.Topics}} {{/* keey the same layout as Fomantic UI generated labels */}} {{.Name}}{{svg "octicon-x" 16 "delete icon"}} {{end}} @@ -52,21 +54,21 @@
- +
{{end}}
- {{if .ReadmeExist}} + {{if and .ctxData.ReadmeExist .HiddenInMobileView}}
- + {{svg "octicon-book"}}{{ctx.Locale.Tr "readme"}}
{{end}} - {{if .CitiationExist}} + {{if .ctxData.CitiationExist}}
{{svg "octicon-cross-reference" 16 "gt-mr-3"}}{{ctx.Locale.Tr "repo.cite_this_repo"}}
diff --git a/web_src/css/helpers.css b/web_src/css/helpers.css index 75831590257cd..9cbfded6fc680 100644 --- a/web_src/css/helpers.css +++ b/web_src/css/helpers.css @@ -281,9 +281,9 @@ only use: .gt-hidden { display: none !important; } @media (max-width: 767.98px) { - .gt-hidden-mobile { display: none !important; } + .gt-hidden-in-mobile { display: none !important; } } @media (min-width: 767.98px) { - .gt-hidden-desktop { display: none !important; } + .gt-hidden-in-desktop { display: none !important; } } \ No newline at end of file From 1379c7d521314bd4fa1de513ee0bfaf58995e033 Mon Sep 17 00:00:00 2001 From: yp05327 <576951401@qq.com> Date: Wed, 29 Nov 2023 04:23:16 +0000 Subject: [PATCH 16/34] fix repo search box --- templates/base/head_navbar.tmpl | 22 +++++++++++++++++++++- templates/repo/sidebar/repo_info.tmpl | 18 ------------------ 2 files changed, 21 insertions(+), 19 deletions(-) diff --git a/templates/base/head_navbar.tmpl b/templates/base/head_navbar.tmpl index effe4dcea9f8f..be244794eb303 100644 --- a/templates/base/head_navbar.tmpl +++ b/templates/base/head_navbar.tmpl @@ -12,6 +12,9 @@
+ {{if .RepoSearchEnabled}} + {{svg "octicon-search"}} + {{end}} {{if .IsSigned}}
@@ -44,7 +47,6 @@ {{else}} {{ctx.Locale.Tr "explore"}} {{end}} - {{template "custom/extra_links" .}} {{if not .IsSigned}} @@ -54,6 +56,24 @@
+ {{if .RepoSearchEnabled}} +
+ +
+
+ + {{if .CodeIndexerUnavailable}} + {{svg "octicon-alert"}} + {{end}} + +
+
+ +
+ {{end}} + {{if and .IsSigned .MustChangePassword}}
diff --git a/templates/repo/sidebar/repo_info.tmpl b/templates/repo/sidebar/repo_info.tmpl index b82d05546d34c..630498ff252db 100644 --- a/templates/repo/sidebar/repo_info.tmpl +++ b/templates/repo/sidebar/repo_info.tmpl @@ -14,24 +14,6 @@ {{if $description}}{{$description | RenderCodeBlock}}{{else if .ctxData.IsRepositoryAdmin}}{{ctx.Locale.Tr "repo.no_desc"}}{{end}} {{.ctxData.Repository.Website}}
- - {{if .ctxData.RepoSearchEnabled}} -
-
-
-
- - {{if .ctxData.CodeIndexerUnavailable}} - {{svg "octicon-alert"}} - {{end}} - -
-
-
-
- {{end}}
From 39e6cae85ceec2540659954e2aa3196f5416a69a Mon Sep 17 00:00:00 2001 From: yp05327 <576951401@qq.com> Date: Wed, 29 Nov 2023 06:07:43 +0000 Subject: [PATCH 17/34] fix manage topic button --- templates/repo/sidebar/repo_info.tmpl | 22 +++++++++++-------- tests/integration/repo_test.go | 12 +++++++---- web_src/css/repo.css | 3 ++- web_src/js/features/citation.js | 2 +- web_src/js/features/repo-home.js | 31 +++++++++++++++++---------- web_src/js/index.js | 4 ++-- 6 files changed, 46 insertions(+), 28 deletions(-) diff --git a/templates/repo/sidebar/repo_info.tmpl b/templates/repo/sidebar/repo_info.tmpl index 630498ff252db..675f04d0980ec 100644 --- a/templates/repo/sidebar/repo_info.tmpl +++ b/templates/repo/sidebar/repo_info.tmpl @@ -1,5 +1,9 @@ +{{$viewType := "desktop"}} +{{if .HiddenInMobileView}} +{{$viewType = "mobile"}} +{{end}} {{if and (not .ctxData.HideRepoInfo) (not .ctxData.IsBlame)}} -
+
{{if .HiddenInMobileView}}
@@ -9,7 +13,7 @@
-
+
{{$description := .ctxData.Repository.DescriptionHTML $.ctxData.Context}} {{if $description}}{{$description | RenderCodeBlock}}{{else if .ctxData.IsRepositoryAdmin}}{{ctx.Locale.Tr "repo.no_desc"}}{{end}} {{.ctxData.Repository.Website}} @@ -18,15 +22,15 @@
-
+
{{range .ctxData.Topics}}{{.Name}}{{end}} - {{if and .ctxData.Permission.IsAdmin (not .ctxData.Repository.IsArchived)}}{{end}} + {{if and .ctxData.Permission.IsAdmin (not .ctxData.Repository.IsArchived)}}{{end}}
{{if and .ctxData.Permission.IsAdmin (not .ctxData.Repository.IsArchived)}} -
+
- + {{range .ctxData.Topics}} {{/* keey the same layout as Fomantic UI generated labels */}} {{.Name}}{{svg "octicon-x" 16 "delete icon"}} @@ -35,8 +39,8 @@
- - + +
{{end}} @@ -52,7 +56,7 @@ {{if .ctxData.CitiationExist}}
- {{svg "octicon-cross-reference" 16 "gt-mr-3"}}{{ctx.Locale.Tr "repo.cite_this_repo"}} + {{svg "octicon-cross-reference" 16 "gt-mr-3"}}{{ctx.Locale.Tr "repo.cite_this_repo"}}
{{end}}
diff --git a/tests/integration/repo_test.go b/tests/integration/repo_test.go index f5417b100cfef..831d79a4d039f 100644 --- a/tests/integration/repo_test.go +++ b/tests/integration/repo_test.go @@ -190,12 +190,16 @@ func TestViewAsRepoAdmin(t *testing.T) { resp := session.MakeRequest(t, req, http.StatusOK) htmlDoc := NewHTMLParser(t, resp.Body) - noDescription := htmlDoc.doc.Find("#repo-desc").Children() - repoTopics := htmlDoc.doc.Find("#repo-topics").Children() + noDescriptionMobile := htmlDoc.doc.Find("#repo-desc-mobile").Children() + repoTopicsMobile := htmlDoc.doc.Find("#repo-topics-mobile").Children() + noDescriptionDesktop := htmlDoc.doc.Find("#repo-desc-desktop").Children() + repoTopicsDesktop := htmlDoc.doc.Find("#repo-topics-desktop").Children() repoSummary := htmlDoc.doc.Find(".repository-summary").Children() - assert.Equal(t, expectedNoDescription, noDescription.HasClass("no-description")) - assert.True(t, repoTopics.HasClass("repo-topic")) + assert.Equal(t, expectedNoDescription, noDescriptionMobile.HasClass("no-description")) + assert.True(t, repoTopicsMobile.HasClass("repo-topic")) + assert.Equal(t, expectedNoDescription, noDescriptionDesktop.HasClass("no-description")) + assert.True(t, repoTopicsDesktop.HasClass("repo-topic")) assert.True(t, repoSummary.HasClass("repository-menu")) } } diff --git a/web_src/css/repo.css b/web_src/css/repo.css index 5527703aea9ff..8336a420bfb40 100644 --- a/web_src/css/repo.css +++ b/web_src/css/repo.css @@ -3227,6 +3227,7 @@ tbody.commit-list { max-height: 200px; } -#repo-desc .description { +#repo-desc-mobile .description, +#repo-desc-desktop .description { max-height: 150px; } diff --git a/web_src/js/features/citation.js b/web_src/js/features/citation.js index 65666864f6956..808411674282b 100644 --- a/web_src/js/features/citation.js +++ b/web_src/js/features/citation.js @@ -54,7 +54,7 @@ export function initCitationFileCopyContent() { $inputContent.trigger('select'); }); - $('#cite-repo-button').on('click', () => { + $('.cite-repo-button').on('click', () => { $('#cite-repo-modal').modal('show'); }); } diff --git a/web_src/js/features/repo-home.js b/web_src/js/features/repo-home.js index 3603fae2e928d..7ec2e377fa415 100644 --- a/web_src/js/features/repo-home.js +++ b/web_src/js/features/repo-home.js @@ -4,13 +4,22 @@ import {hideElem, showElem} from '../utils/dom.js'; const {appSubUrl, csrfToken} = window.config; -export function initRepoTopicBar() { - const mgrBtn = $('#manage_topic'); - if (!mgrBtn.length) return; - const editDiv = $('#topic_edit'); - const viewDiv = $('#repo-topics'); - const saveBtn = $('#save_topic'); - const topicDropdown = $('#topic_edit .dropdown'); +export function initRepoTopicBars() { + $('.manage-topic').each(function () { + const viewType = $(this).attr('data-view-type'); + if (!viewType.length) { + throw new Error('no view type defined in attributes for manage topic button'); + } + initRepoTopicBar($(this), viewType); + }); +} + +function initRepoTopicBar(mgrBtn, viewType) { + const editDiv = $(`#topic_edit_${viewType}`); + const viewDiv = $(`#repo-topics-${viewType}`); + const saveBtn = $(`#save_topic_${viewType}`); + const cancelBtn = $(`#cancel_topic_edit_${viewType}`); + const topicDropdown = $(`#topic_edit_${viewType} .dropdown`); const topicForm = editDiv; // the old logic, editDiv is topicForm const topicDropdownSearch = topicDropdown.find('input.search'); const topicPrompts = { @@ -21,17 +30,17 @@ export function initRepoTopicBar() { mgrBtn.on('click', () => { hideElem(viewDiv); showElem(editDiv); - topicDropdownSearch.focus(); + topicDropdownSearch.trigger('focus'); }); - $('#cancel_topic_edit').on('click', () => { + cancelBtn.on('click', () => { hideElem(editDiv); showElem(viewDiv); - mgrBtn.focus(); + mgrBtn.trigger('focus'); }); saveBtn.on('click', () => { - const topics = $('input[name=topics]').val(); + const topics = $(`input[name=topics-${viewType}]`).val(); $.post(saveBtn.attr('data-link'), { _csrf: csrfToken, diff --git a/web_src/js/index.js b/web_src/js/index.js index 4713618506b0c..b1d024896c7b4 100644 --- a/web_src/js/index.js +++ b/web_src/js/index.js @@ -49,7 +49,7 @@ import { initGlobalLinkActions, initHeadNavbarContentToggle, } from './features/common-global.js'; -import {initRepoTopicBar} from './features/repo-home.js'; +import {initRepoTopicBars} from './features/repo-home.js'; import {initAdminEmails} from './features/admin/emails.js'; import {initAdminCommon} from './features/admin/common.js'; import {initRepoTemplateSearch} from './features/repo-template.js'; @@ -168,7 +168,7 @@ onDomReady(() => { initRepoSettingSearchTeamBox(); initRepoSettingsCollaboration(); initRepoTemplateSearch(); - initRepoTopicBar(); + initRepoTopicBars(); initRepoWikiForm(); initRepository(); initRepositoryActionView(); From 6707a7b5273ff20a75c26fcce915a0e70fa70d27 Mon Sep 17 00:00:00 2001 From: yp05327 <576951401@qq.com> Date: Wed, 29 Nov 2023 06:19:55 +0000 Subject: [PATCH 18/34] improve citation modal --- templates/repo/cite/cite_buttons.tmpl | 2 +- templates/repo/cite/cite_modal.tmpl | 12 +++++------- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/templates/repo/cite/cite_buttons.tmpl b/templates/repo/cite/cite_buttons.tmpl index 9953c92c8aee5..7b16e0ada7db7 100644 --- a/templates/repo/cite/cite_buttons.tmpl +++ b/templates/repo/cite/cite_buttons.tmpl @@ -5,7 +5,7 @@ APA BibTeX - + diff --git a/templates/repo/cite/cite_modal.tmpl b/templates/repo/cite/cite_modal.tmpl index c34c77e0c4159..bd46931da2780 100644 --- a/templates/repo/cite/cite_modal.tmpl +++ b/templates/repo/cite/cite_modal.tmpl @@ -4,13 +4,11 @@
-
-
- {{template "repo/cite/cite_buttons" .}} - - {{svg "octicon-file-moved"}} - -
+
+ {{template "repo/cite/cite_buttons" .}} + + {{svg "octicon-file-moved"}} +
From ebb50604e4b60870df6998728d70a655f4f4abad Mon Sep 17 00:00:00 2001 From: yp05327 <576951401@qq.com> Date: Wed, 29 Nov 2023 06:21:14 +0000 Subject: [PATCH 19/34] fix lint --- templates/base/head_navbar.tmpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/base/head_navbar.tmpl b/templates/base/head_navbar.tmpl index be244794eb303..e372e0f193e22 100644 --- a/templates/base/head_navbar.tmpl +++ b/templates/base/head_navbar.tmpl @@ -73,7 +73,7 @@
{{end}} - + {{if and .IsSigned .MustChangePassword}}
From e0347937d4ea2991d076bcaa50ca3fbda3d17ae7 Mon Sep 17 00:00:00 2001 From: yp05327 <576951401@qq.com> Date: Wed, 29 Nov 2023 06:34:10 +0000 Subject: [PATCH 20/34] improve release tag --- templates/repo/home.tmpl | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/templates/repo/home.tmpl b/templates/repo/home.tmpl index c1b4a9929f516..d7550b4ecd059 100644 --- a/templates/repo/home.tmpl +++ b/templates/repo/home.tmpl @@ -128,16 +128,16 @@ {{CountFmt .NumReleases}}
- -
- {{svg "octicon-tag" 16}} -
+
+
+ + {{svg "octicon-tag" 16}} {{.LatestRelease.TagName}} -
- {{ctx.Locale.Tr "latest"}} + + {{ctx.Locale.Tr "latest"}}
{{TimeSinceUnix .LatestRelease.CreatedUnix ctx.Locale}} - +
From 88683cc43888d17dbdc152225a50e35713c27b4a Mon Sep 17 00:00:00 2001 From: yp05327 <576951401@qq.com> Date: Wed, 29 Nov 2023 06:43:34 +0000 Subject: [PATCH 21/34] improve repo-clone-url --- templates/repo/clone_buttons.tmpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/repo/clone_buttons.tmpl b/templates/repo/clone_buttons.tmpl index a664c4bda8dec..d38ad57c60e1c 100644 --- a/templates/repo/clone_buttons.tmpl +++ b/templates/repo/clone_buttons.tmpl @@ -9,7 +9,7 @@ SSH {{end}} - + From 3e40bba62c305118e2026cbc229b4dfbf6b98fb0 Mon Sep 17 00:00:00 2001 From: yp05327 <576951401@qq.com> Date: Mon, 4 Dec 2023 01:21:37 +0000 Subject: [PATCH 22/34] fix search box --- templates/base/head_navbar.tmpl | 21 -------------------- templates/repo/home.tmpl | 34 +++++++++++++++++++++++++++++++++ 2 files changed, 34 insertions(+), 21 deletions(-) diff --git a/templates/base/head_navbar.tmpl b/templates/base/head_navbar.tmpl index e372e0f193e22..cebf26f502a3a 100644 --- a/templates/base/head_navbar.tmpl +++ b/templates/base/head_navbar.tmpl @@ -12,9 +12,6 @@
- {{if .RepoSearchEnabled}} - {{svg "octicon-search"}} - {{end}} {{if .IsSigned}}
@@ -56,24 +53,6 @@
- {{if .RepoSearchEnabled}} -
-
-
-
- - {{if .CodeIndexerUnavailable}} - {{svg "octicon-alert"}} - {{end}} - -
-
-
-
- {{end}} - {{if and .IsSigned .MustChangePassword}}
diff --git a/templates/repo/home.tmpl b/templates/repo/home.tmpl index d7550b4ecd059..dfcc2d9e6783c 100644 --- a/templates/repo/home.tmpl +++ b/templates/repo/home.tmpl @@ -15,6 +15,23 @@ {{end}}
+ {{if .RepoSearchEnabled}} +
+
+
+
+ + {{if .CodeIndexerUnavailable}} + {{svg "octicon-alert"}} + {{end}} + +
+
+
+
+ {{end}} {{template "repo/sidebar/repo_info" dict "ctxData" . "HiddenInMobileView" false}} {{template "repo/sub_menu" .}}
@@ -116,6 +133,23 @@
+ {{if .RepoSearchEnabled}} +
+
+
+
+ + {{if .CodeIndexerUnavailable}} + {{svg "octicon-alert"}} + {{end}} + +
+
+
+
+ {{end}} {{template "repo/sidebar/repo_info" dict "ctxData" . "HiddenInMobileView" true}} {{if .LatestRelease}} From fd91e9f2655e6aa3c4c8b4a2116a82f28810e5f4 Mon Sep 17 00:00:00 2001 From: yp05327 <576951401@qq.com> Date: Mon, 4 Dec 2023 01:24:20 +0000 Subject: [PATCH 23/34] improve --- templates/repo/home.tmpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/repo/home.tmpl b/templates/repo/home.tmpl index dfcc2d9e6783c..235a0298d41a4 100644 --- a/templates/repo/home.tmpl +++ b/templates/repo/home.tmpl @@ -163,7 +163,7 @@
-
+
{{svg "octicon-tag" 16}} {{.LatestRelease.TagName}} From 258479e8925ca22b9051ea58d5bc8b95b8edc3fd Mon Sep 17 00:00:00 2001 From: yp05327 <576951401@qq.com> Date: Thu, 7 Dec 2023 00:14:30 +0000 Subject: [PATCH 24/34] fix test --- tests/integration/repo_test.go | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/tests/integration/repo_test.go b/tests/integration/repo_test.go index 831d79a4d039f..b3b21c61a9024 100644 --- a/tests/integration/repo_test.go +++ b/tests/integration/repo_test.go @@ -27,13 +27,18 @@ func TestViewRepo(t *testing.T) { resp := session.MakeRequest(t, req, http.StatusOK) htmlDoc := NewHTMLParser(t, resp.Body) - noDescription := htmlDoc.doc.Find("#repo-desc").Children() - repoTopics := htmlDoc.doc.Find("#repo-topics").Children() - repoSummary := htmlDoc.doc.Find(".repository-summary").Children() - assert.True(t, noDescription.HasClass("no-description")) - assert.True(t, repoTopics.HasClass("repo-topic")) - assert.True(t, repoSummary.HasClass("repository-menu")) + components := map[string]*goquery.Selection{ + "no-description": htmlDoc.doc.Find("#repo-desc").Children(), + "repo-topic": htmlDoc.doc.Find("#repo-topics").Children(), + "repository-menu": htmlDoc.doc.Find(".repository-summary").Children(), + } + + for className, selection := range components { + selection.Each(func(_ int, s *goquery.Selection) { + assert.True(t, s.HasClass(className)) + }) + } req = NewRequest(t, "GET", "/org3/repo3") MakeRequest(t, req, http.StatusNotFound) From c740c9a94d06308115f2f917376b7a4982bfff20 Mon Sep 17 00:00:00 2001 From: yp05327 <576951401@qq.com> Date: Fri, 16 Feb 2024 05:12:08 +0000 Subject: [PATCH 25/34] add `s` to repo_lang --- options/locale/locale_en-US.ini | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini index 35dd63acf11d0..75822bbf1b803 100644 --- a/options/locale/locale_en-US.ini +++ b/options/locale/locale_en-US.ini @@ -966,7 +966,7 @@ generate_repo = Generate Repository generate_from = Generate From repo_desc = Description repo_desc_helper = Enter short description (optional) -repo_lang = Language +repo_lang = Languages repo_gitignore_helper = Select .gitignore templates. repo_gitignore_helper_desc = Choose which files not to track from a list of templates for common languages. Typical artifacts generated by each language's build tools are included on .gitignore by default. issue_labels = Issue Labels From 4eec6646fd9cd3ef6f7c9fd00f2d27fcd6304034 Mon Sep 17 00:00:00 2001 From: yp05327 <576951401@qq.com> Date: Fri, 16 Feb 2024 06:31:55 +0000 Subject: [PATCH 26/34] draft add contributors --- routers/web/repo/view.go | 30 ++++++++++++++++++++++++++++++ templates/repo/home.tmpl | 21 +++++++++++++++++++++ web_src/css/repo.css | 7 +++++++ 3 files changed, 58 insertions(+) diff --git a/routers/web/repo/view.go b/routers/web/repo/view.go index 5715fb01d9244..48dc383986cd5 100644 --- a/routers/web/repo/view.go +++ b/routers/web/repo/view.go @@ -16,6 +16,7 @@ import ( "net/url" "path" "slices" + "sort" "strings" "time" @@ -49,6 +50,7 @@ import ( "code.gitea.io/gitea/modules/util" "code.gitea.io/gitea/routers/web/feed" issue_service "code.gitea.io/gitea/services/issue" + contributors_service "code.gitea.io/gitea/services/repository" files_service "code.gitea.io/gitea/services/repository/files" "github.com/nektos/act/pkg/model" @@ -898,6 +900,29 @@ func renderDirectoryFiles(ctx *context.Context, timeout time.Duration) git.Entri return allEntries } +func renderContributorStats(ctx *context.Context) { + contributorStats, err := contributors_service.GetContributorStats(ctx, ctx.Cache, ctx.Repo.Repository, ctx.Repo.CommitID) + // TODO use httpx? + if err != nil { + ctx.ServerError("contributors_service.GetContributorStats", err) + return + } + + contributors := make([]*contributors_service.ContributorData, 0, len(contributorStats)) + limit := 5 + for key, data := range contributorStats { + if key != "total" && limit > 0 { + contributors = append(contributors, data) + } + } + sort.Slice(contributors, func(i, j int) bool { return contributors[i].TotalCommits < contributors[j].TotalCommits }) + if len(contributors) < limit { + limit = len(contributors) + } + ctx.Data["TopContributorStats"] = contributors[:limit] + ctx.Data["NumContributorsStats"] = len(contributorStats) - 1 +} + func renderLanguageStats(ctx *context.Context) { langs, err := repo_model.GetTopLanguageStats(ctx, ctx.Repo.Repository, 5) if err != nil { @@ -989,6 +1014,11 @@ func renderCode(ctx *context.Context) { return } + renderContributorStats(ctx) + if ctx.Written() { + return + } + renderLanguageStats(ctx) if ctx.Written() { return diff --git a/templates/repo/home.tmpl b/templates/repo/home.tmpl index 235a0298d41a4..0070ef87f51f1 100644 --- a/templates/repo/home.tmpl +++ b/templates/repo/home.tmpl @@ -177,6 +177,27 @@
{{end}} + {{if .TopContributorStats}} +
+
+
+ + {{ctx.Locale.Tr "contributors"}} + + {{CountFmt .NumContributorsStats}} +
+ +
+
+ {{range .TopContributorStats}} + + {{end}} +
+
+
+
+ {{end}} + {{if and (.Permission.CanRead $.UnitTypeCode) (not .IsEmptyRepo) .LanguageStats}}
diff --git a/web_src/css/repo.css b/web_src/css/repo.css index 082680a353cb8..d8e930ab31574 100644 --- a/web_src/css/repo.css +++ b/web_src/css/repo.css @@ -2094,6 +2094,13 @@ background: var(--color-secondary); } +.contributors-stats { + display: flex; + flex-flow: row wrap; + padding: 10px; + gap: 5px; +} + .language-stats { display: flex; gap: 2px; From f1e9ec65df202a2627a861e2ec91d8bf591ee990 Mon Sep 17 00:00:00 2001 From: yp05327 <576951401@qq.com> Date: Wed, 13 Mar 2024 02:17:18 +0000 Subject: [PATCH 27/34] fix lint --- services/context/repo.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/services/context/repo.go b/services/context/repo.go index c53c3da609a8e..57542c386bed4 100644 --- a/services/context/repo.go +++ b/services/context/repo.go @@ -533,7 +533,7 @@ func RepoAssignment(ctx *Context) context.CancelFunc { ctx.ServerError("GetReleaseCountByRepoID", err) return nil } - numReleases, err := db.Count[repo_model.Release](ctx, repo_model.FindReleasesOptions{ + numReleases, err := db.Count[repo_model.Release](ctx, repo_model.FindReleasesOptions{ // only show draft releases for users who can write, read-only users shouldn't see draft releases. IncludeDrafts: ctx.Repo.CanWrite(unit_model.TypeReleases), RepoID: ctx.Repo.Repository.ID, From 148bc0ee05224d19360bbaef80fd8e17e2db9c36 Mon Sep 17 00:00:00 2001 From: yp05327 <576951401@qq.com> Date: Tue, 26 Mar 2024 08:05:34 +0000 Subject: [PATCH 28/34] migrate gt to tw --- templates/repo/home.tmpl | 28 +++++++++++++-------------- templates/repo/sidebar/repo_info.tmpl | 26 ++++++++++++------------- web_src/css/helpers.css | 10 ---------- web_src/js/features/repo-home.js | 19 +++++++++--------- 4 files changed, 37 insertions(+), 46 deletions(-) diff --git a/templates/repo/home.tmpl b/templates/repo/home.tmpl index bd82b8e47edde..8e9f92bcf59d6 100644 --- a/templates/repo/home.tmpl +++ b/templates/repo/home.tmpl @@ -16,7 +16,7 @@
{{if .RepoSearchEnabled}} -
+
@@ -35,8 +35,8 @@ {{template "repo/sidebar/repo_info" dict "ctxData" . "HiddenInMobileView" false}} {{template "repo/sub_menu" .}}
-
- {{template "repo/branch_dropdown" dict "root" . "ContainerClasses" "gt-mr-2"}} +
+ {{template "repo/branch_dropdown" dict "root" . "ContainerClasses" "tw-mr-1"}} {{if and .CanCompareOrPull .IsViewBranch (not .Repository.IsArchived)}} {{$cmpBranch := ""}} {{if ne .Repository.ID .BaseRepo.ID}} @@ -57,7 +57,7 @@ {{end}} {{if and .CanWriteCode .IsViewBranch (not .Repository.IsMirror) (not .Repository.IsArchived) (not .IsViewFile)}} - {{end}} +
+
+ {{range .ctxData.Topics}}{{.Name}}{{end}} + {{if and .ctxData.Permission.IsAdmin (not .ctxData.Repository.IsArchived)}}{{end}}
{{if and .ctxData.Permission.IsAdmin (not .ctxData.Repository.IsArchived)}} -
-
-
+
+
+
{{range .ctxData.Topics}} {{/* keey the same layout as Fomantic UI generated labels */}} - {{.Name}}{{svg "octicon-x" 16 "delete icon"}} + {{.Name}}{{svg "octicon-x" 16 "delete icon"}} {{end}}
@@ -48,7 +48,7 @@ {{if and .ctxData.ReadmeExist .HiddenInMobileView}}
- + {{svg "octicon-book"}}{{ctx.Locale.Tr "readme"}}
@@ -56,7 +56,7 @@ {{if .ctxData.CitiationExist}}
- {{svg "octicon-cross-reference" 16 "gt-mr-3"}}{{ctx.Locale.Tr "repo.cite_this_repo"}} + {{svg "octicon-cross-reference" 16 "tw-mr-2"}}{{ctx.Locale.Tr "repo.cite_this_repo"}}
{{end}}
diff --git a/web_src/css/helpers.css b/web_src/css/helpers.css index 0b34d06392a1d..66d0f032576a8 100644 --- a/web_src/css/helpers.css +++ b/web_src/css/helpers.css @@ -68,13 +68,3 @@ only use: display: none !important; } } - -.gt-hidden.gt-hidden { display: none !important; } - -@media (max-width: 767.98px) { - .gt-hidden-in-mobile { display: none !important; } -} - -@media (min-width: 767.98px) { - .gt-hidden-in-desktop { display: none !important; } -} diff --git a/web_src/js/features/repo-home.js b/web_src/js/features/repo-home.js index 07bb06bd96f6e..2e18b739cc263 100644 --- a/web_src/js/features/repo-home.js +++ b/web_src/js/features/repo-home.js @@ -7,18 +7,19 @@ const {appSubUrl} = window.config; export function initRepoTopicBars() { for (const mgrBtn of document.querySelectorAll('.manage-topic')) { - const viewType = $(mgrBtn).getAttribute('data-view-type'); + const viewType = mgrBtn.getAttribute('data-view-type'); if (!viewType.length) { throw new Error('no view type defined in attributes for manage topic button'); } - initRepoTopicBar($(mgrBtn), viewType); + initRepoTopicBar(mgrBtn, viewType); } } -export function initRepoTopicBar() { - const editDiv = document.getElementById('topic_edit'); - const viewDiv = document.getElementById('repo-topics'); - const saveBtn = document.getElementById('save_topic'); +function initRepoTopicBar(mgrBtn, viewType) { + const editDiv = document.getElementById(`topic_edit_${viewType}`); + const viewDiv = document.getElementById(`repo-topics-${viewType}`); + const saveBtn = document.getElementById(`save_topic_${viewType}`); + const cancelBtn = document.getElementById(`cancel_topic_edit_${viewType}`); const topicDropdown = editDiv.querySelector('.dropdown'); const $topicDropdown = $(topicDropdown); const $topicForm = $(editDiv); @@ -34,14 +35,14 @@ export function initRepoTopicBar() { $topicDropdownSearch.trigger('focus'); }); - cancelBtn.on('click', () => { + $(cancelBtn).on('click', () => { hideElem(editDiv); showElem(viewDiv); - mgrBtn.trigger('focus'); + mgrBtn.focus(); }); saveBtn.addEventListener('click', async () => { - const topics = $('input[name=topics-${viewType}]').val(); + const topics = $(`input[name=topics-${viewType}]`).val(); const data = new FormData(); data.append('topics', topics); From 73190dbf764f9e1f1fe2175187ca83e54e85103c Mon Sep 17 00:00:00 2001 From: yp05327 <576951401@qq.com> Date: Tue, 26 Mar 2024 08:52:35 +0000 Subject: [PATCH 29/34] fix search locale --- templates/repo/home.tmpl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/templates/repo/home.tmpl b/templates/repo/home.tmpl index 8e9f92bcf59d6..ae5147ca76898 100644 --- a/templates/repo/home.tmpl +++ b/templates/repo/home.tmpl @@ -20,7 +20,7 @@
- + {{if .CodeIndexerUnavailable}} {{svg "octicon-alert"}} {{end}} @@ -140,7 +140,7 @@
- + {{if .CodeIndexerUnavailable}} {{svg "octicon-alert"}} {{end}} From e0089862144afc5c91a990cfc83c2e74fe84633f Mon Sep 17 00:00:00 2001 From: yp05327 <576951401@qq.com> Date: Wed, 27 Mar 2024 01:14:35 +0000 Subject: [PATCH 30/34] avoid 500 error when generating contributorstats --- routers/web/repo/view.go | 6 ++++++ templates/repo/home.tmpl | 20 ++++++++++++-------- 2 files changed, 18 insertions(+), 8 deletions(-) diff --git a/routers/web/repo/view.go b/routers/web/repo/view.go index 4ff7d49dd80d2..876b03e5a3c1e 100644 --- a/routers/web/repo/view.go +++ b/routers/web/repo/view.go @@ -8,6 +8,7 @@ import ( "bytes" gocontext "context" "encoding/base64" + "errors" "fmt" "html/template" "image" @@ -894,6 +895,11 @@ func renderContributorStats(ctx *context.Context) { contributorStats, err := contributors_service.GetContributorStats(ctx, ctx.Cache, ctx.Repo.Repository, ctx.Repo.CommitID) // TODO use httpx? if err != nil { + if errors.Is(err, contributors_service.ErrAwaitGeneration) { + ctx.Data["ContributorStatsWaitingGeneration"] = true + return + } + ctx.ServerError("contributors_service.GetContributorStats", err) return } diff --git a/templates/repo/home.tmpl b/templates/repo/home.tmpl index ae5147ca76898..3b1db793d7486 100644 --- a/templates/repo/home.tmpl +++ b/templates/repo/home.tmpl @@ -178,26 +178,30 @@
{{end}} - {{if .TopContributorStats}}
{{ctx.Locale.Tr "contributors"}} - {{CountFmt .NumContributorsStats}} + {{if .NumContributorsStats}} + {{CountFmt .NumContributorsStats}} + {{end}}
-
- {{range .TopContributorStats}} - - {{end}} -
+ {{if .ContributorStatsWaitingGeneration}} + {{ctx.Locale.Tr "graphs.component_loading_info"}} + {{else if .TopContributorStats}} +
+ {{range .TopContributorStats}} + + {{end}} +
+ {{end}}
- {{end}} {{if and (.Permission.CanRead $.UnitTypeCode) (not .IsEmptyRepo) .LanguageStats}}
From 6e0e3d0494aabc6a9b5c746851e0c8be0af91443 Mon Sep 17 00:00:00 2001 From: yp05327 <576951401@qq.com> Date: Wed, 27 Mar 2024 01:24:51 +0000 Subject: [PATCH 31/34] remove contributor stats --- routers/web/repo/view.go | 36 ------------------------------------ templates/repo/home.tmpl | 25 ------------------------- 2 files changed, 61 deletions(-) diff --git a/routers/web/repo/view.go b/routers/web/repo/view.go index 876b03e5a3c1e..84c044a8ea38e 100644 --- a/routers/web/repo/view.go +++ b/routers/web/repo/view.go @@ -8,7 +8,6 @@ import ( "bytes" gocontext "context" "encoding/base64" - "errors" "fmt" "html/template" "image" @@ -17,7 +16,6 @@ import ( "net/url" "path" "slices" - "sort" "strings" "time" @@ -51,7 +49,6 @@ import ( "code.gitea.io/gitea/routers/web/feed" "code.gitea.io/gitea/services/context" issue_service "code.gitea.io/gitea/services/issue" - contributors_service "code.gitea.io/gitea/services/repository" files_service "code.gitea.io/gitea/services/repository/files" "github.com/nektos/act/pkg/model" @@ -891,34 +888,6 @@ func renderDirectoryFiles(ctx *context.Context, timeout time.Duration) git.Entri return allEntries } -func renderContributorStats(ctx *context.Context) { - contributorStats, err := contributors_service.GetContributorStats(ctx, ctx.Cache, ctx.Repo.Repository, ctx.Repo.CommitID) - // TODO use httpx? - if err != nil { - if errors.Is(err, contributors_service.ErrAwaitGeneration) { - ctx.Data["ContributorStatsWaitingGeneration"] = true - return - } - - ctx.ServerError("contributors_service.GetContributorStats", err) - return - } - - contributors := make([]*contributors_service.ContributorData, 0, len(contributorStats)) - limit := 5 - for key, data := range contributorStats { - if key != "total" && limit > 0 { - contributors = append(contributors, data) - } - } - sort.Slice(contributors, func(i, j int) bool { return contributors[i].TotalCommits < contributors[j].TotalCommits }) - if len(contributors) < limit { - limit = len(contributors) - } - ctx.Data["TopContributorStats"] = contributors[:limit] - ctx.Data["NumContributorsStats"] = len(contributorStats) - 1 -} - func renderLanguageStats(ctx *context.Context) { langs, err := repo_model.GetTopLanguageStats(ctx, ctx.Repo.Repository, 5) if err != nil { @@ -1036,11 +1005,6 @@ func renderHomeCode(ctx *context.Context) { return } - renderContributorStats(ctx) - if ctx.Written() { - return - } - renderLanguageStats(ctx) if ctx.Written() { return diff --git a/templates/repo/home.tmpl b/templates/repo/home.tmpl index 3b1db793d7486..488986ebf6c0f 100644 --- a/templates/repo/home.tmpl +++ b/templates/repo/home.tmpl @@ -178,31 +178,6 @@
{{end}} -
-
-
- - {{ctx.Locale.Tr "contributors"}} - - {{if .NumContributorsStats}} - {{CountFmt .NumContributorsStats}} - {{end}} -
- -
- {{if .ContributorStatsWaitingGeneration}} - {{ctx.Locale.Tr "graphs.component_loading_info"}} - {{else if .TopContributorStats}} -
- {{range .TopContributorStats}} - - {{end}} -
- {{end}} -
-
-
- {{if and (.Permission.CanRead $.UnitTypeCode) (not .IsEmptyRepo) .LanguageStats}}
From 16f84b9a9999e935039005cdc2dc90b270ff83e6 Mon Sep 17 00:00:00 2001 From: yp05327 <576951401@qq.com> Date: Wed, 27 Mar 2024 01:55:58 +0000 Subject: [PATCH 32/34] fix cite --- web_src/js/features/citation.js | 53 +++++++++++++++++---------------- 1 file changed, 27 insertions(+), 26 deletions(-) diff --git a/web_src/js/features/citation.js b/web_src/js/features/citation.js index 918a4671364c2..589207d1c97b2 100644 --- a/web_src/js/features/citation.js +++ b/web_src/js/features/citation.js @@ -41,36 +41,37 @@ export async function initCitationFileCopyContent() { citationCopyApa.classList.toggle('primary', !isBibtex); }; - document.getElementById('cite-repo-button')?.addEventListener('click', async (e) => { - const dropdownBtn = e.target.closest('.ui.dropdown.button'); - dropdownBtn.classList.add('is-loading'); + for (const button of document.getElementsByClassName('cite-repo-button')) { + button.addEventListener('click', async () => { + const $modal = $('#cite-repo-modal'); + $modal.modal('show'); + $modal.addClass('is-loading'); - try { try { - await initInputCitationValue(citationCopyApa, citationCopyBibtex); - } catch (e) { - console.error(`initCitationFileCopyContent error: ${e}`, e); - return; - } - updateUi(); - - citationCopyApa.addEventListener('click', () => { - localStorage.setItem('citation-copy-format', 'apa'); + try { + await initInputCitationValue(citationCopyApa, citationCopyBibtex); + } catch (e) { + console.error(`initCitationFileCopyContent error: ${e}`, e); + return; + } updateUi(); - }); - citationCopyBibtex.addEventListener('click', () => { - localStorage.setItem('citation-copy-format', 'bibtex'); - updateUi(); - }); + citationCopyApa.addEventListener('click', () => { + localStorage.setItem('citation-copy-format', 'apa'); + updateUi(); + }); - inputContent.addEventListener('click', () => { - inputContent.select(); - }); - } finally { - dropdownBtn.classList.remove('is-loading'); - } + citationCopyBibtex.addEventListener('click', () => { + localStorage.setItem('citation-copy-format', 'bibtex'); + updateUi(); + }); - $('#cite-repo-modal').modal('show'); - }); + inputContent.addEventListener('click', () => { + inputContent.select(); + }); + } finally { + $modal.removeClass('is-loading'); + } + }); + } } From d213cf93ed2f5d287b57136e232c927e0ceb33b5 Mon Sep 17 00:00:00 2001 From: yp05327 <576951401@qq.com> Date: Wed, 27 Mar 2024 02:04:58 +0000 Subject: [PATCH 33/34] improve --- web_src/js/features/citation.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/web_src/js/features/citation.js b/web_src/js/features/citation.js index 589207d1c97b2..a734a828d22fe 100644 --- a/web_src/js/features/citation.js +++ b/web_src/js/features/citation.js @@ -30,6 +30,7 @@ export async function initCitationFileCopyContent() { const citationCopyApa = document.getElementById('citation-copy-apa'); const citationCopyBibtex = document.getElementById('citation-copy-bibtex'); const inputContent = document.getElementById('citation-copy-content'); + const modal = document.getElementById('cite-repo-modal'); if ((!citationCopyApa && !citationCopyBibtex) || !inputContent) return; @@ -43,9 +44,8 @@ export async function initCitationFileCopyContent() { for (const button of document.getElementsByClassName('cite-repo-button')) { button.addEventListener('click', async () => { - const $modal = $('#cite-repo-modal'); - $modal.modal('show'); - $modal.addClass('is-loading'); + $(modal).modal('show'); + $(modal).addClass('is-loading'); try { try { @@ -70,7 +70,7 @@ export async function initCitationFileCopyContent() { inputContent.select(); }); } finally { - $modal.removeClass('is-loading'); + $(modal).removeClass('is-loading'); } }); } From 6567bf83e74df682a45f0f8187ffca453787d47c Mon Sep 17 00:00:00 2001 From: yp05327 <576951401@qq.com> Date: Wed, 27 Mar 2024 08:18:34 +0000 Subject: [PATCH 34/34] fix lint --- web_src/css/repo.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web_src/css/repo.css b/web_src/css/repo.css index 93597fae4add7..f277673e4e34c 100644 --- a/web_src/css/repo.css +++ b/web_src/css/repo.css @@ -135,7 +135,7 @@ gap: .5rem; } -.latest-release .time{ +.latest-release .time { margin-left: 1.6rem; }