Merge lp:~openerp-dev/openerp-web/trunk-new-graphview-ged into lp:openerp-web

[Géry Debongnie]

New graph view, Pivot table and stuff.

[lp:~openerp-dev/openerp-web/trunk-new-graphview-ged]

4081. By Géry Debongnie on 2014-01-17

[FIX] fixes a typo 'widet_config' => 'widget_config' (it previously crashed the graph view) (addon web_graph)

4082. By Géry Debongnie on 2014-01-17

[IMP] change the icon and tooltip of heat map (column) in graph view (addon web_graph)

4083. By Géry Debongnie on 2014-01-17

[IMP] makes sure that the graph view does not reload data if the user removes a measure. Also, display the 'no data' screen if there are no current measure in graph view (addon web_graph)

4084. By Géry Debongnie on 2014-01-17

[IMP] adds checkmarks next to measures when they are used in graph view (addon web_graph)

4085. By Géry Debongnie on 2014-01-17

[IMP] display bar chart controls when the size is large enough and when it makes sense (dim x + dim y >= 2) in grap view (addon web_graph)

4086. By Géry Debongnie on 2014-01-17

[IMP] keeps the dropdown open when the user selects some measures in graph view (addon web_graph)

4087. By Géry Debongnie on 2014-01-17

[FIX] fixes a typo (nodata => no_data), which prevents a crash in graph_view, addon web_graph)

4088. By Géry Debongnie on 2014-01-17

[FIX] fix crash happening when user goes to graph view, switch to other view, changes groupby and goes back to graph view. (addon web_graph)

4089. By Géry Debongnie on 2014-01-20

[IMP] optimizes pivot table so that it doesn't reload data when the groupbys have been changed in such a way that it should only fold some headers (addon web_graph)

4090. By Géry Debongnie on 2014-01-21

[REF] large refactoring in graph view: changes the flow of the program to make it much simpler (addon web_graph)

4091. By Géry Debongnie on 2014-01-21

[MERGE] merge trunk into local branch

4092. By Géry Debongnie on 2014-01-22

[IMP] two small tweaks to improve the code quality in addon web_graph

4093. By Géry Debongnie on 2014-01-22

[FIX] makes the querygroup methods compatible with the 'field:interval' format of groupbys accepted by read_group

4094. By Géry Debongnie on 2014-01-22

[IMP] changes the backend code of graph view to use the new functionality of read_group (use 'field_name:interval' in readgroup instead of context (addon web_graph)

4095. By Géry Debongnie on 2014-01-22

[REF] refactoring: removes the 'interval' attributes in groupbys and improves searchbar integration (addon web_graph)

4096. By Géry Debongnie on 2014-01-23

[FIX] fixes a crash happening when in dashboards, the graph view was trying to access undefined attributes (addon web_graph)

4097. By Géry Debongnie on 2014-01-23

[FIX] fixes a problem with fields selection : the string was not correctly displayed (addon web_graph)

4098. By Géry Debongnie on 2014-01-24

[IMP] graph_view now properly honors the 'interval' attribute of field names in the xml description (addon web_graph)

4099. By Géry Debongnie on 2014-01-24

[FIX] fixes two small issues concerning the groupby dates in graph view (addon web_graph)

4100. By Géry Debongnie on 2014-01-24

[REF] lots of small tweaks to improve the code, and some small fixes, after xmo's code review (addon web_graph)

4101. By Géry Debongnie on 2014-01-24

[FIX] fixes a crash in line chart mode when the view had more than one measure (addon web_graph)

4102. By Géry Debongnie on 2014-01-24

[FIX] fixes a typo, causing crashes when selecting date fields in groupbys (addon web_graph)

4103. By Géry Debongnie on 2014-01-24

[MERGE] merge trunk into local branch

4104. By Géry Debongnie on 2014-01-27

[FIX] fixes a crash happening when the context has a groupby attributes which is an array (addon web_graph)

=== modified file 'addons/web/static/src/js/data.js'
--- addons/web/static/src/js/data.js	2014-01-15 22:13:49 +0000
+++ addons/web/static/src/js/data.js	2014-01-27 15:23:42 +0000
@@ -129,11 +129,14 @@
         if (_.isEmpty(grouping) && !ctx['group_by_no_leaf']) {
             return null;
         }
+        var raw_fields = _.map(grouping.concat(this._fields || []), function (field) {
+            return (_.contains(field, ':')) ? field.split(':')[0] : field;
+        });
 
         var self = this;
         return this._model.call('read_group', {
             groupby: grouping,
-            fields: _.uniq(grouping.concat(this._fields || [])),
+            fields: _.uniq(raw_fields),
             domain: this._model.domain(this._filter),
             context: ctx,
             offset: this._offset,
@@ -233,12 +236,14 @@
 
         var group_size = fixed_group[grouping_field + '_count'] || fixed_group.__count || 0;
         var leaf_group = fixed_group.__context.group_by.length === 0;
+        var raw_field = (_.contains(grouping_field, ':')) ? grouping_field.split(':')[0] : grouping_field;
+
         this.attributes = {
             folded: !!(fixed_group.__fold),
             grouped_on: grouping_field,
             // if terminal group (or no group) and group_by_no_leaf => use group.__count
             length: group_size,
-            value: fixed_group[grouping_field],
+            value: fixed_group[raw_field],
             // A group is open-able if it's not a leaf in group_by_no_leaf mode
             has_children: !(leaf_group && fixed_group.__context['group_by_no_leaf']),
 

=== modified file 'addons/web/static/src/js/pyeval.js'
--- addons/web/static/src/js/pyeval.js	2013-08-06 12:50:22 +0000
+++ addons/web/static/src/js/pyeval.js	2014-01-27 15:23:42 +0000
@@ -845,16 +845,18 @@
     };
     instance.web.pyeval.eval_domains_and_contexts = function (source) {
         return new $.Deferred(function (d) {setTimeout(function () {
+            var result;
             try {
                 var contexts = ([instance.session.user_context] || []).concat(source.contexts);
                 // see Session.eval_context in Python
-                d.resolve({
+                result = {
                     context: instance.web.pyeval.eval('contexts', contexts),
                     domain: instance.web.pyeval.eval('domains', source.domains),
                     group_by: instance.web.pyeval.eval('groupbys', source.group_by_seq || [])
-                });
+                };
+
             } catch (e) {
-                d.resolve({ error: {
+                result = { error: {
                     code: 400,
                     message: instance.web._t("Evaluation Error"),
                     data: {
@@ -863,8 +865,9 @@
                                 instance.web._t("Local evaluation failure\n%s\n\n%s"),
                                 e.message, JSON.stringify(source))
                     }
-                }});
+                }};
             }
+            d.resolve(result);
         }, 0); });
     };
 })();

=== modified file 'addons/web/static/src/js/search.js'
--- addons/web/static/src/js/search.js	2014-01-15 22:13:49 +0000
+++ addons/web/static/src/js/search.js	2014-01-27 15:23:42 +0000
@@ -85,7 +85,7 @@
                     && facet.get('field') === model.get('field');
             });
             if (previous) {
-                previous.values.add(model.get('values'));
+                previous.values.add(model.get('values'), _.omit(options, 'at', 'merge'));
                 return;
             }
             B.Collection.prototype.add.call(this, model, options);

=== modified file 'addons/web/static/test/search.js'
--- addons/web/static/test/search.js	2013-11-07 11:12:31 +0000
+++ addons/web/static/test/search.js	2014-01-27 15:23:42 +0000
@@ -425,7 +425,7 @@
                     "should have the right facet in the query");
             });
     });
