mirror of
				https://gitee.com/gitea/gitea
				synced 2025-11-04 16:40:24 +08:00 
			
		
		
		
	Merge pull request #2126 from angus-g/fixes/commits-branches
Dropdown on commits page to choose branch #1846
This commit is contained in:
		@@ -218,8 +218,9 @@ function initRepository() {
 | 
			
		||||
        });
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    // File list
 | 
			
		||||
    if ($('.repository.file.list').length > 0) {
 | 
			
		||||
    // File list and commits
 | 
			
		||||
    if ($('.repository.file.list').length > 0 ||
 | 
			
		||||
         ('.repository.commits').length > 0) {
 | 
			
		||||
        initFilterSearchDropdown('.choose.reference .dropdown');
 | 
			
		||||
 | 
			
		||||
        $('.reference.column').click(function () {
 | 
			
		||||
@@ -1036,4 +1037,4 @@ $(window).load(function () {
 | 
			
		||||
            }
 | 
			
		||||
        }).trigger('hashchange');
 | 
			
		||||
    }
 | 
			
		||||
});
 | 
			
		||||
});
 | 
			
		||||
 
 | 
			
		||||
							
								
								
									
										44
									
								
								templates/repo/branch_dropdown.tmpl
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										44
									
								
								templates/repo/branch_dropdown.tmpl
									
									
									
									
									
										Normal file
									
								
							@@ -0,0 +1,44 @@
 | 
			
		||||
<div class="fitted item choose reference">
 | 
			
		||||
	<div class="ui floating filter dropdown" data-no-results="{{.i18n.Tr "repo.pulls.no_results"}}">
 | 
			
		||||
		<div class="ui basic small button">
 | 
			
		||||
			<span class="text">
 | 
			
		||||
				<i class="octicon octicon-git-branch"></i>
 | 
			
		||||
				{{if .IsViewBranch}}{{.i18n.Tr "repo.branch"}}{{else}}{{.i18n.Tr "repo.tree"}}{{end}}:
 | 
			
		||||
				<strong>{{if .IsViewBranch}}{{.BranchName}}{{else}}{{ShortSha .BranchName}}{{end}}</strong>
 | 
			
		||||
			</span>
 | 
			
		||||
			<i class="dropdown icon"></i>
 | 
			
		||||
		</div>
 | 
			
		||||
		<div class="menu">
 | 
			
		||||
			<div class="ui icon search input">
 | 
			
		||||
				<i class="filter icon"></i>
 | 
			
		||||
				<input name="search" placeholder="{{.i18n.Tr "repo.filter_branch_and_tag"}}...">
 | 
			
		||||
			</div>
 | 
			
		||||
			<div class="header">
 | 
			
		||||
				<div class="ui grid">
 | 
			
		||||
					<div class="two column row">
 | 
			
		||||
						<a class="reference column" href="#" data-target="#branch-list">
 | 
			
		||||
							<span class="text {{if .IsViewBranch}}black{{end}}">
 | 
			
		||||
								<i class="icon octicon octicon-git-branch"></i> {{.i18n.Tr "repo.branches"}}
 | 
			
		||||
							</span>
 | 
			
		||||
						</a>
 | 
			
		||||
						<a class="reference column" href="#" data-target="#tag-list">
 | 
			
		||||
							<span class="text {{if .IsViewTag}}black{{end}}">
 | 
			
		||||
								<i class="reference tags icon"></i> {{.i18n.Tr "repo.tags"}}
 | 
			
		||||
							</span>
 | 
			
		||||
						</a>
 | 
			
		||||
					</div>
 | 
			
		||||
				</div>
 | 
			
		||||
			</div>
 | 
			
		||||
			<div id="branch-list" class="scrolling menu" {{if .IsViewTag}}style="display: none"{{end}}>
 | 
			
		||||
				{{range .Branches}}
 | 
			
		||||
					<div class="item {{if eq $.BranchName .}}selected{{end}}" data-url="{{$.RepoLink}}/{{if $.PageIsCommits}}commits{{else}}src{{end}}/{{EscapePound .}}">{{.}}</div>
 | 
			
		||||
				{{end}}
 | 
			
		||||
			</div>
 | 
			
		||||
			<div id="tag-list" class="scrolling menu" {{if .IsViewBranch}}style="display: none"{{end}}>
 | 
			
		||||
				{{range .Tags}}
 | 
			
		||||
					<div class="item {{if eq $.BranchName .}}selected{{end}}" data-url="{{$.RepoLink}}/{{if $.PageIsCommits}}commits{{else}}src{{end}}/{{EscapePound .}}">{{.}}</div>
 | 
			
		||||
				{{end}}
 | 
			
		||||
			</div>
 | 
			
		||||
		</div>
 | 
			
		||||
	</div>
 | 
			
		||||
