38/7ed3b341f95bcde4672d464b8e6319532f6cab

   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 179AC429E3C\r
   6         for <notmuch@notmuchmail.org>; Mon,  3 Feb 2014 03:03:11 -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 jcqdTbiOG6us for <notmuch@notmuchmail.org>;\r
  18         Mon,  3 Feb 2014 03:03:04 -0800 (PST)\r
  19 Received: from qmta12.westchester.pa.mail.comcast.net\r
  20         (qmta12.westchester.pa.mail.comcast.net [76.96.59.227])\r
  21         by olra.theworths.org (Postfix) with ESMTP id 3AF99429E4F\r
  22         for <notmuch@notmuchmail.org>; Mon,  3 Feb 2014 03:02:46 -0800 (PST)\r
  23 Received: from omta04.westchester.pa.mail.comcast.net ([76.96.62.35])\r
  24         by qmta12.westchester.pa.mail.comcast.net with comcast\r
  25         id Mn2D1n0050ldTLk5Cn2mua; Mon, 03 Feb 2014 11:02:46 +0000\r
  26 Received: from odin.tremily.us ([24.18.63.50])\r
  27         by omta04.westchester.pa.mail.comcast.net with comcast\r
  28         id Mn0l1n006152l3L01n0mkK; Mon, 03 Feb 2014 11:00:46 +0000\r
  29 Received: from mjolnir.tremily.us (unknown [192.168.0.140])\r
  30         by odin.tremily.us (Postfix) with ESMTPS id 20A40FB4D61;\r
  31         Mon,  3 Feb 2014 03:00:45 -0800 (PST)\r
  32 Received: (nullmailer pid 714 invoked by uid 1000);\r
  33         Mon, 03 Feb 2014 10:59:42 -0000\r
  34 From: "W. Trevor King" <wking@tremily.us>\r
  35 To: notmuch@notmuchmail.org\r
  36 Subject: [PATCH 16/17] nmbug-status: Use <code> and <p> markup where\r
  37         appropriate\r
  38 Date: Mon,  3 Feb 2014 02:59:34 -0800\r
  39 Message-Id:\r
  40  <ec1176e5bde52c91869640e71535b0e35d9ef614.1391424512.git.wking@tremily.us>\r
  41 X-Mailer: git-send-email 1.8.5.2.8.g0f6c0d1\r
  42 In-Reply-To: <cover.1391424512.git.wking@tremily.us>\r
  43 References: <cover.1391424512.git.wking@tremily.us>\r
  44 In-Reply-To: <cover.1391424512.git.wking@tremily.us>\r
  45 References: <cover.1391424512.git.wking@tremily.us>\r
  46 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=comcast.net;\r
  47         s=q20121106; t=1391425366;\r
  48         bh=zGh6MHE95AwdLYS9K2jwLuRY9KZ0HR6wSmxf6FBlODU=;\r
  49         h=Received:Received:Received:Received:From:To:Subject:Date:\r
  50         Message-Id;\r
  51         b=sz+Y23WEjliydnUB+1EAoi8Z3m65R42Kxq7BmPOr6l0HvciDP3e2FvnlEG0DyukUU\r
  52         rVrs3LvbtRHwQzvDwZ97khTgSZ7/ZCjDBhz4KInOEdW4ya99deNZCrz4fJiyhuQgfd\r
  53         IFyCCSwd7tuOQpVtuxZGEEgTgTVhcXroM0oeR8zDlUr45ervCI19HtnIUSzBixxVh5\r
  54         sTdYhWJw5UyRb8K9G652trSvH9BYA6HAul+IbOw8z9hvQXTkvf5JKyKs9LjZ52Zzq0\r
  55         pSllXkbeY0CxcYcJjP0+peyrKM717nbQ6SzJSTc9393e6ucgUA0Q30iuK+afy+OjeT\r
  56         S7cW12F/t8okQ==\r
  57 X-BeenThere: notmuch@notmuchmail.org\r
  58 X-Mailman-Version: 2.1.13\r
  59 Precedence: list\r
  60 List-Id: "Use and development of the notmuch mail system."\r
  61         <notmuch.notmuchmail.org>\r
  62 List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,\r
  63         <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>\r
  64 List-Archive: <http://notmuchmail.org/pipermail/notmuch>\r
  65 List-Post: <mailto:notmuch@notmuchmail.org>\r
  66 List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>\r
  67 List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,\r
  68         <mailto:notmuch-request@notmuchmail.org?subject=subscribe>\r
  69 X-List-Received-Date: Mon, 03 Feb 2014 11:03:11 -0000\r
  70 \r
  71 * Wrap free text in <p> tags.\r
  72 * Convert <blockquote> to <p><code> for query strings.\r
  73 * Wrap message-id-term (id:"...") in <code>.\r
  74 \r
  75 The <code> tags get nicer default markup (smaller monospace font) for\r
  76 notmuch query terms [1].  The <p> tags don't have much effect without\r
  77 attached CSS, but bare text (phrasing content [2]) in <body> (which\r
  78 expects flow content [3,4]) feels wrong.\r
  79 \r
  80 [1]: http://www.w3.org/TR/html5/text-level-semantics.html#the-code-element\r
  81 [2]: http://www.w3.org/TR/html5/dom.html#phrasing-content-1\r
  82 [3]: http://www.w3.org/TR/html5/dom.html#flow-content-1\r
  83 [4]: http://www.w3.org/TR/html5/sections.html#the-body-element\r
  84 ---\r
  85  devel/nmbug/nmbug-status | 12 +++++++++---\r
  86  1 file changed, 9 insertions(+), 3 deletions(-)\r
  87 \r
  88 diff --git a/devel/nmbug/nmbug-status b/devel/nmbug/nmbug-status\r
  89 index 9bdb34f..21fb481 100755\r
  90 --- a/devel/nmbug/nmbug-status\r
  91 +++ b/devel/nmbug/nmbug-status\r
  92 @@ -162,14 +162,18 @@ class HtmlPage (Page):\r
  93  \r
  94      def _write_view_header(self, view, stream):\r
  95          stream.write('<h3 id="{id}">{title}</h3>\n'.format(**view))\r
  96 +        stream.write('<p>\n')\r
  97          if 'comment' in view:\r
  98              stream.write(view['comment'])\r
  99              stream.write('\n')\r
 100          for line in [\r
 101                  'The view is generated from the following query:',\r
 102 -                '<blockquote>',\r
 103 +                '</p>',\r
 104 +                '<p>',\r
 105 +                '  <code>',\r
 106                  view['query-string'],\r
 107 -                '</blockquote>',\r
 108 +                '  </code>',\r
 109 +                '</p>',\r
 110                  ]:\r
 111              stream.write(line)\r
 112              stream.write('\n')\r
 113 @@ -183,7 +187,7 @@ class HtmlPage (Page):\r
 114                  stream.write((\r
 115                      '<tr>\n'\r
 116                      '  <td>{date}</td>\n'\r
 117 -                    '  <td>{message-id-term}</td>\n'\r
 118 +                    '  <td><code>{message-id-term}</code></td>\n'\r
 119                      '</tr>\n'\r
 120                      '<tr>\n'\r
 121                      '  <td>{from}</td>\n'\r
 122 @@ -219,8 +223,10 @@ _PAGES['html'] = HtmlPage(\r
 123  </head>\r
 124  <body>\r
 125  <h2>Notmuch Patches</h2>\r
 126 +<p>\r
 127  Generated: {date}<br />\r
 128  For more infomation see <a href="http://notmuchmail.org/nmbug">nmbug</a>\r
 129 +</p>\r
 130  <h3>Views</h3>\r
 131  '''.format(date=datetime.datetime.utcnow().date(),\r
 132             encoding=_ENCODING),\r
 133 -- \r
 134 1.8.5.2.8.g0f6c0d1\r
 135 \r