diff options
| author | nemoinho <felix@nehrke.info> | 2018-08-14 19:49:33 +0200 |
|---|---|---|
| committer | techknowlogick <techknowlogick@users.noreply.github.com> | 2018-08-14 13:49:33 -0400 |
| commit | ca112f0a04ea7f4fdb8e6dc1e83e293a598abc50 (patch) | |
| tree | 419042b6b41dccc68030df68f8112d08f3a6b1c0 /templates | |
| parent | 03e558c29b55c522c52608065d2b688f8a9a4bc3 (diff) | |
| download | gitea-ca112f0a04ea7f4fdb8e6dc1e83e293a598abc50.tar.gz gitea-ca112f0a04ea7f4fdb8e6dc1e83e293a598abc50.zip | |
Add whitespace handling to PR-comparsion (#4683)
* Add whitespace handling to PR-comparsion
In a PR we have to keep an eye on a lot of different things. But sometimes the
bare code is the key-thing we want to care about and just don't want to care
about fixed indention on some places. Especially if we follow the pathfinder
rule we face a lot of these situations because these changes don't break the
code in many languages but improve the readability a lot.
So this change introduce a fine graned button to adjust the way how the
reviewer want to see whitespace-changes within the code.
The possibilities reflect the possibilities from git itself except of the
`--ignore-blank-lines` flag because that one is also handled by `-b` and is
really rare.
Signed-off-by: Felix Nehrke <felix@nehrke.info>
Diffstat (limited to 'templates')
| -rw-r--r-- | templates/repo/diff/box.tmpl | 21 | ||||
| -rw-r--r-- | templates/repo/diff/whitespace_dropdown.tmpl | 23 |
2 files changed, 43 insertions, 1 deletions
diff --git a/templates/repo/diff/box.tmpl b/templates/repo/diff/box.tmpl index 0a9552acc1..382442fe34 100644 --- a/templates/repo/diff/box.tmpl +++ b/templates/repo/diff/box.tmpl @@ -1,4 +1,19 @@ {{if .DiffNotAvailable}} + <div class="diff-detail-box diff-box ui sticky"> + <div> + <div class="ui right"> + {{if .PageIsPullFiles}} + {{template "repo/diff/whitespace_dropdown" .}} + {{else}} + <a class="ui tiny basic toggle button" href="?style={{if .IsSplitStyle}}unified{{else}}split{{end}}">{{ if .IsSplitStyle }}{{.i18n.Tr "repo.diff.show_unified_view"}}{{else}}{{.i18n.Tr "repo.diff.show_split_view"}}{{end}}</a> + {{end}} + <a class="ui tiny basic toggle button" data-target="#diff-files">{{.i18n.Tr "repo.diff.show_diff_stats"}}</a> + {{if and .PageIsPullFiles $.SignedUserID}} + {{template "repo/diff/new_review" .}} + {{end}} + </div> + </div> + </div> <h4>{{.i18n.Tr "repo.diff.data_not_available"}}</h4> {{else}} <div class="diff-detail-box diff-box ui sticky"> @@ -6,7 +21,11 @@ <i class="fa fa-retweet"></i> {{.i18n.Tr "repo.diff.stats_desc" .Diff.NumFiles .Diff.TotalAddition .Diff.TotalDeletion | Str2html}} <div class="ui right"> - <a class="ui tiny basic toggle button" href="?style={{if .IsSplitStyle}}unified{{else}}split{{end}}">{{ if .IsSplitStyle }}{{.i18n.Tr "repo.diff.show_unified_view"}}{{else}}{{.i18n.Tr "repo.diff.show_split_view"}}{{end}}</a> + {{if .PageIsPullFiles}} + {{template "repo/diff/whitespace_dropdown" .}} + {{else}} + <a class="ui tiny basic toggle button" href="?style={{if .IsSplitStyle}}unified{{else}}split{{end}}">{{ if .IsSplitStyle }}{{.i18n.Tr "repo.diff.show_unified_view"}}{{else}}{{.i18n.Tr "repo.diff.show_split_view"}}{{end}}</a> + {{end}} <a class="ui tiny basic toggle button" data-target="#diff-files">{{.i18n.Tr "repo.diff.show_diff_stats"}}</a> {{if and .PageIsPullFiles $.SignedUserID}} {{template "repo/diff/new_review" .}} diff --git a/templates/repo/diff/whitespace_dropdown.tmpl b/templates/repo/diff/whitespace_dropdown.tmpl new file mode 100644 index 0000000000..65fd871ba5 --- /dev/null +++ b/templates/repo/diff/whitespace_dropdown.tmpl @@ -0,0 +1,23 @@ +<div class="ui dropdown tiny button"> + {{.i18n.Tr "repo.diff.whitespace_button"}} + <i class="dropdown icon"></i> + <div class="menu"> + <a class="item" href="?style={{if .IsSplitStyle}}split{{else}}unified{{end}}&whitespace="> + <i class="circle {{ if eq .WhitespaceBehavior "" }}dot{{else}}outline{{end}} icon"></i> + {{.i18n.Tr "repo.diff.whitespace_show_everything"}} + </a> + <a class="item" href="?style={{if .IsSplitStyle}}split{{else}}unified{{end}}&whitespace=ignore-all"> + <i class="circle {{ if eq .WhitespaceBehavior "ignore-all" }}dot{{else}}outline{{end}} icon"></i> + {{.i18n.Tr "repo.diff.whitespace_ignore_all_whitespace"}} + </a> + <a class="item" href="?style={{if .IsSplitStyle}}split{{else}}unified{{end}}&whitespace=ignore-change"> + <i class="circle {{ if eq .WhitespaceBehavior "ignore-change" }}dot{{else}}outline{{end}} icon"></i> + {{.i18n.Tr "repo.diff.whitespace_ignore_amount_changes"}} + </a> + <a class="item" href="?style={{if .IsSplitStyle}}split{{else}}unified{{end}}&whitespace=ignore-eol"> + <i class="circle {{ if eq .WhitespaceBehavior "ignore-eol" }}dot{{else}}outline{{end}} icon"></i> + {{.i18n.Tr "repo.diff.whitespace_ignore_at_eol"}} + </a> + </div> +</div> +<a class="ui tiny basic toggle button" href="?style={{if .IsSplitStyle}}unified{{else}}split{{end}}&whitespace={{$.WhitespaceBehavior}}">{{ if .IsSplitStyle }}{{.i18n.Tr "repo.diff.show_unified_view"}}{{else}}{{.i18n.Tr "repo.diff.show_split_view"}}{{end}}</a> |