Merge tag '0.18.2'

[notmuch] / devel / nmbug / nmbug-status
diff --git a/devel/nmbug/nmbug-status b/devel/nmbug/nmbug-status

index e137a90ed07582dd0afe6af66aa984c3bbf7724f..f0809f193e108fb024982524a2a56ec1c3250173 100755 (executable)
--- a/devel/nmbug/nmbug-status
+++ b/devel/nmbug/nmbug-status
@@ -276,9 +276,7 @@ args = parser.parse_args()
  
  config = read_config(path=args.config)
  
-_PAGES['text'] = Page()
-_PAGES['html'] = HtmlPage(
-    header='''<!DOCTYPE html>
+header_template = config['meta'].get('header', '''<!DOCTYPE html>
  <html lang="en">
  <head>
    <meta http-equiv="Content-Type" content="text/html; charset={encoding}" />
@@ -315,22 +313,43 @@ _PAGES['html'] = HtmlPage(
      tbody:nth-child(4n+3) tr td {{
        background-color: #bce;
      }}
+    hr {{
+      border: 0;
+      height: 1px;
+      color: #ccc;
+      background-color: #ccc;
+    }}
    </style>
  </head>
  <body>
  <h2>{title}</h2>
-<p>
-Generated: {date}<br />
  {blurb}
  </p>
  <h3>Views</h3>
-'''.format(date=datetime.datetime.utcnow().date(),
-           title=config['meta']['title'],
-           blurb=config['meta']['blurb'],
-           encoding=_ENCODING,
-           inter_message_padding='0.25em',
-           border_radius='0.5em'),
-    footer='</body>\n</html>\n',
+''')
+
+footer_template = config['meta'].get('footer', '''
+<hr>
+<p>Generated: {datetime}
+</body>
+</html>
+''')
+
+now = datetime.datetime.utcnow()
+context = {
+    'date': now,
+    'datetime': now.strftime('%Y-%m-%d %H:%M:%SZ'),
+    'title': config['meta']['title'],
+    'blurb': config['meta']['blurb'],
+    'encoding': _ENCODING,
+    'inter_message_padding': '0.25em',
+    'border_radius': '0.5em',
+    }
+
+_PAGES['text'] = Page()
+_PAGES['html'] = HtmlPage(
+    header=header_template.format(**context),
+    footer=footer_template.format(**context),
      )
  
  if args.list_views: