فهرست منبع

Break branch-selection dropdown into a template

We only handle branch selection for repo home and commits pages, so the
redirection URL is based on PageIsCommits
Angus Gibson 10 سال پیش
والد
کامیت
df05134494
3فایلهای تغییر یافته به همراه46 افزوده شده و 88 حذف شده
  1. 44 0
      templates/repo/branch_dropdown.tmpl
  2. 1 44
      templates/repo/commits.tmpl
  3. 1 44
      templates/repo/home.tmpl

+ 44 - 0
templates/repo/branch_dropdown.tmpl

@@ -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>

+ 1 - 44
templates/repo/commits.tmpl

@@ -2,50 +2,7 @@
 <div class="repository commits">
 	{{template "repo/header" .}}
 	<div class="ui container">
-		<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}}/commits/{{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}}/commits/{{EscapePound .}}">{{.}}</div>
-						{{end}}
-					</div>
-				</div>
-			</div>
-		</div>
+		{{template "repo/branch_dropdown" .}}
 		{{template "repo/commits_table" .}}
 	</div>
 </div>

+ 1 - 44
templates/repo/home.tmpl

@@ -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>