Skip to content

Commit 7706c63

Browse files
committed
Use the changes in bug.item in task.item as well; more semantic markup for msg.item
1 parent 51210d0 commit 7706c63

File tree

2 files changed

+346
-286
lines changed

2 files changed

+346
-286
lines changed

share/roundup/templates/responsive/html/msg.item.html

Lines changed: 65 additions & 98 deletions
Original file line numberDiff line numberDiff line change
@@ -20,104 +20,71 @@
2020
tal:omit-tag="python:1" i18n:translate="">Message<tal:x
2121
replace="context/id" i18n:name="id" /> Editing</span>
2222
</tal:block>
23-
<td class="content" metal:fill-slot="content">
2423

25-
<p tal:condition="python:not (context.is_view_ok()
26-
or request.user.hasRole('Anonymous'))" i18n:translate="">
27-
You are not allowed to view this page.</p>
28-
29-
<p tal:condition="python:not context.is_view_ok()
30-
and request.user.hasRole('Anonymous')" i18n:translate="">
31-
Please login with your username and password.</p>
32-
33-
<div tal:condition="context/is_view_ok">
34-
<table class="form">
35-
36-
<tr>
37-
<th i18n:translate="">Author</th>
38-
<td tal:content="context/author"></td>
39-
</tr>
40-
41-
<tr>
42-
<th i18n:translate="">Recipients</th>
43-
<td tal:content="context/recipients"></td>
44-
</tr>
45-
46-
<tr>
47-
<th i18n:translate="">Date</th>
48-
<td tal:content="context/date"></td>
49-
</tr>
50-
51-
<tr>
52-
<th i18n:translate="">Message-id</th>
53-
<td tal:content="context/messageid"></td>
54-
</tr>
55-
56-
<tr>
57-
<th i18n:translate="">In-reply-to</th>
58-
<td tal:content="context/inreplyto"></td>
59-
</tr>
60-
61-
</table>
62-
63-
<!--<p tal:condition="python:utils.sb_is_spam(context)" class="error-message">
64-
Message has been classified as spam</p>-->
65-
66-
<table class="messages">
67-
68-
<!-- <tr>
69-
<th class="header" i18n:translate="">Content</th>
70-
<th class="header"
71-
tal:condition="python:request.user.hasPermission('SB: May Classify')">
72-
<form method="POST" onSubmit="return submit_once()"
73-
enctype="multipart/form-data"
74-
tal:attributes="action context/designator">
75-
76-
<input type="hidden" name="@action" value="spambayes_classify">
77-
<input type="submit" name="trainspam" value="Mark as SPAM" i18n:attributes="value">
78-
<input type="submit" name="trainham" value="Mark as HAM (not SPAM)" i18n:attributes="value">
79-
</form>
80-
</th>
81-
82-
</tr>-->
83-
84-
<tr>
85-
<td class="content" colspan="2"
86-
tal:condition="python:context.content.is_view_ok()">
87-
<pre
88-
tal:content="structure python:utils.localReplace(context.content.hyperlinked())"></pre></td>
89-
<td class="content" colspan="2"
90-
tal:condition="python:not context.content.is_view_ok()">
91-
You are not authorized to see this message.
92-
<!-- Message has been classified as spam and is therefore not
93-
available to unathorized users. If you think this is
94-
incorrect, please login and report the message as being
95-
misclassified. -->
96-
</td>
97-
</tr>
98-
</table>
99-
100-
<table class="files" tal:condition="context/files">
101-
<tr><th colspan="2" class="header" i18n:translate="">Files</th></tr>
102-
<tr>
103-
<th i18n:translate="">File name</th>
104-
<th i18n:translate="">Uploaded</th>
105-
</tr>
106-
<tr tal:repeat="file context/files">
107-
<td>
108-
<a tal:attributes="href string:file${file/id}/${file/name}"
109-
tal:content="file/name">dld link</a>
110-
</td>
111-
<td>
112-
<span tal:content="file/creator">creator's name</span>,
113-
<span tal:content="file/creation">creation date</span>
114-
</td>
115-
</tr>
116-
</table>
117-
118-
<tal:block tal:replace="structure context/history" />
119-
120-
</div>
121-
</td>
24+
<div metal:fill-slot="content">
25+
26+
<p tal:condition="python:not (context.is_view_ok()
27+
or request.user.hasRole('Anonymous'))" i18n:translate="">
28+
You are not allowed to view this page.</p>
29+
30+
<p tal:condition="python:not context.is_view_ok()
31+
and request.user.hasRole('Anonymous')" i18n:translate="">
32+
Please login with your username and password.</p>
33+
34+
<div tal:condition="context/is_view_ok">
35+
<dl class='dl-horizontal'>
36+
<dt i18n:translate="">Author</dt>
37+
<dd tal:content="context/author"></dd>
38+
<dt i18n:translate="">Recipients</dt>
39+
<dd tal:content="context/recipients"></dd>
40+
<dt i18n:translate="">Date</dt>
41+
<dd tal:content="context/date"></dd>
42+
<dt i18n:translate="">Message-id</dt>
43+
<dd tal:content="context/messageid"></dd>
44+
<dt i18n:translate="">In-reply-to</dt>
45+
<dd tal:content="context/inreplyto"></dd>
46+
</dl>
47+
48+
<!-- not sure this is needed -->
49+
<table class="messages">
50+
<tr>
51+
<td class="content" colspan="2"
52+
tal:condition="python:context.content.is_view_ok()">
53+
<pre
54+
tal:content="structure python:utils.localReplace(context.content.hyperlinked())"></pre></td>
55+
<td class="content" colspan="2"
56+
tal:condition="python:not context.content.is_view_ok()">
57+
You are not authorized to see this message.
58+
<!-- Message has been classified as spam and is therefore not
59+
available to unathorized users. If you think this is
60+
incorrect, please login and report the message as being
61+
misclassified. -->
62+
</td>
63+
</tr>
64+
</table>
65+
66+
<table class="files" tal:condition="context/files">
67+
<tr><th colspan="2" class="header" i18n:translate="">Files</th></tr>
68+
<tr>
69+
<th i18n:translate="">File name</th>
70+
<th i18n:translate="">Uploaded</th>
71+
</tr>
72+
<tr tal:repeat="file context/files">
73+
<td>
74+
<a tal:attributes="href string:file${file/id}/${file/name}"
75+
tal:content="file/name">dld link</a>
76+
</td>
77+
<td>
78+
<span tal:content="file/creator">creator's name</span>,
79+
<span tal:content="file/creation">creation date</span>
80+
</td>
81+
</tr>
82+
</table>
83+
84+
<div class='vspace-five'></div>
85+
<tal:block tal:replace="structure context/history" />
86+
87+
</div> <!-- div tal:condition="context/is_view_ok" -->
88+
</div> <!-- content -->
12289

12390
</tal:block>

0 commit comments

Comments
 (0)