</div>
 | 
			
		||||
@@ -2,6 +2,7 @@
 | 
			
		||||
<div class="repository commits">
 | 
			
		||||
	{{template "repo/header" .}}
 | 
			
		||||
	<div class="ui container">
 | 
			
		||||
		{{template "repo/branch_dropdown" .}}
 | 
			
		||||
		{{template "repo/commits_table" .}}
 | 
			
		||||
	</div>
 | 
			
		||||
</div>
 | 
			
		||||
 
 | 
			
		||||
@@ -15,50 +15,7 @@
 | 
			
		||||
					</a>
 | 
			
		||||
				</div>
 | 
			
		||||
			{{end}}
 | 
			
		||||
			<div class="fitted item choose reference">
 | 
			
		||||
				<div class="ui floating filter dropdown" data-no-results="{{.i18n.Tr "repo.pulls.no_results"}}">
 | 
			
		||||
					<div class="ui basic small button">
 | 
			
		||||
						<span class="text">
 | 
			
		||||
							<i class="octicon octicon-git-branch"></i>
 | 
			
		||||
							{{if .IsViewBranch}}{{.i18n.Tr "repo.branch"}}{{else}}{{.i18n.Tr "repo.tree"}}{{end}}:
 | 
			
		||||
							<strong>{{if .IsViewBranch}}{{.BranchName}}{{else}}{{ShortSha .BranchName}}{{end}}</strong>
 | 
			
		||||
						</span>
 | 
			
		||||
						<i class="dropdown icon"></i>
 | 
			
		||||
					</div>
 | 
			
		||||
					<div class="menu">
 | 
			
		||||
						<div class="ui icon search input">
 | 
			
		||||
							<i class="filter icon"></i>
 | 
			
		||||
							<input name="search" placeholder="{{.i18n.Tr "repo.filter_branch_and_tag"}}...">
 | 
			
		||||
						</div>
 | 
			
		||||
						<div class="header">
 | 
			
		||||
							<div class="ui grid">
 | 
			
		||||
								<div class="two column row">
 | 
			
		||||
									<a class="reference column" href="#" data-target="#branch-list">
 | 
			
		||||
										<span class="text {{if .IsViewBranch}}black{{end}}">
 | 
			
		||||
											<i class="icon octicon octicon-git-branch"></i> {{.i18n.Tr "repo.branches"}}
 | 
			
		||||
										</span>
 | 
			
		||||
									</a>
 | 
			
		||||
									<a class="reference column" href="#" data-target="#tag-list">
 | 
			
		||||
										<span class="text {{if .IsViewTag}}black{{end}}">
 | 
			
		||||
											<i class="reference tags icon"></i> {{.i18n.Tr "repo.tags"}}
 | 
			
		||||
										</span>
 | 
			
		||||
									</a>
 | 
			
		||||
								</div>
 | 
			
		||||
							</div>
 | 
			
		||||
						</div>
 | 
			
		||||
						<div id="branch-list" class="scrolling menu" {{if .IsViewTag}}style="display: none"{{end}}>
 | 
			
		||||
							{{range .Branches}}
 | 
			
		||||
								<div class="item {{if eq $.BranchName .}}selected{{end}}" data-url="{{$.RepoLink}}/src/{{EscapePound .}}">{{.}}</div>
 | 
			
		||||
							{{end}}
 | 
			
		||||
						</div>
 | 
			
		||||
						<div id="tag-list" class="scrolling menu" {{if .IsViewBranch}}style="display: none"{{end}}>
 | 
			
		||||
							{{range .Tags}}
 | 
			
		||||
								<div class="item {{if eq $.BranchName .}}selected{{end}}" data-url="{{$.RepoLink}}/src/{{EscapePound .}}">{{.}}</div>
 | 
			
		||||
							{{end}}
 | 
			
		||||
						</div>
 | 
			
		||||
					</div>
 | 
			
		||||
				</div>
 | 
			
		||||
			</div>
 | 
			
		||||
			{{template "repo/branch_dropdown" .}}
 | 
			
		||||
			<div class="item fitted">
 | 
			
		||||
				<div class="ui breadcrumb">
 | 
			
		||||
					<a class="section" href="{{.RepoLink}}/src/{{EscapePound .BranchName}}">{{.Repository.Name}}</a>
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user