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.

152 lines
6.0 KiB

9 years ago
8 years ago
Squashed commit of the following: commit 0afcb843d7ffd596991c4885cab768273a6eb42c Author: Richard Mahn <richard_mahn@wycliffeassociates.org> Date: Sun Jul 31 17:13:29 2016 -0600 Removed Upload stats as the upload table is just a temporary table commit 7ecd73ff5535612d79d471409173ee7f1fcfa157 Author: Richard Mahn <richard_mahn@wycliffeassociates.org> Date: Sun Jul 31 08:42:41 2016 -0600 Fix for CodeMirror mode commit c29b9ab531e2e7af0fb5db24dc17e51027dd1174 Author: Richard Mahn <richard_mahn@wycliffeassociates.org> Date: Sun Jul 31 08:03:33 2016 -0600 Made tabbing in editor use spaces commit 23af384c53206a8a40e11e45bf49d7a149c4adcd Author: Richard Mahn <richard_mahn@wycliffeassociates.org> Date: Sun Jul 31 07:56:46 2016 -0600 Fix for data-url commit cfb8a97591cb6fc0a92e49563b7b764c524db0e9 Merge: 7fc8a89 991ce42 Author: Richard Mahn <richard_mahn@wycliffeassociates.org> Date: Sun Jul 31 07:42:53 2016 -0600 Merge remote-tracking branch 'gogits/develop' into feature-create-and-edit-repo-file Conflicts: modules/bindata/bindata.go public/js/gogs.js commit 7fc8a89cb495478225b02d613e647f99a1489634 Merge: fd3d86c c03d040 Author: Richard Mahn <richard_mahn@wycliffeassociates.org> Date: Sun Jul 31 07:40:00 2016 -0600 Merge branch 'feature-create-and-edit-repo-file' of github.com:richmahn/gogs into feature-create-and-edit-repo-file commit fd3d86ca6bbc02cfda566a504ffd6b03db4f75ef Author: Richard Mahn <richard_mahn@wycliffeassociates.org> Date: Sun Jul 31 07:39:44 2016 -0600 Code cleanup commit c03d0401c1049eeeccc32ab1f9c3303c130be5ee Author: Richard Mahn <richard_mahn@wycliffeassociates.org> Date: Fri Jul 29 15:38:23 2016 -0600 Code cleanup commit 98e1206ccf9f9a4503c020e3a7830cf9f861dfae Author: Richard Mahn <richard_mahn@wycliffeassociates.org> Date: Thu Jul 28 18:36:01 2016 -0600 Code cleanup and fixes commit c2895dc742f25f8412879c9fa15e18f27f42f194 Author: Richard Mahn <richard_mahn@wycliffeassociates.org> Date: Thu Jul 28 18:24:04 2016 -0600 Fixes per Unknwon's requests commit 6aa7e46b21ad4c96e562daa2eac26a8fb408f8ef Merge: 889e9fa ad7ea88 Author: Richard Mahn <richard_mahn@wycliffeassociates.org> Date: Thu Jul 28 17:13:43 2016 -0600 Merge remote-tracking branch 'gogits/develop' into feature-create-and-edit-repo-file Conflicts: modules/bindata/bindata.go modules/setting/setting.go commit 889e9faf1bd8559a4979c8f46005d488c1a234d4 Author: Richard Mahn <richard_mahn@wycliffeassociates.org> Date: Fri Jul 22 14:09:18 2016 -0600 Fix in gogs.js commit 47603edf223f147b114be65f3bd27bc1e88827a5 Merge: bb57912 cf85e9e Author: Richard Mahn <richard_mahn@wycliffeassociates.org> Date: Fri Jul 22 14:07:36 2016 -0600 Merge remote-tracking branch 'gogits/develop' into feature-create-and-edit-repo-file Conflicts: modules/bindata/bindata.go public/js/gogs.js commit bb5791255867a71c11a77b639db050ad09c597a4 Author: Richard Mahn <richard_mahn@wycliffeassociates.org> Date: Fri Jul 22 14:02:18 2016 -0600 Update for using CodeMirror mode addon commit d10d128c51039be19e2af9c66c63db66a9f2ec6d Author: Richard Mahn <richard_mahn@wycliffeassociates.org> Date: Tue Jul 19 16:12:57 2016 -0600 Update for Edit commit 34a34982025144e3225e389f7849eb6273c1d576 Merge: fa1b752 1c7dcdd Author: Richard Mahn <richard_mahn@wycliffeassociates.org> Date: Tue Jul 19 11:52:02 2016 -0600 Merge remote-tracking branch 'gogits/develop' into feature-create-and-edit-repo-file Conflicts: modules/bindata/bindata.go commit fa1b752be29cd455c5184ddac2ffe80b3489763e Author: Richard Mahn <richard_mahn@wycliffeassociates.org> Date: Fri Jul 15 18:35:42 2016 -0600 Feature for editing, creating, uploading and deleting files
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. <div class="diff-file-box diff-box file-content {{TabSizeClass $.Editorconfig $file.Name}}" id="diff-{{.Index}}">
  55. <h4 class="ui top attached normal header">
  56. <div class="diff-counter count ui left">
  57. {{if $file.IsBin}}
  58. {{$.i18n.Tr "repo.diff.bin"}}
  59. {{else if not $file.IsRenamed}}
  60. <span class="add" data-line="{{.Addition}}">+ {{.Addition}}</span>
  61. <span class="bar">
  62. <span class="pull-left add"></span>
  63. <span class="pull-left del"></span>
  64. </span>
  65. <span class="del" data-line="{{.Deletion}}">- {{.Deletion}}</span>
  66. {{end}}
  67. </div>
  68. <span class="file">{{if $file.IsRenamed}}{{$file.OldName}} &rarr; {{end}}{{$file.Name}}</span>
  69. {{if not $file.IsSubmodule}}
  70. <div class="ui right">
  71. {{if $file.IsDeleted}}
  72. <a class="ui basic grey tiny button" rel="nofollow" href="{{EscapePound $.BeforeSourcePath}}/{{EscapePound .Name}}">{{$.i18n.Tr "repo.diff.view_file"}}</a>
  73. {{else}}
  74. <a class="ui basic grey tiny button" rel="nofollow" href="{{EscapePound $.SourcePath}}/{{EscapePound .Name}}">{{$.i18n.Tr "repo.diff.view_file"}}</a>
  75. {{end}}
  76. </div>
  77. {{end}}
  78. </h4>
  79. <div class="ui attached table segment">
  80. {{if not $file.IsRenamed}}
  81. {{$isImage := (call $.IsImageFile $file.Name)}}
  82. {{if and $isImage}}
  83. <div class="center">
  84. <img src="{{$.RawPath}}/{{EscapePound .Name}}">
  85. </div>
  86. {{else}}
  87. <div class="file-body file-code code-view code-diff">
  88. <table>
  89. <tbody>
  90. {{if $.IsSplitStyle}}
  91. {{$highlightClass := $file.GetHighlightClass}}
  92. {{range $j, $section := $file.Sections}}
  93. {{range $k, $line := $section.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. {{template "repo/diff/section_unified" .}}
  112. {{end}}
  113. </tbody>
  114. </table>
  115. </div>
  116. {{end}}
  117. {{end}}
  118. </div>
  119. </div>
  120. {{end}}
  121. <br>
  122. {{end}}
  123. {{if .Diff.IsIncomplete}}
  124. <div class="diff-file-box diff-box file-content">
  125. <h4 class="ui top attached normal header">
  126. {{$.i18n.Tr "repo.diff.too_many_files"}}
  127. </h4>
  128. </div>
  129. {{end}}
  130. {{if .IsSplitStyle}}
  131. <script>
  132. (function() {
  133. $('.add-code').each(function() {
  134. var prev = $(this).prev();
  135. if(prev.is('.del-code') && prev.children().eq(3).text().trim() === '') {
  136. while(prev.prev().is('.del-code') && prev.prev().children().eq(3).text().trim() === '') {
  137. prev = prev.prev();
  138. }
  139. prev.children().eq(3).html($(this).children().eq(3).html());
  140. prev.children().eq(2).html($(this).children().eq(2).html());
  141. prev.children().eq(3).addClass('add-code');
  142. prev.children().eq(2).addClass('add-code');
  143. $(this).remove();
  144. }
  145. });
  146. }());
  147. </script>
  148. {{end}}
  149. {{end}}