diff options
| author | Mario Lubenka <mario.lubenka@googlemail.com> | 2019-06-07 22:29:29 +0200 |
|---|---|---|
| committer | techknowlogick <hello@techknowlogick.com> | 2019-06-07 16:29:29 -0400 |
| commit | 311ce2d1d06c26d0d5a3b745493995813e2ea6f2 (patch) | |
| tree | 128b7cf4a9772373ea25bfea523de4298e5e78a2 /templates/repo/diff/compare.tmpl | |
| parent | bd55f6ff36d40503bfa3407225780d0ab7d37930 (diff) | |
| download | gitea-311ce2d1d06c26d0d5a3b745493995813e2ea6f2.tar.gz gitea-311ce2d1d06c26d0d5a3b745493995813e2ea6f2.zip | |
Compare branches, commits and tags with each other (#6991)
* Supports tags when comparing commits or branches
Signed-off-by: Mario Lubenka <mario.lubenka@googlemail.com>
* Hide headline when only comparing and don't load unused data
Signed-off-by: Mario Lubenka <mario.lubenka@googlemail.com>
* Merges compare logics to allow comparing branches, commits and tags with eachother
Signed-off-by: Mario Lubenka <mario.lubenka@googlemail.com>
* Display branch or tag instead of commit when used for comparing
Signed-off-by: Mario Lubenka <mario.lubenka@googlemail.com>
* Show pull request form after click on button
Signed-off-by: Mario Lubenka <mario.lubenka@googlemail.com>
* Transfers relevant pull.go changes from master to compare.go
Signed-off-by: Mario Lubenka <mario.lubenka@googlemail.com>
* Fixes error when comparing forks against a commit or tag
Signed-off-by: Mario Lubenka <mario.lubenka@googlemail.com>
* Removes console.log from JavaScript file
Signed-off-by: Mario Lubenka <mario.lubenka@googlemail.com>
* Show icon next to commit reference when comparing branch or tag
Signed-off-by: Mario Lubenka <mario.lubenka@googlemail.com>
* Updates css file
Signed-off-by: Mario Lubenka <mario.lubenka@googlemail.com>
* Fixes import order
* Renames template variable
* Update routers/repo/compare.go
Co-Authored-By: zeripath <art27@cantab.net>
* Update from master
Signed-off-by: Mario Lubenka <mario.lubenka@googlemail.com>
* Allow short-shas in compare
* Renames prInfo to compareInfo
Signed-off-by: Mario Lubenka <mario.lubenka@googlemail.com>
* Check PR permissions only if compare is pull request
Signed-off-by: Mario Lubenka <mario.lubenka@googlemail.com>
* Adjusts comment
Signed-off-by: Mario Lubenka <mario.lubenka@googlemail.com>
* Use compareInfo instead of prInfo
Diffstat (limited to 'templates/repo/diff/compare.tmpl')
| -rw-r--r-- | templates/repo/diff/compare.tmpl | 74 |
1 files changed, 74 insertions, 0 deletions
diff --git a/templates/repo/diff/compare.tmpl b/templates/repo/diff/compare.tmpl new file mode 100644 index 0000000000..cc727422d7 --- /dev/null +++ b/templates/repo/diff/compare.tmpl @@ -0,0 +1,74 @@ +{{template "base/head" .}} +<div class="repository diff {{if .PageIsComparePull}}compare pull{{end}}"> + {{template "repo/header" .}} + <div class="ui container {{if .IsSplitStyle}}fluid padded{{end}}"> + + {{if .PageIsComparePull}} + <h2 class="ui header"> + {{.i18n.Tr "repo.pulls.compare_changes"}} + <div class="sub header">{{.i18n.Tr "repo.pulls.compare_changes_desc"}}</div> + </h2> + <div class="ui segment choose branch"> + <span class="octicon octicon-git-compare"></span> + <div class="ui floating filter dropdown" data-no-results="{{.i18n.Tr "repo.pulls.no_results"}}"> + <div class="ui basic small button"> + <span class="text">{{.i18n.Tr "repo.pulls.compare_base"}}: {{$.BaseName}}:{{$.BaseBranch}}</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.pulls.filter_branch"}}..."> + </div> + <div class="scrolling menu"> + {{range .Branches}} + <div class="item {{if eq $.BaseBranch .}}selected{{end}}" data-url="{{$.RepoLink}}/compare/{{EscapePound .}}...{{if not $.PullRequestCtx.SameRepo}}{{$.HeadUser.Name}}:{{end}}{{EscapePound $.HeadBranch}}">{{$.BaseName}}:{{.}}</div> + {{end}} + </div> + </div> + </div> + ... + <div class="ui floating filter dropdown"> + <div class="ui basic small button"> + <span class="text">{{.i18n.Tr "repo.pulls.compare_compare"}}: {{$.HeadUser.Name}}:{{$.HeadBranch}}</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.pulls.filter_branch"}}..."> + </div> + <div class="scrolling menu"> + {{range .HeadBranches}} + <div class="{{if eq $.HeadBranch .}}selected{{end}} item" data-url="{{$.RepoLink}}/compare/{{EscapePound $.BaseBranch}}...{{if not $.PullRequestCtx.SameRepo}}{{$.HeadUser.Name}}:{{end}}{{EscapePound .}}">{{$.HeadUser.Name}}:{{.}}</div> + {{end}} + </div> + </div> + </div> + </div> + {{end}} + + {{if .IsNothingToCompare}} + <div class="ui segment">{{.i18n.Tr "repo.pulls.nothing_to_compare"}}</div> + {{else if .PageIsComparePull}} + {{if .HasPullRequest}} + <div class="ui segment"> + {{.i18n.Tr "repo.pulls.has_pull_request" $.RepoLink $.RepoRelPath .PullRequest.Index | Safe}} + </div> + {{else}} + <div class="ui info message show-form-container"> + <button class="ui button green show-form">{{.i18n.Tr "repo.pulls.new"}}</button> + </div> + <div class="pullrequest-form" style="display: none"> + {{template "repo/issue/new_form" .}} + </div> + {{template "repo/commits_table" .}} + {{template "repo/diff/box" .}} + {{end}} + {{else}} + {{template "repo/commits_table" .}} + {{template "repo/diff/box" .}} + {{end}} + </div> +</div> +{{template "base/footer" .}} |