nmbug-status: Use <code> and <p> markup where appropriate

* Wrap free text in <p> tags.
* Convert <blockquote> to <p><code> for query strings.
* Wrap message-id-term (id:"...") in <code>.

The <code> tags get nicer default markup (smaller monospace font) for
notmuch query terms [1].  The <p> tags don't have much effect without
attached CSS, but bare text (phrasing content [2]) in <body> (which
expects flow content [3,4]) feels wrong.

[1]: http://www.w3.org/TR/html5/text-level-semantics.html#the-code-element
[2]: http://www.w3.org/TR/html5/dom.html#phrasing-content-1
[3]: http://www.w3.org/TR/html5/dom.html#flow-content-1
[4]: http://www.w3.org/TR/html5/sections.html#the-body-element
This commit is contained in:
W. Trevor King 2014-02-13 08:47:18 -08:00 committed by David Bremner
parent 711d04c821
commit aa32d2579b

View file

@ -183,14 +183,18 @@ class HtmlPage (Page):
def _write_view_header(self, view, stream): def _write_view_header(self, view, stream):
stream.write('<h3 id="{id}">{title}</h3>\n'.format(**view)) stream.write('<h3 id="{id}">{title}</h3>\n'.format(**view))
stream.write('<p>\n')
if 'comment' in view: if 'comment' in view:
stream.write(view['comment']) stream.write(view['comment'])
stream.write('\n') stream.write('\n')
for line in [ for line in [
'The view is generated from the following query:', 'The view is generated from the following query:',
'<blockquote>', '</p>',
'<p>',
' <code>',
view['query-string'], view['query-string'],
'</blockquote>', ' </code>',
'</p>',
]: ]:
stream.write(line) stream.write(line)
stream.write('\n') stream.write('\n')
@ -204,7 +208,7 @@ class HtmlPage (Page):
stream.write(( stream.write((
'<tr>\n' '<tr>\n'
' <td>{date}</td>\n' ' <td>{date}</td>\n'
' <td>{message-id-term}</td>\n' ' <td><code>{message-id-term}</code></td>\n'
'</tr>\n' '</tr>\n'
'<tr>\n' '<tr>\n'
' <td>{from}</td>\n' ' <td>{from}</td>\n'
@ -243,8 +247,10 @@ _PAGES['html'] = HtmlPage(
</head> </head>
<body> <body>
<h2>Notmuch Patches</h2> <h2>Notmuch Patches</h2>
<p>
Generated: {date}<br /> Generated: {date}<br />
For more infomation see <a href="http://notmuchmail.org/nmbug">nmbug</a> For more infomation see <a href="http://notmuchmail.org/nmbug">nmbug</a>
</p>
<h3>Views</h3> <h3>Views</h3>
'''.format(date=datetime.datetime.utcnow().date()), '''.format(date=datetime.datetime.utcnow().date()),
footer='</body>\n</html>\n', footer='</body>\n</html>\n',