mirror of https://github.com/gogits/gogs.git
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.
176 lines
10 KiB
176 lines
10 KiB
{{template "ng/base/head" .}} |
|
{{template "ng/base/header" .}} |
|
<div id="repo-wrapper"> |
|
{{template "repo/header" .}} |
|
<div class="container clear" id="diff-page"> |
|
{{if .IsDiffCompare }} |
|
<div class="panel panel-info panel-radius compare-head-box"> |
|
<div class="panel-header"> |
|
<a class="pull-right btn btn-blue btn-header btn-medium btn-radius" rel="nofollow" href="{{.SourcePath}}">{{.i18n.Tr "repo.diff.browse_source"}}</a> |
|
<h4><a href="{{$.RepoLink}}/commit/{{.BeforeCommitId}}" class="label label-green">{{ShortSha .BeforeCommitId}}</a> ... <a href="{{$.RepoLink}}/commit/{{.AfterCommitId}}" class="label label-green">{{ShortSha .AfterCommitId}}</a></h4> |
|
</div> |
|
<div class="panel-body compare"> |
|
{{template "repo/commits_table" .}} |
|
</div> |
|
</div> |
|
{{else}} |
|
<div class="panel panel-info panel-radius diff-head-box"> |
|
<div class="panel-header"> |
|
<a class="pull-right btn btn-blue btn-header btn-medium btn-radius" rel="nofollow" href="{{.SourcePath}}">{{.i18n.Tr "repo.diff.browse_source"}}</a> |
|
<h4 class="commit-message">{{RenderCommitMessage .Commit.Message $.RepoLink}}</h4> |
|
</div> |
|
<div class="panel-body"> |
|
<span class="pull-right"> |
|
<ul class="list-unstyled"> |
|
<li class="inline">{{.i18n.Tr "repo.diff.parent"}}</li> |
|
{{range .Parents}} |
|
<li class="inline"><a href="{{$.RepoLink}}/commit/{{.}}"><span class="label label-blue">{{ShortSha .}}</span></a></li> |
|
{{end}} |
|
<li class="inline">{{.i18n.Tr "repo.diff.commit"}} <span class="label label-blue">{{ShortSha .CommitId}}</span></li> |
|
</ul> |
|
</span> |
|
<p class="author"> |
|
{{if .Author}} |
|
<img class="avatar-30" src="{{.Author.AvatarLink}}" /> |
|
<a href="{{AppSubUrl}}/{{.Author.Name}}"><strong>{{.Commit.Author.Name}}</strong></a> |
|
{{else}} |
|
<img class="avatar-30" src="{{AvatarLink .Commit.Author.Email}}" /> |
|
<strong>{{.Commit.Author.Name}}</strong> |
|
{{end}} |
|
<span class="text-grey" id="authored-time">{{TimeSince .Commit.Author.When $.Lang}}</span> |
|
</p> |
|
</div> |
|
</div> |
|
{{end}} |
|
{{if .DiffNotAvailable}} |
|
<h4>{{.i18n.Tr "repo.diff.data_not_available"}}</h4> |
|
{{else}} |
|
<div class="diff-detail-box diff-box"> |
|
<a class="pull-right btn btn-gray btn-header btn-radius text-black" data-target="#diff-files">{{.i18n.Tr "repo.diff.show_diff_stats"}}</a> |
|
<p class="showing"> |
|
<i class="fa fa-retweet"></i> |
|
{{.i18n.Tr "repo.diff.stats_desc" .Diff.NumFiles .Diff.TotalAddition .Diff.TotalDeletion | Str2html}} |
|
</p> |
|
<ol class="detail-files collapse hide" id="diff-files"> |
|
{{range .Diff.Files}} |
|
<li> |
|
<div class="diff-counter count pull-right"> |
|
{{if not .IsBin}} |
|
<span class="add" data-line="{{.Addition}}">{{.Addition}}</span> |
|
<span class="bar"> |
|
<span class="pull-left add"></span> |
|
<span class="pull-left del"></span> |
|
</span> |
|
<span class="del" data-line="{{.Deletion}}">{{.Deletion}}</span> |
|
{{else}} |
|
<span>{{$.i18n.Tr "repo.diff.bin"}}</span> |
|
{{end}} |
|
</div> |
|
<!-- todo finish all file status, now modify, add, delete and rename --> |
|
<span class="status {{DiffTypeToStr .Type}}" data-toggle="tooltip" data-placement="right" title="{{DiffTypeToStr .Type}}"> </span> |
|
<a class="file" href="#diff-{{.Index}}">{{.Name}}</a> |
|
</li> |
|
{{end}} |
|
</ol> |
|
</div> |
|
|
|
{{range $i, $file := .Diff.Files}} |
|
<div class="panel panel-radius diff-file-box diff-box file-content" id="diff-{{.Index}}"> |
|
<div class="panel-header"> |
|
<div class="diff-counter count pull-left"> |
|
{{if not $file.IsBin}} |
|
<span class="add" data-line="{{.Addition}}">+ {{.Addition}}</span> |
|
<span class="bar"> |
|
<span class="pull-left add"></span> |
|
<span class="pull-left del"></span> |
|
</span> |
|
<span class="del" data-line="{{.Deletion}}">- {{.Deletion}}</span> |
|
{{else}} |
|
{{$.i18n.Tr "repo.diff.bin"}} |
|
{{end}} |
|
</div> |
|
{{if $file.IsDeleted}} |
|
<a class="btn btn-gray btn-header btn-radius text-black pull-right" rel="nofollow" href="{{$.BeforeSourcePath}}/{{.Name}}">{{$.i18n.Tr "repo.diff.view_file"}}</a> |
|
{{else}} |
|
<a class="btn btn-gray btn-header btn-radius text-black pull-right" rel="nofollow" href="{{$.SourcePath}}/{{.Name}}">{{$.i18n.Tr "repo.diff.view_file"}}</a> |
|
{{end}} |
|
<span class="file">{{$file.Name}}</span> |
|
</div> |
|
{{$isImage := (call $.IsImageFile $file.Name)}} |
|
<div class="panel-body file-body file-code code-view code-diff"> |
|
{{if $isImage}} |
|
<div class="text-center"> |
|
<img src="{{$.RawPath}}/{{.Name}}"> |
|
</div> |
|
{{else}} |
|
<table> |
|
<tbody> |
|
{{range .Sections}} |
|
{{range $k, $line := .Lines}} |
|
<tr class="{{DiffLineTypeToStr .Type}}-code nl-{{$k}} ol-{{$k}}"> |
|
<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> |
|
<td class="lines-code"> |
|
{{if $.SignedUser}}{{if $k}}<b class="octicon octicon-plus" aria-label="{{$.i18n.Tr "repo.commits.comment.comment_line"}}"></b>{{end}}{{end}} |
|
<pre>{{$line.Content}}</pre> |
|
</td> |
|
</tr> |
|
{{$lineNum := (DiffLinePosToStr $file.Name $line.LeftIdx $line.RightIdx)}} |
|
{{if index $.Comments $lineNum }} |
|
<tr class="comment comment-{{$lineNum}}"> |
|
<td class="lines-code" colspan="3"> |
|
{{range (index $.Comments $lineNum)}} |
|
<a name="comment-{{.Id}}"></a> |
|
<div class="commit-comment clear" id="commit-comment-{{.Id}}"> |
|
<a class="author-avatar" href="{{AppSubUrl}}/{{.Poster.Name}}"> |
|
<img class="avatar-40 radius" |
|
src="{{.Poster.AvatarLink}}" |
|
alt=""></a> |
|
|
|
<div class="panel panel-radius"> |
|
<p class="panel-header clear"><a class="author-name" href="{{AppSubUrl}}/{{.Poster.Name}}">{{.Poster.Name}}</a> |
|
<span class="date">{{TimeSince .Created $.Lang}}</span> |
|
<span class="action right"> |
|
{{if eq $.Repository.Owner.Id .Poster.Id}} |
|
<span class="label label-black label-radius">{{$.i18n.Tr "repo.owner"}}</span> |
|
{{end}} |
|
{{if $.SignedUser}} |
|
{{if eq $.SignedUser.Id .Poster.Id}} |
|
<a href="#" class="edit-comment"><i class="octicon octicon-pencil"></i></a> |
|
<a href="#" data-id="{{.Id}}" class="remove-comment"><i class="octicon octicon-x"></i></a> |
|
{{end}} |
|
{{end}} |
|
</span> |
|
</p> |
|
|
|
<div class="panel-content content markdown"> |
|
{{if len .Content}} |
|
{{Str2html .Content}} |
|
{{else}} |
|
<i>No comment entered</i> |
|
{{end}} |
|
</div> |
|
</div> |
|
</div> |
|
{{end}} |
|
<button rel="diff-{{$lineNum}}" class="btn btn-gray btn-radius text-bold answer" value="close">{{$.i18n.Tr "repo.commits.comment.comment_line"}}</button> |
|
</td> |
|
</tr> |
|
{{end}} |
|
{{end}} |
|
{{end}} |
|
</tbody> |
|
</table> |
|
{{end}} |
|
</div> |
|
</div> |
|
<br> |
|
{{end}} |
|
{{end}} |
|
</div> |
|
</div> |
|
{{template "ng/base/footer" .}}
|
|
|