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.

172 lines
7.0 KiB

9 years ago
8 years ago
  1. {{if .DiffNotAvailable}}
  2. <h4>{{.i18n.Tr "repo.diff.data_not_available"}}</h4>
  3. {{else}}
  4. <div class="diff-detail-box diff-box">
  5. <div>
  6. <i class="fa fa-retweet"></i>
  7. {{.i18n.Tr "repo.diff.stats_desc" .Diff.NumFiles .Diff.TotalAddition .Diff.TotalDeletion | Str2html}}
  8. <div class="ui right">
  9. <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>
  10. <a class="ui tiny basic toggle button" data-target="#diff-files">{{.i18n.Tr "repo.diff.show_diff_stats"}}</a>
  11. </div>
  12. </div>
  13. <ol class="detail-files hide" id="diff-files">
  14. {{range .Diff.Files}}
  15. <li>
  16. <div class="diff-counter count pull-right">
  17. {{if not .IsBin}}
  18. <span class="add" data-line="{{.Addition}}">{{.Addition}}</span>
  19. <span class="bar">
  20. <span class="pull-left add"></span>
  21. <span class="pull-left del"></span>
  22. </span>
  23. <span class="del" data-line="{{.Deletion}}">{{.Deletion}}</span>
  24. {{else}}
  25. <span>{{$.i18n.Tr "repo.diff.bin"}}</span>
  26. {{end}}
  27. </div>
  28. <!-- todo finish all file status, now modify, add, delete and rename -->
  29. <span class="status {{DiffTypeToStr .GetType}} poping up" data-content="{{DiffTypeToStr .GetType}}" data-variation="inverted tiny" data-position="right center">&nbsp;</span>
  30. <a class="file" href="#diff-{{.Index}}">{{.Name}}</a>
  31. </li>
  32. {{end}}
  33. </ol>
  34. </div>
  35. {{range $i, $file := .Diff.Files}}
  36. {{if $file.IsIncomplete}}
  37. <div class="diff-file-box diff-box file-content">
  38. <h4 class="ui top attached normal header">
  39. {{$.i18n.Tr "repo.diff.file_suppressed"}}
  40. <div class="diff-counter count ui left">
  41. {{if not $file.IsRenamed}}
  42. <span class="add" data-line="{{.Addition}}">+ {{.Addition}}</span>
  43. <span class="bar">
  44. <span class="pull-left add"></span>
  45. <span class="pull-left del"></span>
  46. </span>
  47. <span class="del" data-line="{{.Deletion}}">- {{.Deletion}}</span>
  48. {{end}}
  49. </div>
  50. <span class="file">{{$file.Name}}</span>
  51. </h4>
  52. </div>
  53. {{else}}
  54. {{$highlightClass := $file.GetHighlightClass}}
  55. <div class="diff-file-box diff-box file-content {{TabSizeClass $.Editorconfig $file.Name}}" id="diff-{{.Index}}">
  56. <h4 class="ui top attached normal header">
  57. <div class="diff-counter count ui left">
  58. {{if $file.IsBin}}
  59. {{$.i18n.Tr "repo.diff.bin"}}
  60. {{else if not $file.IsRenamed}}
  61. <span class="add" data-line="{{.Addition}}">+ {{.Addition}}</span>
  62. <span class="bar">
  63. <span class="pull-left add"></span>
  64. <span class="pull-left del"></span>
  65. </span>
  66. <span class="del" data-line="{{.Deletion}}">- {{.Deletion}}</span>
  67. {{end}}
  68. </div>
  69. <span class="file">{{if $file.IsRenamed}}{{$file.OldName}} &rarr; {{end}}{{$file.Name}}</span>
  70. {{if not $file.IsSubmodule}}
  71. <div class="ui right">
  72. {{if $file.IsDeleted}}
  73. <a class="ui basic tiny button" rel="nofollow" href="{{EscapePound $.BeforeSourcePath}}/{{EscapePound .Name}}">{{$.i18n.Tr "repo.diff.view_file"}}</a>
  74. {{else}}
  75. <a class="ui basic tiny button" rel="nofollow" href="{{EscapePound $.SourcePath}}/{{EscapePound .Name}}">{{$.i18n.Tr "repo.diff.view_file"}}</a>
  76. {{end}}
  77. </div>
  78. {{end}}
  79. </h4>
  80. <div class="ui attached table segment">
  81. {{if not $file.IsRenamed}}
  82. {{$isImage := (call $.IsImageFile $file.Name)}}
  83. {{if and $isImage}}
  84. <div class="center">
  85. <img src="{{$.RawPath}}/{{EscapePound .Name}}">
  86. </div>
  87. {{else}}
  88. <div class="file-body file-code code-view code-diff">
  89. <table>
  90. <tbody>
  91. {{if $.IsSplitStyle}}
  92. {{range $j, $section := .Sections}}
  93. {{range $k, $line := .Lines}}
  94. <tr class="{{DiffLineTypeToStr .GetType}}-code nl-{{$k}} ol-{{$k}}">
  95. <td class="lines-num lines-num-old">
  96. <span rel="{{if $line.LeftIdx}}diff-{{Sha1 $file.Name}}L{{$line.LeftIdx}}{{end}}">{{if $line.LeftIdx}}{{$line.LeftIdx}}{{end}}</span>
  97. </td>
  98. <td class="lines-code halfwidth">
  99. <pre><code class="wrap {{if $highlightClass}}language-{{$highlightClass}}{{else}}nohighlight{{end}}">{{if $line.LeftIdx}}{{$section.GetComputedInlineDiffFor $line}}{{end}}</code></pre>
  100. </td>
  101. <td class="lines-num lines-num-new">
  102. <span rel="{{if $line.RightIdx}}diff-{{Sha1 $file.Name}}R{{$line.RightIdx}}{{end}}">{{if $line.RightIdx}}{{$line.RightIdx}}{{end}}</span>
  103. </td>
  104. <td class="lines-code halfwidth">
  105. <pre><code class="wrap {{if $highlightClass}}language-{{$highlightClass}}{{else}}nohighlight{{end}}">{{if $line.RightIdx}}{{$section.GetComputedInlineDiffFor $line}}{{end}}</code></pre>
  106. </td>
  107. </tr>
  108. {{end}}
  109. {{end}}
  110. {{else}}
  111. {{range $j, $section := .Sections}}
  112. {{range $k, $line := .Lines}}
  113. <tr class="{{DiffLineTypeToStr .GetType}}-code nl-{{$k}} ol-{{$k}}">
  114. {{if eq .GetType 4}}
  115. <td colspan="2" class="lines-num">
  116. {{/* {{if gt $j 0}}<span class="fold octicon octicon-fold"></span>{{end}} */}}
  117. </td>
  118. {{else}}
  119. <td class="lines-num lines-num-old">
  120. <span rel="{{if $line.LeftIdx}}diff-{{Sha1 $file.Name}}L{{$line.LeftIdx}}{{end}}">{{if $line.LeftIdx}}{{$line.LeftIdx}}{{end}}</span>
  121. </td>
  122. <td class="lines-num lines-num-new">
  123. <span rel="{{if $line.RightIdx}}diff-{{Sha1 $file.Name}}R{{$line.RightIdx}}{{end}}">{{if $line.RightIdx}}{{$line.RightIdx}}{{end}}</span>
  124. </td>
  125. {{end}}
  126. <td class="lines-code">
  127. <pre><code class="{{if $highlightClass}}language-{{$highlightClass}}{{else}}nohighlight{{end}}">{{$section.GetComputedInlineDiffFor $line}}</code></pre>
  128. </td>
  129. </tr>
  130. {{end}}
  131. {{end}}
  132. {{end}}
  133. </tbody>
  134. </table>
  135. </div>
  136. {{end}}
  137. {{end}}
  138. </div>
  139. </div>
  140. {{end}}
  141. <br>
  142. {{end}}
  143. {{if .Diff.IsIncomplete}}
  144. <div class="diff-file-box diff-box file-content">
  145. <h4 class="ui top attached normal header">
  146. {{$.i18n.Tr "repo.diff.too_many_files"}}
  147. </h4>
  148. </div>
  149. {{end}}
  150. {{if .IsSplitStyle}}
  151. <script>
  152. (function() {
  153. $('.add-code').each(function() {
  154. var prev = $(this).prev();
  155. if(prev.is('.del-code') && prev.children().eq(3).text().trim() === '') {
  156. while(prev.prev().is('.del-code') && prev.prev().children().eq(3).text().trim() === '') {
  157. prev = prev.prev();
  158. }
  159. prev.children().eq(3).html($(this).children().eq(3).html());
  160. prev.children().eq(2).html($(this).children().eq(2).html());
  161. prev.children().eq(3).addClass('add-code');
  162. prev.children().eq(2).addClass('add-code');
  163. $(this).remove();
  164. }
  165. });
  166. }());
  167. </script>
  168. {{end}}
  169. {{end}}