|
23 | 23 | </div> |
24 | 24 | </td> |
25 | 25 | <td colspan="7" class="lines-code lines-code-old ">{{$inlineDiff := $.section.GetComputedInlineDiffFor $line ctx.Locale}}{{/* |
| 26 | + */}}<button type="button" aria-label="{{ctx.Locale.Tr "repo.diff.comment.add_line_comment"}}" class="ui primary button add-code-comment add-code-comment-{{if $line.RightIdx}}right{{else}}left{{end}}{{if (not $line.CanComment)}} tw-invisible{{end}}" data-side="{{if $line.RightIdx}}right{{else}}left{{end}}" data-idx="{{if $line.RightIdx}}{{$line.RightIdx}}{{else}}{{$line.LeftIdx}}{{end}}">{{/* |
| 27 | + */}}{{svg "octicon-plus"}}{{/* |
| 28 | + */}}</button>{{/* |
26 | 29 | */}}{{template "repo/diff/section_code" dict "diff" $inlineDiff}}</td> |
27 | 30 | {{else}} |
28 | 31 | {{$inlineDiff := $.section.GetComputedInlineDiffFor $line ctx.Locale}} |
29 | 32 | <td class="lines-num lines-num-old" data-line-num="{{if $line.LeftIdx}}{{$line.LeftIdx}}{{end}}"><span rel="{{if $line.LeftIdx}}diff-{{$.FileNameHash}}L{{$line.LeftIdx}}{{end}}"></span></td> |
30 | 33 | <td class="lines-escape lines-escape-old">{{if and $line.LeftIdx $inlineDiff.EscapeStatus.Escaped}}<button class="toggle-escape-button btn interact-bg" title="{{template "repo/diff/escape_title" dict "diff" $inlineDiff}}"></button>{{end}}</td> |
31 | 34 | <td class="lines-type-marker lines-type-marker-old">{{if $line.LeftIdx}}<span class="tw-font-mono" data-type-marker=""></span>{{end}}</td> |
32 | 35 | <td class="lines-code lines-code-old">{{/* |
| 36 | + */}}<button type="button" aria-label="{{ctx.Locale.Tr "repo.diff.comment.add_line_comment"}}" class="ui primary button add-code-comment add-code-comment-{{if $line.RightIdx}}right{{else}}left{{end}}{{if (not $line.CanComment)}} tw-invisible{{end}}" data-side="{{if $line.RightIdx}}right{{else}}left{{end}}" data-idx="{{if $line.RightIdx}}{{$line.RightIdx}}{{else}}{{$line.LeftIdx}}{{end}}">{{/* |
| 37 | + */}}{{svg "octicon-plus"}}{{/* |
| 38 | + */}}</button>{{/* |
33 | 39 | */}}{{if $line.LeftIdx}}{{template "repo/diff/section_code" dict "diff" $inlineDiff}}{{else}}{{/* |
34 | 40 | */}}<code class="code-inner"></code>{{/* |
35 | 41 | */}}{{end}}{{/* |
|
38 | 44 | <td class="lines-escape lines-escape-new">{{if and $line.RightIdx $inlineDiff.EscapeStatus.Escaped}}<button class="toggle-escape-button btn interact-bg" title="{{template "repo/diff/escape_title" dict "diff" $inlineDiff}}"></button>{{end}}</td> |
39 | 45 | <td class="lines-type-marker lines-type-marker-new">{{if $line.RightIdx}}<span class="tw-font-mono" data-type-marker=""></span>{{end}}</td> |
40 | 46 | <td class="lines-code lines-code-new">{{/* |
| 47 | + */}}<button type="button" aria-label="{{ctx.Locale.Tr "repo.diff.comment.add_line_comment"}}" class="ui primary button add-code-comment add-code-comment-{{if $line.RightIdx}}right{{else}}left{{end}}{{if (not $line.CanComment)}} tw-invisible{{end}}" data-side="{{if $line.RightIdx}}right{{else}}left{{end}}" data-idx="{{if $line.RightIdx}}{{$line.RightIdx}}{{else}}{{$line.LeftIdx}}{{end}}">{{/* |
| 48 | + */}}{{svg "octicon-plus"}}{{/* |
| 49 | + */}}</button>{{/* |
41 | 50 | */}}{{if $line.RightIdx}}{{template "repo/diff/section_code" dict "diff" $inlineDiff}}{{else}}{{/* |
42 | 51 | */}}<code class="code-inner"></code>{{/* |
43 | 52 | */}}{{end}}{{/* |
44 | 53 | */}}</td> |
45 | 54 | {{end}} |
46 | 55 | </tr> |
| 56 | + {{if $line.Comments}} |
| 57 | + <tr class="add-comment" data-line-type="{{.GetHTMLDiffLineType}}"> |
| 58 | + <td class="add-comment-left add-comment-right" colspan="5"> |
| 59 | + {{template "repo/diff/conversation" dict "." $.root "comments" $line.Comments}} |
| 60 | + </td> |
| 61 | + </tr> |
| 62 | + {{end}} |
47 | 63 | {{end}} |
48 | 64 | {{else}} |
49 | 65 | {{range $k, $line := $.section.Lines}} |
|
76 | 92 | {{$inlineDiff := $.section.GetComputedInlineDiffFor $line ctx.Locale}} |
77 | 93 | <td class="lines-escape">{{if $inlineDiff.EscapeStatus.Escaped}}<button class="toggle-escape-button btn interact-bg" title="{{template "repo/diff/escape_title" dict "diff" $inlineDiff}}"></button>{{end}}</td> |
78 | 94 | <td class="lines-type-marker"><span class="tw-font-mono" data-type-marker="{{$line.GetLineTypeMarker}}"></span></td> |
79 | | - <td class="lines-code{{if (not $line.RightIdx)}} lines-code-old{{end}}"><code {{if $inlineDiff.EscapeStatus.Escaped}}class="code-inner has-escaped" title="{{template "repo/diff/escape_title" dict "diff" $inlineDiff}}"{{else}}class="code-inner"{{end}}>{{$inlineDiff.Content}}</code></td> |
| 95 | + <td class="lines-code{{if (not $line.RightIdx)}} lines-code-old{{end}}"><button type="button" aria-label="{{ctx.Locale.Tr "repo.diff.comment.add_line_comment"}}" class="ui primary button add-code-comment add-code-comment-{{if $line.RightIdx}}right{{else}}left{{end}}{{if (not $line.CanComment)}} tw-invisible{{end}}" data-side="{{if $line.RightIdx}}right{{else}}left{{end}}" data-idx="{{if $line.RightIdx}}{{$line.RightIdx}}{{else}}{{$line.LeftIdx}}{{end}}">{{svg "octicon-plus"}}</button><code {{if $inlineDiff.EscapeStatus.Escaped}}class="code-inner has-escaped" title="{{template "repo/diff/escape_title" dict "diff" $inlineDiff}}"{{else}}class="code-inner"{{end}}>{{$inlineDiff.Content}}</code></td> |
80 | 96 | </tr> |
| 97 | + {{if $line.Comments}} |
| 98 | + <tr class="add-comment" data-line-type="{{.GetHTMLDiffLineType}}"> |
| 99 | + <td class="add-comment-left add-comment-right" colspan="5"> |
| 100 | + {{template "repo/diff/conversation" dict "." $.root "comments" $line.Comments}} |
| 101 | + </td> |
| 102 | + </tr> |
| 103 | + {{end}} |
81 | 104 | {{end}} |
82 | 105 | {{end}} |
0 commit comments