9e/9c03bbb2f0af959159c7470ea0600ebca204ee

   1 Return-Path: <wking@tremily.us>\r
   2 X-Original-To: notmuch@notmuchmail.org\r
   3 Delivered-To: notmuch@notmuchmail.org\r
   4 Received: from localhost (localhost [127.0.0.1])\r
   5         by olra.theworths.org (Postfix) with ESMTP id 19748431FBD\r
   6         for <notmuch@notmuchmail.org>; Mon, 10 Feb 2014 10:44:57 -0800 (PST)\r
   7 X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
   8 X-Amavis-Alert: BAD HEADER SECTION, Duplicate header field: "References"\r
   9 X-Spam-Flag: NO\r
  10 X-Spam-Score: 0\r
  11 X-Spam-Level: \r
  12 X-Spam-Status: No, score=0 tagged_above=-999 required=5\r
  13         tests=[DKIM_SIGNED=0.1, DKIM_VALID=-0.1, RCVD_IN_DNSWL_NONE=-0.0001]\r
  14         autolearn=disabled\r
  15 Received: from olra.theworths.org ([127.0.0.1])\r
  16         by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024)\r
  17         with ESMTP id l5jQKBZxEQEn for <notmuch@notmuchmail.org>;\r
  18         Mon, 10 Feb 2014 10:44:51 -0800 (PST)\r
  19 Received: from qmta13.westchester.pa.mail.comcast.net\r
  20         (qmta13.westchester.pa.mail.comcast.net [76.96.59.243])\r
  21         by olra.theworths.org (Postfix) with ESMTP id 257BD429E3A\r
  22         for <notmuch@notmuchmail.org>; Mon, 10 Feb 2014 10:44:01 -0800 (PST)\r
  23 Received: from omta08.westchester.pa.mail.comcast.net ([76.96.62.12])\r
  24         by qmta13.westchester.pa.mail.comcast.net with comcast\r
  25         id Qck71n0030Fqzac5Dik1Ac; Mon, 10 Feb 2014 18:44:01 +0000\r
  26 Received: from odin.tremily.us ([24.18.63.50])\r
  27         by omta08.westchester.pa.mail.comcast.net with comcast\r
  28         id Qii01n004152l3L3Uii0pY; Mon, 10 Feb 2014 18:42:01 +0000\r
  29 Received: from mjolnir.tremily.us (unknown [192.168.0.140])\r
  30         by odin.tremily.us (Postfix) with ESMTPS id 06C5810167C3;\r
  31         Mon, 10 Feb 2014 10:42:00 -0800 (PST)\r
  32 Received: (nullmailer pid 1281 invoked by uid 1000);\r
  33         Mon, 10 Feb 2014 18:40:46 -0000\r
  34 From: "W. Trevor King" <wking@tremily.us>\r
  35 To: notmuch@notmuchmail.org\r
  36 Subject: [PATCH v2 17/20] nmbug-status: Use <code> and <p> markup where\r
  37         appropriate\r
  38 Date: Mon, 10 Feb 2014 10:40:38 -0800\r
  39 Message-Id:\r
  40  <9881bd7f6af6260d9a478feddd3c2d87c5b4049a.1392056624.git.wking@tremily.us>\r
  41 X-Mailer: git-send-email 1.8.5.2.8.g0f6c0d1\r
  42 In-Reply-To: <cover.1392056624.git.wking@tremily.us>\r
  43 References: <cover.1392056624.git.wking@tremily.us>\r
  44 In-Reply-To: <cover.1392056624.git.wking@tremily.us>\r
  45 References: <cover.1392056624.git.wking@tremily.us>\r
  46 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=comcast.net;\r
  47         s=q20121106; t=1392057841;\r
  48         bh=r3GIskA8uH+3Z6WZWrusNEgSo9KO3Xyz95l3Y+Jag8k=;\r
  49         h=Received:Received:Received:Received:From:To:Subject:Date:\r
  50         Message-Id;\r
  51         b=Ua50qL4YyhJmwmdQWDnnots+TYbmg73NN238FPEpKSAp4b05dc+l5zYr2z6W8gmas\r
  52         PmJ8dqxMNDpmSXcBD2osFiy44KVS021ZgEwCulV2Yhh0vLuKx+LIx36wQm8PxL5ytF\r
  53         tU0Sse7ASgT7rCzmZZUb0J8BHvcJQ+uVad5texFIPmVCSiLvcZb02nN5dCrRbTnOSI\r
  54         fqi9mv1tO2fOy5X96HHZZvEvc+aaq9WCAkgkQqp0lrCoLPzf9MdoS7r0lXF5nETGe8\r
  55         1HBSrlBhmgFJy3ajaOMwDjoj01KzUlrroxnHGtnblqdFb4xtulQtLw9UE69t/3kPRn\r
  56         ZDRoXq0MPcjdA==\r
  57 Cc: Tomi Ollila <tomi.ollila@iki.fi>\r
  58 X-BeenThere: notmuch@notmuchmail.org\r
  59 X-Mailman-Version: 2.1.13\r
  60 Precedence: list\r
  61 List-Id: "Use and development of the notmuch mail system."\r
  62         <notmuch.notmuchmail.org>\r
  63 List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,\r
  64         <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>\r
  65 List-Archive: <http://notmuchmail.org/pipermail/notmuch>\r
  66 List-Post: <mailto:notmuch@notmuchmail.org>\r
  67 List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>\r
  68 List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,\r
  69         <mailto:notmuch-request@notmuchmail.org?subject=subscribe>\r
  70 X-List-Received-Date: Mon, 10 Feb 2014 18:44:57 -0000\r
  71 \r
  72 * Wrap free text in <p> tags.\r
  73 * Convert <blockquote> to <p><code> for query strings.\r
  74 * Wrap message-id-term (id:"...") in <code>.\r
  75 \r
  76 The <code> tags get nicer default markup (smaller monospace font) for\r
  77 notmuch query terms [1].  The <p> tags don't have much effect without\r
  78 attached CSS, but bare text (phrasing content [2]) in <body> (which\r
  79 expects flow content [3,4]) feels wrong.\r
  80 \r
  81 [1]: http://www.w3.org/TR/html5/text-level-semantics.html#the-code-element\r
  82 [2]: http://www.w3.org/TR/html5/dom.html#phrasing-content-1\r
  83 [3]: http://www.w3.org/TR/html5/dom.html#flow-content-1\r
  84 [4]: http://www.w3.org/TR/html5/sections.html#the-body-element\r
  85 ---\r
  86  devel/nmbug/nmbug-status | 12 +++++++++---\r
  87  1 file changed, 9 insertions(+), 3 deletions(-)\r
  88 \r
  89 diff --git a/devel/nmbug/nmbug-status b/devel/nmbug/nmbug-status\r
  90 index 989d065..c45b763 100755\r
  91 --- a/devel/nmbug/nmbug-status\r
  92 +++ b/devel/nmbug/nmbug-status\r
  93 @@ -183,14 +183,18 @@ class HtmlPage (Page):\r
  94  \r
  95      def _write_view_header(self, view, stream):\r
  96          stream.write('<h3 id="{id}">{title}</h3>\n'.format(**view))\r
  97 +        stream.write('<p>\n')\r
  98          if 'comment' in view:\r
  99              stream.write(view['comment'])\r
 100              stream.write('\n')\r
 101          for line in [\r
 102                  'The view is generated from the following query:',\r
 103 -                '<blockquote>',\r
 104 +                '</p>',\r
 105 +                '<p>',\r
 106 +                '  <code>',\r
 107                  view['query-string'],\r
 108 -                '</blockquote>',\r
 109 +                '  </code>',\r
 110 +                '</p>',\r
 111                  ]:\r
 112              stream.write(line)\r
 113              stream.write('\n')\r
 114 @@ -204,7 +208,7 @@ class HtmlPage (Page):\r
 115                  stream.write((\r
 116                      '<tr>\n'\r
 117                      '  <td>{date}</td>\n'\r
 118 -                    '  <td>{message-id-term}</td>\n'\r
 119 +                    '  <td><code>{message-id-term}</code></td>\n'\r
 120                      '</tr>\n'\r
 121                      '<tr>\n'\r
 122                      '  <td>{from}</td>\n'\r
 123 @@ -243,8 +247,10 @@ _PAGES['html'] = HtmlPage(\r
 124  </head>\r
 125  <body>\r
 126  <h2>Notmuch Patches</h2>\r
 127 +<p>\r
 128  Generated: {date}<br />\r
 129  For more infomation see <a href="http://notmuchmail.org/nmbug">nmbug</a>\r
 130 +</p>\r
 131  <h3>Views</h3>\r
 132  '''.format(date=datetime.datetime.utcnow().date(),\r
 133             encoding=_ENCODING),\r
 134 -- \r
 135 1.8.5.2.8.g0f6c0d1\r
 136 \r