# HG changeset patch # User Matt Johnston # Date 1341323750 -28800 # Node ID 180dc60140a493179b614bb680c970477485e4d1 # Parent 16f96019a9e029234877486c57b4325a8317f6ab# Parent fed6738be1abcaf1dfda7bbd3a8f01d5ab9f9650 merge diff -r 16f96019a9e0 -r 180dc60140a4 web/config.py --- a/web/config.py Sat Jun 30 22:00:46 2012 +0800 +++ b/web/config.py Tue Jul 03 21:55:50 2012 +0800 @@ -25,4 +25,4 @@ #GRAPH_FONT = "URW Gothic L" # determine by zooming in an image viewer -GRAPH_LEFT_MARGIN = 95 +GRAPH_LEFT_MARGIN = 63 diff -r 16f96019a9e0 -r 180dc60140a4 web/log.py --- a/web/log.py Sat Jun 30 22:00:46 2012 +0800 +++ b/web/log.py Tue Jul 03 21:55:50 2012 +0800 @@ -90,7 +90,7 @@ '-h', str(config.GRAPH_HEIGHT), '--slope-mode', '--border', '0', - '--vertical-label', 'Voltage', +# '--vertical-label', 'Voltage', '--y-grid', '0.1:1', '--dynamic-labels', '--grid-dash', '1:0', @@ -105,8 +105,9 @@ args += ['--font', 'WATERMARK:10:%s' % config.GRAPH_FONT] if have_volts: args += ['--right-axis', '10:-20', # matches the scalevolts CDEF above - '--right-axis-format', '%.2lf', - '--right-axis-label', 'Temperature'] + '--right-axis-format', '%.0lf', +# '--right-axis-label', 'Temperature' + ] rrdtool.graph(*args) return tempf.read() diff -r 16f96019a9e0 -r 180dc60140a4 web/views/top.tpl --- a/web/views/top.tpl Sat Jun 30 22:00:46 2012 +0800 +++ b/web/views/top.tpl Tue Jul 03 21:55:50 2012 +0800 @@ -1,8 +1,6 @@ - - - - + + + -