diff options
Diffstat (limited to 'templates')
| -rw-r--r-- | templates/repo/diff/box.tmpl (renamed from templates/repo/diff_box.tmpl) | 24 | ||||
| -rw-r--r-- | templates/repo/diff/page.tmpl (renamed from templates/repo/diff.tmpl) | 2 | ||||
| -rw-r--r-- | templates/repo/diff/section_unified.tmpl | 23 | ||||
| -rw-r--r-- | templates/repo/editor/diff_preview.tmpl | 25 | ||||
| -rw-r--r-- | templates/repo/editor/diff_preview_new.tmpl | 12 | ||||
| -rw-r--r-- | templates/repo/editor/edit.tmpl | 15 | ||||
| -rw-r--r-- | templates/repo/pulls/compare.tmpl | 2 | ||||
| -rw-r--r-- | templates/repo/pulls/files.tmpl | 2 |
8 files changed, 38 insertions, 67 deletions
diff --git a/templates/repo/diff_box.tmpl b/templates/repo/diff/box.tmpl index 8394598875..4f6c70a328 100644 --- a/templates/repo/diff_box.tmpl +++ b/templates/repo/diff/box.tmpl @@ -52,7 +52,6 @@ </h4> </div> {{else}} - {{$highlightClass := $file.GetHighlightClass}} <div class="diff-file-box diff-box file-content {{TabSizeClass $.Editorconfig $file.Name}}" id="diff-{{.Index}}"> <h4 class="ui top attached normal header"> <div class="diff-counter count ui left"> @@ -90,6 +89,7 @@ <table> <tbody> {{if $.IsSplitStyle}} + {{$highlightClass := $file.GetHighlightClass}} {{range $j, $section := $file.Sections}} {{range $k, $line := $section.Lines}} <tr class="{{DiffLineTypeToStr .GetType}}-code nl-{{$k}} ol-{{$k}}"> @@ -109,27 +109,7 @@ {{end}} {{end}} {{else}} - {{range $j, $section := $file.Sections}} - {{range $k, $line := $section.Lines}} - <tr class="{{DiffLineTypeToStr .GetType}}-code nl-{{$k}} ol-{{$k}}"> - {{if eq .GetType 4}} - <td colspan="2" class="lines-num"> - {{/* {{if gt $j 0}}<span class="fold octicon octicon-fold"></span>{{end}} */}} - </td> - {{else}} - <td class="lines-num lines-num-old"> - <span rel="{{if $line.LeftIdx}}diff-{{Sha1 $file.Name}}L{{$line.LeftIdx}}{{end}}">{{if $line.LeftIdx}}{{$line.LeftIdx}}{{end}}</span> - </td> - <td class="lines-num lines-num-new"> - <span rel="{{if $line.RightIdx}}diff-{{Sha1 $file.Name}}R{{$line.RightIdx}}{{end}}">{{if $line.RightIdx}}{{$line.RightIdx}}{{end}}</span> - </td> - {{end}} - <td class="lines-code"> - <pre><code class="{{if $highlightClass}}language-{{$highlightClass}}{{else}}nohighlight{{end}}">{{$section.GetComputedInlineDiffFor $line}}</code></pre> - </td> - </tr> - {{end}} - {{end}} + {{template "repo/diff/section_unified" .}} {{end}} </tbody> </table> diff --git a/templates/repo/diff.tmpl b/templates/repo/diff/page.tmpl index e9f12ab932..0a35a80427 100644 --- a/templates/repo/diff.tmpl +++ b/templates/repo/diff/page.tmpl @@ -39,7 +39,7 @@ </div> {{end}} - {{template "repo/diff_box" .}} + {{template "repo/diff/box" .}} </div> </div> {{template "base/footer" .}} diff --git a/templates/repo/diff/section_unified.tmpl b/templates/repo/diff/section_unified.tmpl new file mode 100644 index 0000000000..ee66b6dc9a --- /dev/null +++ b/templates/repo/diff/section_unified.tmpl @@ -0,0 +1,23 @@ +{{$file := .}} +{{$highlightClass := $file.GetHighlightClass}} +{{range $j, $section := $file.Sections}} + {{range $k, $line := $section.Lines}} + <tr class="{{DiffLineTypeToStr .GetType}}-code nl-{{$k}} ol-{{$k}}"> + {{if eq .GetType 4}} + <td colspan="2" class="lines-num"> + {{/* {{if gt $j 0}}<span class="fold octicon octicon-fold"></span>{{end}} */}} + </td> + {{else}} + <td class="lines-num lines-num-old"> + <span rel="{{if $line.LeftIdx}}diff-{{Sha1 $file.Name}}L{{$line.LeftIdx}}{{end}}">{{if $line.LeftIdx}}{{$line.LeftIdx}}{{end}}</span> + </td> + <td class="lines-num lines-num-new"> + <span rel="{{if $line.RightIdx}}diff-{{Sha1 $file.Name}}R{{$line.RightIdx}}{{end}}">{{if $line.RightIdx}}{{$line.RightIdx}}{{end}}</span> + </td> + {{end}} + <td class="lines-code"> + <pre><code class="{{if $highlightClass}}language-{{$highlightClass}}{{else}}nohighlight{{end}}">{{$section.GetComputedInlineDiffFor $line}}</code></pre> + </td> + </tr> + {{end}} +{{end}}
\ No newline at end of file diff --git a/templates/repo/editor/diff_preview.tmpl b/templates/repo/editor/diff_preview.tmpl index 1c4787a33c..06b4a2e830 100644 --- a/templates/repo/editor/diff_preview.tmpl +++ b/templates/repo/editor/diff_preview.tmpl @@ -1,29 +1,10 @@ -{{$highlightClass := .File.GetHighlightClass}} -<div class="diff-file-box diff-box file-content" id="diff-{{.Index}}"> +<div class="diff-file-box"> <div class="ui attached table segment"> <div class="file-body file-code code-view code-diff"> <table> <tbody> - {{range $j, $section := .File.Sections}} - {{range $k, $line := $section.Lines}} - <tr class="{{DiffLineTypeToStr .GetType}}-code nl-{{$k}} ol-{{$k}}"> - {{if eq .GetType 4}} - <td colspan="2" class="lines-num"> - {{/* {{if gt $j 0}}<span class="fold octicon octicon-fold"></span>{{end}} */}} - </td> - {{else}} - <td class="lines-num lines-num-old"> - <span rel="{{if $line.LeftIdx}}diff-{{Sha1 $.File.Name}}L{{$line.LeftIdx}}{{end}}">{{if $line.LeftIdx}}{{$line.LeftIdx}}{{end}}</span> - </td> - <td class="lines-num lines-num-new"> - <span rel="{{if $line.RightIdx}}diff-{{Sha1 $.File.Name}}R{{$line.RightIdx}}{{end}}">{{if $line.RightIdx}}{{$line.RightIdx}}{{end}}</span> - </td> - {{end}} - <td class="lines-code"> - <pre><code class="{{if $highlightClass}}language-{{$highlightClass}}{{else}}nohighlight{{end}}">{{$section.GetComputedInlineDiffFor $line}}</code></pre> - </td> - </tr> - {{end}} + {{with .File}} + {{template "repo/diff/section_unified" .}} {{end}} </tbody> </table> diff --git a/templates/repo/editor/diff_preview_new.tmpl b/templates/repo/editor/diff_preview_new.tmpl deleted file mode 100644 index 34abfe1823..0000000000 --- a/templates/repo/editor/diff_preview_new.tmpl +++ /dev/null @@ -1,12 +0,0 @@ -<div id="file-content" class="ui attached table segment"> - <div class="file-view code-view has-emoji"> - <table> - <tbody> - <tr> - <td class="lines-num"></td> - <td class="lines-code"><pre><code><ol class="linenums">{{.FileContent}}</ol></code></pre></td> - </tr> - </tbody> - </table> - </div> -</div> diff --git a/templates/repo/editor/edit.tmpl b/templates/repo/editor/edit.tmpl index 377c00bf01..9de55c65a1 100644 --- a/templates/repo/editor/edit.tmpl +++ b/templates/repo/editor/edit.tmpl @@ -1,9 +1,9 @@ {{template "base/head" .}} -<div class="repository file editor"> +<div class="repository file editor edit"> {{template "repo/header" .}} <div class="ui container"> {{template "base/alert" .}} - <form class="ui edit form" action="{{EscapePound $.Link}}" method="post"> + <form class="ui edit form" method="post"> {{.CsrfTokenHtml}} <input type="hidden" name="last_commit" value="{{.last_commit}}"> <div class="ui secondary menu"> @@ -15,24 +15,23 @@ {{range $i, $v := .TreeNames}} <div class="divider"> / </div> {{if eq $i $l}} - <input id="file-name" value="{{$v}}" placeholder="{{$.i18n.Tr "repo.name_your_file"}}" required autofocus> - <span class="octicon octicon-info poping up" data-content="{{$.i18n.Tr "repo.filename_help"}}" data-position="bottom center" data-variation="tiny"></span> + <input id="file-name" value="{{$v}}" placeholder="{{$.i18n.Tr "repo.editor.name_your_file"}}" required autofocus> + <span class="octicon octicon-info poping up" data-content="{{$.i18n.Tr "repo.editor.filename_help"}}" data-position="bottom center" data-variation="tiny inverted"></span> {{else}} <span class="section"><a href="{{EscapePound $.BranchLink}}/{{EscapePound $v}}">{{$v}}</a></span> {{end}} {{end}} - <!-- <button class="clipboard-tree-name octicon octicon-clippy poping up" type="button" data-content="{{.i18n.Tr "repo.copy_file_path_to_clipboard"}}" data-position="bottom center" data-variation="tiny inverted"></button> --> - <span class="repo-edit-file-cancel">{{.i18n.Tr "repo.or"}} <a href="{{EscapePound $.BranchLink}}{{if not .IsNewFile}}/{{EscapePound .TreePath}}{{end}}">{{.i18n.Tr "repo.cancel_lower"}}</a></span> + <span>{{.i18n.Tr "repo.editor.or"}} <a href="{{EscapePound $.BranchLink}}{{if not .IsNewFile}}/{{EscapePound .TreePath}}{{end}}">{{.i18n.Tr "repo.editor.cancel_lower"}}</a></span> <input type="hidden" id="tree_path" name="tree_path" value="{{.TreePath}}" required> </div> </div> </div> <div class="field"> <div class="ui top attached tabular menu" data-write="write" data-preview="preview" data-diff="diff"> - <a class="active item" data-tab="write"><i class="octicon octicon-code"></i> {{if .IsNewFile}}{{.i18n.Tr "repo.new_file"}}{{else}}{{.i18n.Tr "repo.edit_file"}}{{end}}</a> + <a class="active item" data-tab="write"><i class="octicon octicon-code"></i> {{if .IsNewFile}}{{.i18n.Tr "repo.editor.new_file"}}{{else}}{{.i18n.Tr "repo.editor.edit_file"}}{{end}}</a> {{if not .IsNewFile}} <a class="item" data-tab="preview" data-url="{{AppSubUrl}}/api/v1/markdown" data-context="{{.RepoLink}}" data-preview-file-modes="{{.PreviewableFileModes}}"><i class="octicon octicon-eye"></i> {{.i18n.Tr "repo.release.preview"}}</a> - <a class="item" data-tab="diff" data-url="{{.RepoLink}}/_preview/{{.BranchName}}/{{.TreePath}}" data-context="{{.BranchLink}}"><i class="octicon octicon-diff"></i> {{.i18n.Tr "repo.preview_changes"}}</a> + <a class="item" data-tab="diff" data-url="{{.RepoLink}}/_preview/{{.BranchName}}/{{.TreePath}}" data-context="{{.BranchLink}}"><i class="octicon octicon-diff"></i> {{.i18n.Tr "repo.editor.preview_changes"}}</a> {{end}} </div> <div class="ui bottom attached active tab segment" data-tab="write"> diff --git a/templates/repo/pulls/compare.tmpl b/templates/repo/pulls/compare.tmpl index 7069fe3f05..5b71fa5217 100644 --- a/templates/repo/pulls/compare.tmpl +++ b/templates/repo/pulls/compare.tmpl @@ -57,7 +57,7 @@ {{else}} {{template "repo/issue/new_form" .}} {{template "repo/commits_table" .}} - {{template "repo/diff_box" .}} + {{template "repo/diff/box" .}} {{end}} </div> diff --git a/templates/repo/pulls/files.tmpl b/templates/repo/pulls/files.tmpl index 19a75e0763..7663788c68 100644 --- a/templates/repo/pulls/files.tmpl +++ b/templates/repo/pulls/files.tmpl @@ -12,7 +12,7 @@ {{template "repo/issue/view_title" .}} {{template "repo/pulls/tab_menu" .}} <div class="ui bottom attached tab pull segment active"> - {{template "repo/diff_box" .}} + {{template "repo/diff/box" .}} </div> </div> </div> |