|
a/Allura/allura/templates/repo/commit.html |
|
b/Allura/allura/templates/repo/commit.html |
|
... |
|
... |
| 13 |
<b data-icon="{{g.icons.history.char}}" class="ico {{g.icons.history.css}}" title="History"> </b> History
|
13 |
<b data-icon="{{g.icons.history.char}}" class="ico {{g.icons.history.css}}" title="History"> </b> History
|
| 14 |
</a>
|
14 |
</a>
|
| 15 |
{% endblock %}
|
15 |
{% endblock %}
|
| 16 |
|
16 |
|
| 17 |
{% block content %}
|
17 |
{% block content %}
|
| 18 |
{{ clone_info(c.app.repo) }}
|
18 |
{{ clone_info(c.app.repo) }}
|
| 19 |
{{c.revision_widget.display(value=commit, prev=prev, next=next)}}
|
19 |
{{c.revision_widget.display(value=commit, prev=prev, next=next)}}
|
| 20 |
<table>
|
20 |
<table>
|
| 21 |
<tbody>
|
21 |
<tbody>
|
| 22 |
{% for diff in commit.diffs.added %}
|
22 |
{% for type, file in artifacts %}
|
| 23 |
<tr>
|
23 |
<tr>
|
| 24 |
<td>add</td>
|
|
|
| 25 |
<td><a href="{{commit.url()}}tree{{h.really_unicode(diff)}}">{{h.really_unicode(diff)}}</a></td>
|
|
|
| 26 |
</tr>
|
|
|
| 27 |
{% endfor %}{% for diff in commit.diffs.removed %}
|
|
|
| 28 |
<tr>
|
|
|
| 29 |
<td>remove</td>
|
|
|
| 30 |
<td><a href="{{prev[0].url()}}tree{{h.really_unicode(diff)}}">{{h.really_unicode(diff)}}</a></td>
|
|
|
| 31 |
</tr>
|
|
|
| 32 |
{% endfor %}{% for diff in commit.diffs.changed %}
|
|
|
| 33 |
<tr>
|
|
|
| 34 |
<td>change</td>
|
|
|
| 35 |
<td>
|
24 |
<td>
|
| 36 |
<a href="{{commit.url()}}tree{{h.really_unicode(diff)}}">{{h.really_unicode(diff)}}</a>
|
25 |
{% if type != 'removed' %}
|
| 37 |
<a href="{{commit.url()}}tree{{h.really_unicode(diff)}}?diff={{prev[0].object_id}}">(diff)</a>
|
26 |
<a href="#diff-{{loop.index}}">{{ type }}</a>
|
|
|
27 |
{% else %}
|
|
|
28 |
{{ type }}
|
|
|
29 |
{% endif %}
|
| 38 |
</td>
|
30 |
</td>
|
| 39 |
</tr>
|
|
|
| 40 |
{% endfor %}{% for diff in commit.diffs.copied %}
|
|
|
| 41 |
<tr>
|
|
|
| 42 |
<td>copy</td>
|
|
|
| 43 |
<td>
|
31 |
<td>
|
|
|
32 |
{% if type == 'added' %}
|
|
|
33 |
<a href="{{commit.url()}}tree{{h.really_unicode(file)}}">{{h.really_unicode(file)}}</a>
|
|
|
34 |
{% elif type == 'removed' %}
|
|
|
35 |
<a href="{{prev[0].url()}}tree{{h.really_unicode(file)}}">{{h.really_unicode(file)}}</a>
|
|
|
36 |
{% elif type == 'changed' %}
|
|
|
37 |
<a href="{{commit.url()}}tree{{h.really_unicode(file)}}">{{h.really_unicode(file)}}</a>
|
|
|
38 |
<a href="{{commit.url()}}tree{{h.really_unicode(file)}}?file={{prev[0].object_id}}">(diff)</a>
|
|
|
39 |
{% elif type == 'copied' %}
|
| 44 |
<a href="{{prev[0].url()}}tree{{h.really_unicode(diff.old)}}">{{h.really_unicode(diff.old)}}</a>
|
40 |
<a href="{{prev[0].url()}}tree{{h.really_unicode(file.old)}}">{{h.really_unicode(file.old)}}</a>
|
| 45 |
<br/>to<br/>
|
41 |
<br/>to<br/>
|
| 46 |
<a href="{{commit.url()}}tree{{h.really_unicode(diff.new)}}">{{h.really_unicode(diff.new)}}</a>
|
42 |
<a href="{{commit.url()}}tree{{h.really_unicode(file.new)}}">{{h.really_unicode(file.new)}}</a>
|
|
|
43 |
{% endif %}
|
| 47 |
</td>
|
44 |
</td>
|
| 48 |
</tr>
|
45 |
</tr>
|
| 49 |
{% endfor %}
|
46 |
{% endfor %}
|
| 50 |
</tbody>
|
47 |
</tbody>
|
| 51 |
</table>
|
48 |
</table>
|
|
|
49 |
|
|
|
50 |
{% for type, file in artifacts %}
|
|
|
51 |
{% if type != 'removed' %}
|
|
|
52 |
<div id="diff-{{loop.index}}" class="inline-diff"></div>
|
|
|
53 |
<script type="text/javascript">
|
|
|
54 |
$(document).ready(function() {
|
|
|
55 |
$('#diff-{{loop.index}}').load('{{commit.url()}}tree{{h.really_unicode(file)}}?barediff');
|
|
|
56 |
});
|
|
|
57 |
</script>
|
|
|
58 |
{% endif %}
|
|
|
59 |
{% endfor %}
|
| 52 |
{% endblock %}
|
60 |
{% endblock %}
|