diff options
author | ᴜɴᴋɴᴡᴏɴ <u@gogs.io> | 2020-03-08 19:09:31 +0800 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-03-08 19:09:31 +0800 |
commit | 6437d0180b97a26319b50c2e22927dac7c94fcdd (patch) | |
tree | 3d0d097e7f498e4b970065096e7500876d365a8b /templates/repo/diff | |
parent | c65b5b9f84dee21dc362311b299694e8e00f6ac6 (diff) |
git: migrate to github.com/gogs/git-module@v1.0.0 (#5958)
* WIP
* Finish `internal/db/git_diff.go`
* FInish internal/db/mirror.go
* Finish internal/db/pull.go
* Finish internal/db/release.go
* Finish internal/db/repo.go
* Finish internal/db/repo_branch.go
* Finish internal/db/repo_editor.go
* Finish internal/db/update.go
* Save my work
* Add license header
* Compile!
* Merge master
* Finish internal/cmd/hook.go
* Finish internal/conf/static.go
* Finish internal/context/repo.go
* Finish internal/db/action.go
* Finish internal/db/git_diff.go
* Fix submodule URL inferring
* Finish internal/db/mirror.go
* Updat to beta.4
* css: update fonts
* Finish internal/db/pull.go
* Finish internal/db/release.go
* Finish internal/db/repo_branch.go
* Finish internal/db/wiki.go
* gitutil: enhance infer submodule UR
* Finish internal/route/api/v1/repo/commits.go
* mirror: only collect branch commits after sync
* mirror: fix tag support
* Finish internal/db/repo.go
* Finish internal/db/repo_editor.go
* Finish internal/db/update.go
* Finish internal/gitutil/pull_request.go
* Make it compile
* Finish internal/route/repo/setting.go
* Finish internal/route/repo/branch.go
* Finish internal/route/api/v1/repo/file.go
* Finish internal/route/repo/download.go
* Finish internal/route/repo/editor.go
* Use helper
* Finish internal/route/repo/issue.go
* Finish internal/route/repo/pull.go
* Finish internal/route/repo/release.go
* Finish internal/route/repo/repo.go
* Finish internal/route/repo/wiki.go
* Finish internal/route/repo/commit.go
* Finish internal/route/repo/view.go
* Finish internal/gitutil/tag.go
* go.sum
Diffstat (limited to 'templates/repo/diff')
-rw-r--r-- | templates/repo/diff/box.tmpl | 34 | ||||
-rw-r--r-- | templates/repo/diff/section_unified.tmpl | 10 |
2 files changed, 22 insertions, 22 deletions
diff --git a/templates/repo/diff/box.tmpl b/templates/repo/diff/box.tmpl index eaa2882e..297c84f1 100644 --- a/templates/repo/diff/box.tmpl +++ b/templates/repo/diff/box.tmpl @@ -4,7 +4,7 @@ <div class="diff-detail-box diff-box"> <div> <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.TotalAdditions .Diff.TotalDeletions | 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> <a class="ui tiny basic toggle button" data-target="#diff-files">{{.i18n.Tr "repo.diff.show_diff_stats"}}</a> @@ -14,19 +14,19 @@ {{range .Diff.Files}} <li> <div class="diff-counter count pull-right"> - {{if not .IsBin}} - <span class="add" data-line="{{.Addition}}">{{.Addition}}</span> + {{if not .IsBinary}} + <span class="add" data-line="{{.NumAdditions}}">{{.NumAdditions}}</span> <span class="bar"> <span class="pull-left add"></span> <span class="pull-left del"></span> </span> - <span class="del" data-line="{{.Deletion}}">{{.Deletion}}</span> + <span class="del" data-line="{{.NumDeletions}}">{{.NumDeletions}}</span> {{else}} <span>{{$.i18n.Tr "repo.diff.bin"}}</span> {{end}} </div> <!-- todo finish all file status, now modify, add, delete and rename --> - <span class="status {{DiffTypeToStr .GetType}} poping up" data-content="{{DiffTypeToStr .GetType}}" data-variation="inverted tiny" data-position="right center"> </span> + <span class="status {{DiffFileTypeToStr .Type}} poping up" data-content="{{DiffFileTypeToStr .Type}}" data-variation="inverted tiny" data-position="right center"> </span> <a class="file" href="#diff-{{.Index}}">{{.Name}}</a> </li> {{end}} @@ -40,12 +40,12 @@ {{$.i18n.Tr "repo.diff.file_suppressed"}} <div class="diff-counter count ui left"> {{if not $file.IsRenamed}} - <span class="add" data-line="{{.Addition}}">+ {{.Addition}}</span> + <span class="add" data-line="{{.NumAdditions}}">+ {{.NumAdditions}}</span> <span class="bar"> <span class="pull-left add"></span> <span class="pull-left del"></span> </span> - <span class="del" data-line="{{.Deletion}}">- {{.Deletion}}</span> + <span class="del" data-line="{{.NumDeletions}}">- {{.NumDeletions}}</span> {{end}} </div> <span class="file">{{$file.Name}}</span> @@ -55,15 +55,15 @@ <div class="diff-file-box diff-box file-content {{TabSizeClass $.Editorconfig $file.Name}}" id="diff-{{.Index}}"> <h4 class="ui top attached normal header"> <div class="diff-counter count ui left"> - {{if $file.IsBin}} + {{if $file.IsBinary}} {{$.i18n.Tr "repo.diff.bin"}} {{else if not $file.IsRenamed}} - <span class="add" data-line="{{.Addition}}">+ {{.Addition}}</span> + <span class="add" data-line="{{.NumAdditions}}">+ {{.NumAdditions}}</span> <span class="bar"> <span class="pull-left add"></span> <span class="pull-left del"></span> </span> - <span class="del" data-line="{{.Deletion}}">- {{.Deletion}}</span> + <span class="del" data-line="{{.NumDeletions}}">- {{.NumDeletions}}</span> {{end}} </div> <span class="file">{{if $file.IsRenamed}}{{$file.OldName}} → {{end}}{{$file.Name}}</span> @@ -80,7 +80,7 @@ <div class="ui unstackable attached table segment"> {{if not $file.IsRenamed}} {{$isImage := (call $.IsImageFile $file.Name)}} - {{if and $isImage}} + {{if $isImage}} <div class="center"> <img src="{{$.RawPath}}/{{EscapePound .Name}}"> </div> @@ -92,22 +92,22 @@ {{$highlightClass := $file.HighlightClass}} {{range $j, $section := $file.Sections}} {{range $k, $line := $section.Lines}} - <tr class="{{DiffLineTypeToStr .GetType}}-code nl-{{$k}} ol-{{$k}}"> - {{if eq .GetType 4}} + <tr class="{{DiffLineTypeToStr .Type}}-code nl-{{$k}} ol-{{$k}}"> + {{if eq .Type 4}} <td class="lines-num"></td> <td colspan="3" class="lines-code"> <pre><code class="{{if $highlightClass}}language-{{$highlightClass}}{{else}}nohighlight{{end}}">{{$section.ComputedInlineDiffFor $line}}</code></pre> </td> {{else}} - <td class="lines-num lines-num-old" {{if $line.LeftIdx}} id="diff-{{Sha1 $file.Index}}L{{$line.LeftIdx}}" data-line-number="{{$line.LeftIdx}}"{{end}}> + <td class="lines-num lines-num-old" {{if $line.LeftLine}} id="diff-{{Sha1 $file.Index}}L{{$line.LeftLine}}" data-line-number="{{$line.LeftLine}}"{{end}}> </td> <td class="lines-code halfwidth"> - <pre><code class="wrap {{if $highlightClass}}language-{{$highlightClass}}{{else}}nohighlight{{end}}">{{if $line.LeftIdx}}{{$section.ComputedInlineDiffFor $line}}{{end}}</code></pre> + <pre><code class="wrap {{if $highlightClass}}language-{{$highlightClass}}{{else}}nohighlight{{end}}">{{if $line.LeftLine}}{{$section.ComputedInlineDiffFor $line}}{{end}}</code></pre> </td> - <td class="lines-num lines-num-new" {{if $line.RightIdx}} id="diff-{{Sha1 $file.Index}}R{{$line.RightIdx}}" data-line-number="{{$line.RightIdx}}"{{end}}> + <td class="lines-num lines-num-new" {{if $line.RightLine}} id="diff-{{Sha1 $file.Index}}R{{$line.RightLine}}" data-line-number="{{$line.RightLine}}"{{end}}> </td> <td class="lines-code halfwidth"> - <pre><code class="wrap {{if $highlightClass}}language-{{$highlightClass}}{{else}}nohighlight{{end}}">{{if $line.RightIdx}}{{$section.ComputedInlineDiffFor $line}}{{end}}</code></pre> + <pre><code class="wrap {{if $highlightClass}}language-{{$highlightClass}}{{else}}nohighlight{{end}}">{{if $line.RightLine}}{{$section.ComputedInlineDiffFor $line}}{{end}}</code></pre> </td> {{end}} </tr> diff --git a/templates/repo/diff/section_unified.tmpl b/templates/repo/diff/section_unified.tmpl index d85ea49d..9954a4ec 100644 --- a/templates/repo/diff/section_unified.tmpl +++ b/templates/repo/diff/section_unified.tmpl @@ -2,18 +2,18 @@ {{$highlightClass := $file.HighlightClass}} {{range $j, $section := $file.Sections}} {{range $k, $line := $section.Lines}} - <tr class="{{DiffLineTypeToStr .GetType}}-code nl-{{$k}} ol-{{$k}}"> - {{if eq .GetType 4}} + <tr class="{{DiffLineTypeToStr .Type}}-code nl-{{$k}} ol-{{$k}}"> + {{if eq .Type 4}} <td colspan="2" class="lines-num"> {{/* {{if gt $j 0}}<span class="fold octicon octicon-fold"></span>{{end}} */}} </td> {{else}} - <td class="lines-num lines-num-old" {{if $line.LeftIdx}} id="diff-{{$file.Index}}L{{$line.LeftIdx}}" data-line-number="{{$line.LeftIdx}}"{{end}}></td> - <td class="lines-num lines-num-new" {{if $line.RightIdx}} id="diff-{{$file.Index}}R{{$line.RightIdx}}" data-line-number="{{$line.RightIdx}}"{{end}}></td> + <td class="lines-num lines-num-old" {{if $line.LeftLine}} id="diff-{{$file.Index}}L{{$line.LeftLine}}" data-line-number="{{$line.LeftLine}}"{{end}}></td> + <td class="lines-num lines-num-new" {{if $line.RightLine}} id="diff-{{$file.Index}}R{{$line.RightLine}}" data-line-number="{{$line.RightLine}}"{{end}}></td> {{end}} <td class="lines-code"> <pre><code class="{{if $highlightClass}}language-{{$highlightClass}}{{else}}nohighlight{{end}}">{{$section.ComputedInlineDiffFor $line}}</code></pre> </td> </tr> {{end}} -{{end}}
\ No newline at end of file +{{end}} |