-    test('facet selection: new value existing facet', {asserts: 3}, function (instance, $s) {
+    test('facet selection: new value existing facet', {asserts: 8}, function (instance, $s) {
         var field = {
             get_domain: openerp.testing.noop,
             get_context: openerp.testing.noop,
@@ -451,8 +451,14 @@
                     {item: completion});
                 equal(view.query.length, 1, "should still have only one facet");
                 var facet = view.query.at(0);
+                var values = facet.get('values');
+                equal(values.length, 2, 'should have two values');
+                equal(values[0].label, 'previous');
+                equal(values[0].value, 41);
+                equal(values[1].label, 'dummy');
+                equal(values[1].value, 42);
                 deepEqual(
-                    facet.get('values'),
+                    values,
                     [{label: 'previous', value: 41}, {label: 'dummy', value: 42}],
                     "should have added selected value to old one");
             });

=== modified file 'addons/web_graph/__openerp__.py'
--- addons/web_graph/__openerp__.py	2013-12-12 09:45:18 +0000
+++ addons/web_graph/__openerp__.py	2014-01-27 15:23:42 +0000
@@ -15,37 +15,11 @@
     'version': '3.0',
     'depends': ['web'],
     'js': [
-        'static/lib/flotr2/lib/bean.js',
-        'static/lib/flotr2/js/Flotr.js',
-        'static/lib/flotr2/js/DefaultOptions.js',
-        'static/lib/flotr2/js/Color.js',
-        'static/lib/flotr2/js/Date.js',
-        'static/lib/flotr2/js/DOM.js',
-        'static/lib/flotr2/js/EventAdapter.js',
-        'static/lib/flotr2/js/Text.js',
-        'static/lib/flotr2/js/Graph.js',
-        'static/lib/flotr2/js/Axis.js',
-        'static/lib/flotr2/js/Series.js',
-        'static/lib/flotr2/js/types/lines.js',
-        'static/lib/flotr2/js/types/bars.js',
-        'static/lib/flotr2/js/types/bubbles.js',
-        'static/lib/flotr2/js/types/candles.js',
-        'static/lib/flotr2/js/types/gantt.js',
-        'static/lib/flotr2/js/types/markers.js',
-        'static/lib/flotr2/js/types/pie.js',
-        'static/lib/flotr2/js/types/points.js',
-        'static/lib/flotr2/js/types/radar.js',
-        'static/lib/flotr2/js/types/timeline.js',
-        'static/lib/flotr2/js/plugins/crosshair.js',
-        'static/lib/flotr2/js/plugins/download.js',
-        'static/lib/flotr2/js/plugins/grid.js',
-        'static/lib/flotr2/js/plugins/hit.js',
-        'static/lib/flotr2/js/plugins/selection.js',
-        'static/lib/flotr2/js/plugins/labels.js',
-        'static/lib/flotr2/js/plugins/legend.js',
-        'static/lib/flotr2/js/plugins/spreadsheet.js',
-        'static/lib/flotr2/js/plugins/titles.js',
-        'static/src/js/graph.js'
+        'static/lib/nvd3/d3.v3.js',
+        'static/lib/nvd3/nv.d3.js',
+        'static/src/js/graph_view.js',
+        'static/src/js/pivot_table.js',
+        'static/src/js/graph_widget.js',
     ],
     'css': [
         'static/src/css/*.css',

=== removed directory 'addons/web_graph/static/lib/flotr2'
=== removed file 'addons/web_graph/static/lib/flotr2/LICENSE'
--- addons/web_graph/static/lib/flotr2/LICENSE	2012-05-07 08:19:08 +0000
+++ addons/web_graph/static/lib/flotr2/LICENSE	1970-01-01 00:00:00 +0000
@@ -1,19 +0,0 @@
-Copyright (c) 2012 Carl Sutherland
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.

=== removed file 'addons/web_graph/static/lib/flotr2/Makefile'
--- addons/web_graph/static/lib/flotr2/Makefile	2012-05-07 10:34:07 +0000
+++ addons/web_graph/static/lib/flotr2/Makefile	1970-01-01 00:00:00 +0000
@@ -1,40 +0,0 @@
-all: test flotr2
-
-test:
-	cd spec; jasmine-headless-webkit -j jasmine.yml -c
-
-libraries:
-	smoosh make/lib.json
-	cat ./build/bean.js > build/lib.js
-	cat ./build/underscore.js >> build/lib.js
-	cat ./build/bean.min.js > build/lib.min.js
-	echo ";" >> build/lib.min.js
-	cat ./build/underscore.min.js >> build/lib.min.js
-	echo ";" >> build/lib.min.js
-
-ie:
-	smoosh make/ie.json
-
-flotr2: libraries ie
-	smoosh make/flotr2.json
-	cat build/lib.js build/flotr2.js > flotr2.js
-	cat build/lib.min.js > flotr2.min.js
-	cat build/flotr2.min.js >> flotr2.min.js
-	echo ';' >> flotr2.min.js
-	cp build/ie.min.js flotr2.ie.min.js
-
-flotr2-basic: libraries ie
-	smoosh make/basic.json
-	cat build/lib.min.js > flotr2-basic.min.js
-	cat build/flotr2-basic.min.js >> flotr2-basic.min.js
-
-flotr2-standalone: ie
-	smoosh make/flotr2.json
-	cat build/flotr2.js > flotr2.js
-	cp build/ie.min.js flotr2.ie.min.js
-
-flotr-examples:
-	smoosh make/examples.json
-	cp build/examples.min.js flotr2.examples.min.js
-	cp build/examples-types.js flotr2.examples.types.js
-

=== removed file 'addons/web_graph/static/lib/flotr2/README.md'
--- addons/web_graph/static/lib/flotr2/README.md	2012-05-07 08:19:08 +0000
+++ addons/web_graph/static/lib/flotr2/README.md	1970-01-01 00:00:00 +0000
@@ -1,89 +0,0 @@
-Flotr2
-======
-
-The Canvas graphing library.
-
-![Google Groups](http://groups.google.com/intl/en/images/logos/groups_logo_sm.gif)
-
-http://groups.google.com/group/flotr2/
-
-Please fork http://jsfiddle.net/cesutherland/ZFBj5/ with your question or bug reproduction case.
-
-
-API
----
-
-The API consists of a primary draw method which accepts a configuration object, helper methods, and several microlibs.
-
-### Example
-
-```javascript
-  var
-    // Container div:
-    container = document.getElementById("flotr-example-graph"),
-    // First data series:
-    d1 = [[0, 3], [4, 8], [8, 5], [9, 13]],
-    // Second data series:
-    d2 = [],
-    // A couple flotr configuration options:
-    options = {
-      xaxis: {
-        minorTickFreq: 4
-      }, 
-      grid: {
-        minorVerticalLines: true
-      }
-    },
-    i, graph;
-
-  // Generated second data set:
-  for (i = 0; i < 14; i += 0.5) {
-    d2.push([i, Math.sin(i)]);
-  }
-
-  // Draw the graph:
-  graph = Flotr.draw(
-    container,  // Container element
-    [ d1, d2 ], // Array of data series
-    options     // Configuration options
-  );
-```
-
-### Microlibs
-
-* [underscore.js](http://documentcloud.github.com/underscore/)
-* [bean.js](https://github.com/fat/bean)
-
-Extending
----------
-
-Flotr may be extended by adding new plugins and graph types.
-
-### Graph Types
-
-Graph types define how a particular chart is rendered.  Examples include line, bar, pie.
-
-Existing graph types are found in `js/types/`.
-
-### Plugins
-
-Plugins extend the core of flotr with new functionality.  They can add interactions, new decorations, etc.  Examples 
-include titles, labels and selection.
-
-The plugins included are found in `js/plugins/`.
-
-Development
------------
-
-This project uses [smoosh](https://github.com/fat/smoosh) to build and [jasmine](http://pivotal.github.com/jasmine/) 
-with [js-imagediff](https://github.com/HumbleSoftware/js-imagediff) to test.  Tests may be executed by 
-[jasmine-headless-webkit](http://johnbintz.github.com/jasmine-headless-webkit/) with 
-`cd spec; jasmine-headless-webkit -j jasmine.yml -c` or by a browser by navigating to 
-`flotr2/spec/SpecRunner.html`.
-
-Shoutouts
----------
-
-Thanks to Bas Wenneker, Fabien Ménager and others for all the work on the original Flotr.
-Thanks to Jochen Berger and Jordan Santell for their contributions to Flotr2.
-

=== removed directory 'addons/web_graph/static/lib/flotr2/dev'
=== removed file 'addons/web_graph/static/lib/flotr2/dev/notes.txt'
--- addons/web_graph/static/lib/flotr2/dev/notes.txt	2012-05-07 08:19:08 +0000
+++ addons/web_graph/static/lib/flotr2/dev/notes.txt	1970-01-01 00:00:00 +0000
@@ -1,86 +0,0 @@
-Flotr 2 Architecture Notes
-
-
-Global:
-======
-
-Flotr.js -
-  versioning information
-  browser detection
-  extension (plugins, graph types)
-  draw
-  clone / merge
-  tick size
-  tick formatter
-  engineering notation
-  magnitude
-  rad, pixel, floor
-  drawText
-  measureText
-  getBestTextAlign
-  align map
-  compatibility
-
-
-Graph Architecture:
-===================
-
-Axis -
-  all series
-  orientation
-  ticks (major, minor)
-  scale (d2p, p2d, logarithmic)
-  notion of stacks
-
-Series -
-  per 'data'
-  notion of range (x, y, min, max)
-
-Graph -
-  DOM constructon
-  event attachment
-  options initialization
-  data range calculations
-  canvas spacing calculations
-  event normalization
-  draw methods
-  DOM cleanup
-  event cleanup
-
-
-Utilities:
-==========
-
-Color
-  build colors
-  parse textual color data
-  convert colors
-  clone colors
-
-Text
-  calculate text size
-  canvas size
-  html size
-
-Date
-  formatting
-  constants
-
-
-Spacing Calculation
-===================
-
-Flotr
-  calculate data
-  calculate margins
-
-Chart
-  calculate Data Ranges - Explicit or auto data minimum, maximums
-  calculate Data Range Extensions - By chart type, extend data range with needs of chart type (ie. stacked bars, stacked lines)
-  add Chart Padding - By chart type
-
-Text
-  use explicit margins
-  calculate label margins
-  calculate title margins
-

=== removed file 'addons/web_graph/static/lib/flotr2/flotr2.examples.min.js'
--- addons/web_graph/static/lib/flotr2/flotr2.examples.min.js	2012-05-07 08:19:08 +0000
+++ addons/web_graph/static/lib/flotr2/flotr2.examples.min.js	1970-01-01 00:00:00 +0000
@@ -1,2 +0,0 @@
-
-(function(){var a=Flotr.EventAdapter,b=Flotr._,c="click",d="example",e="mouseenter",f="mouseleave",g=".",h="flotr-examples",i="flotr-examples-container",j="flotr-examples-reset",k="flotr-examples-thumbs",l="flotr-examples-thumb",m="flotr-examples-collapsed",n="flotr-examples-highlight",o="flotr-examples-large",p="flotr-examples-medium",q="flotr-examples-small",r="flotr-examples-mobile",s='<div class="'+l+'"></div>',t='<div class="'+h+'">'+'<div class="'+j+'">View All</div>'+'<div class="'+k+'"></div>'+'<div class="'+i+'"></div>'+"</div>";Examples=function(a){if(b.isUndefined(Flotr.ExampleList))throw"Flotr.ExampleList not defined.";this.options=a,this.list=Flotr.ExampleList,this.current=null,this.single=!1,this._initNodes(),this._example=new Flotr.Examples.Example({node:this._exampleNode}),this._initExamples()},Examples.prototype={examples:function(){function f(b){var c=$(b.currentTarget),e=c.data("example"),f=b.data.orientation;f^c.hasClass(n)&&(c.toggleClass(n).css(a),d._example.executeCallback(e,c))}var a={cursor:"pointer"},b=this._thumbsNode,c=this.list.get(),d=this,e=["basic","basic-axis","basic-bars","basic-bars-horizontal","basic-bar-stacked","basic-stacked-horizontal","basic-pie","basic-radar","basic-bubble","basic-candle","basic-legend","mouse-tracking","mouse-zoom","mouse-drag","basic-time","negative-values","click-example","download-image","download-data","advanced-titles","color-gradients","basic-timeline","advanced-markers"];(function h(){var a=e.shift(),f=c[a];if(f.type==="profile"||f.type==="test")return;var g=$(s);g.data("example",f),b.append(g),d._example.executeCallback(f,g),g.click(function(){d._loadExample(f)}),e.length&&setTimeout(h,20)})(),b.delegate(g+l,"mouseenter",{orientation:!0},f),b.delegate(g+l,"mouseleave",{orientation:!1},f)},_loadExample:function(a){a&&(window.location.hash="!"+(this.single?"single/":"")+a.key,u||(this._thumbsNode.css({position:"absolute",height:"0px",overflow:"hidden",width:"0px"}),this._resetNode.css({top:"16px"})),this._examplesNode.addClass(m),this._exampleNode.show(),this._example.setExample(a),this._resize(),$(document).scrollTop(0))},_reset:function(){window.location.hash="",u||this._thumbsNode.css({position:"",height:"",overflow:"",width:""}),this._examplesNode.removeClass(m),this._thumbsNode.height(""),this._exampleNode.hide()},_initNodes:function(){var a=$(this.options.node),b=this,c=$(t);b._resetNode=c.find(g+j),b._exampleNode=c.find(g+i),b._thumbsNode=c.find(g+k),b._examplesNode=c,b._resetNode.click(function(){b._reset()}),a.append(c),this._initResizer()},_initResizer:function(){function e(){var b=c.height()-(a.options.thumbPadding||0),e=c.width(),f;e>1760?(f=o,a._thumbsNode.height(b)):e>1140?(f=p,a._thumbsNode.height(b)):(f=q,a._thumbsNode.height("")),d!==f&&(d&&a._examplesNode.removeClass(d),a._examplesNode.addClass(f),d=f)}var a=this,b=a._examplesNode,c=$(window),d;$(window).resize(e),e(),this._resize=e},_initExamples:function(){var a=window.location.hash,b,c;a?(a=a.substring(2),c=a.split("/"),c.length==1?(b=this.list.get(a),this.examples()):c[0]=="single"&&(this.single=!0,b=this.list.get(c[1])),this._loadExample(b)):this.examples()}};var u=function(){var a=!!(navigator.userAgent.match(/Android/i)||navigator.userAgent.match(/webOS/i)||navigator.userAgent.match(/iPhone/i)||navigator.userAgent.match(/iPod/i)),b=!!$.browser.mozilla;return!a||b}();Flotr.Examples=Examples})(),function(){var a=Flotr._,b=".",c="flotr-example",d="flotr-example-label",e="flotr-example-title",f="flotr-example-description",g="flotr-example-editor",h="flotr-example-graph",i='<div class="'+c+'">'+'<div class="'+d+" "+e+'"></div>'+'<div class="'+f+'"></div>'+'<div class="'+g+'"></div>'+"</div>",j=function(a){this.options=a,this.example=null,this._initNodes()};j.prototype={setExample:function(a){var b=this.getSource(a),c=this._editorNode;this.example=a,Math.seedrandom(a.key),this._exampleNode.css({display:"block"}),this._titleNode.html(a.name||""),this._markupNode.html(a.description||""),this._editor?this._editor.setExample(b):this._editor=new Flotr.Examples.Editor(c,{example:b,teardown:function(){Flotr.EventAdapter.stopObserving($(c).find(".render")[0]),$(c).find("canvas").each(function(a,b){Flotr.EventAdapter.stopObserving(b)})}})},getSource:function(a){var b=a.callback.toString();return navigator.userAgent.search(/firefox/i)!==-1&&(b=js_beautify(b)),b},executeCallback:function(b,c){a.isElement(c)||(c=c[0]);var d=b.args?[c].concat(b.args):[c];return Math.seedrandom(b.key),b.callback.apply(this,d)},_initNodes:function(){var a=this.options.node,c=$(i);this._titleNode=c.find(b+e),this._markupNode=c.find(b+f),this._editorNode=c.find(b+g),this._exampleNode=c,a.append(c)}},Flotr.Examples.Example=j}(),function(){function Editor(a,b){function o(){i.hide(),f&&f.call(),m.render({example:d,render:h})}function p(a,b,c){var d=!1,e='<span class="error">Error: </span>',f,g;e+='<span class="message">'+a+"</span>",typeof c!="undefined"&&(e+='<span class="position">',e+='Line <span class="line">'+c+"</span>",console.log(b),b&&(e+=" of ",b==window.location?(e+='<span class="url">script</span>',!d):e+='<span class="url">'+b+"</span>"),e+=".</span>"),i.show(),i.html(e)}var c=b.type||"javascript",d=b.example||"",e=b.noRun||!1,f=b.teardown||!1,g=$(T_CONTROLS),h=$(T_RENDER),i=$(T_ERRORS),j=$(T_SOURCE),k=$(T_EDITOR),l="editor-render-"+COUNT,m,h,n;m=new TYPES[c]({onerror:p});if(!m)throw"Invalid type: API not found for type `"+c+"`.";h.attr("id",l),i.hide(),k.append(h).append(g).append(j).addClass(c).addClass(e?"no-run":""),a=$(a),a.append(k),j.append(i),d=m.example({example:d,render:h}),n=CodeMirror(j[0],{value:d,readOnly:e,lineNumbers:!0,mode:m.codeMirrorType}),e||(g.delegate(".run","click",function(){d=n.getValue(),o()}),o()),window.onerror=function(a,b,c){return p(a,b,c),console.log(a),ONERROR&&$.isFunction(ONERROR)?ONERROR(a,b,c):!1},COUNT++,this.setExample=function(a){d=m.example({example:a,render:h}),n.setValue(d),n.refresh(),o()}}var ONERROR=window.onerror,COUNT=0,TYPES={},T_CONTROLS='<div class="controls"><button class="run btn large primary">Run</button></div>',T_EDITOR='<div class="editor"></div>',T_SOURCE='<div class="source"></div>',T_ERRORS='<div class="errors"></div>',T_RENDER='<div class="render"></div>',T_IFRAME="<iframe></iframe>";TYPES.javascript=function(b){this.onerror=b.onerror},TYPES.javascript.prototype={codeMirrorType:"javascript",example:function(a){var b=a.example,c=a.render,d=$(c).attr("id");return"("+b+')(document.getElementById("'+d+'"));'},render:function(o){eval(o.example)}},TYPES.html=function(b){this.onerror=b.onerror},TYPES.html.prototype={codeMirrorType:"htmlmixed",example:function(a){return $.trim(a.example)},render:function(a){var b=a.example,c=a.render,d=$(T_IFRAME),e=this,f,g;c.html(d),f=d[0].contentWindow,g=f.document,g.open(),f.onerror=d.onerror=function(){e.onerror.apply(null,arguments)},g.write(b),g.close()}},typeof Flotr.Examples=="undefined"&&(Flotr.Examples={}),Flotr.Examples.Editor=Editor}(),function(){var a=Flotr.DOM,b=Flotr.EventAdapter,c=Flotr._,d="click",e="example-profile",f="examples",g=function(a){if(c.isUndefined(Flotr.ExampleList))throw"Flotr.ExampleList not defined.";this.editMode="off",this.list=Flotr.ExampleList,this.current=null,this.single=!1,this.init()};g.prototype=c.extend({},Flotr.Examples.prototype,{examples:function(){var e=document.getElementById(f),g=a.node("<ul></ul>"),h;c.each(this.list.getType("profile"),function(e){h=a.node("<li>"+e.name+"</li>"),a.insert(g,h),b.observe(h,d,c.bind(function(){this.example(e)},this))},this),a.insert(e,g)},example:function(a){this._renderSource(a),this.profileStart(a),setTimeout(c.bind(function(){this._renderGraph(a),this.profileEnd()},this),50)},profileStart:function(a){var b=document.getElementById(e);this._startTime=new Date,b.innerHTML='<div>Profile started for "'+a.name+'"...</div>'},profileEnd:function(a){var b=document.getElementById(e);profileTime=new Date-this._startTime,this._startTime=null,b.innerHTML+="<div>Profile complete: "+profileTime+"ms<div>"}}),Flotr.Profile=g}()
\ No newline at end of file

=== removed file 'addons/web_graph/static/lib/flotr2/flotr2.examples.types.js'
--- addons/web_graph/static/lib/flotr2/flotr2.examples.types.js	2012-05-07 08:19:08 +0000
+++ addons/web_graph/static/lib/flotr2/flotr2.examples.types.js	1970-01-01 00:00:00 +0000
@@ -1,1425 +0,0 @@
-(function () {
-
-var ExampleList = function () {
-
-  // Map of examples.
-  this.examples = {};
-
-};
-
-ExampleList.prototype = {
-
-  add : function (example) {
-    this.examples[example.key] = example;
-  },
-
-  get : function (key) {
-    return key ? (this.examples[key] || null) : this.examples;
-  },
-
-  getType : function (type) {
-    return Flotr._.select(this.examples, function (example) {
-      return (example.type === type);
-    });
-  }
-}
-
-Flotr.ExampleList = new ExampleList();
-
-})();
-
-(function () {
-
-Flotr.ExampleList.add({
-  key : 'basic',
-  name : 'Basic',
-  callback : basic
-});
-
-function basic (container) {
-
-  var
-    d1 = [[0, 3], [4, 8], [8, 5], [9, 13]], // First data series
-    d2 = [],                                // Second data series
-    i, graph;
-
-  // Generate first data set
-  for (i = 0; i < 14; i += 0.5) {
-    d2.push([i, Math.sin(i)]);
-  }
-
-  // Draw Graph
-  graph = Flotr.draw(container, [ d1, d2 ], {
-    xaxis: {
-      minorTickFreq: 4
-    }, 
-    grid: {
-      minorVerticalLines: true
-    }
-  });
-}
-
-})();
-
-(function () {
-
-Flotr.ExampleList.add({
-  key : 'basic-stacked',
-  name : 'Basic Stacked',
-  callback : basic_stacked,
-  type : 'test'
-});
-
-function basic_stacked (container) {
-
-  var
-    d1 = [[0, 3], [4, 8], [8, 2], [9, 3]], // First data series
-    d2 = [[0, 2], [4, 3], [8, 8], [9, 4]], // Second data series
-    i, graph;
-
-  // Draw Graph
-  graph = Flotr.draw(container, [ d1, d2 ], {
-    lines: {
-      show : true,
-      stacked: true
-    },
-    xaxis: {
-      minorTickFreq: 4
-    }, 
-    grid: {
-      minorVerticalLines: true
-    }
-  });
-}
-
-})();
-
-(function () {
-
-Flotr.ExampleList.add({
-  key : 'basic-stepped',
-  name : 'Basic Stepped',
-  callback : basic_stepped,
-  type : 'test'
-});
-
-function basic_stepped (container) {
-
-  var
-    d1 = [[0, 3], [4, 8], [8, 5], [9, 13]], // First data series
-    d2 = [],                                // Second data series
-    i, graph;
-
-  // Generate first data set
-  for (i = 0; i < 14; i += 0.5) {
-    d2.push([i, Math.sin(i)]);
-  }
-
-  // Draw Graph
-  graph = Flotr.draw(container, [ d1, d2 ], {
-    lines: {
-      steps : true,
-      show : true
-    },
-    xaxis: {
-      minorTickFreq: 4
-    }, 
-    yaxis: {
-      autoscale: true
-    },
-    grid: {
-      minorVerticalLines: true
-    },
-    mouse : {
-      track : true,
-      relative : true
-    }
-  });
-}
-
-})();
-
-(function () {
-
-Flotr.ExampleList.add({
-  key : 'basic-axis',
-  name : 'Basic Axis',
-  callback : basic_axis
-});
-
-function basic_axis (container) {
-
-  var
-    d1 = [],
-    d2 = [],
-    d3 = [],
-    d4 = [],
-    d5 = [],                        // Data
-    ticks = [[ 0, "Lower"], 10, 20, 30, [40, "Upper"]], // Ticks for the Y-Axis
-    graph;
-        
-  for(var i = 0; i <= 10; i += 0.1){
-    d1.push([i, 4 + Math.pow(i,1.5)]);
-    d2.push([i, Math.pow(i,3)]);
-    d3.push([i, i*5+3*Math.sin(i*4)]);
-    d4.push([i, i]);
-    if( i.toFixed(1)%1 == 0 ){
-      d5.push([i, 2*i]);
-    }
-  }
-        
-  d3[30][1] = null;
-  d3[31][1] = null;
-
-  function ticksFn (n) { return '('+n+')'; }
-
-  graph = Flotr.draw(container, [ 
-      { data : d1, label : 'y = 4 + x^(1.5)', lines : { fill : true } }, 
-      { data : d2, label : 'y = x^3'}, 
-      { data : d3, label : 'y = 5x + 3sin(4x)'}, 
-      { data : d4, label : 'y = x'},
-      { data : d5, label : 'y = 2x', lines : { show : true }, points : { show : true } }
-    ], {
-      xaxis : {
-        noTicks : 7,              // Display 7 ticks.
-        tickFormatter : ticksFn,  // Displays tick values between brackets.
-        min : 1,                  // Part of the series is not displayed.
-        max : 7.5                 // Part of the series is not displayed.
-      },
-      yaxis : {
-        ticks : ticks,            // Set Y-Axis ticks
-        max : 40                  // Maximum value along Y-Axis
-      },
-      grid : {
-        verticalLines : false,
-        backgroundColor : {
-          colors : [[0,'#fff'], [1,'#ccc']],
-          start : 'top',
-          end : 'bottom'
-        }
-      },
-      legend : {
-        position : 'nw'
-      },
-      title : 'Basic Axis example',
-      subtitle : 'This is a subtitle'
-  });
-}
-
-})();
-
-(function () {
-
-Flotr.ExampleList.add({
-  key : 'basic-bars',
-  name : 'Basic Bars',
-  callback : basic_bars
-});
-
-Flotr.ExampleList.add({
-  key : 'basic-bars-horizontal',
-  name : 'Horizontal Bars',
-  args : [true],
-  callback : basic_bars,
-  tolerance : 5
-});
-
-function basic_bars (container, horizontal) {
-
-  var
-    horizontal = (horizontal ? true : false), // Show horizontal bars
-    d1 = [],                                  // First data series
-    d2 = [],                                  // Second data series
-    point,                                    // Data point variable declaration
-    i;
-
-  for (i = 0; i < 4; i++) {
-
-    if (horizontal) { 
-      point = [Math.ceil(Math.random()*10), i];
-    } else {
-      point = [i, Math.ceil(Math.random()*10)];
-    }
-
-    d1.push(point);
-        
-    if (horizontal) { 
-      point = [Math.ceil(Math.random()*10), i+0.5];
-    } else {
-      point = [i+0.5, Math.ceil(Math.random()*10)];
-    }
-
-    d2.push(point);
-  };
-              
-  // Draw the graph
-  Flotr.draw(
-    container,
-    [d1, d2],
-    {
-      bars : {
-        show : true,
-        horizontal : horizontal,
-        shadowSize : 0,
-        barWidth : 0.5
-      },
-      mouse : {
-        track : true,
-        relative : true
-      },
-      yaxis : {
-        min : 0,
-        autoscaleMargin : 1
-      }
-    }
-  );
-}
-
-})();
-
-(function () {
-
-Flotr.ExampleList.add({
-  key : 'basic-bar-stacked',
-  name : 'Stacked Bars',
-  callback : bars_stacked
-});
-
-Flotr.ExampleList.add({
-  key : 'basic-stacked-horizontal',
-  name : 'Stacked Horizontal Bars',
-  args : [true],
-  callback : bars_stacked,
-  tolerance : 5
-});
-
-function bars_stacked (container, horizontal) {
-
-  var
-    d1 = [],
-    d2 = [],
-    d3 = [],
-    graph, i;
-
-  for (i = -10; i < 10; i++) {
-    if (horizontal) {
-      d1.push([Math.random(), i]);
-      d2.push([Math.random(), i]);
-      d3.push([Math.random(), i]);
-    } else {
-      d1.push([i, Math.random()]);
-      d2.push([i, Math.random()]);
-      d3.push([i, Math.random()]);
-    }
-  }
-
-  graph = Flotr.draw(container,[
-    { data : d1, label : 'Serie 1' },
-    { data : d2, label : 'Serie 2' },
-    { data : d3, label : 'Serie 3' }
-  ], {
-    legend : {
-      backgroundColor : '#D2E8FF' // Light blue 
-    },
-    bars : {
-      show : true,
-      stacked : true,
-      horizontal : horizontal,
-      barWidth : 0.6,
-      lineWidth : 1,
-      shadowSize : 0
-    },
-    grid : {
-      verticalLines : horizontal,
-      horizontalLines : !horizontal
-    }
-  });
-}
-
-})();
-
-(function () {
-
-Flotr.ExampleList.add({
-  key : 'basic-pie',
-  name : 'Basic Pie',
-  callback : basic_pie
-});
-
-function basic_pie (container) {
-
-  var
-    d1 = [[0, 4]],
-    d2 = [[0, 3]],
-    d3 = [[0, 1.03]],
-    d4 = [[0, 3.5]],
-    graph;
-  
-  graph = Flotr.draw(container, [
-    { data : d1, label : 'Comedy' },
-    { data : d2, label : 'Action' },
-    { data : d3, label : 'Romance',
-      pie : {
-        explode : 50
-      }
-    },
-    { data : d4, label : 'Drama' }
-  ], {
-    HtmlText : false,
-    grid : {
-      verticalLines : false,
-      horizontalLines : false
-    },
-    xaxis : { showLabels : false },
-    yaxis : { showLabels : false },
-    pie : {
-      show : true, 
-      explode : 6
-    },
-    mouse : { track : true },
-    legend : {
-      position : 'se',
-      backgroundColor : '#D2E8FF'
-    }
-  });
-}
-
-})();
-
-(function () {
-
-Flotr.ExampleList.add({
-  key : 'basic-radar',
-  name : 'Basic Radar',
-  callback : basic_radar
-});
-
-function basic_radar (container) {
-
-  // Fill series s1 and s2.
-  var
-    s1 = { label : 'Actual', data : [[0, 3], [1, 8], [2, 5], [3, 5], [4, 3], [5, 9]] },
-    s2 = { label : 'Target', data : [[0, 8], [1, 7], [2, 8], [3, 2], [4, 4], [5, 7]] },
-    graph, ticks;
-
-  // Radar Labels
-  ticks = [
-    [0, "Statutory"],
-    [1, "External"],
-    [2, "Videos"],
-    [3, "Yippy"],
-    [4, "Management"],
-    [5, "oops"]
-  ];
-    
-  // Draw the graph.
-  graph = Flotr.draw(container, [ s1, s2 ], {
-    radar : { show : true}, 
-    grid  : { circular : true, minorHorizontalLines : true}, 
-    yaxis : { min : 0, max : 10, minorTickFreq : 2}, 
-    xaxis : { ticks : ticks}
-  });
-}
-
-})();
-
-(function () {
-
-Flotr.ExampleList.add({
-  key : 'basic-bubble',
-  name : 'Basic Bubble',
-  callback : basic_bubble
-});
-
-function basic_bubble (container) {
-
-  var
-    d1 = [],
-    d2 = [],
-    point, graph, i;
-      
-  for (i = 0; i < 10; i++ ){
-    point = [i, Math.ceil(Math.random()*10), Math.ceil(Math.random()*10)];
-    d1.push(point);
-    
-    point = [i, Math.ceil(Math.random()*10), Math.ceil(Math.random()*10)];
-    d2.push(point);
-  }
-  
-  // Draw the graph
-  graph = Flotr.draw(container, [d1, d2], {
-    bubbles : { show : true, baseRadius : 5 },
-    xaxis   : { min : -4, max : 14 },
-    yaxis   : { min : -4, max : 14 }
-  });
-}
-
-})();
-
-(function () {
-
-Flotr.ExampleList.add({
-  key : 'basic-candle',
-  name : 'Basic Candle',
-  callback : basic_candle
-});
-
-function basic_candle (container) {
-
-  var
-    d1 = [],
-    price = 3.206,
-    graph,
-    i, a, b, c;
-
-  for (i = 0; i < 50; i++) {
-      a = Math.random();
-      b = Math.random();
-      c = (Math.random() * (a + b)) - b;
-      d1.push([i, price, price + a, price - b, price + c]);
-      price = price + c;
-  }
-    
-  // Graph
-  graph = Flotr.draw(container, [ d1 ], { 
-    candles : { show : true, candleWidth : 0.6 },
-    xaxis   : { noTicks : 10 }
-  });
-}
-
-})();
-
-
-(function () {
-
-Flotr.ExampleList.add({
-  key : 'basic-legend',
-  name : 'Basic Legend',
-  callback : basic_legend
-});
-
-function basic_legend (container) {
-
-  var
-    d1 = [],
-    d2 = [],
-    d3 = [],
-    data,
-    graph, i;
-
-  // Data Generation
-  for (i = 0; i < 15; i += 0.5) {
-    d1.push([i, i + Math.sin(i+Math.PI)]);
-    d2.push([i, i]);
-    d3.push([i, 15-Math.cos(i)]);
-  }
-
-  data = [
-    { data : d1, label :'x + sin(x+&pi;)' },
-    { data : d2, label :'x' },
-    { data : d3, label :'15 - cos(x)' }
-  ];
-
-
-  // This function prepend each label with 'y = '
-  function labelFn (label) {
-    return 'y = ' + label;
-  }
-
-  // Draw graph
-  graph = Flotr.draw(container, data, {
-    legend : {
-      position : 'se',            // Position the legend 'south-east'.
-      labelFormatter : labelFn,   // Format the labels.
-      backgroundColor : '#D2E8FF' // A light blue background color.
-    },
-    HtmlText : false
-  });
-}
-
-})();
-
-(function () {
-
-Flotr.ExampleList.add({
-  key : 'mouse-tracking',
-  name : 'Mouse Tracking',
-  callback : mouse_tracking
-});
-
-function mouse_tracking (container) {
-
-  var
-    d1 = [],
-    d2 = [],
-    d3 = [],
-    graph, i;
-
-  for (i = 0; i < 20; i += 0.5) {
-    d1.push([i, 2*i]);
-    d2.push([i, i*1.5+1.5*Math.sin(i)]);
-    d3.push([i, 3*Math.cos(i)+10]);
-  }
-
-  graph = Flotr.draw(
-    container, 
-    [
-      {
-        data : d1,
-        mouse : { track : false } // Disable mouse tracking for d1
-      },
-      d2,
-      d3
-    ],
-    {
-      mouse : {
-        track           : true, // Enable mouse tracking
-        lineColor       : 'purple',
-        relative        : true,
-        position        : 'ne',
-        sensibility     : 1,
-        trackDecimals   : 2,
-        trackFormatter  : function (o) { return 'x = ' + o.x +', y = ' + o.y; }
-      },
-      crosshair : {
-        mode : 'xy'
-      }
-    }
-  );
-
-};      
-
-})();
-
-(function () {
-
-Flotr.ExampleList.add({
-  key : 'mouse-zoom',
-  name : 'Mouse Zoom',
-  callback : mouse_zoom,
-  description : "<p>Select an area of the graph to zoom.  Click to reset the chart.</p>"
-});
-
-function mouse_zoom (container) {
-
-  var
-    d1 = [],
-    d2 = [],
-    d3 = [],
-    options,
-    graph,
-    i;
-
-  for (i = 0; i < 40; i += 0.5) {
-    d1.push([i, Math.sin(i)+3*Math.cos(i)]);
-    d2.push([i, Math.pow(1.1, i)]);
-    d3.push([i, 40 - i+Math.random()*10]);
-  }
-      
-  options = {
-    selection : { mode : 'x', fps : 30 },
-    title : 'Mouse Zoom'
-  };
-    
-  // Draw graph with default options, overwriting with passed options
-  function drawGraph (opts) {
-
-    // Clone the options, so the 'options' variable always keeps intact.
-    var o = Flotr._.extend(Flotr._.clone(options), opts || {});
-
-    // Return a new graph.
-    return Flotr.draw(
-      container,
-      [ d1, d2, d3 ],
-      o
-    );
-  }
-
-  // Actually draw the graph.
-  graph = drawGraph();      
-    
-  // Hook into the 'flotr:select' event.
-  Flotr.EventAdapter.observe(container, 'flotr:select', function (area) {
-
-    // Draw graph with new area
-    f = drawGraph({
-      xaxis: {min:area.x1, max:area.x2},
-      yaxis: {min:area.y1, max:area.y2}
-    });
-
-  });
-    
-  // When graph is clicked, draw the graph with default area.
-  Flotr.EventAdapter.observe(container, 'flotr:click', function () { drawGraph(); });
-};
-
-})();
-
-
-(function () {
-
-Flotr.ExampleList.add({
-  key : 'mouse-drag',
-  name : 'Mouse Drag',
-  callback : mouse_drag
-});
-
-function mouse_drag (container) {
-
-  var
-    d1 = [],
-    d2 = [],
-    d3 = [],
-    options,
-    graph,
-    start,
-    i;
-
-  for (i = -40; i < 40; i += 0.5) {
-    d1.push([i, Math.sin(i)+3*Math.cos(i)]);
-    d2.push([i, Math.pow(1.1, i)]);
-    d3.push([i, 40 - i+Math.random()*10]);
-  }
-      
-  options = {
-    xaxis: {min: 0, max: 20},
-      title : 'Mouse Drag'
-  };
-
-  // Draw graph with default options, overwriting with passed options
-  function drawGraph (opts) {
-
-    // Clone the options, so the 'options' variable always keeps intact.
-    var o = Flotr._.extend(Flotr._.clone(options), opts || {});
-
-    // Return a new graph.
-    return Flotr.draw(
-      container,
-      [ d1, d2, d3 ],
-      o
-    );
-  }
-
-  graph = drawGraph();      
-
-  function initializeDrag (e) {
-    start = graph.getEventPosition(e);
-    Flotr.EventAdapter.observe(document, 'mousemove', move);
-    Flotr.EventAdapter.observe(document, 'mouseup', stopDrag);
-  }
-
-  function move (e) {
-    var
-      end     = graph.getEventPosition(e),
-      xaxis   = graph.axes.x,
-      offset  = start.x - end.x;
-
-    graph = drawGraph({
-      xaxis : {
-        min : xaxis.min + offset,
-        max : xaxis.max + offset
-      }
-    });
-    // @todo: refector initEvents in order not to remove other observed events
-    Flotr.EventAdapter.observe(graph.overlay, 'mousedown', initializeDrag);
-  }
-
-  function stopDrag () {
-    Flotr.EventAdapter.stopObserving(document, 'mousemove', move);
-  }
-
-  Flotr.EventAdapter.observe(graph.overlay, 'mousedown', initializeDrag);
-
-};
-
-})();
-
-(function () {
-
-Flotr.ExampleList.add({
-  key : 'basic-time',
-  name : 'Basic Time',
-  callback : basic_time,
-  description : "<p>Select an area of the graph to zoom.  Click to reset the chart.</p>"
-});
-
-function basic_time (container) {
-
-  var
-    d1    = [],
-    start = new Date("2009/01/01 01:00").getTime(),
-    options,
-    graph,
-    i, x, o;
-
-  for (i = 0; i < 100; i++) {
-    x = start+(i*1000*3600*24*36.5);
-    d1.push([x, i+Math.random()*30+Math.sin(i/20+Math.random()*2)*20+Math.sin(i/10+Math.random())*10]);
-  }
-        
-  options = {
-    xaxis : {
-      mode : 'time', 
-      labelsAngle : 45
-    },
-    selection : {
-      mode : 'x'
-    },
-    HtmlText : false,
-    title : 'Time'
-  };
-        
-  // Draw graph with default options, overwriting with passed options
-  function drawGraph (opts) {
-
-    // Clone the options, so the 'options' variable always keeps intact.
-    o = Flotr._.extend(Flotr._.clone(options), opts || {});
-
-    // Return a new graph.
-    return Flotr.draw(
-      container,
-      [ d1 ],
-      o
-    );
-  }
-
-  graph = drawGraph();      
-        
-  Flotr.EventAdapter.observe(container, 'flotr:select', function(area){
-    // Draw selected area
-    graph = drawGraph({
-      xaxis : { min : area.x1, max : area.x2, mode : 'time', labelsAngle : 45 },
-      yaxis : { min : area.y1, max : area.y2 }
-    });
-  });
-        
-  // When graph is clicked, draw the graph with default area.
-  Flotr.EventAdapter.observe(container, 'flotr:click', function () { graph = drawGraph(); });
-};      
-
-})();
-
-(function () {
-
-Flotr.ExampleList.add({
-  key : 'negative-values',
-  name : 'Negative Values',
-  callback : negative_values
-});
-
-function negative_values (container) {
-
-  var
-    d0    = [], // Line through y = 0
-    d1    = [], // Random data presented as a scatter plot. 
-    d2    = [], // A regression line for the scatter. 
-    sx    = 0,
-    sy    = 0,
-    sxy   = 0,
-    sxsq  = 0,
-    xmean,
-    ymean,
-    alpha,
-    beta,
-    n, x, y;
-
-  for (n = 0; n < 20; n++){
-
-    x = n;
-    y = x + Math.random()*8 - 15;
-
-    d0.push([x, 0]);
-    d1.push([x, y]);
-
-    // Computations used for regression line
-    sx += x;
-    sy += y;
-    sxy += x*y;
-    sxsq += Math.pow(x,2);
-  }
-
-  xmean = sx/n;
-  ymean = sy/n;
-  beta  = ((n*sxy) - (sx*sy))/((n*sxsq)-(Math.pow(sx,2)));
-  alpha = ymean - (beta * xmean);
-  
-  // Compute the regression line.
-  for (n = 0; n < 20; n++){
-    d2.push([n, alpha + beta*n])
-  }     
-
-  // Draw the graph
-  graph = Flotr.draw(
-    container, [ 
-      { data : d0, shadowSize : 0, color : '#545454' }, // Horizontal
-      { data : d1, label : 'y = x + (Math.random() * 8) - 15', points : { show : true } },  // Scatter
-      { data : d2, label : 'y = ' + alpha.toFixed(2) + ' + ' + beta.toFixed(2) + '*x' }  // Regression
-    ],
-    {
-      legend : { position : 'se', backgroundColor : '#D2E8FF' },
-      title : 'Negative Values'
-    }
-  );
-};
-
-})();
-
-(function () {
-
-Flotr.ExampleList.add({
-  key : 'click-example',
-  name : 'Click Example',
-  callback : click_example
-});
-
-function click_example (container) {
-
-  var
-    d1 = [[0,0]], // Point at origin
-    options,
-    graph;
-
-  options = {
-    xaxis: {min: 0, max: 15},
-    yaxis: {min: 0, max: 15},
-    lines: {show: true},
-    points: {show: true},
-    mouse: {track:true},
-    title: 'Click Example'
-  };
-
-  graph = Flotr.draw(container, [d1], options);
-
-  // Add a point to the series and redraw the graph
-  Flotr.EventAdapter.observe(container, 'flotr:click', function(position){
-
-    // Add a point to the series at the location of the click
-    d1.push([position.x, position.y]);
-    
-    // Sort the series.
-    d1 = d1.sort(function (a, b) { return a[0] - b[0]; });
-    
-    // Redraw the graph, with the new series.
-    graph = Flotr.draw(container, [d1], options);
-  });
-};      
-
-})();
-
-(function () {
-
-Flotr.ExampleList.add({
-  key : 'download-image',
-  name : 'Download Image',
-  callback : download_image,
-  description : '' + 
-    '<form name="image-download" id="image-download" action="" onsubmit="return false">' +
-      '<label><input type="radio" name="format" value="png" checked="checked" /> PNG</label>' +
-      '<label><input type="radio" name="format" value="jpeg" /> JPEG</label>' +
-
-      '<button name="to-image" onclick="CurrentExample(\'to-image\')">To Image</button>' +
-      '<button name="download" onclick="CurrentExample(\'download\')">Download</button>' +
-      '<button name="reset" onclick="CurrentExample(\'reset\')">Reset</button>' +
-    '</form>'
-});
-
-function download_image (container) {
-
-  var
-    d1 = [],
-    d2 = [],
-    d3 = [],
-    d4 = [],
-    d5 = [],
-    graph,
-    i;
-  
-  for (i = 0; i <= 10; i += 0.1) {
-    d1.push([i, 4 + Math.pow(i,1.5)]);
-    d2.push([i, Math.pow(i,3)]);
-    d3.push([i, i*5+3*Math.sin(i*4)]);
-    d4.push([i, i]);
-    if( i.toFixed(1)%1 == 0 ){
-      d5.push([i, 2*i]);
-    }
-  }
-
-  // Draw the graph
-  graph = Flotr.draw(
-    container,[ 
-      {data:d1, label:'y = 4 + x^(1.5)', lines:{fill:true}}, 
-      {data:d2, label:'y = x^3', yaxis:2}, 
-      {data:d3, label:'y = 5x + 3sin(4x)'}, 
-      {data:d4, label:'y = x'},
-      {data:d5, label:'y = 2x', lines: {show: true}, points: {show: true}}
-    ],{
-      title: 'Download Image Example',
-      subtitle: 'You can save me as an image',
-      xaxis:{
-        noTicks: 7, // Display 7 ticks.
-        tickFormatter: function(n){ return '('+n+')'; }, // => displays tick values between brackets.
-        min: 1,  // => part of the series is not displayed.
-        max: 7.5, // => part of the series is not displayed.
-        labelsAngle: 45,
-        title: 'x Axis'
-      },
-      yaxis:{
-        ticks: [[0, "Lower"], 10, 20, 30, [40, "Upper"]],
-        max: 40,
-        title: 'y = f(x)'
-      },
-      y2axis:{color:'#FF0000', max: 500, title: 'y = x^3'},
-      grid:{
-        verticalLines: false,
-        backgroundColor: 'white'
-      },
-      HtmlText: false,
-      legend: {
-        position: 'nw'
-      }
-  });
-
-  this.CurrentExample = function (operation) {
-
-    var
-      format = $('#image-download input:radio[name=format]:checked').val();
-    if (Flotr.isIE && Flotr.isIE < 9) {
-      alert(
-        "Your browser doesn't allow you to get a bitmap image from the plot, " +
-        "you can only get a VML image that you can use in Microsoft Office.<br />"
-      );
-    }
-
-    if (operation == 'to-image') {
-      graph.download.saveImage(format, null, null, true)
-    } else if (operation == 'download') {
-      graph.download.saveImage(format);
-    } else if (operation == 'reset') {
-      graph.download.restoreCanvas();
-    }
-  };
-
-  return graph;
-};
-
-})();
-
-(function () {
-
-Flotr.ExampleList.add({
-  key : 'download-data',
-  name : 'Download Data',
-  callback : download_data
-});
-
-function download_data (container) {
-
-  var
-    d1 = [],
-    d2 = [],
-    d3 = [],
-    d4 = [],
-    d5 = [],
-    graph,
-    i,x;
-  
-  for (i = 0; i <= 100; i += 1) {
-    x = i / 10;
-    d1.push([x, 4 + Math.pow(x,1.5)]);
-    d2.push([x, Math.pow(x,3)]);
-    d3.push([x, i*5+3*Math.sin(x*4)]);
-    d4.push([x, x]);
-    if(x%1 === 0 ){
-      d5.push([x, 2*x]);
-    }
-  }
-          
-  // Draw the graph.
-  graph = Flotr.draw(
-    container, [ 
-      { data : d1, label : 'y = 4 + x^(1.5)', lines : { fill : true } },
-      { data : d2, label : 'y = x^3' },
-      { data : d3, label : 'y = 5x + 3sin(4x)' },
-      { data : d4, label : 'y = x' },
-      { data : d5, label : 'y = 2x', lines : { show : true }, points : { show : true } }
-    ],{
-      xaxis : {
-        noTicks : 7,
-        tickFormatter : function (n) { return '('+n+')'; },
-        min: 1,   // Part of the series is not displayed.
-        max: 7.5
-      },
-      yaxis : {
-        ticks : [[ 0, "Lower"], 10, 20, 30, [40, "Upper"]],
-        max : 40
-      },
-      grid : {
-        verticalLines : false,
-        backgroundColor : 'white'
-      },
-      legend : {
-        position : 'nw'
-      },
-      spreadsheet : {
-        show : true,
-        tickFormatter : function (e) { return e+''; }
-      }
-  });
-};
-
-})();
-
-(function () {
-
-Flotr.ExampleList.add({
-  key : 'advanced-titles',
-  name : 'Advanced Titles',
-  callback : advanced_titles
-});
-
-function advanced_titles (container) {
-
-  var
-    d1 = [],
-    d2 = [],
-    d3 = [],
-    d4 = [],
-    d5 = [],
-    graph,
-    i;
-
-  for (i = 0; i <= 10; i += 0.1) {
-    d1.push([i, 4 + Math.pow(i,1.5)]);
-    d2.push([i, Math.pow(i,3)]);
-    d3.push([i, i*5+3*Math.sin(i*4)]);
-    d4.push([i, i]);
-    if (i.toFixed(1)%1 == 0) {
-      d5.push([i, 2*i]);
-    }
-  }
-
-  // Draw the graph.
-  graph = Flotr.draw(
-    container,[ 
-      { data : d1, label : 'y = 4 + x^(1.5)', lines : { fill : true } },
-      { data : d2, label : 'y = x^3', yaxis : 2 },
-      { data : d3, label : 'y = 5x + 3sin(4x)' },
-      { data : d4, label : 'y = x' },
-      { data : d5, label : 'y = 2x', lines : { show : true }, points : { show : true } }
-    ], {
-      title : 'Advanced Titles Example',
-      subtitle : 'You can save me as an image',
-      xaxis : {
-        noTicks : 7,
-        tickFormatter : function (n) { return '('+n+')'; },
-        min : 1,
-        max : 7.5,
-        labelsAngle : 45,
-        title : 'x Axis'
-      },
-      yaxis : {
-        ticks : [[0, "Lower"], 10, 20, 30, [40, "Upper"]],
-        max : 40,
-        title : 'y = f(x)'
-      },
-      y2axis : { color : '#FF0000', max : 500, title : 'y = x^3' },
-      grid : {
-        verticalLines : false,
-        backgroundColor : 'white'
-      },
-      HtmlText : false,
-      legend : {
-        position : 'nw'
-      }
-  });
-};
-
-})();
-
-(function () {
-
-Flotr.ExampleList.add({
-  key : 'color-gradients',
-  name : 'Color Gradients',
-  callback : color_gradients
-});
-
-function color_gradients (container) {
-
-  var
-    bars = {
-      data: [],
-      bars: {
-        show: true,
-        barWidth: 0.8,
-        lineWidth: 0,
-        fillColor: {
-          colors: ['#CB4B4B', '#fff'],
-          start: 'top',
-          end: 'bottom'
-        },
-        fillOpacity: 0.8
-      }
-    }, markers = {
-      data: [],
-      markers: {
-        show: true,
-        position: 'ct'
-      }
-    }, lines = {
-      data: [],
-      lines: {
-        show: true,
-        fillColor: ['#00A8F0', '#fff'],
-        fill: true,
-        fillOpacity: 1
-      }
-    },
-    point,
-    graph,
-    i;
-  
-  for (i = 0; i < 8; i++) {
-    point = [i, Math.ceil(Math.random() * 10)];
-    bars.data.push(point);
-    markers.data.push(point);
-  }
-  
-  for (i = -1; i < 9; i += 0.01){
-    lines.data.push([i, i*i/8+2]);
-  }
-  
-  graph = Flotr.draw(
-    container,
-    [lines, bars, markers], {
-      yaxis: {
-        min: 0,
-        max: 11
-      },
-      xaxis: {
-        min: -0.5,
-        max: 7.5
-      },
-      grid: {
-        verticalLines: false,
-        backgroundColor: ['#fff', '#ccc']
-      }
-    }
-  );
-};
-
-})();
-
-
-(function () {
-
-Flotr.ExampleList.add({
-  key : 'profile-bars',
-  name : 'Profile Bars',
-  type : 'profile',
-  callback : profile_bars
-});
-
-/*
-Flotr.ExampleList.add({
-  key : 'basic-bars-horizontal',
-  name : 'Horizontal Bars',
-  args : [true],
-  callback : basic_bars
-});
-*/
-
-function profile_bars (container, horizontal) {
-
-  var
-    horizontal = (horizontal ? true : false), // Show horizontal bars
-    d1 = [],                                  // First data series
-    d2 = [],                                  // Second data series
-    point,                                    // Data point variable declaration
-    i;
-
-  for (i = 0; i < 5000; i++) {
-
-    if (horizontal) { 
-      point = [Math.ceil(Math.random()*10), i];
-    } else {
-      point = [i, Math.ceil(Math.random()*10)];
-    }
-
-    d1.push(point);
-        
-    if (horizontal) { 
-      point = [Math.ceil(Math.random()*10), i+0.5];
-    } else {
-      point = [i+0.5, Math.ceil(Math.random()*10)];
-    }
-
-    d2.push(point);
-  };
-              
-  // Draw the graph
-  Flotr.draw(
-    container,
-    [d1, d2],
-    {
-      bars : {
-        show : true,
-        horizontal : horizontal,
-        barWidth : 0.5
-      },
-      mouse : {
-        track : true,
-        relative : true
-      },
-      yaxis : {
-        min : 0,
-        autoscaleMargin : 1
-      }
-    }
-  );
-}
-
-})();
-
-(function () {
-
-Flotr.ExampleList.add({
-  key : 'basic-timeline',
-  name : 'Basic Timeline',
-  callback : basic_timeline
-});
-
-function basic_timeline (container) {
-
-  var
-    d1        = [[1, 4, 5]],
-    d2        = [[3.2, 3, 4]],
-    d3        = [[1.9, 2, 2], [5, 2, 3.3]],
-    d4        = [[1.55, 1, 9]],
-    d5        = [[5, 0, 2.3]],
-    data      = [],
-    timeline  = { show : true, barWidth : .5 },
-    markers   = [],
-    labels    = ['Obama', 'Bush', 'Clinton', 'Palin', 'McCain'],
-    i, graph, point;
-
-  // Timeline
-  Flotr._.each([d1, d2, d3, d4, d5], function (d) {
-    data.push({
-      data : d,
-      timeline : Flotr._.clone(timeline)
-    });
-  });
-
-  // Markers
-  Flotr._.each([d1, d2, d3, d4, d5], function (d) {
-    point = d[0];
-    markers.push([point[0], point[1]]);
-  });
-  data.push({
-    data: markers,
-    markers: {
-      show: true,
-      position: 'rm',
-      fontSize: 11,
-      labelFormatter : function (o) { return labels[o.index]; }
-    }
-  });
-  
-  // Draw Graph
-  graph = Flotr.draw(container, data, {
-    xaxis: {
-      noTicks: 3,
-      tickFormatter: function (x) {
-        var
-          x = parseInt(x),
-          months = ['Jan', 'Feb', 'Mar', 'Apr', 'May', 'Jun', 'Jul', 'Aug', 'Sep', 'Oct', 'Nov', 'Dec'];
-        return months[(x-1)%12];
-      }
-    }, 
-    yaxis: {
-      showLabels : false
-    },
-    grid: {
-      horizontalLines : false
-    }
-  });
-}
-
-})();
-
-(function () {
-
-Flotr.ExampleList.add({
-  key : 'advanced-markers',
-  name : 'Advanced Markers',
-  callback : advanced_markers,
-  timeout : 150
-});
-
-function advanced_markers (container) {
-
-  var
-    xmark = new Image(),
-    checkmark = new Image(),
-    bars = {
-      data: [],
-      bars: {
-        show: true,
-        barWidth: 0.6,
-        lineWidth: 0,
-        fillOpacity: 0.8
-      }
-    }, markers = {
-      data: [],
-      markers: {
-        show: true,
-        position: 'ct',
-        labelFormatter: function (o) {
-          return (o.y >= 5) ? checkmark : xmark;
-        }
-      }
-    },
-    flotr = Flotr,
-    point,
-    graph,
-    i;
-
-
-  for (i = 0; i < 8; i++) {
-    point = [i, Math.ceil(Math.random() * 10)];
-    bars.data.push(point);
-    markers.data.push(point);
-  }
-
-  var runner = function () {
-    if (!xmark.complete || !checkmark.complete) {
-        setTimeout(runner, 50);
-        return;
-    }
-
-    graph = flotr.draw(
-      container,
-      [bars, markers], {
-        yaxis: {
-          min: 0,
-          max: 11
-        },
-        xaxis: {
-          min: -0.5,
-          max: 7.5
-        },
-        grid: {
-          verticalLines: false
-        }
-      }
-    );
-  }
-
-  xmark.onload = runner;
-  xmark.src = 'images/xmark.png';
-  checkmark.src = 'images/checkmark.png';
-};
-
-})();
-

=== removed file 'addons/web_graph/static/lib/flotr2/flotr2.ie.min.js'
--- addons/web_graph/static/lib/flotr2/flotr2.ie.min.js	2012-05-07 08:19:08 +0000
+++ addons/web_graph/static/lib/flotr2/flotr2.ie.min.js	1970-01-01 00:00:00 +0000
@@ -1,33 +0,0 @@
-// Copyright 2006 Google Inc.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-// Known Issues:
-//
-// * Patterns only support repeat.
-// * Radial gradient are not implemented. The VML version of these look very
-//   different from the canvas one.
-// * Clipping paths are not implemented.
-// * Coordsize. The width and height attribute have higher priority than the
-//   width and height style values which isn't correct.
-// * Painting mode isn't implemented.
-// * Canvas width/height should is using content-box by default. IE in
-//   Quirks mode will draw the canvas using border-box. Either change your
-//   doctype to HTML5
-//   (http://www.whatwg.org/specs/web-apps/current-work/#the-doctype)
-//   or use Box Sizing Behavior from WebFX
-//   (http://webfx.eae.net/dhtml/boxsizing/boxsizing.html)
-// * Non uniform scaling does not correctly scale strokes.
-// * Optimize. There is always room for speed improvements.
-// Only add this code if we do not already have a canvas implementation
-
-document.createElement("canvas").getContext||function(){function j(){return this.context_||(this.context_=new N(this))}function l(a,b,c){var d=k.call(arguments,2);return function(){return a.apply(b,d.concat(k.call(arguments)))}}function m(a){return String(a).replace(/&/g,"&amp;").replace(/"/g,"&quot;")}function n(a,b,c){a.namespaces[b]||a.namespaces.add(b,c,"#default#VML")}function o(a){n(a,"g_vml_","urn:schemas-microsoft-com:vml"),n(a,"g_o_","urn:schemas-microsoft-com:office:office");if(!a.styleSheets.ex_canvas_){var b=a.createStyleSheet();b.owningElement.id="ex_canvas_",b.cssText="canvas{display:inline-block;overflow:hidden;text-align:left;width:300px;height:150px}"}}function q(a){var b=a.srcElement;switch(a.propertyName){case"width":b.getContext().clearRect(),b.style.width=b.attributes.width.nodeValue+"px",b.firstChild&&(b.firstChild.style.width=b.clientWidth+"px");break;case"height":b.getContext().clearRect(),b.style.height=b.attributes.height.nodeValue+"px",b.firstChild&&(b.firstChild.style.height=b.clientHeight+"px")}}function r(a){var b=a.srcElement;b.firstChild&&(b.firstChild.style.width=b.clientWidth+"px",b.firstChild.style.height=b.clientHeight+"px")}function v(){return[[1,0,0],[0,1,0],[0,0,1]]}function w(a,b){var c=v();for(var d=0;d<3;d++)for(var e=0;e<3;e++){var f=0;for(var g=0;g<3;g++)f+=a[d][g]*b[g][e];c[d][e]=f}return c}function x(a,b){b.fillStyle=a.fillStyle,b.lineCap=a.lineCap,b.lineJoin=a.lineJoin,b.lineWidth=a.lineWidth,b.miterLimit=a.miterLimit,b.shadowBlur=a.shadowBlur,b.shadowColor=a.shadowColor,b.shadowOffsetX=a.shadowOffsetX,b.shadowOffsetY=a.shadowOffsetY,b.strokeStyle=a.strokeStyle,b.globalAlpha=a.globalAlpha,b.font=a.font,b.textAlign=a.textAlign,b.textBaseline=a.textBaseline,b.arcScaleX_=a.arcScaleX_,b.arcScaleY_=a.arcScaleY_,b.lineScale_=a.lineScale_}function z(a){var b=a.indexOf("(",3),c=a.indexOf(")",b+1),d=a.substring(b+1,c).split(",");if(d.length!=4||a.charAt(3)!="a")d[3]=1;return d}function A(a){return parseFloat(a)/100}function B(a,b,c){return Math.min(c,Math.max(b,a))}function C(a){var b,c,d,e,f,g;e=parseFloat(a[0])/360%360,e<0&&e++,f=B(A(a[1]),0,1),g=B(A(a[2]),0,1);if(f==0)b=c=d=g;else{var h=g<.5?g*(1+f):g+f-g*f,i=2*g-h;b=D(i,h,e+1/3),c=D(i,h,e),d=D(i,h,e-1/3)}return"#"+s[Math.floor(b*255)]+s[Math.floor(c*255)]+s[Math.floor(d*255)]}function D(a,b,c){return c<0&&c++,c>1&&c--,6*c<1?a+(b-a)*6*c:2*c<1?b:3*c<2?a+(b-a)*(2/3-c)*6:a}function F(a){if(a in E)return E[a];var b,c=1;a=String(a);if(a.charAt(0)=="#")b=a;else if(/^rgb/.test(a)){var d=z(a),b="#",e;for(var f=0;f<3;f++)d[f].indexOf("%")!=-1?e=Math.floor(A(d[f])*255):e=+d[f],b+=s[B(e,0,255)];c=+d[3]}else if(/^hsl/.test(a)){var d=z(a);b=C(d),c=d[3]}else b=y[a]||a;return E[a]={color:b,alpha:c}}function I(a){if(H[a])return H[a];var b=document.createElement("div"),c=b.style;try{c.font=a}catch(d){}return H[a]={style:c.fontStyle||G.style,variant:c.fontVariant||G.variant,weight:c.fontWeight||G.weight,size:c.fontSize||G.size,family:c.fontFamily||G.family}}function J(a,b){var c={};for(var d in a)c[d]=a[d];var e=parseFloat(b.currentStyle.fontSize),f=parseFloat(a.size);return typeof a.size=="number"?c.size=a.size:a.size.indexOf("px")!=-1?c.size=f:a.size.indexOf("em")!=-1?c.size=e*f:a.size.indexOf("%")!=-1?c.size=e/100*f:a.size.indexOf("pt")!=-1?c.size=f/.75:c.size=e,c}function K(a){return a.style+" "+a.variant+" "+a.weight+" "+a.size+"px "+a.family}function M(a){return L[a]||"square"}function N(a){this.m_=v(),this.mStack_=[],this.aStack_=[],this.currentPath_=[],this.strokeStyle="#000",this.fillStyle="#000",this.lineWidth=1,this.lineJoin="miter",this.lineCap="butt",this.miterLimit=g*1,this.globalAlpha=1,this.font="10px sans-serif",this.textAlign="left",this.textBaseline="alphabetic",this.canvas=a;var b="width:"+a.clientWidth+"px;height:"+a.clientHeight+"px;overflow:hidden;position:absolute",c=a.ownerDocument.createElement("div");c.style.cssText=b,a.appendChild(c);var d=c.cloneNode(!1);d.style.backgroundColor="red",d.style.filter="alpha(opacity=0)",a.appendChild(d),this.element_=c,this.arcScaleX_=1,this.arcScaleY_=1,this.lineScale_=1}function P(a,b,c,d){a.currentPath_.push({type:"bezierCurveTo",cp1x:b.x,cp1y:b.y,cp2x:c.x,cp2y:c.y,x:d.x,y:d.y}),a.currentX_=d.x,a.currentY_=d.y}function Q(a,b){var c=F(a.strokeStyle),d=c.color,e=c.alpha*a.globalAlpha,f=a.lineScale_*a.lineWidth;f<1&&(e*=f),b.push("<g_vml_:stroke",' opacity="',e,'"',' joinstyle="',a.lineJoin,'"',' miterlimit="',a.miterLimit,'"',' endcap="',M(a.lineCap),'"',' weight="',f,'px"',' color="',d,'" />')}function R(b,c,d,e){var f=b.fillStyle,h=b.arcScaleX_,i=b.arcScaleY_,j=e.x-d.x,k=e.y-d.y;if(f instanceof V){var l=0,m={x:0,y:0},n=0,o=1;if(f.type_=="gradient"){var p=f.x0_/h,q=f.y0_/i,r=f.x1_/h,s=f.y1_/i,t=S(b,p,q),u=S(b,r,s),v=u.x-t.x,w=u.y-t.y;l=Math.atan2(v,w)*180/Math.PI,l<0&&(l+=360),l<1e-6&&(l=0)}else{var t=S(b,f.x0_,f.y0_);m={x:(t.x-d.x)/j,y:(t.y-d.y)/k},j/=h*g,k/=i*g;var x=a.max(j,k);n=2*f.r0_/x,o=2*f.r1_/x-n}var y=f.colors_;y.sort(function(a,b){return a.offset-b.offset});var z=y.length,A=y[0].color,B=y[z-1].color,C=y[0].alpha*b.globalAlpha,D=y[z-1].alpha*b.globalAlpha,E=[];for(var G=0;G<z;G++){var H=y[G];E.push(H.offset*o+n+" "+H.color)}c.push('<g_vml_:fill type="',f.type_,'"',' method="none" focus="100%"',' color="',A,'"',' color2="',B,'"',' colors="',E.join(","),'"',' opacity="',D,'"',' g_o_:opacity2="',C,'"',' angle="',l,'"',' focusposition="',m.x,",",m.y,'" />')}else if(f instanceof W){if(j&&k){var I=-d.x,J=-d.y;c.push("<g_vml_:fill",' position="',I/j*h*h,",",J/k*i*i,'"',' type="tile"',' src="',f.src_,'" />')}}else{var K=F(b.fillStyle),L=K.color,M=K.alpha*b.globalAlpha;c.push('<g_vml_:fill color="',L,'" opacity="',M,'" />')}}function S(a,b,c){var d=a.m_;return{x:g*(b*d[0][0]+c*d[1][0]+d[2][0])-h,y:g*(b*d[0][1]+c*d[1][1]+d[2][1])-h}}function T(a){return isFinite(a[0][0])&&isFinite(a[0][1])&&isFinite(a[1][0])&&isFinite(a[1][1])&&isFinite(a[2][0])&&isFinite(a[2][1])}function U(a,b,c){if(!T(b))return;a.m_=b;if(c){var d=b[0][0]*b[1][1]-b[0][1]*b[1][0];a.lineScale_=f(e(d))}}function V(a){this.type_=a,this.x0_=0,this.y0_=0,this.r0_=0,this.x1_=0,this.y1_=0,this.r1_=0,this.colors_=[]}function W(a,b){Y(a);switch(b){case"repeat":case null:case"":this.repetition_="repeat";break;case"repeat-x":case"repeat-y":case"no-repeat":this.repetition_=b;break;default:X("SYNTAX_ERR")}this.src_=a.src,this.width_=a.width,this.height_=a.height}function X(a){throw new Z(a)}function Y(a){(!a||a.nodeType!=1||a.tagName!="IMG")&&X("TYPE_MISMATCH_ERR"),a.readyState!="complete"&&X("INVALID_STATE_ERR")}function Z(a){this.code=this[a],this.message=a+": DOM Exception "+this.code}var a=Math,b=a.round,c=a.sin,d=a.cos,e=a.abs,f=a.sqrt,g=10,h=g/2,i=+navigator.userAgent.match(/MSIE ([\d.]+)?/)[1],k=Array.prototype.slice;o(document);var p={init:function(a){var b=a||document;b.createElement("canvas"),b.attachEvent("onreadystatechange",l(this.init_,this,b))},init_:function(a){var b=a.getElementsByTagName("canvas");for(var c=0;c<b.length;c++)this.initElement(b[c])},initElement:function(a){if(!a.getContext){a.getContext=j,o(a.ownerDocument),a.innerHTML="",a.attachEvent("onpropertychange",q),a.attachEvent("onresize",r);var b=a.attributes;b.width&&b.width.specified?a.style.width=b.width.nodeValue+"px":a.width=a.clientWidth,b.height&&b.height.specified?a.style.height=b.height.nodeValue+"px":a.height=a.clientHeight}return a}};p.init();var s=[];for(var t=0;t<16;t++)for(var u=0;u<16;u++)s[t*16+u]=t.toString(16)+u.toString(16);var y={aliceblue:"#F0F8FF",antiquewhite:"#FAEBD7",aquamarine:"#7FFFD4",azure:"#F0FFFF",beige:"#F5F5DC",bisque:"#FFE4C4",black:"#000000",blanchedalmond:"#FFEBCD",blueviolet:"#8A2BE2",brown:"#A52A2A",burlywood:"#DEB887",cadetblue:"#5F9EA0",chartreuse:"#7FFF00",chocolate:"#D2691E",coral:"#FF7F50",cornflowerblue:"#6495ED",cornsilk:"#FFF8DC",crimson:"#DC143C",cyan:"#00FFFF",darkblue:"#00008B",darkcyan:"#008B8B",darkgoldenrod:"#B8860B",darkgray:"#A9A9A9",darkgreen:"#006400",darkgrey:"#A9A9A9",darkkhaki:"#BDB76B",darkmagenta:"#8B008B",darkolivegreen:"#556B2F",darkorange:"#FF8C00",darkorchid:"#9932CC",darkred:"#8B0000",darksalmon:"#E9967A",darkseagreen:"#8FBC8F",darkslateblue:"#483D8B",darkslategray:"#2F4F4F",darkslategrey:"#2F4F4F",darkturquoise:"#00CED1",darkviolet:"#9400D3",deeppink:"#FF1493",deepskyblue:"#00BFFF",dimgray:"#696969",dimgrey:"#696969",dodgerblue:"#1E90FF",firebrick:"#B22222",floralwhite:"#FFFAF0",forestgreen:"#228B22",gainsboro:"#DCDCDC",ghostwhite:"#F8F8FF",gold:"#FFD700",goldenrod:"#DAA520",grey:"#808080",greenyellow:"#ADFF2F",honeydew:"#F0FFF0",hotpink:"#FF69B4",indianred:"#CD5C5C",indigo:"#4B0082",ivory:"#FFFFF0",khaki:"#F0E68C",lavender:"#E6E6FA",lavenderblush:"#FFF0F5",lawngreen:"#7CFC00",lemonchiffon:"#FFFACD",lightblue:"#ADD8E6",lightcoral:"#F08080",lightcyan:"#E0FFFF",lightgoldenrodyellow:"#FAFAD2",lightgreen:"#90EE90",lightgrey:"#D3D3D3",lightpink:"#FFB6C1",lightsalmon:"#FFA07A",lightseagreen:"#20B2AA",lightskyblue:"#87CEFA",lightslategray:"#778899",lightslategrey:"#778899",lightsteelblue:"#B0C4DE",lightyellow:"#FFFFE0",limegreen:"#32CD32",linen:"#FAF0E6",magenta:"#FF00FF",mediumaquamarine:"#66CDAA",mediumblue:"#0000CD",mediumorchid:"#BA55D3",mediumpurple:"#9370DB",mediumseagreen:"#3CB371",mediumslateblue:"#7B68EE",mediumspringgreen:"#00FA9A",mediumturquoise:"#48D1CC",mediumvioletred:"#C71585",midnightblue:"#191970",mintcream:"#F5FFFA",mistyrose:"#FFE4E1",moccasin:"#FFE4B5",navajowhite:"#FFDEAD",oldlace:"#FDF5E6",olivedrab:"#6B8E23",orange:"#FFA500",orangered:"#FF4500",orchid:"#DA70D6",palegoldenrod:"#EEE8AA",palegreen:"#98FB98",paleturquoise:"#AFEEEE",palevioletred:"#DB7093",papayawhip:"#FFEFD5",peachpuff:"#FFDAB9",peru:"#CD853F",pink:"#FFC0CB",plum:"#DDA0DD",powderblue:"#B0E0E6",rosybrown:"#BC8F8F",royalblue:"#4169E1",saddlebrown:"#8B4513",salmon:"#FA8072",sandybrown:"#F4A460",seagreen:"#2E8B57",seashell:"#FFF5EE",sienna:"#A0522D",skyblue:"#87CEEB",slateblue:"#6A5ACD",slategray:"#708090",slategrey:"#708090",snow:"#FFFAFA",springgreen:"#00FF7F",steelblue:"#4682B4",tan:"#D2B48C",thistle:"#D8BFD8",tomato:"#FF6347",turquoise:"#40E0D0",violet:"#EE82EE",wheat:"#F5DEB3",whitesmoke:"#F5F5F5",yellowgreen:"#9ACD32"},E={},G={style:"normal",variant:"normal",weight:"normal",size:10,family:"sans-serif"},H={},L={butt:"flat",round:"round"},O=N.prototype;O.clearRect=function(){this.textMeasureEl_&&(this.textMeasureEl_.removeNode(!0),this.textMeasureEl_=null),this.element_.innerHTML=""},O.beginPath=function(){this.currentPath_=[]},O.moveTo=function(a,b){var c=S(this,a,b);this.currentPath_.push({type:"moveTo",x:c.x,y:c.y}),this.currentX_=c.x,this.currentY_=c.y},O.lineTo=function(a,b){var c=S(this,a,b);this.currentPath_.push({type:"lineTo",x:c.x,y:c.y}),this.currentX_=c.x,this.currentY_=c.y},O.bezierCurveTo=function(a,b,c,d,e,f){var g=S(this,e,f),h=S(this,a,b),i=S(this,c,d);P(this,h,i,g)},O.quadraticCurveTo=function(a,b,c,d){var e=S(this,a,b),f=S(this,c,d),g={x:this.currentX_+2/3*(e.x-this.currentX_),y:this.currentY_+2/3*(e.y-this.currentY_)},h={x:g.x+(f.x-this.currentX_)/3,y:g.y+(f.y-this.currentY_)/3};P(this,g,h,f)},O.arc=function(a,b,f,i,j,k){f*=g;var l=k?"at":"wa",m=a+d(i)*f-h,n=b+c(i)*f-h,o=a+d(j)*f-h,p=b+c(j)*f-h;e(m-o)<1e-7&&!k&&(m+=.125),e(n-p)<1e-7&&k&&(n-=.125);var q=S(this,a,b),r=S(this,m,n),s=S(this,o,p);this.currentPath_.push({type:l,x:q.x,y:q.y,radius:f,xStart:r.x,yStart:r.y,xEnd:s.x,yEnd:s.y})},O.rect=function(a,b,c,d){this.moveTo(a,b),this.lineTo(a+c,b),this.lineTo(a+c,b+d),this.lineTo(a,b+d),this.closePath()},O.strokeRect=function(a,b,c,d){var e=this.currentPath_;this.beginPath(),this.moveTo(a,b),this.lineTo(a+c,b),this.lineTo(a+c,b+d),this.lineTo(a,b+d),this.closePath(),this.stroke(),this.currentPath_=e},O.fillRect=function(a,b,c,d){var e=this.currentPath_;this.beginPath(),this.moveTo(a,b),this.lineTo(a+c,b),this.lineTo(a+c,b+d),this.lineTo(a,b+d),this.closePath(),this.fill(),this.currentPath_=e},O.createLinearGradient=function(a,b,c,d){var e=new V("gradient");return e.x0_=a,e.y0_=b,e.x1_=c,e.y1_=d,e},O.createRadialGradient=function(a,b,c,d,e,f){var g=new V("gradientradial");return g.x0_=a,g.y0_=b,g.r0_=c,g.x1_=d,g.y1_=e,g.r1_=f,g},O.drawImage=function(c,d){var e,f,h,i,j,k,l,m,n=c.runtimeStyle.width,o=c.runtimeStyle.height;c.runtimeStyle.width="auto",c.runtimeStyle.height="auto";var p=c.width,q=c.height;c.runtimeStyle.width=n,c.runtimeStyle.height=o;if(arguments.length==3)e=arguments[1],f=arguments[2],j=k=0,l=h=p,m=i=q;else if(arguments.length==5)e=arguments[1],f=arguments[2],h=arguments[3],i=arguments[4],j=k=0,l=p,m=q;else if(arguments.length==9)j=arguments[1],k=arguments[2],l=arguments[3],m=arguments[4],e=arguments[5],f=arguments[6],h=arguments[7],i=arguments[8];else throw Error("Invalid number of arguments");var r=S(this,e,f),s=l/2,t=m/2,u=[],v=10,w=10;u.push(" <g_vml_:group",' coordsize="',g*v,",",g*w,'"',' coordorigin="0,0"',' style="width:',v,"px;height:",w,"px;position:absolute;");if(this.m_[0][0]!=1||this.m_[0][1]||this.m_[1][1]!=1||this.m_[1][0]){var x=[];x.push("M11=",this.m_[0][0],",","M12=",this.m_[1][0],",","M21=",this.m_[0][1],",","M22=",this.m_[1][1],",","Dx=",b(r.x/g),",","Dy=",b(r.y/g),"");var y=r,z=S(this,e+h,f),A=S(this,e,f+i),B=S(this,e+h,f+i);y.x=a.max(y.x,z.x,A.x,B.x),y.y=a.max(y.y,z.y,A.y,B.y),u.push("padding:0 ",b(y.x/g),"px ",b(y.y/g),"px 0;filter:progid:DXImageTransform.Microsoft.Matrix(",x.join(""),", sizingmethod='clip');")}else u.push("top:",b(r.y/g),"px;left:",b(r.x/g),"px;");u.push(' ">','<g_vml_:image src="',c.src,'"',' style="width:',g*h,"px;"," height:",g*i,'px"',' cropleft="',j/p,'"',' croptop="',k/q,'"',' cropright="',(p-j-l)/p,'"',' cropbottom="',(q-k-m)/q,'"'," />","</g_vml_:group>"),this.element_.insertAdjacentHTML("BeforeEnd",u.join(""))},O.stroke=function(a){var c=[],d=!1,e=10,f=10;c.push("<g_vml_:shape",' filled="',!!a,'"',' style="position:absolute;width:',e,"px;height:",f,'px;"',' coordorigin="0,0"',' coordsize="',g*e,",",g*f,'"',' stroked="',!a,'"',' path="');var h=!1,i={x:null,y:null},j={x:null,y:null};for(var k=0;k<this.currentPath_.length;k++){var l=this.currentPath_[k],m;switch(l.type){case"moveTo":m=l,c.push(" m ",b(l.x),",",b(l.y));break;case"lineTo":c.push(" l ",b(l.x),",",b(l.y));break;case"close":c.push(" x "),l=null;break;case"bezierCurveTo":c.push(" c ",b(l.cp1x),",",b(l.cp1y),",",b(l.cp2x),",",b(l.cp2y),",",b(l.x),",",b(l.y));break;case"at":case"wa":c.push(" ",l.type," ",b(l.x-this.arcScaleX_*l.radius),",",b(l.y-this.arcScaleY_*l.radius)," ",b(l.x+this.arcScaleX_*l.radius),",",b(l.y+this.arcScaleY_*l.radius)," ",b(l.xStart),",",b(l.yStart)," ",b(l.xEnd),",",b(l.yEnd))}if(l){if(i.x==null||l.x<i.x)i.x=l.x;if(j.x==null||l.x>j.x)j.x=l.x;if(i.y==null||l.y<i.y)i.y=l.y;if(j.y==null||l.y>j.y)j.y=l.y}}c.push(' ">'),a?R(this,c,i,j):Q(this,c),c.push("</g_vml_:shape>"),this.element_.insertAdjacentHTML("beforeEnd",c.join(""))},O.fill=function(){this.stroke(!0)},O.closePath=function(){this.currentPath_.push({type:"close"})},O.save=function(){var a={};x(this,a),this.aStack_.push(a),this.mStack_.push(this.m_),this.m_=w(v(),this.m_)},O.restore=function(){this.aStack_.length&&(x(this.aStack_.pop(),this),this.m_=this.mStack_.pop())},O.translate=function(a,b){var c=[[1,0,0],[0,1,0],[a,b,1]];U(this,w(c,this.m_),!1)},O.rotate=function(a){var b=d(a),e=c(a),f=[[b,e,0],[-e,b,0],[0,0,1]];U(this,w(f,this.m_),!1)},O.scale=function(a,b){this.arcScaleX_*=a,this.arcScaleY_*=b;var c=[[a,0,0],[0,b,0],[0,0,1]];U(this,w(c,this.m_),!0)},O.transform=function(a,b,c,d,e,f){var g=[[a,b,0],[c,d,0],[e,f,1]];U(this,w(g,this.m_),!0)},O.setTransform=function(a,b,c,d,e,f){var g=[[a,b,0],[c,d,0],[e,f,1]];U(this,g,!0)},O.drawText_=function(a,c,d,e,f){var h=this.m_,i=1e3,j=0,k=i,l={x:0,y:0},n=[],o=J(I(this.font),this.element_),p=K(o),q=this.element_.currentStyle,r=this.textAlign.toLowerCase();switch(r){case"left":case"center":case"right":break;case"end":r=q.direction=="ltr"?"right":"left";break;case"start":r=q.direction=="rtl"?"right":"left";break;default:r="left"}switch(this.textBaseline){case"hanging":case"top":l.y=o.size/1.75;break;case"middle":break;default:case null:case"alphabetic":case"ideographic":case"bottom":l.y=-o.size/2.25}switch(r){case"right":j=i,k=.05;break;case"center":j=k=i/2}var s=S(this,c+l.x,d+l.y);n.push('<g_vml_:line from="',-j,' 0" to="',k,' 0.05" ',' coordsize="100 100" coordorigin="0 0"',' filled="',!f,'" stroked="',!!f,'" style="position:absolute;width:1px;height:1px;">'),f?Q(this,n):R(this,n,{x:-j,y:0},{x:k,y:o.size});var t=h[0][0].toFixed(3)+","+h[1][0].toFixed(3)+","+h[0][1].toFixed(3)+","+h[1][1].toFixed(3)+",0,0",u=b(s.x/g)+","+b(s.y/g);n.push('<g_vml_:skew on="t" matrix="',t,'" ',' offset="',u,'" origin="',j,' 0" />','<g_vml_:path textpathok="true" />','<g_vml_:textpath on="true" string="',m(a),'" style="v-text-align:',r,";font:",m(p),'" /></g_vml_:line>'),this.element_.insertAdjacentHTML("beforeEnd",n.join(""))},O.fillText=function(a,b,c,d){this.drawText_(a,b,c,d,!1)},O.strokeText=function(a,b,c,d){this.drawText_(a,b,c,d,!0)},O.measureText=function(a){if(!this.textMeasureEl_){var b='<span style="position:absolute;top:-20000px;left:0;padding:0;margin:0;border:none;white-space:pre;"></span>';this.element_.insertAdjacentHTML("beforeEnd",b),this.textMeasureEl_=this.element_.lastChild}var c=this.element_.ownerDocument;return this.textMeasureEl_.innerHTML="",this.textMeasureEl_.style.font=this.font,this.textMeasureEl_.appendChild(c.createTextNode(a)),{width:this.textMeasureEl_.offsetWidth}},O.clip=function(){},O.arcTo=function(){},O.createPattern=function(a,b){return new W(a,b)},V.prototype.addColorStop=function(a,b){b=F(b),this.colors_.push({offset:a,color:b.color,alpha:b.alpha})};var $=Z.prototype=new Error;$.INDEX_SIZE_ERR=1,$.DOMSTRING_SIZE_ERR=2,$.HIERARCHY_REQUEST_ERR=3,$.WRONG_DOCUMENT_ERR=4,$.INVALID_CHARACTER_ERR=5,$.NO_DATA_ALLOWED_ERR=6,$.NO_MODIFICATION_ALLOWED_ERR=7,$.NOT_FOUND_ERR=8,$.NOT_SUPPORTED_ERR=9,$.INUSE_ATTRIBUTE_ERR=10,$.INVALID_STATE_ERR=11,$.SYNTAX_ERR=12,$.INVALID_MODIFICATION_ERR=13,$.NAMESPACE_ERR=14,$.INVALID_ACCESS_ERR=15,$.VALIDATION_ERR=16,$.TYPE_MISMATCH_ERR=17,G_vmlCanvasManager=p,CanvasRenderingContext2D=N,CanvasGradient=V,CanvasPattern=W,DOMException=Z}(),function(){function c(b){var c,d,e,f,g,h;e=b.length,d=0,c="";while(d<e){f=b.charCodeAt(d++)&255;if(d==e){c+=a.charAt(f>>2),c+=a.charAt((f&3)<<4),c+="==";break}g=b.charCodeAt(d++);if(d==e){c+=a.charAt(f>>2),c+=a.charAt((f&3)<<4|(g&240)>>4),c+=a.charAt((g&15)<<2),c+="=";break}h=b.charCodeAt(d++),c+=a.charAt(f>>2),c+=a.charAt((f&3)<<4|(g&240)>>4),c+=a.charAt((g&15)<<2|(h&192)>>6),c+=a.charAt(h&63)}return c}function d(a){var c,d,e,f,g,h,i;h=a.length,g=0,i="";while(g<h){do c=b[a.charCodeAt(g++)&255];while(g<h&&c==-1);if(c==-1)break;do d=b[a.charCodeAt(g++)&255];while(g<h&&d==-1);if(d==-1)break;i+=String.fromCharCode(c<<2|(d&48)>>4);do{e=a.charCodeAt(g++)&255;if(e==61)return i;e=b[e]}while(g<h&&e==-1);if(e==-1)break;i+=String.fromCharCode((d&15)<<4|(e&60)>>2);do{f=a.charCodeAt(g++)&255;if(f==61)return i;f=b[f]}while(g<h&&f==-1);if(f==-1)break;i+=String.fromCharCode((e&3)<<6|f)}return i}var a="ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/",b=[-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,62,-1,-1,-1,63,52,53,54,55,56,57,58,59,60,61,-1,-1,-1,-1,-1,-1,-1,0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,-1,-1,-1,-1,-1,-1,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,-1,-1,-1,-1,-1];window.btoa||(window.btoa=c),window.atob||(window.atob=d)}();var CanvasText={letters:{"\n":{width:-1,points:[]}," ":{width:10,points:[]},"!":{width:10,points:[[5,21],[5,7],null,[5,2],[4,1],[5,0],[6,1],[5,2]]},'"':{width:16,points:[[4,21],[4,14],null,[12,21],[12,14]]},"#":{width:21,points:[[11,25],[4,-7],null,[17,25],[10,-7],null,[4,12],[18,12],null,[3,6],[17,6]]},$:{width:20,points:[[8,25],[8,-4],null,[12,25],[12,-4],null,[17,18],[15,20],[12,21],[8,21],[5,20],[3,18],[3,16],[4,14],[5,13],[7,12],[13,10],[15,9],[16,8],[17,6],[17,3],[15,1],[12,0],[8,0],[5,1],[3,3]]},"%":{width:24,points:[[21,21],[3,0],null,[8,21],[10,19],[10,17],[9,15],[7,14],[5,14],[3,16],[3,18],[4,20],[6,21],[8,21],null,[17,7],[15,6],[14,4],[14,2],[16,0],[18,0],[20,1],[21,3],[21,5],[19,7],[17,7]]},"&":{width:26,points:[[23,12],[23,13],[22,14],[21,14],[20,13],[19,11],[17,6],[15,3],[13,1],[11,0],[7,0],[5,1],[4,2],[3,4],[3,6],[4,8],[5,9],[12,13],[13,14],[14,16],[14,18],[13,20],[11,21],[9,20],[8,18],[8,16],[9,13],[11,10],[16,3],[18,1],[20,0],[22,0],[23,1],[23,2]]},"'":{width:10,points:[[5,19],[4,20],[5,21],[6,20],[6,18],[5,16],[4,15]]},"(":{width:14,points:[[11,25],[9,23],[7,20],[5,16],[4,11],[4,7],[5,2],[7,-2],[9,-5],[11,-7]]},")":{width:14,points:[[3,25],[5,23],[7,20],[9,16],[10,11],[10,7],[9,2],[7,-2],[5,-5],[3,-7]]},"*":{width:16,points:[[8,21],[8,9],null,[3,18],[13,12],null,[13,18],[3,12]]},"+":{width:26,points:[[13,18],[13,0],null,[4,9],[22,9]]},",":{width:10,points:[[6,1],[5,0],[4,1],[5,2],[6,1],[6,-1],[5,-3],[4,-4]]},"-":{width:26,points:[[4,9],[22,9]]},".":{width:10,points:[[5,2],[4,1],[5,0],[6,1],[5,2]]},"/":{width:22,points:[[20,25],[2,-7]]},0:{width:20,points:[[9,21],[6,20],[4,17],[3,12],[3,9],[4,4],[6,1],[9,0],[11,0],[14,1],[16,4],[17,9],[17,12],[16,17],[14,20],[11,21],[9,21]]},1:{width:20,points:[[6,17],[8,18],[11,21],[11,0]]},2:{width:20,points:[[4,16],[4,17],[5,19],[6,20],[8,21],[12,21],[14,20],[15,19],[16,17],[16,15],[15,13],[13,10],[3,0],[17,0]]},3:{width:20,points:[[5,21],[16,21],[10,13],[13,13],[15,12],[16,11],[17,8],[17,6],[16,3],[14,1],[11,0],[8,0],[5,1],[4,2],[3,4]]},4:{width:20,points:[[13,21],[3,7],[18,7],null,[13,21],[13,0]]},5:{width:20,points:[[15,21],[5,21],[4,12],[5,13],[8,14],[11,14],[14,13],[16,11],[17,8],[17,6],[16,3],[14,1],[11,0],[8,0],[5,1],[4,2],[3,4]]},6:{width:20,points:[[16,18],[15,20],[12,21],[10,21],[7,20],[5,17],[4,12],[4,7],[5,3],[7,1],[10,0],[11,0],[14,1],[16,3],[17,6],[17,7],[16,10],[14,12],[11,13],[10,13],[7,12],[5,10],[4,7]]},7:{width:20,points:[[17,21],[7,0],null,[3,21],[17,21]]},8:{width:20,points:[[8,21],[5,20],[4,18],[4,16],[5,14],[7,13],[11,12],[14,11],[16,9],[17,7],[17,4],[16,2],[15,1],[12,0],[8,0],[5,1],[4,2],[3,4],[3,7],[4,9],[6,11],[9,12],[13,13],[15,14],[16,16],[16,18],[15,20],[12,21],[8,21]]},9:{width:20,points:[[16,14],[15,11],[13,9],[10,8],[9,8],[6,9],[4,11],[3,14],[3,15],[4,18],[6,20],[9,21],[10,21],[13,20],[15,18],[16,14],[16,9],[15,4],[13,1],[10,0],[8,0],[5,1],[4,3]]},":":{width:10,points:[[5,14],[4,13],[5,12],[6,13],[5,14],null,[5,2],[4,1],[5,0],[6,1],[5,2]]},";":{width:10,points:[[5,14],[4,13],[5,12],[6,13],[5,14],null,[6,1],[5,0],[4,1],[5,2],[6,1],[6,-1],[5,-3],[4,-4]]},"<":{width:24,points:[[20,18],[4,9],[20,0]]},"=":{width:26,points:[[4,12],[22,12],null,[4,6],[22,6]]},">":{width:24,points:[[4,18],[20,9],[4,0]]},"?":{width:18,points:[[3,16],[3,17],[4,19],[5,20],[7,21],[11,21],[13,20],[14,19],[15,17],[15,15],[14,13],[13,12],[9,10],[9,7],null,[9,2],[8,1],[9,0],[10,1],[9,2]]},"@":{width:27,points:[[18,13],[17,15],[15,16],[12,16],[10,15],[9,14],[8,11],[8,8],[9,6],[11,5],[14,5],[16,6],[17,8],null,[12,16],[10,14],[9,11],[9,8],[10,6],[11,5],null,[18,16],[17,8],[17,6],[19,5],[21,5],[23,7],[24,10],[24,12],[23,15],[22,17],[20,19],[18,20],[15,21],[12,21],[9,20],[7,19],[5,17],[4,15],[3,12],[3,9],[4,6],[5,4],[7,2],[9,1],[12,0],[15,0],[18,1],[20,2],[21,3],null,[19,16],[18,8],[18,6],[19,5]]},A:{width:18,points:[[9,21],[1,0],null,[9,21],[17,0],null,[4,7],[14,7]]},B:{width:21,points:[[4,21],[4,0],null,[4,21],[13,21],[16,20],[17,19],[18,17],[18,15],[17,13],[16,12],[13,11],null,[4,11],[13,11],[16,10],[17,9],[18,7],[18,4],[17,2],[16,1],[13,0],[4,0]]},C:{width:21,points:[[18,16],[17,18],[15,20],[13,21],[9,21],[7,20],[5,18],[4,16],[3,13],[3,8],[4,5],[5,3],[7,1],[9,0],[13,0],[15,1],[17,3],[18,5]]},D:{width:21,points:[[4,21],[4,0],null,[4,21],[11,21],[14,20],[16,18],[17,16],[18,13],[18,8],[17,5],[16,3],[14,1],[11,0],[4,0]]},E:{width:19,points:[[4,21],[4,0],null,[4,21],[17,21],null,[4,11],[12,11],null,[4,0],[17,0]]},F:{width:18,points:[[4,21],[4,0],null,[4,21],[17,21],null,[4,11],[12,11]]},G:{width:21,points:[[18,16],[17,18],[15,20],[13,21],[9,21],[7,20],[5,18],[4,16],[3,13],[3,8],[4,5],[5,3],[7,1],[9,0],[13,0],[15,1],[17,3],[18,5],[18,8],null,[13,8],[18,8]]},H:{width:22,points:[[4,21],[4,0],null,[18,21],[18,0],null,[4,11],[18,11]]},I:{width:8,points:[[4,21],[4,0]]},J:{width:16,points:[[12,21],[12,5],[11,2],[10,1],[8,0],[6,0],[4,1],[3,2],[2,5],[2,7]]},K:{width:21,points:[[4,21],[4,0],null,[18,21],[4,7],null,[9,12],[18,0]]},L:{width:17,points:[[4,21],[4,0],null,[4,0],[16,0]]},M:{width:24,points:[[4,21],[4,0],null,[4,21],[12,0],null,[20,21],[12,0],null,[20,21],[20,0]]},N:{width:22,points:[[4,21],[4,0],null,[4,21],[18,0],null,[18,21],[18,0]]},O:{width:22,points:[[9,21],[7,20],[5,18],[4,16],[3,13],[3,8],[4,5],[5,3],[7,1],[9,0],[13,0],[15,1],[17,3],[18,5],[19,8],[19,13],[18,16],[17,18],[15,20],[13,21],[9,21]]},P:{width:21,points:[[4,21],[4,0],null,[4,21],[13,21],[16,20],[17,19],[18,17],[18,14],[17,12],[16,11],[13,10],[4,10]]},Q:{width:22,points:[[9,21],[7,20],[5,18],[4,16],[3,13],[3,8],[4,5],[5,3],[7,1],[9,0],[13,0],[15,1],[17,3],[18,5],[19,8],[19,13],[18,16],[17,18],[15,20],[13,21],[9,21],null,[12,4],[18,-2]]},R:{width:21,points:[[4,21],[4,0],null,[4,21],[13,21],[16,20],[17,19],[18,17],[18,15],[17,13],[16,12],[13,11],[4,11],null,[11,11],[18,0]]},S:{width:20,points:[[17,18],[15,20],[12,21],[8,21],[5,20],[3,18],[3,16],[4,14],[5,13],[7,12],[13,10],[15,9],[16,8],[17,6],[17,3],[15,1],[12,0],[8,0],[5,1],[3,3]]},T:{width:16,points:[[8,21],[8,0],null,[1,21],[15,21]]},U:{width:22,points:[[4,21],[4,6],[5,3],[7,1],[10,0],[12,0],[15,1],[17,3],[18,6],[18,21]]},V:{width:18,points:[[1,21],[9,0],null,[17,21],[9,0]]},W:{width:24,points:[[2,21],[7,0],null,[12,21],[7,0],null,[12,21],[17,0],null,[22,21],[17,0]]},X:{width:20,points:[[3,21],[17,0],null,[17,21],[3,0]]},Y:{width:18,points:[[1,21],[9,11],[9,0],null,[17,21],[9,11]]},Z:{width:20,points:[[17,21],[3,0],null,[3,21],[17,21],null,[3,0],[17,0]]},"[":{width:14,points:[[4,25],[4,-7],null,[5,25],[5,-7],null,[4,25],[11,25],null,[4,-7],[11,-7]]},"\\":{width:14,points:[[0,21],[14,-3]]},"]":{width:14,points:[[9,25],[9,-7],null,[10,25],[10,-7],null,[3,25],[10,25],null,[3,-7],[10,-7]]},"^":{width:14,points:[[3,10],[8,18],[13,10]]},_:{width:16,points:[[0,-2],[16,-2]]},"`":{width:10,points:[[6,21],[5,20],[4,18],[4,16],[5,15],[6,16],[5,17]]},a:{width:19,points:[[15,14],[15,0],null,[15,11],[13,13],[11,14],[8,14],[6,13],[4,11],[3,8],[3,6],[4,3],[6,1],[8,0],[11,0],[13,1],[15,3]]},b:{width:19,points:[[4,21],[4,0],null,[4,11],[6,13],[8,14],[11,14],[13,13],[15,11],[16,8],[16,6],[15,3],[13,1],[11,0],[8,0],[6,1],[4,3]]},c:{width:18,points:[[15,11],[13,13],[11,14],[8,14],[6,13],[4,11],[3,8],[3,6],[4,3],[6,1],[8,0],[11,0],[13,1],[15,3]]},d:{width:19,points:[[15,21],[15,0],null,[15,11],[13,13],[11,14],[8,14],[6,13],[4,11],[3,8],[3,6],[4,3],[6,1],[8,0],[11,0],[13,1],[15,3]]},e:{width:18,points:[[3,8],[15,8],[15,10],[14,12],[13,13],[11,14],[8,14],[6,13],[4,11],[3,8],[3,6],[4,3],[6,1],[8,0],[11,0],[13,1],[15,3]]},f:{width:12,points:[[10,21],[8,21],[6,20],[5,17],[5,0],null,[2,14],[9,14]]},g:{width:19,points:[[15,14],[15,-2],[14,-5],[13,-6],[11,-7],[8,-7],[6,-6],null,[15,11],[13,13],[11,14],[8,14],[6,13],[4,11],[3,8],[3,6],[4,3],[6,1],[8,0],[11,0],[13,1],[15,3]]},h:{width:19,points:[[4,21],[4,0],null,[4,10],[7,13],[9,14],[12,14],[14,13],[15,10],[15,0]]},i:{width:8,points:[[3,21],[4,20],[5,21],[4,22],[3,21],null,[4,14],[4,0]]},j:{width:10,points:[[5,21],[6,20],[7,21],[6,22],[5,21],null,[6,14],[6,-3],[5,-6],[3,-7],[1,-7]]},k:{width:17,points:[[4,21],[4,0],null,[14,14],[4,4],null,[8,8],[15,0]]},l:{width:8,points:[[4,21],[4,0]]},m:{width:30,points:[[4,14],[4,0],null,[4,10],[7,13],[9,14],[12,14],[14,13],[15,10],[15,0],null,[15,10],[18,13],[20,14],[23,14],[25,13],[26,10],[26,0]]},n:{width:19,points:[[4,14],[4,0],null,[4,10],[7,13],[9,14],[12,14],[14,13],[15,10],[15,0]]},o:{width:19,points:[[8,14],[6,13],[4,11],[3,8],[3,6],[4,3],[6,1],[8,0],[11,0],[13,1],[15,3],[16,6],[16,8],[15,11],[13,13],[11,14],[8,14]]},p:{width:19,points:[[4,14],[4,-7],null,[4,11],[6,13],[8,14],[11,14],[13,13],[15,11],[16,8],[16,6],[15,3],[13,1],[11,0],[8,0],[6,1],[4,3]]},q:{width:19,points:[[15,14],[15,-7],null,[15,11],[13,13],[11,14],[8,14],[6,13],[4,11],[3,8],[3,6],[4,3],[6,1],[8,0],[11,0],[13,1],[15,3]]},r:{width:13,points:[[4,14],[4,0],null,[4,8],[5,11],[7,13],[9,14],[12,14]]},s:{width:17,points:[[14,11],[13,13],[10,14],[7,14],[4,13],[3,11],[4,9],[6,8],[11,7],[13,6],[14,4],[14,3],[13,1],[10,0],[7,0],[4,1],[3,3]]},t:{width:12,points:[[5,21],[5,4],[6,1],[8,0],[10,0],null,[2,14],[9,14]]},u:{width:19,points:[[4,14],[4,4],[5,1],[7,0],[10,0],[12,1],[15,4],null,[15,14],[15,0]]},v:{width:16,points:[[2,14],[8,0],null,[14,14],[8,0]]},w:{width:22,points:[[3,14],[7,0],null,[11,14],[7,0],null,[11,14],[15,0],null,[19,14],[15,0]]},x:{width:17,points:[[3,14],[14,0],null,[14,14],[3,0]]},y:{width:16,points:[[2,14],[8,0],null,[14,14],[8,0],[6,-4],[4,-6],[2,-7],[1,-7]]},z:{width:17,points:[[14,14],[3,0],null,[3,14],[14,14],null,[3,0],[14,0]]},"{":{width:14,points:[[9,25],[7,24],[6,23],[5,21],[5,19],[6,17],[7,16],[8,14],[8,12],[6,10],null,[7,24],[6,22],[6,20],[7,18],[8,17],[9,15],[9,13],[8,11],[4,9],[8,7],[9,5],[9,3],[8,1],[7,0],[6,-2],[6,-4],[7,-6],null,[6,8],[8,6],[8,4],[7,2],[6,1],[5,-1],[5,-3],[6,-5],[7,-6],[9,-7]]},"|":{width:8,points:[[4,25],[4,-7]]},"}":{width:14,points:[[5,25],[7,24],[8,23],[9,21],[9,19],[8,17],[7,16],[6,14],[6,12],[8,10],null,[7,24],[8,22],[8,20],[7,18],[6,17],[5,15],[5,13],[6,11],[10,9],[6,7],[5,5],[5,3],[6,1],[7,0],[8,-2],[8,-4],[7,-6],null,[8,8],[6,6],[6,4],[7,2],[8,1],[9,-1],[9,-3],[8,-5],[7,-6],[5,-7]]},"~":{width:24,points:[[3,6],[3,8],[4,11],[6,12],[8,12],[10,11],[14,8],[16,7],[18,7],[20,8],[21,10],null,[3,8],[4,10],[6,11],[8,11],[10,10],[14,7],[16,6],[18,6],[20,7],[21,10],[21,12]]},"�":{diacritic:"`",letter:"a"},"�":{diacritic:"�",letter:"a"},"�":{diacritic:"^",letter:"a"},"�":{diacritic:"�",letter:"a"},"�":{diacritic:"~",letter:"a"},"�":{diacritic:"`",letter:"e"},"�":{diacritic:"�",letter:"e"},"�":{diacritic:"^",letter:"e"},"�":{diacritic:"�",letter:"e"},"�":{diacritic:"`",letter:"i"},"�":{diacritic:"�",letter:"i"},"�":{diacritic:"^",letter:"i"},"�":{diacritic:"�",letter:"i"},"�":{diacritic:"`",letter:"o"},"�":{diacritic:"�",letter:"o"},"�":{diacritic:"^",letter:"o"},"�":{diacritic:"�",letter:"o"},"�":{diacritic:"~",letter:"o"},"�":{diacritic:"`",letter:"u"},"�":{diacritic:"�",letter:"u"},"�":{diacritic:"^",letter:"u"},"�":{diacritic:"�",letter:"u"},"�":{diacritic:"�",letter:"y"},"�":{diacritic:"�",letter:"y"},"�":{diacritic:"�",letter:"c"},"�":{diacritic:"~",letter:"n"},"�":{diacritic:"`",letter:"A"},"�":{diacritic:"�",letter:"A"},"�":{diacritic:"^",letter:"A"},"�":{diacritic:"�",letter:"A"},"�":{diacritic:"~",letter:"A"},"�":{diacritic:"`",letter:"E"},"�":{diacritic:"�",letter:"E"},"�":{diacritic:"^",letter:"E"},"�":{diacritic:"�",letter:"E"},"�":{diacritic:"`",letter:"I"},"�":{diacritic:"�",letter:"I"},"�":{diacritic:"^",letter:"I"},"�":{diacritic:"�",letter:"I"},"�":{diacritic:"`",letter:"O"},"�":{diacritic:"�",letter:"O"},"�":{diacritic:"^",letter:"O"},"�":{diacritic:"�",letter:"O"},"�":{diacritic:"~",letter:"O"},"�":{diacritic:"`",letter:"U"},"�":{diacritic:"�",letter:"U"},"�":{diacritic:"^",letter:"U"},"�":{diacritic:"�",letter:"U"},"�":{diacritic:"�",letter:"Y"},"�":{diacritic:"�",letter:"C"},"�":{diacritic:"~",letter:"N"}},specialchars:{pi:{width:19,points:[[6,14],[6,0],null,[14,14],[14,0],null,[2,13],[6,16],[13,13],[17,16]]}},diacritics:{"�":{entity:"cedil",points:[[6,-4],[4,-6],[2,-7],[1,-7]]},"�":{entity:"acute",points:[[8,19],[13,22]]},"`":{entity:"grave",points:[[7,22],[12,19]]},"^":{entity:"circ",points:[[5.5,19],[9.5,23],[12.5,19]]},"�":{entity:"trema",points:[[5,21],[6,20],[7,21],[6,22],[5,21],null,[12,21],[13,20],[14,21],[13,22],[12,21]]},"~":{entity:"tilde",points:[[4,18],[7,22],[10,18],[13,22]]}},style:{size:8,font:null,color:"#000000",weight:1,textAlign:"left",textBaseline:"bottom",adjustAlign:!1,angle:0,tracking:1,boundingBoxColor:"#ff0000",originPointColor:"#000000"},debug:!1,_bufferLexemes:{},extend:function(a,b){for(var c in b){if(c in a)continue;a[c]=b[c]}return a},letter:function(a){return CanvasText.letters[a]},parseLexemes:function(a){if(CanvasText._bufferLexemes[a])return CanvasText._bufferLexemes[a];var b,c,d=a.match(/&[A-Za-z]{2,5};|\s|./g),e=[],f=[];for(b=0;b<d.length;b++){c=d[b];if(c.length==1)f.push(c);else{var g=c.substring(1,c.length-1);CanvasText.specialchars[g]?f.push(g):f=f.concat(c.toArray())}}for(b=0;b<f.length;b++)c=f[b],(c=CanvasText.letters[c]||CanvasText.specialchars[c])&&e.push(c);for(b=0;b<e.length;b++)(e===null||typeof e=="undefined")&&delete e[b];return CanvasText._bufferLexemes[a]=e},ascent:function(a){return a=a||CanvasText.style,a.size||CanvasText.style.size},descent:function(a){return a=a||CanvasText.style,7*(a.size||CanvasText.style.size)/25},measure:function(a,b){if(!a)return;b=b||CanvasText.style;var d,e,f=CanvasText.parseLexemes(a),g=0;for(d=f.length-1;d>-1;--d)c=f[d],e=c.diacritic?CanvasText.letter(c.letter).width:c.width,g+=e*(b.tracking||CanvasText.style.tracking)*(b.size||CanvasText.style.size)/25;return g},getDimensions:function(a,b){b=b||CanvasText.style;var c=CanvasText.measure(a,b),d=b.size||CanvasText.style.size,e=b.angle||CanvasText.style.angle;return b.angle==0?{width:c,height:d}:{width:Math.abs(Math.cos(e)*c)+Math.abs(Math.sin(e)*d),height:Math.abs(Math.sin(e)*c)+Math.abs(Math.cos(e)*d)}},drawPoints:function(a,b,c,d,e,f){var g,h,i=!0,j=0;f=f||{x:0,y:0},a.beginPath();for(g=0;g<b.length;g++){h=b[g];if(!h){i=!0;continue}i?(a.moveTo(c+h[0]*e+f.x,d-h[1]*e+f.y),i=!1):a.lineTo(c+h[0]*e+f.x,d-h[1]*e+f.y)}a.stroke(),a.closePath()},draw:function(a,b,c,d){if(!a)return;CanvasText.extend(d,CanvasText.style);var e,f,g=0,h=d.size/25,i=0,j=0,k=CanvasText.parseLexemes(a),l={x:0,y:0},m=CanvasText.measure(a,d),n;d.adjustAlign&&(n=CanvasText.getBestAlign(d.angle,d),CanvasText.extend(d,n));switch(d.textAlign){case"left":break;case"center":l.x=-m/2;break;case"right":l.x=-m}switch(d.textBaseline){case"bottom":break;case"middle":l.y=d.size/2;break;case"top":l.y=d.size}this.save(),this.translate(b,c),this.rotate(d.angle),this.lineCap="round",this.lineWidth=2*h*(d.weight||CanvasText.style.weight),this.strokeStyle=d.color||CanvasText.style.color;for(e=0;e<k.length;e++){f=k[e];if(f.width==-1){i=0,j=d.size*1.4;continue}var o=f.points,p=f.width;if(f.diacritic){var q=CanvasText.diacritics[f.diacritic],r=CanvasText.letter(f.letter);CanvasText.drawPoints(this,q.points,i,j-(f.letter.toUpperCase()==f.letter?3:0),h,l),o=r.points,p=r.width}CanvasText.drawPoints(this,o,i,j,h,l),CanvasText.debug&&(this.save(),this.lineJoin="miter",this.lineWidth=.5,this.strokeStyle=d.boundingBoxColor||CanvasText.style.boundingBoxColor,this.strokeRect(i+l.x,j+l.y,p*h,-d.size),this.fillStyle=d.originPointColor||CanvasText.style.originPointColor,this.beginPath(),this.arc(0,0,1.5,0,Math.PI*2,!0),this.fill(),this.closePath(),this.restore()),i+=p*h*(d.tracking||CanvasText.style.tracking)}return this.restore(),g}};CanvasText.proto=window.CanvasRenderingContext2D?window.CanvasRenderingContext2D.prototype:document.createElement("canvas").getContext("2d").__proto__,CanvasText.proto&&(CanvasText.proto.drawText=CanvasText.draw,CanvasText.proto.measure=CanvasText.measure,CanvasText.proto.getTextBounds=CanvasText.getDimensions,CanvasText.proto.fontAscent=CanvasText.ascent,CanvasText.proto.fontDescent=CanvasText.descent)
\ No newline at end of file

=== removed file 'addons/web_graph/static/lib/flotr2/flotr2.js'
--- addons/web_graph/static/lib/flotr2/flotr2.js	2012-05-07 08:19:08 +0000
+++ addons/web_graph/static/lib/flotr2/flotr2.js	1970-01-01 00:00:00 +0000
@@ -1,6865 +0,0 @@
-/*!
-  * bean.js - copyright Jacob Thornton 2011
-  * https://github.com/fat/bean
-  * MIT License
-  * special thanks to:
-  * dean edwards: http://dean.edwards.name/
-  * dperini: https://github.com/dperini/nwevents
-  * the entire mootools team: github.com/mootools/mootools-core
-  */
-/*global module:true, define:true*/
-!function (name, context, definition) {
-  if (typeof module !== 'undefined') module.exports = definition(name, context);
-  else if (typeof define === 'function' && typeof define.amd  === 'object') define(definition);
-  else context[name] = definition(name, context);
-}('bean', this, function (name, context) {
-  var win = window
-    , old = context[name]
-    , overOut = /over|out/
-    , namespaceRegex = /[^\.]*(?=\..*)\.|.*/
-    , nameRegex = /\..*/
-    , addEvent = 'addEventListener'
-    , attachEvent = 'attachEvent'
-    , removeEvent = 'removeEventListener'
-    , detachEvent = 'detachEvent'
-    , doc = document || {}
-    , root = doc.documentElement || {}
-    , W3C_MODEL = root[addEvent]
-    , eventSupport = W3C_MODEL ? addEvent : attachEvent
-    , slice = Array.prototype.slice
-    , mouseTypeRegex = /click|mouse|menu|drag|drop/i
-    , touchTypeRegex = /^touch|^gesture/i
-    , ONE = { one: 1 } // singleton for quick matching making add() do one()
-
-    , nativeEvents = (function (hash, events, i) {
-        for (i = 0; i < events.length; i++)
-          hash[events[i]] = 1
-        return hash
-      })({}, (
-          'click dblclick mouseup mousedown contextmenu ' +                  // mouse buttons
-          'mousewheel DOMMouseScroll ' +                                     // mouse wheel
-          'mouseover mouseout mousemove selectstart selectend ' +            // mouse movement
-          'keydown keypress keyup ' +                                        // keyboard
-          'orientationchange ' +                                             // mobile
-          'focus blur change reset select submit ' +                         // form elements
-          'load unload beforeunload resize move DOMContentLoaded readystatechange ' + // window
-          'error abort scroll ' +                                            // misc
-          (W3C_MODEL ? // element.fireEvent('onXYZ'... is not forgiving if we try to fire an event
-                       // that doesn't actually exist, so make sure we only do these on newer browsers
-            'show ' +                                                          // mouse buttons
-            'input invalid ' +                                                 // form elements
-            'touchstart touchmove touchend touchcancel ' +                     // touch
-            'gesturestart gesturechange gestureend ' +                         // gesture
-            'message readystatechange pageshow pagehide popstate ' +           // window
-            'hashchange offline online ' +                                     // window
-            'afterprint beforeprint ' +                                        // printing
-            'dragstart dragenter dragover dragleave drag drop dragend ' +      // dnd
-            'loadstart progress suspend emptied stalled loadmetadata ' +       // media
-            'loadeddata canplay canplaythrough playing waiting seeking ' +     // media
-            'seeked ended durationchange timeupdate play pause ratechange ' +  // media
-            'volumechange cuechange ' +                                        // media
-            'checking noupdate downloading cached updateready obsolete ' +     // appcache
-            '' : '')
-        ).split(' ')
-      )
-
-    , customEvents = (function () {
-        function isDescendant(parent, node) {
-          while ((node = node.parentNode) !== null) {
-            if (node === parent) return true
-          }
-          return false
-        }
-
-        function check(event) {
-          var related = event.relatedTarget
-          if (!related) return related === null
-          return (related !== this && related.prefix !== 'xul' && !/document/.test(this.toString()) && !isDescendant(this, related))
-        }
-
-        return {
-            mouseenter: { base: 'mouseover', condition: check }
-          , mouseleave: { base: 'mouseout', condition: check }
-          , mousewheel: { base: /Firefox/.test(navigator.userAgent) ? 'DOMMouseScroll' : 'mousewheel' }
-        }
-      })()
-
-    , fixEvent = (function () {
-        var commonProps = 'altKey attrChange attrName bubbles cancelable ctrlKey currentTarget detail eventPhase getModifierState isTrusted metaKey relatedNode relatedTarget shiftKey srcElement target timeStamp type view which'.split(' ')
-          , mouseProps = commonProps.concat('button buttons clientX clientY dataTransfer fromElement offsetX offsetY pageX pageY screenX screenY toElement'.split(' '))
-          , keyProps = commonProps.concat('char charCode key keyCode'.split(' '))
-          , touchProps = commonProps.concat('touches targetTouches changedTouches scale rotation'.split(' '))
-          , preventDefault = 'preventDefault'
-          , createPreventDefault = function (event) {
-              return function () {
-                if (event[preventDefault])
-                  event[preventDefault]()
-                else
-                  event.returnValue = false
-              }
-            }
-          , stopPropagation = 'stopPropagation'
-          , createStopPropagation = function (event) {
-              return function () {
-                if (event[stopPropagation])
-                  event[stopPropagation]()
-                else
-                  event.cancelBubble = true
-              }
-            }
-          , createStop = function (synEvent) {
-              return function () {
-                synEvent[preventDefault]()
-                synEvent[stopPropagation]()
-                synEvent.stopped = true
-              }
-            }
-          , copyProps = function (event, result, props) {
-              var i, p
-              for (i = props.length; i--;) {
-                p = props[i]
-                if (!(p in result) && p in event) result[p] = event[p]
-              }
-            }
-
-        return function (event, isNative) {
-          var result = { originalEvent: event, isNative: isNative }
-          if (!event)
-            return result
-
-          var props
-            , type = event.type
-            , target = event.target || event.srcElement
-
-          result[preventDefault] = createPreventDefault(event)
-          result[stopPropagation] = createStopPropagation(event)
-          result.stop = createStop(result)
-          result.target = target && target.nodeType === 3 ? target.parentNode : target
-
-          if (isNative) { // we only need basic augmentation on custom events, the rest is too expensive
-            if (type.indexOf('key') !== -1) {
-              props = keyProps
-              result.keyCode = event.which || event.keyCode
-            } else if (mouseTypeRegex.test(type)) {
-              props = mouseProps
-              result.rightClick = event.which === 3 || event.button === 2
-              result.pos = { x: 0, y: 0 }
-              if (event.pageX || event.pageY) {
-                result.clientX = event.pageX
-                result.clientY = event.pageY
-              } else if (event.clientX || event.clientY) {
-                result.clientX = event.clientX + doc.body.scrollLeft + root.scrollLeft
-                result.clientY = event.clientY + doc.body.scrollTop + root.scrollTop
-              }
-              if (overOut.test(type))
-                result.relatedTarget = event.relatedTarget || event[(type === 'mouseover' ? 'from' : 'to') + 'Element']
-            } else if (touchTypeRegex.test(type)) {
-              props = touchProps
-            }
-            copyProps(event, result, props || commonProps)
-          }
-          return result
-        }
-      })()
-
-      // if we're in old IE we can't do onpropertychange on doc or win so we use doc.documentElement for both
-    , targetElement = function (element, isNative) {
-        return !W3C_MODEL && !isNative && (element === doc || element === win) ? root : element
-      }
-
-      // we use one of these per listener, of any type
-    , RegEntry = (function () {
-        function entry(element, type, handler, original, namespaces) {
-          this.element = element
-          this.type = type
-          this.handler = handler
-          this.original = original
-          this.namespaces = namespaces
-          this.custom = customEvents[type]
-          this.isNative = nativeEvents[type] && element[eventSupport]
-          this.eventType = W3C_MODEL || this.isNative ? type : 'propertychange'
-          this.customType = !W3C_MODEL && !this.isNative && type
-          this.target = targetElement(element, this.isNative)
-          this.eventSupport = this.target[eventSupport]
-        }
-
-        entry.prototype = {
-            // given a list of namespaces, is our entry in any of them?
-            inNamespaces: function (checkNamespaces) {
-              var i, j
-              if (!checkNamespaces)
-                return true
-              if (!this.namespaces)
-                return false
-              for (i = checkNamespaces.length; i--;) {
-                for (j = this.namespaces.length; j--;) {
-                  if (checkNamespaces[i] === this.namespaces[j])
-                    return true
-                }
-              }
-              return false
-            }
-
-            // match by element, original fn (opt), handler fn (opt)
-          , matches: function (checkElement, checkOriginal, checkHandler) {
-              return this.element === checkElement &&
-                (!checkOriginal || this.original === checkOriginal) &&
-                (!checkHandler || this.handler === checkHandler)
-            }
-        }
-
-        return entry
-      })()
-
-    , registry = (function () {
-        // our map stores arrays by event type, just because it's better than storing
-        // everything in a single array. uses '$' as a prefix for the keys for safety
-        var map = {}
-
-          // generic functional search of our registry for matching listeners,
-          // `fn` returns false to break out of the loop
-          , forAll = function (element, type, original, handler, fn) {
-              if (!type || type === '*') {
-                // search the whole registry
-                for (var t in map) {
-                  if (t.charAt(0) === '$')
-                    forAll(element, t.substr(1), original, handler, fn)
-                }
-              } else {
-                var i = 0, l, list = map['$' + type], all = element === '*'
-                if (!list)
-                  return
-                for (l = list.length; i < l; i++) {
-                  if (all || list[i].matches(element, original, handler))
-                    if (!fn(list[i], list, i, type))
-                      return
-                }
-              }
-            }
-
-          , has = function (element, type, original) {
-              // we're not using forAll here simply because it's a bit slower and this
-              // needs to be fast
-              var i, list = map['$' + type]
-              if (list) {
-                for (i = list.length; i--;) {
-                  if (list[i].matches(element, original, null))
-                    return true
-                }
-              }
-              return false
-            }
-
-          , get = function (element, type, original) {
-              var entries = []
-              forAll(element, type, original, null, function (entry) { return entries.push(entry) })
-              return entries
-            }
-
-          , put = function (entry) {
-              (map['$' + entry.type] || (map['$' + entry.type] = [])).push(entry)
-              return entry
-            }
-
-          , del = function (entry) {
-              forAll(entry.element, entry.type, null, entry.handler, function (entry, list, i) {
-                list.splice(i, 1)
-                if (list.length === 0)
-                  delete map['$' + entry.type]
-                return false
-              })
-            }
-
-            // dump all entries, used for onunload
-          , entries = function () {
-              var t, entries = []
-              for (t in map) {
-                if (t.charAt(0) === '$')
-                  entries = entries.concat(map[t])
-              }
-              return entries
-            }
-
-        return { has: has, get: get, put: put, del: del, entries: entries }
-      })()
-
-      // add and remove listeners to DOM elements
-    , listener = W3C_MODEL ? function (element, type, fn, add) {
-        element[add ? addEvent : removeEvent](type, fn, false)
-      } : function (element, type, fn, add, custom) {
-        if (custom && add && element['_on' + custom] === null)
-          element['_on' + custom] = 0
-        element[add ? attachEvent : detachEvent]('on' + type, fn)
-      }
-
-    , nativeHandler = function (element, fn, args) {
-        return function (event) {
-          event = fixEvent(event || ((this.ownerDocument || this.document || this).parentWindow || win).event, true)
-          return fn.apply(element, [event].concat(args))
-        }
-      }
-
-    , customHandler = function (element, fn, type, condition, args, isNative) {
-        return function (event) {
-          if (condition ? condition.apply(this, arguments) : W3C_MODEL ? true : event && event.propertyName === '_on' + type || !event) {
-            if (event)
-              event = fixEvent(event || ((this.ownerDocument || this.document || this).parentWindow || win).event, isNative)
-            fn.apply(element, event && (!args || args.length === 0) ? arguments : slice.call(arguments, event ? 0 : 1).concat(args))
-          }
-        }
-      }
-
-    , once = function (rm, element, type, fn, originalFn) {
-        // wrap the handler in a handler that does a remove as well
-        return function () {
-          rm(element, type, originalFn)
-          fn.apply(this, arguments)
-        }
-      }
-
-    , removeListener = function (element, orgType, handler, namespaces) {
-        var i, l, entry
-          , type = (orgType && orgType.replace(nameRegex, ''))
-          , handlers = registry.get(element, type, handler)
-
-        for (i = 0, l = handlers.length; i < l; i++) {
-          if (handlers[i].inNamespaces(namespaces)) {
-            if ((entry = handlers[i]).eventSupport)
-              listener(entry.target, entry.eventType, entry.handler, false, entry.type)
-            // TODO: this is problematic, we have a registry.get() and registry.del() that
-            // both do registry searches so we waste cycles doing this. Needs to be rolled into
-            // a single registry.forAll(fn) that removes while finding, but the catch is that
-            // we'll be splicing the arrays that we're iterating over. Needs extra tests to
-            // make sure we don't screw it up. @rvagg
-            registry.del(entry)
-          }
-        }
-      }
-
-    , addListener = function (element, orgType, fn, originalFn, args) {
-        var entry
-          , type = orgType.replace(nameRegex, '')
-          , namespaces = orgType.replace(namespaceRegex, '').split('.')
-
-        if (registry.has(element, type, fn))
-          return element // no dupe
-        if (type === 'unload')
-          fn = once(removeListener, element, type, fn, originalFn) // self clean-up
-        if (customEvents[type]) {
-          if (customEvents[type].condition)
-            fn = customHandler(element, fn, type, customEvents[type].condition, true)
-          type = customEvents[type].base || type
-        }
-        entry = registry.put(new RegEntry(element, type, fn, originalFn, namespaces[0] && namespaces))
-        entry.handler = entry.isNative ?
-          nativeHandler(element, entry.handler, args) :
-          customHandler(element, entry.handler, type, false, args, false)
-        if (entry.eventSupport)
-          listener(entry.target, entry.eventType, entry.handler, true, entry.customType)
-      }
-
-    , del = function (selector, fn, $) {
-        return function (e) {
-          var target, i, array = typeof selector === 'string' ? $(selector, this) : selector
-          for (target = e.target; target && target !== this; target = target.parentNode) {
-            for (i = array.length; i--;) {
-              if (array[i] === target) {
-                return fn.apply(target, arguments)
-              }
-            }
-          }
-        }
-      }
-
-    , remove = function (element, typeSpec, fn) {
-        var k, m, type, namespaces, i
-          , rm = removeListener
-          , isString = typeSpec && typeof typeSpec === 'string'
-
-        if (isString && typeSpec.indexOf(' ') > 0) {
-          // remove(el, 't1 t2 t3', fn) or remove(el, 't1 t2 t3')
-          typeSpec = typeSpec.split(' ')
-          for (i = typeSpec.length; i--;)
-            remove(element, typeSpec[i], fn)
-          return element
-        }
-        type = isString && typeSpec.replace(nameRegex, '')
-        if (type && customEvents[type])
-          type = customEvents[type].type
-        if (!typeSpec || isString) {
-          // remove(el) or remove(el, t1.ns) or remove(el, .ns) or remove(el, .ns1.ns2.ns3)
-          if (namespaces = isString && typeSpec.replace(namespaceRegex, ''))
-            namespaces = namespaces.split('.')
-          rm(element, type, fn, namespaces)
-        } else if (typeof typeSpec === 'function') {
-          // remove(el, fn)
-          rm(element, null, typeSpec)
-        } else {
-          // remove(el, { t1: fn1, t2, fn2 })
-          for (k in typeSpec) {
-            if (typeSpec.hasOwnProperty(k))
-              remove(element, k, typeSpec[k])
-          }
-        }
-        return element
-      }
-
-    , add = function (element, events, fn, delfn, $) {
-        var type, types, i, args
-          , originalFn = fn
-          , isDel = fn && typeof fn === 'string'
-
-        if (events && !fn && typeof events === 'object') {
-          for (type in events) {
-            if (events.hasOwnProperty(type))
-              add.apply(this, [ element, type, events[type] ])
-          }
-        } else {
-          args = arguments.length > 3 ? slice.call(arguments, 3) : []
-          types = (isDel ? fn : events).split(' ')
-          isDel && (fn = del(events, (originalFn = delfn), $)) && (args = slice.call(args, 1))
-          // special case for one()
-          this === ONE && (fn = once(remove, element, events, fn, originalFn))
-          for (i = types.length; i--;) addListener(element, types[i], fn, originalFn, args)
-        }
-        return element
-      }
-
-    , one = function () {
-        return add.apply(ONE, arguments)
-      }
-
-    , fireListener = W3C_MODEL ? function (isNative, type, element) {
-        var evt = doc.createEvent(isNative ? 'HTMLEvents' : 'UIEvents')
-        evt[isNative ? 'initEvent' : 'initUIEvent'](type, true, true, win, 1)
-        element.dispatchEvent(evt)
-      } : function (isNative, type, element) {
-        element = targetElement(element, isNative)
-        // if not-native then we're using onpropertychange so we just increment a custom property
-        isNative ? element.fireEvent('on' + type, doc.createEventObject()) : element['_on' + type]++
-      }
-
-    , fire = function (element, type, args) {
-        var i, j, l, names, handlers
-          , types = type.split(' ')
-
-        for (i = types.length; i--;) {
-          type = types[i].replace(nameRegex, '')
-          if (names = types[i].replace(namespaceRegex, ''))
-            names = names.split('.')
-          if (!names && !args && element[eventSupport]) {
-            fireListener(nativeEvents[type], type, element)
-          } else {
-            // non-native event, either because of a namespace, arguments or a non DOM element
-            // iterate over all listeners and manually 'fire'
-            handlers = registry.get(element, type)
-            args = [false].concat(args)
-            for (j = 0, l = handlers.length; j < l; j++) {
-              if (handlers[j].inNamespaces(names))
-                handlers[j].handler.apply(element, args)
-            }
-          }
-        }
-        return element
-      }
-
-    , clone = function (element, from, type) {
-        var i = 0
-          , handlers = registry.get(from, type)
-          , l = handlers.length
-
-        for (;i < l; i++)
-          handlers[i].original && add(element, handlers[i].type, handlers[i].original)
-        return element
-      }
-
-    , bean = {
-          add: add
-        , one: one
-        , remove: remove
-        , clone: clone
-        , fire: fire
-        , noConflict: function () {
-            context[name] = old
-            return this
-          }
-      }
-
-  if (win[attachEvent]) {
-    // for IE, clean up on unload to avoid leaks
-    var cleanup = function () {
-      var i, entries = registry.entries()
-      for (i in entries) {
-        if (entries[i].type && entries[i].type !== 'unload')
-          remove(entries[i].element, entries[i].type)
-      }
-      win[detachEvent]('onunload', cleanup)
-      win.CollectGarbage && win.CollectGarbage()
-    }
-    win[attachEvent]('onunload', cleanup)
-  }
-
-  return bean
-});
-//     Underscore.js 1.1.7
-//     (c) 2011 Jeremy Ashkenas, DocumentCloud Inc.
-//     Underscore is freely distributable under the MIT license.
-//     Portions of Underscore are inspired or borrowed from Prototype,
-//     Oliver Steele's Functional, and John Resig's Micro-Templating.
-//     For all details and documentation:
-//     http://documentcloud.github.com/underscore
-
-(function() {
-
-  // Baseline setup
-  // --------------
-
-  // Establish the root object, `window` in the browser, or `global` on the server.
-  var root = this;
-
-  // Save the previous value of the `_` variable.
-  var previousUnderscore = root._;
-
-  // Establish the object that gets returned to break out of a loop iteration.
-  var breaker = {};
-
-  // Save bytes in the minified (but not gzipped) version:
-  var ArrayProto = Array.prototype, ObjProto = Object.prototype, FuncProto = Function.prototype;
-
-  // Create quick reference variables for speed access to core prototypes.
-  var slice            = ArrayProto.slice,
-      unshift          = ArrayProto.unshift,
-      toString         = ObjProto.toString,
-      hasOwnProperty   = ObjProto.hasOwnProperty;
-
-  // All **ECMAScript 5** native function implementations that we hope to use
-  // are declared here.
-  var
-    nativeForEach      = ArrayProto.forEach,
-    nativeMap          = ArrayProto.map,
-    nativeReduce       = ArrayProto.reduce,
-    nativeReduceRight  = ArrayProto.reduceRight,
-    nativeFilter       = ArrayProto.filter,
-    nativeEvery        = ArrayProto.every,
-    nativeSome         = ArrayProto.some,
-    nativeIndexOf      = ArrayProto.indexOf,
-    nativeLastIndexOf  = ArrayProto.lastIndexOf,
-    nativeIsArray      = Array.isArray,
-    nativeKeys         = Object.keys,
-    nativeBind         = FuncProto.bind;
-
-  // Create a safe reference to the Underscore object for use below.
-  var _ = function(obj) { return new wrapper(obj); };
-
-  // Export the Underscore object for **CommonJS**, with backwards-compatibility
-  // for the old `require()` API. If we're not in CommonJS, add `_` to the
-  // global object.
-  if (typeof module !== 'undefined' && module.exports) {
-    module.exports = _;
-    _._ = _;
-  } else {
-    // Exported as a string, for Closure Compiler "advanced" mode.
-    root['_'] = _;
-  }
-
-  // Current version.
-  _.VERSION = '1.1.7';
-
-  // Collection Functions
-  // --------------------
-
-  // The cornerstone, an `each` implementation, aka `forEach`.
-  // Handles objects with the built-in `forEach`, arrays, and raw objects.
-  // Delegates to **ECMAScript 5**'s native `forEach` if available.
-  var each = _.each = _.forEach = function(obj, iterator, context) {
-    if (obj == null) return;
-    if (nativeForEach && obj.forEach === nativeForEach) {
-      obj.forEach(iterator, context);
-    } else if (obj.length === +obj.length) {
-      for (var i = 0, l = obj.length; i < l; i++) {
-        if (i in obj && iterator.call(context, obj[i], i, obj) === breaker) return;
-      }
-    } else {
-      for (var key in obj) {
-        if (hasOwnProperty.call(obj, key)) {
-          if (iterator.call(context, obj[key], key, obj) === breaker) return;
-        }
-      }
-    }
-  };
-
-  // Return the results of applying the iterator to each element.
-  // Delegates to **ECMAScript 5**'s native `map` if available.
-  _.map = function(obj, iterator, context) {
-    var results = [];
-    if (obj == null) return results;
-    if (nativeMap && obj.map === nativeMap) return obj.map(iterator, context);
-    each(obj, function(value, index, list) {
-      results[results.length] = iterator.call(context, value, index, list);
-    });
-    return results;
-  };
-
-  // **Reduce** builds up a single result from a list of values, aka `inject`,
-  // or `foldl`. Delegates to **ECMAScript 5**'s native `reduce` if available.
-  _.reduce = _.foldl = _.inject = function(obj, iterator, memo, context) {
-    var initial = memo !== void 0;
-    if (obj == null) obj = [];
-    if (nativeReduce && obj.reduce === nativeReduce) {
-      if (context) iterator = _.bind(iterator, context);
-      return initial ? obj.reduce(iterator, memo) : obj.reduce(iterator);
-    }
-    each(obj, function(value, index, list) {
-      if (!initial) {
-        memo = value;
-        initial = true;
-      } else {
-        memo = iterator.call(context, memo, value, index, list);
-      }
-    });
-    if (!initial) throw new TypeError("Reduce of empty array with no initial value");
-    return memo;
-  };
-
-  // The right-associative version of reduce, also known as `foldr`.
-  // Delegates to **ECMAScript 5**'s native `reduceRight` if available.
-  _.reduceRight = _.foldr = function(obj, iterator, memo, context) {
-    if (obj == null) obj = [];
-    if (nativeReduceRight && obj.reduceRight === nativeReduceRight) {
-      if (context) iterator = _.bind(iterator, context);
-      return memo !== void 0 ? obj.reduceRight(iterator, memo) : obj.reduceRight(iterator);
-    }
-    var reversed = (_.isArray(obj) ? obj.slice() : _.toArray(obj)).reverse();
-    return _.reduce(reversed, iterator, memo, context);
-  };
-
-  // Return the first value which passes a truth test. Aliased as `detect`.
-  _.find = _.detect = function(obj, iterator, context) {
-    var result;
-    any(obj, function(value, index, list) {
-      if (iterator.call(context, value, index, list)) {
-        result = value;
-        return true;
-      }
-    });
-    return result;
-  };
-
-  // Return all the elements that pass a truth test.
-  // Delegates to **ECMAScript 5**'s native `filter` if available.
-  // Aliased as `select`.
-  _.filter = _.select = function(obj, iterator, context) {
-    var results = [];
-    if (obj == null) return results;
-    if (nativeFilter && obj.filter === nativeFilter) return obj.filter(iterator, context);
-    each(obj, function(value, index, list) {
-      if (iterator.call(context, value, index, list)) results[results.length] = value;
-    });
-    return results;
-  };
-
-  // Return all the elements for which a truth test fails.
-  _.reject = function(obj, iterator, context) {
-    var results = [];
-    if (obj == null) return results;
-    each(obj, function(value, index, list) {
-      if (!iterator.call(context, value, index, list)) results[results.length] = value;
-    });
-    return results;
-  };
-
-  // Determine whether all of the elements match a truth test.
-  // Delegates to **ECMAScript 5**'s native `every` if available.
-  // Aliased as `all`.
-  _.every = _.all = function(obj, iterator, context) {
-    var result = true;
-    if (obj == null) return result;
-    if (nativeEvery && obj.every === nativeEvery) return obj.every(iterator, context);
-    each(obj, function(value, index, list) {
-      if (!(result = result && iterator.call(context, value, index, list))) return breaker;
-    });
-    return result;
-  };
-
-  // Determine if at least one element in the object matches a truth test.
-  // Delegates to **ECMAScript 5**'s native `some` if available.
-  // Aliased as `any`.
-  var any = _.some = _.any = function(obj, iterator, context) {
-    iterator = iterator || _.identity;
-    var result = false;
-    if (obj == null) return result;
-    if (nativeSome && obj.some === nativeSome) return obj.some(iterator, context);
-    each(obj, function(value, index, list) {
-      if (result |= iterator.call(context, value, index, list)) return breaker;
-    });
-    return !!result;
-  };
-
-  // Determine if a given value is included in the array or object using `===`.
-  // Aliased as `contains`.
-  _.include = _.contains = function(obj, target) {
-    var found = false;
-    if (obj == null) return found;
-    if (nativeIndexOf && obj.indexOf === nativeIndexOf) return obj.indexOf(target) != -1;
-    any(obj, function(value) {
-      if (found = value === target) return true;
-    });
-    return found;
-  };
-
-  // Invoke a method (with arguments) on every item in a collection.
-  _.invoke = function(obj, method) {
-    var args = slice.call(arguments, 2);
-    return _.map(obj, function(value) {
-      return (method.call ? method || value : value[method]).apply(value, args);
-    });
-  };
-
-  // Convenience version of a common use case of `map`: fetching a property.
-  _.pluck = function(obj, key) {
-    return _.map(obj, function(value){ return value[key]; });
-  };
-
-  // Return the maximum element or (element-based computation).
-  _.max = function(obj, iterator, context) {
-    if (!iterator && _.isArray(obj)) return Math.max.apply(Math, obj);
-    var result = {computed : -Infinity};
-    each(obj, function(value, index, list) {
-      var computed = iterator ? iterator.call(context, value, index, list) : value;
-      computed >= result.computed && (result = {value : value, computed : computed});
-    });
-    return result.value;
-  };
-
-  // Return the minimum element (or element-based computation).
-  _.min = function(obj, iterator, context) {
-    if (!iterator && _.isArray(obj)) return Math.min.apply(Math, obj);
-    var result = {computed : Infinity};
-    each(obj, function(value, index, list) {
-      var computed = iterator ? iterator.call(context, value, index, list) : value;
-      computed < result.computed && (result = {value : value, computed : computed});
-    });
-    return result.value;
-  };
-
-  // Sort the object's values by a criterion produced by an iterator.
-  _.sortBy = function(obj, iterator, context) {
-    return _.pluck(_.map(obj, function(value, index, list) {
-      return {
-        value : value,
-        criteria : iterator.call(context, value, index, list)
-      };
-    }).sort(function(left, right) {
-      var a = left.criteria, b = right.criteria;
-      return a < b ? -1 : a > b ? 1 : 0;
-    }), 'value');
-  };
-
-  // Groups the object's values by a criterion produced by an iterator
-  _.groupBy = function(obj, iterator) {
-    var result = {};
-    each(obj, function(value, index) {
-      var key = iterator(value, index);
-      (result[key] || (result[key] = [])).push(value);
-    });
-    return result;
-  };
-
-  // Use a comparator function to figure out at what index an object should
-  // be inserted so as to maintain order. Uses binary search.
-  _.sortedIndex = function(array, obj, iterator) {
-    iterator || (iterator = _.identity);
-    var low = 0, high = array.length;
-    while (low < high) {
-      var mid = (low + high) >> 1;
-      iterator(array[mid]) < iterator(obj) ? low = mid + 1 : high = mid;
-    }
-    return low;
-  };
-
-  // Safely convert anything iterable into a real, live array.
-  _.toArray = function(iterable) {
-    if (!iterable)                return [];
-    if (iterable.toArray)         return iterable.toArray();
-    if (_.isArray(iterable))      return slice.call(iterable);
-    if (_.isArguments(iterable))  return slice.call(iterable);
-    return _.values(iterable);
-  };
-
-  // Return the number of elements in an object.
-  _.size = function(obj) {
-    return _.toArray(obj).length;
-  };
-
-  // Array Functions
-  // ---------------
-
-  // Get the first element of an array. Passing **n** will return the first N
-  // values in the array. Aliased as `head`. The **guard** check allows it to work
-  // with `_.map`.
-  _.first = _.head = function(array, n, guard) {
-    return (n != null) && !guard ? slice.call(array, 0, n) : array[0];
-  };
-
-  // Returns everything but the first entry of the array. Aliased as `tail`.
-  // Especially useful on the arguments object. Passing an **index** will return
-  // the rest of the values in the array from that index onward. The **guard**
-  // check allows it to work with `_.map`.
-  _.rest = _.tail = function(array, index, guard) {
-    return slice.call(array, (index == null) || guard ? 1 : index);
-  };
-
-  // Get the last element of an array.
-  _.last = function(array) {
-    return array[array.length - 1];
-  };
-
-  // Trim out all falsy values from an array.
-  _.compact = function(array) {
-    return _.filter(array, function(value){ return !!value; });
-  };
-
-  // Return a completely flattened version of an array.
-  _.flatten = function(array) {
-    return _.reduce(array, function(memo, value) {
-      if (_.isArray(value)) return memo.concat(_.flatten(value));
-      memo[memo.length] = value;
-      return memo;
-    }, []);
-  };
-
-  // Return a version of the array that does not contain the specified value(s).
-  _.without = function(array) {
-    return _.difference(array, slice.call(arguments, 1));
-  };
-
-  // Produce a duplicate-free version of the array. If the array has already
-  // been sorted, you have the option of using a faster algorithm.
-  // Aliased as `unique`.
-  _.uniq = _.unique = function(array, isSorted) {
-    return _.reduce(array, function(memo, el, i) {
-      if (0 == i || (isSorted === true ? _.last(memo) != el : !_.include(memo, el))) memo[memo.length] = el;
-      return memo;
-    }, []);
-  };
-
-  // Produce an array that contains the union: each distinct element from all of
-  // the passed-in arrays.
-  _.union = function() {
-    return _.uniq(_.flatten(arguments));
-  };
-
-  // Produce an array that contains every item shared between all the
-  // passed-in arrays. (Aliased as "intersect" for back-compat.)
-  _.intersection = _.intersect = function(array) {
-    var rest = slice.call(arguments, 1);
-    return _.filter(_.uniq(array), function(item) {
-      return _.every(rest, function(other) {
-        return _.indexOf(other, item) >= 0;
-      });
-    });
-  };
-
-  // Take the difference between one array and another.
-  // Only the elements present in just the first array will remain.
-  _.difference = function(array, other) {
-    return _.filter(array, function(value){ return !_.include(other, value); });
-  };
-
-  // Zip together multiple lists into a single array -- elements that share
-  // an index go together.
-  _.zip = function() {
-    var args = slice.call(arguments);
-    var length = _.max(_.pluck(args, 'length'));
-    var results = new Array(length);
-    for (var i = 0; i < length; i++) results[i] = _.pluck(args, "" + i);
-    return results;
-  };
-
-  // If the browser doesn't supply us with indexOf (I'm looking at you, **MSIE**),
-  // we need this function. Return the position of the first occurrence of an
-  // item in an array, or -1 if the item is not included in the array.
-  // Delegates to **ECMAScript 5**'s native `indexOf` if available.
-  // If the array is large and already in sort order, pass `true`
-  // for **isSorted** to use binary search.
-  _.indexOf = function(array, item, isSorted) {
-    if (array == null) return -1;
-    var i, l;
-    if (isSorted) {
-      i = _.sortedIndex(array, item);
-      return array[i] === item ? i : -1;
-    }
-    if (nativeIndexOf && array.indexOf === nativeIndexOf) return array.indexOf(item);
-    for (i = 0, l = array.length; i < l; i++) if (array[i] === item) return i;
-    return -1;
-  };
-
-
-  // Delegates to **ECMAScript 5**'s native `lastIndexOf` if available.
-  _.lastIndexOf = function(array, item) {
-    if (array == null) return -1;
-    if (nativeLastIndexOf && array.lastIndexOf === nativeLastIndexOf) return array.lastIndexOf(item);
-    var i = array.length;
-    while (i--) if (array[i] === item) return i;
-    return -1;
-  };
-
-  // Generate an integer Array containing an arithmetic progression. A port of
-  // the native Python `range()` function. See
-  // [the Python documentation](http://docs.python.org/library/functions.html#range).
-  _.range = function(start, stop, step) {
-    if (arguments.length <= 1) {
-      stop = start || 0;
-      start = 0;
-    }
-    step = arguments[2] || 1;
-
-    var len = Math.max(Math.ceil((stop - start) / step), 0);
-    var idx = 0;
-    var range = new Array(len);
-
-    while(idx < len) {
-      range[idx++] = start;
-      start += step;
-    }
-
-    return range;
-  };
-
-  // Function (ahem) Functions
-  // ------------------
-
-  // Create a function bound to a given object (assigning `this`, and arguments,
-  // optionally). Binding with arguments is also known as `curry`.
-  // Delegates to **ECMAScript 5**'s native `Function.bind` if available.
-  // We check for `func.bind` first, to fail fast when `func` is undefined.
-  _.bind = function(func, obj) {
-    if (func.bind === nativeBind && nativeBind) return nativeBind.apply(func, slice.call(arguments, 1));
-    var args = slice.call(arguments, 2);
-    return function() {
-      return func.apply(obj, args.concat(slice.call(arguments)));
-    };
-  };
-
-  // Bind all of an object's methods to that object. Useful for ensuring that
-  // all callbacks defined on an object belong to it.
-  _.bindAll = function(obj) {
-    var funcs = slice.call(arguments, 1);
-    if (funcs.length == 0) funcs = _.functions(obj);
-    each(funcs, function(f) { obj[f] = _.bind(obj[f], obj); });
-    return obj;
-  };
-
-  // Memoize an expensive function by storing its results.
-  _.memoize = function(func, hasher) {
-    var memo = {};
-    hasher || (hasher = _.identity);
-    return function() {
-      var key = hasher.apply(this, arguments);
-      return hasOwnProperty.call(memo, key) ? memo[key] : (memo[key] = func.apply(this, arguments));
-    };
-  };
-
-  // Delays a function for the given number of milliseconds, and then calls
-  // it with the arguments supplied.
-  _.delay = function(func, wait) {
-    var args = slice.call(arguments, 2);
-    return setTimeout(function(){ return func.apply(func, args); }, wait);
-  };
-
-  // Defers a function, scheduling it to run after the current call stack has
-  // cleared.
-  _.defer = function(func) {
-    return _.delay.apply(_, [func, 1].concat(slice.call(arguments, 1)));
-  };
-
-  // Internal function used to implement `_.throttle` and `_.debounce`.
-  var limit = function(func, wait, debounce) {
-    var timeout;
-    return function() {
-      var context = this, args = arguments;
-      var throttler = function() {
-        timeout = null;
-        func.apply(context, args);
-      };
-      if (debounce) clearTimeout(timeout);
-      if (debounce || !timeout) timeout = setTimeout(throttler, wait);
-    };
-  };
-
-  // Returns a function, that, when invoked, will only be triggered at most once
-  // during a given window of time.
-  _.throttle = function(func, wait) {
-    return limit(func, wait, false);
-  };
-
-  // Returns a function, that, as long as it continues to be invoked, will not
-  // be triggered. The function will be called after it stops being called for
-  // N milliseconds.
-  _.debounce = function(func, wait) {
-    return limit(func, wait, true);
-  };
-
-  // Returns a function that will be executed at most one time, no matter how
-  // often you call it. Useful for lazy initialization.
-  _.once = function(func) {
-    var ran = false, memo;
-    return function() {
-      if (ran) return memo;
-      ran = true;
-      return memo = func.apply(this, arguments);
-    };
-  };
-
-  // Returns the first function passed as an argument to the second,
-  // allowing you to adjust arguments, run code before and after, and
-  // conditionally execute the original function.
-  _.wrap = function(func, wrapper) {
-    return function() {
-      var args = [func].concat(slice.call(arguments));
-      return wrapper.apply(this, args);
-    };
-  };
-
-  // Returns a function that is the composition of a list of functions, each
-  // consuming the return value of the function that follows.
-  _.compose = function() {
-    var funcs = slice.call(arguments);
-    return function() {
-      var args = slice.call(arguments);
-      for (var i = funcs.length - 1; i >= 0; i--) {
-        args = [funcs[i].apply(this, args)];
-      }
-      return args[0];
-    };
-  };
-
-  // Returns a function that will only be executed after being called N times.
-  _.after = function(times, func) {
-    return function() {
-      if (--times < 1) { return func.apply(this, arguments); }
-    };
-  };
-
-
-  // Object Functions
-  // ----------------
-
-  // Retrieve the names of an object's properties.
-  // Delegates to **ECMAScript 5**'s native `Object.keys`
-  _.keys = nativeKeys || function(obj) {
-    if (obj !== Object(obj)) throw new TypeError('Invalid object');
-    var keys = [];
-    for (var key in obj) if (hasOwnProperty.call(obj, key)) keys[keys.length] = key;
-    return keys;
-  };
-
-  // Retrieve the values of an object's properties.
-  _.values = function(obj) {
-    return _.map(obj, _.identity);
-  };
-
-  // Return a sorted list of the function names available on the object.
-  // Aliased as `methods`
-  _.functions = _.methods = function(obj) {
-    var names = [];
-    for (var key in obj) {
-      if (_.isFunction(obj[key])) names.push(key);
-    }
-    return names.sort();
-  };
-
-  // Extend a given object with all the properties in passed-in object(s).
-  _.extend = function(obj) {
-    each(slice.call(arguments, 1), function(source) {
-      for (var prop in source) {
-        if (source[prop] !== void 0) obj[prop] = source[prop];
-      }
-    });
-    return obj;
-  };
-
-  // Fill in a given object with default properties.
-  _.defaults = function(obj) {
-    each(slice.call(arguments, 1), function(source) {
-      for (var prop in source) {
-        if (obj[prop] == null) obj[prop] = source[prop];
-      }
-    });
-    return obj;
-  };
-
-  // Create a (shallow-cloned) duplicate of an object.
-  _.clone = function(obj) {
-    return _.isArray(obj) ? obj.slice() : _.extend({}, obj);
-  };
-
-  // Invokes interceptor with the obj, and then returns obj.
-  // The primary purpose of this method is to "tap into" a method chain, in
-  // order to perform operations on intermediate results within the chain.
-  _.tap = function(obj, interceptor) {
-    interceptor(obj);
-    return obj;
-  };
-
-  // Perform a deep comparison to check if two objects are equal.
-  _.isEqual = function(a, b) {
-    // Check object identity.
-    if (a === b) return true;
-    // Different types?
-    var atype = typeof(a), btype = typeof(b);
-    if (atype != btype) return false;
-    // Basic equality test (watch out for coercions).
-    if (a == b) return true;
-    // One is falsy and the other truthy.
-    if ((!a && b) || (a && !b)) return false;
-    // Unwrap any wrapped objects.
-    if (a._chain) a = a._wrapped;
-    if (b._chain) b = b._wrapped;
-    // One of them implements an isEqual()?
-    if (a.isEqual) return a.isEqual(b);
-    if (b.isEqual) return b.isEqual(a);
-    // Check dates' integer values.
-    if (_.isDate(a) && _.isDate(b)) return a.getTime() === b.getTime();
-    // Both are NaN?
-    if (_.isNaN(a) && _.isNaN(b)) return false;
-    // Compare regular expressions.
-    if (_.isRegExp(a) && _.isRegExp(b))
-      return a.source     === b.source &&
-             a.global     === b.global &&
-             a.ignoreCase === b.ignoreCase &&
-             a.multiline  === b.multiline;
-    // If a is not an object by this point, we can't handle it.
-    if (atype !== 'object') return false;
-    // Check for different array lengths before comparing contents.
-    if (a.length && (a.length !== b.length)) return false;
-    // Nothing else worked, deep compare the contents.
-    var aKeys = _.keys(a), bKeys = _.keys(b);
-    // Different object sizes?
-    if (aKeys.length != bKeys.length) return false;
-    // Recursive comparison of contents.
-    for (var key in a) if (!(key in b) || !_.isEqual(a[key], b[key])) return false;
-    return true;
-  };
-
-  // Is a given array or object empty?
-  _.isEmpty = function(obj) {
-    if (_.isArray(obj) || _.isString(obj)) return obj.length === 0;
-    for (var key in obj) if (hasOwnProperty.call(obj, key)) return false;
-    return true;
-  };
-
-  // Is a given value a DOM element?
-  _.isElement = function(obj) {
-    return !!(obj && obj.nodeType == 1);
-  };
-
-  // Is a given value an array?
-  // Delegates to ECMA5's native Array.isArray
-  _.isArray = nativeIsArray || function(obj) {
-    return toString.call(obj) === '[object Array]';
-  };
-
-  // Is a given variable an object?
-  _.isObject = function(obj) {
-    return obj === Object(obj);
-  };
-
-  // Is a given variable an arguments object?
-  _.isArguments = function(obj) {
-    return !!(obj && hasOwnProperty.call(obj, 'callee'));
-  };
-
-  // Is a given value a function?
-  _.isFunction = function(obj) {
-    return !!(obj && obj.constructor && obj.call && obj.apply);
-  };
-
-  // Is a given value a string?
-  _.isString = function(obj) {
-    return !!(obj === '' || (obj && obj.charCodeAt && obj.substr));
-  };
-
-  // Is a given value a number?
-  _.isNumber = function(obj) {
-    return !!(obj === 0 || (obj && obj.toExponential && obj.toFixed));
-  };
-
-  // Is the given value `NaN`? `NaN` happens to be the only value in JavaScript
-  // that does not equal itself.
-  _.isNaN = function(obj) {
-    return obj !== obj;
-  };
-
-  // Is a given value a boolean?
-  _.isBoolean = function(obj) {
-    return obj === true || obj === false;
-  };
-
-  // Is a given value a date?
-  _.isDate = function(obj) {
-    return !!(obj && obj.getTimezoneOffset && obj.setUTCFullYear);
-  };
-
-  // Is the given value a regular expression?
-  _.isRegExp = function(obj) {
-    return !!(obj && obj.test && obj.exec && (obj.ignoreCase || obj.ignoreCase === false));
-  };
-
-  // Is a given value equal to null?
-  _.isNull = function(obj) {
-    return obj === null;
-  };
-
-  // Is a given variable undefined?
-  _.isUndefined = function(obj) {
-    return obj === void 0;
-  };
-
-  // Utility Functions
-  // -----------------
-
-  // Run Underscore.js in *noConflict* mode, returning the `_` variable to its
-  // previous owner. Returns a reference to the Underscore object.
-  _.noConflict = function() {
-    root._ = previousUnderscore;
-    return this;
-  };
-
-  // Keep the identity function around for default iterators.
-  _.identity = function(value) {
-    return value;
-  };
-
-  // Run a function **n** times.
-  _.times = function (n, iterator, context) {
-    for (var i = 0; i < n; i++) iterator.call(context, i);
-  };
-
-  // Add your own custom functions to the Underscore object, ensuring that
-  // they're correctly added to the OOP wrapper as well.
-  _.mixin = function(obj) {
-    each(_.functions(obj), function(name){
-      addToWrapper(name, _[name] = obj[name]);
-    });
-  };
-
-  // Generate a unique integer id (unique within the entire client session).
-  // Useful for temporary DOM ids.
-  var idCounter = 0;
-  _.uniqueId = function(prefix) {
-    var id = idCounter++;
-    return prefix ? prefix + id : id;
-  };
-
-  // By default, Underscore uses ERB-style template delimiters, change the
-  // following template settings to use alternative delimiters.
-  _.templateSettings = {
-    evaluate    : /<%([\s\S]+?)%>/g,
-    interpolate : /<%=([\s\S]+?)%>/g
-  };
-
-  // JavaScript micro-templating, similar to John Resig's implementation.
-  // Underscore templating handles arbitrary delimiters, preserves whitespace,
-  // and correctly escapes quotes within interpolated code.
-  _.template = function(str, data) {
-    var c  = _.templateSettings;
-    var tmpl = 'var __p=[],print=function(){__p.push.apply(__p,arguments);};' +
-      'with(obj||{}){__p.push(\'' +
-      str.replace(/\\/g, '\\\\')
-         .replace(/'/g, "\\'")
-         .replace(c.interpolate, function(match, code) {
-           return "'," + code.replace(/\\'/g, "'") + ",'";
-         })
-         .replace(c.evaluate || null, function(match, code) {
-           return "');" + code.replace(/\\'/g, "'")
-                              .replace(/[\r\n\t]/g, ' ') + "__p.push('";
-         })
-         .replace(/\r/g, '\\r')
-         .replace(/\n/g, '\\n')
-         .replace(/\t/g, '\\t')
-         + "');}return __p.join('');";
-    var func = new Function('obj', tmpl);
-    return data ? func(data) : func;
-  };
-
-  // The OOP Wrapper
-  // ---------------
-
-  // If Underscore is called as a function, it returns a wrapped object that
-  // can be used OO-style. This wrapper holds altered versions of all the
-  // underscore functions. Wrapped objects may be chained.
-  var wrapper = function(obj) { this._wrapped = obj; };
-
-  // Expose `wrapper.prototype` as `_.prototype`
-  _.prototype = wrapper.prototype;
-
-  // Helper function to continue chaining intermediate results.
-  var result = function(obj, chain) {
-    return chain ? _(obj).chain() : obj;
-  };
-
-  // A method to easily add functions to the OOP wrapper.
-  var addToWrapper = function(name, func) {
-    wrapper.prototype[name] = function() {
-      var args = slice.call(arguments);
-      unshift.call(args, this._wrapped);
-      return result(func.apply(_, args), this._chain);
-    };
-  };
-
-  // Add all of the Underscore functions to the wrapper object.
-  _.mixin(_);
-
-  // Add all mutator Array functions to the wrapper.
-  each(['pop', 'push', 'reverse', 'shift', 'sort', 'splice', 'unshift'], function(name) {
-    var method = ArrayProto[name];
-    wrapper.prototype[name] = function() {
-      method.apply(this._wrapped, arguments);
-      return result(this._wrapped, this._chain);
-    };
-  });
-
-  // Add all accessor Array functions to the wrapper.
-  each(['concat', 'join', 'slice'], function(name) {
-    var method = ArrayProto[name];
-    wrapper.prototype[name] = function() {
-      return result(method.apply(this._wrapped, arguments), this._chain);
-    };
-  });
-
-  // Start chaining a wrapped Underscore object.
-  wrapper.prototype.chain = function() {
-    this._chain = true;
-    return this;
-  };
-
-  // Extracts the result from a wrapped and chained object.
-  wrapper.prototype.value = function() {
-    return this._wrapped;
-  };
-
-})();
-/**
- * Flotr2 (c) 2012 Carl Sutherland
- * MIT License
- * Special thanks to:
- * Flotr: http://code.google.com/p/flotr/ (fork)
- * Flot: https://github.com/flot/flot (original fork)
- */
-(function () {
-
-var
-  global = this,
-  previousFlotr = this.Flotr,
-  Flotr;
-
-Flotr = {
-  _: _,
-  bean: bean,
-  isIphone: /iphone/i.test(navigator.userAgent),
-  isIE: (navigator.appVersion.indexOf("MSIE") != -1 ? parseFloat(navigator.appVersion.split("MSIE")[1]) : false),
-  
-  /**
-   * An object of the registered graph types. Use Flotr.addType(type, object)
-   * to add your own type.
-   */
-  graphTypes: {},
-  
-  /**
-   * The list of the registered plugins
-   */
-  plugins: {},
-  
-  /**
-   * Can be used to add your own chart type. 
-   * @param {String} name - Type of chart, like 'pies', 'bars' etc.
-   * @param {String} graphType - The object containing the basic drawing functions (draw, etc)
-   */
-  addType: function(name, graphType){
-    Flotr.graphTypes[name] = graphType;
-    Flotr.defaultOptions[name] = graphType.options || {};
-    Flotr.defaultOptions.defaultType = Flotr.defaultOptions.defaultType || name;
-  },
-  
-  /**
-   * Can be used to add a plugin
-   * @param {String} name - The name of the plugin
-   * @param {String} plugin - The object containing the plugin's data (callbacks, options, function1, function2, ...)
-   */
-  addPlugin: function(name, plugin){
-    Flotr.plugins[name] = plugin;
-    Flotr.defaultOptions[name] = plugin.options || {};
-  },
-  
-  /**
-   * Draws the graph. This function is here for backwards compatibility with Flotr version 0.1.0alpha.
-   * You could also draw graphs by directly calling Flotr.Graph(element, data, options).
-   * @param {Element} el - element to insert the graph into
-   * @param {Object} data - an array or object of dataseries
-   * @param {Object} options - an object containing options
-   * @param {Class} _GraphKlass_ - (optional) Class to pass the arguments to, defaults to Flotr.Graph
-   * @return {Object} returns a new graph object and of course draws the graph.
-   */
-  draw: function(el, data, options, GraphKlass){  
-    GraphKlass = GraphKlass || Flotr.Graph;
-    return new GraphKlass(el, data, options);
-  },
-  
-  /**
-   * Recursively merges two objects.
-   * @param {Object} src - source object (likely the object with the least properties)
-   * @param {Object} dest - destination object (optional, object with the most properties)
-   * @return {Object} recursively merged Object
-   * @TODO See if we can't remove this.
-   */
-  merge: function(src, dest){
-    var i, v, result = dest || {};
-
-    for (i in src) {
-      v = src[i];
-      if (v && typeof(v) === 'object') {
-        if (v.constructor === Array) {
-          result[i] = this._.clone(v);
-        } else if (v.constructor !== RegExp && !this._.isElement(v)) {
-          result[i] = Flotr.merge(v, (dest ? dest[i] : undefined));
-        } else {
-          result[i] = v;
-        }
-      } else {
-        result[i] = v;
-      }
-    }
-
-    return result;
-  },
-  
-  /**
-   * Recursively clones an object.
-   * @param {Object} object - The object to clone
-   * @return {Object} the clone
-   * @TODO See if we can't remove this.
-   */
-  clone: function(object){
-    return Flotr.merge(object, {});
-  },
-  
-  /**
-   * Function calculates the ticksize and returns it.
-   * @param {Integer} noTicks - number of ticks
-   * @param {Integer} min - lower bound integer value for the current axis
-   * @param {Integer} max - upper bound integer value for the current axis
-   * @param {Integer} decimals - number of decimals for the ticks
-   * @return {Integer} returns the ticksize in pixels
-   */
-  getTickSize: function(noTicks, min, max, decimals){
-    var delta = (max - min) / noTicks,
-        magn = Flotr.getMagnitude(delta),
-        tickSize = 10,
-        norm = delta / magn; // Norm is between 1.0 and 10.0.
-        
-    if(norm < 1.5) tickSize = 1;
-    else if(norm < 2.25) tickSize = 2;
-    else if(norm < 3) tickSize = ((decimals === 0) ? 2 : 2.5);
-    else if(norm < 7.5) tickSize = 5;
-    
-    return tickSize * magn;
-  },
-  
-  /**
-   * Default tick formatter.
-   * @param {String, Integer} val - tick value integer
-   * @param {Object} axisOpts - the axis' options
-   * @return {String} formatted tick string
-   */
-  defaultTickFormatter: function(val, axisOpts){
-    return val+'';
-  },
-  
-  /**
-   * Formats the mouse tracker values.
-   * @param {Object} obj - Track value Object {x:..,y:..}
-   * @return {String} Formatted track string
-   */
-  defaultTrackFormatter: function(obj){
-    return '('+obj.x+', '+obj.y+')';
-  }, 
-  
-  /**
-   * Utility function to convert file size values in bytes to kB, MB, ...
-   * @param value {Number} - The value to convert
-   * @param precision {Number} - The number of digits after the comma (default: 2)
-   * @param base {Number} - The base (default: 1000)
-   */
-  engineeringNotation: function(value, precision, base){
-    var sizes =         ['Y','Z','E','P','T','G','M','k',''],
-        fractionSizes = ['y','z','a','f','p','n','µ','m',''],
-        total = sizes.length;
-
-    base = base || 1000;
-    precision = Math.pow(10, precision || 2);
-
-    if (value === 0) return 0;
-
-    if (value > 1) {
-      while (total-- && (value >= base)) value /= base;
-    }
-    else {
-      sizes = fractionSizes;
-      total = sizes.length;
-      while (total-- && (value < 1)) value *= base;
-    }
-
-    return (Math.round(value * precision) / precision) + sizes[total];
-  },
-  
-  /**
-   * Returns the magnitude of the input value.
-   * @param {Integer, Float} x - integer or float value
-   * @return {Integer, Float} returns the magnitude of the input value
-   */
-  getMagnitude: function(x){
-    return Math.pow(10, Math.floor(Math.log(x) / Math.LN10));
-  },
-  toPixel: function(val){
-    return Math.floor(val)+0.5;//((val-Math.round(val) < 0.4) ? (Math.floor(val)-0.5) : val);
-  },
-  toRad: function(angle){
-    return -angle * (Math.PI/180);
-  },
-  floorInBase: function(n, base) {
-    return base * Math.floor(n / base);
-  },
-  drawText: function(ctx, text, x, y, style) {
-    if (!ctx.fillText) {
-      ctx.drawText(text, x, y, style);
-      return;
-    }
-    
-    style = this._.extend({
-      size: Flotr.defaultOptions.fontSize,
-      color: '#000000',
-      textAlign: 'left',
-      textBaseline: 'bottom',
-      weight: 1,
-      angle: 0
-    }, style);
-    
-    ctx.save();
-    ctx.translate(x, y);
-    ctx.rotate(style.angle);
-    ctx.fillStyle = style.color;
-    ctx.font = (style.weight > 1 ? "bold " : "") + (style.size*1.3) + "px sans-serif";
-    ctx.textAlign = style.textAlign;
-    ctx.textBaseline = style.textBaseline;
-    ctx.fillText(text, 0, 0);
-    ctx.restore();
-  },
-  getBestTextAlign: function(angle, style) {
-    style = style || {textAlign: 'center', textBaseline: 'middle'};
-    angle += Flotr.getTextAngleFromAlign(style);
-    
-    if (Math.abs(Math.cos(angle)) > 10e-3) 
-      style.textAlign    = (Math.cos(angle) > 0 ? 'right' : 'left');
-    
-    if (Math.abs(Math.sin(angle)) > 10e-3) 
-      style.textBaseline = (Math.sin(angle) > 0 ? 'top' : 'bottom');
-    
-    return style;
-  },
-  alignTable: {
-    'right middle' : 0,
-    'right top'    : Math.PI/4,
-    'center top'   : Math.PI/2,
-    'left top'     : 3*(Math.PI/4),
-    'left middle'  : Math.PI,
-    'left bottom'  : -3*(Math.PI/4),
-    'center bottom': -Math.PI/2,
-    'right bottom' : -Math.PI/4,
-    'center middle': 0
-  },
-  getTextAngleFromAlign: function(style) {
-    return Flotr.alignTable[style.textAlign+' '+style.textBaseline] || 0;
-  },
-  noConflict : function () {
-    global.Flotr = previousFlotr;
-    return this;
-  }
-};
-
-global.Flotr = Flotr;
-
-})();
-
-/**
- * Flotr Defaults
- */
-Flotr.defaultOptions = {
-  colors: ['#00A8F0', '#C0D800', '#CB4B4B', '#4DA74D', '#9440ED'], //=> The default colorscheme. When there are > 5 series, additional colors are generated.
-  ieBackgroundColor: '#FFFFFF', // Background color for excanvas clipping
-  title: null,             // => The graph's title
-  subtitle: null,          // => The graph's subtitle
-  shadowSize: 4,           // => size of the 'fake' shadow
-  defaultType: null,       // => default series type
-  HtmlText: true,          // => wether to draw the text using HTML or on the canvas
-  fontColor: '#545454',    // => default font color
-  fontSize: 7.5,           // => canvas' text font size
-  resolution: 1,           // => resolution of the graph, to have printer-friendly graphs !
-  parseFloat: true,        // => whether to preprocess data for floats (ie. if input is string)
-  xaxis: {
-    ticks: null,           // => format: either [1, 3] or [[1, 'a'], 3]
-    minorTicks: null,      // => format: either [1, 3] or [[1, 'a'], 3]
-    showLabels: true,      // => setting to true will show the axis ticks labels, hide otherwise
-    showMinorLabels: false,// => true to show the axis minor ticks labels, false to hide
-    labelsAngle: 0,        // => labels' angle, in degrees
-    title: null,           // => axis title
-    titleAngle: 0,         // => axis title's angle, in degrees
-    noTicks: 5,            // => number of ticks for automagically generated ticks
-    minorTickFreq: null,   // => number of minor ticks between major ticks for autogenerated ticks
-    tickFormatter: Flotr.defaultTickFormatter, // => fn: number, Object -> string
-    tickDecimals: null,    // => no. of decimals, null means auto
-    min: null,             // => min. value to show, null means set automatically
-    max: null,             // => max. value to show, null means set automatically
-    autoscale: false,      // => Turns autoscaling on with true
-    autoscaleMargin: 0,    // => margin in % to add if auto-setting min/max
-    color: null,           // => color of the ticks
-    mode: 'normal',        // => can be 'time' or 'normal'
-    timeFormat: null,
-    timeMode:'UTC',        // => For UTC time ('local' for local time).
-    timeUnit:'millisecond',// => Unit for time (millisecond, second, minute, hour, day, month, year)
-    scaling: 'linear',     // => Scaling, can be 'linear' or 'logarithmic'
-    base: Math.E,
-    titleAlign: 'center',
-    margin: true           // => Turn off margins with false
-  },
-  x2axis: {},
-  yaxis: {
-    ticks: null,           // => format: either [1, 3] or [[1, 'a'], 3]
-    minorTicks: null,      // => format: either [1, 3] or [[1, 'a'], 3]
-    showLabels: true,      // => setting to true will show the axis ticks labels, hide otherwise
-    showMinorLabels: false,// => true to show the axis minor ticks labels, false to hide
-    labelsAngle: 0,        // => labels' angle, in degrees
-    title: null,           // => axis title
-    titleAngle: 90,        // => axis title's angle, in degrees
-    noTicks: 5,            // => number of ticks for automagically generated ticks
-    minorTickFreq: null,   // => number of minor ticks between major ticks for autogenerated ticks
-    tickFormatter: Flotr.defaultTickFormatter, // => fn: number, Object -> string
-    tickDecimals: null,    // => no. of decimals, null means auto
-    min: null,             // => min. value to show, null means set automatically
-    max: null,             // => max. value to show, null means set automatically
-    autoscale: false,      // => Turns autoscaling on with true
-    autoscaleMargin: 0,    // => margin in % to add if auto-setting min/max
-    color: null,           // => The color of the ticks
-    scaling: 'linear',     // => Scaling, can be 'linear' or 'logarithmic'
-    base: Math.E,
-    titleAlign: 'center',
-    margin: true           // => Turn off margins with false
-  },
-  y2axis: {
-    titleAngle: 270
-  },
-  grid: {
-    color: '#545454',      // => primary color used for outline and labels
-    backgroundColor: null, // => null for transparent, else color
-    backgroundImage: null, // => background image. String or object with src, left and top
-    watermarkAlpha: 0.4,   // => 
-    tickColor: '#DDDDDD',  // => color used for the ticks
-    labelMargin: 3,        // => margin in pixels
-    verticalLines: true,   // => whether to show gridlines in vertical direction
-    minorVerticalLines: null, // => whether to show gridlines for minor ticks in vertical dir.
-    horizontalLines: true, // => whether to show gridlines in horizontal direction
-    minorHorizontalLines: null, // => whether to show gridlines for minor ticks in horizontal dir.
-    outlineWidth: 1,       // => width of the grid outline/border in pixels
-    outline : 'nsew',      // => walls of the outline to display
-    circular: false        // => if set to true, the grid will be circular, must be used when radars are drawn
-  },
-  mouse: {
-    track: false,          // => true to track the mouse, no tracking otherwise
-    trackAll: false,
-    position: 'se',        // => position of the value box (default south-east)
-    relative: false,       // => next to the mouse cursor
-    trackFormatter: Flotr.defaultTrackFormatter, // => formats the values in the value box
-    margin: 5,             // => margin in pixels of the valuebox
-    lineColor: '#FF3F19',  // => line color of points that are drawn when mouse comes near a value of a series
-    trackDecimals: 1,      // => decimals for the track values
-    sensibility: 2,        // => the lower this number, the more precise you have to aim to show a value
-    trackY: true,          // => whether or not to track the mouse in the y axis
-    radius: 3,             // => radius of the track point
-    fillColor: null,       // => color to fill our select bar with only applies to bar and similar graphs (only bars for now)
-    fillOpacity: 0.4       // => opacity of the fill color, set to 1 for a solid fill, 0 hides the fill 
-  }
-};
-
-/**
- * Flotr Color
- */
-
-(function () {
-
-var
-  _ = Flotr._;
-
-// Constructor
-function Color (r, g, b, a) {
-  this.rgba = ['r','g','b','a'];
-  var x = 4;
-  while(-1<--x){
-    this[this.rgba[x]] = arguments[x] || ((x==3) ? 1.0 : 0);
-  }
-  this.normalize();
-}
-
-// Constants
-var COLOR_NAMES = {
-  aqua:[0,255,255],azure:[240,255,255],beige:[245,245,220],black:[0,0,0],blue:[0,0,255],
-  brown:[165,42,42],cyan:[0,255,255],darkblue:[0,0,139],darkcyan:[0,139,139],darkgrey:[169,169,169],
-  darkgreen:[0,100,0],darkkhaki:[189,183,107],darkmagenta:[139,0,139],darkolivegreen:[85,107,47],
-  darkorange:[255,140,0],darkorchid:[153,50,204],darkred:[139,0,0],darksalmon:[233,150,122],
-  darkviolet:[148,0,211],fuchsia:[255,0,255],gold:[255,215,0],green:[0,128,0],indigo:[75,0,130],
-  khaki:[240,230,140],lightblue:[173,216,230],lightcyan:[224,255,255],lightgreen:[144,238,144],
-  lightgrey:[211,211,211],lightpink:[255,182,193],lightyellow:[255,255,224],lime:[0,255,0],magenta:[255,0,255],
-  maroon:[128,0,0],navy:[0,0,128],olive:[128,128,0],orange:[255,165,0],pink:[255,192,203],purple:[128,0,128],
-  violet:[128,0,128],red:[255,0,0],silver:[192,192,192],white:[255,255,255],yellow:[255,255,0]
-};
-
-Color.prototype = {
-  scale: function(rf, gf, bf, af){
-    var x = 4;
-    while (-1 < --x) {
-      if (!_.isUndefined(arguments[x])) this[this.rgba[x]] *= arguments[x];
-    }
-    return this.normalize();
-  },
-  alpha: function(alpha) {
-    if (!_.isUndefined(alpha) && !_.isNull(alpha)) {
-      this.a = alpha;
-    }
-    return this.normalize();
-  },
-  clone: function(){
-    return new Color(this.r, this.b, this.g, this.a);
-  },
-  limit: function(val,minVal,maxVal){
-    return Math.max(Math.min(val, maxVal), minVal);
-  },
-  normalize: function(){
-    var limit = this.limit;
-    this.r = limit(parseInt(this.r, 10), 0, 255);
-    this.g = limit(parseInt(this.g, 10), 0, 255);
-    this.b = limit(parseInt(this.b, 10), 0, 255);
-    this.a = limit(this.a, 0, 1);
-    return this;
-  },
-  distance: function(color){
-    if (!color) return;
-    color = new Color.parse(color);
-    var dist = 0, x = 3;
-    while(-1<--x){
-      dist += Math.abs(this[this.rgba[x]] - color[this.rgba[x]]);
-    }
-    return dist;
-  },
-  toString: function(){
-    return (this.a >= 1.0) ? 'rgb('+[this.r,this.g,this.b].join(',')+')' : 'rgba('+[this.r,this.g,this.b,this.a].join(',')+')';
-  },
-  contrast: function () {
-    var
-      test = 1 - ( 0.299 * this.r + 0.587 * this.g + 0.114 * this.b) / 255;
-    return (test < 0.5 ? '#000000' : '#ffffff');
-  }
-};
-
-_.extend(Color, {
-  /**
-   * Parses a color string and returns a corresponding Color.
-   * The different tests are in order of probability to improve speed.
-   * @param {String, Color} str - string thats representing a color
-   * @return {Color} returns a Color object or false
-   */
-  parse: function(color){
-    if (color instanceof Color) return color;
-
-    var result;
-
-    // #a0b1c2
-    if((result = /#([a-fA-F0-9]{2})([a-fA-F0-9]{2})([a-fA-F0-9]{2})/.exec(color)))
-      return new Color(parseInt(result[1], 16), parseInt(result[2], 16), parseInt(result[3], 16));
-
-    // rgb(num,num,num)
-    if((result = /rgb\(\s*([0-9]{1,3})\s*,\s*([0-9]{1,3})\s*,\s*([0-9]{1,3})\s*\)/.exec(color)))
-      return new Color(parseInt(result[1], 10), parseInt(result[2], 10), parseInt(result[3], 10));
-  
-    // #fff
-    if((result = /#([a-fA-F0-9])([a-fA-F0-9])([a-fA-F0-9])/.exec(color)))
-      return new Color(parseInt(result[1]+result[1],16), parseInt(result[2]+result[2],16), parseInt(result[3]+result[3],16));
-  
-    // rgba(num,num,num,num)
-    if((result = /rgba\(\s*([0-9]{1,3})\s*,\s*([0-9]{1,3})\s*,\s*([0-9]{1,3})\s*,\s*([0-9]+(?:\.[0-9]+)?)\s*\)/.exec(color)))
-      return new Color(parseInt(result[1], 10), parseInt(result[2], 10), parseInt(result[3], 10), parseFloat(result[4]));
-      
-    // rgb(num%,num%,num%)
-    if((result = /rgb\(\s*([0-9]+(?:\.[0-9]+)?)\%\s*,\s*([0-9]+(?:\.[0-9]+)?)\%\s*,\s*([0-9]+(?:\.[0-9]+)?)\%\s*\)/.exec(color)))
-      return new Color(parseFloat(result[1])*2.55, parseFloat(result[2])*2.55, parseFloat(result[3])*2.55);
-  
-    // rgba(num%,num%,num%,num)
-    if((result = /rgba\(\s*([0-9]+(?:\.[0-9]+)?)\%\s*,\s*([0-9]+(?:\.[0-9]+)?)\%\s*,\s*([0-9]+(?:\.[0-9]+)?)\%\s*,\s*([0-9]+(?:\.[0-9]+)?)\s*\)/.exec(color)))
-      return new Color(parseFloat(result[1])*2.55, parseFloat(result[2])*2.55, parseFloat(result[3])*2.55, parseFloat(result[4]));
-
-    // Otherwise, we're most likely dealing with a named color.
-    var name = (color+'').replace(/^\s*([\S\s]*?)\s*$/, '$1').toLowerCase();
-    if(name == 'transparent'){
-      return new Color(255, 255, 255, 0);
-    }
-    return (result = COLOR_NAMES[name]) ? new Color(result[0], result[1], result[2]) : new Color(0, 0, 0, 0);
-  },
-
-  /**
-   * Process color and options into color style.
-   */
-  processColor: function(color, options) {
-
-    var opacity = options.opacity;
-    if (!color) return 'rgba(0, 0, 0, 0)';
-    if (color instanceof Color) return color.alpha(opacity).toString();
-    if (_.isString(color)) return Color.parse(color).alpha(opacity).toString();
-    
-    var grad = color.colors ? color : {colors: color};
-    
-    if (!options.ctx) {
-      if (!_.isArray(grad.colors)) return 'rgba(0, 0, 0, 0)';
-      return Color.parse(_.isArray(grad.colors[0]) ? grad.colors[0][1] : grad.colors[0]).alpha(opacity).toString();
-    }
-    grad = _.extend({start: 'top', end: 'bottom'}, grad); 
-    
-    if (/top/i.test(grad.start))  options.x1 = 0;
-    if (/left/i.test(grad.start)) options.y1 = 0;
-    if (/bottom/i.test(grad.end)) options.x2 = 0;
-    if (/right/i.test(grad.end))  options.y2 = 0;
-
-    var i, c, stop, gradient = options.ctx.createLinearGradient(options.x1, options.y1, options.x2, options.y2);
-    for (i = 0; i < grad.colors.length; i++) {
-      c = grad.colors[i];
-      if (_.isArray(c)) {
-        stop = c[0];
-        c = c[1];
-      }
-      else stop = i / (grad.colors.length-1);
-      gradient.addColorStop(stop, Color.parse(c).alpha(opacity));
-    }
-    return gradient;
-  }
-});
-
-Flotr.Color = Color;
-
-})();
-
-/**
- * Flotr Date
- */
-Flotr.Date = {
-
-  set : function (date, name, mode, value) {
-    mode = mode || 'UTC';
-    name = 'set' + (mode === 'UTC' ? 'UTC' : '') + name;
-    date[name](value);
-  },
-
-  get : function (date, name, mode) {
-    mode = mode || 'UTC';
-    name = 'get' + (mode === 'UTC' ? 'UTC' : '') + name;
-    return date[name]();
-  },
-
-  format: function(d, format, mode) {
-    if (!d) return;
-
-    // We should maybe use an "official" date format spec, like PHP date() or ColdFusion 
-    // http://fr.php.net/manual/en/function.date.php
-    // http://livedocs.adobe.com/coldfusion/8/htmldocs/help.html?content=functions_c-d_29.html
-    var
-      get = this.get,
-      tokens = {
-        h: get(d, 'Hours', mode).toString(),
-        H: leftPad(get(d, 'Hours', mode)),
-        M: leftPad(get(d, 'Minutes', mode)),
-        S: leftPad(get(d, 'Seconds', mode)),
-        s: get(d, 'Milliseconds', mode),
-        d: get(d, 'Date', mode).toString(),
-        m: (get(d, 'Month') + 1).toString(),
-        y: get(d, 'FullYear').toString(),
-        b: Flotr.Date.monthNames[get(d, 'Month', mode)]
-      };
-
-    function leftPad(n){
-      n += '';
-      return n.length == 1 ? "0" + n : n;
-    }
-    
-    var r = [], c,
-        escape = false;
-    
-    for (var i = 0; i < format.length; ++i) {
-      c = format.charAt(i);
-      
-      if (escape) {
-        r.push(tokens[c] || c);
-        escape = false;
-      }
-      else if (c == "%")
-        escape = true;
-      else
-        r.push(c);
-    }
-    return r.join('');
-  },
-  getFormat: function(time, span) {
-    var tu = Flotr.Date.timeUnits;
-         if (time < tu.second) return "%h:%M:%S.%s";
-    else if (time < tu.minute) return "%h:%M:%S";
-    else if (time < tu.day)    return (span < 2 * tu.day) ? "%h:%M" : "%b %d %h:%M";
-    else if (time < tu.month)  return "%b %d";
-    else if (time < tu.year)   return (span < tu.year) ? "%b" : "%b %y";
-    else                       return "%y";
-  },
-  formatter: function (v, axis) {
-    var
-      options = axis.options,
-      scale = Flotr.Date.timeUnits[options.timeUnit],
-      d = new Date(v * scale);
-
-    // first check global format
-    if (axis.options.timeFormat)
-      return Flotr.Date.format(d, options.timeFormat, options.timeMode);
-    
-    var span = (axis.max - axis.min) * scale,
-        t = axis.tickSize * Flotr.Date.timeUnits[axis.tickUnit];
-
-    return Flotr.Date.format(d, Flotr.Date.getFormat(t, span), options.timeMode);
-  },
-  generator: function(axis) {
-
-     var
-      set       = this.set,
-      get       = this.get,
-      timeUnits = this.timeUnits,
-      spec      = this.spec,
-      options   = axis.options,
-      mode      = options.timeMode,
-      scale     = timeUnits[options.timeUnit],
-      min       = axis.min * scale,
-      max       = axis.max * scale,
-      delta     = (max - min) / options.noTicks,
-      ticks     = [],
-      tickSize  = axis.tickSize,
-      tickUnit,
-      formatter, i;
-
-    // Use custom formatter or time tick formatter
-    formatter = (options.tickFormatter === Flotr.defaultTickFormatter ?
-      this.formatter : options.tickFormatter
-    );
-
-    for (i = 0; i < spec.length - 1; ++i) {
-      var d = spec[i][0] * timeUnits[spec[i][1]];
-      if (delta < (d + spec[i+1][0] * timeUnits[spec[i+1][1]]) / 2 && d >= tickSize)
-        break;
-    }
-    tickSize = spec[i][0];
-    tickUnit = spec[i][1];
-
-    // special-case the possibility of several years
-    if (tickUnit == "year") {
-      tickSize = Flotr.getTickSize(options.noTicks*timeUnits.year, min, max, 0);
-
-      // Fix for 0.5 year case
-      if (tickSize == 0.5) {
-        tickUnit = "month";
-        tickSize = 6;
-      }
-    }
-
-    axis.tickUnit = tickUnit;
-    axis.tickSize = tickSize;
-
-    var
-      d = new Date(min);
-
-    var step = tickSize * timeUnits[tickUnit];
-
-    function setTick (name) {
-      set(d, name, mode, Flotr.floorInBase(
-        get(d, name, mode), tickSize
-      ));
-    }
-
-    switch (tickUnit) {
-      case "millisecond": setTick('Milliseconds'); break;
-      case "second": setTick('Seconds'); break;
-      case "minute": setTick('Minutes'); break;
-      case "hour": setTick('Hours'); break;
-      case "month": setTick('Month'); break;
-      case "year": setTick('FullYear'); break;
-    }
-    
-    // reset smaller components
-    if (step >= timeUnits.second)  set(d, 'Milliseconds', mode, 0);
-    if (step >= timeUnits.minute)  set(d, 'Seconds', mode, 0);
-    if (step >= timeUnits.hour)    set(d, 'Minutes', mode, 0);
-    if (step >= timeUnits.day)     set(d, 'Hours', mode, 0);
-    if (step >= timeUnits.day * 4) set(d, 'Date', mode, 1);
-    if (step >= timeUnits.year)    set(d, 'Month', mode, 0);
-
-    var carry = 0, v = NaN, prev;
-    do {
-      prev = v;
-      v = d.getTime();
-      ticks.push({ v: v / scale, label: formatter(v / scale, axis) });
-      if (tickUnit == "month") {
-        if (tickSize < 1) {
-          /* a bit complicated - we'll divide the month up but we need to take care of fractions
-           so we don't end up in the middle of a day */
-          set(d, 'Date', mode, 1);
-          var start = d.getTime();
-          set(d, 'Month', mode, get(d, 'Month', mode) + 1)
-          var end = d.getTime();
-          d.setTime(v + carry * timeUnits.hour + (end - start) * tickSize);
-          carry = get(d, 'Hours', mode)
-          set(d, 'Hours', mode, 0);
-        }
-        else
-          set(d, 'Month', mode, get(d, 'Month', mode) + tickSize);
-      }
-      else if (tickUnit == "year") {
-        set(d, 'FullYear', mode, get(d, 'FullYear', mode) + tickSize);
-      }
-      else
-        d.setTime(v + step);
-
-    } while (v < max && v != prev);
-
-    return ticks;
-  },
-  timeUnits: {
-    millisecond: 1,
-    second: 1000,
-    minute: 1000 * 60,
-    hour:   1000 * 60 * 60,
-    day:    1000 * 60 * 60 * 24,
-    month:  1000 * 60 * 60 * 24 * 30,
-    year:   1000 * 60 * 60 * 24 * 365.2425
-  },
-  // the allowed tick sizes, after 1 year we use an integer algorithm
-  spec: [
-    [1, "millisecond"], [20, "millisecond"], [50, "millisecond"], [100, "millisecond"], [200, "millisecond"], [500, "millisecond"], 
-    [1, "second"],   [2, "second"],  [5, "second"], [10, "second"], [30, "second"], 
-    [1, "minute"],   [2, "minute"],  [5, "minute"], [10, "minute"], [30, "minute"], 
-    [1, "hour"],     [2, "hour"],    [4, "hour"],   [8, "hour"],    [12, "hour"],
-    [1, "day"],      [2, "day"],     [3, "day"],
-    [0.25, "month"], [0.5, "month"], [1, "month"],  [2, "month"],   [3, "month"], [6, "month"],
-    [1, "year"]
-  ],
-  monthNames: ["Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec"]
-};
-
-(function () {
-
-var _ = Flotr._;
-
-Flotr.DOM = {
-  addClass: function(element, name){
-    var classList = (element.className ? element.className : '');
-      if (_.include(classList.split(/\s+/g), name)) return;
-    element.className = (classList ? classList + ' ' : '') + name;
-  },
-  /**
-   * Create an element.
-   */
-  create: function(tag){
-    return document.createElement(tag);
-  },
-  node: function(html) {
-    var div = Flotr.DOM.create('div'), n;
-    div.innerHTML = html;
-    n = div.children[0];
-    div.innerHTML = '';
-    return n;
-  },
-  /**
-   * Remove all children.
-   */
-  empty: function(element){
-    element.innerHTML = '';
-    /*
-    if (!element) return;
-    _.each(element.childNodes, function (e) {
-      Flotr.DOM.empty(e);
-      element.removeChild(e);
-    });
-    */
-  },
-  hide: function(element){
-    Flotr.DOM.setStyles(element, {display:'none'});
-  },
-  /**
-   * Insert a child.
-   * @param {Element} element
-   * @param {Element|String} Element or string to be appended.
-   */
-  insert: function(element, child){
-    if(_.isString(child))
-      element.innerHTML += child;
-    else if (_.isElement(child))
-      element.appendChild(child);
-  },
-  // @TODO find xbrowser implementation
-  opacity: function(element, opacity) {
-    element.style.opacity = opacity;
-  },
-  position: function(element, p){
-    if (!element.offsetParent)
-      return {left: (element.offsetLeft || 0), top: (element.offsetTop || 0)};
-
-    p = this.position(element.offsetParent);
-    p.left  += element.offsetLeft;
-    p.top   += element.offsetTop;
-    return p;
-  },
-  removeClass: function(element, name) {
-    var classList = (element.className ? element.className : '');
-    element.className = _.filter(classList.split(/\s+/g), function (c) {
-      if (c != name) return true; }
-    ).join(' ');
-  },
-  setStyles: function(element, o) {
-    _.each(o, function (value, key) {
-      element.style[key] = value;
-    });
-  },
-  show: function(element){
-    Flotr.DOM.setStyles(element, {display:''});
-  },
-  /**
-   * Return element size.
-   */
-  size: function(element){
-    return {
-      height : element.offsetHeight,
-      width : element.offsetWidth };
-  }
-};
-
-})();
-
-/**
- * Flotr Event Adapter
- */
-(function () {
-var
-  F = Flotr,
-  bean = F.bean;
-F.EventAdapter = {
-  observe: function(object, name, callback) {
-    bean.add(object, name, callback);
-    return this;
-  },
-  fire: function(object, name, args) {
-    bean.fire(object, name, args);
-    if (typeof(Prototype) != 'undefined')
-      Event.fire(object, name, args);
-    // @TODO Someone who uses mootools, add mootools adapter for existing applciations.
-    return this;
-  },
-  stopObserving: function(object, name, callback) {
-    bean.remove(object, name, callback);
-    return this;
-  },
-  eventPointer: function(e) {
-    if (!F._.isUndefined(e.touches) && e.touches.length > 0) {
-      return {
-        x : e.touches[0].pageX,
-        y : e.touches[0].pageY
-      };
-    } else if (!F._.isUndefined(e.changedTouches) && e.changedTouches.length > 0) {
-      return {
-        x : e.changedTouches[0].pageX,
-        y : e.changedTouches[0].pageY
-      };
-    } else if (e.pageX || e.pageY) {
-      return {
-        x : e.pageX,
-        y : e.pageY
-      };
-    } else if (e.clientX || e.clientY) {
-      var
-        d = document,
-        b = d.body,
-        de = d.documentElement;
-      return {
-        x: e.clientX + b.scrollLeft + de.scrollLeft,
-        y: e.clientY + b.scrollTop + de.scrollTop
-      };
-    }
-  }
-};
-})();
-
-/**
- * Text Utilities
- */
-(function () {
-
-var
-  F = Flotr,
-  D = F.DOM,
-  _ = F._,
-
-Text = function (o) {
-  this.o = o;
-};
-
-Text.prototype = {
-
-  dimensions : function (text, canvasStyle, htmlStyle, className) {
-
-    if (!text) return { width : 0, height : 0 };
-    
-    return (this.o.html) ?
-      this.html(text, this.o.element, htmlStyle, className) : 
-      this.canvas(text, canvasStyle);
-  },
-
-  canvas : function (text, style) {
-
-    if (!this.o.textEnabled) return;
-    style = style || {};
-
-    var
-      metrics = this.measureText(text, style),
-      width = metrics.width,
-      height = style.size || F.defaultOptions.fontSize,
-      angle = style.angle || 0,
-      cosAngle = Math.cos(angle),
-      sinAngle = Math.sin(angle),
-      widthPadding = 2,
-      heightPadding = 6,
-      bounds;
-
-    bounds = {
-      width: Math.abs(cosAngle * width) + Math.abs(sinAngle * height) + widthPadding,
-      height: Math.abs(sinAngle * width) + Math.abs(cosAngle * height) + heightPadding
-    };
-
-    return bounds;
-  },
-
-  html : function (text, element, style, className) {
-
-    var div = D.create('div');
-
-    D.setStyles(div, { 'position' : 'absolute', 'top' : '-10000px' });
-    D.insert(div, '<div style="'+style+'" class="'+className+' flotr-dummy-div">' + text + '</div>');
-    D.insert(this.o.element, div);
-
-    return D.size(div);
-  },
-
-  measureText : function (text, style) {
-
-    var
-      context = this.o.ctx,
-      metrics;
-
-    if (!context.fillText || (F.isIphone && context.measure)) {
-      return { width : context.measure(text, style)};
-    }
-
-    style = _.extend({
-      size: F.defaultOptions.fontSize,
-      weight: 1,
-      angle: 0
-    }, style);
-
-    context.save();
-    context.font = (style.weight > 1 ? "bold " : "") + (style.size*1.3) + "px sans-serif";
-    metrics = context.measureText(text);
-    context.restore();
-
-    return metrics;
-  }
-};
-
-Flotr.Text = Text;
-
-})();
-
-/**
- * Flotr Graph class that plots a graph on creation.
- */
-(function () {
-
-var
-  D     = Flotr.DOM,
-  E     = Flotr.EventAdapter,
-  _     = Flotr._,
-  flotr = Flotr;
-/**
- * Flotr Graph constructor.
- * @param {Element} el - element to insert the graph into
- * @param {Object} data - an array or object of dataseries
- * @param {Object} options - an object containing options
- */
-Graph = function(el, data, options){
-// Let's see if we can get away with out this [JS]
-//  try {
-    this._setEl(el);
-    this._initMembers();
-    this._initPlugins();
-
-    E.fire(this.el, 'flotr:beforeinit', [this]);
-
-    this.data = data;
-    this.series = flotr.Series.getSeries(data);
-    this._initOptions(options);
-    this._initGraphTypes();
-    this._initCanvas();
-    this._text = new flotr.Text({
-      element : this.el,
-      ctx : this.ctx,
-      html : this.options.HtmlText,
-      textEnabled : this.textEnabled
-    });
-    E.fire(this.el, 'flotr:afterconstruct', [this]);
-    this._initEvents();
-
-    this.findDataRanges();
-    this.calculateSpacing();
-
-    this.draw(_.bind(function() {
-      E.fire(this.el, 'flotr:afterinit', [this]);
-    }, this));
-/*
-    try {
-  } catch (e) {
-    try {
-      console.error(e);
-    } catch (e2) {}
-  }*/
-};
-
-function observe (object, name, callback) {
-  E.observe.apply(this, arguments);
-  this._handles.push(arguments);
-  return this;
-}
-
-Graph.prototype = {
-
-  destroy: function () {
-    E.fire(this.el, 'flotr:destroy');
-    _.each(this._handles, function (handle) {
-      E.stopObserving.apply(this, handle);
-    });
-    this._handles = [];
-    this.el.graph = null;
-  },
-
-  observe : observe,
-
-  /**
-   * @deprecated
-   */
-  _observe : observe,
-
-  processColor: function(color, options){
-    var o = { x1: 0, y1: 0, x2: this.plotWidth, y2: this.plotHeight, opacity: 1, ctx: this.ctx };
-    _.extend(o, options);
-    return flotr.Color.processColor(color, o);
-  },
-  /**
-   * Function determines the min and max values for the xaxis and yaxis.
-   *
-   * TODO logarithmic range validation (consideration of 0)
-   */
-  findDataRanges: function(){
-    var a = this.axes,
-      xaxis, yaxis, range;
-
-    _.each(this.series, function (series) {
-      range = series.getRange();
-      if (range) {
-        xaxis = series.xaxis;
-        yaxis = series.yaxis;
-        xaxis.datamin = Math.min(range.xmin, xaxis.datamin);
-        xaxis.datamax = Math.max(range.xmax, xaxis.datamax);
-        yaxis.datamin = Math.min(range.ymin, yaxis.datamin);
-        yaxis.datamax = Math.max(range.ymax, yaxis.datamax);
-        xaxis.used = (xaxis.used || range.xused);
-        yaxis.used = (yaxis.used || range.yused);
-      }
-    }, this);
-
-    // Check for empty data, no data case (none used)
-    if (!a.x.used && !a.x2.used) a.x.used = true;
-    if (!a.y.used && !a.y2.used) a.y.used = true;
-
-    _.each(a, function (axis) {
-      axis.calculateRange();
-    });
-
-    var
-      types = _.keys(flotr.graphTypes),
-      drawn = false;
-
-    _.each(this.series, function (series) {
-      if (series.hide) return;
-      _.each(types, function (type) {
-        if (series[type] && series[type].show) {
-          this.extendRange(type, series);
-          drawn = true;
-        }
-      }, this);
-      if (!drawn) {
-        this.extendRange(this.options.defaultType, series);
-      }
-    }, this);
-  },
-
-  extendRange : function (type, series) {
-    if (this[type].extendRange) this[type].extendRange(series, series.data, series[type], this[type]);
-    if (this[type].extendYRange) this[type].extendYRange(series.yaxis, series.data, series[type], this[type]);
-    if (this[type].extendXRange) this[type].extendXRange(series.xaxis, series.data, series[type], this[type]);
-  },
-
-  /**
-   * Calculates axis label sizes.
-   */
-  calculateSpacing: function(){
-
-    var a = this.axes,
-        options = this.options,
-        series = this.series,
-        margin = options.grid.labelMargin,
-        T = this._text,
-        x = a.x,
-        x2 = a.x2,
-        y = a.y,
-        y2 = a.y2,
-        maxOutset = options.grid.outlineWidth,
-        i, j, l, dim;
-
-    // TODO post refactor, fix this
-    _.each(a, function (axis) {
-      axis.calculateTicks();
-      axis.calculateTextDimensions(T, options);
-    });
-
-    // Title height
-    dim = T.dimensions(
-      options.title,
-      {size: options.fontSize*1.5},
-      'font-size:1em;font-weight:bold;',
-      'flotr-title'
-    );
-    this.titleHeight = dim.height;
-
-    // Subtitle height
-    dim = T.dimensions(
-      options.subtitle,
-      {size: options.fontSize},
-      'font-size:smaller;',
-      'flotr-subtitle'
-    );
-    this.subtitleHeight = dim.height;
-
-    for(j = 0; j < options.length; ++j){
-      if (series[j].points.show){
-        maxOutset = Math.max(maxOutset, series[j].points.radius + series[j].points.lineWidth/2);
-      }
-    }
-
-    var p = this.plotOffset;
-    if (x.options.margin === false) {
-      p.bottom = 0;
-      p.top    = 0;
-    } else {
-      p.bottom += (options.grid.circular ? 0 : (x.used && x.options.showLabels ?  (x.maxLabel.height + margin) : 0)) +
-                  (x.used && x.options.title ? (x.titleSize.height + margin) : 0) + maxOutset;
-
-      p.top    += (options.grid.circular ? 0 : (x2.used && x2.options.showLabels ? (x2.maxLabel.height + margin) : 0)) +
-                  (x2.used && x2.options.title ? (x2.titleSize.height + margin) : 0) + this.subtitleHeight + this.titleHeight + maxOutset;
-    }
-    if (y.options.margin === false) {
-      p.left  = 0;
-      p.right = 0;
-    } else {
-      p.left   += (options.grid.circular ? 0 : (y.used && y.options.showLabels ?  (y.maxLabel.width + margin) : 0)) +
-                  (y.used && y.options.title ? (y.titleSize.width + margin) : 0) + maxOutset;
-
-      p.right  += (options.grid.circular ? 0 : (y2.used && y2.options.showLabels ? (y2.maxLabel.width + margin) : 0)) +
-                  (y2.used && y2.options.title ? (y2.titleSize.width + margin) : 0) + maxOutset;
-    }
-
-    p.top = Math.floor(p.top); // In order the outline not to be blured
-
-    this.plotWidth  = this.canvasWidth - p.left - p.right;
-    this.plotHeight = this.canvasHeight - p.bottom - p.top;
-
-    // TODO post refactor, fix this
-    x.length = x2.length = this.plotWidth;
-    y.length = y2.length = this.plotHeight;
-    y.offset = y2.offset = this.plotHeight;
-    x.setScale();
-    x2.setScale();
-    y.setScale();
-    y2.setScale();
-  },
-  /**
-   * Draws grid, labels, series and outline.
-   */
-  draw: function(after) {
-
-    var
-      context = this.ctx,
-      i;
-
-    E.fire(this.el, 'flotr:beforedraw', [this.series, this]);
-
-    if (this.series.length) {
-
-      context.save();
-      context.translate(this.plotOffset.left, this.plotOffset.top);
-
-      for (i = 0; i < this.series.length; i++) {
-        if (!this.series[i].hide) this.drawSeries(this.series[i]);
-      }
-
-      context.restore();
-      this.clip();
-    }
-
-    E.fire(this.el, 'flotr:afterdraw', [this.series, this]);
-    if (after) after();
-  },
-  /**
-   * Actually draws the graph.
-   * @param {Object} series - series to draw
-   */
-  drawSeries: function(series){
-
-    function drawChart (series, typeKey) {
-      var options = this.getOptions(series, typeKey);
-      this[typeKey].draw(options);
-    }
-
-    var drawn = false;
-    series = series || this.series;
-
-    _.each(flotr.graphTypes, function (type, typeKey) {
-      if (series[typeKey] && series[typeKey].show && this[typeKey]) {
-        drawn = true;
-        drawChart.call(this, series, typeKey);
-      }
-    }, this);
-
-    if (!drawn) drawChart.call(this, series, this.options.defaultType);
-  },
-
-  getOptions : function (series, typeKey) {
-    var
-      type = series[typeKey],
-      graphType = this[typeKey],
-      options = {
-        context     : this.ctx,
-        width       : this.plotWidth,
-        height      : this.plotHeight,
-        fontSize    : this.options.fontSize,
-        fontColor   : this.options.fontColor,
-        textEnabled : this.textEnabled,
-        htmlText    : this.options.HtmlText,
-        text        : this._text, // TODO Is this necessary?
-        element     : this.el,
-        data        : series.data,
-        color       : series.color,
-        shadowSize  : series.shadowSize,
-        xScale      : _.bind(series.xaxis.d2p, series.xaxis),
-        yScale      : _.bind(series.yaxis.d2p, series.yaxis)
-      };
-
-    options = flotr.merge(type, options);
-
-    // Fill
-    options.fillStyle = this.processColor(
-      type.fillColor || series.color,
-      {opacity: type.fillOpacity}
-    );
-
-    return options;
-  },
-  /**
-   * Calculates the coordinates from a mouse event object.
-   * @param {Event} event - Mouse Event object.
-   * @return {Object} Object with coordinates of the mouse.
-   */
-  getEventPosition: function (e){
-
-    var
-      d = document,
-      b = d.body,
-      de = d.documentElement,
-      axes = this.axes,
-      plotOffset = this.plotOffset,
-      lastMousePos = this.lastMousePos,
-      pointer = E.eventPointer(e),
-      dx = pointer.x - lastMousePos.pageX,
-      dy = pointer.y - lastMousePos.pageY,
-      r, rx, ry;
-
-    if ('ontouchstart' in this.el) {
-      r = D.position(this.overlay);
-      rx = pointer.x - r.left - plotOffset.left;
-      ry = pointer.y - r.top - plotOffset.top;
-    } else {
-      r = this.overlay.getBoundingClientRect();
-      rx = e.clientX - r.left - plotOffset.left - b.scrollLeft - de.scrollLeft;
-      ry = e.clientY - r.top - plotOffset.top - b.scrollTop - de.scrollTop;
-    }
-
-    return {
-      x:  axes.x.p2d(rx),
-      x2: axes.x2.p2d(rx),
-      y:  axes.y.p2d(ry),
-      y2: axes.y2.p2d(ry),
-      relX: rx,
-      relY: ry,
-      dX: dx,
-      dY: dy,
-      absX: pointer.x,
-      absY: pointer.y,
-      pageX: pointer.x,
-      pageY: pointer.y
-    };
-  },
-  /**
-   * Observes the 'click' event and fires the 'flotr:click' event.
-   * @param {Event} event - 'click' Event object.
-   */
-  clickHandler: function(event){
-    if(this.ignoreClick){
-      this.ignoreClick = false;
-      return this.ignoreClick;
-    }
-    E.fire(this.el, 'flotr:click', [this.getEventPosition(event), this]);
-  },
-  /**
-   * Observes mouse movement over the graph area. Fires the 'flotr:mousemove' event.
-   * @param {Event} event - 'mousemove' Event object.
-   */
-  mouseMoveHandler: function(event){
-    if (this.mouseDownMoveHandler) return;
-    var pos = this.getEventPosition(event);
-    E.fire(this.el, 'flotr:mousemove', [event, pos, this]);
-    this.lastMousePos = pos;
-  },
-  /**
-   * Observes the 'mousedown' event.
-   * @param {Event} event - 'mousedown' Event object.
-   */
-  mouseDownHandler: function (event){
-
-    /*
-    // @TODO Context menu?
-    if(event.isRightClick()) {
-      event.stop();
-
-      var overlay = this.overlay;
-      overlay.hide();
-
-      function cancelContextMenu () {
-        overlay.show();
-        E.stopObserving(document, 'mousemove', cancelContextMenu);
-      }
-      E.observe(document, 'mousemove', cancelContextMenu);
-      return;
-    }
-    */
-
-    if (this.mouseUpHandler) return;
-    this.mouseUpHandler = _.bind(function (e) {
-      E.stopObserving(document, 'mouseup', this.mouseUpHandler);
-      E.stopObserving(document, 'mousemove', this.mouseDownMoveHandler);
-      this.mouseDownMoveHandler = null;
-      this.mouseUpHandler = null;
-      // @TODO why?
-      //e.stop();
-      E.fire(this.el, 'flotr:mouseup', [e, this]);
-    }, this);
-    this.mouseDownMoveHandler = _.bind(function (e) {
-        var pos = this.getEventPosition(e);
-        E.fire(this.el, 'flotr:mousemove', [event, pos, this]);
-        this.lastMousePos = pos;
-    }, this);
-    E.observe(document, 'mouseup', this.mouseUpHandler);
-    E.observe(document, 'mousemove', this.mouseDownMoveHandler);
-    E.fire(this.el, 'flotr:mousedown', [event, this]);
-    this.ignoreClick = false;
-  },
-  drawTooltip: function(content, x, y, options) {
-    var mt = this.getMouseTrack(),
-        style = 'opacity:0.7;background-color:#000;color:#fff;display:none;position:absolute;padding:2px 8px;-moz-border-radius:4px;border-radius:4px;white-space:nowrap;',
-        p = options.position,
-        m = options.margin,
-        plotOffset = this.plotOffset;
-
-    if(x !== null && y !== null){
-      if (!options.relative) { // absolute to the canvas
-             if(p.charAt(0) == 'n') style += 'top:' + (m + plotOffset.top) + 'px;bottom:auto;';
-        else if(p.charAt(0) == 's') style += 'bottom:' + (m + plotOffset.bottom) + 'px;top:auto;';
-             if(p.charAt(1) == 'e') style += 'right:' + (m + plotOffset.right) + 'px;left:auto;';
-        else if(p.charAt(1) == 'w') style += 'left:' + (m + plotOffset.left) + 'px;right:auto;';
-      }
-      else { // relative to the mouse
-             if(p.charAt(0) == 'n') style += 'bottom:' + (m - plotOffset.top - y + this.canvasHeight) + 'px;top:auto;';
-        else if(p.charAt(0) == 's') style += 'top:' + (m + plotOffset.top + y) + 'px;bottom:auto;';
-             if(p.charAt(1) == 'e') style += 'left:' + (m + plotOffset.left + x) + 'px;right:auto;';
-        else if(p.charAt(1) == 'w') style += 'right:' + (m - plotOffset.left - x + this.canvasWidth) + 'px;left:auto;';
-      }
-
-      mt.style.cssText = style;
-      D.empty(mt);
-      D.insert(mt, content);
-      D.show(mt);
-    }
-    else {
-      D.hide(mt);
-    }
-  },
-
-  clip: function () {
-
-    var
-      ctx = this.ctx,
-      o   = this.plotOffset,
-      w   = this.canvasWidth,
-      h   = this.canvasHeight;
-
-    if (flotr.isIE && flotr.isIE < 9) {
-      // Clipping for excanvas :-(
-      ctx.save();
-      ctx.fillStyle = this.processColor(this.options.ieBackgroundColor);
-      ctx.fillRect(0, 0, w, o.top);
-      ctx.fillRect(0, 0, o.left, h);
-      ctx.fillRect(0, h - o.bottom, w, o.bottom);
-      ctx.fillRect(w - o.right, 0, o.right,h);
-      ctx.restore();
-    } else {
-      ctx.clearRect(0, 0, w, o.top);
-      ctx.clearRect(0, 0, o.left, h);
-      ctx.clearRect(0, h - o.bottom, w, o.bottom);
-      ctx.clearRect(w - o.right, 0, o.right,h);
-    }
-  },
-
-  _initMembers: function() {
-    this._handles = [];
-    this.lastMousePos = {pageX: null, pageY: null };
-    this.plotOffset = {left: 0, right: 0, top: 0, bottom: 0};
-    this.ignoreClick = true;
-    this.prevHit = null;
-  },
-
-  _initGraphTypes: function() {
-    _.each(flotr.graphTypes, function(handler, graphType){
-      this[graphType] = flotr.clone(handler);
-    }, this);
-  },
-
-  _initEvents: function () {
-
-    var
-      el = this.el,
-      touchendHandler, movement, touchend;
-
-    if ('ontouchstart' in el) {
-
-      touchendHandler = _.bind(function (e) {
-        touchend = true;
-        E.stopObserving(document, 'touchend', touchendHandler);
-        E.fire(el, 'flotr:mouseup', [event, this]);
-        this.multitouches = null;
-
-        if (!movement) {
-          this.clickHandler(e);
-        }
-      }, this);
-
-      this.observe(this.overlay, 'touchstart', _.bind(function (e) {
-        movement = false;
-        touchend = false;
-        this.ignoreClick = false;
-
-        if (e.touches && e.touches.length > 1) {
-          this.multitouches = e.touches;
-        }
-
-        E.fire(el, 'flotr:mousedown', [event, this]);
-        this.observe(document, 'touchend', touchendHandler);
-      }, this));
-
-      this.observe(this.overlay, 'touchmove', _.bind(function (e) {
-
-        var pos = this.getEventPosition(e);
-
-        e.preventDefault();
-
-        movement = true;
-
-        if (this.multitouches || (e.touches && e.touches.length > 1)) {
-          this.multitouches = e.touches;
-        } else {
-          if (!touchend) {
-            E.fire(el, 'flotr:mousemove', [event, pos, this]);
-          }
-        }
-        this.lastMousePos = pos;
-      }, this));
-
-    } else {
-      this.
-        observe(this.overlay, 'mousedown', _.bind(this.mouseDownHandler, this)).
-        observe(el, 'mousemove', _.bind(this.mouseMoveHandler, this)).
-        observe(this.overlay, 'click', _.bind(this.clickHandler, this)).
-        observe(el, 'mouseout', function () {
-          E.fire(el, 'flotr:mouseout');
-        });
-    }
-  },
-
-  /**
-   * Initializes the canvas and it's overlay canvas element. When the browser is IE, this makes use
-   * of excanvas. The overlay canvas is inserted for displaying interactions. After the canvas elements
-   * are created, the elements are inserted into the container element.
-   */
-  _initCanvas: function(){
-    var el = this.el,
-      o = this.options,
-      children = el.children,
-      removedChildren = [],
-      child, i,
-      size, style;
-
-    // Empty the el
-    for (i = children.length; i--;) {
-      child = children[i];
-      if (!this.canvas && child.className === 'flotr-canvas') {
-        this.canvas = child;
-      } else if (!this.overlay && child.className === 'flotr-overlay') {
-        this.overlay = child;
-      } else {
-        removedChildren.push(child);
-      }
-    }
-    for (i = removedChildren.length; i--;) {
-      el.removeChild(removedChildren[i]);
-    }
-
-    D.setStyles(el, {position: 'relative'}); // For positioning labels and overlay.
-    size = {};
-    size.width = el.clientWidth;
-    size.height = el.clientHeight;
-
-    if(size.width <= 0 || size.height <= 0 || o.resolution <= 0){
-      throw 'Invalid dimensions for plot, width = ' + size.width + ', height = ' + size.height + ', resolution = ' + o.resolution;
-    }
-
-    // Main canvas for drawing graph types
-    this.canvas = getCanvas(this.canvas, 'canvas');
-    // Overlay canvas for interactive features
-    this.overlay = getCanvas(this.overlay, 'overlay');
-    this.ctx = getContext(this.canvas);
-    this.ctx.clearRect(0, 0, this.canvas.width, this.canvas.height);
-    this.octx = getContext(this.overlay);
-    this.octx.clearRect(0, 0, this.overlay.width, this.overlay.height);
-    this.canvasHeight = size.height;
-    this.canvasWidth = size.width;
-    this.textEnabled = !!this.ctx.drawText || !!this.ctx.fillText; // Enable text functions
-
-    function getCanvas(canvas, name){
-      if(!canvas){
-        canvas = D.create('canvas');
-        if (typeof FlashCanvas != "undefined" && typeof canvas.getContext === 'function') {
-          FlashCanvas.initElement(canvas);
-        }
-        canvas.className = 'flotr-'+name;
-        canvas.style.cssText = 'position:absolute;left:0px;top:0px;';
-        D.insert(el, canvas);
-      }
-      _.each(size, function(size, attribute){
-        D.show(canvas);
-        if (name == 'canvas' && canvas.getAttribute(attribute) === size) {
-          return;
-        }
-        canvas.setAttribute(attribute, size * o.resolution);
-        canvas.style[attribute] = size + 'px';
-      });
-      canvas.context_ = null; // Reset the ExCanvas context
-      return canvas;
-    }
-
-    function getContext(canvas){
-      if(window.G_vmlCanvasManager) window.G_vmlCanvasManager.initElement(canvas); // For ExCanvas
-      var context = canvas.getContext('2d');
-      if(!window.G_vmlCanvasManager) context.scale(o.resolution, o.resolution);
-      return context;
-    }
-  },
-
-  _initPlugins: function(){
-    // TODO Should be moved to flotr and mixed in.
-    _.each(flotr.plugins, function(plugin, name){
-      _.each(plugin.callbacks, function(fn, c){
-        this.observe(this.el, c, _.bind(fn, this));
-      }, this);
-      this[name] = flotr.clone(plugin);
-      _.each(this[name], function(fn, p){
-        if (_.isFunction(fn))
-          this[name][p] = _.bind(fn, this);
-      }, this);
-    }, this);
-  },
-
-  /**
-   * Sets options and initializes some variables and color specific values, used by the constructor.
-   * @param {Object} opts - options object
-   */
-  _initOptions: function(opts){
-    var options = flotr.clone(flotr.defaultOptions);
-    options.x2axis = _.extend(_.clone(options.xaxis), options.x2axis);
-    options.y2axis = _.extend(_.clone(options.yaxis), options.y2axis);
-    this.options = flotr.merge(opts || {}, options);
-
-    if (this.options.grid.minorVerticalLines === null &&
-      this.options.xaxis.scaling === 'logarithmic') {
-      this.options.grid.minorVerticalLines = true;
-    }
-    if (this.options.grid.minorHorizontalLines === null &&
-      this.options.yaxis.scaling === 'logarithmic') {
-      this.options.grid.minorHorizontalLines = true;
-    }
-
-    E.fire(this.el, 'flotr:afterinitoptions', [this]);
-
-    this.axes = flotr.Axis.getAxes(this.options);
-
-    // Initialize some variables used throughout this function.
-    var assignedColors = [],
-        colors = [],
-        ln = this.series.length,
-        neededColors = this.series.length,
-        oc = this.options.colors,
-        usedColors = [],
-        variation = 0,
-        c, i, j, s;
-
-    // Collect user-defined colors from series.
-    for(i = neededColors - 1; i > -1; --i){
-      c = this.series[i].color;
-      if(c){
-        --neededColors;
-        if(_.isNumber(c)) assignedColors.push(c);
-        else usedColors.push(flotr.Color.parse(c));
-      }
-    }
-
-    // Calculate the number of colors that need to be generated.
-    for(i = assignedColors.length - 1; i > -1; --i)
-      neededColors = Math.max(neededColors, assignedColors[i] + 1);
-
-    // Generate needed number of colors.
-    for(i = 0; colors.length < neededColors;){
-      c = (oc.length == i) ? new flotr.Color(100, 100, 100) : flotr.Color.parse(oc[i]);
-
-      // Make sure each serie gets a different color.
-      var sign = variation % 2 == 1 ? -1 : 1,
-          factor = 1 + sign * Math.ceil(variation / 2) * 0.2;
-      c.scale(factor, factor, factor);
-
-      /**
-       * @todo if we're getting too close to something else, we should probably skip this one
-       */
-      colors.push(c);
-
-      if(++i >= oc.length){
-        i = 0;
-        ++variation;
-      }
-    }
-
-    // Fill the options with the generated colors.
-    for(i = 0, j = 0; i < ln; ++i){
-      s = this.series[i];
-
-      // Assign the color.
-      if (!s.color){
-        s.color = colors[j++].toString();
-      }else if(_.isNumber(s.color)){
-        s.color = colors[s.color].toString();
-      }
-
-      // Every series needs an axis
-      if (!s.xaxis) s.xaxis = this.axes.x;
-           if (s.xaxis == 1) s.xaxis = this.axes.x;
-      else if (s.xaxis == 2) s.xaxis = this.axes.x2;
-
-      if (!s.yaxis) s.yaxis = this.axes.y;
-           if (s.yaxis == 1) s.yaxis = this.axes.y;
-      else if (s.yaxis == 2) s.yaxis = this.axes.y2;
-
-      // Apply missing options to the series.
-      for (var t in flotr.graphTypes){
-        s[t] = _.extend(_.clone(this.options[t]), s[t]);
-      }
-      s.mouse = _.extend(_.clone(this.options.mouse), s.mouse);
-
-      if (_.isUndefined(s.shadowSize)) s.shadowSize = this.options.shadowSize;
-    }
-  },
-
-  _setEl: function(el) {
-    if (!el) throw 'The target container doesn\'t exist';
-    else if (el.graph instanceof Graph) el.graph.destroy();
-    else if (!el.clientWidth) throw 'The target container must be visible';
-
-    el.graph = this;
-    this.el = el;
-  }
-};
-
-Flotr.Graph = Graph;
-
-})();
-
-/**
- * Flotr Axis Library
- */
-
-(function () {
-
-var
-  _ = Flotr._,
-  LOGARITHMIC = 'logarithmic';
-
-function Axis (o) {
-
-  this.orientation = 1;
-  this.offset = 0;
-  this.datamin = Number.MAX_VALUE;
-  this.datamax = -Number.MAX_VALUE;
-
-  _.extend(this, o);
-
-  this._setTranslations();
-}
-
-
-// Prototype
-Axis.prototype = {
-
-  setScale : function () {
-    var length = this.length;
-    if (this.options.scaling == LOGARITHMIC) {
-      this.scale = length / (log(this.max, this.options.base) - log(this.min, this.options.base));
-    } else {
-      this.scale = length / (this.max - this.min);
-    }
-  },
-
-  calculateTicks : function () {
-    var options = this.options;
-
-    this.ticks = [];
-    this.minorTicks = [];
-    
-    // User Ticks
-    if(options.ticks){
-      this._cleanUserTicks(options.ticks, this.ticks);
-      this._cleanUserTicks(options.minorTicks || [], this.minorTicks);
-    }
-    else {
-      if (options.mode == 'time') {
-        this._calculateTimeTicks();
-      } else if (options.scaling === 'logarithmic') {
-        this._calculateLogTicks();
-      } else {
-        this._calculateTicks();
-      }
-    }
-  },
-
-  /**
-   * Calculates the range of an axis to apply autoscaling.
-   */