From c71886f059b6d2ad68f55a37c891f26898a5c7be Mon Sep 17 00:00:00 2001
From: Richard Wall <richard@largo>
Date: Thu, 30 Dec 2010 00:37:31 +0000
Subject: Refactor rrdqueryremote to allow a new query for available data
 sources.

---
 jarmon/jarmon.js      | 84 +++++++++++++++++++++++++++++++++++++++------------
 jarmon/jarmon.test.js | 14 +++++++++
 2 files changed, 79 insertions(+), 19 deletions(-)

diff --git a/jarmon/jarmon.js b/jarmon/jarmon.js
index 406c4d1..a66a93b 100644
--- a/jarmon/jarmon.js
+++ b/jarmon/jarmon.js
@@ -275,23 +275,11 @@ jarmon.RrdQueryRemote = function(url, unit, downloader) {
     this._download = null;
 };
 
-jarmon.RrdQueryRemote.prototype.getData = function(startTime, endTime, dsId) {
-    /**
-     * Return a Flot compatible data series asynchronously.
-     *
-     * @method getData
-     * @param startTime {Number} The start timestamp
-     * @param endTime {Number} The end timestamp
-     * @param dsId {Variant} identifier of the RRD datasource (string or number)
-     * @return {Object} A Deferred which calls back with a flot data series.
-     **/
-    var endTimestamp = endTime/1000;
 
-    // Download the rrd if there has never been a download or if the last
-    // completed download had a lastUpdated timestamp less than the requested
-    // end time.
-    // Don't start another download if one is already in progress.
-    if(!this._download || (this._download.fired > -1 && this.lastUpdate < endTimestamp )) {
+jarmon.RrdQueryRemote.prototype._callRemote = function(methodName, args) {
+    // Download the rrd if there has never been a download and don't start
+    // another download if one is already in progress.
+    if(!this._download) {
         this._download = this.downloader(this.url)
                 .addCallback(
                     function(self, binary) {
@@ -307,9 +295,10 @@ jarmon.RrdQueryRemote.prototype.getData = function(startTime, endTime, dsId) {
     // Set up a deferred which will call getData on the local RrdQuery object
     // returning a flot compatible data object to the caller.
     var ret = new MochiKit.Async.Deferred().addCallback(
-        function(self, startTime, endTime, dsId, rrd) {
-            return new jarmon.RrdQuery(rrd, self.unit).getData(startTime, endTime, dsId);
-        }, this, startTime, endTime, dsId);
+        function(self, methodName, args, rrd) {
+            var rq = new jarmon.RrdQuery(rrd, self.unit);
+            return rq[methodName].apply(rq, args);
+        }, this, methodName, args);
 
     // Add a pair of callbacks to the current download which will callback the
     // result which we setup above.
@@ -326,6 +315,23 @@ jarmon.RrdQueryRemote.prototype.getData = function(startTime, endTime, dsId) {
     return ret;
 };
 
+
+jarmon.RrdQueryRemote.prototype.getData = function(startTime, endTime, dsId) {
+    /**
+     * Return a Flot compatible data series asynchronously.
+     *
+     * @method getData
+     * @param startTime {Number} The start timestamp
+     * @param endTime {Number} The end timestamp
+     * @param dsId {Variant} identifier of the RRD datasource (string or number)
+     * @return {Object} A Deferred which calls back with a flot data series.
+     **/
+    if(this.lastUpdate < endTime/1000) {
+        this._download = null;
+    }
+    return this._callRemote('getData', [startTime, endTime, dsId]);
+};
+
 /**
  * Wraps RrdQueryRemote to provide access to a different RRD DSs within a
  * single RrdDataSource.
@@ -654,6 +660,46 @@ jarmon.Chart.fromRecipe = function(recipes, templateFactory, downloader) {
 };
 
 
+/**
+ * Generate a form through which to manipulate the data sources for a chart
+ *
+ * @class jarmon.ChartConfig
+ * @constructor
+ **/
+jarmon.ChartConfig = function($tpl) {
+    this.$tpl = $tpl;
+};
+
+jarmon.ChartConfig.prototype.draw = function() {
+    $('<form/>').append(
+        $('<div/>').append(
+            $('<label/>').append(
+                ['URL', ': '].join(''),
+                $('<input/>', {name: 'rrd_url'})
+            )
+        ),
+        $('<div/>').append(
+            $('<input/>', {type: 'submit', value: 'submit'})
+        )
+    ).submit(
+        function(e) {
+            var d = new jarmon.RrdQueryRemote(this['rrd_url'])
+            $(this).append(
+                $('<div/>').append(
+                    $('<label/>').append(
+                        ['DS', ': '].join(''),
+                        $('<input/>', {name: 'rrd_ds'})
+                    )
+                )
+            );
+
+            return false;
+        }
+    ).appendTo(this.$tpl);
+}
+
+
+
 // Options common to all the chart on this page
 jarmon.Chart.BASE_OPTIONS = {
     grid: {
diff --git a/jarmon/jarmon.test.js b/jarmon/jarmon.test.js
index c838023..fda076f 100644
--- a/jarmon/jarmon.test.js
+++ b/jarmon/jarmon.test.js
@@ -301,6 +301,20 @@ YUI({ logInclude: { TestRunner: true } }).use('console', 'test', function(Y) {
     }));
 
 
+    Y.Test.Runner.add(new Y.Test.Case({
+        name: "jarmon.ChartConfig",
+
+        test_draw: function () {
+            /**
+             * Test that a rendered chart has the correct dimensions, legend,
+             * axis, labels etc
+             **/
+            var c = new jarmon.ChartConfig($('<div/>').appendTo($('body')));
+            c.draw();
+        },
+    }));
+
+
     //initialize the console
     var yconsole = new Y.Console({
         newestOnTop: false,
-- 
cgit v1.2.3


From b3b166f6455b8556b5f14f35f8f755f26d5d87e1 Mon Sep 17 00:00:00 2001
From: Richard Wall <richard@largo>
Date: Thu, 30 Dec 2010 12:56:10 +0000
Subject: Unit tests for RrdQueryRemote

---
 jarmon/jarmon.js      |  4 +--
 jarmon/jarmon.test.js | 99 +++++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 101 insertions(+), 2 deletions(-)

diff --git a/jarmon/jarmon.js b/jarmon/jarmon.js
index a66a93b..6e1d1f8 100644
--- a/jarmon/jarmon.js
+++ b/jarmon/jarmon.js
@@ -316,7 +316,7 @@ jarmon.RrdQueryRemote.prototype._callRemote = function(methodName, args) {
 };
 
 
-jarmon.RrdQueryRemote.prototype.getData = function(startTime, endTime, dsId) {
+jarmon.RrdQueryRemote.prototype.getData = function(startTime, endTime, dsId, cfName) {
     /**
      * Return a Flot compatible data series asynchronously.
      *
@@ -329,7 +329,7 @@ jarmon.RrdQueryRemote.prototype.getData = function(startTime, endTime, dsId) {
     if(this.lastUpdate < endTime/1000) {
         this._download = null;
     }
-    return this._callRemote('getData', [startTime, endTime, dsId]);
+    return this._callRemote('getData', [startTime, endTime, dsId, cfName]);
 };
 
 /**
diff --git a/jarmon/jarmon.test.js b/jarmon/jarmon.test.js
index fda076f..2b4465d 100644
--- a/jarmon/jarmon.test.js
+++ b/jarmon/jarmon.test.js
@@ -276,6 +276,105 @@ YUI({ logInclude: { TestRunner: true } }).use('console', 'test', function(Y) {
     }));
 
 
+    Y.Test.Runner.add(new Y.Test.Case({
+        name: "jarmon.RrdQueryRemote",
+
+        setUp: function() {
+            this.rq = new jarmon.RrdQueryRemote('build/test.rrd', '')
+        },
+
+        test_getDataTimeRangeOverlapError: function () {
+            /**
+             * The starttime must be less than the endtime
+             **/
+            this.rq.getData(1, 0).addBoth(
+                function(self, res) {
+                    self.resume(function() {
+                        Y.Assert.isInstanceOf(RangeError, res);
+                    });
+                }, this);
+            this.wait();
+        },
+
+
+        test_getDataUnknownCfError: function () {
+            /**
+             * Error is raised if the rrd file doesn't contain an RRA with the
+             * requested consolidation function (CF)
+             **/
+            this.rq.getData(RRD_STARTTIME, RRD_ENDTIME, 0, 'FOO').addBoth(
+                function(self, res) {
+                    self.resume(function() {
+                        Y.Assert.isInstanceOf(TypeError, res);
+                    });
+                }, this);
+            this.wait();
+        },
+
+
+        test_getData: function () {
+            /**
+             * The generated rrd file should have values 0-9 at 300s intervals
+             * starting at 1980-01-01 00:00:00
+             * Result should include a data points with times > starttime and
+             * <= endTime
+             **/
+            this.rq.getData(RRD_STARTTIME + (RRD_STEP+1) * 1000,
+                            RRD_ENDTIME - (RRD_STEP-1) * 1000).addBoth(
+                function(self, data) {
+                    self.resume(function() {
+                        // We request data starting 1 STEP +1s after the RRD file
+                        // first val and ending 1 STEP -1s before the RRD last val
+                        // ie one step within the RRD file, but 1s away from the
+                        // step boundary to test the quantisation of the
+                        // requested time range.
+
+                        // so we expect two less rows than the total rows in the
+                        // file.
+                        Y.Assert.areEqual(RRD_RRAROWS-2, data.data.length);
+
+                        // The value of the first returned row should be the
+                        // second value in the RRD file (starts at value 0)
+                        Y.Assert.areEqual(1, data.data[0][1]);
+
+                        // The value of the last returned row should be the
+                        // 10 value in the RRD file (starts at value 0)
+                        Y.Assert.areEqual(10, data.data[data.data.length-1][1]);
+
+                        // The timestamp of the first returned row should be
+                        // exactly one step after the start of the RRD file
+                        Y.Assert.areEqual(
+                            RRD_STARTTIME+RRD_STEP*1000, data.data[0][0]);
+
+                        // RRD_ENDTIME is on a step boundary and is therfore
+                        // actually the start time of a new row
+                        // So when we ask for endTime = RRD_ENDTIME-STEP-1 we
+                        // actually get data up to the 2nd to last RRD row.
+                        Y.Assert.areEqual(
+                            RRD_ENDTIME-RRD_STEP*1000*2,
+                            data.data[data.data.length-1][0]);
+                    });
+                }, this);
+            this.wait();
+        },
+
+        test_getDataUnknownValues: function () {
+            /**
+             * If the requested time range is outside the range of the RRD file
+             * we should not get any values back
+             **/
+            this.rq.getData(RRD_ENDTIME, RRD_ENDTIME+1000).addBoth(
+                function(self, data) {
+                    self.resume(function() {
+                        Y.Assert.areEqual(0, data.data.length);
+                    });
+                }, this);
+            this.wait();
+        }
+
+    }));
+
+
     Y.Test.Runner.add(new Y.Test.Case({
         name: "jarmon.Chart",
 
-- 
cgit v1.2.3


From b3dfd26ce97cd1817f728667a586bf29eace752f Mon Sep 17 00:00:00 2001
From: Richard Wall <richard@largo>
Date: Thu, 30 Dec 2010 17:21:31 +0000
Subject: display a list of ds names found in the rrd url

---
 jarmon/jarmon.js      | 91 ++++++++++++++++++++++++++++++++++++++++-----------
 jarmon/jarmon.test.js |  2 +-
 2 files changed, 73 insertions(+), 20 deletions(-)

diff --git a/jarmon/jarmon.js b/jarmon/jarmon.js
index 6e1d1f8..c25210d 100644
--- a/jarmon/jarmon.js
+++ b/jarmon/jarmon.js
@@ -256,6 +256,18 @@ jarmon.RrdQuery.prototype.getData = function(startTimeJs, endTimeJs, dsId, cfNam
             'lastUpdated': lastUpdated*1000.0};
 };
 
+
+jarmon.RrdQuery.prototype.getDSNames = function() {
+    /**
+     * Return a list of RRD Data Source names
+     *
+     * @method getDSNames
+     * @return {Array} An array of DS names.
+     **/
+    return this.rrd.getDSNames();
+};
+
+
 /**
  * A wrapper around RrdQuery which provides asynchronous access to the data in a
  * remote RRD file.
@@ -332,6 +344,18 @@ jarmon.RrdQueryRemote.prototype.getData = function(startTime, endTime, dsId, cfN
     return this._callRemote('getData', [startTime, endTime, dsId, cfName]);
 };
 
+
+jarmon.RrdQueryRemote.prototype.getDSNames = function() {
+    /**
+     * Return a list of RRD Data Source names
+     *
+     * @method getDSNames
+     * @return {Object} A Deferred which calls back with an array of DS names.
+     **/
+    return this._callRemote('getDSNames');
+};
+
+
 /**
  * Wraps RrdQueryRemote to provide access to a different RRD DSs within a
  * single RrdDataSource.
@@ -668,31 +692,60 @@ jarmon.Chart.fromRecipe = function(recipes, templateFactory, downloader) {
  **/
 jarmon.ChartConfig = function($tpl) {
     this.$tpl = $tpl;
+    this.rrdUrl = '';
+    this.dsNames = [];
+    this.errors = [];
 };
 
 jarmon.ChartConfig.prototype.draw = function() {
-    $('<form/>').append(
-        $('<div/>').append(
-            $('<label/>').append(
-                ['URL', ': '].join(''),
-                $('<input/>', {name: 'rrd_url'})
-            )
-        ),
-        $('<div/>').append(
-            $('<input/>', {type: 'submit', value: 'submit'})
+    var self = this;
+    this.$tpl.empty();
+
+    $(this.errors).map(function(i, el) {
+        return $('<p/>').text(el.toString());
+    }).appendTo(this.$tpl);
+
+    var $f = $('<form/>')
+    $('<div/>').append(
+        $('<label/>').append(
+            ['URL', ': '].join(''),
+            $('<input/>', {name: 'rrd_url', value: this.rrdUrl})
+        )
+    ).appendTo($f);
+
+    $(this.dsNames).map(function(i, el) {
+        return $('<label/>').append(
+            [el, ': '].join(''),
+            $('<input/>', {
+                type: 'checkbox',
+                name: 'rrd_ds',
+                value: el
+            })
         )
-    ).submit(
+    }).appendTo($f);
+
+    $('<div/>').append(
+        $('<input/>', {type: 'submit', value: 'submit'})
+    ).appendTo($f);
+
+    $f.submit(
         function(e) {
-            var d = new jarmon.RrdQueryRemote(this['rrd_url'])
-            $(this).append(
-                $('<div/>').append(
-                    $('<label/>').append(
-                        ['DS', ': '].join(''),
-                        $('<input/>', {name: 'rrd_ds'})
-                    )
-                )
+            self.rrdUrl = this['rrd_url'].value;
+            self.$tpl.empty();
+            self.dsNames = [];
+            self.errors = [];
+            new jarmon.RrdQueryRemote(self.rrdUrl).getDSNames().addCallbacks(
+                function(dsNames) {
+                    self.dsNames = dsNames;
+                },
+                function(err) {
+                    self.errors.push(err);
+                }
+            ).addBoth(
+                function() {
+                    self.draw();
+                }
             );
-
             return false;
         }
     ).appendTo(this.$tpl);
diff --git a/jarmon/jarmon.test.js b/jarmon/jarmon.test.js
index 2b4465d..7f34391 100644
--- a/jarmon/jarmon.test.js
+++ b/jarmon/jarmon.test.js
@@ -280,7 +280,7 @@ YUI({ logInclude: { TestRunner: true } }).use('console', 'test', function(Y) {
         name: "jarmon.RrdQueryRemote",
 
         setUp: function() {
-            this.rq = new jarmon.RrdQueryRemote('build/test.rrd', '')
+            this.rq = new jarmon.RrdQueryRemote('build/test.rrd', '');
         },
 
         test_getDataTimeRangeOverlapError: function () {
-- 
cgit v1.2.3


From cc1d4b25ed125afd07204da980f5c9bc555b7862 Mon Sep 17 00:00:00 2001
From: Richard Wall <richard@largo>
Date: Thu, 30 Dec 2010 18:15:15 +0000
Subject: Render an error message and a list of ds label fields

---
 jarmon/jarmon.js      | 10 +++++++---
 jarmon/jarmon.test.js | 43 ++++++++++++++++++++++++++++++++++++++-----
 test.html             |  5 +----
 3 files changed, 46 insertions(+), 12 deletions(-)

diff --git a/jarmon/jarmon.js b/jarmon/jarmon.js
index c25210d..ae452d3 100644
--- a/jarmon/jarmon.js
+++ b/jarmon/jarmon.js
@@ -702,14 +702,18 @@ jarmon.ChartConfig.prototype.draw = function() {
     this.$tpl.empty();
 
     $(this.errors).map(function(i, el) {
-        return $('<p/>').text(el.toString());
+        return $('<p/>', {'class': 'error'}).text(el.toString());
     }).appendTo(this.$tpl);
 
     var $f = $('<form/>')
     $('<div/>').append(
         $('<label/>').append(
             ['URL', ': '].join(''),
-            $('<input/>', {name: 'rrd_url', value: this.rrdUrl})
+            $('<input/>', {
+                type: 'text',
+                name: 'rrd_url',
+                value: this.rrdUrl
+            })
         )
     ).appendTo($f);
 
@@ -717,7 +721,7 @@ jarmon.ChartConfig.prototype.draw = function() {
         return $('<label/>').append(
             [el, ': '].join(''),
             $('<input/>', {
-                type: 'checkbox',
+                type: 'text',
                 name: 'rrd_ds',
                 value: el
             })
diff --git a/jarmon/jarmon.test.js b/jarmon/jarmon.test.js
index 7f34391..0e548d5 100644
--- a/jarmon/jarmon.test.js
+++ b/jarmon/jarmon.test.js
@@ -403,13 +403,46 @@ YUI({ logInclude: { TestRunner: true } }).use('console', 'test', function(Y) {
     Y.Test.Runner.add(new Y.Test.Case({
         name: "jarmon.ChartConfig",
 
-        test_draw: function () {
+        setUp: function() {
+            this.$tpl = $('<div/>').appendTo($('body'))
+            var c = new jarmon.ChartConfig(this.$tpl);
+            c.draw();
+        },
+
+        test_drawInitialForm: function () {
             /**
-             * Test that a rendered chart has the correct dimensions, legend,
-             * axis, labels etc
+             * Test that the initial config form contains an rrd form field
              **/
-            var c = new jarmon.ChartConfig($('<div/>').appendTo($('body')));
-            c.draw();
+            Y.Assert.areEqual(
+                this.$tpl.find('form input[name=rrd_url]').size(), 1);
+        },
+
+        test_drawUrlErrorMessage: function () {
+            /**
+             * Test that submitting the form with an incorrect url results in
+             * an error message
+             **/
+            var self = this;
+            this.$tpl.find('form input[name=rrd_url]').val('Foo/Bar').submit();
+            this.wait(
+                function() {
+                    Y.Assert.areEqual(self.$tpl.find('.error').size(), 1);
+                }, 1000
+            );
+        },
+
+        test_drawUrlListDatasources: function () {
+            /**
+             * Test that submitting the form with an correct rrd url results in
+             * list of further DS  label fields
+             **/
+            var self = this;
+            this.$tpl.find('form input[name=rrd_url]').val('build/test.rrd').submit();
+            this.wait(
+                function() {
+                    Y.Assert.areEqual(self.$tpl.find('input[name=rrd_ds]').size(), 1);
+                }, 1000
+            );
         },
     }));
 
diff --git a/test.html b/test.html
index e8508f6..5d0baf4 100644
--- a/test.html
+++ b/test.html
@@ -3,10 +3,7 @@
     <head>
         <meta charset="utf-8">
         <title>Jarmon Unit Test Runner</title>
-        <link rel="stylesheet" type="text/css"
-              href="http://developer.yahoo.com/yui/3/assets/yui.css"/>
-        <link rel="stylesheet" type="text/css"
-              href="http://yui.yahooapis.com/3.1.1/build/cssfonts/fonts-min.css"/>
+
         <style type='text/css'>
         .chart {
             width: 500px;
-- 
cgit v1.2.3


From 04e45ad7e22505b1cd70f22e38e2cbb09e8a28a6 Mon Sep 17 00:00:00 2001
From: Richard Wall <richard@largo>
Date: Thu, 30 Dec 2010 23:56:16 +0000
Subject: step 2 - choose a label and unit

---
 jarmon/jarmon.js      | 115 +++++++++++++++++++++++++++++++++-----------------
 jarmon/jarmon.test.js |   4 +-
 2 files changed, 79 insertions(+), 40 deletions(-)

diff --git a/jarmon/jarmon.js b/jarmon/jarmon.js
index ae452d3..1c5c3eb 100644
--- a/jarmon/jarmon.js
+++ b/jarmon/jarmon.js
@@ -693,68 +693,107 @@ jarmon.Chart.fromRecipe = function(recipes, templateFactory, downloader) {
 jarmon.ChartConfig = function($tpl) {
     this.$tpl = $tpl;
     this.rrdUrl = '';
-    this.dsNames = [];
-    this.errors = [];
+    this.dsName = '';
+    this.dsLabel = '';
+    this.dsUnit = '';
 };
 
-jarmon.ChartConfig.prototype.draw = function() {
+jarmon.ChartConfig.prototype.drawRrdUrlForm = function() {
     var self = this;
     this.$tpl.empty();
 
-    $(this.errors).map(function(i, el) {
-        return $('<p/>', {'class': 'error'}).text(el.toString());
-    }).appendTo(this.$tpl);
+    var $f = $('<form/>');
 
-    var $f = $('<form/>')
     $('<div/>').append(
+        $('<p/>').text('Enter the URL of an RRD file'),
         $('<label/>').append(
             ['URL', ': '].join(''),
             $('<input/>', {
                 type: 'text',
                 name: 'rrd_url',
                 value: this.rrdUrl
-            })
+            }),
+            $('<input/>', {type: 'submit', value: 'download'}),
+            $('<div/>', {class: 'next'})
         )
     ).appendTo($f);
 
-    $(this.dsNames).map(function(i, el) {
-        return $('<label/>').append(
-            [el, ': '].join(''),
-            $('<input/>', {
-                type: 'text',
-                name: 'rrd_ds',
-                value: el
-            })
-        )
-    }).appendTo($f);
-
-    $('<div/>').append(
-        $('<input/>', {type: 'submit', value: 'submit'})
-    ).appendTo($f);
-
     $f.submit(
         function(e) {
             self.rrdUrl = this['rrd_url'].value;
-            self.$tpl.empty();
-            self.dsNames = [];
-            self.errors = [];
-            new jarmon.RrdQueryRemote(self.rrdUrl).getDSNames().addCallbacks(
-                function(dsNames) {
-                    self.dsNames = dsNames;
-                },
-                function(err) {
-                    self.errors.push(err);
-                }
-            ).addBoth(
-                function() {
-                    self.draw();
-                }
+            $placeholder = $(this).find('.next').empty();
+            var rq = new jarmon.RrdQueryRemote(self.rrdUrl);
+            rq.getDSNames().addCallback(
+                function($placeholder, dsNames) {
+                    if(dsNames.length > 1) {
+                        $('<p/>').text('The RRD file contains multiple data sources. Choose one:').appendTo($placeholder);
+                        $(dsNames).map(
+                            function(i, el) {
+                                return $('<input/>', {
+                                    type: 'button',
+                                    value: el
+                                }
+                            ).click(
+                                function(e) {
+                                    self.dsName = this.value;
+                                    self.drawDsLabelForm();
+                                }
+                            );
+                        }).appendTo($placeholder);
+                    } else {
+                        self.dsName = dsNames[0];
+                        self.drawDsLabelForm();
+                    }
+                }, $placeholder
+            ).addErrback(
+                function($placeholder, err) {
+                    $('<p/>', {'class': 'error'}).text(err.toString()).appendTo($placeholder);
+                }, $placeholder
             );
             return false;
         }
-    ).appendTo(this.$tpl);
+    );
+
+    $f.appendTo(this.$tpl);
 }
 
+jarmon.ChartConfig.prototype.drawDsLabelForm = function() {
+    var self = this;
+    this.$tpl.empty();
+
+    $('<form/>').append(
+        $('<p/>').text('Choose a label and unit for this data source.'),
+        $('<div/>').append(
+            $('<label/>').append(
+                ['Label', ': '].join(''),
+                $('<input/>', {
+                    type: 'text',
+                    name: 'dsLabel',
+                    value: this.dslabel || this.dsName
+                })
+            )
+        ),
+        $('<div/>').append(
+            $('<label/>').append(
+                ['Unit', ': '].join(''),
+                $('<input/>', {
+                    type: 'text',
+                    name: 'dsUnit',
+                    value: this.dsUnit
+                })
+            )
+        ),
+        $('<input/>', {type: 'submit', value: 'save'}),
+        $('<div/>', {class: 'next'})
+    ).submit(
+        function(e) {
+            self.dsLabel = this['dsLabel'].value;
+            self.dsUnit = this['dsUnit'].value;
+            return false;
+        }
+    ).appendTo(this.$tpl);
+
+};
 
 
 // Options common to all the chart on this page
diff --git a/jarmon/jarmon.test.js b/jarmon/jarmon.test.js
index 0e548d5..b42f701 100644
--- a/jarmon/jarmon.test.js
+++ b/jarmon/jarmon.test.js
@@ -406,7 +406,7 @@ YUI({ logInclude: { TestRunner: true } }).use('console', 'test', function(Y) {
         setUp: function() {
             this.$tpl = $('<div/>').appendTo($('body'))
             var c = new jarmon.ChartConfig(this.$tpl);
-            c.draw();
+            c.drawRrdUrlForm();
         },
 
         test_drawInitialForm: function () {
@@ -440,7 +440,7 @@ YUI({ logInclude: { TestRunner: true } }).use('console', 'test', function(Y) {
             this.$tpl.find('form input[name=rrd_url]').val('build/test.rrd').submit();
             this.wait(
                 function() {
-                    Y.Assert.areEqual(self.$tpl.find('input[name=rrd_ds]').size(), 1);
+                    Y.Assert.areEqual(self.$tpl.find('input[name=rrd_ds_label]').size(), 1);
                 }, 1000
             );
         },
-- 
cgit v1.2.3


From be6a9a53cfc620df3b79591f846c9f159b271247 Mon Sep 17 00:00:00 2001
From: Richard Wall <richard@largo>
Date: Fri, 31 Dec 2010 11:31:48 +0000
Subject: a summary page and back buttons

---
 jarmon/jarmon.js | 93 ++++++++++++++++++++++++++++++++++++--------------------
 1 file changed, 60 insertions(+), 33 deletions(-)

diff --git a/jarmon/jarmon.js b/jarmon/jarmon.js
index 1c5c3eb..6bd8d23 100644
--- a/jarmon/jarmon.js
+++ b/jarmon/jarmon.js
@@ -692,41 +692,43 @@ jarmon.Chart.fromRecipe = function(recipes, templateFactory, downloader) {
  **/
 jarmon.ChartConfig = function($tpl) {
     this.$tpl = $tpl;
-    this.rrdUrl = '';
-    this.dsName = '';
-    this.dsLabel = '';
-    this.dsUnit = '';
+    this.data = {
+        rrdUrl: '',
+        dsName: '',
+        dsLabel: '',
+        dsUnit:''
+    };
 };
 
 jarmon.ChartConfig.prototype.drawRrdUrlForm = function() {
     var self = this;
     this.$tpl.empty();
 
-    var $f = $('<form/>');
-
-    $('<div/>').append(
-        $('<p/>').text('Enter the URL of an RRD file'),
-        $('<label/>').append(
-            ['URL', ': '].join(''),
-            $('<input/>', {
-                type: 'text',
-                name: 'rrd_url',
-                value: this.rrdUrl
-            }),
+    $('<form/>').append(
+        $('<div/>').append(
+            $('<p/>').text('Enter the URL of an RRD file'),
+            $('<label/>').append(
+                'URL: ',
+                $('<input/>', {
+                    type: 'text',
+                    name: 'rrd_url',
+                    value: this.data.rrdUrl
+                })
+            ),
             $('<input/>', {type: 'submit', value: 'download'}),
             $('<div/>', {class: 'next'})
         )
-    ).appendTo($f);
-
-    $f.submit(
+    ).submit(
         function(e) {
-            self.rrdUrl = this['rrd_url'].value;
+            self.data.rrdUrl = this['rrd_url'].value;
             $placeholder = $(this).find('.next').empty();
-            var rq = new jarmon.RrdQueryRemote(self.rrdUrl);
-            rq.getDSNames().addCallback(
+            new jarmon.RrdQueryRemote(self.data.rrdUrl).getDSNames().addCallback(
                 function($placeholder, dsNames) {
                     if(dsNames.length > 1) {
-                        $('<p/>').text('The RRD file contains multiple data sources. Choose one:').appendTo($placeholder);
+                        $('<p/>').text(
+                            'The RRD file contains multiple data sources. \
+                             Choose one:').appendTo($placeholder);
+
                         $(dsNames).map(
                             function(i, el) {
                                 return $('<input/>', {
@@ -735,13 +737,13 @@ jarmon.ChartConfig.prototype.drawRrdUrlForm = function() {
                                 }
                             ).click(
                                 function(e) {
-                                    self.dsName = this.value;
+                                    self.data.dsName = this.value;
                                     self.drawDsLabelForm();
                                 }
                             );
                         }).appendTo($placeholder);
                     } else {
-                        self.dsName = dsNames[0];
+                        self.data.dsName = dsNames[0];
                         self.drawDsLabelForm();
                     }
                 }, $placeholder
@@ -752,9 +754,7 @@ jarmon.ChartConfig.prototype.drawRrdUrlForm = function() {
             );
             return false;
         }
-    );
-
-    $f.appendTo(this.$tpl);
+    ).appendTo(this.$tpl);
 }
 
 jarmon.ChartConfig.prototype.drawDsLabelForm = function() {
@@ -765,34 +765,61 @@ jarmon.ChartConfig.prototype.drawDsLabelForm = function() {
         $('<p/>').text('Choose a label and unit for this data source.'),
         $('<div/>').append(
             $('<label/>').append(
-                ['Label', ': '].join(''),
+                'Label: ',
                 $('<input/>', {
                     type: 'text',
                     name: 'dsLabel',
-                    value: this.dslabel || this.dsName
+                    value: this.data.dslabel || this.data.dsName
                 })
             )
         ),
         $('<div/>').append(
             $('<label/>').append(
-                ['Unit', ': '].join(''),
+                'Unit: ',
                 $('<input/>', {
                     type: 'text',
                     name: 'dsUnit',
-                    value: this.dsUnit
+                    value: this.data.dsUnit
                 })
             )
         ),
+        $('<input/>', {type: 'button', value: 'back'}).click(
+            function(e) {
+                self.drawRrdUrlForm();
+            }
+        ),
         $('<input/>', {type: 'submit', value: 'save'}),
         $('<div/>', {class: 'next'})
     ).submit(
         function(e) {
-            self.dsLabel = this['dsLabel'].value;
-            self.dsUnit = this['dsUnit'].value;
+            self.data.dsLabel = this['dsLabel'].value;
+            self.data.dsUnit = this['dsUnit'].value;
+            self.drawDsSummary();
             return false;
         }
     ).appendTo(this.$tpl);
+};
+
+
+jarmon.ChartConfig.prototype.drawDsSummary = function() {
+    var self = this;
+    this.$tpl.empty();
+
+    jQuery.each(this.data, function(i, el) {
+        $('<p/>').append(
+            $('<strong/>').text(i),
+            [': ', el].join('')
+        ).appendTo(self.$tpl);
+    });
 
+    this.$tpl.append(
+        $('<input/>', {type: 'button', value: 'back'}).click(
+            function(e) {
+                self.drawDsLabelForm();
+            }
+        ),
+        $('<input/>', {type: 'button', value: 'finish'})
+    );
 };
 
 
-- 
cgit v1.2.3


From 9fd4c47c8e3d87efd89acab8c1b59a5f526506d4 Mon Sep 17 00:00:00 2001
From: Richard Wall <richard@largo>
Date: Fri, 31 Dec 2010 12:21:54 +0000
Subject: a more suitable name

---
 jarmon/jarmon.js      | 12 ++++++------
 jarmon/jarmon.test.js |  4 ++--
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/jarmon/jarmon.js b/jarmon/jarmon.js
index 6bd8d23..d47af27 100644
--- a/jarmon/jarmon.js
+++ b/jarmon/jarmon.js
@@ -685,12 +685,12 @@ jarmon.Chart.fromRecipe = function(recipes, templateFactory, downloader) {
 
 
 /**
- * Generate a form through which to manipulate the data sources for a chart
+ * Generate a form through which to choose a data source from a remote RRD file
  *
- * @class jarmon.ChartConfig
+ * @class jarmon.RrdChooser
  * @constructor
  **/
-jarmon.ChartConfig = function($tpl) {
+jarmon.RrdChooser = function($tpl) {
     this.$tpl = $tpl;
     this.data = {
         rrdUrl: '',
@@ -700,7 +700,7 @@ jarmon.ChartConfig = function($tpl) {
     };
 };
 
-jarmon.ChartConfig.prototype.drawRrdUrlForm = function() {
+jarmon.RrdChooser.prototype.drawRrdUrlForm = function() {
     var self = this;
     this.$tpl.empty();
 
@@ -757,7 +757,7 @@ jarmon.ChartConfig.prototype.drawRrdUrlForm = function() {
     ).appendTo(this.$tpl);
 }
 
-jarmon.ChartConfig.prototype.drawDsLabelForm = function() {
+jarmon.RrdChooser.prototype.drawDsLabelForm = function() {
     var self = this;
     this.$tpl.empty();
 
@@ -801,7 +801,7 @@ jarmon.ChartConfig.prototype.drawDsLabelForm = function() {
 };
 
 
-jarmon.ChartConfig.prototype.drawDsSummary = function() {
+jarmon.RrdChooser.prototype.drawDsSummary = function() {
     var self = this;
     this.$tpl.empty();
 
diff --git a/jarmon/jarmon.test.js b/jarmon/jarmon.test.js
index b42f701..18b82d4 100644
--- a/jarmon/jarmon.test.js
+++ b/jarmon/jarmon.test.js
@@ -401,11 +401,11 @@ YUI({ logInclude: { TestRunner: true } }).use('console', 'test', function(Y) {
 
 
     Y.Test.Runner.add(new Y.Test.Case({
-        name: "jarmon.ChartConfig",
+        name: "jarmon.RrdChooser",
 
         setUp: function() {
             this.$tpl = $('<div/>').appendTo($('body'))
-            var c = new jarmon.ChartConfig(this.$tpl);
+            var c = new jarmon.RrdChooser(this.$tpl);
             c.drawRrdUrlForm();
         },
 
-- 
cgit v1.2.3


From 0b6a4a8cd443b6d0a4ac9ffc42e4e094ed5bfe9b Mon Sep 17 00:00:00 2001
From: Richard Wall <richard@largo>
Date: Fri, 31 Dec 2010 13:23:09 +0000
Subject: A skeleton chart editing control

---
 jarmon/jarmon.js      | 67 +++++++++++++++++++++++++++++++++++++++++++++++++++
 jarmon/jarmon.test.js | 19 +++++++++++++++
 2 files changed, 86 insertions(+)

diff --git a/jarmon/jarmon.js b/jarmon/jarmon.js
index d47af27..5df7cce 100644
--- a/jarmon/jarmon.js
+++ b/jarmon/jarmon.js
@@ -823,6 +823,73 @@ jarmon.RrdChooser.prototype.drawDsSummary = function() {
 };
 
 
+jarmon.ChartEditor = function($tpl) {
+    this.$tpl = $tpl;
+    this.data = {
+        title: '',
+        datasources: [
+            ['data/cpu-0/cpu-wait.rrd', 0, 'CPU-0 Wait', '%'],
+            ['data/cpu-1/cpu-wait.rrd', 0, 'CPU-1 Wait', '%'],
+            ['data/cpu-0/cpu-system.rrd', 0, 'CPU-0 System', '%'],
+            ['data/cpu-1/cpu-system.rrd', 0, 'CPU-1 System', '%'],
+            ['data/cpu-0/cpu-user.rrd', 0, 'CPU-0 User', '%'],
+            ['data/cpu-1/cpu-user.rrd', 0, 'CPU-1 User', '%']
+        ]
+    };
+};
+
+jarmon.ChartEditor.prototype.drawChartEditForm = function() {
+    var self = this;
+    this.$tpl.empty();
+
+    $('<form/>').append(
+        $('<div/>').append(
+            $('<label/>').append(
+                'Title: ',
+                $('<input/>', {
+                    type: 'text',
+                    name: 'title',
+                    value: this.data.title
+                })
+            )
+        ),
+        $('<fieldset/>').append(
+            $('<legend/>').text('Data Sources'),
+            $('<table/>', {'class': 'datasources'}).append(
+                $('<thead/>').append(
+                    $('<tr/>').append(
+                        $('<th/>').text('RRD File'),
+                        $('<th/>').text('DS Name'),
+                        $('<th/>').text('DS Label'),
+                        $('<th/>').text('DS Unit'),
+                        $('<th/>')
+                    )
+                )
+            ),
+            $('<input/>', {type: 'button', value: 'Add'})
+        ),
+        $('<input/>', {type: 'submit', value: 'Save'}),
+        $('<div/>', {class: 'next'})
+
+    ).appendTo(this.$tpl);
+
+    $(this.data.datasources).map(
+        function(i, el) {
+            return $('<tr/>').append(
+                $('<td/>').text(el[0]),
+                $('<td/>').text(el[1]),
+                $('<td/>').text(el[2]),
+                $('<td/>').text(el[3]),
+                $('<td/>').append(
+                    $('<input/>', {type: 'button', value: 'edit'}),
+                    $('<input/>', {type: 'button', value: 'delete'})
+                )
+            );
+        }
+    ).appendTo(this.$tpl.find('.datasources'));
+};
+
+
 // Options common to all the chart on this page
 jarmon.Chart.BASE_OPTIONS = {
     grid: {
diff --git a/jarmon/jarmon.test.js b/jarmon/jarmon.test.js
index 18b82d4..ee9c7bb 100644
--- a/jarmon/jarmon.test.js
+++ b/jarmon/jarmon.test.js
@@ -447,6 +447,25 @@ YUI({ logInclude: { TestRunner: true } }).use('console', 'test', function(Y) {
     }));
 
 
+    Y.Test.Runner.add(new Y.Test.Case({
+        name: "jarmon.ChartEditor",
+
+        setUp: function() {
+            this.$tpl = $('<div/>').appendTo($('body'))
+            var c = new jarmon.ChartEditor(this.$tpl);
+            c.drawChartEditForm();
+        },
+
+        test_drawInitialForm: function () {
+            /**
+             * Test that the initial config form contains an rrd form field
+             **/
+            Y.Assert.areEqual(
+                this.$tpl.find('form input[name=rrd_url]').size(), 1);
+        }
+    }));
+
+
     //initialize the console
     var yconsole = new Y.Console({
         newestOnTop: false,
-- 
cgit v1.2.3


From 4b91cf5648ebddf60e793cb90ad209439b595dbd Mon Sep 17 00:00:00 2001
From: Richard Wall <richard@largo>
Date: Sat, 1 Jan 2011 12:22:51 +0000
Subject: Allow add delete of data source records

---
 jarmon/jarmon.js      | 132 +++++++++++++++++++++++++++++++++++++++-----------
 jarmon/jarmon.test.js |  15 +++++-
 2 files changed, 117 insertions(+), 30 deletions(-)

diff --git a/jarmon/jarmon.js b/jarmon/jarmon.js
index 5df7cce..6639382 100644
--- a/jarmon/jarmon.js
+++ b/jarmon/jarmon.js
@@ -823,19 +823,9 @@ jarmon.RrdChooser.prototype.drawDsSummary = function() {
 };
 
 
-jarmon.ChartEditor = function($tpl) {
+jarmon.ChartEditor = function($tpl, data) {
     this.$tpl = $tpl;
-    this.data = {
-        title: '',
-        datasources: [
-            ['data/cpu-0/cpu-wait.rrd', 0, 'CPU-0 Wait', '%'],
-            ['data/cpu-1/cpu-wait.rrd', 0, 'CPU-1 Wait', '%'],
-            ['data/cpu-0/cpu-system.rrd', 0, 'CPU-0 System', '%'],
-            ['data/cpu-1/cpu-system.rrd', 0, 'CPU-1 System', '%'],
-            ['data/cpu-0/cpu-user.rrd', 0, 'CPU-0 User', '%'],
-            ['data/cpu-1/cpu-user.rrd', 0, 'CPU-1 User', '%']
-        ]
-    };
+    this.data = data;
 };
 
 jarmon.ChartEditor.prototype.drawChartEditForm = function() {
@@ -864,29 +854,113 @@ jarmon.ChartEditor.prototype.drawChartEditForm = function() {
                         $('<th/>').text('DS Unit'),
                         $('<th/>')
                     )
-                )
-            ),
-            $('<input/>', {type: 'button', value: 'Add'})
+                ),
+                $('<tfoot/>').append(
+                    $('<tr/>').append(
+                        $('<td/>').append(
+                            $('<input/>', {type: 'text'})
+                        ),
+                        $('<td/>').append(
+                            $('<input/>', {type: 'text'})
+                        ),
+                        $('<td/>').append(
+                            $('<input/>', {type: 'text'})
+                        ),
+                        $('<td/>').append(
+                            $('<input/>', {type: 'text'})
+                        ),
+                        $('<td/>').append(
+                            $('<input/>', {
+                                type: 'button',
+                                value: 'add',
+                                name: 'datasource_add'
+                            })
+                        )
+                    )
+                ),
+                $('<tbody/>')
+            )
         ),
-        $('<input/>', {type: 'submit', value: 'Save'}),
-        $('<div/>', {class: 'next'})
-
+        $('<input/>', {type: 'submit', value: 'save'})
     ).appendTo(this.$tpl);
 
-    $(this.data.datasources).map(
-        function(i, el) {
-            return $('<tr/>').append(
-                $('<td/>').text(el[0]),
-                $('<td/>').text(el[1]),
-                $('<td/>').text(el[2]),
-                $('<td/>').text(el[3]),
-                $('<td/>').append(
-                    $('<input/>', {type: 'button', value: 'edit'}),
-                    $('<input/>', {type: 'button', value: 'delete'})
+    for(var i=0; i<this.data.datasources.length; i++) {
+        this._addDatasourceRow(this.data.datasources[i]);
+    }
+
+    $('form', this.$tpl[0]).live(
+        'submit',
+        {self: this},
+        function(e) {
+            var self = e.data.self;
+            self.data.title = this['title'].value;
+            self.data.datasources = $(this).find('.datasources tbody tr').map(
+                function(i, el) {
+                    return $(el).find('input[type=text]').map(
+                        function(i, el) {
+                            return el.value;
+                        }
+                    );
+                }
+            );
+            console.log(self.data);
+            return false;
+        }
+    );
+
+    $('form input[name=datasource_delete]', this.$tpl[0]).live('click',
+        function(e) {
+            $(this).closest('tr').remove();
+        }
+    );
+
+    $('form input[name=datasource_add]', this.$tpl[0]).live(
+        'click',
+        {self: this},
+        function(e) {
+            var self = e.data.self;
+            self._addDatasourceRow(
+                self._extractRowValues(
+                    $(this).closest('tr')
                 )
             );
+            $(this).closest('tr').find('input[type=text]').val('')
         }
-    ).appendTo(this.$tpl.find('.datasources'));
+    );
+};
+
+
+jarmon.ChartEditor.prototype._extractRowValues = function($row) {
+    return $row.find('input[type=text]').map(
+        function(i, el) {
+            return el.value;
+        }
+    )
+};
+
+
+jarmon.ChartEditor.prototype._addDatasourceRow = function(record) {
+    $('<tr/>').append(
+        $('<td/>').append(
+            $('<input/>', {type: 'text', value: record[0]})
+        ),
+        $('<td/>').append(
+            $('<input/>', {type: 'text', value: record[1]})
+        ),
+        $('<td/>').append(
+            $('<input/>', {type: 'text', value: record[2]})
+        ),
+        $('<td/>').append(
+            $('<input/>', {type: 'text', value: record[3]})
+        ),
+        $('<td/>').append(
+            $('<input/>', {
+                type: 'button',
+                value: 'delete',
+                name: 'datasource_delete'
+            })
+        )
+    ).appendTo(this.$tpl.find('.datasources tbody'));
 };
 
 
diff --git a/jarmon/jarmon.test.js b/jarmon/jarmon.test.js
index ee9c7bb..08ac433 100644
--- a/jarmon/jarmon.test.js
+++ b/jarmon/jarmon.test.js
@@ -452,7 +452,20 @@ YUI({ logInclude: { TestRunner: true } }).use('console', 'test', function(Y) {
 
         setUp: function() {
             this.$tpl = $('<div/>').appendTo($('body'))
-            var c = new jarmon.ChartEditor(this.$tpl);
+            var c = new jarmon.ChartEditor(
+                this.$tpl,
+                {
+                    title: 'Foo',
+                    datasources: [
+                        ['data/cpu-0/cpu-wait.rrd', 0, 'CPU-0 Wait', '%'],
+                        ['data/cpu-1/cpu-wait.rrd', 0, 'CPU-1 Wait', '%'],
+                        ['data/cpu-0/cpu-system.rrd', 0, 'CPU-0 System', '%'],
+                        ['data/cpu-1/cpu-system.rrd', 0, 'CPU-1 System', '%'],
+                        ['data/cpu-0/cpu-user.rrd', 0, 'CPU-0 User', '%'],
+                        ['data/cpu-1/cpu-user.rrd', 0, 'CPU-1 User', '%']
+                    ]
+                }
+            );
             c.drawChartEditForm();
         },
 
-- 
cgit v1.2.3


From eadfb7138783844ba9c62bad9038cdeac7a1f305 Mon Sep 17 00:00:00 2001
From: Richard Wall <richard@largo>
Date: Sat, 1 Jan 2011 12:37:39 +0000
Subject: A reset button

---
 jarmon/jarmon.js      | 95 ++++++++++++++++++++++++++++-----------------------
 jarmon/jarmon.test.js |  2 +-
 2 files changed, 54 insertions(+), 43 deletions(-)

diff --git a/jarmon/jarmon.js b/jarmon/jarmon.js
index 6639382..a9dcac5 100644
--- a/jarmon/jarmon.js
+++ b/jarmon/jarmon.js
@@ -826,9 +826,59 @@ jarmon.RrdChooser.prototype.drawDsSummary = function() {
 jarmon.ChartEditor = function($tpl, data) {
     this.$tpl = $tpl;
     this.data = data;
+
+    $('form', this.$tpl[0]).live(
+        'submit',
+        {self: this},
+        function(e) {
+            var self = e.data.self;
+            self.data.title = this['title'].value;
+            self.data.datasources = $(this).find('.datasources tbody tr').map(
+                function(i, el) {
+                    return $(el).find('input[type=text]').map(
+                        function(i, el) {
+                            return el.value;
+                        }
+                    );
+                }
+            );
+            return false;
+        }
+    );
+
+    $('form', this.$tpl[0]).live(
+        'reset',
+        {self: this},
+        function(e) {
+            var self = e.data.self;
+            self.draw();
+            return false;
+        }
+    );
+
+    $('form input[name=datasource_delete]', this.$tpl[0]).live(
+        'click',
+        function(e) {
+            $(this).closest('tr').remove();
+        }
+    );
+
+    $('form input[name=datasource_add]', this.$tpl[0]).live(
+        'click',
+        {self: this},
+        function(e) {
+            var self = e.data.self;
+            self._addDatasourceRow(
+                self._extractRowValues(
+                    $(this).closest('tr')
+                )
+            );
+            $(this).closest('tr').find('input[type=text]').val('');
+        }
+    );
 };
 
-jarmon.ChartEditor.prototype.drawChartEditForm = function() {
+jarmon.ChartEditor.prototype.draw = function() {
     var self = this;
     this.$tpl.empty();
 
@@ -881,52 +931,13 @@ jarmon.ChartEditor.prototype.drawChartEditForm = function() {
                 $('<tbody/>')
             )
         ),
-        $('<input/>', {type: 'submit', value: 'save'})
+        $('<input/>', {type: 'submit', value: 'save'}),
+        $('<input/>', {type: 'reset', value: 'reset'})
     ).appendTo(this.$tpl);
 
     for(var i=0; i<this.data.datasources.length; i++) {
         this._addDatasourceRow(this.data.datasources[i]);
     }
-
-    $('form', this.$tpl[0]).live(
-        'submit',
-        {self: this},
-        function(e) {
-            var self = e.data.self;
-            self.data.title = this['title'].value;
-            self.data.datasources = $(this).find('.datasources tbody tr').map(
-                function(i, el) {
-                    return $(el).find('input[type=text]').map(
-                        function(i, el) {
-                            return el.value;
-                        }
-                    );
-                }
-            );
-            console.log(self.data);
-            return false;
-        }
-    );
-
-    $('form input[name=datasource_delete]', this.$tpl[0]).live('click',
-        function(e) {
-            $(this).closest('tr').remove();
-        }
-    );
-
-    $('form input[name=datasource_add]', this.$tpl[0]).live(
-        'click',
-        {self: this},
-        function(e) {
-            var self = e.data.self;
-            self._addDatasourceRow(
-                self._extractRowValues(
-                    $(this).closest('tr')
-                )
-            );
-            $(this).closest('tr').find('input[type=text]').val('')
-        }
-    );
 };
 
 
diff --git a/jarmon/jarmon.test.js b/jarmon/jarmon.test.js
index 08ac433..f5b7dae 100644
--- a/jarmon/jarmon.test.js
+++ b/jarmon/jarmon.test.js
@@ -466,7 +466,7 @@ YUI({ logInclude: { TestRunner: true } }).use('console', 'test', function(Y) {
                     ]
                 }
             );
-            c.drawChartEditForm();
+            c.draw();
         },
 
         test_drawInitialForm: function () {
-- 
cgit v1.2.3


From e7c9a4fc96dda39c5b11f92a875e4d2b630ea656 Mon Sep 17 00:00:00 2001
From: Richard Wall <richard@largo>
Date: Sat, 1 Jan 2011 14:42:07 +0000
Subject: start joining things up.

---
 jarmon/jarmon.js | 48 +++++++++++++++++++++++++++++++-----------------
 1 file changed, 31 insertions(+), 17 deletions(-)

diff --git a/jarmon/jarmon.js b/jarmon/jarmon.js
index a9dcac5..e6a7814 100644
--- a/jarmon/jarmon.js
+++ b/jarmon/jarmon.js
@@ -394,9 +394,10 @@ jarmon.RrdQueryDsProxy.prototype.getData = function(startTime, endTime) {
  * @param options {Object} Flot options which control how the chart should be
  *      drawn.
  **/
-jarmon.Chart = function(template, options) {
+jarmon.Chart = function(template, recipe) {
     this.template = template;
-    this.options = jQuery.extend(true, {yaxis: {}}, options);
+    this.recipe = recipe;
+    this.options = jQuery.extend(true, {yaxis: {}}, recipe.options);
 
     this.data = [];
 
@@ -410,6 +411,14 @@ jarmon.Chart = function(template, options) {
         self.draw();
     });
 
+    $('.graph-legend input[name=chart_edit]', this.template[0]).live(
+        'click',
+        {self: this},
+        function(e) {
+            var self = e.data.self;
+            new jarmon.ChartEditor($(this).closest('.graph-legend'), self.recipe).draw();
+        }
+    );
 
     this.options['yaxis']['ticks'] = function(axis) {
         /*
@@ -598,13 +607,15 @@ jarmon.Chart.prototype.draw = function() {
                     // to accomodate the color box
                     var legend = self.template.find('.graph-legend').show();
                     legend.empty();
-                    self.template.find('.legendLabel')
-                        .each(function(i, el) {
+                    self.template.find('.legendLabel').each(
+                        function(i, el) {
                             var orig = $(el);
                             var label = orig.text();
-                            var newEl = $('<div />')
-                                .attr('class', 'legendItem')
-                                .attr('title', 'Data series switch - click to turn this data series on or off')
+                            var newEl = $('<div />', {
+                                'class': 'legendItem',
+                                'title': 'Data series switch - click to turn \
+                                          this data series on or off'
+                            })
                                 .width(orig.width()+20)
                                 .text(label)
                                 .prepend(orig.prev().find('div div').clone().addClass('legendColorBox'))
@@ -615,8 +626,11 @@ jarmon.Chart.prototype.draw = function() {
                             if( $.inArray(label, disabled) > -1 ) {
                                 newEl.addClass('disabled');
                             }
-                        })
-                        .remove();
+                        }
+                    ).remove();
+                    legend.append(
+                        $('<input/>', {type: 'button', value: 'edit', name: 'chart_edit'})
+                    );
                     legend.append($('<div />').css('clear', 'both'));
                     self.template.find('.legend').remove();
 
@@ -673,7 +687,7 @@ jarmon.Chart.fromRecipe = function(recipes, templateFactory, downloader) {
         if(chartData.length > 0) {
             template = templateFactory();
             template.find('.title').text(recipe['title']);
-            c = new jarmon.Chart(template, recipe['options']);
+            c = new jarmon.Chart(template, recipe);
             for(j=0; j<chartData.length; j++) {
                 c.addData.apply(c, chartData[j]);
             }
@@ -823,17 +837,17 @@ jarmon.RrdChooser.prototype.drawDsSummary = function() {
 };
 
 
-jarmon.ChartEditor = function($tpl, data) {
+jarmon.ChartEditor = function($tpl, recipe) {
     this.$tpl = $tpl;
-    this.data = data;
+    this.recipe = recipe;
 
     $('form', this.$tpl[0]).live(
         'submit',
         {self: this},
         function(e) {
             var self = e.data.self;
-            self.data.title = this['title'].value;
-            self.data.datasources = $(this).find('.datasources tbody tr').map(
+            self.recipe.title = this['title'].value;
+            self.recipe.data = $(this).find('.datasources tbody tr').map(
                 function(i, el) {
                     return $(el).find('input[type=text]').map(
                         function(i, el) {
@@ -889,7 +903,7 @@ jarmon.ChartEditor.prototype.draw = function() {
                 $('<input/>', {
                     type: 'text',
                     name: 'title',
-                    value: this.data.title
+                    value: this.recipe.title
                 })
             )
         ),
@@ -935,8 +949,8 @@ jarmon.ChartEditor.prototype.draw = function() {
         $('<input/>', {type: 'reset', value: 'reset'})
     ).appendTo(this.$tpl);
 
-    for(var i=0; i<this.data.datasources.length; i++) {
-        this._addDatasourceRow(this.data.datasources[i]);
+    for(var i=0; i<this.recipe.data.length; i++) {
+        this._addDatasourceRow(this.recipe.data[i]);
     }
 };
 
-- 
cgit v1.2.3


From a48dd7a95f71869a367a3f32787660bb0a88eadb Mon Sep 17 00:00:00 2001
From: Richard Wall <richard@largo>
Date: Sat, 1 Jan 2011 15:34:11 +0000
Subject: some refactoring required to get things working...

---
 jarmon/jarmon.js | 72 +++++++++++++++++++++++++++++---------------------------
 1 file changed, 37 insertions(+), 35 deletions(-)

diff --git a/jarmon/jarmon.js b/jarmon/jarmon.js
index e6a7814..ccfbc8e 100644
--- a/jarmon/jarmon.js
+++ b/jarmon/jarmon.js
@@ -394,13 +394,17 @@ jarmon.RrdQueryDsProxy.prototype.getData = function(startTime, endTime) {
  * @param options {Object} Flot options which control how the chart should be
  *      drawn.
  **/
-jarmon.Chart = function(template, recipe) {
+jarmon.Chart = function(template, recipe,  downloader) {
     this.template = template;
     this.recipe = recipe;
+    this.downloader = downloader;
+
     this.options = jQuery.extend(true, {yaxis: {}}, recipe.options);
 
     this.data = [];
 
+    this.setup();
+
     var self = this;
 
 
@@ -416,7 +420,7 @@ jarmon.Chart = function(template, recipe) {
         {self: this},
         function(e) {
             var self = e.data.self;
-            new jarmon.ChartEditor($(this).closest('.graph-legend'), self.recipe).draw();
+            new jarmon.ChartEditor($(this).closest('.graph-legend'), self).draw();
         }
     );
 
@@ -481,6 +485,24 @@ jarmon.Chart = function(template, recipe) {
     };
 };
 
+jarmon.Chart.prototype.setup = function() {
+    this.template.find('.title').text(this.recipe['title']);
+    this.data = [];
+    var recipe = this.recipe;
+    var dataDict = {};
+    for(var j=0; j<recipe['data'].length; j++) {
+        var rrd = recipe['data'][j][0];
+        var ds = recipe['data'][j][1];
+        var label = recipe['data'][j][2];
+        var unit = recipe['data'][j][3];
+
+        if(typeof dataDict[rrd] == 'undefined') {
+            dataDict[rrd] = new jarmon.RrdQueryRemote(rrd, unit, this.downloader);
+        }
+        this.addData(label, new jarmon.RrdQueryDsProxy(dataDict[rrd], ds));
+    }
+};
+
 jarmon.Chart.prototype.addData = function(label, db, enabled) {
     /**
      * Add details of a remote RRD data source whose data will be added to this
@@ -666,33 +688,11 @@ jarmon.Chart.fromRecipe = function(recipes, templateFactory, downloader) {
      **/
 
     var charts = [];
-    var dataDict = {};
-
-    var recipe, chartData, template, c, i, j, ds, label, rrd, unit, re, match;
 
-    for(i=0; i<recipes.length; i++) {
-        recipe = recipes[i];
-        chartData = [];
-
-        for(j=0; j<recipe['data'].length; j++) {
-            rrd = recipe['data'][j][0];
-            ds = recipe['data'][j][1];
-            label = recipe['data'][j][2];
-            unit = recipe['data'][j][3];
-            if(typeof dataDict[rrd] == 'undefined') {
-                dataDict[rrd] = new jarmon.RrdQueryRemote(rrd, unit, downloader);
-            }
-            chartData.push([label, new jarmon.RrdQueryDsProxy(dataDict[rrd], ds)]);
-        }
-        if(chartData.length > 0) {
-            template = templateFactory();
-            template.find('.title').text(recipe['title']);
-            c = new jarmon.Chart(template, recipe);
-            for(j=0; j<chartData.length; j++) {
-                c.addData.apply(c, chartData[j]);
-            }
-            charts.push(c);
-        }
+    for(var i=0; i<recipes.length; i++) {
+        charts.push(
+            new jarmon.Chart(templateFactory(), recipes[i], downloader)
+        );
     }
     return charts;
 };
@@ -837,17 +837,17 @@ jarmon.RrdChooser.prototype.drawDsSummary = function() {
 };
 
 
-jarmon.ChartEditor = function($tpl, recipe) {
+jarmon.ChartEditor = function($tpl, chart) {
     this.$tpl = $tpl;
-    this.recipe = recipe;
+    this.chart = chart;
 
     $('form', this.$tpl[0]).live(
         'submit',
         {self: this},
         function(e) {
             var self = e.data.self;
-            self.recipe.title = this['title'].value;
-            self.recipe.data = $(this).find('.datasources tbody tr').map(
+            self.chart.recipe.title = this['title'].value;
+            self.chart.recipe.data = $(this).find('.datasources tbody tr').map(
                 function(i, el) {
                     return $(el).find('input[type=text]').map(
                         function(i, el) {
@@ -856,6 +856,8 @@ jarmon.ChartEditor = function($tpl, recipe) {
                     );
                 }
             );
+            self.chart.setup();
+            self.chart.draw();
             return false;
         }
     );
@@ -903,7 +905,7 @@ jarmon.ChartEditor.prototype.draw = function() {
                 $('<input/>', {
                     type: 'text',
                     name: 'title',
-                    value: this.recipe.title
+                    value: this.chart.recipe.title
                 })
             )
         ),
@@ -949,8 +951,8 @@ jarmon.ChartEditor.prototype.draw = function() {
         $('<input/>', {type: 'reset', value: 'reset'})
     ).appendTo(this.$tpl);
 
-    for(var i=0; i<this.recipe.data.length; i++) {
-        this._addDatasourceRow(this.recipe.data[i]);
+    for(var i=0; i<this.chart.recipe.data.length; i++) {
+        this._addDatasourceRow(this.chart.recipe.data[i]);
     }
 };
 
-- 
cgit v1.2.3


From 91d9735a448bb519fd5683bfef9635fc77ac7008 Mon Sep 17 00:00:00 2001
From: Richard Wall <richard@largo>
Date: Sat, 1 Jan 2011 15:43:03 +0000
Subject: fix an issue with DS indices

---
 jarmon/jarmon.js | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/jarmon/jarmon.js b/jarmon/jarmon.js
index ccfbc8e..5952aa2 100644
--- a/jarmon/jarmon.js
+++ b/jarmon/jarmon.js
@@ -493,6 +493,11 @@ jarmon.Chart.prototype.setup = function() {
     for(var j=0; j<recipe['data'].length; j++) {
         var rrd = recipe['data'][j][0];
         var ds = recipe['data'][j][1];
+        // Test for integer DS index as opposed to DS name
+        var dsi = parseInt(ds);
+        if(ds.toString() == dsi.toString()) {
+            ds = dsi;
+        }
         var label = recipe['data'][j][2];
         var unit = recipe['data'][j][3];
 
-- 
cgit v1.2.3


From 7e7a9e36693919bd79a11be271a379303f581c54 Mon Sep 17 00:00:00 2001
From: Richard Wall <richard@largo>
Date: Sat, 8 Jan 2011 15:05:38 +0000
Subject: start to reorganise the example application

---
 docs/examples/index.html                | 112 +++++++++++++--------------
 docs/examples/jarmon_example_recipes.js | 130 +++++++++++++++-----------------
 jarmon/jarmon.js                        |  24 ------
 3 files changed, 112 insertions(+), 154 deletions(-)

diff --git a/docs/examples/index.html b/docs/examples/index.html
index 3debd18..ec5143d 100644
--- a/docs/examples/index.html
+++ b/docs/examples/index.html
@@ -18,31 +18,36 @@
         <script type="text/javascript">
         // Recipes for the charts on this page
 
-        var application_recipes = [
-            {
-                title: 'Jarmon Webserver TCP Stats',
-                data: [
-                    ['data/tcpconns-8080-local/tcp_connections-CLOSE_WAIT.rrd', 0, 'CLOSE_WAIT', ''],
-                    ['data/tcpconns-8080-local/tcp_connections-SYN_RECV.rrd', 0, 'SYN_RECV', ''],
-                    ['data/tcpconns-8080-local/tcp_connections-TIME_WAIT.rrd', 0, 'TIME_WAIT', ''],
-                    ['data/tcpconns-8080-local/tcp_connections-CLOSED.rrd', 0, 'CLOSED', ''],
-                    ['data/tcpconns-8080-local/tcp_connections-FIN_WAIT2.rrd', 0, 'FIN_WAIT2', ''],
-                    ['data/tcpconns-8080-local/tcp_connections-FIN_WAIT1.rrd', 0, 'FIN_WAIT1', ''],
-                    ['data/tcpconns-8080-local/tcp_connections-ESTABLISHED.rrd', 0, 'ESTABLISHED', ''],
-                    ['data/tcpconns-8080-local/tcp_connections-LAST_ACK.rrd', 0, 'LAST_ACK', ''],
-                    ['data/tcpconns-8080-local/tcp_connections-LISTEN.rrd', 0, 'LISTEN', ''],
-                    ['data/tcpconns-8080-local/tcp_connections-SYN_SENT.rrd', 0, 'SYN_SENT', ''],
-                    ['data/tcpconns-8080-local/tcp_connections-CLOSING.rrd', 0, 'CLOSING', '']
-                ],
-                options: jQuery.extend(true, {yaxis: {tickDecimals: 0}}, jarmon.Chart.BASE_OPTIONS, jarmon.Chart.STACKED_OPTIONS)
-            }
-        ];
+        var application_recipe = {
+            title: 'Jarmon Webserver TCP Stats',
+            data: [
+                ['data/tcpconns-8080-local/tcp_connections-CLOSE_WAIT.rrd', 0, 'CLOSE_WAIT', ''],
+                ['data/tcpconns-8080-local/tcp_connections-SYN_RECV.rrd', 0, 'SYN_RECV', ''],
+                ['data/tcpconns-8080-local/tcp_connections-TIME_WAIT.rrd', 0, 'TIME_WAIT', ''],
+                ['data/tcpconns-8080-local/tcp_connections-CLOSED.rrd', 0, 'CLOSED', ''],
+                ['data/tcpconns-8080-local/tcp_connections-FIN_WAIT2.rrd', 0, 'FIN_WAIT2', ''],
+                ['data/tcpconns-8080-local/tcp_connections-FIN_WAIT1.rrd', 0, 'FIN_WAIT1', ''],
+                ['data/tcpconns-8080-local/tcp_connections-ESTABLISHED.rrd', 0, 'ESTABLISHED', ''],
+                ['data/tcpconns-8080-local/tcp_connections-LAST_ACK.rrd', 0, 'LAST_ACK', ''],
+                ['data/tcpconns-8080-local/tcp_connections-LISTEN.rrd', 0, 'LISTEN', ''],
+                ['data/tcpconns-8080-local/tcp_connections-SYN_SENT.rrd', 0, 'SYN_SENT', ''],
+                ['data/tcpconns-8080-local/tcp_connections-CLOSING.rrd', 0, 'CLOSING', '']
+            ],
+            options: jQuery.extend(true, {yaxis: {tickDecimals: 0}}, jarmon.Chart.BASE_OPTIONS, jarmon.Chart.STACKED_OPTIONS)
+        };
 
 
         function initialiseCharts() {
             /**
              * Setup chart date range controls and all charts
              **/
+            var cc = new jarmon.ChartCoordinator($('.chartRangeControl'));
+
+            var TABS = [
+                ['System',      ['cpu', 'memory','load']],
+                ['Network',     ['interface']],
+                ['DNS',         ['dns_query_types', 'dns_return_codes']]
+            ];
 
             var p = new jarmon.Parallimiter(1);
             function serialDownloader(url) {
@@ -50,17 +55,36 @@
             }
 
             // Extract the chart template from the page
-            var chartTemplate = $('.chart-container').remove();
-
-            function templateFactory(parentEl) {
-                return function() {
-                    // The chart template must be appended to the page early, so
-                    // that flot can calculate chart dimensions etc.
-                    return chartTemplate.clone().appendTo(parentEl);
+            var $chartTemplate = $('.chart-container').remove();
+
+            var $tabs = $('<ul/>', {'class': 'css-tabs'}).appendTo('.tabbed-chart-interface');
+            var $tabPanels = $('<div/>', {'class': 'css-panes charts'}).appendTo('.tabbed-chart-interface');
+            var tabName, $tabPanel, chartNames;
+            for(var i=0; i<TABS.length; i++) {
+                tabName = TABS[i][0];
+                chartNames = TABS[i][1];
+                // Add a tab
+                $('<li/>').append(
+                    $('<a/>', {href: ['#', tabName].join('')}).text(tabName)
+                ).appendTo($tabs);
+
+                // Add tab panel
+                $tabPanel = $('<div/>').appendTo($tabPanels);
+
+                for(var j=0; j<chartNames.length; j++) {
+                    cc.charts.push(
+                        new jarmon.Chart(
+                            $chartTemplate.clone().appendTo($tabPanel),
+                            jarmon.COLLECTD_RECIPES[chartNames[j]],
+                            serialDownloader
+                        )
+                    );
                 }
             }
 
-            var cc = new jarmon.ChartCoordinator($('.chartRangeControl'));
+            // Setup dhtml tabs
+            $(".css-tabs").tabs(".css-panes > div", {history: true});
+
             var t;
             // Initialise tabs and update charts when tab is clicked
             $(".css-tabs:first").bind('click', function(i) {
@@ -70,24 +94,6 @@
                 t = window.setTimeout(function() { cc.update(); }, 100);
             });
 
-            cc.charts = [].concat(
-                jarmon.Chart.fromRecipe(
-                    [].concat(
-                        jarmon.COLLECTD_RECIPES.cpu,
-                        jarmon.COLLECTD_RECIPES.memory,
-                        jarmon.COLLECTD_RECIPES.load),
-                    templateFactory('.system-charts'), serialDownloader),
-                jarmon.Chart.fromRecipe(
-                    jarmon.COLLECTD_RECIPES.interface,
-                    templateFactory('.network-charts'), serialDownloader),
-                jarmon.Chart.fromRecipe(
-                    jarmon.COLLECTD_RECIPES.dns,
-                    templateFactory('.dns-charts'), serialDownloader),
-                jarmon.Chart.fromRecipe(
-                    application_recipes,
-                    templateFactory('.application-charts'), serialDownloader)
-            );
-
             // Initialise all the charts
             cc.init();
         }
@@ -157,9 +163,6 @@
                 }
             );
 
-            // Setup dhtml tabs
-            $(".css-tabs").tabs(".css-panes > div", {history: true});
-
             initialiseCharts();
         });
         </script>
@@ -194,18 +197,7 @@
                 <div class="range-preview"
                      title="Time range preview - click and drag to select a custom timerange" ></div>
             </form>
-            <ul class="css-tabs">
-                <li><a href="#system">System</a></li>
-                <li><a href="#network">Network</a></li>
-                <li><a href="#dns">DNS</a></li>
-                <li><a href="#application">Application</a></li>
-            </ul>
-            <div class="css-panes charts">
-                <div class="system-charts"></div>
-                <div class="network-charts"></div>
-                <div class="dns-charts"></div>
-                <div class="application-charts"></div>
-            </div>
+            <div class="tabbed-chart-interface"></div>
             <div class="chart-container">
                 <h2 class="title"></h2>
                 <div class="error"></div>
diff --git a/docs/examples/jarmon_example_recipes.js b/docs/examples/jarmon_example_recipes.js
index 90b5c2e..e2e42b9 100644
--- a/docs/examples/jarmon_example_recipes.js
+++ b/docs/examples/jarmon_example_recipes.js
@@ -10,79 +10,69 @@ if(typeof jarmon == 'undefined') {
 }
 
 jarmon.COLLECTD_RECIPES = {
-    'cpu': [
-        {
-            title: 'CPU Usage',
-            data: [
-                ['data/cpu-0/cpu-wait.rrd', 0, 'CPU-0 Wait', '%'],
-                ['data/cpu-1/cpu-wait.rrd', 0, 'CPU-1 Wait', '%'],
-                ['data/cpu-0/cpu-system.rrd', 0, 'CPU-0 System', '%'],
-                ['data/cpu-1/cpu-system.rrd', 0, 'CPU-1 System', '%'],
-                ['data/cpu-0/cpu-user.rrd', 0, 'CPU-0 User', '%'],
-                ['data/cpu-1/cpu-user.rrd', 0, 'CPU-1 User', '%']
-            ],
-            options: jQuery.extend(true, {}, jarmon.Chart.BASE_OPTIONS,
-                                             jarmon.Chart.STACKED_OPTIONS)
-        }
-    ],
+    'cpu': {
+        title: 'CPU Usage',
+        data: [
+            ['data/cpu-0/cpu-wait.rrd', 0, 'CPU-0 Wait', '%'],
+            ['data/cpu-1/cpu-wait.rrd', 0, 'CPU-1 Wait', '%'],
+            ['data/cpu-0/cpu-system.rrd', 0, 'CPU-0 System', '%'],
+            ['data/cpu-1/cpu-system.rrd', 0, 'CPU-1 System', '%'],
+            ['data/cpu-0/cpu-user.rrd', 0, 'CPU-0 User', '%'],
+            ['data/cpu-1/cpu-user.rrd', 0, 'CPU-1 User', '%']
+        ],
+        options: jQuery.extend(true, {}, jarmon.Chart.BASE_OPTIONS,
+                                         jarmon.Chart.STACKED_OPTIONS)
+    },
 
-    'memory': [
-        {
-            title: 'Memory',
-            data: [
-                ['data/memory/memory-buffered.rrd', 0, 'Buffered', 'B'],
-                ['data/memory/memory-used.rrd', 0, 'Used', 'B'],
-                ['data/memory/memory-cached.rrd', 0, 'Cached', 'B'],
-                ['data/memory/memory-free.rrd', 0, 'Free', 'B']
-            ],
-            options: jQuery.extend(true, {}, jarmon.Chart.BASE_OPTIONS,
-                                             jarmon.Chart.STACKED_OPTIONS)
-        }
-    ],
+    'memory': {
+        title: 'Memory',
+        data: [
+            ['data/memory/memory-buffered.rrd', 0, 'Buffered', 'B'],
+            ['data/memory/memory-used.rrd', 0, 'Used', 'B'],
+            ['data/memory/memory-cached.rrd', 0, 'Cached', 'B'],
+            ['data/memory/memory-free.rrd', 0, 'Free', 'B']
+        ],
+        options: jQuery.extend(true, {}, jarmon.Chart.BASE_OPTIONS,
+                                         jarmon.Chart.STACKED_OPTIONS)
+    },
 
-    'dns': [
-        {
-            title: 'DNS Query Types',
-            data: [
-                ['data/dns/dns_qtype-A.rrd', 0, 'A', 'Q/s'],
-                ['data/dns/dns_qtype-PTR.rrd', 0, 'PTR', 'Q/s'],
-                ['data/dns/dns_qtype-SOA.rrd', 0, 'SOA', 'Q/s'],
-                ['data/dns/dns_qtype-SRV.rrd', 0, 'SRV', 'Q/s']
-            ],
-            options: jQuery.extend(true, {}, jarmon.Chart.BASE_OPTIONS)
-        },
+    'dns_query_types': {
+        title: 'DNS Query Types',
+        data: [
+            ['data/dns/dns_qtype-A.rrd', 0, 'A', 'Q/s'],
+            ['data/dns/dns_qtype-PTR.rrd', 0, 'PTR', 'Q/s'],
+            ['data/dns/dns_qtype-SOA.rrd', 0, 'SOA', 'Q/s'],
+            ['data/dns/dns_qtype-SRV.rrd', 0, 'SRV', 'Q/s']
+        ],
+        options: jQuery.extend(true, {}, jarmon.Chart.BASE_OPTIONS)
+    },
 
-        {
-            title: 'DNS Return Codes',
-            data: [
-                ['data/dns/dns_rcode-NOERROR.rrd', 0, 'NOERROR', 'Q/s'],
-                ['data/dns/dns_rcode-NXDOMAIN.rrd', 0, 'NXDOMAIN', 'Q/s'],
-                ['data/dns/dns_rcode-SERVFAIL.rrd', 0, 'SERVFAIL', 'Q/s']
-            ],
-            options: jQuery.extend(true, {}, jarmon.Chart.BASE_OPTIONS)
-        }
-    ],
+    'dns_return_codes': {
+        title: 'DNS Return Codes',
+        data: [
+            ['data/dns/dns_rcode-NOERROR.rrd', 0, 'NOERROR', 'Q/s'],
+            ['data/dns/dns_rcode-NXDOMAIN.rrd', 0, 'NXDOMAIN', 'Q/s'],
+            ['data/dns/dns_rcode-SERVFAIL.rrd', 0, 'SERVFAIL', 'Q/s']
+        ],
+        options: jQuery.extend(true, {}, jarmon.Chart.BASE_OPTIONS)
+    },
 
-    'load': [
-        {
-            title: 'Load Average',
-            data: [
-                ['data/load/load.rrd', 'shortterm', 'Short Term', ''],
-                ['data/load/load.rrd', 'midterm', 'Medium Term', ''],
-                ['data/load/load.rrd', 'longterm', 'Long Term', '']
-            ],
-            options: jQuery.extend(true, {}, jarmon.Chart.BASE_OPTIONS)
-        }
-    ],
+    'load': {
+        title: 'Load Average',
+        data: [
+            ['data/load/load.rrd', 'shortterm', 'Short Term', ''],
+            ['data/load/load.rrd', 'midterm', 'Medium Term', ''],
+            ['data/load/load.rrd', 'longterm', 'Long Term', '']
+        ],
+        options: jQuery.extend(true, {}, jarmon.Chart.BASE_OPTIONS)
+    },
 
-    'interface': [
-        {
-            title: 'Wlan0 Throughput',
-            data: [
-                ['data/interface/if_octets-wlan0.rrd', 'tx', 'Transmit', 'b/s'],
-                ['data/interface/if_octets-wlan0.rrd', 'rx', 'Receive', 'b/s']
-            ],
-            options: jQuery.extend(true, {}, jarmon.Chart.BASE_OPTIONS)
-        }
-    ]
+    'interface': {
+        title: 'Wlan0 Throughput',
+        data: [
+            ['data/interface/if_octets-wlan0.rrd', 'tx', 'Transmit', 'b/s'],
+            ['data/interface/if_octets-wlan0.rrd', 'rx', 'Receive', 'b/s']
+        ],
+        options: jQuery.extend(true, {}, jarmon.Chart.BASE_OPTIONS)
+    }
 };
diff --git a/jarmon/jarmon.js b/jarmon/jarmon.js
index 5952aa2..0919915 100644
--- a/jarmon/jarmon.js
+++ b/jarmon/jarmon.js
@@ -679,30 +679,6 @@ jarmon.Chart.prototype.draw = function() {
 };
 
 
-jarmon.Chart.fromRecipe = function(recipes, templateFactory, downloader) {
-    /**
-     * A static factory method to generate a list of I{Chart} from a list of
-     * recipes and a list of available rrd files in collectd path format.
-     *
-     * @method fromRecipe
-     * @param recipes {Array} A list of recipe objects.
-     * @param templateFactory {Function} A callable which generates an html
-     *      template for a chart.
-     * @param downloader {Function} A download function which returns a Deferred
-     * @return {Array} A list of Chart objects
-     **/
-
-    var charts = [];
-
-    for(var i=0; i<recipes.length; i++) {
-        charts.push(
-            new jarmon.Chart(templateFactory(), recipes[i], downloader)
-        );
-    }
-    return charts;
-};
-
-
 /**
  * Generate a form through which to choose a data source from a remote RRD file
  *
-- 
cgit v1.2.3


From 2447194a8f52ba7577ef2a0e0929d433dfa292aa Mon Sep 17 00:00:00 2001
From: Richard Wall <richard@largo>
Date: Sun, 9 Jan 2011 15:36:01 +0000
Subject: Simplify the example application - move most code to jarmon.js

---
 docs/examples/index.html                | 152 ++----------------------------
 docs/examples/jarmon_example_recipes.js |   8 +-
 jarmon/jarmon.js                        | 158 +++++++++++++++++++++++++++++++-
 3 files changed, 170 insertions(+), 148 deletions(-)

diff --git a/docs/examples/index.html b/docs/examples/index.html
index ec5143d..e561b9e 100644
--- a/docs/examples/index.html
+++ b/docs/examples/index.html
@@ -16,154 +16,15 @@
         <script type="text/javascript" src="../../jarmon/jarmon.js"></script>
         <script type="text/javascript" src="jarmon_example_recipes.js"></script>
         <script type="text/javascript">
-        // Recipes for the charts on this page
-
-        var application_recipe = {
-            title: 'Jarmon Webserver TCP Stats',
-            data: [
-                ['data/tcpconns-8080-local/tcp_connections-CLOSE_WAIT.rrd', 0, 'CLOSE_WAIT', ''],
-                ['data/tcpconns-8080-local/tcp_connections-SYN_RECV.rrd', 0, 'SYN_RECV', ''],
-                ['data/tcpconns-8080-local/tcp_connections-TIME_WAIT.rrd', 0, 'TIME_WAIT', ''],
-                ['data/tcpconns-8080-local/tcp_connections-CLOSED.rrd', 0, 'CLOSED', ''],
-                ['data/tcpconns-8080-local/tcp_connections-FIN_WAIT2.rrd', 0, 'FIN_WAIT2', ''],
-                ['data/tcpconns-8080-local/tcp_connections-FIN_WAIT1.rrd', 0, 'FIN_WAIT1', ''],
-                ['data/tcpconns-8080-local/tcp_connections-ESTABLISHED.rrd', 0, 'ESTABLISHED', ''],
-                ['data/tcpconns-8080-local/tcp_connections-LAST_ACK.rrd', 0, 'LAST_ACK', ''],
-                ['data/tcpconns-8080-local/tcp_connections-LISTEN.rrd', 0, 'LISTEN', ''],
-                ['data/tcpconns-8080-local/tcp_connections-SYN_SENT.rrd', 0, 'SYN_SENT', ''],
-                ['data/tcpconns-8080-local/tcp_connections-CLOSING.rrd', 0, 'CLOSING', '']
-            ],
-            options: jQuery.extend(true, {yaxis: {tickDecimals: 0}}, jarmon.Chart.BASE_OPTIONS, jarmon.Chart.STACKED_OPTIONS)
-        };
-
-
-        function initialiseCharts() {
-            /**
-             * Setup chart date range controls and all charts
-             **/
-            var cc = new jarmon.ChartCoordinator($('.chartRangeControl'));
-
-            var TABS = [
-                ['System',      ['cpu', 'memory','load']],
-                ['Network',     ['interface']],
-                ['DNS',         ['dns_query_types', 'dns_return_codes']]
-            ];
-
-            var p = new jarmon.Parallimiter(1);
-            function serialDownloader(url) {
-                return p.addCallable(jarmon.downloadBinary, [url]);
-            }
-
-            // Extract the chart template from the page
-            var $chartTemplate = $('.chart-container').remove();
-
-            var $tabs = $('<ul/>', {'class': 'css-tabs'}).appendTo('.tabbed-chart-interface');
-            var $tabPanels = $('<div/>', {'class': 'css-panes charts'}).appendTo('.tabbed-chart-interface');
-            var tabName, $tabPanel, chartNames;
-            for(var i=0; i<TABS.length; i++) {
-                tabName = TABS[i][0];
-                chartNames = TABS[i][1];
-                // Add a tab
-                $('<li/>').append(
-                    $('<a/>', {href: ['#', tabName].join('')}).text(tabName)
-                ).appendTo($tabs);
-
-                // Add tab panel
-                $tabPanel = $('<div/>').appendTo($tabPanels);
-
-                for(var j=0; j<chartNames.length; j++) {
-                    cc.charts.push(
-                        new jarmon.Chart(
-                            $chartTemplate.clone().appendTo($tabPanel),
-                            jarmon.COLLECTD_RECIPES[chartNames[j]],
-                            serialDownloader
-                        )
-                    );
-                }
-            }
-
-            // Setup dhtml tabs
-            $(".css-tabs").tabs(".css-panes > div", {history: true});
-
-            var t;
-            // Initialise tabs and update charts when tab is clicked
-            $(".css-tabs:first").bind('click', function(i) {
-                // XXX: Hack to give the tab just enough time to become visible
-                // so that flot can calculate chart dimensions.
-                window.clearTimeout(t);
-                t = window.setTimeout(function() { cc.update(); }, 100);
-            });
-
-            // Initialise all the charts
-            cc.init();
-        }
 
         $(function() {
-            // Add dhtml calendars to the date input fields
-            $(".timerange_control img")
-                .dateinput({
-                    'format': 'dd mmm yyyy 00:00:00',
-                    'max': +1,
-                    'css': {'input': 'jquerytools_date'}})
-                .bind('onBeforeShow', function(e) {
-                    var classes = $(this).attr('class').split(' ');
-                    var currentDate, input_selector;
-                    for(var i=0; i<=classes.length; i++) {
-                        input_selector = '[name="' + classes[i] + '"]';
-                        // Look for a neighboring input element whose name matches the
-                        // class name of this calendar
-                        // Parse the value as a date if the returned date.getTime
-                        // returns NaN we know it's an invalid date
-                        // XXX: is there a better way to check for valid date?
-                        currentDate = new Date($(this).siblings(input_selector).val());
-                        if(currentDate.getTime() != NaN) {
-                            $(this).data('dateinput')._input_selector = input_selector;
-                            $(this).data('dateinput')._initial_val = currentDate.getTime();
-                            $(this).data('dateinput').setValue(currentDate);
-                            break;
-                        }
-                    }
-                })
-                .bind('onHide', function(e) {
-                    // Called after a calendar date has been chosen by the user.
-
-                    // Use the sibling selector that we generated above before opening
-                    // the calendar
-                    var input_selector = $(this).data('dateinput')._input_selector;
-                    var oldStamp = $(this).data('dateinput')._initial_val;
-                    var newDate = $(this).data('dateinput').getValue();
-                    // Only update the form field if the date has changed.
-                    if(oldStamp != newDate.getTime()) {
-                        $(this).siblings(input_selector).val(
-                            newDate.toString().split(' ').slice(1,5).join(' '));
-                        // Trigger a change event which should automatically update the
-                        // graphs and change the timerange drop down selector to
-                        // "custom"
-                        $(this).siblings(input_selector).trigger('change');
-                    }
-                });
-
-            // Avoid overlaps between the calendars
-            // XXX: This is a bit of hack, what if there's more than one set of calendar
-            // controls on a page?
-            $(".timerange_control img.from_custom").bind('onBeforeShow',
-                function() {
-                    var otherVal = new Date(
-                        $('.timerange_control [name="to_custom"]').val());
-
-                    $(this).data('dateinput').setMax(otherVal);
-                }
+            jarmon.buildTabbedChartUi(
+                $('.chart-container').remove(),
+                jarmon.CHART_RECIPES_COLLECTD,
+                $('.tabbed-chart-interface'),
+                jarmon.TAB_RECIPES_STANDARD,
+                $('.chartRangeControl')
             );
-            $(".timerange_control img.to_custom").bind('onBeforeShow',
-                function() {
-                    var otherVal = new Date(
-                        $('.timerange_control [name="from_custom"]').val());
-
-                    $(this).data('dateinput').setMin(otherVal);
-                }
-            );
-
-            initialiseCharts();
         });
         </script>
     </head>
@@ -205,5 +66,6 @@
                 <div class="graph-legend"></div>
             </div>
         </div>
+
     </body>
 </html>
diff --git a/docs/examples/jarmon_example_recipes.js b/docs/examples/jarmon_example_recipes.js
index e2e42b9..610ecb2 100644
--- a/docs/examples/jarmon_example_recipes.js
+++ b/docs/examples/jarmon_example_recipes.js
@@ -9,7 +9,13 @@ if(typeof jarmon == 'undefined') {
     var jarmon = {};
 }
 
-jarmon.COLLECTD_RECIPES = {
+jarmon.TAB_RECIPES_STANDARD = [
+    ['System',      ['cpu', 'memory','load']],
+    ['Network',     ['interface']],
+    ['DNS',         ['dns_query_types', 'dns_return_codes']]
+];
+
+jarmon.CHART_RECIPES_COLLECTD = {
     'cpu': {
         title: 'CPU Usage',
         data: [
diff --git a/jarmon/jarmon.js b/jarmon/jarmon.js
index 0919915..a2c862d 100644
--- a/jarmon/jarmon.js
+++ b/jarmon/jarmon.js
@@ -972,6 +972,89 @@ jarmon.ChartEditor.prototype._addDatasourceRow = function(record) {
 };
 
 
+jarmon.TabbedInterface = function($tpl, recipe) {
+    this.$tpl = $tpl;
+    this.recipe = recipe;
+    this.placeholders = [];
+
+    var $tabBar = $('<ul/>', {'class': 'css-tabs'}).appendTo($tpl);
+    var $tabPanels = $('<div/>', {'class': 'css-panes charts'}).appendTo($tpl);
+    var tabName, $tabPanel, placeNames;
+    for(var i=0; i<recipe.length; i++) {
+        tabName = recipe[i][0];
+        placeNames = recipe[i][1];
+        // Add a tab
+        $('<li/>').append(
+            $('<a/>', {href: ['#', tabName].join('')}).text(tabName)
+        ).appendTo($tabBar);
+
+        // Add tab panel
+        $tabPanel = $('<div/>').appendTo($tabPanels);
+
+        for(var j=0; j<placeNames.length; j++) {
+            this.placeholders.push([
+                placeNames[j], $('<div/>').appendTo($tabPanel)]);
+        }
+    }
+
+    // Setup dhtml tabs
+    $tabBar.tabs($tabPanels.children('div'), {history: true});
+
+};
+
+jarmon.TabbedInterface.prototype.draw = function() {
+
+};
+
+
+jarmon.buildTabbedChartUi = function ($chartTemplate, chartRecipes,
+                                      $tabTemplate, tabRecipes,
+                                      $controlPanelTemplate) {
+    /**
+     * Setup chart date range controls and all charts
+     **/
+    var p = new jarmon.Parallimiter(1);
+    function serialDownloader(url) {
+        return p.addCallable(jarmon.downloadBinary, [url]);
+    }
+
+    var ti = new jarmon.TabbedInterface($tabTemplate, tabRecipes);
+
+    var charts = jQuery.map(
+        ti.placeholders,
+        function(el, i) {
+            return new jarmon.Chart(
+                $chartTemplate.clone().replaceAll(el[1]),
+                chartRecipes[el[0]],
+                serialDownloader
+            )
+        }
+    );
+
+    var cc = new jarmon.ChartCoordinator($controlPanelTemplate, charts);
+    // Update charts when tab is clicked
+    ti.$tpl.find(".css-tabs:first").bind(
+        'click',
+        {'cc': cc},
+        function(e) {
+            var cc = e.data.cc;
+            // XXX: Hack to give the tab just enough time to become visible
+            // so that flot can calculate chart dimensions.
+            window.clearTimeout(cc.t);
+            cc.t = window.setTimeout(
+                function() {
+                    cc.update();
+                }, 100);
+        }
+    );
+
+    // Initialise all the charts
+    cc.init();
+
+    return [charts, ti, cc];
+};
+
+
 // Options common to all the chart on this page
 jarmon.Chart.BASE_OPTIONS = {
     grid: {
@@ -1038,10 +1121,10 @@ jarmon.timeRangeShortcuts = [
  * @param ui {Object} A one element jQuery containing an input form and
  *      placeholders for the timeline and for the series of charts.
  **/
-jarmon.ChartCoordinator = function(ui) {
+jarmon.ChartCoordinator = function(ui, charts) {
     var self = this;
     this.ui = ui;
-    this.charts = [];
+    this.charts = charts;
 
     // Style and configuration of the range timeline
     this.rangePreviewOptions = {
@@ -1140,6 +1223,77 @@ jarmon.ChartCoordinator = function(ui) {
         self.setTimeRange(ranges.xaxis.from, ranges.xaxis.to);
         self.update();
     });
+
+    // Add dhtml calendars to the date input fields
+    this.ui.find(".timerange_control img")
+        .dateinput({
+            'format': 'dd mmm yyyy 00:00:00',
+            'max': +1,
+            'css': {'input': 'jquerytools_date'}})
+        .bind('onBeforeShow', function(e) {
+            var classes = $(this).attr('class').split(' ');
+            var currentDate, input_selector;
+            for(var i=0; i<=classes.length; i++) {
+                input_selector = '[name="' + classes[i] + '"]';
+                // Look for a neighboring input element whose name matches the
+                // class name of this calendar
+                // Parse the value as a date if the returned date.getTime
+                // returns NaN we know it's an invalid date
+                // XXX: is there a better way to check for valid date?
+                currentDate = new Date($(this).siblings(input_selector).val());
+                if(currentDate.getTime() != NaN) {
+                    $(this).data('dateinput')._input_selector = input_selector;
+                    $(this).data('dateinput')._initial_val = currentDate.getTime();
+                    $(this).data('dateinput').setValue(currentDate);
+                    break;
+                }
+            }
+        })
+        .bind('onHide', function(e) {
+            // Called after a calendar date has been chosen by the user.
+
+            // Use the sibling selector that we generated above before opening
+            // the calendar
+            var input_selector = $(this).data('dateinput')._input_selector;
+            var oldStamp = $(this).data('dateinput')._initial_val;
+            var newDate = $(this).data('dateinput').getValue();
+            // Only update the form field if the date has changed.
+            if(oldStamp != newDate.getTime()) {
+                $(this).siblings(input_selector).val(
+                    newDate.toString().split(' ').slice(1,5).join(' '));
+                // Trigger a change event which should automatically update the
+                // graphs and change the timerange drop down selector to
+                // "custom"
+                $(this).siblings(input_selector).trigger('change');
+            }
+        });
+
+    // Avoid overlaps between the calendars
+    // XXX: This is a bit of hack, what if there's more than one set of calendar
+    // controls on a page?
+    this.ui.find(".timerange_control img.from_custom").bind(
+        'onBeforeShow',
+        {self: this},
+        function(e) {
+            var self = e.data.self;
+            var otherVal = new Date(
+                self.ui.find('.timerange_control [name="to_custom"]').val());
+
+            $(this).data('dateinput').setMax(otherVal);
+        }
+    );
+    this.ui.find(".timerange_control img.to_custom").bind(
+        'onBeforeShow',
+        {self: this},
+        function(e) {
+            var self = e.data.self;
+            var otherVal = new Date(
+                self.ui.find('.timerange_control [name="from_custom"]').val());
+
+            $(this).data('dateinput').setMin(otherVal);
+        }
+    );
+
 };
 
 
-- 
cgit v1.2.3


From 7a08bdc6fbd7400414fb4853de89d0a670daeffd Mon Sep 17 00:00:00 2001
From: Richard Wall <richard@largo>
Date: Sun, 9 Jan 2011 21:02:47 +0000
Subject: A button to add a new tab

---
 jarmon/jarmon.js | 54 +++++++++++++++++++++++++++++++++++++++++++-----------
 1 file changed, 43 insertions(+), 11 deletions(-)

diff --git a/jarmon/jarmon.js b/jarmon/jarmon.js
index a2c862d..b4bd6e4 100644
--- a/jarmon/jarmon.js
+++ b/jarmon/jarmon.js
@@ -977,19 +977,14 @@ jarmon.TabbedInterface = function($tpl, recipe) {
     this.recipe = recipe;
     this.placeholders = [];
 
-    var $tabBar = $('<ul/>', {'class': 'css-tabs'}).appendTo($tpl);
-    var $tabPanels = $('<div/>', {'class': 'css-panes charts'}).appendTo($tpl);
+    this.$tabBar = $('<ul/>', {'class': 'css-tabs'}).appendTo($tpl);
+    this.$tabPanels = $('<div/>', {'class': 'css-panes charts'}).appendTo($tpl);
     var tabName, $tabPanel, placeNames;
     for(var i=0; i<recipe.length; i++) {
         tabName = recipe[i][0];
         placeNames = recipe[i][1];
-        // Add a tab
-        $('<li/>').append(
-            $('<a/>', {href: ['#', tabName].join('')}).text(tabName)
-        ).appendTo($tabBar);
 
-        // Add tab panel
-        $tabPanel = $('<div/>').appendTo($tabPanels);
+        $tabPanel = this.newTab(tabName);
 
         for(var j=0; j<placeNames.length; j++) {
             this.placeholders.push([
@@ -997,15 +992,52 @@ jarmon.TabbedInterface = function($tpl, recipe) {
         }
     }
 
-    // Setup dhtml tabs
-    $tabBar.tabs($tabPanels.children('div'), {history: true});
+    this.setup();
+
+    this.newTab('+').append(
+        $('<form/>').append(
+            $('<div/>').append(
+                $('<label/>').append(
+                    'Tab Title',
+                    $('<input/>', {type: 'text', name: 'tabTitle', value: ''})
+                )
+            ),
+            $('<div/>').append(
+                $('<input/>', {type: 'submit', value: 'save'})
+            )
+        ).bind(
+            'submit',
+            {self: this},
+            function(e) {
+                var self = e.data.self;
+                self.newTab(this.tabTitle.value);
+                self.setup();
+                return false;
+            }
+        )
+    );
 
+    this.setup();
 };
 
-jarmon.TabbedInterface.prototype.draw = function() {
+jarmon.TabbedInterface.prototype.newTab = function(tabName) {
+    // Add a tab
+    $('<li/>').append(
+        $('<a/>', {href: ['#', tabName].join('')}).text(tabName)
+    ).appendTo(this.$tabBar);
 
+    // Add tab panel
+    return $('<div/>').appendTo(this.$tabPanels);
 };
 
+jarmon.TabbedInterface.prototype.setup = function() {
+    // Setup dhtml tabs
+    var api = this.$tabBar.data("tabs");
+    if(api) {
+        api.destroy();
+    }
+    this.$tabBar.tabs(this.$tabPanels.children('div'));
+};
 
 jarmon.buildTabbedChartUi = function ($chartTemplate, chartRecipes,
                                       $tabTemplate, tabRecipes,
-- 
cgit v1.2.3


From af306014da4a5c9e363a170cf86a742ffcb87862 Mon Sep 17 00:00:00 2001
From: Richard Wall <richard@largo>
Date: Sun, 9 Jan 2011 23:22:19 +0000
Subject: Editable tab titles

---
 jarmon/jarmon.js | 29 +++++++++++++++++++++++++++--
 1 file changed, 27 insertions(+), 2 deletions(-)

diff --git a/jarmon/jarmon.js b/jarmon/jarmon.js
index b4bd6e4..431e08b 100644
--- a/jarmon/jarmon.js
+++ b/jarmon/jarmon.js
@@ -992,8 +992,6 @@ jarmon.TabbedInterface = function($tpl, recipe) {
         }
     }
 
-    this.setup();
-
     this.newTab('+').append(
         $('<form/>').append(
             $('<div/>').append(
@@ -1018,6 +1016,33 @@ jarmon.TabbedInterface = function($tpl, recipe) {
     );
 
     this.setup();
+
+    $('ul.css-tabs > li > a', $tpl[0]).live(
+        'dblclick',
+        function(e) {
+            var $originalLink = $(this);
+            var $input = $('<input/>', {
+                type: 'text',
+                name: 'tabTitle',
+                value: $originalLink.text()
+            });
+            $originalLink.replaceWith($input);
+            $input.focus();
+        }
+    );
+
+    $('ul.css-tabs > li > input', $tpl[0]).live(
+        'blur',
+        {self: this},
+        function(e) {
+            var self = e.data.self;
+            $(this).replaceWith(
+                $('<a/>', {href: ['#', this.value].join('')}).text(this.value)
+            );
+            self.setup();
+            self.$tabBar.data("tabs").click(this.value);
+        }
+    );
 };
 
 jarmon.TabbedInterface.prototype.newTab = function(tabName) {
-- 
cgit v1.2.3


From 6afea2f598c07c36fd272f694a98cec7137ec875 Mon Sep 17 00:00:00 2001
From: Richard Wall <richard@largo>
Date: Mon, 10 Jan 2011 00:37:47 +0000
Subject: Neater add new tab controls

---
 jarmon/jarmon.js | 59 +++++++++++++++++++-------------------------------------
 1 file changed, 20 insertions(+), 39 deletions(-)

diff --git a/jarmon/jarmon.js b/jarmon/jarmon.js
index 431e08b..0b72949 100644
--- a/jarmon/jarmon.js
+++ b/jarmon/jarmon.js
@@ -978,6 +978,14 @@ jarmon.TabbedInterface = function($tpl, recipe) {
     this.placeholders = [];
 
     this.$tabBar = $('<ul/>', {'class': 'css-tabs'}).appendTo($tpl);
+    this.$newTabControls = $('<li/>', {
+        'class': 'newTabControls',
+        'title': 'Add new tab'
+    }).append(
+        $('<img/>', {src: 'assets/icons/next.gif'}),
+        $('<input/>').hide()
+    ).appendTo(this.$tabBar);
+
     this.$tabPanels = $('<div/>', {'class': 'css-panes charts'}).appendTo($tpl);
     var tabName, $tabPanel, placeNames;
     for(var i=0; i<recipe.length; i++) {
@@ -992,55 +1000,26 @@ jarmon.TabbedInterface = function($tpl, recipe) {
         }
     }
 
-    this.newTab('+').append(
-        $('<form/>').append(
-            $('<div/>').append(
-                $('<label/>').append(
-                    'Tab Title',
-                    $('<input/>', {type: 'text', name: 'tabTitle', value: ''})
-                )
-            ),
-            $('<div/>').append(
-                $('<input/>', {type: 'submit', value: 'save'})
-            )
-        ).bind(
-            'submit',
-            {self: this},
-            function(e) {
-                var self = e.data.self;
-                self.newTab(this.tabTitle.value);
-                self.setup();
-                return false;
-            }
-        )
-    );
-
     this.setup();
 
-    $('ul.css-tabs > li > a', $tpl[0]).live(
-        'dblclick',
+    $('ul.css-tabs > li.newTabControls > img', $tpl[0]).live(
+        'click',
         function(e) {
-            var $originalLink = $(this);
-            var $input = $('<input/>', {
-                type: 'text',
-                name: 'tabTitle',
-                value: $originalLink.text()
-            });
-            $originalLink.replaceWith($input);
-            $input.focus();
+            $(this).hide().siblings().val('').show().focus();
         }
     );
 
-    $('ul.css-tabs > li > input', $tpl[0]).live(
+    $('ul.css-tabs > li.newTabControls > input', $tpl[0]).live(
         'blur',
         {self: this},
         function(e) {
             var self = e.data.self;
-            $(this).replaceWith(
-                $('<a/>', {href: ['#', this.value].join('')}).text(this.value)
-            );
-            self.setup();
-            self.$tabBar.data("tabs").click(this.value);
+            $(this).hide().siblings().show();
+            if(this.value) {
+                self.newTab(this.value);
+                self.setup();
+                self.$tabBar.data("tabs").click(this.value);
+            }
         }
     );
 };
@@ -1056,12 +1035,14 @@ jarmon.TabbedInterface.prototype.newTab = function(tabName) {
 };
 
 jarmon.TabbedInterface.prototype.setup = function() {
+    this.$newTabControls.remove();
     // Setup dhtml tabs
     var api = this.$tabBar.data("tabs");
     if(api) {
         api.destroy();
     }
     this.$tabBar.tabs(this.$tabPanels.children('div'));
+    this.$newTabControls.appendTo(this.$tabBar);
 };
 
 jarmon.buildTabbedChartUi = function ($chartTemplate, chartRecipes,
-- 
cgit v1.2.3


From 28c1497d0d027765020d3fc33170a934041de5b9 Mon Sep 17 00:00:00 2001
From: Richard Wall <richard@largo>
Date: Mon, 10 Jan 2011 00:51:29 +0000
Subject: Re-enable tab title editing

---
 jarmon/jarmon.js | 29 +++++++++++++++++++++++++++++
 1 file changed, 29 insertions(+)

diff --git a/jarmon/jarmon.js b/jarmon/jarmon.js
index 0b72949..d4f902c 100644
--- a/jarmon/jarmon.js
+++ b/jarmon/jarmon.js
@@ -1022,6 +1022,35 @@ jarmon.TabbedInterface = function($tpl, recipe) {
             }
         }
     );
+
+    $('ul.css-tabs > li > a', $tpl[0]).live(
+        'dblclick',
+        {self: this},
+        function(e) {
+            var $originalLink = $(this);
+            var $input = $('<input/>', {
+                'value': $originalLink.text(),
+                'name': 'editTabTitle'
+            })
+            $originalLink.replaceWith($input);
+            $input.focus();
+        }
+    );
+
+    $('ul.css-tabs > li > input[name=editTabTitle]', $tpl[0]).live(
+        'blur',
+        {self: this},
+        function(e) {
+            var self = e.data.self;
+            $(this).replaceWith(
+                $('<a/>', {
+                    href: ['#', this.value].join('')
+                }).text(this.value)
+            )
+            self.setup();
+            self.$tabBar.data("tabs").click(this.value);
+        }
+    );
 };
 
 jarmon.TabbedInterface.prototype.newTab = function(tabName) {
-- 
cgit v1.2.3


From 841d30bf4eda7a8658433d97b9c9a686c85b6e5a Mon Sep 17 00:00:00 2001
From: Richard Wall <richard@largo>
Date: Sat, 15 Jan 2011 15:34:41 +0000
Subject: decouple the chart coordinator html from the charts under its
 control. Also lighten the border of input text boxes.

---
 docs/examples/assets/css/style.css |  5 +++++
 docs/examples/index.html           | 15 +++++++-------
 jarmon/jarmon.js                   | 40 +++++++++++++++++++++++++++++++-------
 3 files changed, 45 insertions(+), 15 deletions(-)

diff --git a/docs/examples/assets/css/style.css b/docs/examples/assets/css/style.css
index 561b11e..10ecda9 100644
--- a/docs/examples/assets/css/style.css
+++ b/docs/examples/assets/css/style.css
@@ -75,6 +75,11 @@ input[type=checkbox] {
     border: none;
 }
 
+input[type=text] {
+    padding: 3px;
+    border: 1px solid #EEE;
+}
+
 .notice {
     border: 1px solid Green;
     background: #FFDDFF;
diff --git a/docs/examples/index.html b/docs/examples/index.html
index e561b9e..6acf2b8 100644
--- a/docs/examples/index.html
+++ b/docs/examples/index.html
@@ -58,14 +58,13 @@
                 <div class="range-preview"
                      title="Time range preview - click and drag to select a custom timerange" ></div>
             </form>
-            <div class="tabbed-chart-interface"></div>
-            <div class="chart-container">
-                <h2 class="title"></h2>
-                <div class="error"></div>
-                <div class="chart"></div>
-                <div class="graph-legend"></div>
-            </div>
         </div>
-
+        <div class="tabbed-chart-interface"></div>
+        <div class="chart-container">
+            <h2 class="title"></h2>
+            <div class="error"></div>
+            <div class="chart"></div>
+            <div class="graph-legend"></div>
+        </div>
     </body>
 </html>
diff --git a/jarmon/jarmon.js b/jarmon/jarmon.js
index d4f902c..731c06c 100644
--- a/jarmon/jarmon.js
+++ b/jarmon/jarmon.js
@@ -983,7 +983,7 @@ jarmon.TabbedInterface = function($tpl, recipe) {
         'title': 'Add new tab'
     }).append(
         $('<img/>', {src: 'assets/icons/next.gif'}),
-        $('<input/>').hide()
+        $('<input/>', {'type': 'text'}).hide()
     ).appendTo(this.$tabBar);
 
     this.$tabPanels = $('<div/>', {'class': 'css-panes charts'}).appendTo($tpl);
@@ -1030,7 +1030,8 @@ jarmon.TabbedInterface = function($tpl, recipe) {
             var $originalLink = $(this);
             var $input = $('<input/>', {
                 'value': $originalLink.text(),
-                'name': 'editTabTitle'
+                'name': 'editTabTitle',
+                'type': 'text'
             })
             $originalLink.replaceWith($input);
             $input.focus();
@@ -1285,11 +1286,36 @@ jarmon.ChartCoordinator = function(ui, charts) {
 
     // When a selection is made on the range timeline, or any of my charts
     // redraw all the charts.
-    this.ui.bind("plotselected", function(event, ranges) {
-        self.ui.find('[name="from_standard"]').val('custom');
-        self.setTimeRange(ranges.xaxis.from, ranges.xaxis.to);
-        self.update();
-    });
+    $(document).bind(
+        'plotselected',
+        {self: this},
+        function(e, ranges) {
+            var self = e.data.self;
+            var eventSourceIsMine = false;
+
+            // plotselected event may be from my range selector chart or
+            if( self.ui.has(e.target) ) {
+                eventSourceIsMine = true;
+            } else {
+                // ...it may come from one of the charts under my supervision
+                for(var i=0; i<self.charts.length; i++) {
+                    if(self.charts[i].template.has(e.target).length > 0) {
+                        eventSourceIsMine = true;
+                        break;
+                    }
+                }
+            }
+
+            if(eventSourceIsMine) {
+                // Update the prepared time range select box to value "custom"
+                self.ui.find('[name="from_standard"]').val('custom');
+
+                // Update all my charts
+                self.setTimeRange(ranges.xaxis.from, ranges.xaxis.to);
+                self.update();
+            }
+        }
+    );
 
     // Add dhtml calendars to the date input fields
     this.ui.find(".timerange_control img")
-- 
cgit v1.2.3


From ae0205889ae453329c1d87e81d81a072b4b52451 Mon Sep 17 00:00:00 2001
From: Richard Wall <richard@largo>
Date: Sun, 16 Jan 2011 12:34:48 +0000
Subject: handle return keypress to save the tab name

---
 jarmon/jarmon.js | 36 +++++++++++++++++++++++++++++++-----
 1 file changed, 31 insertions(+), 5 deletions(-)

diff --git a/jarmon/jarmon.js b/jarmon/jarmon.js
index 731c06c..680d287 100644
--- a/jarmon/jarmon.js
+++ b/jarmon/jarmon.js
@@ -978,6 +978,8 @@ jarmon.TabbedInterface = function($tpl, recipe) {
     this.placeholders = [];
 
     this.$tabBar = $('<ul/>', {'class': 'css-tabs'}).appendTo($tpl);
+
+    // Icon and hidden input box for adding new tabs. See event handlers below.
     this.$newTabControls = $('<li/>', {
         'class': 'newTabControls',
         'title': 'Add new tab'
@@ -1002,27 +1004,49 @@ jarmon.TabbedInterface = function($tpl, recipe) {
 
     this.setup();
 
+    // Show the new tab name input box when the user clicks the new tab icon
     $('ul.css-tabs > li.newTabControls > img', $tpl[0]).live(
         'click',
         function(e) {
-            $(this).hide().siblings().val('').show().focus();
+            $(this).hide().siblings().show().focus();
         }
     );
 
+    // When the "new" tab input loses focus, use its value to create a new
+    // tab.
+    // XXX: Due to event bubbling, this event seems to be triggered twice, but
+    // only when the input is forcefully blurred by the "keypress" event handler
+    // below. To prevent two tabs, we blank the input field value. Tried
+    // preventing event bubbling, but there seems to be some subtle difference
+    // with the use of jquery live event handlers.
     $('ul.css-tabs > li.newTabControls > input', $tpl[0]).live(
         'blur',
         {self: this},
         function(e) {
             var self = e.data.self;
+            var value = this.value;
+            this.value = '';
             $(this).hide().siblings().show();
-            if(this.value) {
-                self.newTab(this.value);
+            if(value) {
+                self.newTab(value);
                 self.setup();
-                self.$tabBar.data("tabs").click(this.value);
+                self.$tabBar.data("tabs").click(value);
             }
         }
     );
 
+    // Unfocus the input element when return key is pressed. Triggers a
+    // blur event which then replaces the input with a tab
+    $('ul.css-tabs > li > input', $tpl[0]).live(
+        'keypress',
+        function(e) {
+            if(e.which == 13) {
+                $(this).blur();
+            }
+        }
+    );
+
+    // Show tab name input box when tab is double clicked.
     $('ul.css-tabs > li > a', $tpl[0]).live(
         'dblclick',
         {self: this},
@@ -1038,6 +1062,7 @@ jarmon.TabbedInterface = function($tpl, recipe) {
         }
     );
 
+    // Handle the updating of the tab when its name is edited.
     $('ul.css-tabs > li > input[name=editTabTitle]', $tpl[0]).live(
         'blur',
         {self: this},
@@ -1066,7 +1091,7 @@ jarmon.TabbedInterface.prototype.newTab = function(tabName) {
 
 jarmon.TabbedInterface.prototype.setup = function() {
     this.$newTabControls.remove();
-    // Setup dhtml tabs
+    // Destroy then re-initialise the jquerytools tabs plugin
     var api = this.$tabBar.data("tabs");
     if(api) {
         api.destroy();
@@ -1075,6 +1100,7 @@ jarmon.TabbedInterface.prototype.setup = function() {
     this.$newTabControls.appendTo(this.$tabBar);
 };
 
+
 jarmon.buildTabbedChartUi = function ($chartTemplate, chartRecipes,
                                       $tabTemplate, tabRecipes,
                                       $controlPanelTemplate) {
-- 
cgit v1.2.3


From f7143a7a053c05ac9617d3557f583ce8cf223952 Mon Sep 17 00:00:00 2001
From: Richard Wall <richard@largo>
Date: Sun, 16 Jan 2011 18:33:04 +0000
Subject: Move edit buttons

---
 docs/examples/assets/css/style.css | 27 ++++++++++++++---
 docs/examples/index.html           |  8 ++++-
 jarmon/jarmon.js                   | 61 +++++++++++++++++++++++++++-----------
 3 files changed, 74 insertions(+), 22 deletions(-)

diff --git a/docs/examples/assets/css/style.css b/docs/examples/assets/css/style.css
index 10ecda9..982398b 100644
--- a/docs/examples/assets/css/style.css
+++ b/docs/examples/assets/css/style.css
@@ -9,11 +9,7 @@ form div {
 }
 
 h2 {
-    padding: 0 0 0 55px;
-    margin: 20px auto 5px auto;
     font-size: 14px;
-    text-align: left;
-    clear: both;
 }
 
 p, li, dt, dd, td, th, div {
@@ -36,6 +32,7 @@ p, li, dt, dd, td, th, div {
     height:200px;
     width: 850px;
     margin: 0 auto 0 auto;
+    clear: both;
 }
 
 .tickLabel {
@@ -90,3 +87,25 @@ input[type=text] {
 #calroot {
     z-index: 2;
 }
+
+.chart-header {
+    width: 790px;
+    padding: 5px 0 5px 0;
+    margin: 20px auto 0 auto;
+    position: relative;
+    left: 25px;
+}
+
+.chart-header:AFTER {
+    content: ''
+}
+
+.chart-container h2{
+    float: left;
+    margin: 0;
+}
+
+.chart-container .chart-controls{
+    float: right;
+    margin: 0;
+}
diff --git a/docs/examples/index.html b/docs/examples/index.html
index 6acf2b8..2bec8aa 100644
--- a/docs/examples/index.html
+++ b/docs/examples/index.html
@@ -61,7 +61,13 @@
         </div>
         <div class="tabbed-chart-interface"></div>
         <div class="chart-container">
-            <h2 class="title"></h2>
+            <div class="chart-header">
+                <h2 class="title"></h2>
+                <div class="chart-controls">
+                    <input type="button" name="chart_edit" value="edit">
+                    <input type="button" name="chart_delete" value="delete">
+                </div>
+            </div>
             <div class="error"></div>
             <div class="chart"></div>
             <div class="graph-legend"></div>
diff --git a/jarmon/jarmon.js b/jarmon/jarmon.js
index 680d287..0ba2e32 100644
--- a/jarmon/jarmon.js
+++ b/jarmon/jarmon.js
@@ -415,15 +415,6 @@ jarmon.Chart = function(template, recipe,  downloader) {
         self.draw();
     });
 
-    $('.graph-legend input[name=chart_edit]', this.template[0]).live(
-        'click',
-        {self: this},
-        function(e) {
-            var self = e.data.self;
-            new jarmon.ChartEditor($(this).closest('.graph-legend'), self).draw();
-        }
-    );
-
     this.options['yaxis']['ticks'] = function(axis) {
         /*
          * Choose a suitable SI multiplier based on the min and max values from
@@ -655,9 +646,6 @@ jarmon.Chart.prototype.draw = function() {
                             }
                         }
                     ).remove();
-                    legend.append(
-                        $('<input/>', {type: 'button', value: 'edit', name: 'chart_edit'})
-                    );
                     legend.append($('<div />').css('clear', 'both'));
                     self.template.find('.legend').remove();
 
@@ -1077,6 +1065,14 @@ jarmon.TabbedInterface = function($tpl, recipe) {
             self.$tabBar.data("tabs").click(this.value);
         }
     );
+
+    $('input[name=add_new_chart]', $tpl[0]).live(
+        'click',
+        {self: this},
+        function(e) {
+            console.log(e);
+        }
+    );
 };
 
 jarmon.TabbedInterface.prototype.newTab = function(tabName) {
@@ -1084,9 +1080,20 @@ jarmon.TabbedInterface.prototype.newTab = function(tabName) {
     $('<li/>').append(
         $('<a/>', {href: ['#', tabName].join('')}).text(tabName)
     ).appendTo(this.$tabBar);
-
+    var $placeholder = $('<div/>');
     // Add tab panel
-    return $('<div/>').appendTo(this.$tabPanels);
+    $('<div/>').append(
+        $placeholder,
+        $('<div/>').append(
+            $('<input/>', {
+                type: 'button',
+                value: 'Add new chart',
+                name: 'add_new_chart'
+            })
+        )
+    ).appendTo(this.$tabPanels);
+
+    return $placeholder;
 };
 
 jarmon.TabbedInterface.prototype.setup = function() {
@@ -1117,11 +1124,31 @@ jarmon.buildTabbedChartUi = function ($chartTemplate, chartRecipes,
     var charts = jQuery.map(
         ti.placeholders,
         function(el, i) {
-            return new jarmon.Chart(
-                $chartTemplate.clone().replaceAll(el[1]),
+            /*
+            $('.graph-legend input[name=chart_edit]', this.template[0]).live(
+                'click',
+                {self: this},
+                function(e) {
+
+                }
+            );
+            */
+            var chart = new jarmon.Chart(
+                $chartTemplate.clone().appendTo(el[1]),
                 chartRecipes[el[0]],
                 serialDownloader
-            )
+            );
+
+            $('input[name=chart_edit]', el[1][0]).live(
+                'click',
+                {chart: chart},
+                function(e) {
+                    var chart = e.data.chart;
+                    new jarmon.ChartEditor($(this).closest('.chart-container').find('.graph-legend'), chart).draw();
+                }
+            );
+
+            return chart;
         }
     );
 
-- 
cgit v1.2.3


From e37aeb47afd8d528c004eed5762287c5c99867e9 Mon Sep 17 00:00:00 2001
From: Richard Wall <richard@largo>
Date: Sun, 16 Jan 2011 20:30:16 +0000
Subject: position the add new chart button

---
 docs/examples/assets/css/style.css |  9 +++++++++
 jarmon/jarmon.js                   | 23 ++++++++++++-----------
 2 files changed, 21 insertions(+), 11 deletions(-)

diff --git a/docs/examples/assets/css/style.css b/docs/examples/assets/css/style.css
index 982398b..e82ec30 100644
--- a/docs/examples/assets/css/style.css
+++ b/docs/examples/assets/css/style.css
@@ -109,3 +109,12 @@ input[type=text] {
     float: right;
     margin: 0;
 }
+
+.tab-controls {
+    width: 790px;
+    padding: 5px 0 5px 0;
+    margin: 20px auto 0 auto;
+    text-align: right;
+    position: relative;
+    left: 25px;
+}
diff --git a/jarmon/jarmon.js b/jarmon/jarmon.js
index 0ba2e32..1dda6a8 100644
--- a/jarmon/jarmon.js
+++ b/jarmon/jarmon.js
@@ -1084,7 +1084,7 @@ jarmon.TabbedInterface.prototype.newTab = function(tabName) {
     // Add tab panel
     $('<div/>').append(
         $placeholder,
-        $('<div/>').append(
+        $('<div/>', {'class': 'tab-controls'}).append(
             $('<input/>', {
                 type: 'button',
                 value: 'Add new chart',
@@ -1124,15 +1124,6 @@ jarmon.buildTabbedChartUi = function ($chartTemplate, chartRecipes,
     var charts = jQuery.map(
         ti.placeholders,
         function(el, i) {
-            /*
-            $('.graph-legend input[name=chart_edit]', this.template[0]).live(
-                'click',
-                {self: this},
-                function(e) {
-
-                }
-            );
-            */
             var chart = new jarmon.Chart(
                 $chartTemplate.clone().appendTo(el[1]),
                 chartRecipes[el[0]],
@@ -1144,7 +1135,17 @@ jarmon.buildTabbedChartUi = function ($chartTemplate, chartRecipes,
                 {chart: chart},
                 function(e) {
                     var chart = e.data.chart;
-                    new jarmon.ChartEditor($(this).closest('.chart-container').find('.graph-legend'), chart).draw();
+                    new jarmon.ChartEditor(
+                        chart.template.find('.graph-legend'), chart).draw();
+                }
+            );
+
+            $('input[name=chart_delete]', el[1][0]).live(
+                'click',
+                {chart: chart},
+                function(e) {
+                    var chart = e.data.chart;
+                    chart.template.remove();
                 }
             );
 
-- 
cgit v1.2.3


From 77de7a5f611e78b199076d19756666e597f63137 Mon Sep 17 00:00:00 2001
From: Richard Wall <richard@largo>
Date: Wed, 16 Feb 2011 22:29:59 +0000
Subject: Some pyflakes / pep8 fixes.

---
 jarmonbuild/commands.py | 34 +++++++++++++++++++---------------
 1 file changed, 19 insertions(+), 15 deletions(-)

diff --git a/jarmonbuild/commands.py b/jarmonbuild/commands.py
index 9ababd9..13958fb 100644
--- a/jarmonbuild/commands.py
+++ b/jarmonbuild/commands.py
@@ -8,9 +8,7 @@ import logging
 import os
 import shutil
 import sys
-import time
 
-from datetime import datetime
 from optparse import OptionParser
 from subprocess import check_call, PIPE
 from tempfile import gettempdir
@@ -20,8 +18,8 @@ from zipfile import ZipFile, ZIP_DEFLATED
 import pkg_resources
 
 
-JARMON_PROJECT_TITLE='Jarmon'
-JARMON_PROJECT_URL='http://www.launchpad.net/jarmon'
+JARMON_PROJECT_TITLE = 'Jarmon'
+JARMON_PROJECT_URL = 'http://www.launchpad.net/jarmon'
 
 YUIDOC_URL = 'http://yuilibrary.com/downloads/yuidoc/yuidoc_1.0.0b1.zip'
 YUIDOC_MD5 = 'cd5545d2dec8f7afe3d18e793538162c'
@@ -91,15 +89,17 @@ class BuildApidocsCommand(BuildCommand):
         yuizip_path = os.path.join(tmpdir, os.path.basename(YUIDOC_URL))
         if os.path.exists(yuizip_path):
             self.log.debug('Using cached YUI doc')
+
             def producer():
                 yield open(yuizip_path).read()
         else:
             self.log.debug('Downloading YUI Doc')
+
             def producer():
                 with open(yuizip_path, 'w') as yuizip:
                     download = urlopen(YUIDOC_URL)
                     while True:
-                        bytes = download.read(1024*10)
+                        bytes = download.read(1024 * 10)
                         if not bytes:
                             break
                         else:
@@ -114,7 +114,8 @@ class BuildApidocsCommand(BuildCommand):
         if actual_md5 != YUIDOC_MD5:
             raise BuildError(
                 'YUI Doc checksum error. File: %s, '
-                'Expected: %s, Got: %s' % (yuizip_path, YUIDOC_MD5, actual_md5))
+                'Expected: %s, '
+                'Got: %s' % (yuizip_path, YUIDOC_MD5, actual_md5))
         else:
             self.log.debug('YUI Doc checksum verified')
 
@@ -145,7 +146,7 @@ class BuildApidocsCommand(BuildCommand):
                     workingbranch_dir, 'jarmonbuild', 'yuidoc_template'),),
             '--version=%s' % (buildversion,),
             '--project=%s' % (JARMON_PROJECT_TITLE,),
-            '--projecturl=%s' % (JARMON_PROJECT_URL,)
+            '--projecturl=%s' % (JARMON_PROJECT_URL,),
         ), stdout=PIPE, stderr=PIPE,)
 
         shutil.rmtree(yuidoc_dir)
@@ -181,21 +182,21 @@ class BuildReleaseCommand(BuildCommand):
         if status != 0:
             raise BuildError('bzr export failure. Status: %r' % (status,))
 
-
         self.log.debug('Record the branch version')
         from bzrlib.branch import Branch
         from bzrlib.version_info_formats import format_python
         v = format_python.PythonVersionInfoBuilder(
             Branch.open(workingbranch_dir))
-        versionfile_path = os.path.join(build_dir, 'jarmonbuild', '_version.py')
+
+        versionfile_path = os.path.join(
+            build_dir, 'jarmonbuild', '_version.py')
+
         with open(versionfile_path, 'w') as f:
             v.generate(f)
 
-
         self.log.debug('Generate apidocs')
         BuildApidocsCommand().main([buildversion])
 
-
         self.log.debug('Generate archive')
         archive_root = 'jarmon-%s' % (buildversion,)
         prefix_len = len(build_dir) + 1
@@ -205,7 +206,7 @@ class BuildReleaseCommand(BuildCommand):
                 for file in files:
                     z.write(
                         os.path.join(root, file),
-                        os.path.join(archive_root, root[prefix_len:], file)
+                        os.path.join(archive_root, root[prefix_len:], file),
                     )
         finally:
             z.close()
@@ -233,14 +234,17 @@ class BuildTestDataCommand(BuildCommand):
         rows = 12
         step = 10
 
-        dss.append(DataSource(dsName='speed', dsType='GAUGE', heartbeat=2*step))
+        dss.append(
+            DataSource(dsName='speed', dsType='GAUGE', heartbeat=2 * step))
         rras.append(RRA(cf='AVERAGE', xff=0.5, steps=1, rows=rows))
         rras.append(RRA(cf='AVERAGE', xff=0.5, steps=12, rows=rows))
         my_rrd = RRD(filename, ds=dss, rra=rras, start=start, step=step)
         my_rrd.create()
 
-        for i, t in enumerate(range(start+step, start+step+(rows*step), step)):
-            self.log.debug('DATA: %s %s (%s)' % (t, i, datetime.fromtimestamp(t)))
+        for i, t in enumerate(
+            range(start + step, start + step + (rows * step), step)):
+            self.log.debug(
+                'DATA: %s %s (%s)' % (t, i, datetime.fromtimestamp(t)))
             my_rrd.bufferValue(t, i)
 
         # Add further data 1 second later to demonstrate that the rrd
-- 
cgit v1.2.3


From 2e0922788f4f3d34e8fe56fcdf140e59299c730c Mon Sep 17 00:00:00 2001
From: Richard Wall <richard@largo>
Date: Wed, 16 Feb 2011 23:00:29 +0000
Subject: Rename inline functions to satisfy pyflakes.

---
 jarmonbuild/commands.py | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/jarmonbuild/commands.py b/jarmonbuild/commands.py
index 13958fb..0be6cf0 100644
--- a/jarmonbuild/commands.py
+++ b/jarmonbuild/commands.py
@@ -90,12 +90,14 @@ class BuildApidocsCommand(BuildCommand):
         if os.path.exists(yuizip_path):
             self.log.debug('Using cached YUI doc')
 
-            def producer():
+            def producer_local():
                 yield open(yuizip_path).read()
+
+            producer = producer_local
         else:
             self.log.debug('Downloading YUI Doc')
 
-            def producer():
+            def producer_remote():
                 with open(yuizip_path, 'w') as yuizip:
                     download = urlopen(YUIDOC_URL)
                     while True:
@@ -106,6 +108,8 @@ class BuildApidocsCommand(BuildCommand):
                             yuizip.write(bytes)
                             yield bytes
 
+            producer = producer_remote
+
         checksum = hashlib.md5()
         for bytes in producer():
             checksum.update(bytes)
-- 
cgit v1.2.3