summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAngus Gibson <angus.gibson@anu.edu.au>2015-12-09 17:11:41 +1100
committerAngus Gibson <angus.gibson@anu.edu.au>2015-12-09 17:15:58 +1100
commitdf05134494ccc4cf53ff816a6457c7e21a69f730 (patch)
tree88a2cd2aaf1b40456e91d083d7223e52f61a802e
parent9bd3ebe20708b3d61f1cab8daeeffe8748f93852 (diff)
downloadgitea-df05134494ccc4cf53ff816a6457c7e21a69f730.tar.gz
gitea-df05134494ccc4cf53ff816a6457c7e21a69f730.zip
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
-rw-r--r--templates/repo/branch_dropdown.tmpl44
-rw-r--r--templates/repo/commits.tmpl45
-rw-r--r--templates/repo/home.tmpl45
3 files changed, 46 insertions, 88 deletions
diff --git a/templates/repo/branch_dropdown.tmpl b/templates/repo/branch_dropdown.tmpl
new file mode 100644
index 0000000000..a825ee243c
--- /dev/null
+++ b/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>
diff --git a/templates/repo/commits.tmpl b/templates/repo/commits.tmpl
index 0c8ca443c2..88a87ef8ce 100644
--- a/templates/repo/commits.tmpl
+++ b/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>
diff --git a/templates/repo/home.tmpl b/templates/repo/home.tmpl
index ccbe6639cf..22a2f839a5 100644
--- a/templates/repo/home.tmpl
+++ b/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>