Files
GitList/themes/bootstrap3/twig/commit.twig
Mike Gelfand 5d3d7517f3 Show committer if it differs from author
It is quite useful sometimes to see that someone else (not you) has pushed
commit to remote. This change adds "C committed on D" phrase right after
"A authored on B" if author and committer are not the same person (judging
from email address).
2014-08-02 10:56:55 +03:00

84 lines
3.5 KiB
Twig

{% extends 'layout_page.twig' %}
{% set page = 'commits' %}
{% block title %}GitList{% endblock %}
{% block content %}
{% include 'breadcrumb.twig' with {breadcrumbs: [{dir: "Commit #{commit.hash}", path:''}]} %}
<div class="commit-view">
<div class="commit-header">
<span class="pull-right">
<a class="btn btn-default btn-sm" href="{{ path('branch', {repo: repo, branch: commit.hash}) }}" title="Browse code at this point in history"><span class="fa fa-list-alt"></span> Browse code</a></span>
<h4>{{ commit.message }}</h4>
</div>
<div class="commit-body">
{% if commit.body is not empty %}
<p>{{ commit.body | nl2br }}</p>
{% endif %}
<img src="https://gravatar.com/avatar/{{ commit.author.email | lower | md5 }}?s=32" class="pull-left space-right" />
<span>
<a href="mailto:{{ commit.author.email }}">{{ commit.author.name }}</a> authored on {{ commit.date | format_date }}
{% if commit.author.email != commit.commiter.email %}
&bull; <a href="mailto:{{ commit.commiter.email }}">{{ commit.commiter.name }}</a> committed on {{ commit.commiterDate | format_date }}
{% endif %}
<br />Showing {{ commit.changedFiles }} changed files
</span>
</div>
</div>
<ul class="commit-list">
{% for diff in commit.diffs %}
<li><i class="fa fa-file"></i> <a href="#{{ loop.index }}">{{ diff.file }}</a> <span class="meta pull-right">{{ diff.index }}</span></li>
{% endfor %}
</ul>
{% for diff in commit.diffs %}
<div class="source-view">
<div class="source-header">
<div class="meta"><a name="{{ loop.index }}">{{ diff.file }}</div>
<div class="btn-group pull-right">
<a href="{{ path('commits', {repo: repo, commitishPath: commit.hash ~ '/' ~ diff.file}) }}" class="btn btn-default btn-sm"><span class="fa fa-list-alt"></span> History</a>
<a href="{{ path('blob', {repo: repo, commitishPath: commit.hash ~'/' ~ diff.file}) }}" class="btn btn-default btn-sm"><span class="fa fa-file"></span> View file @ {{ commit.shortHash }}</a>
</div>
</div>
<div class="source-diff">
<table>
{% for line in diff.getLines %}
<tr>
<td class="lineNo">
{% if line.getType != 'chunk' %}
<a name="L{{ loop.index }}R{{ line.getNumOld }}"></a>
<a href="#L{{ loop.index }}L{{ line.getNumOld }}">
{% endif %}
{{ line.getNumOld }}
{% if line.getType != 'chunk' %}
</a>
{% endif %}
</td>
<td class="lineNo">
{% if line.getType != 'chunk' %}
<a name="L{{ loop.index }}L{{ line.getNumNew }}"></a>
<a href="#L{{ loop.index }}L{{ line.getNumNew }}">
{% endif %}
{{ line.getNumNew }}
{% if line.getType != 'chunk' %}
</a>
{% endif %}
</td>
<td style="width: 100%">
<pre{% if line.getType %} class="{{ line.getType }}"{% endif %}>{{ line.getLine }}</pre>
</td>
</tr>
{% endfor %}
</table>
</div>
</div>
{% endfor %}
<hr />
{% endblock %}