2015-09-02 01:07:02 +02:00
{{ if .DiffNotAvailable }}
2018-08-14 19:49:33 +02:00
< 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 }}
2019-10-15 12:44:36 +02:00
{{ template "repo/diff/options_dropdown" . }}
2019-01-23 19:58:38 +01:00
{{ if and .PageIsPullFiles $.SignedUserID ( not .IsArchived ) }}
2018-08-14 19:49:33 +02:00
{{ template "repo/diff/new_review" . }}
{{ end }}
< / div >
< / div >
< / div >
2015-12-07 23:30:52 +01:00
< h4 > {{ .i18n.Tr "repo.diff.data_not_available" }} </ h4 >
2015-09-02 01:07:02 +02:00
{{ else }}
2019-10-21 09:51:24 +02:00
< div >
< div class = "diff-detail-box diff-box ui sticky" >
2015-12-07 23:30:52 +01:00
< i class = "fa fa-retweet" > < / i >
{{ .i18n.Tr "repo.diff.stats_desc" .Diff.NumFiles .Diff.TotalAddition .Diff.TotalDeletion | Str2html }}
< div class = "ui right" >
2018-08-14 19:49:33 +02:00
{{ 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 }}
2019-10-15 12:44:36 +02:00
{{ template "repo/diff/options_dropdown" . }}
2019-01-23 19:58:38 +01:00
{{ if and .PageIsPullFiles $.SignedUserID ( not .IsArchived ) }}
2018-08-06 06:43:22 +02:00
{{ template "repo/diff/new_review" . }}
{{ end }}
2015-12-07 23:30:52 +01:00
< / div >
< / div >
2019-10-21 09:51:24 +02:00
< ol class = "diff-detail-box diff-stats detail-files hide" id = "diff-files" >
2015-12-07 23:30:52 +01:00
{{ range .Diff.Files }}
< li >
< div class = "diff-counter count pull-right" >
{{ if not .IsBin }}
2019-10-21 09:51:24 +02:00
< span class = "add" data-line = " {{ .Addition }} " > +{{ .Addition }} </ span >
2015-12-07 23:30:52 +01:00
< span class = "bar" >
2017-12-14 19:26:59 +01:00
< div class = "pull-left add" > < / div >
< div class = "pull-left del" > < / div >
2015-12-07 23:30:52 +01:00
< / span >
2019-10-21 09:51:24 +02:00
< span class = "del" data-line = " {{ .Deletion }} " > -{{ .Deletion }} </ span >
2015-12-07 23:30:52 +01:00
{{ else }}
< span > {{ $.i18n.Tr "repo.diff.bin" }} </ span >
{{ end }}
< / div >
<!-- todo finish all file status, now modify, add, delete and rename -->
2016-01-06 21:00:40 +01:00
< span class = "status {{ DiffTypeToStr .GetType }} poping up" data-content = " {{ DiffTypeToStr .GetType }} " data-variation = "inverted tiny" data-position = "right center" > </ span >
2015-12-07 23:30:52 +01:00
< a class = "file" href = "#diff- {{ .Index }} " > {{ .Name }} </ a >
< / li >
{{ end }}
< / ol >
2019-10-21 09:51:24 +02:00
{{ range $i , $file := .Diff.Files }}
{{ if $file .IsIncomplete }}
< div class = "diff-file-box diff-box file-content" >
< h4 class = "ui top attached normal header rounded" >
< div class = "diff-counter count ui left" >
{{ if not $file .IsRenamed }}
< span class = "add" data-line = " {{ .Addition }} " > + {{ .Addition }} </ span >
< span class = "bar" >
< div class = "pull-left add" > < / div >
< div class = "pull-left del" > < / div >
< / span >
< span class = "del" data-line = " {{ .Deletion }} " > - {{ .Deletion }} </ span >
{{ end }}
< / div >
< span class = "file" > {{ $file .Name }} </ span >
< div > {{ $.i18n.Tr "repo.diff.file_suppressed" }} </ div >
{{ if not $file .IsSubmodule }}
{{ if $file .IsDeleted }}
< a class = "ui basic grey tiny button" rel = "nofollow" href = " {{ EscapePound $.BeforeSourcePath }} / {{ EscapePound .Name }} " > {{ $.i18n.Tr "repo.diff.view_file" }} </ a >
{{ else }}
< a class = "ui basic grey tiny button" rel = "nofollow" href = " {{ EscapePound $.SourcePath }} / {{ EscapePound .Name }} " > {{ $.i18n.Tr "repo.diff.view_file" }} </ a >
{{ end }}
2017-09-10 22:21:26 +02:00
{{ end }}
2019-10-21 09:51:24 +02:00
< / h4 >
< / div >
{{ else }}
< div class = "diff-file-box diff-box file-content {{ TabSizeClass $.Editorconfig $file .Name }} " id = "diff- {{ .Index }} " >
2020-01-26 09:17:25 +01:00
< h4 class = "diff-file-header ui top attached normal header" >
2019-11-15 03:52:59 +01:00
{{ $isImage := false }}
{{ if $file .IsDeleted }}
{{ $isImage = ( call $.IsImageFileInBase $file .Name ) }}
{{ else }}
{{ $isImage = ( call $.IsImageFileInHead $file .Name ) }}
{{ end }}
{{ if or ( not $file .IsBin ) $isImage }}
< i class = "ui fold-code grey fa fa-chevron-down" > < / i >
{{ end }}
2019-10-21 09:51:24 +02:00
< div class = "diff-counter count" >
{{ if $file .IsBin }}
{{ $.i18n.Tr "repo.diff.bin" }}
{{ else if not $file .IsRenamed }}
< span class = "add" data-line = " {{ .Addition }} " > + {{ .Addition }} </ span >
< span class = "bar" >
< div class = "pull-left add" > < / div >
< div class = "pull-left del" > < / div >
< / span >
< span class = "del" data-line = " {{ .Deletion }} " > - {{ .Deletion }} </ span >
{{ end }}
< / div >
< span class = "file" > {{ if $file .IsRenamed }}{{ $file .OldName }} → {{ end }}{{ $file .Name }}{{ if .IsLFSFile }} ({{ $.i18n.Tr "repo.stored_lfs" }} ){{ end }} </ span >
{{ if not $file .IsSubmodule }}
{{ if $file .IsDeleted }}
< a class = "ui basic grey tiny button" rel = "nofollow" href = " {{ EscapePound $.BeforeSourcePath }} / {{ EscapePound .Name }} " > {{ $.i18n.Tr "repo.diff.view_file" }} </ a >
{{ else }}
< a class = "ui basic grey tiny button" rel = "nofollow" href = " {{ EscapePound $.SourcePath }} / {{ EscapePound .Name }} " > {{ $.i18n.Tr "repo.diff.view_file" }} </ a >
{{ end }}
2019-10-04 21:58:54 +02:00
{{ end }}
2019-10-21 09:51:24 +02:00
< / h4 >
2020-01-26 09:17:25 +01:00
< div class = "diff-file-body ui attached unstackable table segment" >
2019-10-21 09:51:24 +02:00
{{ if ne $file .Type 4 }}
2019-12-03 00:03:30 +01:00
< div class = "file-body file-code code-view has-context-menu code-diff {{ if $.IsSplitStyle }} code-diff-split {{ else }} code-diff-unified {{ end }} " >
2019-10-21 09:51:24 +02:00
< table >
< tbody >
{{ if $isImage }}
{{ template "repo/diff/image_diff" dict "file" . "root" $ }}
{{ else }}
{{ if $.IsSplitStyle }}
{{ $highlightClass := $file .GetHighlightClass }}
{{ range $j , $section := $file .Sections }}
{{ range $k , $line := $section .Lines }}
< tr class = " {{ DiffLineTypeToStr .GetType }} -code nl- {{ $k }} ol- {{ $k }} " >
2019-11-15 03:52:59 +01:00
{{ if eq .GetType 4 }}
< td class = "lines-num lines-num-old" >
{{ if or ( eq $line .GetExpandDirection 3 ) ( eq $line .GetExpandDirection 5 ) }}
< i class = "ui blob-excerpt fa fa-caret-down" data-url = " {{ $.RepoLink }} /blob_excerpt/ {{ $.AfterCommitID }} " data-query = " {{ $line .GetBlobExcerptQuery }} &style=split&direction=down" data-anchor = "diff- {{ Sha1 $file .Name }} K {{ $line .SectionInfo.RightIdx }} " ></ i >
{{ end }}
{{ if or ( eq $line .GetExpandDirection 3 ) ( eq $line .GetExpandDirection 4 ) }}
< i class = "ui blob-excerpt fa fa-caret-up" data-url = " {{ $.RepoLink }} /blob_excerpt/ {{ $.AfterCommitID }} " data-query = " {{ $line .GetBlobExcerptQuery }} &style=split&direction=up" data-anchor = "diff- {{ Sha1 $file .Name }} K {{ $line .SectionInfo.RightIdx }} " ></ i >
{{ end }}
{{ if or ( eq $line .GetExpandDirection 2 ) }}
< i class = "ui blob-excerpt octicon octicon-fold" data-url = " {{ $.RepoLink }} /blob_excerpt/ {{ $.AfterCommitID }} " data-query = " {{ $line .GetBlobExcerptQuery }} &style=split&direction=" data-anchor = "diff- {{ Sha1 $file .Name }} K {{ $line .SectionInfo.RightIdx }} " ></ i >
{{ end }}
< / td >
< td colspan = "5" class = "lines-code lines-code-old " >< span class = "mono wrap {{ if $highlightClass }} language- {{ $highlightClass }}{{ else }} nohighlight {{ end }} " > {{ $section .GetComputedInlineDiffFor $line }} </ span ></ td >
{{ else }}
< 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-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 $.SignedUserID $line .CanComment $.PageIsPullFiles ( not ( eq .GetType 2 )) }} < a class = "ui green button add-code-comment add-code-comment-left" data-path = " {{ $file .Name }} " data-side = "left" data-idx = " {{ $line .LeftIdx }} " > +</ a > {{ end }} < span class = "mono wrap {{ if $highlightClass }} language- {{ $highlightClass }}{{ else }} nohighlight {{ end }} " > {{ if $line .LeftIdx }}{{ $section .GetComputedInlineDiffFor $line }}{{ end }} </ span ></ 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-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 $.SignedUserID $line .CanComment $.PageIsPullFiles ( not ( eq .GetType 3 )) }} < a class = "ui green button add-code-comment add-code-comment-right" data-path = " {{ $file .Name }} " data-side = "right" data-idx = " {{ $line .RightIdx }} " > +</ a > {{ end }} < span class = "mono wrap {{ if $highlightClass }} language- {{ $highlightClass }}{{ else }} nohighlight {{ end }} " > {{ if $line .RightIdx }}{{ $section .GetComputedInlineDiffFor $line }}{{ end }} </ span ></ td >
{{ end }}
2019-10-21 09:51:24 +02:00
< / tr >
{{ if gt ( len $line .Comments ) 0 }}
< tr class = "add-code-comment" >
< td class = "lines-num" > < / td >
< td class = "lines-type-marker" > < / td >
< td class = "add-comment-left" >
{{ if eq $line .GetCommentSide "previous" }}
< div class = "field comment-code-cloud" >
< div class = "comment-list" >
< ui class = "ui comments" >
{{ template "repo/diff/comments" dict "root" $ "comments" $line .Comments }}
< / ui >
< / div >
{{ template "repo/diff/comment_form_datahandler" dict "reply" ( index $line .Comments 0 ) .ReviewID "hidden" true "root" $ "comment" ( index $line .Comments 0 ) }}
2018-08-06 06:43:22 +02:00
< / div >
2019-10-21 09:51:24 +02:00
{{ end }}
< / td >
< td class = "lines-num" > < / td >
< td class = "lines-type-marker" > < / td >
< td class = "add-comment-right" >
{{ if eq $line .GetCommentSide "proposed" }}
< div class = "field comment-code-cloud" >
< div class = "comment-list" >
< ui class = "ui comments" >
{{ template "repo/diff/comments" dict "root" $ "comments" $line .Comments }}
< / ui >
< / div >
{{ template "repo/diff/comment_form_datahandler" dict "reply" ( index $line .Comments 0 ) .ReviewID "hidden" true "root" $ "comment" ( index $line .Comments 0 ) }}
2018-08-06 06:43:22 +02:00
< / div >
2019-10-21 09:51:24 +02:00
{{ end }}
< / td >
< / tr >
{{ end }}
2018-08-06 06:43:22 +02:00
{{ end }}
2016-06-29 17:11:00 +02:00
{{ end }}
2019-10-21 09:51:24 +02:00
{{ else }}
{{ template "repo/diff/section_unified" dict "file" . "root" $ }}
2016-01-06 00:08:50 +01:00
{{ end }}
{{ end }}
2019-10-21 09:51:24 +02:00
< / tbody >
< / table >
< / div >
{{ end }}
< / div >
2016-06-29 17:11:00 +02:00
< / div >
2019-10-21 09:51:24 +02:00
{{ end }}
< br >
2016-06-29 17:11:00 +02:00
{{ end }}
2019-10-21 09:51:24 +02:00
{{ if .Diff.IsIncomplete }}
< div class = "diff-file-box diff-box file-content" >
< h4 class = "ui top attached normal header" >
{{ $.i18n.Tr "repo.diff.too_many_files" }}
< / h4 >
< / div >
{{ end }}
2016-06-29 17:11:00 +02:00
2019-10-21 09:51:24 +02:00
{{ if not $.Repository.IsArchived }}
< div id = "pull_review_add_comment" class = "hide" >
{{ template "repo/diff/new_comment" dict "root" . }}
< / div >
< div class = "hide" id = "edit-content-form" >
< div class = "ui comment form" >
< div class = "ui top attached tabular menu" >
< a class = "active write item" > {{ $.i18n.Tr "write" }} </ a >
< a class = "preview item" data-url = " {{ $.Repository.APIURL }} /markdown" data-context = " {{ $.RepoLink }} " > {{ $.i18n.Tr "preview" }} </ a >
< / div >
< div class = "ui bottom attached active write tab segment" >
2020-01-02 04:02:11 +01:00
< textarea class = "review-textarea" tabindex = "1" name = "content" > < / textarea >
2019-10-21 09:51:24 +02:00
< / div >
< div class = "ui bottom attached tab preview segment markdown" >
{{ $.i18n.Tr "loading" }}
< / div >
< div class = "text right edit buttons" >
< div class = "ui basic blue cancel button" tabindex = "3" > {{ .i18n.Tr "repo.issues.cancel" }} </ div >
< div class = "ui green save button" tabindex = "2" > {{ .i18n.Tr "repo.issues.save" }} </ div >
< / div >
< / div >
< / div >
{{ end }}
2018-08-06 06:43:22 +02:00
2019-10-21 09:51:24 +02:00
{{ if .IsSplitStyle }}
< script >
document.addEventListener('DOMContentLoaded', function() {
$('tr.add-code').each(function() {
var prev = $(this).prev();
if(prev.is('.del-code') & & prev.children().eq(5).text().trim() === '') {
while(prev.prev().is('.del-code') & & prev.prev().children().eq(5).text().trim() === '') {
prev = prev.prev();
}
prev.children().eq(3).attr("data-line-num", $(this).children().eq(3).attr("data-line-num"));
prev.children().eq(3).html($(this).children().eq(3).html());
prev.children().eq(4).html($(this).children().eq(4).html());
prev.children().eq(5).html($(this).children().eq(5).html());
2017-01-05 02:07:43 +01:00
2019-10-21 09:51:24 +02:00
prev.children().eq(0).addClass('del-code');
prev.children().eq(1).addClass('del-code');
prev.children().eq(2).addClass('del-code');
prev.children().eq(3).addClass('add-code');
prev.children().eq(4).addClass('add-code');
prev.children().eq(5).addClass('add-code');
2019-06-26 23:35:07 +02:00
2019-10-21 09:51:24 +02:00
$(this).remove();
}
});
2016-08-28 10:41:44 +02:00
});
2019-10-21 09:51:24 +02:00
< / script >
{{ end }}
< / div >
2015-09-02 01:07:02 +02:00
{{ end }}