2014-10-10 19:40:51 -06:00
|
|
|
{{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>
|
2014-08-26 06:20:18 -06:00
|
|
|
</div>
|
|
|
|
<div class="panel-body compare">
|
2014-10-10 19:40:51 -06:00
|
|
|
{{template "repo/commits_table" .}}
|
2014-08-26 06:20:18 -06:00
|
|
|
</div>
|
|
|
|
</div>
|
2014-10-10 19:40:51 -06:00
|
|
|
{{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>
|
2015-01-30 16:05:20 -07:00
|
|
|
<h4 class="commit-message">{{RenderCommitMessage .Commit.Message $.RepoLink}}</h4>
|
2014-03-24 07:27:19 -06:00
|
|
|
</div>
|
|
|
|
<div class="panel-body">
|
|
|
|
<span class="pull-right">
|
2014-10-10 19:40:51 -06:00
|
|
|
<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>
|
2014-03-24 07:27:19 -06:00
|
|
|
</span>
|
|
|
|
<p class="author">
|
2014-10-10 19:40:51 -06:00
|
|
|
{{if .Author}}
|
2014-11-21 08:58:08 -07:00
|
|
|
<img class="avatar-30" src="{{.Author.AvatarLink}}" />
|
|
|
|
<a href="{{AppSubUrl}}/{{.Author.Name}}"><strong>{{.Commit.Author.Name}}</strong></a>
|
2014-10-10 19:40:51 -06:00
|
|
|
{{else}}
|
2014-11-21 08:58:08 -07:00
|
|
|
<img class="avatar-30" src="{{AvatarLink .Commit.Author.Email}}" />
|
2014-10-10 19:40:51 -06:00
|
|
|
<strong>{{.Commit.Author.Name}}</strong>
|
|
|
|
{{end}}
|
|
|
|
<span class="text-grey" id="authored-time">{{TimeSince .Commit.Author.When $.Lang}}</span>
|
2014-03-24 07:27:19 -06:00
|
|
|
</p>
|
2014-10-10 19:40:51 -06:00
|
|
|
</div>
|
2014-03-24 07:27:19 -06:00
|
|
|
</div>
|
2014-10-10 19:40:51 -06:00
|
|
|
{{end}}
|
2014-04-11 23:45:43 -06:00
|
|
|
{{if .DiffNotAvailable}}
|
2014-10-10 19:40:51 -06:00
|
|
|
<h4>{{.i18n.Tr "repo.diff.data_not_available"}}</h4>
|
2014-04-11 23:45:43 -06:00
|
|
|
{{else}}
|
2014-03-24 07:27:19 -06:00
|
|
|
<div class="diff-detail-box diff-box">
|
2014-10-10 19:40:51 -06:00
|
|
|
<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>
|
2014-03-24 07:27:19 -06:00
|
|
|
<p class="showing">
|
|
|
|
<i class="fa fa-retweet"></i>
|
2014-10-10 19:40:51 -06:00
|
|
|
{{.i18n.Tr "repo.diff.stats_desc" .Diff.NumFiles .Diff.TotalAddition .Diff.TotalDeletion | Str2html}}
|
2014-03-24 07:27:19 -06:00
|
|
|
</p>
|
2014-10-14 21:44:34 -06:00
|
|
|
<ol class="detail-files collapse hide" id="diff-files">
|
2014-03-25 21:53:01 -06:00
|
|
|
{{range .Diff.Files}}
|
2014-03-24 07:27:19 -06:00
|
|
|
<li>
|
|
|
|
<div class="diff-counter count pull-right">
|
2014-04-15 18:01:20 -06:00
|
|
|
{{if not .IsBin}}
|
2014-03-25 21:53:01 -06:00
|
|
|
<span class="add" data-line="{{.Addition}}">{{.Addition}}</span>
|
2014-03-24 07:27:19 -06:00
|
|
|
<span class="bar">
|
|
|
|
<span class="pull-left add"></span>
|
|
|
|
<span class="pull-left del"></span>
|
|
|
|
</span>
|
2014-03-25 21:53:01 -06:00
|
|
|
<span class="del" data-line="{{.Deletion}}">{{.Deletion}}</span>
|
2014-04-10 20:03:31 -06:00
|
|
|
{{else}}
|
2014-10-10 19:40:51 -06:00
|
|
|
<span>{{$.i18n.Tr "repo.diff.bin"}}</span>
|
2014-04-10 20:03:31 -06:00
|
|
|
{{end}}
|
2014-03-24 07:27:19 -06:00
|
|
|
</div>
|
|
|
|
<!-- todo finish all file status, now modify, add, delete and rename -->
|
2014-03-26 05:24:20 -06:00
|
|
|
<span class="status {{DiffTypeToStr .Type}}" data-toggle="tooltip" data-placement="right" title="{{DiffTypeToStr .Type}}"> </span>
|
2014-05-13 10:40:32 -06:00
|
|
|
<a class="file" href="#diff-{{.Index}}">{{.Name}}</a>
|
2014-03-24 07:27:19 -06:00
|
|
|
</li>
|
2014-03-25 21:53:01 -06:00
|
|
|
{{end}}
|
2014-03-24 07:27:19 -06:00
|
|
|
</ol>
|
|
|
|
</div>
|
|
|
|
|
2015-02-04 11:54:45 -07:00
|
|
|
{{range $i, $file := .Diff.Files}}
|
2014-10-11 16:20:07 -06:00
|
|
|
<div class="panel panel-radius diff-file-box diff-box file-content" id="diff-{{.Index}}">
|
2014-10-10 19:40:51 -06:00
|
|
|
<div class="panel-header">
|
2014-03-24 07:27:19 -06:00
|
|
|
<div class="diff-counter count pull-left">
|
2015-02-04 11:54:45 -07:00
|
|
|
{{if not $file.IsBin}}
|
2014-03-25 21:53:01 -06:00
|
|
|
<span class="add" data-line="{{.Addition}}">+ {{.Addition}}</span>
|
2014-03-24 07:27:19 -06:00
|
|
|
<span class="bar">
|
|
|
|
<span class="pull-left add"></span>
|
|
|
|
<span class="pull-left del"></span>
|
|
|
|
</span>
|
2014-03-25 21:53:01 -06:00
|
|
|
<span class="del" data-line="{{.Deletion}}">- {{.Deletion}}</span>
|
2014-04-10 20:03:31 -06:00
|
|
|
{{else}}
|
2014-10-10 19:40:51 -06:00
|
|
|
{{$.i18n.Tr "repo.diff.bin"}}
|
2014-04-10 20:03:31 -06:00
|
|
|
{{end}}
|
2014-03-24 07:27:19 -06:00
|
|
|
</div>
|
2014-10-10 19:40:51 -06:00
|
|
|
<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>
|
2015-02-04 11:54:45 -07:00
|
|
|
<span class="file">{{$file.Name}}</span>
|
2014-03-24 07:27:19 -06:00
|
|
|
</div>
|
2015-02-04 11:54:45 -07:00
|
|
|
{{$isImage := (call $.IsImageFile $file.Name)}}
|
2014-03-24 07:27:19 -06:00
|
|
|
<div class="panel-body file-body file-code code-view code-diff">
|
2014-03-27 11:17:09 -06:00
|
|
|
{{if $isImage}}
|
|
|
|
<div class="text-center">
|
|
|
|
<img src="{{$.RawPath}}/{{.Name}}">
|
|
|
|
</div>
|
|
|
|
{{else}}
|
2014-03-24 07:27:19 -06:00
|
|
|
<table>
|
|
|
|
<tbody>
|
2015-02-04 11:54:45 -07:00
|
|
|
{{range $j, $section := $file.Sections}}
|
|
|
|
{{range $k, $line := $section.Lines}}
|
2015-02-03 13:53:34 -07:00
|
|
|
<tr class="{{DiffLineTypeToStr .Type}}-code nl-{{$i}} ol-{{$i}}">
|
2014-03-25 21:53:01 -06:00
|
|
|
<td class="lines-num lines-num-old">
|
2015-02-04 11:54:45 -07:00
|
|
|
<span rel="L{{Add $i 1}}{{Add $j 1}}{{$k}}">{{if $line.LeftIdx}}{{$line.LeftIdx}}{{end}}</span>
|
2014-03-25 21:53:01 -06:00
|
|
|
</td>
|
|
|
|
<td class="lines-num lines-num-new">
|
2015-02-04 11:54:45 -07:00
|
|
|
<span rel="L{{Add $i 1}}{{Add $j 1}}{{$k}}">{{if $line.RightIdx}}{{$line.RightIdx}}{{end}}</span>
|
2014-03-25 21:53:01 -06:00
|
|
|
</td>
|
2014-10-04 11:19:14 -06:00
|
|
|
|
2014-03-25 21:53:01 -06:00
|
|
|
<td class="lines-code">
|
2015-02-03 13:53:34 -07:00
|
|
|
<pre>{{$line.Content}}</pre>
|
2014-03-25 21:53:01 -06:00
|
|
|
</td>
|
|
|
|
</tr>
|
|
|
|
{{end}}
|
2014-03-26 04:02:08 -06:00
|
|
|
{{end}}
|
2014-03-24 07:27:19 -06:00
|
|
|
</tbody>
|
|
|
|
</table>
|
2014-03-27 11:17:09 -06:00
|
|
|
{{end}}
|
2014-03-24 07:27:19 -06:00
|
|
|
</div>
|
|
|
|
</div>
|
2014-10-10 19:40:51 -06:00
|
|
|
<br>
|
2014-03-25 21:53:01 -06:00
|
|
|
{{end}}
|
2014-04-11 23:45:43 -06:00
|
|
|
{{end}}
|
2014-03-24 07:27:19 -06:00
|
|
|
</div>
|
|
|
|
</div>
|
2014-10-10 19:40:51 -06:00
|
|
|
{{template "ng/base/footer" .}}
|