diff -r 96d551b90734 -r 2c66ab45d91e bin/pvl.verkko-rrd --- a/bin/pvl.verkko-rrd Mon Jan 21 18:39:53 2013 +0200 +++ b/bin/pvl.verkko-rrd Mon Jan 21 18:40:09 2013 +0200 @@ -14,6 +14,8 @@ import optparse import logging; log = logging.getLogger('main') +import codecs # --web-layout + def parse_argv (argv, doc = __doc__) : """ Parse command-line argv, returning (options, args). @@ -34,6 +36,9 @@ parser.add_option_group(pvl.args.parser(parser)) parser.add_option_group(pvl.rrd.args.parser(parser)) + parser.add_option('--web-layout', metavar='TEMPLATE', + help="Use template from given file for layout") + # parse options, args = parser.parse_args(args) @@ -52,9 +57,16 @@ # rrd rrd = pvl.rrd.args.apply(options) + + if options.web_layout : + layout = codecs.open(options.web_layout, 'r', 'utf-8').read() + else : + layout = None # app - application = pvl.verkko.rrd.Application(rrd) + application = pvl.verkko.rrd.Application(rrd, + layout = layout + ) # wsgi wrapper werkzeug.serving.run_simple('0.0.0.0', 8080, application,