Merge branch 'main' into add-file-tree-to-file-view-page

templates/repo/home_branch_dropdown.tmpl

@@ -1,9 +1,15 @@
-{{$branchDropdownCurrentRefType := "branch"}}
+{{- /* for repo home (default branch) and /owner/repo/src/branch/the-name */ -}}
-{{$branchDropdownCurrentRefShortName := .ctxData.BranchName}}
+{{- $branchDropdownCurrentRefType := "branch" -}}
-{{if .ctxData.IsViewTag}}
+{{- $branchDropdownCurrentRefShortName := .ctxData.BranchName -}}
-	{{$branchDropdownCurrentRefType = "tag"}}
+{{- if .IsViewTag -}}
-	{{$branchDropdownCurrentRefShortName = .ctxData.TagName}}
+	{{- /* for /owner/repo/src/tag/the-name */ -}}
-{{end}}
+	{{- $branchDropdownCurrentRefType = "tag" -}}
+	{{- $branchDropdownCurrentRefShortName = .ctxData.TagName -}}
+{{- else if .IsViewCommit -}}
+	{{- /* for /owner/repo/src/commit/000000 */ -}}
+	{{- $branchDropdownCurrentRefType = "commit" -}}
+	{{- $branchDropdownCurrentRefShortName = ShortSha .ctxData.CommitID -}}
+{{- end -}}
 {{template "repo/branch_dropdown" dict
 	"Repository" .ctxData.Repository
 	"ShowTabBranches" true

templates/repo/view_file_tree_sidebar.tmpl

@@ -1,9 +1,15 @@
-{{$branchDropdownCurrentRefType := "branch"}}
+{{- /* for repo home (default branch) and /owner/repo/src/branch/the-name */ -}}
-{{$branchDropdownCurrentRefShortName := .BranchName}}
+{{- $branchDropdownCurrentRefType := "branch" -}}
-{{if .IsViewTag}}
+{{- $branchDropdownCurrentRefShortName := .BranchName -}}
-	{{$branchDropdownCurrentRefType = "tag"}}
+{{- if .IsViewTag -}}
-	{{$branchDropdownCurrentRefShortName = .TagName}}
+	{{- /* for /owner/repo/src/tag/the-name */ -}}
-{{end}}
+	{{- $branchDropdownCurrentRefType = "tag" -}}
+	{{- $branchDropdownCurrentRefShortName = .TagName -}}
+{{- else if .IsViewCommit -}}
+	{{- /* for /owner/repo/src/commit/000000 */ -}}
+	{{- $branchDropdownCurrentRefType = "commit" -}}
+	{{- $branchDropdownCurrentRefShortName = ShortSha .CommitID -}}
+{{- end -}}
 
 <div class="view-file-tree-sidebar-top">
 	<div class="sidebar-header">