Browse Source

Unified/Inline Diff-View Selectable

pull/2288/head
Kim "BKC" Carlbäcker 9 years ago
parent
commit
573c8d2b53
  1. 2
      routers/repo/commit.go
  2. 19
      templates/repo/diff_box.tmpl

2
routers/repo/commit.go

@ -168,6 +168,7 @@ func Diff(ctx *middleware.Context) {
} }
} }
ctx.Data["Style"] = ctx.Query("style") == "unified";
ctx.Data["Username"] = userName ctx.Data["Username"] = userName
ctx.Data["Reponame"] = repoName ctx.Data["Reponame"] = repoName
ctx.Data["IsImageFile"] = commit.IsImageFile ctx.Data["IsImageFile"] = commit.IsImageFile
@ -213,6 +214,7 @@ func CompareDiff(ctx *middleware.Context) {
} }
commits = models.ValidateCommitsWithEmails(commits) commits = models.ValidateCommitsWithEmails(commits)
ctx.Data["Style"] = ctx.Query("style") == "unified";
ctx.Data["CommitRepoLink"] = ctx.Repo.RepoLink ctx.Data["CommitRepoLink"] = ctx.Repo.RepoLink
ctx.Data["Commits"] = commits ctx.Data["Commits"] = commits
ctx.Data["CommitCount"] = commits.Len() ctx.Data["CommitCount"] = commits.Len()

19
templates/repo/diff_box.tmpl

@ -6,10 +6,8 @@
<i class="fa fa-retweet"></i> <i class="fa fa-retweet"></i>
{{.i18n.Tr "repo.diff.stats_desc" .Diff.NumFiles .Diff.TotalAddition .Diff.TotalDeletion | Str2html}} {{.i18n.Tr "repo.diff.stats_desc" .Diff.NumFiles .Diff.TotalAddition .Diff.TotalDeletion | Str2html}}
<div class="ui right"> <div class="ui right">
<div class="ui buttons"> <button class="ui tiny basic toggle button">{{ .Style }}</button>
<button class="ui tiny basic toggle button" data-target="#inline">Inline</button> <a class="ui tiny basic toggle button" href="?style={{if .Style}}inline{{else}}unified{{end}}">{{ if .Style }}Inline{{else}}Unified{{end}}</a>
<button class="ui tiny basic toggle button" data-target="#unified">Unified</button>
</div>
<button class="ui tiny basic toggle button" data-target="#diff-files">{{.i18n.Tr "repo.diff.show_diff_stats"}}</button> <button class="ui tiny basic toggle button" data-target="#diff-files">{{.i18n.Tr "repo.diff.show_diff_stats"}}</button>
</div> </div>
</div> </div>
@ -36,10 +34,11 @@
</ol> </ol>
</div> </div>
<div id="unified" class="hide"> {{if .Style}}
{{ template "repo/diff_box_unified.tmpl" . }} {{ template "repo/diff_box_unified" . }}
</div> {{else}}
<div if="inline" class=""> {{ template "repo/diff_box_inline" . }}
{{ template "repo/diff_box_inline.tmpl" . }} {{end}}
</div> <script>
</script>
{{end}} {{end}}

Loading…
Cancel
Save