clean up

Author: wxiaoguang

services/contexttest/context_tests.go

@@ -20,7 +20,7 @@ import (
 	"code.gitea.io/gitea/models/unittest"
 	user_model "code.gitea.io/gitea/models/user"
 	"code.gitea.io/gitea/modules/cache"
-	git2 "code.gitea.io/gitea/modules/git"
+	git_module "code.gitea.io/gitea/modules/git"
 	"code.gitea.io/gitea/modules/gitrepo"
 	"code.gitea.io/gitea/modules/reqctx"
 	"code.gitea.io/gitea/modules/session"
@@ -146,7 +146,7 @@ func LoadRepoCommit(t *testing.T, ctx gocontext.Context) {
 	defer gitRepo.Close()
 
 	if repo.RefFullName == "" {
-		repo.RefFullName = git2.RefNameFromBranch(repo.Repository.DefaultBranch)
+		repo.RefFullName = git_module.RefNameFromBranch(repo.Repository.DefaultBranch)
 	}
 	if repo.RefFullName.IsPull() {
 		repo.BranchName = repo.RefFullName.ShortName()

templates/repo/home_branch_dropdown.tmpl

@@ -9,7 +9,17 @@
 		</button>
 	{{end}}
 
-	{{template "repo/home_branch_dropdown" (dict "ctxData" .)}}
+	{{template "repo/branch_dropdown" dict
+		"Repository" .Repository
+		"ShowTabBranches" true
+		"ShowTabTags" true
+		"CurrentRefType" .RefFullName.RefType
+		"CurrentRefShortName" .RefFullName.ShortName
+		"CurrentTreePath" .TreePath
+		"RefLinkTemplate" "{RepoLink}/src/{RefType}/{RefShortName}/{TreePath}"
+		"AllowCreateNewRef" .CanCreateBranch
+		"ShowViewAllRefsEntry" true
+	}}
 
 	{{if and .CanCompareOrPull .RefFullName.IsBranch (not .Repository.IsArchived)}}
 		{{$cmpBranch := ""}}

templates/repo/view_content.tmpl

@@ -5,7 +5,7 @@
 	<b>Files</b>
 </div>
 
-<!--// TODO: Dynamically move components such as refSelector and createPR here-->
+{{/* TODO: Dynamically move components such as refSelector and createPR here */}}
 <div class="view-file-tree-sidebar-bottom tw-overflow-auto">
 	<div id="view-file-tree" class="is-loading"
 		data-repo-link="{{.RepoLink}}"

templates/repo/view_file_tree_sidebar.tmpl

@@ -59,10 +59,6 @@
   flex: 1;
 }
 
-#view-file-tree.is-loading {
-  aspect-ratio: 5.415; /* the size is about 790 x 145 */
-}
-
 .repo-view-with-sidebar .repo-view-file-tree-sidebar {
   flex: 0 1 15%;
   display: flex;