Платформа ЦРНП "Мирокод" для разработки проектов
https://git.mirocod.ru
You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
153 lines
9.8 KiB
153 lines
9.8 KiB
{{$file := .file}} |
|
{{range $j, $section := $file.Sections}} |
|
{{range $k, $line := $section.Lines}} |
|
{{$hasmatch := ne $line.Match -1}} |
|
{{if or (ne .GetType 2) (not $hasmatch)}} |
|
<tr class="{{DiffLineTypeToStr .GetType}}-code nl-{{$k}} ol-{{$k}}" data-line-type="{{DiffLineTypeToStr .GetType}}"> |
|
{{if eq .GetType 4}} |
|
<td class="lines-num lines-num-old"> |
|
{{if or (eq $line.GetExpandDirection 3) (eq $line.GetExpandDirection 5) }} |
|
<a role="button" class="blob-excerpt" data-url="{{$.root.RepoLink}}/blob_excerpt/{{PathEscape $.root.AfterCommitID}}" data-query="{{$line.GetBlobExcerptQuery}}&style=split&direction=down&wiki={{$.root.PageIsWiki}}" data-anchor="diff-{{Sha1 $file.Name}}K{{$line.SectionInfo.RightIdx}}"> |
|
{{svg "octicon-fold-down"}} |
|
</a> |
|
{{end}} |
|
{{if or (eq $line.GetExpandDirection 3) (eq $line.GetExpandDirection 4) }} |
|
<a role="button" class="blob-excerpt" data-url="{{$.root.RepoLink}}/blob_excerpt/{{PathEscape $.root.AfterCommitID}}" data-query="{{$line.GetBlobExcerptQuery}}&style=split&direction=up&wiki={{$.root.PageIsWiki}}" data-anchor="diff-{{Sha1 $file.Name}}K{{$line.SectionInfo.RightIdx}}"> |
|
{{svg "octicon-fold-up"}} |
|
</a> |
|
{{end}} |
|
{{if eq $line.GetExpandDirection 2}} |
|
<a role="button" class="blob-excerpt" data-url="{{$.root.RepoLink}}/blob_excerpt/{{PathEscape $.root.AfterCommitID}}" data-query="{{$line.GetBlobExcerptQuery}}&style=split&direction=&wiki={{$.root.PageIsWiki}}" data-anchor="diff-{{Sha1 $file.Name}}K{{$line.SectionInfo.RightIdx}}"> |
|
{{svg "octicon-fold"}} |
|
</a> |
|
{{end}} |
|
</td>{{$inlineDiff := $section.GetComputedInlineDiffFor $line}} |
|
<td class="lines-escape lines-escape-old">{{if $inlineDiff.EscapeStatus.Escaped}}<a href="" class="toggle-escape-button" title="{{$.i18n.Tr "repo.line_unicode"}}"></a>{{end}}</td> |
|
<td colspan="6" class="lines-code lines-code-old "><code {{if $inlineDiff.EscapeStatus.Escaped}}class="code-inner has-escaped" title="{{$.root.i18n.Tr "repo.line_unicode"}}"{{else}}class="code-inner"{{end}}>{{$inlineDiff.Content}}</span></td> |
|
{{else if and (eq .GetType 3) $hasmatch}}{{/* DEL */}} |
|
{{$match := index $section.Lines $line.Match}} |
|
{{- $leftDiff := ""}}{{if $line.LeftIdx}}{{$leftDiff = $section.GetComputedInlineDiffFor $line}}{{end}} |
|
{{- $rightDiff := ""}}{{if $match.RightIdx}}{{$rightDiff = $section.GetComputedInlineDiffFor $match}}{{end}} |
|
<td class="lines-num lines-num-old del-code" data-line-num="{{$line.LeftIdx}}"><span rel="diff-{{Sha1 $file.Name}}L{{$line.LeftIdx}}"></span></td> |
|
<td class="lines-escape del-code lines-escape-old">{{if $line.LeftIdx}}{{if $leftDiff.EscapeStatus.Escaped}}<a href="" class="toggle-escape-button" title="{{$.i18n.Tr "repo.line_unicode"}}"></a>{{end}}{{end}}</td> |
|
<td class="lines-type-marker lines-type-marker-old del-code"><span class="mono" data-type-marker="{{$line.GetLineTypeMarker}}"></span></td> |
|
<td class="lines-code lines-code-old halfwidth del-code">{{/* |
|
*/}}{{if and $.root.SignedUserID $.root.PageIsPullFiles}}{{/* |
|
*/}}<a class="ui primary button add-code-comment add-code-comment-left{{if (not $line.CanComment)}} invisible{{end}}" data-side="left" data-idx="{{$line.LeftIdx}}">{{/* |
|
*/}}{{svg "octicon-plus"}}{{/* |
|
*/}}</a>{{/* |
|
*/}}{{end}}{{/* |
|
*/}}{{if $line.LeftIdx}}{{/* |
|
*/}}<code {{if $leftDiff.EscapeStatus.Escaped}}class="code-inner has-escaped" title="{{$.root.i18n.Tr "repo.line_unicode"}}"{{else}}class="code-inner"{{end}}>{{$leftDiff.Content}}</code>{{/* |
|
*/}}{{else}}{{/* |
|
*/}}<code class="code-inner"></code>{{/* |
|
*/}}{{end}}{{/* |
|
*/}}</td> |
|
<td class="lines-num lines-num-new add-code" data-line-num="{{if $match.RightIdx}}{{$match.RightIdx}}{{end}}"><span rel="{{if $match.RightIdx}}diff-{{Sha1 $file.Name}}R{{$match.RightIdx}}{{end}}"></span></td> |
|
<td class="lines-escape add-code lines-escape-new">{{if $match.RightIdx}}{{if $rightDiff.EscapeStatus.Escaped}}<a href="" class="toggle-escape-button" title="{{$.i18n.Tr "repo.line_unicode"}}"></a>{{end}}{{end}}</td> |
|
<td class="lines-type-marker lines-type-marker-new add-code">{{if $match.RightIdx}}<span class="mono" data-type-marker="{{$match.GetLineTypeMarker}}"></span>{{end}}</td> |
|
<td class="lines-code lines-code-new halfwidth add-code">{{/* |
|
*/}}{{if and $.root.SignedUserID $.root.PageIsPullFiles}}{{/* |
|
*/}}<a class="ui primary button add-code-comment add-code-comment-right{{if (not $match.CanComment)}} invisible{{end}}" data-side="right" data-idx="{{$match.RightIdx}}">{{/* |
|
*/}}{{svg "octicon-plus"}}{{/* |
|
*/}}</a>{{/* |
|
*/}}{{end}}{{/* |
|
*/}}{{if $match.RightIdx}}{{/* |
|
*/}}<code {{if $rightDiff.EscapeStatus.Escaped}}class="code-inner has-escaped" title="{{$.root.i18n.Tr "repo.line_unicode"}}"{{else}}class="code-inner"{{end}}>{{$rightDiff.Content}}</code>{{/* |
|
*/}}{{else}}{{/* |
|
*/}}<code class="code-inner"></code>{{/* |
|
*/}}{{end}}{{/* |
|
*/}}</td> |
|
{{else}} |
|
{{$inlineDiff := $section.GetComputedInlineDiffFor $line}} |
|
<td class="lines-num lines-num-old" data-line-num="{{if $line.LeftIdx}}{{$line.LeftIdx}}{{end}}"><span rel="{{if $line.LeftIdx}}diff-{{Sha1 $file.Name}}L{{$line.LeftIdx}}{{end}}"></span></td> |
|
<td class="lines-escape lines-escape-old">{{if $line.LeftIdx}}{{if $inlineDiff.EscapeStatus.Escaped}}<a href="" class="toggle-escape-button" title="{{$.i18n.Tr "repo.line_unicode"}}"></a>{{end}}{{end}}</td> |
|
<td class="lines-type-marker lines-type-marker-old">{{if $line.LeftIdx}}<span class="mono" data-type-marker="{{$line.GetLineTypeMarker}}"></span>{{end}}</td> |
|
<td class="lines-code lines-code-old halfwidth">{{/* |
|
*/}}{{if and $.root.SignedUserID $.root.PageIsPullFiles (not (eq .GetType 2))}}{{/* |
|
*/}}<a class="ui primary button add-code-comment add-code-comment-left{{if (not $line.CanComment)}} invisible{{end}}" data-side="left" data-idx="{{$line.LeftIdx}}">{{/* |
|
*/}}{{svg "octicon-plus"}}{{/* |
|
*/}}</a>{{/* |
|
*/}}{{end}}{{/* |
|
*/}}{{if $line.LeftIdx}}{{/* |
|
*/}}<code {{if $inlineDiff.EscapeStatus.Escaped}}class="code-inner has-escaped" title="{{$.root.i18n.Tr "repo.line_unicode"}}"{{else}}class="code-inner"{{end}}>{{$inlineDiff.Content}}</code>{{/* |
|
*/}}{{else}}{{/* |
|
*/}}<code class="code-inner"></code>{{/* |
|
*/}}{{end}}{{/* |
|
*/}}</td> |
|
<td class="lines-num lines-num-new" data-line-num="{{if $line.RightIdx}}{{$line.RightIdx}}{{end}}"><span rel="{{if $line.RightIdx}}diff-{{Sha1 $file.Name}}R{{$line.RightIdx}}{{end}}"></span></td> |
|
<td class="lines-escape lines-escape-new">{{if $line.RightIdx}}{{if $inlineDiff.EscapeStatus.Escaped}}<a href="" class="toggle-escape-button" title="{{$.i18n.Tr "repo.line_unicode"}}"></a>{{end}}{{end}}</td> |
|
<td class="lines-type-marker lines-type-marker-new">{{if $line.RightIdx}}<span class="mono" data-type-marker="{{$line.GetLineTypeMarker}}"></span>{{end}}</td> |
|
<td class="lines-code lines-code-new halfwidth">{{/* |
|
*/}}{{if and $.root.SignedUserID $.root.PageIsPullFiles (not (eq .GetType 3))}}{{/* |
|
*/}}<a class="ui primary button add-code-comment add-code-comment-right{{if (not $line.CanComment)}} invisible{{end}}" data-side="right" data-idx="{{$line.RightIdx}}">{{/* |
|
*/}}{{svg "octicon-plus"}}{{/* |
|
*/}}</a>{{/* |
|
*/}}{{end}}{{/* |
|
*/}}{{if $line.RightIdx}}{{/* |
|
*/}}<code {{if $inlineDiff.EscapeStatus.Escaped}}class="code-inner has-escaped" title="{{$.root.i18n.Tr "repo.line_unicode"}}"{{else}}class="code-inner"{{end}}>{{$inlineDiff.Content}}</code>{{/* |
|
*/}}{{else}}{{/* |
|
*/}}<code class="code-inner"></code>{{/* |
|
*/}}{{end}}{{/* |
|
*/}}</td> |
|
{{end}} |
|
</tr> |
|
{{if and (eq .GetType 3) $hasmatch}} |
|
{{$match := index $section.Lines $line.Match}} |
|
{{if or (gt (len $line.Comments) 0) (gt (len $match.Comments) 0)}} |
|
<tr class="add-comment" data-line-type="{{DiffLineTypeToStr .GetType}}"> |
|
<td class="lines-num"></td> |
|
<td class="lines-escape"></td> |
|
<td class="lines-type-marker"></td> |
|
<td class="add-comment-left"> |
|
{{if gt (len $line.Comments) 0}} |
|
{{if eq $line.GetCommentSide "previous"}} |
|
{{template "repo/diff/conversation" mergeinto $.root "comments" $line.Comments}} |
|
{{end}} |
|
{{end}} |
|
{{if gt (len $match.Comments) 0}} |
|
{{if eq $match.GetCommentSide "previous"}} |
|
{{template "repo/diff/conversation" mergeinto $.root "comments" $match.Comments}} |
|
{{end}} |
|
{{end}} |
|
</td> |
|
<td class="lines-num"></td> |
|
<td class="lines-escape"></td> |
|
<td class="lines-type-marker"></td> |
|
<td class="add-comment-right"> |
|
{{if eq $line.GetCommentSide "proposed"}} |
|
{{template "repo/diff/conversation" mergeinto $.root "comments" $line.Comments}} |
|
{{end}} |
|
{{if gt (len $match.Comments) 0}} |
|
{{if eq $match.GetCommentSide "proposed"}} |
|
{{template "repo/diff/conversation" mergeinto $.root "comments" $match.Comments}} |
|
{{end}} |
|
{{end}} |
|
</td> |
|
</tr> |
|
{{end}} |
|
{{else if gt (len $line.Comments) 0}} |
|
<tr class="add-comment" data-line-type="{{DiffLineTypeToStr .GetType}}"> |
|
<td class="lines-num"></td> |
|
<td class="lines-escape"></td> |
|
<td class="lines-type-marker"></td> |
|
<td class="add-comment-left"> |
|
{{if gt (len $line.Comments) 0}} |
|
{{if eq $line.GetCommentSide "previous"}} |
|
{{template "repo/diff/conversation" mergeinto $.root "comments" $line.Comments}} |
|
{{end}} |
|
{{end}} |
|
</td> |
|
<td class="lines-num"></td> |
|
<td class="lines-escape"></td> |
|
<td class="lines-type-marker"></td> |
|
<td class="add-comment-right"> |
|
{{if eq $line.GetCommentSide "proposed"}} |
|
{{template "repo/diff/conversation" mergeinto $.root "comments" $line.Comments}} |
|
{{end}} |
|
</td> |
|
</tr> |
|
{{end}} |
|
{{end}} |
|
{{end}} |
|
{{end}}
|
|
|