annotate MoinMoin/templates/atom.html @ 2935:453a66b219ab

Fixes #503 Added time in item diff
author Aabhas Majumdar <majumdaraabhas@gmail.com>
date Sun, 08 Mar 2015 21:01:25 +0530
parents 4ac437141bbe
children
rev   line source
1365
6cb48018d6aa mass update part 2 - change DOS line endings to unix
Roger Haase <crosseyedpenguin@yahoo.com>
parents: 1214
diff changeset
1 {% import "utils.html" as utils %}
6cb48018d6aa mass update part 2 - change DOS line endings to unix
Roger Haase <crosseyedpenguin@yahoo.com>
parents: 1214
diff changeset
2
6cb48018d6aa mass update part 2 - change DOS line endings to unix
Roger Haase <crosseyedpenguin@yahoo.com>
parents: 1214
diff changeset
3 {# A few style rules to ensure the content doesn't overflow #}
6cb48018d6aa mass update part 2 - change DOS line endings to unix
Roger Haase <crosseyedpenguin@yahoo.com>
parents: 1214
diff changeset
4 {% macro atom_style() %}
6cb48018d6aa mass update part 2 - change DOS line endings to unix
Roger Haase <crosseyedpenguin@yahoo.com>
parents: 1214
diff changeset
5 <style type="text/css">
6cb48018d6aa mass update part 2 - change DOS line endings to unix
Roger Haase <crosseyedpenguin@yahoo.com>
parents: 1214
diff changeset
6 img {
6cb48018d6aa mass update part 2 - change DOS line endings to unix
Roger Haase <crosseyedpenguin@yahoo.com>
parents: 1214
diff changeset
7 max-width: 100%;
6cb48018d6aa mass update part 2 - change DOS line endings to unix
Roger Haase <crosseyedpenguin@yahoo.com>
parents: 1214
diff changeset
8 }
6cb48018d6aa mass update part 2 - change DOS line endings to unix
Roger Haase <crosseyedpenguin@yahoo.com>
parents: 1214
diff changeset
9 td {
6cb48018d6aa mass update part 2 - change DOS line endings to unix
Roger Haase <crosseyedpenguin@yahoo.com>
parents: 1214
diff changeset
10 padding-right: 10px;
6cb48018d6aa mass update part 2 - change DOS line endings to unix
Roger Haase <crosseyedpenguin@yahoo.com>
parents: 1214
diff changeset
11 }
6cb48018d6aa mass update part 2 - change DOS line endings to unix
Roger Haase <crosseyedpenguin@yahoo.com>
parents: 1214
diff changeset
12 table {
6cb48018d6aa mass update part 2 - change DOS line endings to unix
Roger Haase <crosseyedpenguin@yahoo.com>
parents: 1214
diff changeset
13 width: 100%;
6cb48018d6aa mass update part 2 - change DOS line endings to unix
Roger Haase <crosseyedpenguin@yahoo.com>
parents: 1214
diff changeset
14 }
6cb48018d6aa mass update part 2 - change DOS line endings to unix
Roger Haase <crosseyedpenguin@yahoo.com>
parents: 1214
diff changeset
15 </style>
6cb48018d6aa mass update part 2 - change DOS line endings to unix
Roger Haase <crosseyedpenguin@yahoo.com>
parents: 1214
diff changeset
16 {% endmacro %}
6cb48018d6aa mass update part 2 - change DOS line endings to unix
Roger Haase <crosseyedpenguin@yahoo.com>
parents: 1214
diff changeset
17
6cb48018d6aa mass update part 2 - change DOS line endings to unix
Roger Haase <crosseyedpenguin@yahoo.com>
parents: 1214
diff changeset
18 {%- if get == 'xml' -%}
6cb48018d6aa mass update part 2 - change DOS line endings to unix
Roger Haase <crosseyedpenguin@yahoo.com>
parents: 1214
diff changeset
19 <?xml-stylesheet type="text/xsl" href="{{ theme_static('atom.xslt') }}"?>
6cb48018d6aa mass update part 2 - change DOS line endings to unix
Roger Haase <crosseyedpenguin@yahoo.com>
parents: 1214
diff changeset
20 {%- elif get == 'comment_cont_merge' -%}
6cb48018d6aa mass update part 2 - change DOS line endings to unix
Roger Haase <crosseyedpenguin@yahoo.com>
parents: 1214
diff changeset
21 <p style="font-size: 1.2em">…{{ comment }}</p> <br /> {{ content }}
6cb48018d6aa mass update part 2 - change DOS line endings to unix
Roger Haase <crosseyedpenguin@yahoo.com>
parents: 1214
diff changeset
22 {%- elif get == 'first_revision' -%}
6cb48018d6aa mass update part 2 - change DOS line endings to unix
Roger Haase <crosseyedpenguin@yahoo.com>
parents: 1214
diff changeset
23 {{ content }}
6cb48018d6aa mass update part 2 - change DOS line endings to unix
Roger Haase <crosseyedpenguin@yahoo.com>
parents: 1214
diff changeset
24 <br />
6cb48018d6aa mass update part 2 - change DOS line endings to unix
Roger Haase <crosseyedpenguin@yahoo.com>
parents: 1214
diff changeset
25 <table class="moin-diff" cellpadding="10" width="100%">
6cb48018d6aa mass update part 2 - change DOS line endings to unix
Roger Haase <crosseyedpenguin@yahoo.com>
parents: 1214
diff changeset
26 <tr>
6cb48018d6aa mass update part 2 - change DOS line endings to unix
Roger Haase <crosseyedpenguin@yahoo.com>
parents: 1214
diff changeset
27 <td class="moin-diff-header" style="width: 100%;">
2935
453a66b219ab Fixes #503 Added time in item diff
Aabhas Majumdar <majumdaraabhas@gmail.com>
parents: 1397
diff changeset
28 <strong>{{ utils.show_meta(rev) }}</strong>
1365
6cb48018d6aa mass update part 2 - change DOS line endings to unix
Roger Haase <crosseyedpenguin@yahoo.com>
parents: 1214
diff changeset
29 </td>
6cb48018d6aa mass update part 2 - change DOS line endings to unix
Roger Haase <crosseyedpenguin@yahoo.com>
parents: 1214
diff changeset
30 </tr>
6cb48018d6aa mass update part 2 - change DOS line endings to unix
Roger Haase <crosseyedpenguin@yahoo.com>
parents: 1214
diff changeset
31 </table>
6cb48018d6aa mass update part 2 - change DOS line endings to unix
Roger Haase <crosseyedpenguin@yahoo.com>
parents: 1214
diff changeset
32 {{ atom_style() }}
6cb48018d6aa mass update part 2 - change DOS line endings to unix
Roger Haase <crosseyedpenguin@yahoo.com>
parents: 1214
diff changeset
33 {%- elif get == 'binary' -%}
6cb48018d6aa mass update part 2 - change DOS line endings to unix
Roger Haase <crosseyedpenguin@yahoo.com>
parents: 1214
diff changeset
34 {{ content }}
6cb48018d6aa mass update part 2 - change DOS line endings to unix
Roger Haase <crosseyedpenguin@yahoo.com>
parents: 1214
diff changeset
35 <br />
6cb48018d6aa mass update part 2 - change DOS line endings to unix
Roger Haase <crosseyedpenguin@yahoo.com>
parents: 1214
diff changeset
36 <table class="moin-diff" cellpadding="10" width="100%">
6cb48018d6aa mass update part 2 - change DOS line endings to unix
Roger Haase <crosseyedpenguin@yahoo.com>
parents: 1214
diff changeset
37 <tr>
6cb48018d6aa mass update part 2 - change DOS line endings to unix
Roger Haase <crosseyedpenguin@yahoo.com>
parents: 1214
diff changeset
38 <td class="moin-diff-header" style="width: 50%;">
2935
453a66b219ab Fixes #503 Added time in item diff
Aabhas Majumdar <majumdaraabhas@gmail.com>
parents: 1397
diff changeset
39 <strong>{{ utils.show_meta(oldrev) }}</strong>
1365
6cb48018d6aa mass update part 2 - change DOS line endings to unix
Roger Haase <crosseyedpenguin@yahoo.com>
parents: 1214
diff changeset
40 </td>
6cb48018d6aa mass update part 2 - change DOS line endings to unix
Roger Haase <crosseyedpenguin@yahoo.com>
parents: 1214
diff changeset
41 <td class="moin-diff-header" style="width: 50%;">
2935
453a66b219ab Fixes #503 Added time in item diff
Aabhas Majumdar <majumdaraabhas@gmail.com>
parents: 1397
diff changeset
42 <strong>{{ utils.show_meta(newrev) }}</strong>
1365
6cb48018d6aa mass update part 2 - change DOS line endings to unix
Roger Haase <crosseyedpenguin@yahoo.com>
parents: 1214
diff changeset
43 </td>
6cb48018d6aa mass update part 2 - change DOS line endings to unix
Roger Haase <crosseyedpenguin@yahoo.com>
parents: 1214
diff changeset
44 </tr>
6cb48018d6aa mass update part 2 - change DOS line endings to unix
Roger Haase <crosseyedpenguin@yahoo.com>
parents: 1214
diff changeset
45 </table>
6cb48018d6aa mass update part 2 - change DOS line endings to unix
Roger Haase <crosseyedpenguin@yahoo.com>
parents: 1214
diff changeset
46 {{ atom_style() }}
6cb48018d6aa mass update part 2 - change DOS line endings to unix
Roger Haase <crosseyedpenguin@yahoo.com>
parents: 1214
diff changeset
47 {%- endif -%}