|
a/Allura/allura/templates/repo/diff.html |
|
b/Allura/allura/templates/repo/diff.html |
|
... |
|
... |
| 12 |
<a href="{{b.url()}}">{{b.commit.shorthand_id()}}</a>
|
12 |
<a href="{{b.url()}}">{{b.commit.shorthand_id()}}</a>
|
| 13 |
{% endblock %}
|
13 |
{% endblock %}
|
| 14 |
|
14 |
|
| 15 |
{% block content %}
|
15 |
{% block content %}
|
| 16 |
{{ clone_info(c.app.repo) }}
|
16 |
{{ clone_info(c.app.repo) }}
|
| 17 |
{% if (not a.has_html_view and not a.has_image_view) or (not b.has_html_view and not b.has_image_view) %}
|
|
|
| 18 |
<p>{{a.name}} cannot be displayed in your browser.
|
|
|
| 19 |
You may, however, <a href="?format=raw">download this file</a> instead.</p>
|
|
|
| 20 |
{% endif %}
|
|
|
| 21 |
{% if a.has_html_view and b.has_html_view %}
|
|
|
| 22 |
<div class="clip grid-19">
|
|
|
| 23 |
<h3><span class="ico-l"><b data-icon="{{g.icons['table'].char}}" class="ico {{g.icons['table'].css}}"></b> {{h.really_unicode(a.filename) or h.html.literal(' ')}}</span></h3>
|
|
|
| 24 |
{{g.highlight(diff, lexer='diff')}}
|
|
|
| 25 |
</div>
|
|
|
| 26 |
{% endif %}
|
|
|
| 27 |
{% if a.has_image_view and b.has_image_view %}
|
17 |
{% if a.has_image_view and b.has_image_view %}
|
| 28 |
<div class="grid-19">
|
18 |
<div class="grid-19">
|
| 29 |
<img src="{{a.url()}}?format=raw"
|
19 |
<img src="{{a.url()}}?format=raw"
|
| 30 |
alt="{{h.text.truncate(a._commit._id, 10)}}"
|
20 |
alt="{{h.text.truncate(a._commit._id, 10)}}"
|
| 31 |
title="{{h.text.truncate(a._commit._id, 10)}}"/>
|
21 |
title="{{h.text.truncate(a._commit._id, 10)}}"/>
|
| 32 |
<img src="{{b.url()}}?format=raw"
|
22 |
<img src="{{b.url()}}?format=raw"
|
| 33 |
alt="{{h.text.truncate(b._commit._id, 10)}}"
|
23 |
alt="{{h.text.truncate(b._commit._id, 10)}}"
|
| 34 |
title="{{h.text.truncate(b._commit._id, 10)}}"/>
|
24 |
title="{{h.text.truncate(b._commit._id, 10)}}"/>
|
| 35 |
</div>
|
25 |
</div>
|
|
|
26 |
{% else %}
|
|
|
27 |
<div class="clip grid-19">
|
|
|
28 |
<h3><span class="ico-l"><b data-icon="{{g.icons['table'].char}}" class="ico {{g.icons['table'].css}}"></b> {{h.really_unicode(a.filename) or h.html.literal(' ')}}</span></h3>
|
|
|
29 |
{{g.highlight(diff, lexer='diff')}}
|
|
|
30 |
</div>
|
| 36 |
{% endif %}
|
31 |
{% endif %}
|
| 37 |
{% endblock %}
|
32 |
{% endblock %}
|
| 38 |
|
33 |
|
| 39 |
{% block extra_css %}
|
34 |
{% block extra_css %}
|
| 40 |
<style type="text/css">
|
35 |
<style type="text/css">
|