new file mode 100644
--- /dev/null
+++ b/browser/app/profile/extensions/testpilot@labs.mozilla.com/chrome.manifest
@@ -0,0 +1,10 @@
+resource testpilot ./
+content testpilot content/
+skin testpilot skin skin/all/
+skin testpilot-os skin skin/linux/ os=Linux
+skin testpilot-os skin skin/mac/ os=Darwin
+skin testpilot-os skin skin/win/ os=WINNT
+overlay chrome://browser/content/browser.xul chrome://testpilot/content/tp-browser.xul application={ec8030f7-c20a-464f-9b0e-13a3a9e97384} appversion<=3.6.*
+overlay chrome://browser/content/browser.xul chrome://testpilot/content/feedback-browser.xul application={ec8030f7-c20a-464f-9b0e-13a3a9e97384} appversion>3.7a1pre
+# For the menubar on Mac
+overlay chrome://testpilot/content/all-studies-window.xul chrome://browser/content/macBrowserOverlay.xul application={ec8030f7-c20a-464f-9b0e-13a3a9e97384} os=Darwin

new file mode 100644
--- /dev/null
+++ b/browser/app/profile/extensions/testpilot@labs.mozilla.com/components/TestPilot.js
@@ -0,0 +1,84 @@
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (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.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Weave.
+ *
+ * The Initial Developer of the Original Code is Mozilla.
+ * Portions created by the Initial Developer are Copyright (C) 2008
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *  Dan Mills <thunder@mozilla.com>
+ *  Jono X <jono@mozilla.com>
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+const Cc = Components.classes;
+const Ci = Components.interfaces;
+const Cu = Components.utils;
+
+Cu.import("resource://gre/modules/XPCOMUtils.jsm");
+
+function TestPilotComponent() {}
+TestPilotComponent.prototype = {
+  classDescription: "Test Pilot Component",
+  contractID: "@mozilla.org/testpilot/service;1",
+  classID: Components.ID("{e6e5e58f-7977-485a-b076-2f74bee2677b}"),
+  _xpcom_categories: [{ category: "app-startup", service: true }],
+  _startupTimer: null,
+
+  QueryInterface: XPCOMUtils.generateQI([Ci.nsIObserver,
+                                         Ci.nsISupportsWeakReference]),
+
+  observe: function TPC__observe(subject, topic, data) {
+    let os = Cc["@mozilla.org/observer-service;1"].
+        getService(Ci.nsIObserverService);
+    switch (topic) {
+    case "app-startup":
+      os.addObserver(this, "sessionstore-windows-restored", true);
+      break;
+    case "sessionstore-windows-restored":
+      /* Stop oberver, to ensure that globalStartup doesn't get
+       * called more than once. */
+      os.removeObserver(this, "sessionstore-windows-restored", false);
+      /* Call global startup on a timer so that it's off of the main
+       * thread... delay a few seconds to give firefox time to finish
+       * starting up.
+       */
+      this._startupTimer = Cc["@mozilla.org/timer;1"].createInstance(Ci.nsITimer);
+      this._startupTimer.initWithCallback(
+        {notify: function(timer) {
+           Cu.import("resource://testpilot/modules/setup.js");
+           TestPilotSetup.globalStartup();
+         }}, 10000, Ci.nsITimer.TYPE_ONE_SHOT);
+      break;
+    }
+  }
+};
+
+function NSGetModule(compMgr, fileSpec) {
+  return XPCOMUtils.generateModule([TestPilotComponent]);
+}
+

new file mode 100644
--- /dev/null
+++ b/browser/app/profile/extensions/testpilot@labs.mozilla.com/content/all-studies-window.js
@@ -0,0 +1,446 @@
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (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.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Test Pilot.
+ *
+ * The Initial Developer of the Original Code is Mozilla.
+ * Portions created by the Initial Developer are Copyright (C) 2007
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *   Jono X <jono@mozilla.com>
+ *   Raymond Lee <raymond@appcoast.com>
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+// TODO Show individual status page in new chromeless window as html with
+// background color set to "moz-dialog".
+
+const NO_STUDIES_IMG = "chrome://testpilot/skin/testPilot_200x200.png";
+const PROPOSE_STUDY_URL =
+  "https://wiki.mozilla.org/Labs/Test_Pilot#For_researchers";
+
+var TestPilotXulWindow = {
+  _stringBundle : null,
+
+  onSubmitButton: function(experimentId) {
+    Components.utils.import("resource://testpilot/modules/setup.js");
+    let task = TestPilotSetup.getTaskById(experimentId);
+    let button = document.getElementById("submit-button-" + task.id);
+
+    // Hide the upload button so it doesn't get clicked again...
+    let parent = button.parentNode;
+    while (parent.firstChild) {
+      parent.removeChild(parent.firstChild);
+    }
+    // Replace it with a message:
+    this.addLabel(
+      parent,
+      this._stringBundle.getString("testpilot.studiesWindow.uploading"));
+    let self = this;
+
+    task.upload( function(success) {
+      while (parent.firstChild) {
+        parent.removeChild(parent.firstChild);
+      }
+      if (success) {
+        self.addThanksMessage(parent);
+        // TODO or should we move it to 'finished studies' immediately?
+      } else {
+        // TODO a better error message?
+        self.addLabel(
+          parent,
+          self._stringBundle.getString(
+            "testpilot.studiesWindow.unableToReachServer"));
+      }
+    });
+
+  },
+
+  addThanksMessage: function(container) {
+    // Fill in status box with icon and message to show success
+    let hbox = document.createElement("hbox");
+    container.appendChild(this.makeSpacer());
+    container.appendChild(hbox);
+    this.addLabel(
+      container,
+      this._stringBundle.getString(
+        "testpilot.studiesWindow.thanksForContributing"));
+    container.appendChild(this.makeSpacer());
+    hbox.appendChild(this.makeSpacer());
+    this.addImg(hbox, "study-submitted");
+    hbox.appendChild(this.makeSpacer());
+  },
+
+  addXulLink: function (container, text, url, openInTab) {
+    let linkContainer = document.createElement("hbox");
+    let link = document.createElement("label");
+    let spacer = document.createElement("spacer");
+    link.setAttribute("value", text);
+    link.setAttribute("class", "text-link");
+    if (openInTab) {
+      link.setAttribute(
+        "onclick",
+        "if (event.button==0) { " +
+        "TestPilotWindowUtils.openInTab('" + url + "'); }");
+    } else {
+      link.setAttribute(
+        "onclick",
+        "if (event.button==0) { " +
+        "TestPilotWindowUtils.openChromeless('" + url + "'); }");
+    }
+    linkContainer.appendChild(link);
+    spacer.setAttribute("flex", "1");
+    linkContainer.appendChild(spacer);
+    container.appendChild(linkContainer);
+  },
+
+  addLabel: function(container, text, styleClass) {
+    let label = document.createElement("label");
+    label.setAttribute("value", text);
+    if (styleClass) {
+      label.setAttribute("class", styleClass);
+    }
+    container.appendChild(label);
+  },
+
+  addImg: function(container, iconClass) {
+    let newImg = document.createElement("image");
+    newImg.setAttribute("class", iconClass);
+    container.appendChild(newImg);
+  },
+
+  makeSpacer: function() {
+    let spacer = document.createElement("spacer");
+    spacer.setAttribute("flex", "1");
+    return spacer;
+  },
+
+  addThumbnail: function(container, imgUrl) {
+    let boundingBox = document.createElement("vbox");
+    boundingBox.setAttribute("class", "results-thumbnail");
+    let bBox2 = document.createElement("hbox");
+
+    boundingBox.appendChild(this.makeSpacer());
+    boundingBox.appendChild(bBox2);
+    boundingBox.appendChild(this.makeSpacer());
+
+    bBox2.appendChild(this.makeSpacer());
+    let newImg = document.createElement("image");
+    newImg.setAttribute("src", imgUrl);
+    newImg.setAttribute("class", "results-thumbnail");
+    bBox2.appendChild(newImg);
+    bBox2.appendChild(this.makeSpacer());
+
+    container.appendChild(boundingBox);
+  },
+
+  addProgressBar: function(container, percent) {
+    let progBar = document.createElement("progressmeter");
+    progBar.setAttribute("mode", "determined");
+    progBar.setAttribute("value", Math.ceil(percent).toString());
+    container.appendChild(progBar);
+  },
+
+  addDescription: function(container, title, paragraph) {
+    let desc = document.createElement("description");
+    desc.setAttribute("class", "study-title");
+    let txtNode = document.createTextNode(title);
+    desc.appendChild(txtNode);
+    container.appendChild(desc);
+
+    desc = document.createElement("description");
+    desc.setAttribute("class", "study-description");
+    desc.setAttribute("crop", "none");
+    txtNode = document.createTextNode(paragraph);
+    desc.appendChild(txtNode);
+    container.appendChild(desc);
+  },
+
+  addButton: function(container, label, id, onClickHandler) {
+    let button = document.createElement("button");
+    button.setAttribute("label", label);
+    button.setAttribute("id", id);
+    button.setAttribute("oncommand", onClickHandler);
+    container.appendChild(button);
+  },
+
+  _sortNewestFirst: function(experiments) {
+    experiments.sort(
+      function sortFunc(a, b) {
+        if (a.endDate && b.endDate) {
+          return b.endDate - a.endDate;
+        }
+        if (a.publishDate && b.publishDate) {
+          if (isNaN(a.publishDate) || isNaN(b.publishDate)) {
+            return 0;
+          }
+          return b.publishDate - a.publishDate;
+        }
+        return 0;
+      });
+    return experiments;
+  },
+
+  onLoad: function () {
+    Components.utils.import("resource://testpilot/modules/Observers.js");
+    Components.utils.import("resource://testpilot/modules/setup.js");
+    Components.utils.import("resource://testpilot/modules/tasks.js");
+
+    this._stringBundle = document.getElementById("testpilot-stringbundle");
+    this._init(false);
+    Observers.add("testpilot:task:changed", this._onTaskStatusChanged, this);
+  },
+
+  onUnload: function() {
+    Observers.remove("testpilot:task:changed", this._onTaskStatusChanged, this);
+  },
+
+  _onTaskStatusChanged : function() {
+    this._init(true);
+  },
+
+  onTakeSurveyButton: function(taskId) {
+    let task = TestPilotSetup.getTaskById(taskId);
+    TestPilotWindowUtils.openChromeless(task.defaultUrl);
+    task.onDetailPageOpened();
+  },
+
+  _init: function(aReload) {
+    let experiments;
+    let ready = false;
+
+    // Are we done loading tasks?
+    if (TestPilotSetup.startupComplete) {
+      experiments = TestPilotSetup.getAllTasks();
+      if (experiments.length > 0 ) {
+        ready = true;
+      }
+    }
+
+    if (!ready) {
+      // If you opened the window before tasks are done loading, exit now but try
+      // again in a few seconds.
+      window.setTimeout(
+        function() { TestPilotXulWindow._init(aReload); }, 2000);
+      return;
+    }
+
+    let numFinishedStudies = 0;
+    let numCurrentStudies = 0;
+
+    /* Remove 'loading' message */
+    let msg = window.document.getElementById("still-loading-msg");
+    msg.setAttribute("hidden", "true");
+
+    if (aReload) {
+      /* If we're reloading, start by clearing out any old stuff already
+       * present in the listboxes. */
+      let listboxIds =
+        ["current-studies-listbox", "finished-studies-listbox",
+         "study-results-listbox"];
+      for (let i = 0; i < listboxIds.length; i++) {
+        let listbox = document.getElementById(listboxIds[i]);
+
+        while (listbox.lastChild) {
+          listbox.removeChild(listbox.lastChild);
+        }
+      }
+    }
+
+    experiments = this._sortNewestFirst(experiments);
+
+    for (let i = 0; i < experiments.length; i++) {
+      let task = experiments[i];
+      let newRow = document.createElement("richlistitem");
+      newRow.setAttribute("class", "tp-study-list");
+
+      this.addThumbnail(newRow, task.thumbnail);
+
+      let textVbox = document.createElement("vbox");
+      newRow.appendChild(textVbox);
+
+      let openInTab = (task.taskType == TaskConstants.TYPE_LEGACY);
+
+      this.addDescription(textVbox, task.title, task.summary);
+      if (task.showMoreInfoLink) {
+        this.addXulLink(
+          textVbox, this._stringBundle.getString("testpilot.moreInfo"),
+          task.defaultUrl, openInTab);
+      }
+
+      // Create the rightmost status area, depending on status:
+      let statusVbox = document.createElement("vbox");
+      if (task.status == TaskConstants.STATUS_FINISHED) {
+        this.addLabel(
+          statusVbox,
+          this._stringBundle.getFormattedString(
+            "testpilot.studiesWindow.finishedOn",
+            [(new Date(task.endDate)).toLocaleDateString()]));
+        this.addButton(statusVbox,
+          this._stringBundle.getString("testpilot.submit"),
+          "submit-button-" + task.id,
+          "TestPilotXulWindow.onSubmitButton(" + task.id + ");");
+      }
+      if (task.status == TaskConstants.STATUS_CANCELLED) {
+        let hbox = document.createElement("hbox");
+        newRow.setAttribute("class", "tp-opted-out");
+        statusVbox.appendChild(this.makeSpacer());
+        statusVbox.appendChild(hbox);
+        this.addLabel(
+          statusVbox,
+          this._stringBundle.getString("testpilot.studiesWindow.canceledStudy"));
+        statusVbox.appendChild(this.makeSpacer());
+        hbox.appendChild(this.makeSpacer());
+        this.addImg(hbox, "study-canceled");
+        hbox.appendChild(this.makeSpacer());
+      }
+      if (task.status == TaskConstants.STATUS_NEW ||
+          task.status == TaskConstants.STATUS_PENDING ) {
+        newRow.setAttribute("class", "tp-new-results");
+
+        if (task.taskType == TaskConstants.TYPE_SURVEY) {
+          this.addButton(
+            statusVbox,
+            this._stringBundle.getString("testpilot.takeSurvey"),
+            "survey-button",
+            "TestPilotXulWindow.onTakeSurveyButton('" + task.id + "');");
+        } else if (task.taskType == TaskConstants.TYPE_EXPERIMENT) {
+          if (task.startDate) {
+            this.addLabel(
+              statusVbox,
+              this._stringBundle.getFormattedString(
+                "testpilot.studiesWindow.willStart",
+                [(new Date(task.startDate)).toLocaleDateString()]));
+          }
+        }
+      }
+      if (task.status == TaskConstants.STATUS_IN_PROGRESS ||
+          task.status == TaskConstants.STATUS_STARTING) {
+
+        if (task.taskType == TaskConstants.TYPE_SURVEY) {
+          this.addButton(
+            statusVbox,
+            this._stringBundle.getString("testpilot.takeSurvey"),
+            "survey-button",
+            "TestPilotXulWindow.onTakeSurveyButton('" + task.id + "');");
+        } else if (task.taskType == TaskConstants.TYPE_EXPERIMENT) {
+          this.addLabel(
+            statusVbox,
+            this._stringBundle.getString(
+             "testpilot.studiesWindow.gatheringData"));
+             let now = (new Date()).getTime();
+          let progress =
+            100 * (now - task.startDate) / (task.endDate - task.startDate);
+          this.addProgressBar(statusVbox, progress);
+          this.addLabel(
+            statusVbox,
+            this._stringBundle.getFormattedString(
+              "testpilot.studiesWindow.willFinish",
+              [(new Date(task.endDate)).toLocaleDateString()]));
+        }
+      }
+      if (task.status >= TaskConstants.STATUS_SUBMITTED) {
+        if (task.taskType == TaskConstants.TYPE_RESULTS) {
+          let maintask = TestPilotSetup.getTaskById(task.relatedStudyId);
+          if (maintask && maintask.status >= TaskConstants.STATUS_SUBMITTED) {
+            this.addThanksMessage(statusVbox);
+          }
+        } else {
+          if (task.status == TaskConstants.STATUS_MISSED) {
+            // TODO use Sean's icon for missed studies
+          } else {
+            this.addThanksMessage(statusVbox);
+            numFinishedStudies ++;
+          }
+        }
+      }
+      let spacer = document.createElement("spacer");
+      spacer.setAttribute("flex", "1");
+      newRow.appendChild(spacer);
+      newRow.appendChild(statusVbox);
+
+      // Use status to decide which panel to add this to:
+      let rowset;
+      if (task.taskType == TaskConstants.TYPE_RESULTS) {
+        rowset = document.getElementById("study-results-listbox");
+      } else if (task.status > TaskConstants.STATUS_FINISHED) {
+        rowset = document.getElementById("finished-studies-listbox");
+      } else {
+        rowset = document.getElementById("current-studies-listbox");
+        numCurrentStudies++;
+      }
+
+      // TODO further distinguish by background colors.
+      rowset.appendChild(newRow);
+    }
+
+    // If there are no current studies, show a message about upcoming
+    // studies:
+    if (numCurrentStudies == 0) {
+      let newRow = document.createElement("richlistitem");
+      newRow.setAttribute("class", "tp-study-list");
+      this.addThumbnail(newRow, NO_STUDIES_IMG);
+      let textVbox = document.createElement("vbox");
+      textVbox.setAttribute("class", "pilot-largetext");
+      newRow.appendChild(textVbox);
+      this.addDescription(
+        textVbox, "",
+        this._stringBundle.getString("testpilot.studiesWindow.noStudies"));
+      this.addXulLink(
+        textVbox,
+        this._stringBundle.getString("testpilot.studiesWindow.proposeStudy"),
+        PROPOSE_STUDY_URL, true);
+      document.getElementById("current-studies-listbox").appendChild(newRow);
+    }
+
+    // Show number of studies the user finished on badge:
+    document.getElementById("num-finished-badge").setAttribute(
+      "value", numFinishedStudies);
+
+    window.sizeToContent();
+  },
+
+  focusPane: function(paneIndex) {
+    document.getElementById("tp-xulwindow-deck").selectedIndex = paneIndex;
+
+    // When you focus the 'study findings' tab, any results there which
+    // are still marked "new" should have their status changed as the user
+    // is considered to have seen them.
+    if (paneIndex == 2) {
+      Components.utils.import("resource://testpilot/modules/setup.js");
+      Components.utils.import("resource://testpilot/modules/tasks.js");
+
+      let experiments = TestPilotSetup.getAllTasks();
+      for each (let experiment in experiments) {
+        if (experiment.taskType == TaskConstants.TYPE_RESULTS) {
+          if (experiment.status == TaskConstants.STATUS_NEW) {
+            experiment.changeStatus(TaskConstants.STATUS_ARCHIVED, true);
+          }
+        }
+      }
+    }
+  }
+};

new file mode 100644
--- /dev/null
+++ b/browser/app/profile/extensions/testpilot@labs.mozilla.com/content/all-studies-window.xul
@@ -0,0 +1,138 @@
+<?xml version="1.0"?>
+<?xml-stylesheet href="chrome://global/skin/global.css" type="text/css"?>
+<?xml-stylesheet href="chrome://global/skin/preferences.css" type="text/css"?>
+<?xml-stylesheet href="chrome://mozapps/content/extensions/extensions.css"
+  type="text/css"?>
+<?xml-stylesheet href="chrome://testpilot/content/browser.css" type="text/css"?>
+
+
+<!DOCTYPE prefwindow [
+  <!ENTITY % testpilotDTD SYSTEM "chrome://testpilot/locale/main.dtd">
+    %testpilotDTD;
+]>
+
+<prefwindow id="test-pilot-all-studies-window"
+  title="&testpilot.studiesWindow.title;"
+  windowtype="extensions:testpilot:all_studies_window"
+  xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
+  onload="TestPilotXulWindow.onLoad();"
+  onunload="TestPilotXulWindow.onUnload();">
+
+  <script src="chrome://testpilot/content/window-utils.js"
+    type="application/javascript;version=1.8"/>
+  <script src="chrome://testpilot/content/all-studies-window.js"
+    type="application/javascript;version=1.8"/>
+
+  <stringbundleset id="stringbundleset">
+    <stringbundle id="testpilot-stringbundle"
+      src="chrome://testpilot/locale/main.properties" />
+  </stringbundleset>
+
+  <vbox flex="1">
+    <windowdragbox orient="vertical">
+      <radiogroup id="tp-radiogroup" orient="horizontal" role="listbox"
+        class="paneSelector"
+        onselect="TestPilotXulWindow.focusPane(this.selectedIndex);">
+        <radio pane="current-studies-pane-button" orient="vertical">
+          <image class="paneButtonIcon" />
+          <label class="paneButtonLabel"
+            value="&testpilot.studiesWindow.currentStudies.label;"/>
+        </radio>
+        <radio pane="finished-studies-pane-button" orient="vertical">
+          <stack align="center" pack="center">
+            <hbox align="center" pack="center">
+             <image class="paneButtonIcon" />
+            </hbox>
+            <label id="num-finished-badge" class="pane-button-badge"/>
+          </stack>
+          <label class="paneButtonLabel"
+            value="&testpilot.studiesWindow.finishedStudies.label;"/>
+        </radio>
+        <radio pane="study-results-pane-button" orient="vertical">
+          <image class="paneButtonIcon" />
+          <label class="paneButtonLabel"
+            value="&testpilot.studiesWindow.studyFindings.label;"/>
+        </radio>
+        <radio pane="settings-pane-button" orient="vertical">
+          <image class="paneButtonIcon" />
+          <label class="paneButtonLabel"
+            value="&testpilot.studiesWindow.settings.label;"/>
+        </radio>
+      </radiogroup>
+    </windowdragbox>
+
+    <deck id="tp-xulwindow-deck" flex="1">
+      <prefpane id="current-studies-pane" class="tp-tab-panel">
+        <richlistbox id="current-studies-listbox" class="tp-study-list"
+          disabled="true">
+          <richlistitem id="still-loading-msg" class="tp-study-list">
+            <description class="pilot-largetext">
+              &testpilot.studiesWindow.stillLoadingMessage;
+            </description>
+          </richlistitem>
+        </richlistbox>
+      </prefpane>
+
+      <prefpane id="finished-studies-pane" class="tp-tab-panel">
+        <richlistbox id="finished-studies-listbox" class="tp-study-list"
+          disabled="true" />
+      </prefpane>
+
+      <prefpane id="study-results-pane" class="tp-tab-panel">
+        <richlistbox id="study-results-listbox" class="tp-study-list"
+          disabled="true" />
+      </prefpane>
+
+      <prefpane id="settings-pane" class="tp-tab-panel">
+        <preferences>
+          <preference id="notify-finished" type="bool"
+                      name="extensions.testpilot.popup.showOnStudyFinished"/>
+          <preference id="notify-new" type="bool"
+                      name="extensions.testpilot.popup.showOnNewStudy"/>
+          <preference id="notify-results" type="bool"
+                      name="extensions.testpilot.popup.showOnNewResults"/>
+          <preference id="always-submit-data" type="bool"
+                      name="extensions.testpilot.alwaysSubmitData"/>
+        </preferences>
+        <vbox style="padding: 12px;">
+          <groupbox>
+            <caption label="Data Submission" />
+            <checkbox label="&testpilot.settings.alwaysSubmitData.label;"
+                      preference="always-submit-data"/>
+          </groupbox>
+          <groupbox>
+            <caption label="Notifications" />
+            <label value="&testpilot.settings.notifyMeWhen.label;"/>
+            <hbox>
+              <separator orient="vertical" />
+              <vbox>
+                <checkbox label="&testpilot.settings.readyToSubmit.label;"
+                          preference="notify-finished"/>
+                <checkbox label="&testpilot.settings.newStudy.label;"
+                          preference="notify-new"/>
+                <checkbox label="&testpilot.settings.hasNewResults.label;"
+                          preference="notify-results"/>
+              </vbox>
+            </hbox>
+          </groupbox>
+        </vbox>
+      </prefpane>
+    </deck>
+  </vbox>
+
+  <!-- For the menubar on mac, the below elements are needed for
+       macBrowserOverlay.xul to overlay this window. -->
+  <stringbundleset id="stringbundleset"/>
+
+  <commandset id="mainCommandSet"/>
+  <commandset id="baseMenuCommandSet"/>
+  <commandset id="placesCommands"/>
+
+  <broadcasterset id="mainBroadcasterSet"/>
+
+  <keyset id="mainKeyset"/>
+  <keyset id="baseMenuKeyset"/>
+
+  <menubar id="main-menubar" style="border:none !important;margin:0;padding:0;"/>
+
+</prefwindow>

new file mode 100644
--- /dev/null
+++ b/browser/app/profile/extensions/testpilot@labs.mozilla.com/content/browser.css
@@ -0,0 +1,240 @@
+/* Toolbar Button */
+
+#feedback-menu-button {
+  -moz-box-orient: horizontal;
+}
+
+#feedback-menu-button .toolbarbutton-text {
+  display: -moz-box;
+  margin: 0;
+}
+ 
+#feedback-menu-button .toolbarbutton-icon {
+  display: none;
+}
+
+#feedback-menu-button .toolbarbutton-menu-dropmarker {
+  -moz-padding-start: 5px;
+}
+
+
+#pilot-notifications-button {
+  margin-right: 10px;
+}
+
+/* Popup Bounding Box */
+#pilot-notification-popup {
+  -moz-appearance: none;
+  -moz-window-shadow: none;
+  background-color: transparent;
+  margin-top: -6px;
+  margin-right: -3px;
+  width: 480px;
+}
+
+.tail-up {
+ -moz-border-image: url(chrome://testpilot-os/skin/notification-tail-up.png) 26 56 22 18 / 26px 56px 22px 18px round stretch;
+}
+
+.tail-down {
+ -moz-border-image: url(chrome://testpilot-os/skin/notification-tail-down.png) 26 56 22 18 / 26px 56px 22px 18px round stretch;
+}
+
+
+.pilot-notification-popup-container {
+  -moz-appearance: none;
+  margin-right: -42px;
+  padding: 0px 5px 5px 5px;
+  font-size: 14px;
+}
+
+.pilot-notification-toprow {
+  margin-bottom: 12px;
+}
+
+#pilot-notification-text,
+#pilot-notification-link {
+  margin-bottom: 5px;
+}
+
+#pilot-notification-close {
+  list-style-image: url("chrome://testpilot-os/skin/close_button.png");
+  -moz-image-region: rect(0px, 14px, 14px, 0px);
+  width: 14px;
+  height: 14px;
+}
+
+#pilot-notification-close:hover {
+  -moz-image-region: rect(0px, 28px, 14px, 14px);
+}
+
+#pilot-notification-close:hover:active {
+  -moz-image-region: rect(0px, 42px, 14px, 28px);
+}
+
+.pilot-notify-me-when[disabled="true"] {
+  color: -moz-dialogtext;
+}
+.pilot-title {
+  font-size: 25px;
+}
+
+image.study-finished {
+  list-style-image: url("chrome://testpilot/skin/tp-submit-48x48.png");
+  height: 48px;
+  width: 48px;
+  margin-right: 8px;
+}
+
+image.study-submitted {
+  list-style-image: url("chrome://testpilot/skin/status-completed.png");
+  height: 32px;
+  width: 64px;
+  margin-right: 8px;
+}
+
+image.study-canceled {
+  list-style-image: url("chrome://testpilot/skin/status-ejected.png");
+  height: 32px;
+  width: 64px;
+  margin-right: 8px;
+}
+
+image.new-study {
+  list-style-image: url("chrome://testpilot/skin/tp-study-48x48.png");
+  height: 48px;
+  width: 48px;
+  margin-right: 8px;
+}
+
+image.new-results {
+  list-style-image: url("chrome://testpilot/skin/tp-results-48x48.png");
+  height: 48px;
+  width: 48px;
+  margin-right: 8px;
+}
+
+image.update-extension {
+  list-style-image: url("chrome://testpilot/skin/testpilot_32x32.png");
+  height: 48px;
+  width: 48px;
+  margin-right: 8px;
+}
+
+image.study-result {
+  list-style-image: url("chrome://testpilot/skin/badge-default.png");
+  height: 96px;
+  width: 96px;
+  margin-right: 8px;
+}
+
+/* All studies window */
+.pilot-largetext {
+  font-size: 16px;
+}
+
+#test-pilot-all-studies-window {
+  min-width: 720px !important;
+  min-height: 500px !important;
+}
+
+#test-pilot-all-studies-window > .prefWindow-dlgbuttons {
+    display: none;
+}
+
+.paneSelector {
+    margin: 0 !important;
+}
+
+.paneSelector radio[pane="current-studies-pane-button"] .paneButtonIcon {
+    list-style-image: url("chrome://testpilot/skin/tp-currentstudies-32x32.png");
+    padding-top: 3px;
+}
+.paneSelector radio[pane="finished-studies-pane-button"] .paneButtonIcon {
+    list-style-image: url("chrome://testpilot/skin/tp-completedstudies-32x32.png");
+    padding-top: 3px;
+}
+.paneSelector radio[pane="study-results-pane-button"] .paneButtonIcon {
+    list-style-image: url("chrome://testpilot/skin/tp-learned-32x32.png");
+    padding-top: 3px;
+}
+.paneSelector radio[pane="settings-pane-button"] .paneButtonIcon {
+    list-style-image: url("chrome://testpilot/skin/tp-settings-32x32.png");
+    padding-top: 3px;
+}
+
+.pane-button-badge {
+    background-color: green;
+    color: white;
+    font-weight: bold;
+    padding: 2px;
+    -moz-border-radius: 100%;
+    margin-right: 25px;
+    margin-bottom: 13px;
+}
+
+richlistbox.tp-study-list {
+    height: 522px;
+    width: 502px;
+    overflow: auto;
+    margin: 0px;
+}
+
+.tp-tab-panel {
+    padding: 0px;
+}
+
+description.study-description {
+    width: 350px;
+}
+
+description.study-title {
+    width: 350px;
+    font-size: 20px;
+    text-align: left;
+    margin-top: 10px;
+}
+
+richlistitem.tp-study-list {
+    min-height: 120px;
+    color: black;
+    background-color: -moz-dialog;
+}
+
+richlistitem.tp-new-results {
+    min-height: 120px;
+    color: black;
+    background-color: LemonChiffon;
+}
+
+richlistitem.tp-opted-out {
+    min-height: 120px;
+    color: grey;
+    background-color: -moz-dialog;
+}
+
+vbox.results-thumbnail {
+    height: 120px;
+    width: 120px;
+}
+
+image.results-thumbnail {
+    max-height: 90px;
+    max-width:  90px;
+    margin: 10px;
+}
+
+.notification-link {
+    text-decoration: underline;
+    cursor: pointer;
+}
+
+prefpane .groupbox-body {
+  -moz-appearance: none;
+  padding: 8px 4px 4px 4px;
+}
+
+prefpane .groupbox-title {
+  background: url("chrome://global/skin/50pct_transparent_grey.png") repeat-x bottom left;
+  margin-bottom: 4px;
+}

new file mode 100644
--- /dev/null
+++ b/browser/app/profile/extensions/testpilot@labs.mozilla.com/content/browser.js
@@ -0,0 +1,176 @@
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (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.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Test Pilot.
+ *
+ * The Initial Developer of the Original Code is Mozilla.
+ * Portions created by the Initial Developer are Copyright (C) 2007
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *   Atul Varma <atul@mozilla.com>
+ *   Jono X <jono@mozilla.com>
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+var TestPilotMenuUtils;
+
+(function() {
+  var Cc = Components.classes;
+  var Cu = Components.utils;
+  var Ci = Components.interfaces;
+
+  Cu.import("resource://testpilot/modules/setup.js");
+
+  TestPilotMenuUtils = {
+    updateSubmenu: function() {
+      let ntfyMenuFinished =
+        document.getElementById("pilot-menu-notify-finished");
+      let ntfyMenuNew = document.getElementById("pilot-menu-notify-new");
+      let ntfyMenuResults = document.getElementById("pilot-menu-notify-results");
+      let alwaysSubmitData =
+        document.getElementById("pilot-menu-always-submit-data");
+      let Application = Cc["@mozilla.org/fuel/application;1"]
+                      .getService(Ci.fuelIApplication);
+      ntfyMenuFinished.setAttribute("checked", Application.prefs.getValue(
+                                    POPUP_SHOW_ON_FINISH, false));
+      ntfyMenuNew.setAttribute("checked", Application.prefs.getValue(
+                                POPUP_SHOW_ON_NEW, false));
+      ntfyMenuResults.setAttribute("checked", Application.prefs.getValue(
+                                    POPUP_SHOW_ON_RESULTS, false));
+      alwaysSubmitData.setAttribute("checked", Application.prefs.getValue(
+                                     ALWAYS_SUBMIT_DATA, false));
+    },
+
+    togglePref: function(id) {
+      let prefName = "extensions.testpilot." + id;
+      let oldVal = Application.prefs.getValue(prefName, false);
+      Application.prefs.setValue( prefName, !oldVal);
+
+      // If you turn on or off the global pref, startup or shutdown test pilot
+      // accordingly:
+      if (prefName == RUN_AT_ALL_PREF) {
+        if (oldVal == true) {
+          TestPilotSetup.globalShutdown();
+        }
+        if (oldVal == false) {
+          TestPilotSetup.globalStartup();
+        }
+      }
+    },
+
+    onPopupShowing: function(event) {
+      this._setMenuLabels();
+    },
+
+    onPopupHiding: function(event) {
+      let target = event.target;
+      if (target.id == "pilot-menu-popup") {
+        let menu = document.getElementById("pilot-menu");
+        if (target.parentNode != menu) {
+          menu.appendChild(target);
+        }
+      }
+    },
+
+    _setMenuLabels: function() {
+      // Make the enable/disable User Studies menu item show the right label
+      // for the current status...
+      let runStudiesToggle = document.getElementById("feedback-menu-enable-studies");
+      if (runStudiesToggle) {
+        let currSetting = Application.prefs.getValue("extensions.testpilot.runStudies",
+                                                     true);
+
+        let stringBundle = Cc["@mozilla.org/intl/stringbundle;1"].
+          getService(Ci.nsIStringBundleService).
+          createBundle("chrome://testpilot/locale/main.properties");
+
+        if (currSetting) {
+          runStudiesToggle.setAttribute("label",
+            stringBundle.GetStringFromName("testpilot.turnOff"));
+        } else {
+          runStudiesToggle.setAttribute("label",
+            stringBundle.GetStringFromName("testpilot.turnOn"));
+        }
+      }
+
+      let studiesMenuItem = document.getElementById("feedback-menu-show-studies");
+      studiesMenuItem.setAttribute("disabled",
+                                   !Application.prefs.getValue(RUN_AT_ALL_PREF, true));
+    },
+
+    onMenuButtonMouseDown: function(attachPointId) {
+      if (!attachPointId) {
+        attachPointId = "pilot-notifications-button";
+      }
+      let menuPopup = document.getElementById("pilot-menu-popup");
+      let menuButton = document.getElementById(attachPointId);
+
+      if (menuPopup.parentNode != menuButton)
+        menuButton.appendChild(menuPopup);
+
+      let alignment;
+      // Menu should appear above status bar icon, but below Feedback button
+      if (attachPointId == "pilot-notifications-button") {
+        alignment = "before_start";
+      } else {
+        alignment = "after_end";
+      }
+
+      menuPopup.openPopup(menuButton, alignment, 0, 0, true);
+    }
+  };
+
+
+  var TestPilotWindowHandlers = {
+    onWindowLoad: function() {
+      /* "Hold" window load events for TestPilotSetup, passing them along only
+       * after startup is complete.  It's hacky, but the benefit is that
+       * TestPilotSetup.onWindowLoad can treat all windows the same no matter
+       * whether they opened with Firefox on startup or were opened later. */
+      if (TestPilotSetup.startupComplete) {
+        TestPilotSetup.onWindowLoad(window);
+      } else {
+        let observerSvc = Cc["@mozilla.org/observer-service;1"]
+                             .getService(Ci.nsIObserverService);
+        let observer = {
+          observe: function(subject, topic, data) {
+            observerSvc.removeObserver(this, "testpilot:startup:complete");
+            TestPilotSetup.onWindowLoad(window);
+          }
+        };
+        observerSvc.addObserver(observer, "testpilot:startup:complete", false);
+      }
+    },
+
+    onWindowUnload: function() {
+      TestPilotSetup.onWindowUnload(window);
+    }
+  };
+
+  window.addEventListener("load", TestPilotWindowHandlers.onWindowLoad, false);
+  window.addEventListener("unload", TestPilotWindowHandlers.onWindowUnload, false);
+}());
+

new file mode 100644
--- /dev/null
+++ b/browser/app/profile/extensions/testpilot@labs.mozilla.com/content/debug.html
@@ -0,0 +1,223 @@
+<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">
+<html> <head>
+<title>Test Pilot Debug Page</title>
+<script src="experiment-page.js" type="application/javascript;version=1.8"></script>
+<script type="application/javascript;version=1.8">
+
+  function getEid() {
+    var selector = document.getElementById("task-selector");
+    var i = selector.selectedIndex;
+    return selector.options[i].getAttribute("value");
+  }
+
+  function setTaskStatus() {
+    Components.utils.import("resource://testpilot/modules/setup.js");
+    var newStatus = document.getElementById("status-code").value;
+    newStatus = parseInt(newStatus);
+    var task = TestPilotSetup.getTaskById(getEid());
+    task.changeStatus(newStatus, false);
+  }
+
+  function reloadAllExperiments() {
+    Components.utils.import("resource://testpilot/modules/setup.js");
+    TestPilotSetup.reloadRemoteExperiments();
+  }
+
+  function runUnitTests() {
+   Components.utils.import("resource://testpilot/tests/test_data_store.js");
+   runAllTests();
+  }
+
+  function testJarStore() {
+    var Cuddlefish = {};
+    Components.utils.import("resource://testpilot/modules/lib/cuddlefish.js",
+                        Cuddlefish);
+    var loader = new Cuddlefish.Loader(
+      {rootPaths: ["resource://testpilot/modules/",
+                   "resource://testpilot/modules/lib/"]});
+    var jarStoreModule = loader.require("jar-code-store");
+    var SecurableModule = loader.require("securable-module");
+    var jarStore = new jarStoreModule.JarStore();
+
+    // OK now watch this!  It's gonna be awesome!
+    var clientLoader = Cuddlefish.Loader(
+      {fs: new SecurableModule.CompositeFileSystem(
+         [jarStore, loader.fs])});
+    dump("Debug page Requiring toolbar study.\n");
+    var toolbarStudy = clientLoader.require("toolbar-study");
+    
+  }
+
+  function remindMe() {
+    Components.utils.import("resource://testpilot/modules/setup.js");
+    TestPilotSetup._notifyUserOfTasks();
+    //TestPilotSetup._doHousekeeping();
+  }
+
+  function getCodeStorage() {
+    Components.utils.import("resource://testpilot/modules/setup.js");
+    var loader = TestPilotSetup._remoteExperimentLoader;
+    return loader._jarStore;
+  }
+
+  function getSelectedFilename() {
+    var selector = document.getElementById("file-selector");
+    var i = selector.selectedIndex;
+    return selector.options[i].text;
+  }
+
+  function loadExperimentCode() {
+    var filename = getSelectedFilename();
+    var codeStore = getCodeStorage();
+    var textArea = document.getElementById("experiment-code-area");
+    var path = codeStore.resolveModule(null, filename);
+    code = codeStore.getFile(path).contents;
+    textArea.value = code;
+  }
+
+  function saveAndRun() {
+    var filename = getSelectedFilename();
+    var codeStore = getCodeStorage();
+    var path = codeStore.resolveModule(null, filename);
+    var textArea = document.getElementById("experiment-code-area");
+    codeStore.setLocalOverride(path, textArea.value);
+    reloadAllExperiments(function(success) {
+      document.getElementById("debug").innerHTML = "Success? " + success;});
+  }
+
+  function showMetaData() {
+    Components.utils.import("resource://testpilot/modules/setup.js");
+    let task = TestPilotSetup.getTaskById(getEid());
+    let json = task._prependMetadataToJSON(function(json) {
+      document.getElementById("debug").innerHTML = json;
+    });
+  }
+
+  function makeThereBeAPopup() {
+    Components.utils.import("resource://testpilot/modules/setup.js");
+    var task = TestPilotSetup.getTaskById(getEid());
+    var text = "Sample popup for " + task.title;
+    TestPilotSetup._showNotification(task, false, text, "This is Title",
+                                     "", true, false, "Linktext",
+                                     "http://evilbrainjono.net");
+  }
+
+  function wipeDb() {
+    Components.utils.import("resource://testpilot/modules/setup.js");
+    var task = TestPilotSetup.getTaskById(getEid());
+    task.dataStore.wipeAllData();
+    var debug = document.getElementById("debug");
+    debug.innerHTML = "Wiped!";
+  }
+
+  function nukeDb() {
+    Components.utils.import("resource://testpilot/modules/setup.js");
+    var task = TestPilotSetup.getTaskById(getEid());
+    task.dataStore.nukeTable();
+    var debug = document.getElementById("debug");
+    debug.innerHTML = "Nuked!";
+  }
+
+  function populateFileDropdown() {
+    var codeStore = getCodeStorage();
+    var files = codeStore.listAllFiles();
+    var selector = document.getElementById("file-selector");
+    var opt, i;
+    for (var i = 0; i < files.length; i++) {
+      opt = document.createElement("option");
+      opt.innerHTML = files[i];
+      selector.appendChild(opt);
+    }
+
+    selector = document.getElementById("task-selector");
+    var tasks = TestPilotSetup.getAllTasks();
+    var title;
+    for (i = 0; i < tasks.length; i++) {
+      opt = document.createElement("option");
+      title = tasks[i].title;
+      opt.innerHTML = title;
+      opt.setAttribute("value", tasks[i].id);
+      selector.appendChild(opt);
+    }
+  }
+
+  function showSelectedTaskStatus() {
+    Components.utils.import("resource://testpilot/modules/setup.js");
+    var task = TestPilotSetup.getTaskById(getEid());
+    document.getElementById("show-status-span").innerHTML = task.status;
+    var selector = document.getElementById("status-selector");
+    selector.selectedIndex = task.status;
+  }
+
+  function resetSelectedTask() {
+    Components.utils.import("resource://testpilot/modules/setup.js");
+    var task = TestPilotSetup.getTaskById(getEid());
+    task.changeStatus(0, true);
+    var prefService  = Components.classes["@mozilla.org/preferences-service;1"].getService(Components.interfaces.nsIPrefBranch);
+    var prefName= "extensions.testpilot.startDate." + task.id;
+    if (prefService.prefHasUserValue(prefName)) {
+      prefService.clearUserPref(prefName);
+    }
+    //TestPilotSetup.reloadRemoteExperiments();
+  }
+
+  function setSelectedTaskStatus() {
+    Components.utils.import("resource://testpilot/modules/setup.js");
+    var task = TestPilotSetup.getTaskById(getEid());
+
+    var selector = document.getElementById("status-selector");
+    var i = selector.selectedIndex;
+    var newStatus = parseInt( selector.options[i].value );
+    task.changeStatus(newStatus, false);
+  }
+
+
+</script>
+
+<style type="text/css">
+      canvas { border: 1px solid black; }
+    </style>
+
+</head>
+
+<body onload="populateFileDropdown();showSelectedTaskStatus();">
+
+<fieldset>
+<p><select id="task-selector" onchange="showSelectedTaskStatus();"></select> Current Status = <span id="show-status-span"></span>.
+<button onclick="resetSelectedTask();showSelectedTaskStatus();">Reset Task</button>
+or set it to
+<select id="status-selector" onchange="setSelectedTaskStatus(); showSelectedTaskStatus();">
+  <option value="0">0 (New)</option>
+  <option value="1">1 (Pending)</option>
+  <option value="2">2 (Starting)</option>
+  <option value="3">3 (In Progress)</option>
+  <option value="4">4 (Finished)</option>
+  <option value="5">5 (Cancelled)</option>
+  <option value="6">6 (Submitted)</option>
+  <option value="7">7 (Results)</option>
+  <option value="8">8 (Archived)</option>
+</select>
+<button onclick="wipeDb();">Wipe My Data</button>
+<button onclick="nukeDb();">NUKE</button>
+<button onclick="uploadData();">Upload My Data</button>
+<button onclick="showMetaData();">Show Metadata</button>
+<button onclick="runUnitTests();">Run Tests</button>
+</fieldset>
+<fieldset>
+<p><button onclick="makeThereBeAPopup();">Show Dummy Popup</button>
+<button onclick="reloadAllExperiments();">Reload All Experiments</button>
+<button onclick="remindMe();">Notify Me</button>
+<button onclick="testJarStore();">Test Jar Store</button>
+</p>
+</fieldset>
+<p><span id="debug"></span></p>
+
+
+<textarea id="experiment-code-area" rows="40" cols="80">
+</textarea>
+<select id="file-selector"></select>
+<button onclick="loadExperimentCode();">Load Ye Code</button>
+<button onclick="saveAndRun();">Save And Run Ye Code</button>
+
+
+</body> </html>

new file mode 100644
--- /dev/null
+++ b/browser/app/profile/extensions/testpilot@labs.mozilla.com/content/experiment-page.js
@@ -0,0 +1,457 @@
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (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.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Test Pilot.
+ *
+ * The Initial Developer of the Original Code is Mozilla.
+ * Portions created by the Initial Developer are Copyright (C) 2007
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *   Jono X <jono@mozilla.com>
+ *   Raymond Lee <raymond@appcoast.com>
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+const PAGE_TYPE_STATUS = 0;
+const PAGE_TYPE_QUIT = 1;
+var stringBundle;
+
+  function showRawData(experimentId) {
+    window.openDialog(
+      "chrome://testpilot/content/raw-data-dialog.xul",
+      "TestPilotRawDataDialog", "chrome,centerscreen,resizable,scrollbars",
+      experimentId);
+  }
+
+  function getUrlParam(name) {
+    // from http://www.netlobo.com/url_query_string_javascript.html
+    name = name.replace(/[\[]/,"\\\[").replace(/[\]]/,"\\\]");
+    var regexS = "[\\?&]"+name+"=([^&#]*)";
+    var regex = new RegExp(regexS);
+    var results = regex.exec(window.location.href);
+    if( results == null )
+      return "";
+    else
+      return results[1];
+  }
+
+  function uploadData() {
+    Components.utils.import("resource://testpilot/modules/setup.js");
+    let eid = parseInt(getUrlParam("eid"));
+    let task = TestPilotSetup.getTaskById(eid);
+
+    // If always-submit-checkbox is checked, set the pref
+    if (task._recursAutomatically) {
+      let checkBox = document.getElementById("always-submit-checkbox");
+      if (checkBox && checkBox.checked) {
+        task.setRecurPref(TaskConstants.ALWAYS_SUBMIT);
+      }
+    }
+
+    let uploadStatus = document.getElementById("upload-status");
+    uploadStatus.innerHTML =
+      stringBundle.GetStringFromName("testpilot.statusPage.uploadingData");
+    task.upload( function(success) {
+      if (success) {
+        window.location =
+	  "chrome://testpilot/content/status.html?eid=" + eid;
+      } else {
+        uploadStatus.innerHTML =
+	  "<p>" +
+	  stringBundle.GetStringFromName("testpilot.statusPage.uploadError") +
+	  "</p>";
+      }
+    });
+  }
+
+  function deleteData() {
+    Components.utils.import("resource://testpilot/modules/setup.js");
+    Components.utils.import("resource://testpilot/modules/tasks.js");
+    let eid = parseInt(getUrlParam("eid"));
+    let task = TestPilotSetup.getTaskById(eid);
+    task.dataStore.wipeAllData();
+    // reload the URL after wiping all data.
+    window.location = "chrome://testpilot/content/status.html?eid=" + eid;
+  }
+
+  function saveCanvas(canvas) {
+    const nsIFilePicker = Components.interfaces.nsIFilePicker;
+    let filePicker = Components.classes["@mozilla.org/filepicker;1"].
+      createInstance(nsIFilePicker);
+    filePicker.init(window, null, nsIFilePicker.modeSave);
+    filePicker.appendFilters(
+	nsIFilePicker.filterImages | nsIFilePicker.filterAll);
+    filePicker.defaultString = "canvas.png";
+
+    let response = filePicker.show();
+    if (response == nsIFilePicker.returnOK ||
+	response == nsIFilePicker.returnReplace) {
+      const nsIWebBrowserPersist = Components.interfaces.nsIWebBrowserPersist;
+      let file = filePicker.file;
+
+      // create a data url from the canvas and then create URIs of the source
+      // and targets
+      let io = Components.classes["@mozilla.org/network/io-service;1"].
+	getService(Components.interfaces.nsIIOService);
+      let source = io.newURI(canvas.toDataURL("image/png", ""), "UTF8", null);
+      let target = io.newFileURI(file);
+
+      // prepare to save the canvas data
+      let persist = Components.classes[
+	"@mozilla.org/embedding/browser/nsWebBrowserPersist;1"].
+	  createInstance(nsIWebBrowserPersist);
+      persist.persistFlags = nsIWebBrowserPersist.
+	PERSIST_FLAGS_REPLACE_EXISTING_FILES;
+      persist.persistFlags |= nsIWebBrowserPersist.
+        PERSIST_FLAGS_AUTODETECT_APPLY_CONVERSION;
+
+      // displays a download dialog (remove these 3 lines for silent download)
+      let xfer = Components.classes["@mozilla.org/transfer;1"].
+	createInstance(Components.interfaces.nsITransfer);
+      xfer.init(source, target, "", null, null, null, persist);
+      persist.progressListener = xfer;
+
+      // save the canvas data to the file
+      persist.saveURI(source, null, null, null, null, file);
+    }
+  }
+
+  function exportData() {
+    const nsIFilePicker = Components.interfaces.nsIFilePicker;
+    let filePicker = Components.classes["@mozilla.org/filepicker;1"].
+      createInstance(nsIFilePicker);
+    let eid = parseInt(getUrlParam("eid"));
+    let task = TestPilotSetup.getTaskById(eid);
+
+    filePicker.init(window, null, nsIFilePicker.modeSave);
+    filePicker.appendFilters(
+	nsIFilePicker.filterImages | nsIFilePicker.filterAll);
+    filePicker.defaultString = task.title + ".csv";
+
+    let response = filePicker.show();
+    if (response == nsIFilePicker.returnOK ||
+	response == nsIFilePicker.returnReplace) {
+      const nsIWebBrowserPersist = Components.interfaces.nsIWebBrowserPersist;
+      let foStream =
+        Components.classes["@mozilla.org/network/file-output-stream;1"].
+	  createInstance(Components.interfaces.nsIFileOutputStream);
+      let converter =
+        Components.classes["@mozilla.org/intl/converter-output-stream;1"].
+	  createInstance(Components.interfaces.nsIConverterOutputStream);
+      let file = filePicker.file;
+      let dataStore = task.dataStore;
+      let columnNames = dataStore.getHumanReadableColumnNames();
+      let propertyNames = dataStore.getPropertyNames();
+      let csvString = "";
+
+      // titles
+      for (let i = 0; i < columnNames.length; i++) {
+	csvString += "\"" + columnNames[i] + "\",";
+      }
+      if (csvString.length > 0) {
+	csvString = csvString.substring(0, (csvString.length - 1));
+        csvString += "\n";
+      }
+
+      dataStore.getAllDataAsJSON(true, function(rawData) {
+        // data
+        for (let i = 0; i < rawData.length; i++) {
+          for (let j = 0; j < columnNames.length; j++) {
+	    csvString += "\"" + rawData[i][propertyNames[j]] + "\",";
+          }
+	  csvString = csvString.substring(0, (csvString.length - 1));
+          csvString += "\n";
+        }
+
+        // write, create, truncate
+        foStream.init(file, 0x02 | 0x08 | 0x20, 0664, 0);
+        converter.init(foStream, "UTF-8", 0, 0);
+        converter.writeString(csvString);
+        converter.close();
+      });
+    }
+  }
+
+  function openLink(url) {
+    // open the link in the chromeless window
+    let wm = Components.classes["@mozilla.org/appshell/window-mediator;1"]
+                       .getService(Components.interfaces.nsIWindowMediator);
+    let recentWindow = wm.getMostRecentWindow("navigator:browser");
+
+    if (recentWindow) {
+      recentWindow.TestPilotWindowUtils.openInTab(url);
+    } else {
+      window.open(url);
+    }
+  }
+
+  function getTestEndingDate(experimentId) {
+    Components.utils.import("resource://testpilot/modules/setup.js");
+    var task = TestPilotSetup.getTaskById(experimentId);
+    var endDate = new Date(task.endDate);
+    var diff = (endDate - Date.now());
+    var span = document.getElementById("test-end-time");
+    if (!span) {
+      return;
+    }
+    if (diff < 0) {
+      span.innerHTML =
+        stringBundle.GetStringFromName("testpilot.statusPage.endedAlready");
+      return;
+    }
+    var hours = diff / (60 * 60 * 1000);
+    if (hours < 24) {
+      span.innerHTML =
+        stringBundle.formatStringFromName(
+	  "testpilot.statusPage.todayAt", [endDate.toLocaleTimeString()], 1);
+    } else {
+      span.innerHTML =
+        stringBundle.formatStringFromName(
+	  "testpilot.statusPage.endOn", [endDate.toLocaleString()], 1);
+    }
+  }
+
+  function showMetaData() {
+    Components.utils.import("resource://testpilot/modules/metadata.js");
+    MetadataCollector.getMetadata(function(md) {
+      var mdLocale = document.getElementById("md-locale");
+      if (mdLocale)
+        mdLocale.innerHTML = md.location;
+      var mdVersion = document.getElementById("md-version");
+      if (mdVersion)
+        mdVersion.innerHTML = md.version;
+      var mdOs = document.getElementById("md-os");
+      if (mdOs)
+        mdOs.innerHTML = md.operatingSystem;
+      var mdNumExt = document.getElementById("md-num-ext");
+      if (mdNumExt) {
+        var numExt = md.extensions.length;
+        if (numExt == 1) {
+          mdNumExt.innerHTML =
+            stringBundle.GetStringFromName("testpilot.statusPage.extension");
+        } else {
+          mdNumExt.innerHTML =
+            stringBundle.formatStringFromName(
+            "testpilot.statusPage.extensions", [numExt], 1);
+        }
+      }
+    });
+  }
+
+  function onQuitPageLoad() {
+    Components.utils.import("resource://testpilot/modules/setup.js");
+    setStrings(PAGE_TYPE_QUIT);
+    let eid = parseInt(getUrlParam("eid"));
+    let task = TestPilotSetup.getTaskById(eid);
+    let header = document.getElementById("about-quit-title");
+    header.innerHTML =
+      stringBundle.formatStringFromName(
+	"testpilot.quitPage.aboutToQuit", [task.title], 1);
+
+    if (task._recursAutomatically) {
+      document.getElementById("recur-options").setAttribute("style", "");
+      document.getElementById("recur-checkbox-container").
+        setAttribute("style", "");
+    }
+  }
+
+  function quitExperiment() {
+    Components.utils.import("resource://testpilot/modules/setup.js");
+    Components.utils.import("resource://testpilot/modules/tasks.js");
+    let eid = parseInt(getUrlParam("eid"));
+    let reason = document.getElementById("reason-for-quit").value;
+    let task = TestPilotSetup.getTaskById(eid);
+    task.optOut(reason, function(success) {
+      // load the you-are-canceleed page.
+      window.location = "chrome://testpilot/content/status.html?eid=" + eid;
+    });
+
+    // If opt-out-forever checkbox is checked, opt out forever!
+    if (task._recursAutomatically) {
+      let checkBox = document.getElementById("opt-out-forever");
+      if (checkBox.checked) {
+        task.setRecurPref(TaskConstants.NEVER_SUBMIT);
+      }
+      // quit test so rescheduling
+      task._reschedule();
+    }
+  }
+
+  function updateRecurSettings() {
+    Components.utils.import("resource://testpilot/modules/setup.js");
+    let eid = parseInt(getUrlParam("eid"));
+    let experiment = TestPilotSetup.getTaskById(eid);
+    let recurSelector = document.getElementById("recur-selector");
+    let newValue = recurSelector.options[recurSelector.selectedIndex].value;
+    experiment.setRecurPref(parseInt(newValue));
+  }
+
+  function showRecurControls(experiment) {
+    Components.utils.import("resource://testpilot/modules/tasks.js");
+    let recurPrefSpan = document.getElementById("recur-pref");
+    if (!recurPrefSpan) {
+      return;
+    }
+    let days = experiment._recurrenceInterval;
+    recurPrefSpan.innerHTML =
+      stringBundle.formatStringFromName(
+	"testpilot.statusPage.recursEveryNumberOfDays", [days], 1);
+
+    let controls = document.getElementById("recur-controls");
+    let selector = document.createElement("select");
+    controls.appendChild(selector);
+    selector.setAttribute("onchange", "updateRecurSettings();");
+    selector.setAttribute("id", "recur-selector");
+
+    let option = document.createElement("option");
+    option.setAttribute("value", TaskConstants.ASK_EACH_TIME);
+    if (experiment.recurPref == TaskConstants.ASK_EACH_TIME) {
+      option.setAttribute("selected", "true");
+    }
+    option.innerHTML =
+      stringBundle.GetStringFromName(
+	"testpilot.statusPage.askMeBeforeSubmitData");
+    selector.appendChild(option);
+
+    option = document.createElement("option");
+    option.setAttribute("value", TaskConstants.ALWAYS_SUBMIT);
+    if (experiment.recurPref == TaskConstants.ALWAYS_SUBMIT) {
+      option.setAttribute("selected", "true");
+    }
+    option.innerHTML =
+      stringBundle.GetStringFromName(
+	"testpilot.statusPage.alwaysSubmitData");
+    selector.appendChild(option);
+
+    option = document.createElement("option");
+    option.setAttribute("value", TaskConstants.NEVER_SUBMIT);
+    if (experiment.recurPref == TaskConstants.NEVER_SUBMIT) {
+      option.setAttribute("selected", "true");
+    }
+    option.innerHTML =
+      stringBundle.GetStringFromName(
+	"testpilot.statusPage.neverSubmitData");
+    selector.appendChild(option);
+  }
+
+  function loadExperimentPage() {
+    Components.utils.import("resource://testpilot/modules/setup.js");
+    Components.utils.import("resource://testpilot/modules/tasks.js");
+    var contentDiv = document.getElementById("experiment-specific-text");
+    var dataPrivacyDiv = document.getElementById("data-privacy-text");
+    // Get experimentID from the GET args of page
+    var eid = parseInt(getUrlParam("eid"));
+    var experiment = TestPilotSetup.getTaskById(eid);
+    if (!experiment) {
+      // Possible that experiments aren't done loading yet.  Try again in
+      // a few seconds.
+      contentDiv.innerHTML =
+        stringBundle.GetStringFromName("testpilot.statusPage.loading");
+      window.setTimeout(function() { loadExperimentPage(); }, 2000);
+      return;
+    }
+    experiment.getWebContent(function(webContent) {
+      contentDiv.innerHTML = webContent;
+    });
+
+    experiment.getDataPrivacyContent(function(dataPrivacyContent) {
+      if (dataPrivacyContent && dataPrivacyContent.length > 0) {
+        dataPrivacyDiv.innerHTML = dataPrivacyContent;
+        dataPrivacyDiv.removeAttribute("hidden");
+      }
+    });
+
+    // Metadata and start/end date should be filled in for every experiment:
+    showMetaData();
+    getTestEndingDate(eid);
+    if (experiment._recursAutomatically &&
+        experiment.status != TaskConstants.STATUS_FINISHED) {
+      showRecurControls(experiment);
+    }
+
+    // Do whatever the experiment's web content wants done on load:
+    experiment.webContent.onPageLoad(experiment, document, jQuery);
+  }
+
+  function onStatusPageLoad() {
+    setStrings(PAGE_TYPE_STATUS);
+    /* If an experiment ID (eid) is provided in the url params, show status
+     * for that experiment.  If not, show the main menu with status for all
+     * installed experiments. */
+    let eidString = getUrlParam("eid");
+    if (eidString == "") {
+      showStatusMenuPage();
+    } else {
+      loadExperimentPage();
+    }
+  }
+
+  function setStrings(pageType) {
+    stringBundle =
+      Components.classes["@mozilla.org/intl/stringbundle;1"].
+        getService(Components.interfaces.nsIStringBundleService).
+	  createBundle("chrome://testpilot/locale/main.properties");
+    let map;
+    let mapLength;
+
+    if (pageType == PAGE_TYPE_STATUS) {
+      map = [
+	{ id: "page-title", stringKey: "testpilot.fullBrandName" },
+	{ id: "comments-and-discussions-link",
+	  stringKey: "testpilot.page.commentsAndDiscussions" },
+	{ id: "propose-test-link",
+	  stringKey: "testpilot.page.proposeATest" },
+	{ id: "testpilot-twitter-link",
+	  stringKey: "testpilot.page.testpilotOnTwitter" }
+      ];
+    } else if (pageType == PAGE_TYPE_QUIT) {
+      map = [
+	{ id: "page-title", stringKey: "testpilot.fullBrandName" },
+	{ id: "comments-and-discussions-link",
+	  stringKey: "testpilot.page.commentsAndDiscussions" },
+	{ id: "propose-test-link",
+	  stringKey: "testpilot.page.proposeATest" },
+	{ id: "testpilot-twitter-link",
+	  stringKey: "testpilot.page.testpilotOnTwitter" },
+	{ id: "optional-message",
+	  stringKey: "testpilot.quitPage.optionalMessage" },
+	{ id: "reason-text",
+	  stringKey: "testpilot.quitPage.reason" },
+	{ id: "recur-options",
+	  stringKey: "testpilot.quitPage.recurringStudy" },
+	{ id: "quit-forever-text",
+	  stringKey: "testpilot.quitPage.quitFoever" },
+	{ id: "quit-study-link",
+	  stringKey: "testpilot.quitPage.quitStudy" }
+      ];
+    }
+    mapLength = map.length;
+    for (let i = 0; i < mapLength; i++) {
+      let entry = map[i];
+      document.getElementById(entry.id).innerHTML =
+        stringBundle.GetStringFromName(entry.stringKey);
+    }
+  }

new file mode 100644
--- /dev/null
+++ b/browser/app/profile/extensions/testpilot@labs.mozilla.com/content/feedback-browser.xul
@@ -0,0 +1,81 @@
+<?xml version="1.0"?>
+<?xml-stylesheet href="chrome://testpilot/content/browser.css" type="text/css"?>
+<?xml-stylesheet href="chrome://testpilot-os/skin/feedback.css" type="text/css"?>
+
+<!DOCTYPE overlay [
+  <!ENTITY % testpilotDTD SYSTEM "chrome://testpilot/locale/main.dtd">
+    %testpilotDTD;
+]>
+
+<overlay xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
+<script src="chrome://testpilot/content/browser.js"
+  type="application/x-javascript" />
+<script src="chrome://testpilot/content/window-utils.js"
+  type="application/x-javascript" />
+
+<menupopup id="menu_ToolsPopup">
+  <menu id="pilot-menu" insertafter="menu_openAddons" />
+</menupopup>
+
+<toolbarpalette id="BrowserToolbarPalette">
+  <toolbarbutton type="menu" id="feedback-menu-button"
+    class="toolbarbutton-1" label="&testpilot.feedbackbutton.label;"
+    onmousedown="event.preventDefault();
+        TestPilotMenuUtils.onMenuButtonMouseDown('feedback-menu-button');"/>
+</toolbarpalette>
+
+<toolbar id="nav-bar">
+  <panel id="pilot-notification-popup" hidden="true" noautofocus="true"
+    level="parent" position="after_start">
+    <vbox class="pilot-notification-popup-container">
+      <hbox class="pilot-notification-toprow">
+        <image id="pilot-notification-icon" />
+        <vbox pack="center">
+          <label id="pilot-notification-title" class="pilot-title" />
+        </vbox>
+        <spacer flex="1" />
+        <vbox pack="start">
+          <image id="pilot-notification-close"
+            tooltiptext="&testpilot.notification.close.tooltip;" />
+        </vbox>
+      </hbox>
+      <description id="pilot-notification-text" />
+      <hbox align="right"><label id="pilot-notification-link" /></hbox>
+      <hbox>
+        <checkbox id="pilot-notification-always-submit-checkbox"
+          label="&testpilot.settings.alwaysSubmitData.label;" />
+        <spacer flex="1" />
+      </hbox>
+      <hbox align="right">
+        <button id="pilot-notification-submit" />
+      </hbox>
+    </vbox>
+  </panel>
+</toolbar>
+
+<menu id="pilot-menu" class="menu-iconic"
+      label="&testpilot.feedbackbutton.label;"
+      insertafter="addonsManager">
+  <menupopup id="pilot-menu-popup"
+             onpopupshowing="TestPilotMenuUtils.onPopupShowing(event);"
+             onpopuphiding="TestPilotMenuUtils.onPopupHiding(event);">
+    <menuitem id="feedback-menu-happy-button"
+              class="menuitem-iconic"
+              image="chrome://testpilot-os/skin/feedback-smile-16x16.png"
+              label = "&testpilot.happy.label;"
+              oncommand="TestPilotWindowUtils.openFeedbackPage(true);"/>
+    <menuitem id="feedback-menu-sad-button"
+              class="menuitem-iconic"
+              image="chrome://testpilot-os/skin/feedback-frown-16x16.png"
+              label = "&testpilot.sad.label;"
+              oncommand="TestPilotWindowUtils.openFeedbackPage(false);"/>
+    <menuseparator/>
+    <menuitem id="feedback-menu-show-studies"
+              label="&testpilot.allStudies.label;..."
+              oncommand="TestPilotWindowUtils.openAllStudiesWindow();"/>
+    <menuitem id="feedback-menu-enable-studies" 
+              label="&testpilot.enable.label;"
+              oncommand="TestPilotMenuUtils.togglePref('runStudies');"/>
+  </menupopup>
+</menu>
+</overlay>
\ No newline at end of file

new file mode 100644
--- /dev/null
+++ b/browser/app/profile/extensions/testpilot@labs.mozilla.com/content/flot/jquery.colorhelpers.js
@@ -0,0 +1,174 @@
+/* Plugin for jQuery for working with colors.
+ * 
+ * Version 1.0.
+ * 
+ * Inspiration from jQuery color animation plugin by John Resig.
+ *
+ * Released under the MIT license by Ole Laursen, October 2009.
+ *
+ * Examples:
+ *
+ *   $.color.parse("#fff").scale('rgb', 0.25).add('a', -0.5).toString()
+ *   var c = $.color.extract($("#mydiv"), 'background-color');
+ *   console.log(c.r, c.g, c.b, c.a);
+ *   $.color.make(100, 50, 25, 0.4).toString() // returns "rgba(100,50,25,0.4)"
+ *
+ * Note that .scale() and .add() work in-place instead of returning
+ * new objects.
+ */ 
+
+(function() {
+    jQuery.color = {};
+
+    // construct color object with some convenient chainable helpers
+    jQuery.color.make = function (r, g, b, a) {
+        var o = {};
+        o.r = r || 0;
+        o.g = g || 0;
+        o.b = b || 0;
+        o.a = a != null ? a : 1;
+
+        o.add = function (c, d) {
+            for (var i = 0; i < c.length; ++i)
+                o[c.charAt(i)] += d;
+            return o.normalize();
+        };
+        
+        o.scale = function (c, f) {
+            for (var i = 0; i < c.length; ++i)
+                o[c.charAt(i)] *= f;
+            return o.normalize();
+        };
+        
+        o.toString = function () {
+            if (o.a >= 1.0) {
+                return "rgb("+[o.r, o.g, o.b].join(",")+")";
+            } else {
+                return "rgba("+[o.r, o.g, o.b, o.a].join(",")+")";
+            }
+        };
+
+        o.normalize = function () {
+            function clamp(min, value, max) {
+                return value < min ? min: (value > max ? max: value);
+            }
+            
+            o.r = clamp(0, parseInt(o.r), 255);
+            o.g = clamp(0, parseInt(o.g), 255);
+            o.b = clamp(0, parseInt(o.b), 255);
+            o.a = clamp(0, o.a, 1);
+            return o;
+        };
+
+        o.clone = function () {
+            return jQuery.color.make(o.r, o.b, o.g, o.a);
+        };
+
+        return o.normalize();
+    }
+
+    // extract CSS color property from element, going up in the DOM
+    // if it's "transparent"
+    jQuery.color.extract = function (elem, css) {
+        var c;
+        do {
+            c = elem.css(css).toLowerCase();
+            // keep going until we find an element that has color, or
+            // we hit the body
+            if (c != '' && c != 'transparent')
+                break;
+            elem = elem.parent();
+        } while (!jQuery.nodeName(elem.get(0), "body"));
+
+        // catch Safari's way of signalling transparent
+        if (c == "rgba(0, 0, 0, 0)")
+            c = "transparent";
+        
+        return jQuery.color.parse(c);
+    }
+    
+    // parse CSS color string (like "rgb(10, 32, 43)" or "#fff"),
+    // returns color object
+    jQuery.color.parse = function (str) {
+        var res, m = jQuery.color.make;
+
+        // Look for rgb(num,num,num)
+        if (res = /rgb\(\s*([0-9]{1,3})\s*,\s*([0-9]{1,3})\s*,\s*([0-9]{1,3})\s*\)/.exec(str))
+            return m(parseInt(res[1], 10), parseInt(res[2], 10), parseInt(res[3], 10));
+        
+        // Look for rgba(num,num,num,num)
+        if (res = /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(str))
+            return m(parseInt(res[1], 10), parseInt(res[2], 10), parseInt(res[3], 10), parseFloat(res[4]));
+            
+        // Look for rgb(num%,num%,num%)
+        if (res = /rgb\(\s*([0-9]+(?:\.[0-9]+)?)\%\s*,\s*([0-9]+(?:\.[0-9]+)?)\%\s*,\s*([0-9]+(?:\.[0-9]+)?)\%\s*\)/.exec(str))
+            return m(parseFloat(res[1])*2.55, parseFloat(res[2])*2.55, parseFloat(res[3])*2.55);
+
+        // Look for rgba(num%,num%,num%,num)
+        if (res = /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(str))
+            return m(parseFloat(res[1])*2.55, parseFloat(res[2])*2.55, parseFloat(res[3])*2.55, parseFloat(res[4]));
+        
+        // Look for #a0b1c2
+        if (res = /#([a-fA-F0-9]{2})([a-fA-F0-9]{2})([a-fA-F0-9]{2})/.exec(str))
+            return m(parseInt(res[1], 16), parseInt(res[2], 16), parseInt(res[3], 16));
+
+        // Look for #fff
+        if (res = /#([a-fA-F0-9])([a-fA-F0-9])([a-fA-F0-9])/.exec(str))
+            return m(parseInt(res[1]+res[1], 16), parseInt(res[2]+res[2], 16), parseInt(res[3]+res[3], 16));
+
+        // Otherwise, we're most likely dealing with a named color
+        var name = jQuery.trim(str).toLowerCase();
+        if (name == "transparent")
+            return m(255, 255, 255, 0);
+        else {
+            res = lookupColors[name];
+            return m(res[0], res[1], res[2]);
+        }
+    }
+    
+    var lookupColors = {
+        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]
+    };    
+})();

new file mode 100644
--- /dev/null
+++ b/browser/app/profile/extensions/testpilot@labs.mozilla.com/content/flot/jquery.colorhelpers.min.js
@@ -0,0 +1,1 @@
+(function(){jQuery.color={};jQuery.color.make=function(E,D,B,C){var F={};F.r=E||0;F.g=D||0;F.b=B||0;F.a=C!=null?C:1;F.add=function(I,H){for(var G=0;G<I.length;++G){F[I.charAt(G)]+=H}return F.normalize()};F.scale=function(I,H){for(var G=0;G<I.length;++G){F[I.charAt(G)]*=H}return F.normalize()};F.toString=function(){if(F.a>=1){return"rgb("+[F.r,F.g,F.b].join(",")+")"}else{return"rgba("+[F.r,F.g,F.b,F.a].join(",")+")"}};F.normalize=function(){function G(I,J,H){return J<I?I:(J>H?H:J)}F.r=G(0,parseInt(F.r),255);F.g=G(0,parseInt(F.g),255);F.b=G(0,parseInt(F.b),255);F.a=G(0,F.a,1);return F};F.clone=function(){return jQuery.color.make(F.r,F.b,F.g,F.a)};return F.normalize()};jQuery.color.extract=function(C,B){var D;do{D=C.css(B).toLowerCase();if(D!=""&&D!="transparent"){break}C=C.parent()}while(!jQuery.nodeName(C.get(0),"body"));if(D=="rgba(0, 0, 0, 0)"){D="transparent"}return jQuery.color.parse(D)};jQuery.color.parse=function(E){var D,B=jQuery.color.make;if(D=/rgb\(\s*([0-9]{1,3})\s*,\s*([0-9]{1,3})\s*,\s*([0-9]{1,3})\s*\)/.exec(E)){return B(parseInt(D[1],10),parseInt(D[2],10),parseInt(D[3],10))}if(D=/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(E)){return B(parseInt(D[1],10),parseInt(D[2],10),parseInt(D[3],10),parseFloat(D[4]))}if(D=/rgb\(\s*([0-9]+(?:\.[0-9]+)?)\%\s*,\s*([0-9]+(?:\.[0-9]+)?)\%\s*,\s*([0-9]+(?:\.[0-9]+)?)\%\s*\)/.exec(E)){return B(parseFloat(D[1])*2.55,parseFloat(D[2])*2.55,parseFloat(D[3])*2.55)}if(D=/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(E)){return B(parseFloat(D[1])*2.55,parseFloat(D[2])*2.55,parseFloat(D[3])*2.55,parseFloat(D[4]))}if(D=/#([a-fA-F0-9]{2})([a-fA-F0-9]{2})([a-fA-F0-9]{2})/.exec(E)){return B(parseInt(D[1],16),parseInt(D[2],16),parseInt(D[3],16))}if(D=/#([a-fA-F0-9])([a-fA-F0-9])([a-fA-F0-9])/.exec(E)){return B(parseInt(D[1]+D[1],16),parseInt(D[2]+D[2],16),parseInt(D[3]+D[3],16))}var C=jQuery.trim(E).toLowerCase();if(C=="transparent"){return B(255,255,255,0)}else{D=A[C];return B(D[0],D[1],D[2])}};var A={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]}})();
\ No newline at end of file

new file mode 100644
--- /dev/null
+++ b/browser/app/profile/extensions/testpilot@labs.mozilla.com/content/flot/jquery.flot.crosshair.js
@@ -0,0 +1,156 @@
+/*
+Flot plugin for showing a crosshair, thin lines, when the mouse hovers
+over the plot.
+
+  crosshair: {
+    mode: null or "x" or "y" or "xy"
+    color: color
+    lineWidth: number
+  }
+
+Set the mode to one of "x", "y" or "xy". The "x" mode enables a
+vertical crosshair that lets you trace the values on the x axis, "y"
+enables a horizontal crosshair and "xy" enables them both. "color" is
+the color of the crosshair (default is "rgba(170, 0, 0, 0.80)"),
+"lineWidth" is the width of the drawn lines (default is 1).
+
+The plugin also adds four public methods:
+
+  - setCrosshair(pos)
+
+    Set the position of the crosshair. Note that this is cleared if
+    the user moves the mouse. "pos" should be on the form { x: xpos,
+    y: ypos } (or x2 and y2 if you're using the secondary axes), which
+    is coincidentally the same format as what you get from a "plothover"
+    event. If "pos" is null, the crosshair is cleared.
+
+  - clearCrosshair()
+
+    Clear the crosshair.
+
+  - lockCrosshair(pos)
+
+    Cause the crosshair to lock to the current location, no longer
+    updating if the user moves the mouse. Optionally supply a position
+    (passed on to setCrosshair()) to move it to.
+
+    Example usage:
+      var myFlot = $.plot( $("#graph"), ..., { crosshair: { mode: "x" } } };
+      $("#graph").bind("plothover", function (evt, position, item) {
+        if (item) {
+          // Lock the crosshair to the data point being hovered
+          myFlot.lockCrosshair({ x: item.datapoint[0], y: item.datapoint[1] });
+        }
+        else {
+          // Return normal crosshair operation
+          myFlot.unlockCrosshair();
+        }
+      });
+
+  - unlockCrosshair()
+
+    Free the crosshair to move again after locking it.
+*/
+
+(function ($) {
+    var options = {
+        crosshair: {
+            mode: null, // one of null, "x", "y" or "xy",
+            color: "rgba(170, 0, 0, 0.80)",
+            lineWidth: 1
+        }
+    };
+    
+    function init(plot) {
+        // position of crosshair in pixels
+        var crosshair = { x: -1, y: -1, locked: false };
+
+        plot.setCrosshair = function setCrosshair(pos) {
+            if (!pos)
+                crosshair.x = -1;
+            else {
+                var axes = plot.getAxes();
+                
+                crosshair.x = Math.max(0, Math.min(pos.x != null ? axes.xaxis.p2c(pos.x) : axes.x2axis.p2c(pos.x2), plot.width()));
+                crosshair.y = Math.max(0, Math.min(pos.y != null ? axes.yaxis.p2c(pos.y) : axes.y2axis.p2c(pos.y2), plot.height()));
+            }
+            
+            plot.triggerRedrawOverlay();
+        };
+        
+        plot.clearCrosshair = plot.setCrosshair; // passes null for pos
+        
+        plot.lockCrosshair = function lockCrosshair(pos) {
+            if (pos)
+                plot.setCrosshair(pos);
+            crosshair.locked = true;
+        }
+
+        plot.unlockCrosshair = function unlockCrosshair() {
+            crosshair.locked = false;
+        }
+
+        plot.hooks.bindEvents.push(function (plot, eventHolder) {
+            if (!plot.getOptions().crosshair.mode)
+                return;
+
+            eventHolder.mouseout(function () {
+                if (crosshair.x != -1) {
+                    crosshair.x = -1;
+                    plot.triggerRedrawOverlay();
+                }
+            });
+            
+            eventHolder.mousemove(function (e) {
+                if (plot.getSelection && plot.getSelection()) {
+                    crosshair.x = -1; // hide the crosshair while selecting
+                    return;
+                }
+                
+                if (crosshair.locked)
+                    return;
+                
+                var offset = plot.offset();
+                crosshair.x = Math.max(0, Math.min(e.pageX - offset.left, plot.width()));
+                crosshair.y = Math.max(0, Math.min(e.pageY - offset.top, plot.height()));
+                plot.triggerRedrawOverlay();
+            });
+        });
+
+        plot.hooks.drawOverlay.push(function (plot, ctx) {
+            var c = plot.getOptions().crosshair;
+            if (!c.mode)
+                return;
+
+            var plotOffset = plot.getPlotOffset();
+            
+            ctx.save();
+            ctx.translate(plotOffset.left, plotOffset.top);
+
+            if (crosshair.x != -1) {
+                ctx.strokeStyle = c.color;
+                ctx.lineWidth = c.lineWidth;
+                ctx.lineJoin = "round";
+
+                ctx.beginPath();
+                if (c.mode.indexOf("x") != -1) {
+                    ctx.moveTo(crosshair.x, 0);
+                    ctx.lineTo(crosshair.x, plot.height());
+                }
+                if (c.mode.indexOf("y") != -1) {
+                    ctx.moveTo(0, crosshair.y);
+                    ctx.lineTo(plot.width(), crosshair.y);
+                }
+                ctx.stroke();
+            }
+            ctx.restore();
+        });
+    }
+    
+    $.plot.plugins.push({
+        init: init,
+        options: options,
+        name: 'crosshair',
+        version: '1.0'
+    });
+})(jQuery);

new file mode 100644
--- /dev/null
+++ b/browser/app/profile/extensions/testpilot@labs.mozilla.com/content/flot/jquery.flot.crosshair.min.js
@@ -0,0 +1,1 @@
+(function(B){var A={crosshair:{mode:null,color:"rgba(170, 0, 0, 0.80)",lineWidth:1}};function C(G){var H={x:-1,y:-1,locked:false};G.setCrosshair=function D(J){if(!J){H.x=-1}else{var I=G.getAxes();H.x=Math.max(0,Math.min(J.x!=null?I.xaxis.p2c(J.x):I.x2axis.p2c(J.x2),G.width()));H.y=Math.max(0,Math.min(J.y!=null?I.yaxis.p2c(J.y):I.y2axis.p2c(J.y2),G.height()))}G.triggerRedrawOverlay()};G.clearCrosshair=G.setCrosshair;G.lockCrosshair=function E(I){if(I){G.setCrosshair(I)}H.locked=true};G.unlockCrosshair=function F(){H.locked=false};G.hooks.bindEvents.push(function(J,I){if(!J.getOptions().crosshair.mode){return }I.mouseout(function(){if(H.x!=-1){H.x=-1;J.triggerRedrawOverlay()}});I.mousemove(function(K){if(J.getSelection&&J.getSelection()){H.x=-1;return }if(H.locked){return }var L=J.offset();H.x=Math.max(0,Math.min(K.pageX-L.left,J.width()));H.y=Math.max(0,Math.min(K.pageY-L.top,J.height()));J.triggerRedrawOverlay()})});G.hooks.drawOverlay.push(function(K,I){var L=K.getOptions().crosshair;if(!L.mode){return }var J=K.getPlotOffset();I.save();I.translate(J.left,J.top);if(H.x!=-1){I.strokeStyle=L.color;I.lineWidth=L.lineWidth;I.lineJoin="round";I.beginPath();if(L.mode.indexOf("x")!=-1){I.moveTo(H.x,0);I.lineTo(H.x,K.height())}if(L.mode.indexOf("y")!=-1){I.moveTo(0,H.y);I.lineTo(K.width(),H.y)}I.stroke()}I.restore()})}B.plot.plugins.push({init:C,options:A,name:"crosshair",version:"1.0"})})(jQuery);
\ No newline at end of file

new file mode 100644
--- /dev/null
+++ b/browser/app/profile/extensions/testpilot@labs.mozilla.com/content/flot/jquery.flot.image.js
@@ -0,0 +1,237 @@
+/*
+Flot plugin for plotting images, e.g. useful for putting ticks on a
+prerendered complex visualization.
+
+The data syntax is [[image, x1, y1, x2, y2], ...] where (x1, y1) and
+(x2, y2) are where you intend the two opposite corners of the image to
+end up in the plot. Image must be a fully loaded Javascript image (you
+can make one with new Image()). If the image is not complete, it's
+skipped when plotting.
+
+There are two helpers included for retrieving images. The easiest work
+the way that you put in URLs instead of images in the data (like
+["myimage.png", 0, 0, 10, 10]), then call $.plot.image.loadData(data,
+options, callback) where data and options are the same as you pass in
+to $.plot. This loads the images, replaces the URLs in the data with
+the corresponding images and calls "callback" when all images are
+loaded (or failed loading). In the callback, you can then call $.plot
+with the data set. See the included example.
+
+A more low-level helper, $.plot.image.load(urls, callback) is also
+included. Given a list of URLs, it calls callback with an object
+mapping from URL to Image object when all images are loaded or have
+failed loading.
+
+Options for the plugin are
+
+  series: {
+      images: {
+          show: boolean
+          anchor: "corner" or "center"
+          alpha: [0,1]
+      }
+  }
+
+which can be specified for a specific series
+
+  $.plot($("#placeholder"), [{ data: [ ... ], images: { ... } ])
+
+Note that because the data format is different from usual data points,
+you can't use images with anything else in a specific data series.
+
+Setting "anchor" to "center" causes the pixels in the image to be
+anchored at the corner pixel centers inside of at the pixel corners,
+effectively letting half a pixel stick out to each side in the plot.
+
+
+A possible future direction could be support for tiling for large
+images (like Google Maps).
+
+*/
+
+(function ($) {
+    var options = {
+        series: {
+            images: {
+                show: false,
+                alpha: 1,
+                anchor: "corner" // or "center"
+            }
+        }
+    };
+
+    $.plot.image = {};
+
+    $.plot.image.loadDataImages = function (series, options, callback) {
+        var urls = [], points = [];
+
+        var defaultShow = options.series.images.show;
+        
+        $.each(series, function (i, s) {
+            if (!(defaultShow || s.images.show))
+                return;
+            
+            if (s.data)
+                s = s.data;
+
+            $.each(s, function (i, p) {
+                if (typeof p[0] == "string") {
+                    urls.push(p[0]);
+                    points.push(p);
+                }
+            });
+        });
+
+        $.plot.image.load(urls, function (loadedImages) {
+            $.each(points, function (i, p) {
+                var url = p[0];
+                if (loadedImages[url])
+                    p[0] = loadedImages[url];
+            });
+
+            callback();
+        });
+    }
+    
+    $.plot.image.load = function (urls, callback) {
+        var missing = urls.length, loaded = {};
+        if (missing == 0)
+            callback({});
+
+        $.each(urls, function (i, url) {
+            var handler = function () {
+                --missing;
+                
+                loaded[url] = this;
+                
+                if (missing == 0)
+                    callback(loaded);
+            };
+
+            $('<img />').load(handler).error(handler).attr('src', url);
+        });
+    }
+    
+    function draw(plot, ctx) {
+        var plotOffset = plot.getPlotOffset();
+        
+        $.each(plot.getData(), function (i, series) {
+            var points = series.datapoints.points,
+                ps = series.datapoints.pointsize;
+            
+            for (var i = 0; i < points.length; i += ps) {
+                var img = points[i],
+                    x1 = points[i + 1], y1 = points[i + 2],
+                    x2 = points[i + 3], y2 = points[i + 4],
+                    xaxis = series.xaxis, yaxis = series.yaxis,
+                    tmp;
+
+                // actually we should check img.complete, but it
+                // appears to be a somewhat unreliable indicator in
+                // IE6 (false even after load event)
+                if (!img || img.width <= 0 || img.height <= 0)
+                    continue;
+
+                if (x1 > x2) {
+                    tmp = x2;
+                    x2 = x1;
+                    x1 = tmp;
+                }
+                if (y1 > y2) {
+                    tmp = y2;
+                    y2 = y1;
+                    y1 = tmp;
+                }
+                
+                // if the anchor is at the center of the pixel, expand the 
+                // image by 1/2 pixel in each direction
+                if (series.images.anchor == "center") {
+                    tmp = 0.5 * (x2-x1) / (img.width - 1);
+                    x1 -= tmp;
+                    x2 += tmp;
+                    tmp = 0.5 * (y2-y1) / (img.height - 1);
+                    y1 -= tmp;
+                    y2 += tmp;
+                }
+                
+                // clip
+                if (x1 == x2 || y1 == y2 ||
+                    x1 >= xaxis.max || x2 <= xaxis.min ||
+                    y1 >= yaxis.max || y2 <= yaxis.min)
+                    continue;
+
+                var sx1 = 0, sy1 = 0, sx2 = img.width, sy2 = img.height;
+                if (x1 < xaxis.min) {
+                    sx1 += (sx2 - sx1) * (xaxis.min - x1) / (x2 - x1);
+                    x1 = xaxis.min;
+                }
+
+                if (x2 > xaxis.max) {
+                    sx2 += (sx2 - sx1) * (xaxis.max - x2) / (x2 - x1);
+                    x2 = xaxis.max;
+                }
+
+                if (y1 < yaxis.min) {
+                    sy2 += (sy1 - sy2) * (yaxis.min - y1) / (y2 - y1);
+                    y1 = yaxis.min;
+                }
+
+                if (y2 > yaxis.max) {
+                    sy1 += (sy1 - sy2) * (yaxis.max - y2) / (y2 - y1);
+                    y2 = yaxis.max;
+                }
+                
+                x1 = xaxis.p2c(x1);
+                x2 = xaxis.p2c(x2);
+                y1 = yaxis.p2c(y1);
+                y2 = yaxis.p2c(y2);
+                
+                // the transformation may have swapped us
+                if (x1 > x2) {
+                    tmp = x2;
+                    x2 = x1;
+                    x1 = tmp;
+                }
+                if (y1 > y2) {
+                    tmp = y2;
+                    y2 = y1;
+                    y1 = tmp;
+                }
+
+                tmp = ctx.globalAlpha;
+                ctx.globalAlpha *= series.images.alpha;
+                ctx.drawImage(img,
+                              sx1, sy1, sx2 - sx1, sy2 - sy1,
+                              x1 + plotOffset.left, y1 + plotOffset.top,
+                              x2 - x1, y2 - y1);
+                ctx.globalAlpha = tmp;
+            }
+        });
+    }
+
+    function processRawData(plot, series, data, datapoints) {
+        if (!series.images.show)
+            return;
+
+        // format is Image, x1, y1, x2, y2 (opposite corners)
+        datapoints.format = [
+            { required: true },
+            { x: true, number: true, required: true },
+            { y: true, number: true, required: true },
+            { x: true, number: true, required: true },
+            { y: true, number: true, required: true }
+        ];
+    }
+    
+    function init(plot) {
+        plot.hooks.processRawData.push(processRawData);
+        plot.hooks.draw.push(draw);
+    }
+    
+    $.plot.plugins.push({
+        init: init,
+        options: options,
+        name: 'image',
+        version: '1.1'
+    });
+})(jQuery);

new file mode 100644
--- /dev/null
+++ b/browser/app/profile/extensions/testpilot@labs.mozilla.com/content/flot/jquery.flot.image.min.js
@@ -0,0 +1,1 @@
+(function(D){var B={series:{images:{show:false,alpha:1,anchor:"corner"}}};D.plot.image={};D.plot.image.loadDataImages=function(G,F,K){var J=[],H=[];var I=F.series.images.show;D.each(G,function(L,M){if(!(I||M.images.show)){return }if(M.data){M=M.data}D.each(M,function(N,O){if(typeof O[0]=="string"){J.push(O[0]);H.push(O)}})});D.plot.image.load(J,function(L){D.each(H,function(N,O){var M=O[0];if(L[M]){O[0]=L[M]}});K()})};D.plot.image.load=function(H,I){var G=H.length,F={};if(G==0){I({})}D.each(H,function(K,J){var L=function(){--G;F[J]=this;if(G==0){I(F)}};D("<img />").load(L).error(L).attr("src",J)})};function A(H,F){var G=H.getPlotOffset();D.each(H.getData(),function(O,P){var X=P.datapoints.points,I=P.datapoints.pointsize;for(var O=0;O<X.length;O+=I){var Q=X[O],M=X[O+1],V=X[O+2],K=X[O+3],T=X[O+4],W=P.xaxis,S=P.yaxis,N;if(!Q||Q.width<=0||Q.height<=0){continue}if(M>K){N=K;K=M;M=N}if(V>T){N=T;T=V;V=N}if(P.images.anchor=="center"){N=0.5*(K-M)/(Q.width-1);M-=N;K+=N;N=0.5*(T-V)/(Q.height-1);V-=N;T+=N}if(M==K||V==T||M>=W.max||K<=W.min||V>=S.max||T<=S.min){continue}var L=0,U=0,J=Q.width,R=Q.height;if(M<W.min){L+=(J-L)*(W.min-M)/(K-M);M=W.min}if(K>W.max){J+=(J-L)*(W.max-K)/(K-M);K=W.max}if(V<S.min){R+=(U-R)*(S.min-V)/(T-V);V=S.min}if(T>S.max){U+=(U-R)*(S.max-T)/(T-V);T=S.max}M=W.p2c(M);K=W.p2c(K);V=S.p2c(V);T=S.p2c(T);if(M>K){N=K;K=M;M=N}if(V>T){N=T;T=V;V=N}N=F.globalAlpha;F.globalAlpha*=P.images.alpha;F.drawImage(Q,L,U,J-L,R-U,M+G.left,V+G.top,K-M,T-V);F.globalAlpha=N}})}function C(I,F,G,H){if(!F.images.show){return }H.format=[{required:true},{x:true,number:true,required:true},{y:true,number:true,required:true},{x:true,number:true,required:true},{y:true,number:true,required:true}]}function E(F){F.hooks.processRawData.push(C);F.hooks.draw.push(A)}D.plot.plugins.push({init:E,options:B,name:"image",version:"1.1"})})(jQuery);
\ No newline at end of file

new file mode 100644
--- /dev/null
+++ b/browser/app/profile/extensions/testpilot@labs.mozilla.com/content/flot/jquery.flot.js
@@ -0,0 +1,2119 @@
+/* Javascript plotting library for jQuery, v. 0.6.
+ *
+ * Released under the MIT license by IOLA, December 2007.
+ *
+ */
+
+// first an inline dependency, jquery.colorhelpers.js, we inline it here
+// for convenience
+
+/* Plugin for jQuery for working with colors.
+ * 
+ * Version 1.0.
+ * 
+ * Inspiration from jQuery color animation plugin by John Resig.
+ *
+ * Released under the MIT license by Ole Laursen, October 2009.
+ *
+ * Examples:
+ *
+ *   $.color.parse("#fff").scale('rgb', 0.25).add('a', -0.5).toString()
+ *   var c = $.color.extract($("#mydiv"), 'background-color');
+ *   console.log(c.r, c.g, c.b, c.a);
+ *   $.color.make(100, 50, 25, 0.4).toString() // returns "rgba(100,50,25,0.4)"
+ *
+ * Note that .scale() and .add() work in-place instead of returning
+ * new objects.
+ */ 
+(function(){jQuery.color={};jQuery.color.make=function(E,D,B,C){var F={};F.r=E||0;F.g=D||0;F.b=B||0;F.a=C!=null?C:1;F.add=function(I,H){for(var G=0;G<I.length;++G){F[I.charAt(G)]+=H}return F.normalize()};F.scale=function(I,H){for(var G=0;G<I.length;++G){F[I.charAt(G)]*=H}return F.normalize()};F.toString=function(){if(F.a>=1){return"rgb("+[F.r,F.g,F.b].join(",")+")"}else{return"rgba("+[F.r,F.g,F.b,F.a].join(",")+")"}};F.normalize=function(){function G(I,J,H){return J<I?I:(J>H?H:J)}F.r=G(0,parseInt(F.r),255);F.g=G(0,parseInt(F.g),255);F.b=G(0,parseInt(F.b),255);F.a=G(0,F.a,1);return F};F.clone=function(){return jQuery.color.make(F.r,F.b,F.g,F.a)};return F.normalize()};jQuery.color.extract=function(C,B){var D;do{D=C.css(B).toLowerCase();if(D!=""&&D!="transparent"){break}C=C.parent()}while(!jQuery.nodeName(C.get(0),"body"));if(D=="rgba(0, 0, 0, 0)"){D="transparent"}return jQuery.color.parse(D)};jQuery.color.parse=function(E){var D,B=jQuery.color.make;if(D=/rgb\(\s*([0-9]{1,3})\s*,\s*([0-9]{1,3})\s*,\s*([0-9]{1,3})\s*\)/.exec(E)){return B(parseInt(D[1],10),parseInt(D[2],10),parseInt(D[3],10))}if(D=/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(E)){return B(parseInt(D[1],10),parseInt(D[2],10),parseInt(D[3],10),parseFloat(D[4]))}if(D=/rgb\(\s*([0-9]+(?:\.[0-9]+)?)\%\s*,\s*([0-9]+(?:\.[0-9]+)?)\%\s*,\s*([0-9]+(?:\.[0-9]+)?)\%\s*\)/.exec(E)){return B(parseFloat(D[1])*2.55,parseFloat(D[2])*2.55,parseFloat(D[3])*2.55)}if(D=/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(E)){return B(parseFloat(D[1])*2.55,parseFloat(D[2])*2.55,parseFloat(D[3])*2.55,parseFloat(D[4]))}if(D=/#([a-fA-F0-9]{2})([a-fA-F0-9]{2})([a-fA-F0-9]{2})/.exec(E)){return B(parseInt(D[1],16),parseInt(D[2],16),parseInt(D[3],16))}if(D=/#([a-fA-F0-9])([a-fA-F0-9])([a-fA-F0-9])/.exec(E)){return B(parseInt(D[1]+D[1],16),parseInt(D[2]+D[2],16),parseInt(D[3]+D[3],16))}var C=jQuery.trim(E).toLowerCase();if(C=="transparent"){return B(255,255,255,0)}else{D=A[C];return B(D[0],D[1],D[2])}};var A={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]}})();
+
+// the actual Flot code
+(function($) {
+    function Plot(placeholder, data_, options_, plugins) {
+        // data is on the form:
+        //   [ series1, series2 ... ]
+        // where series is either just the data as [ [x1, y1], [x2, y2], ... ]
+        // or { data: [ [x1, y1], [x2, y2], ... ], label: "some label", ... }
+        
+        var series = [],
+            options = {
+                // the color theme used for graphs
+                colors: ["#edc240", "#afd8f8", "#cb4b4b", "#4da74d", "#9440ed"],
+                legend: {
+                    show: true,
+                    noColumns: 1, // number of colums in legend table
+                    labelFormatter: null, // fn: string -> string
+                    labelBoxBorderColor: "#ccc", // border color for the little label boxes
+                    container: null, // container (as jQuery object) to put legend in, null means default on top of graph
+                    position: "ne", // position of default legend container within plot
+                    margin: 5, // distance from grid edge to default legend container within plot
+                    backgroundColor: null, // null means auto-detect
+                    backgroundOpacity: 0.85 // set to 0 to avoid background
+                },
+                xaxis: {
+                    mode: null, // null or "time"
+                    transform: null, // null or f: number -> number to transform axis
+                    inverseTransform: null, // if transform is set, this should be the inverse function
+                    min: null, // min. value to show, null means set automatically
+                    max: null, // max. value to show, null means set automatically
+                    autoscaleMargin: null, // margin in % to add if auto-setting min/max
+                    ticks: null, // either [1, 3] or [[1, "a"], 3] or (fn: axis info -> ticks) or app. number of ticks for auto-ticks
+                    tickFormatter: null, // fn: number -> string
+                    labelWidth: null, // size of tick labels in pixels
+                    labelHeight: null,
+                    
+                    // mode specific options
+                    tickDecimals: null, // no. of decimals, null means auto
+                    tickSize: null, // number or [number, "unit"]
+                    minTickSize: null, // number or [number, "unit"]
+                    monthNames: null, // list of names of months
+                    timeformat: null, // format string to use
+                    twelveHourClock: false // 12 or 24 time in time mode
+                },
+                yaxis: {
+                    autoscaleMargin: 0.02
+                },
+                x2axis: {
+                    autoscaleMargin: null
+                },
+                y2axis: {
+                    autoscaleMargin: 0.02
+                },
+                series: {
+                    points: {
+                        show: false,
+                        radius: 3,
+                        lineWidth: 2, // in pixels
+                        fill: true,
+                        fillColor: "#ffffff"
+                    },
+                    lines: {
+                        // we don't put in show: false so we can see
+                        // whether lines were actively disabled 
+                        lineWidth: 2, // in pixels
+                        fill: false,
+                        fillColor: null,
+                        steps: false
+                    },
+                    bars: {
+                        show: false,
+                        lineWidth: 2, // in pixels
+                        barWidth: 1, // in units of the x axis
+                        fill: true,
+                        fillColor: null,
+                        align: "left", // or "center" 
+                        horizontal: false // when horizontal, left is now top
+                    },
+                    shadowSize: 3
+                },
+                grid: {
+                    show: true,
+                    aboveData: false,
+                    color: "#545454", // primary color used for outline and labels
+                    backgroundColor: null, // null for transparent, else color
+                    tickColor: "rgba(0,0,0,0.15)", // color used for the ticks
+                    labelMargin: 5, // in pixels
+                    borderWidth: 2, // in pixels
+                    borderColor: null, // set if different from the grid color
+                    markings: null, // array of ranges or fn: axes -> array of ranges
+                    markingsColor: "#f4f4f4",
+                    markingsLineWidth: 2,
+                    // interactive stuff
+                    clickable: false,
+                    hoverable: false,
+                    autoHighlight: true, // highlight in case mouse is near
+                    mouseActiveRadius: 10 // how far the mouse can be away to activate an item
+                },
+                hooks: {}
+            },
+        canvas = null,      // the canvas for the plot itself
+        overlay = null,     // canvas for interactive stuff on top of plot
+        eventHolder = null, // jQuery object that events should be bound to
+        ctx = null, octx = null,
+        axes = { xaxis: {}, yaxis: {}, x2axis: {}, y2axis: {} },
+        plotOffset = { left: 0, right: 0, top: 0, bottom: 0},
+        canvasWidth = 0, canvasHeight = 0,
+        plotWidth = 0, plotHeight = 0,
+        hooks = {
+            processOptions: [],
+            processRawData: [],
+            processDatapoints: [],
+            draw: [],
+            bindEvents: [],
+            drawOverlay: []
+        },
+        plot = this;
+
+        // public functions
+        plot.setData = setData;
+        plot.setupGrid = setupGrid;
+        plot.draw = draw;
+        plot.getPlaceholder = function() { return placeholder; };
+        plot.getCanvas = function() { return canvas; };
+        plot.getPlotOffset = function() { return plotOffset; };
+        plot.width = function () { return plotWidth; };
+        plot.height = function () { return plotHeight; };
+        plot.offset = function () {
+            var o = eventHolder.offset();
+            o.left += plotOffset.left;
+            o.top += plotOffset.top;
+            return o;
+        };
+        plot.getData = function() { return series; };
+        plot.getAxes = function() { return axes; };
+        plot.getOptions = function() { return options; };
+        plot.highlight = highlight;
+        plot.unhighlight = unhighlight;
+        plot.triggerRedrawOverlay = triggerRedrawOverlay;
+        plot.pointOffset = function(point) {
+            return { left: parseInt(axisSpecToRealAxis(point, "xaxis").p2c(+point.x) + plotOffset.left),
+                     top: parseInt(axisSpecToRealAxis(point, "yaxis").p2c(+point.y) + plotOffset.top) };
+        };
+        
+
+        // public attributes
+        plot.hooks = hooks;
+        
+        // initialize
+        initPlugins(plot);
+        parseOptions(options_);
+        constructCanvas();
+        setData(data_);
+        setupGrid();
+        draw();
+        bindEvents();
+
+
+        function executeHooks(hook, args) {
+            args = [plot].concat(args);
+            for (var i = 0; i < hook.length; ++i)
+                hook[i].apply(this, args);
+        }
+
+        function initPlugins() {
+            for (var i = 0; i < plugins.length; ++i) {
+                var p = plugins[i];
+                p.init(plot);
+                if (p.options)
+                    $.extend(true, options, p.options);
+            }
+        }
+        
+        function parseOptions(opts) {
+            $.extend(true, options, opts);
+            if (options.grid.borderColor == null)
+                options.grid.borderColor = options.grid.color;
+            // backwards compatibility, to be removed in future
+            if (options.xaxis.noTicks && options.xaxis.ticks == null)
+                options.xaxis.ticks = options.xaxis.noTicks;
+            if (options.yaxis.noTicks && options.yaxis.ticks == null)
+                options.yaxis.ticks = options.yaxis.noTicks;
+            if (options.grid.coloredAreas)
+                options.grid.markings = options.grid.coloredAreas;
+            if (options.grid.coloredAreasColor)
+                options.grid.markingsColor = options.grid.coloredAreasColor;
+            if (options.lines)
+                $.extend(true, options.series.lines, options.lines);
+            if (options.points)
+                $.extend(true, options.series.points, options.points);
+            if (options.bars)
+                $.extend(true, options.series.bars, options.bars);
+            if (options.shadowSize)
+                options.series.shadowSize = options.shadowSize;
+
+            for (var n in hooks)
+                if (options.hooks[n] && options.hooks[n].length)
+                    hooks[n] = hooks[n].concat(options.hooks[n]);
+
+            executeHooks(hooks.processOptions, [options]);
+        }
+
+        function setData(d) {
+            series = parseData(d);
+            fillInSeriesOptions();
+            processData();
+        }
+        
+        function parseData(d) {
+            var res = [];
+            for (var i = 0; i < d.length; ++i) {
+                var s = $.extend(true, {}, options.series);
+
+                if (d[i].data) {
+                    s.data = d[i].data; // move the data instead of deep-copy
+                    delete d[i].data;
+
+                    $.extend(true, s, d[i]);
+
+                    d[i].data = s.data;
+                }
+                else
+                    s.data = d[i];
+                res.push(s);
+            }
+
+            return res;
+        }
+        
+        function axisSpecToRealAxis(obj, attr) {
+            var a = obj[attr];
+            if (!a || a == 1)
+                return axes[attr];
+            if (typeof a == "number")
+                return axes[attr.charAt(0) + a + attr.slice(1)];
+            return a; // assume it's OK
+        }
+        
+        function fillInSeriesOptions() {
+            var i;
+            
+            // collect what we already got of colors
+            var neededColors = series.length,
+                usedColors = [],
+                assignedColors = [];
+            for (i = 0; i < series.length; ++i) {
+                var sc = series[i].color;
+                if (sc != null) {
+                    --neededColors;
+                    if (typeof sc == "number")
+                        assignedColors.push(sc);
+                    else
+                        usedColors.push($.color.parse(series[i].color));
+                }
+            }
+            
+            // we might need to generate more colors if higher indices
+            // are assigned
+            for (i = 0; i < assignedColors.length; ++i) {
+                neededColors = Math.max(neededColors, assignedColors[i] + 1);
+            }
+
+            // produce colors as needed
+            var colors = [], variation = 0;
+            i = 0;
+            while (colors.length < neededColors) {
+                var c;
+                if (options.colors.length == i) // check degenerate case
+                    c = $.color.make(100, 100, 100);
+                else
+                    c = $.color.parse(options.colors[i]);
+
+                // vary color if needed
+                var sign = variation % 2 == 1 ? -1 : 1;
+                c.scale('rgb', 1 + sign * Math.ceil(variation / 2) * 0.2)
+
+                // FIXME: if we're getting to close to something else,
+                // we should probably skip this one
+                colors.push(c);
+                
+                ++i;
+                if (i >= options.colors.length) {
+                    i = 0;
+                    ++variation;
+                }
+            }
+
+            // fill in the options
+            var colori = 0, s;
+            for (i = 0; i < series.length; ++i) {
+                s = series[i];
+                
+                // assign colors
+                if (s.color == null) {
+                    s.color = colors[colori].toString();
+                    ++colori;
+                }
+                else if (typeof s.color == "number")
+                    s.color = colors[s.color].toString();
+
+                // turn on lines automatically in case nothing is set
+                if (s.lines.show == null) {
+                    var v, show = true;
+                    for (v in s)
+                        if (s[v].show) {
+                            show = false;
+                            break;
+                        }
+                    if (show)
+                        s.lines.show = true;
+                }
+
+                // setup axes
+                s.xaxis = axisSpecToRealAxis(s, "xaxis");
+                s.yaxis = axisSpecToRealAxis(s, "yaxis");
+            }
+        }
+        
+        function processData() {
+            var topSentry = Number.POSITIVE_INFINITY,
+                bottomSentry = Number.NEGATIVE_INFINITY,
+                i, j, k, m, length,
+                s, points, ps, x, y, axis, val, f, p;
+
+            for (axis in axes) {
+                axes[axis].datamin = topSentry;
+                axes[axis].datamax = bottomSentry;
+                axes[axis].used = false;
+            }
+
+            function updateAxis(axis, min, max) {
+                if (min < axis.datamin)
+                    axis.datamin = min;
+                if (max > axis.datamax)
+                    axis.datamax = max;
+            }
+
+            for (i = 0; i < series.length; ++i) {
+                s = series[i];
+                s.datapoints = { points: [] };
+                
+                executeHooks(hooks.processRawData, [ s, s.data, s.datapoints ]);
+            }
+            
+            // first pass: clean and copy data
+            for (i = 0; i < series.length; ++i) {
+                s = series[i];
+
+                var data = s.data, format = s.datapoints.format;
+
+                if (!format) {
+                    format = [];
+                    // find out how to copy
+                    format.push({ x: true, number: true, required: true });
+                    format.push({ y: true, number: true, required: true });
+
+                    if (s.bars.show)
+                        format.push({ y: true, number: true, required: false, defaultValue: 0 });
+                    
+                    s.datapoints.format = format;
+                }
+
+                if (s.datapoints.pointsize != null)
+                    continue; // already filled in
+
+                if (s.datapoints.pointsize == null)
+                    s.datapoints.pointsize = format.length;
+                
+                ps = s.datapoints.pointsize;
+                points = s.datapoints.points;
+
+                insertSteps = s.lines.show && s.lines.steps;
+                s.xaxis.used = s.yaxis.used = true;
+                
+                for (j = k = 0; j < data.length; ++j, k += ps) {
+                    p = data[j];
+
+                    var nullify = p == null;
+                    if (!nullify) {
+                        for (m = 0; m < ps; ++m) {
+                            val = p[m];
+                            f = format[m];
+
+                            if (f) {
+                                if (f.number && val != null) {
+                                    val = +val; // convert to number
+                                    if (isNaN(val))
+                                        val = null;
+                                }
+
+                                if (val == null) {
+                                    if (f.required)
+                                        nullify = true;
+                                    
+                                    if (f.defaultValue != null)
+                                        val = f.defaultValue;
+                                }
+                            }
+                            
+                            points[k + m] = val;
+                        }
+                    }
+                    
+                    if (nullify) {
+                        for (m = 0; m < ps; ++m) {
+                            val = points[k + m];
+                            if (val != null) {
+                                f = format[m];
+                                // extract min/max info
+                                if (f.x)
+                                    updateAxis(s.xaxis, val, val);
+                                if (f.y)
+                                    updateAxis(s.yaxis, val, val);
+                            }
+                            points[k + m] = null;
+                        }
+                    }
+                    else {
+                        // a little bit of line specific stuff that
+                        // perhaps shouldn't be here, but lacking
+                        // better means...
+                        if (insertSteps && k > 0
+                            && points[k - ps] != null
+                            && points[k - ps] != points[k]
+                            && points[k - ps + 1] != points[k + 1]) {
+                            // copy the point to make room for a middle point
+                            for (m = 0; m < ps; ++m)
+                                points[k + ps + m] = points[k + m];
+
+                            // middle point has same y
+                            points[k + 1] = points[k - ps + 1];
+
+                            // we've added a point, better reflect that
+                            k += ps;
+                        }
+                    }
+                }
+            }
+
+            // give the hooks a chance to run
+            for (i = 0; i < series.length; ++i) {
+                s = series[i];
+                
+                executeHooks(hooks.processDatapoints, [ s, s.datapoints]);
+            }
+
+            // second pass: find datamax/datamin for auto-scaling
+            for (i = 0; i < series.length; ++i) {
+                s = series[i];
+                points = s.datapoints.points,
+                ps = s.datapoints.pointsize;
+
+                var xmin = topSentry, ymin = topSentry,
+                    xmax = bottomSentry, ymax = bottomSentry;
+                
+                for (j = 0; j < points.length; j += ps) {
+                    if (points[j] == null)
+                        continue;
+
+                    for (m = 0; m < ps; ++m) {
+                        val = points[j + m];
+                        f = format[m];
+                        if (!f)
+                            continue;
+                        
+                        if (f.x) {
+                            if (val < xmin)
+                                xmin = val;
+                            if (val > xmax)
+                                xmax = val;
+                        }
+                        if (f.y) {
+                            if (val < ymin)
+                                ymin = val;
+                            if (val > ymax)
+                                ymax = val;
+                        }
+                    }
+                }
+                
+                if (s.bars.show) {
+                    // make sure we got room for the bar on the dancing floor
+                    var delta = s.bars.align == "left" ? 0 : -s.bars.barWidth/2;
+                    if (s.bars.horizontal) {
+                        ymin += delta;
+                        ymax += delta + s.bars.barWidth;
+                    }
+                    else {
+                        xmin += delta;
+                        xmax += delta + s.bars.barWidth;
+                    }
+                }
+                
+                updateAxis(s.xaxis, xmin, xmax);
+                updateAxis(s.yaxis, ymin, ymax);
+            }
+
+            for (axis in axes) {
+                if (axes[axis].datamin == topSentry)
+                    axes[axis].datamin = null;
+                if (axes[axis].datamax == bottomSentry)
+                    axes[axis].datamax = null;
+            }
+        }
+
+        function constructCanvas() {
+            function makeCanvas(width, height) {
+                var c = document.createElement('canvas');
+                c.width = width;
+                c.height = height;
+                if ($.browser.msie) // excanvas hack
+                    c = window.G_vmlCanvasManager.initElement(c);
+                return c;
+            }
+            
+            canvasWidth = placeholder.width();
+            canvasHeight = placeholder.height();
+            placeholder.html(""); // clear placeholder
+            if (placeholder.css("position") == 'static')
+                placeholder.css("position", "relative"); // for positioning labels and overlay
+
+            if (canvasWidth <= 0 || canvasHeight <= 0)
+                throw "Invalid dimensions for plot, width = " + canvasWidth + ", height = " + canvasHeight;
+
+            if ($.browser.msie) // excanvas hack
+                window.G_vmlCanvasManager.init_(document); // make sure everything is setup
+            
+            // the canvas
+            canvas = $(makeCanvas(canvasWidth, canvasHeight)).appendTo(placeholder).get(0);
+            ctx = canvas.getContext("2d");
+
+            // overlay canvas for interactive features
+            overlay = $(makeCanvas(canvasWidth, canvasHeight)).css({ position: 'absolute', left: 0, top: 0 }).appendTo(placeholder).get(0);
+            octx = overlay.getContext("2d");
+            octx.stroke();
+        }
+
+        function bindEvents() {
+            // we include the canvas in the event holder too, because IE 7
+            // sometimes has trouble with the stacking order
+            eventHolder = $([overlay, canvas]);
+
+            // bind events
+            if (options.grid.hoverable)
+                eventHolder.mousemove(onMouseMove);
+
+            if (options.grid.clickable)
+                eventHolder.click(onClick);
+
+            executeHooks(hooks.bindEvents, [eventHolder]);
+        }
+
+        function setupGrid() {
+            function setTransformationHelpers(axis, o) {
+                function identity(x) { return x; }
+                
+                var s, m, t = o.transform || identity,
+                    it = o.inverseTransform;
+                    
+                // add transformation helpers
+                if (axis == axes.xaxis || axis == axes.x2axis) {
+                    // precompute how much the axis is scaling a point
+                    // in canvas space
+                    s = axis.scale = plotWidth / (t(axis.max) - t(axis.min));
+                    m = t(axis.min);
+
+                    // data point to canvas coordinate
+                    if (t == identity) // slight optimization
+                        axis.p2c = function (p) { return (p - m) * s; };
+                    else
+                        axis.p2c = function (p) { return (t(p) - m) * s; };
+                    // canvas coordinate to data point
+                    if (!it)
+                        axis.c2p = function (c) { return m + c / s; };
+                    else
+                        axis.c2p = function (c) { return it(m + c / s); };
+                }
+                else {
+                    s = axis.scale = plotHeight / (t(axis.max) - t(axis.min));
+                    m = t(axis.max);
+                    
+                    if (t == identity)
+                        axis.p2c = function (p) { return (m - p) * s; };
+                    else
+                        axis.p2c = function (p) { return (m - t(p)) * s; };
+                    if (!it)
+                        axis.c2p = function (c) { return m - c / s; };
+                    else
+                        axis.c2p = function (c) { return it(m - c / s); };
+                }
+            }
+
+            function measureLabels(axis, axisOptions) {
+                var i, labels = [], l;
+                
+                axis.labelWidth = axisOptions.labelWidth;
+                axis.labelHeight = axisOptions.labelHeight;
+
+                if (axis == axes.xaxis || axis == axes.x2axis) {
+                    // to avoid measuring the widths of the labels, we
+                    // construct fixed-size boxes and put the labels inside
+                    // them, we don't need the exact figures and the
+                    // fixed-size box content is easy to center
+                    if (axis.labelWidth == null)
+                        axis.labelWidth = canvasWidth / (axis.ticks.length > 0 ? axis.ticks.length : 1);
+
+                    // measure x label heights
+                    if (axis.labelHeight == null) {
+                        labels = [];
+                        for (i = 0; i < axis.ticks.length; ++i) {
+                            l = axis.ticks[i].label;
+                            if (l)
+                                labels.push('<div class="tickLabel" style="float:left;width:' + axis.labelWidth + 'px">' + l + '</div>');
+                        }
+                        
+                        if (labels.length > 0) {
+                            var dummyDiv = $('<div style="position:absolute;top:-10000px;width:10000px;font-size:smaller">'
+                                             + labels.join("") + '<div style="clear:left"></div></div>').appendTo(placeholder);
+                            axis.labelHeight = dummyDiv.height();
+                            dummyDiv.remove();
+                        }
+                    }
+                }
+                else if (axis.labelWidth == null || axis.labelHeight == null) {
+                    // calculate y label dimensions
+                    for (i = 0; i < axis.ticks.length; ++i) {
+                        l = axis.ticks[i].label;
+                        if (l)
+                            labels.push('<div class="tickLabel">' + l + '</div>');
+                    }
+                    
+                    if (labels.length > 0) {
+                        var dummyDiv = $('<div style="position:absolute;top:-10000px;font-size:smaller">'
+                                         + labels.join("") + '</div>').appendTo(placeholder);
+                        if (axis.labelWidth == null)
+                            axis.labelWidth = dummyDiv.width();
+                        if (axis.labelHeight == null)
+                            axis.labelHeight = dummyDiv.find("div").height();
+                        dummyDiv.remove();
+                    }
+                    
+                }
+
+                if (axis.labelWidth == null)
+                    axis.labelWidth = 0;
+                if (axis.labelHeight == null)
+                    axis.labelHeight = 0;
+            }
+            
+            function setGridSpacing() {
+                // get the most space needed around the grid for things
+                // that may stick out
+                var maxOutset = options.grid.borderWidth;
+                for (i = 0; i < series.length; ++i)
+                    maxOutset = Math.max(maxOutset, 2 * (series[i].points.radius + series[i].points.lineWidth/2));
+                
+                plotOffset.left = plotOffset.right = plotOffset.top = plotOffset.bottom = maxOutset;
+                
+                var margin = options.grid.labelMargin + options.grid.borderWidth;
+                
+                if (axes.xaxis.labelHeight > 0)
+                    plotOffset.bottom = Math.max(maxOutset, axes.xaxis.labelHeight + margin);
+                if (axes.yaxis.labelWidth > 0)
+                    plotOffset.left = Math.max(maxOutset, axes.yaxis.labelWidth + margin);
+                if (axes.x2axis.labelHeight > 0)
+                    plotOffset.top = Math.max(maxOutset, axes.x2axis.labelHeight + margin);
+                if (axes.y2axis.labelWidth > 0)
+                    plotOffset.right = Math.max(maxOutset, axes.y2axis.labelWidth + margin);
+            
+                plotWidth = canvasWidth - plotOffset.left - plotOffset.right;
+                plotHeight = canvasHeight - plotOffset.bottom - plotOffset.top;
+            }
+            
+            var axis;
+            for (axis in axes)
+                setRange(axes[axis], options[axis]);
+            
+            if (options.grid.show) {
+                for (axis in axes) {
+                    prepareTickGeneration(axes[axis], options[axis]);
+                    setTicks(axes[axis], options[axis]);
+                    measureLabels(axes[axis], options[axis]);
+                }
+
+                setGridSpacing();
+            }
+            else {
+                plotOffset.left = plotOffset.right = plotOffset.top = plotOffset.bottom = 0;
+                plotWidth = canvasWidth;
+                plotHeight = canvasHeight;
+            }
+            
+            for (axis in axes)
+                setTransformationHelpers(axes[axis], options[axis]);
+
+            if (options.grid.show)
+                insertLabels();
+            
+            insertLegend();
+        }
+        
+        function setRange(axis, axisOptions) {
+            var min = +(axisOptions.min != null ? axisOptions.min : axis.datamin),
+                max = +(axisOptions.max != null ? axisOptions.max : axis.datamax),
+                delta = max - min;
+
+            if (delta == 0.0) {
+                // degenerate case
+                var widen = max == 0 ? 1 : 0.01;
+
+                if (axisOptions.min == null)
+                    min -= widen;
+                // alway widen max if we couldn't widen min to ensure we
+                // don't fall into min == max which doesn't work
+                if (axisOptions.max == null || axisOptions.min != null)
+                    max += widen;
+            }
+            else {
+                // consider autoscaling
+                var margin = axisOptions.autoscaleMargin;
+                if (margin != null) {
+                    if (axisOptions.min == null) {
+                        min -= delta * margin;
+                        // make sure we don't go below zero if all values
+                        // are positive
+                        if (min < 0 && axis.datamin != null && axis.datamin >= 0)
+                            min = 0;
+                    }
+                    if (axisOptions.max == null) {
+                        max += delta * margin;
+                        if (max > 0 && axis.datamax != null && axis.datamax <= 0)
+                            max = 0;
+                    }
+                }
+            }
+            axis.min = min;
+            axis.max = max;
+        }
+
+        function prepareTickGeneration(axis, axisOptions) {
+            // estimate number of ticks
+            var noTicks;
+            if (typeof axisOptions.ticks == "number" && axisOptions.ticks > 0)
+                noTicks = axisOptions.ticks;
+            else if (axis == axes.xaxis || axis == axes.x2axis)
+                 // heuristic based on the model a*sqrt(x) fitted to
+                 // some reasonable data points
+                noTicks = 0.3 * Math.sqrt(canvasWidth);
+            else
+                noTicks = 0.3 * Math.sqrt(canvasHeight);
+            
+            var delta = (axis.max - axis.min) / noTicks,
+                size, generator, unit, formatter, i, magn, norm;
+
+            if (axisOptions.mode == "time") {
+                // pretty handling of time
+                
+                // map of app. size of time units in milliseconds
+                var timeUnitSize = {
+                    "second": 1000,
+                    "minute": 60 * 1000,
+                    "hour": 60 * 60 * 1000,
+                    "day": 24 * 60 * 60 * 1000,
+                    "month": 30 * 24 * 60 * 60 * 1000,
+                    "year": 365.2425 * 24 * 60 * 60 * 1000
+                };
+
+
+                // the allowed tick sizes, after 1 year we use
+                // an integer algorithm
+                var spec = [
+                    [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"]
+                ];
+
+                var minSize = 0;
+                if (axisOptions.minTickSize != null) {
+                    if (typeof axisOptions.tickSize == "number")
+                        minSize = axisOptions.tickSize;
+                    else
+                        minSize = axisOptions.minTickSize[0] * timeUnitSize[axisOptions.minTickSize[1]];
+                }
+
+                for (i = 0; i < spec.length - 1; ++i)
+                    if (delta < (spec[i][0] * timeUnitSize[spec[i][1]]
+                                 + spec[i + 1][0] * timeUnitSize[spec[i + 1][1]]) / 2
+                       && spec[i][0] * timeUnitSize[spec[i][1]] >= minSize)
+                        break;
+                size = spec[i][0];
+                unit = spec[i][1];
+                
+                // special-case the possibility of several years
+                if (unit == "year") {
+                    magn = Math.pow(10, Math.floor(Math.log(delta / timeUnitSize.year) / Math.LN10));
+                    norm = (delta / timeUnitSize.year) / magn;
+                    if (norm < 1.5)
+                        size = 1;
+                    else if (norm < 3)
+                        size = 2;
+                    else if (norm < 7.5)
+                        size = 5;
+                    else
+                        size = 10;
+
+                    size *= magn;
+                }
+
+                if (axisOptions.tickSize) {
+                    size = axisOptions.tickSize[0];
+                    unit = axisOptions.tickSize[1];
+                }
+                
+                generator = function(axis) {
+                    var ticks = [],
+                        tickSize = axis.tickSize[0], unit = axis.tickSize[1],
+                        d = new Date(axis.min);
+                    
+                    var step = tickSize * timeUnitSize[unit];
+
+                    if (unit == "second")
+                        d.setUTCSeconds(floorInBase(d.getUTCSeconds(), tickSize));
+                    if (unit == "minute")
+                        d.setUTCMinutes(floorInBase(d.getUTCMinutes(), tickSize));
+                    if (unit == "hour")
+                        d.setUTCHours(floorInBase(d.getUTCHours(), tickSize));
+                    if (unit == "month")
+                        d.setUTCMonth(floorInBase(d.getUTCMonth(), tickSize));
+                    if (unit == "year")
+                        d.setUTCFullYear(floorInBase(d.getUTCFullYear(), tickSize));
+                    
+                    // reset smaller components
+                    d.setUTCMilliseconds(0);
+                    if (step >= timeUnitSize.minute)
+                        d.setUTCSeconds(0);
+                    if (step >= timeUnitSize.hour)
+                        d.setUTCMinutes(0);
+                    if (step >= timeUnitSize.day)
+                        d.setUTCHours(0);
+                    if (step >= timeUnitSize.day * 4)
+                        d.setUTCDate(1);
+                    if (step >= timeUnitSize.year)
+                        d.setUTCMonth(0);
+
+
+                    var carry = 0, v = Number.NaN, prev;
+                    do {
+                        prev = v;
+                        v = d.getTime();
+                        ticks.push({ v: v, label: axis.tickFormatter(v, axis) });
+                        if (unit == "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
+                                d.setUTCDate(1);
+                                var start = d.getTime();
+                                d.setUTCMonth(d.getUTCMonth() + 1);
+                                var end = d.getTime();
+                                d.setTime(v + carry * timeUnitSize.hour + (end - start) * tickSize);
+                                carry = d.getUTCHours();
+                                d.setUTCHours(0);
+                            }
+                            else
+                                d.setUTCMonth(d.getUTCMonth() + tickSize);
+                        }
+                        else if (unit == "year") {
+                            d.setUTCFullYear(d.getUTCFullYear() + tickSize);
+                        }
+                        else
+                            d.setTime(v + step);
+                    } while (v < axis.max && v != prev);
+
+                    return ticks;
+                };
+
+                formatter = function (v, axis) {
+                    var d = new Date(v);
+
+                    // first check global format
+                    if (axisOptions.timeformat != null)
+                        return $.plot.formatDate(d, axisOptions.timeformat, axisOptions.monthNames);
+                    
+                    var t = axis.tickSize[0] * timeUnitSize[axis.tickSize[1]];
+                    var span = axis.max - axis.min;
+                    var suffix = (axisOptions.twelveHourClock) ? " %p" : "";
+                    
+                    if (t < timeUnitSize.minute)
+                        fmt = "%h:%M:%S" + suffix;
+                    else if (t < timeUnitSize.day) {
+                        if (span < 2 * timeUnitSize.day)
+                            fmt = "%h:%M" + suffix;
+                        else
+                            fmt = "%b %d %h:%M" + suffix;
+                    }
+                    else if (t < timeUnitSize.month)
+                        fmt = "%b %d";
+                    else if (t < timeUnitSize.year) {
+                        if (span < timeUnitSize.year)
+                            fmt = "%b";
+                        else
+                            fmt = "%b %y";
+                    }
+                    else
+                        fmt = "%y";
+                    
+                    return $.plot.formatDate(d, fmt, axisOptions.monthNames);
+                };
+            }
+            else {
+                // pretty rounding of base-10 numbers
+                var maxDec = axisOptions.tickDecimals;
+                var dec = -Math.floor(Math.log(delta) / Math.LN10);
+                if (maxDec != null && dec > maxDec)
+                    dec = maxDec;
+
+                magn = Math.pow(10, -dec);
+                norm = delta / magn; // norm is between 1.0 and 10.0
+                
+                if (norm < 1.5)
+                    size = 1;
+                else if (norm < 3) {
+                    size = 2;
+                    // special case for 2.5, requires an extra decimal
+                    if (norm > 2.25 && (maxDec == null || dec + 1 <= maxDec)) {
+                        size = 2.5;
+                        ++dec;
+                    }
+                }
+                else if (norm < 7.5)
+                    size = 5;
+                else
+                    size = 10;
+
+                size *= magn;
+                
+                if (axisOptions.minTickSize != null && size < axisOptions.minTickSize)
+                    size = axisOptions.minTickSize;
+
+                if (axisOptions.tickSize != null)
+                    size = axisOptions.tickSize;
+
+                axis.tickDecimals = Math.max(0, (maxDec != null) ? maxDec : dec);
+
+                generator = function (axis) {
+                    var ticks = [];
+
+                    // spew out all possible ticks
+                    var start = floorInBase(axis.min, axis.tickSize),
+                        i = 0, v = Number.NaN, prev;
+                    do {
+                        prev = v;
+                        v = start + i * axis.tickSize;
+                        ticks.push({ v: v, label: axis.tickFormatter(v, axis) });
+                        ++i;
+                    } while (v < axis.max && v != prev);
+                    return ticks;
+                };
+
+                formatter = function (v, axis) {
+                    return v.toFixed(axis.tickDecimals);
+                };
+            }
+
+            axis.tickSize = unit ? [size, unit] : size;
+            axis.tickGenerator = generator;
+            if ($.isFunction(axisOptions.tickFormatter))
+                axis.tickFormatter = function (v, axis) { return "" + axisOptions.tickFormatter(v, axis); };
+            else
+                axis.tickFormatter = formatter;
+        }
+        
+        function setTicks(axis, axisOptions) {
+            axis.ticks = [];
+
+            if (!axis.used)
+                return;
+            
+            if (axisOptions.ticks == null)
+                axis.ticks = axis.tickGenerator(axis);
+            else if (typeof axisOptions.ticks == "number") {
+                if (axisOptions.ticks > 0)
+                    axis.ticks = axis.tickGenerator(axis);
+            }
+            else if (axisOptions.ticks) {
+                var ticks = axisOptions.ticks;
+
+                if ($.isFunction(ticks))
+                    // generate the ticks
+                    ticks = ticks({ min: axis.min, max: axis.max });
+                
+                // clean up the user-supplied ticks, copy them over
+                var i, v;
+                for (i = 0; i < ticks.length; ++i) {
+                    var label = null;
+                    var t = ticks[i];
+                    if (typeof t == "object") {
+                        v = t[0];
+                        if (t.length > 1)
+                            label = t[1];
+                    }
+                    else
+                        v = t;
+                    if (label == null)
+                        label = axis.tickFormatter(v, axis);
+                    axis.ticks[i] = { v: v, label: label };
+                }
+            }
+
+            if (axisOptions.autoscaleMargin != null && axis.ticks.length > 0) {
+                // snap to ticks
+                if (axisOptions.min == null)
+                    axis.min = Math.min(axis.min, axis.ticks[0].v);
+                if (axisOptions.max == null && axis.ticks.length > 1)
+                    axis.max = Math.max(axis.max, axis.ticks[axis.ticks.length - 1].v);
+            }
+        }
+      
+        function draw() {
+            ctx.clearRect(0, 0, canvasWidth, canvasHeight);
+
+            var grid = options.grid;
+            
+            if (grid.show && !grid.aboveData)
+                drawGrid();
+
+            for (var i = 0; i < series.length; ++i)
+                drawSeries(series[i]);
+
+            executeHooks(hooks.draw, [ctx]);
+            
+            if (grid.show && grid.aboveData)
+                drawGrid();
+        }
+
+        function extractRange(ranges, coord) {
+            var firstAxis = coord + "axis",
+                secondaryAxis = coord + "2axis",
+                axis, from, to, reverse;
+
+            if (ranges[firstAxis]) {
+                axis = axes[firstAxis];
+                from = ranges[firstAxis].from;
+                to = ranges[firstAxis].to;
+            }
+            else if (ranges[secondaryAxis]) {
+                axis = axes[secondaryAxis];
+                from = ranges[secondaryAxis].from;
+                to = ranges[secondaryAxis].to;
+            }
+            else {
+                // backwards-compat stuff - to be removed in future
+                axis = axes[firstAxis];
+                from = ranges[coord + "1"];
+                to = ranges[coord + "2"];
+            }
+
+            // auto-reverse as an added bonus
+            if (from != null && to != null && from > to)
+                return { from: to, to: from, axis: axis };
+            
+            return { from: from, to: to, axis: axis };
+        }
+        
+        function drawGrid() {
+            var i;
+            
+            ctx.save();
+            ctx.translate(plotOffset.left, plotOffset.top);
+
+            // draw background, if any
+            if (options.grid.backgroundColor) {
+                ctx.fillStyle = getColorOrGradient(options.grid.backgroundColor, plotHeight, 0, "rgba(255, 255, 255, 0)");
+                ctx.fillRect(0, 0, plotWidth, plotHeight);
+            }
+
+            // draw markings
+            var markings = options.grid.markings;
+            if (markings) {
+                if ($.isFunction(markings))
+                    // xmin etc. are backwards-compatible, to be removed in future
+                    markings = markings({ xmin: axes.xaxis.min, xmax: axes.xaxis.max, ymin: axes.yaxis.min, ymax: axes.yaxis.max, xaxis: axes.xaxis, yaxis: axes.yaxis, x2axis: axes.x2axis, y2axis: axes.y2axis });
+
+                for (i = 0; i < markings.length; ++i) {
+                    var m = markings[i],
+                        xrange = extractRange(m, "x"),
+                        yrange = extractRange(m, "y");
+
+                    // fill in missing
+                    if (xrange.from == null)
+                        xrange.from = xrange.axis.min;
+                    if (xrange.to == null)
+                        xrange.to = xrange.axis.max;
+                    if (yrange.from == null)
+                        yrange.from = yrange.axis.min;
+                    if (yrange.to == null)
+                        yrange.to = yrange.axis.max;
+
+                    // clip
+                    if (xrange.to < xrange.axis.min || xrange.from > xrange.axis.max ||
+                        yrange.to < yrange.axis.min || yrange.from > yrange.axis.max)
+                        continue;
+
+                    xrange.from = Math.max(xrange.from, xrange.axis.min);
+                    xrange.to = Math.min(xrange.to, xrange.axis.max);
+                    yrange.from = Math.max(yrange.from, yrange.axis.min);
+                    yrange.to = Math.min(yrange.to, yrange.axis.max);
+
+                    if (xrange.from == xrange.to && yrange.from == yrange.to)
+                        continue;
+
+                    // then draw
+                    xrange.from = xrange.axis.p2c(xrange.from);
+                    xrange.to = xrange.axis.p2c(xrange.to);
+                    yrange.from = yrange.axis.p2c(yrange.from);
+                    yrange.to = yrange.axis.p2c(yrange.to);
+                    
+                    if (xrange.from == xrange.to || yrange.from == yrange.to) {
+                        // draw line
+                        ctx.beginPath();
+                        ctx.strokeStyle = m.color || options.grid.markingsColor;
+                        ctx.lineWidth = m.lineWidth || options.grid.markingsLineWidth;
+                        //ctx.moveTo(Math.floor(xrange.from), yrange.from);
+                        //ctx.lineTo(Math.floor(xrange.to), yrange.to);
+                        ctx.moveTo(xrange.from, yrange.from);
+                        ctx.lineTo(xrange.to, yrange.to);
+                        ctx.stroke();
+                    }
+                    else {
+                        // fill area
+                        ctx.fillStyle = m.color || options.grid.markingsColor;
+                        ctx.fillRect(xrange.from, yrange.to,
+                                     xrange.to - xrange.from,
+                                     yrange.from - yrange.to);
+                    }
+                }
+            }
+            
+            // draw the inner grid
+            ctx.lineWidth = 1;
+            ctx.strokeStyle = options.grid.tickColor;
+            ctx.beginPath();
+            var v, axis = axes.xaxis;
+            for (i = 0; i < axis.ticks.length; ++i) {
+                v = axis.ticks[i].v;
+                if (v <= axis.min || v >= axes.xaxis.max)
+                    continue;   // skip those lying on the axes
+
+                ctx.moveTo(Math.floor(axis.p2c(v)) + ctx.lineWidth/2, 0);
+                ctx.lineTo(Math.floor(axis.p2c(v)) + ctx.lineWidth/2, plotHeight);
+            }
+
+            axis = axes.yaxis;
+            for (i = 0; i < axis.ticks.length; ++i) {
+                v = axis.ticks[i].v;
+                if (v <= axis.min || v >= axis.max)
+                    continue;
+
+                ctx.moveTo(0, Math.floor(axis.p2c(v)) + ctx.lineWidth/2);
+                ctx.lineTo(plotWidth, Math.floor(axis.p2c(v)) + ctx.lineWidth/2);
+            }
+
+            axis = axes.x2axis;
+            for (i = 0; i < axis.ticks.length; ++i) {
+                v = axis.ticks[i].v;
+                if (v <= axis.min || v >= axis.max)
+                    continue;
+    
+                ctx.moveTo(Math.floor(axis.p2c(v)) + ctx.lineWidth/2, -5);
+                ctx.lineTo(Math.floor(axis.p2c(v)) + ctx.lineWidth/2, 5);
+            }
+
+            axis = axes.y2axis;
+            for (i = 0; i < axis.ticks.length; ++i) {
+                v = axis.ticks[i].v;
+                if (v <= axis.min || v >= axis.max)
+                    continue;
+
+                ctx.moveTo(plotWidth-5, Math.floor(axis.p2c(v)) + ctx.lineWidth/2);
+                ctx.lineTo(plotWidth+5, Math.floor(axis.p2c(v)) + ctx.lineWidth/2);
+            }
+            
+            ctx.stroke();
+            
+            if (options.grid.borderWidth) {
+                // draw border
+                var bw = options.grid.borderWidth;
+                ctx.lineWidth = bw;
+                ctx.strokeStyle = options.grid.borderColor;
+                ctx.strokeRect(-bw/2, -bw/2, plotWidth + bw, plotHeight + bw);
+            }
+
+            ctx.restore();
+        }
+
+        function insertLabels() {
+            placeholder.find(".tickLabels").remove();
+            
+            var html = ['<div class="tickLabels" style="font-size:smaller;color:' + options.grid.color + '">'];
+
+            function addLabels(axis, labelGenerator) {
+                for (var i = 0; i < axis.ticks.length; ++i) {
+                    var tick = axis.ticks[i];
+                    if (!tick.label || tick.v < axis.min || tick.v > axis.max)
+                        continue;
+                    html.push(labelGenerator(tick, axis));
+                }
+            }
+
+            var margin = options.grid.labelMargin + options.grid.borderWidth;
+            
+            addLabels(axes.xaxis, function (tick, axis) {
+                return '<div style="position:absolute;top:' + (plotOffset.top + plotHeight + margin) + 'px;left:' + Math.round(plotOffset.left + axis.p2c(tick.v) - axis.labelWidth/2) + 'px;width:' + axis.labelWidth + 'px;text-align:center" class="tickLabel">' + tick.label + "</div>";
+            });
+            
+            
+            addLabels(axes.yaxis, function (tick, axis) {
+                return '<div style="position:absolute;top:' + Math.round(plotOffset.top + axis.p2c(tick.v) - axis.labelHeight/2) + 'px;right:' + (plotOffset.right + plotWidth + margin) + 'px;width:' + axis.labelWidth + 'px;text-align:right" class="tickLabel">' + tick.label + "</div>";
+            });
+            
+            addLabels(axes.x2axis, function (tick, axis) {
+                return '<div style="position:absolute;bottom:' + (plotOffset.bottom + plotHeight + margin) + 'px;left:' + Math.round(plotOffset.left + axis.p2c(tick.v) - axis.labelWidth/2) + 'px;width:' + axis.labelWidth + 'px;text-align:center" class="tickLabel">' + tick.label + "</div>";
+            });
+            
+            addLabels(axes.y2axis, function (tick, axis) {
+                return '<div style="position:absolute;top:' + Math.round(plotOffset.top + axis.p2c(tick.v) - axis.labelHeight/2) + 'px;left:' + (plotOffset.left + plotWidth + margin) +'px;width:' + axis.labelWidth + 'px;text-align:left" class="tickLabel">' + tick.label + "</div>";
+            });
+
+            html.push('</div>');
+            
+            placeholder.append(html.join(""));
+        }
+
+        function drawSeries(series) {
+            if (series.lines.show)
+                drawSeriesLines(series);
+            if (series.bars.show)
+                drawSeriesBars(series);
+            if (series.points.show)
+                drawSeriesPoints(series);
+        }
+        
+        function drawSeriesLines(series) {
+            function plotLine(datapoints, xoffset, yoffset, axisx, axisy) {
+                var points = datapoints.points,
+                    ps = datapoints.pointsize,
+                    prevx = null, prevy = null;
+                
+                ctx.beginPath();
+                for (var i = ps; i < points.length; i += ps) {
+                    var x1 = points[i - ps], y1 = points[i - ps + 1],
+                        x2 = points[i], y2 = points[i + 1];
+                    
+                    if (x1 == null || x2 == null)
+                        continue;
+
+                    // clip with ymin
+                    if (y1 <= y2 && y1 < axisy.min) {
+                        if (y2 < axisy.min)
+                            continue;   // line segment is outside
+                        // compute new intersection point
+                        x1 = (axisy.min - y1) / (y2 - y1) * (x2 - x1) + x1;
+                        y1 = axisy.min;
+                    }
+                    else if (y2 <= y1 && y2 < axisy.min) {
+                        if (y1 < axisy.min)
+                            continue;
+                        x2 = (axisy.min - y1) / (y2 - y1) * (x2 - x1) + x1;
+                        y2 = axisy.min;
+                    }
+
+                    // clip with ymax
+                    if (y1 >= y2 && y1 > axisy.max) {
+                        if (y2 > axisy.max)
+                            continue;
+                        x1 = (axisy.max - y1) / (y2 - y1) * (x2 - x1) + x1;
+                        y1 = axisy.max;
+                    }
+                    else if (y2 >= y1 && y2 > axisy.max) {
+                        if (y1 > axisy.max)
+                            continue;
+                        x2 = (axisy.max - y1) / (y2 - y1) * (x2 - x1) + x1;
+                        y2 = axisy.max;
+                    }
+
+                    // clip with xmin
+                    if (x1 <= x2 && x1 < axisx.min) {
+                        if (x2 < axisx.min)
+                            continue;
+                        y1 = (axisx.min - x1) / (x2 - x1) * (y2 - y1) + y1;
+                        x1 = axisx.min;
+                    }
+                    else if (x2 <= x1 && x2 < axisx.min) {
+                        if (x1 < axisx.min)
+                            continue;
+                        y2 = (axisx.min - x1) / (x2 - x1) * (y2 - y1) + y1;
+                        x2 = axisx.min;
+                    }
+
+                    // clip with xmax
+                    if (x1 >= x2 && x1 > axisx.max) {
+                        if (x2 > axisx.max)
+                            continue;
+                        y1 = (axisx.max - x1) / (x2 - x1) * (y2 - y1) + y1;
+                        x1 = axisx.max;
+                    }
+                    else if (x2 >= x1 && x2 > axisx.max) {
+                        if (x1 > axisx.max)
+                            continue;
+                        y2 = (axisx.max - x1) / (x2 - x1) * (y2 - y1) + y1;
+                        x2 = axisx.max;
+                    }
+
+                    if (x1 != prevx || y1 != prevy)
+                        ctx.moveTo(axisx.p2c(x1) + xoffset, axisy.p2c(y1) + yoffset);
+                    
+                    prevx = x2;
+                    prevy = y2;
+                    ctx.lineTo(axisx.p2c(x2) + xoffset, axisy.p2c(y2) + yoffset);
+                }
+                ctx.stroke();
+            }
+
+            function plotLineArea(datapoints, axisx, axisy) {
+                var points = datapoints.points,
+                    ps = datapoints.pointsize,
+                    bottom = Math.min(Math.max(0, axisy.min), axisy.max),
+                    top, lastX = 0, areaOpen = false;
+                
+                for (var i = ps; i < points.length; i += ps) {
+                    var x1 = points[i - ps], y1 = points[i - ps + 1],
+                        x2 = points[i], y2 = points[i + 1];
+                    
+                    if (areaOpen && x1 != null && x2 == null) {
+                        // close area
+                        ctx.lineTo(axisx.p2c(lastX), axisy.p2c(bottom));
+                        ctx.fill();
+                        areaOpen = false;
+                        continue;
+                    }
+
+                    if (x1 == null || x2 == null)
+                        continue;
+
+                    // clip x values
+                    
+                    // clip with xmin
+                    if (x1 <= x2 && x1 < axisx.min) {
+                        if (x2 < axisx.min)
+                            continue;
+                        y1 = (axisx.min - x1) / (x2 - x1) * (y2 - y1) + y1;
+                        x1 = axisx.min;
+                    }
+                    else if (x2 <= x1 && x2 < axisx.min) {
+                        if (x1 < axisx.min)
+                            continue;
+                        y2 = (axisx.min - x1) / (x2 - x1) * (y2 - y1) + y1;
+                        x2 = axisx.min;
+                    }
+
+                    // clip with xmax
+                    if (x1 >= x2 && x1 > axisx.max) {
+                        if (x2 > axisx.max)
+                            continue;
+                        y1 = (axisx.max - x1) / (x2 - x1) * (y2 - y1) + y1;
+                        x1 = axisx.max;
+                    }
+                    else if (x2 >= x1 && x2 > axisx.max) {
+                        if (x1 > axisx.max)
+                            continue;
+                        y2 = (axisx.max - x1) / (x2 - x1) * (y2 - y1) + y1;
+                        x2 = axisx.max;
+                    }
+
+                    if (!areaOpen) {
+                        // open area
+                        ctx.beginPath();
+                        ctx.moveTo(axisx.p2c(x1), axisy.p2c(bottom));
+                        areaOpen = true;
+                    }
+                    
+                    // now first check the case where both is outside
+                    if (y1 >= axisy.max && y2 >= axisy.max) {
+                        ctx.lineTo(axisx.p2c(x1), axisy.p2c(axisy.max));
+                        ctx.lineTo(axisx.p2c(x2), axisy.p2c(axisy.max));
+                        lastX = x2;
+                        continue;
+                    }
+                    else if (y1 <= axisy.min && y2 <= axisy.min) {
+                        ctx.lineTo(axisx.p2c(x1), axisy.p2c(axisy.min));
+                        ctx.lineTo(axisx.p2c(x2), axisy.p2c(axisy.min));
+                        lastX = x2;
+                        continue;
+                    }
+                    
+                    // else it's a bit more complicated, there might
+                    // be two rectangles and two triangles we need to fill
+                    // in; to find these keep track of the current x values
+                    var x1old = x1, x2old = x2;
+
+                    // and clip the y values, without shortcutting
+                    
+                    // clip with ymin
+                    if (y1 <= y2 && y1 < axisy.min && y2 >= axisy.min) {
+                        x1 = (axisy.min - y1) / (y2 - y1) * (x2 - x1) + x1;
+                        y1 = axisy.min;
+                    }
+                    else if (y2 <= y1 && y2 < axisy.min && y1 >= axisy.min) {
+                        x2 = (axisy.min - y1) / (y2 - y1) * (x2 - x1) + x1;
+                        y2 = axisy.min;
+                    }
+
+                    // clip with ymax
+                    if (y1 >= y2 && y1 > axisy.max && y2 <= axisy.max) {
+                        x1 = (axisy.max - y1) / (y2 - y1) * (x2 - x1) + x1;
+                        y1 = axisy.max;
+                    }
+                    else if (y2 >= y1 && y2 > axisy.max && y1 <= axisy.max) {
+                        x2 = (axisy.max - y1) / (y2 - y1) * (x2 - x1) + x1;
+                        y2 = axisy.max;
+                    }
+
+
+                    // if the x value was changed we got a rectangle
+                    // to fill
+                    if (x1 != x1old) {
+                        if (y1 <= axisy.min)
+                            top = axisy.min;
+                        else
+                            top = axisy.max;
+                        
+                        ctx.lineTo(axisx.p2c(x1old), axisy.p2c(top));
+                        ctx.lineTo(axisx.p2c(x1), axisy.p2c(top));
+                    }
+                    
+                    // fill the triangles
+                    ctx.lineTo(axisx.p2c(x1), axisy.p2c(y1));
+                    ctx.lineTo(axisx.p2c(x2), axisy.p2c(y2));
+
+                    // fill the other rectangle if it's there
+                    if (x2 != x2old) {
+                        if (y2 <= axisy.min)
+                            top = axisy.min;
+                        else
+                            top = axisy.max;
+                        
+                        ctx.lineTo(axisx.p2c(x2), axisy.p2c(top));
+                        ctx.lineTo(axisx.p2c(x2old), axisy.p2c(top));
+                    }
+
+                    lastX = Math.max(x2, x2old);
+                }
+
+                if (areaOpen) {
+                    ctx.lineTo(axisx.p2c(lastX), axisy.p2c(bottom));
+                    ctx.fill();
+                }
+            }
+            
+            ctx.save();
+            ctx.translate(plotOffset.left, plotOffset.top);
+            ctx.lineJoin = "round";
+
+            var lw = series.lines.lineWidth,
+                sw = series.shadowSize;
+            // FIXME: consider another form of shadow when filling is turned on
+            if (lw > 0 && sw > 0) {
+                // draw shadow as a thick and thin line with transparency
+                ctx.lineWidth = sw;
+                ctx.strokeStyle = "rgba(0,0,0,0.1)";
+                // position shadow at angle from the mid of line
+                var angle = Math.PI/18;
+                plotLine(series.datapoints, Math.sin(angle) * (lw/2 + sw/2), Math.cos(angle) * (lw/2 + sw/2), series.xaxis, series.yaxis);
+                ctx.lineWidth = sw/2;
+                plotLine(series.datapoints, Math.sin(angle) * (lw/2 + sw/4), Math.cos(angle) * (lw/2 + sw/4), series.xaxis, series.yaxis);
+            }
+
+            ctx.lineWidth = lw;
+            ctx.strokeStyle = series.color;
+            var fillStyle = getFillStyle(series.lines, series.color, 0, plotHeight);
+            if (fillStyle) {
+                ctx.fillStyle = fillStyle;
+                plotLineArea(series.datapoints, series.xaxis, series.yaxis);
+            }
+
+            if (lw > 0)
+                plotLine(series.datapoints, 0, 0, series.xaxis, series.yaxis);
+            ctx.restore();
+        }
+
+        function drawSeriesPoints(series) {
+            function plotPoints(datapoints, radius, fillStyle, offset, circumference, axisx, axisy) {
+                var points = datapoints.points, ps = datapoints.pointsize;
+                
+                for (var i = 0; i < points.length; i += ps) {
+                    var x = points[i], y = points[i + 1];
+                    if (x == null || x < axisx.min || x > axisx.max || y < axisy.min || y > axisy.max)
+                        continue;
+                    
+                    ctx.beginPath();
+                    ctx.arc(axisx.p2c(x), axisy.p2c(y) + offset, radius, 0, circumference, false);
+                    if (fillStyle) {
+                        ctx.fillStyle = fillStyle;
+                        ctx.fill();
+                    }
+                    ctx.stroke();
+                }
+            }
+            
+            ctx.save();
+            ctx.translate(plotOffset.left, plotOffset.top);
+
+            var lw = series.lines.lineWidth,
+                sw = series.shadowSize,
+                radius = series.points.radius;
+            if (lw > 0 && sw > 0) {
+                // draw shadow in two steps
+                var w = sw / 2;
+                ctx.lineWidth = w;
+                ctx.strokeStyle = "rgba(0,0,0,0.1)";
+                plotPoints(series.datapoints, radius, null, w + w/2, Math.PI,
+                           series.xaxis, series.yaxis);
+
+                ctx.strokeStyle = "rgba(0,0,0,0.2)";
+                plotPoints(series.datapoints, radius, null, w/2, Math.PI,
+                           series.xaxis, series.yaxis);
+            }
+
+            ctx.lineWidth = lw;
+            ctx.strokeStyle = series.color;
+            plotPoints(series.datapoints, radius,
+                       getFillStyle(series.points, series.color), 0, 2 * Math.PI,
+                       series.xaxis, series.yaxis);
+            ctx.restore();
+        }
+
+        function drawBar(x, y, b, barLeft, barRight, offset, fillStyleCallback, axisx, axisy, c, horizontal) {
+            var left, right, bottom, top,
+                drawLeft, drawRight, drawTop, drawBottom,
+                tmp;
+
+            if (horizontal) {
+                drawBottom = drawRight = drawTop = true;
+                drawLeft = false;
+                left = b;
+                right = x;
+                top = y + barLeft;
+                bottom = y + barRight;
+
+                // account for negative bars
+                if (right < left) {
+                    tmp = right;
+                    right = left;
+                    left = tmp;
+                    drawLeft = true;
+                    drawRight = false;
+                }
+            }
+            else {
+                drawLeft = drawRight = drawTop = true;
+                drawBottom = false;
+                left = x + barLeft;
+                right = x + barRight;
+                bottom = b;
+                top = y;
+
+                // account for negative bars
+                if (top < bottom) {
+                    tmp = top;
+                    top = bottom;
+                    bottom = tmp;
+                    drawBottom = true;
+                    drawTop = false;
+                }
+            }
+           
+            // clip
+            if (right < axisx.min || left > axisx.max ||
+                top < axisy.min || bottom > axisy.max)
+                return;
+            
+            if (left < axisx.min) {
+                left = axisx.min;
+                drawLeft = false;
+            }
+
+            if (right > axisx.max) {
+                right = axisx.max;
+                drawRight = false;
+            }
+
+            if (bottom < axisy.min) {
+                bottom = axisy.min;
+                drawBottom = false;
+            }
+            
+            if (top > axisy.max) {
+                top = axisy.max;
+                drawTop = false;
+            }
+
+            left = axisx.p2c(left);
+            bottom = axisy.p2c(bottom);
+            right = axisx.p2c(right);
+            top = axisy.p2c(top);
+            
+            // fill the bar
+            if (fillStyleCallback) {
+                c.beginPath();
+                c.moveTo(left, bottom);
+                c.lineTo(left, top);
+                c.lineTo(right, top);
+                c.lineTo(right, bottom);
+                c.fillStyle = fillStyleCallback(bottom, top);
+                c.fill();
+            }
+
+            // draw outline
+            if (drawLeft || drawRight || drawTop || drawBottom) {
+                c.beginPath();
+
+                // FIXME: inline moveTo is buggy with excanvas
+                c.moveTo(left, bottom + offset);
+                if (drawLeft)
+                    c.lineTo(left, top + offset);
+                else
+                    c.moveTo(left, top + offset);
+                if (drawTop)
+                    c.lineTo(right, top + offset);
+                else
+                    c.moveTo(right, top + offset);
+                if (drawRight)
+                    c.lineTo(right, bottom + offset);
+                else
+                    c.moveTo(right, bottom + offset);
+                if (drawBottom)
+                    c.lineTo(left, bottom + offset);
+                else
+                    c.moveTo(left, bottom + offset);
+                c.stroke();
+            }
+        }
+        
+        function drawSeriesBars(series) {
+            function plotBars(datapoints, barLeft, barRight, offset, fillStyleCallback, axisx, axisy) {
+                var points = datapoints.points, ps = datapoints.pointsize;
+                
+                for (var i = 0; i < points.length; i += ps) {
+                    if (points[i] == null)
+                        continue;
+                    drawBar(points[i], points[i + 1], points[i + 2], barLeft, barRight, offset, fillStyleCallback, axisx, axisy, ctx, series.bars.horizontal);
+                }
+            }
+
+            ctx.save();
+            ctx.translate(plotOffset.left, plotOffset.top);
+
+            // FIXME: figure out a way to add shadows (for instance along the right edge)
+            ctx.lineWidth = series.bars.lineWidth;
+            ctx.strokeStyle = series.color;
+            var barLeft = series.bars.align == "left" ? 0 : -series.bars.barWidth/2;
+            var fillStyleCallback = series.bars.fill ? function (bottom, top) { return getFillStyle(series.bars, series.color, bottom, top); } : null;
+            plotBars(series.datapoints, barLeft, barLeft + series.bars.barWidth, 0, fillStyleCallback, series.xaxis, series.yaxis);
+            ctx.restore();
+        }
+
+        function getFillStyle(filloptions, seriesColor, bottom, top) {
+            var fill = filloptions.fill;
+            if (!fill)
+                return null;
+
+            if (filloptions.fillColor)
+                return getColorOrGradient(filloptions.fillColor, bottom, top, seriesColor);
+            
+            var c = $.color.parse(seriesColor);
+            c.a = typeof fill == "number" ? fill : 0.4;
+            c.normalize();
+            return c.toString();
+        }
+        
+        function insertLegend() {
+            placeholder.find(".legend").remove();
+
+            if (!options.legend.show)
+                return;
+            
+            var fragments = [], rowStarted = false,
+                lf = options.legend.labelFormatter, s, label;
+            for (i = 0; i < series.length; ++i) {
+                s = series[i];
+                label = s.label;
+                if (!label)
+                    continue;
+                
+                if (i % options.legend.noColumns == 0) {
+                    if (rowStarted)
+                        fragments.push('</tr>');
+                    fragments.push('<tr>');
+                    rowStarted = true;
+                }
+
+                if (lf)
+                    label = lf(label, s);
+                
+                fragments.push(
+                    '<td class="legendColorBox"><div style="border:1px solid ' + options.legend.labelBoxBorderColor + ';padding:1px"><div style="width:4px;height:0;border:5px solid ' + s.color + ';overflow:hidden"></div></div></td>' +
+                    '<td class="legendLabel">' + label + '</td>');
+            }
+            if (rowStarted)
+                fragments.push('</tr>');
+            
+            if (fragments.length == 0)
+                return;
+
+            var table = '<table style="font-size:smaller;color:' + options.grid.color + '">' + fragments.join("") + '</table>';
+            if (options.legend.container != null)
+                $(options.legend.container).html(table);
+            else {
+                var pos = "",
+                    p = options.legend.position,
+                    m = options.legend.margin;
+                if (m[0] == null)
+                    m = [m, m];
+                if (p.charAt(0) == "n")
+                    pos += 'top:' + (m[1] + plotOffset.top) + 'px;';
+                else if (p.charAt(0) == "s")
+                    pos += 'bottom:' + (m[1] + plotOffset.bottom) + 'px;';
+                if (p.charAt(1) == "e")
+                    pos += 'right:' + (m[0] + plotOffset.right) + 'px;';
+                else if (p.charAt(1) == "w")
+                    pos += 'left:' + (m[0] + plotOffset.left) + 'px;';
+                var legend = $('<div class="legend">' + table.replace('style="', 'style="position:absolute;' + pos +';') + '</div>').appendTo(placeholder);
+                if (options.legend.backgroundOpacity != 0.0) {
+                    // put in the transparent background
+                    // separately to avoid blended labels and
+                    // label boxes
+                    var c = options.legend.backgroundColor;
+                    if (c == null) {
+                        c = options.grid.backgroundColor;
+                        if (c && typeof c == "string")
+                            c = $.color.parse(c);
+                        else
+                            c = $.color.extract(legend, 'background-color');
+                        c.a = 1;
+                        c = c.toString();
+                    }
+                    var div = legend.children();
+                    $('<div style="position:absolute;width:' + div.width() + 'px;height:' + div.height() + 'px;' + pos +'background-color:' + c + ';"> </div>').prependTo(legend).css('opacity', options.legend.backgroundOpacity);
+                }
+            }
+        }
+
+
+        // interactive features
+        
+        var highlights = [],
+            redrawTimeout = null;
+        
+        // returns the data item the mouse is over, or null if none is found
+        function findNearbyItem(mouseX, mouseY, seriesFilter) {
+            var maxDistance = options.grid.mouseActiveRadius,
+                smallestDistance = maxDistance * maxDistance + 1,
+                item = null, foundPoint = false, i, j;
+
+            for (i = 0; i < series.length; ++i) {
+                if (!seriesFilter(series[i]))
+                    continue;
+                
+                var s = series[i],
+                    axisx = s.xaxis,
+                    axisy = s.yaxis,
+                    points = s.datapoints.points,
+                    ps = s.datapoints.pointsize,
+                    mx = axisx.c2p(mouseX), // precompute some stuff to make the loop faster
+                    my = axisy.c2p(mouseY),
+                    maxx = maxDistance / axisx.scale,
+                    maxy = maxDistance / axisy.scale;
+
+                if (s.lines.show || s.points.show) {
+                    for (j = 0; j < points.length; j += ps) {
+                        var x = points[j], y = points[j + 1];
+                        if (x == null)
+                            continue;
+                        
+                        // For points and lines, the cursor must be within a
+                        // certain distance to the data point
+                        if (x - mx > maxx || x - mx < -maxx ||
+                            y - my > maxy || y - my < -maxy)
+                            continue;
+
+                        // We have to calculate distances in pixels, not in
+                        // data units, because the scales of the axes may be different
+                        var dx = Math.abs(axisx.p2c(x) - mouseX),
+                            dy = Math.abs(axisy.p2c(y) - mouseY),
+                            dist = dx * dx + dy * dy; // we save the sqrt
+
+                        // use <= to ensure last point takes precedence
+                        // (last generally means on top of)
+                        if (dist <= smallestDistance) {
+                            smallestDistance = dist;
+                            item = [i, j / ps];
+                        }
+                    }
+                }
+                    
+                if (s.bars.show && !item) { // no other point can be nearby
+                    var barLeft = s.bars.align == "left" ? 0 : -s.bars.barWidth/2,
+                        barRight = barLeft + s.bars.barWidth;
+                    
+                    for (j = 0; j < points.length; j += ps) {
+                        var x = points[j], y = points[j + 1], b = points[j + 2];
+                        if (x == null)
+                            continue;
+  
+                        // for a bar graph, the cursor must be inside the bar
+                        if (series[i].bars.horizontal ? 
+                            (mx <= Math.max(b, x) && mx >= Math.min(b, x) && 
+                             my >= y + barLeft && my <= y + barRight) :
+                            (mx >= x + barLeft && mx <= x + barRight &&
+                             my >= Math.min(b, y) && my <= Math.max(b, y)))
+                                item = [i, j / ps];
+                    }
+                }
+            }
+
+            if (item) {
+                i = item[0];
+                j = item[1];
+                ps = series[i].datapoints.pointsize;
+                
+                return { datapoint: series[i].datapoints.points.slice(j * ps, (j + 1) * ps),
+                         dataIndex: j,
+                         series: series[i],
+                         seriesIndex: i };
+            }
+            
+            return null;
+        }
+
+        function onMouseMove(e) {
+            if (options.grid.hoverable)
+                triggerClickHoverEvent("plothover", e,
+                                       function (s) { return s["hoverable"] != false; });
+        }
+        
+        function onClick(e) {
+            triggerClickHoverEvent("plotclick", e,
+                                   function (s) { return s["clickable"] != false; });
+        }
+
+        // trigger click or hover event (they send the same parameters
+        // so we share their code)
+        function triggerClickHoverEvent(eventname, event, seriesFilter) {
+            var offset = eventHolder.offset(),
+                pos = { pageX: event.pageX, pageY: event.pageY },
+                canvasX = event.pageX - offset.left - plotOffset.left,
+                canvasY = event.pageY - offset.top - plotOffset.top;
+
+            if (axes.xaxis.used)
+                pos.x = axes.xaxis.c2p(canvasX);
+            if (axes.yaxis.used)
+                pos.y = axes.yaxis.c2p(canvasY);
+            if (axes.x2axis.used)
+                pos.x2 = axes.x2axis.c2p(canvasX);
+            if (axes.y2axis.used)
+                pos.y2 = axes.y2axis.c2p(canvasY);
+
+            var item = findNearbyItem(canvasX, canvasY, seriesFilter);
+
+            if (item) {
+                // fill in mouse pos for any listeners out there
+                item.pageX = parseInt(item.series.xaxis.p2c(item.datapoint[0]) + offset.left + plotOffset.left);
+                item.pageY = parseInt(item.series.yaxis.p2c(item.datapoint[1]) + offset.top + plotOffset.top);
+            }
+
+            if (options.grid.autoHighlight) {
+                // clear auto-highlights
+                for (var i = 0; i < highlights.length; ++i) {
+                    var h = highlights[i];
+                    if (h.auto == eventname &&
+                        !(item && h.series == item.series && h.point == item.datapoint))
+                        unhighlight(h.series, h.point);
+                }
+                
+                if (item)
+                    highlight(item.series, item.datapoint, eventname);
+            }
+            
+            placeholder.trigger(eventname, [ pos, item ]);
+        }
+
+        function triggerRedrawOverlay() {
+            if (!redrawTimeout)
+                redrawTimeout = setTimeout(drawOverlay, 30);
+        }
+
+        function drawOverlay() {
+            redrawTimeout = null;
+
+            // draw highlights
+            octx.save();
+            octx.clearRect(0, 0, canvasWidth, canvasHeight);
+            octx.translate(plotOffset.left, plotOffset.top);
+            
+            var i, hi;
+            for (i = 0; i < highlights.length; ++i) {
+                hi = highlights[i];
+
+                if (hi.series.bars.show)
+                    drawBarHighlight(hi.series, hi.point);
+                else
+                    drawPointHighlight(hi.series, hi.point);
+            }
+            octx.restore();
+            
+            executeHooks(hooks.drawOverlay, [octx]);
+        }
+        
+        function highlight(s, point, auto) {
+            if (typeof s == "number")
+                s = series[s];
+
+            if (typeof point == "number")
+                point = s.data[point];
+
+            var i = indexOfHighlight(s, point);
+            if (i == -1) {
+                highlights.push({ series: s, point: point, auto: auto });
+
+                triggerRedrawOverlay();
+            }
+            else if (!auto)
+                highlights[i].auto = false;
+        }
+            
+        function unhighlight(s, point) {
+            if (s == null && point == null) {
+                highlights = [];
+                triggerRedrawOverlay();
+            }
+            
+            if (typeof s == "number")
+                s = series[s];
+
+            if (typeof point == "number")
+                point = s.data[point];
+
+            var i = indexOfHighlight(s, point);
+            if (i != -1) {
+                highlights.splice(i, 1);
+
+                triggerRedrawOverlay();
+            }
+        }
+        
+        function indexOfHighlight(s, p) {
+            for (var i = 0; i < highlights.length; ++i) {
+                var h = highlights[i];
+                if (h.series == s && h.point[0] == p[0]
+                    && h.point[1] == p[1])
+                    return i;
+            }
+            return -1;
+        }
+        
+        function drawPointHighlight(series, point) {
+            var x = point[0], y = point[1],
+                axisx = series.xaxis, axisy = series.yaxis;
+            
+            if (x < axisx.min || x > axisx.max || y < axisy.min || y > axisy.max)
+                return;
+            
+            var pointRadius = series.points.radius + series.points.lineWidth / 2;
+            octx.lineWidth = pointRadius;
+            octx.strokeStyle = $.color.parse(series.color).scale('a', 0.5).toString();
+            var radius = 1.5 * pointRadius;
+            octx.beginPath();
+            octx.arc(axisx.p2c(x), axisy.p2c(y), radius, 0, 2 * Math.PI, false);
+            octx.stroke();
+        }
+
+        function drawBarHighlight(series, point) {
+            octx.lineWidth = series.bars.lineWidth;
+            octx.strokeStyle = $.color.parse(series.color).scale('a', 0.5).toString();
+            var fillStyle = $.color.parse(series.color).scale('a', 0.5).toString();
+            var barLeft = series.bars.align == "left" ? 0 : -series.bars.barWidth/2;
+            drawBar(point[0], point[1], point[2] || 0, barLeft, barLeft + series.bars.barWidth,
+                    0, function () { return fillStyle; }, series.xaxis, series.yaxis, octx, series.bars.horizontal);
+        }
+
+        function getColorOrGradient(spec, bottom, top, defaultColor) {
+            if (typeof spec == "string")
+                return spec;
+            else {
+                // assume this is a gradient spec; IE currently only
+                // supports a simple vertical gradient properly, so that's
+                // what we support too
+                var gradient = ctx.createLinearGradient(0, top, 0, bottom);
+                
+                for (var i = 0, l = spec.colors.length; i < l; ++i) {
+                    var c = spec.colors[i];
+                    if (typeof c != "string") {
+                        c = $.color.parse(defaultColor).scale('rgb', c.brightness);
+                        c.a *= c.opacity;
+                        c = c.toString();
+                    }
+                    gradient.addColorStop(i / (l - 1), c);
+                }
+                
+                return gradient;
+            }
+        }
+    }
+
+    $.plot = function(placeholder, data, options) {
+        var plot = new Plot($(placeholder), data, options, $.plot.plugins);
+        /*var t0 = new Date();
+        var t1 = new Date();
+        var tstr = "time used (msecs): " + (t1.getTime() - t0.getTime())
+        if (window.console)
+            console.log(tstr);
+        else
+            alert(tstr);*/
+        return plot;
+    };
+
+    $.plot.plugins = [];
+
+    // returns a string with the date d formatted according to fmt
+    $.plot.formatDate = function(d, fmt, monthNames) {
+        var leftPad = function(n) {
+            n = "" + n;
+            return n.length == 1 ? "0" + n : n;
+        };
+        
+        var r = [];
+        var escape = false;
+        var hours = d.getUTCHours();
+        var isAM = hours < 12;
+        if (monthNames == null)
+            monthNames = ["Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec"];
+
+        if (fmt.search(/%p|%P/) != -1) {
+            if (hours > 12) {
+                hours = hours - 12;
+            } else if (hours == 0) {
+                hours = 12;
+            }
+        }
+        for (var i = 0; i < fmt.length; ++i) {
+            var c = fmt.charAt(i);
+            
+            if (escape) {
+                switch (c) {
+                case 'h': c = "" + hours; break;
+                case 'H': c = leftPad(hours); break;
+                case 'M': c = leftPad(d.getUTCMinutes()); break;
+                case 'S': c = leftPad(d.getUTCSeconds()); break;
+                case 'd': c = "" + d.getUTCDate(); break;
+                case 'm': c = "" + (d.getUTCMonth() + 1); break;
+                case 'y': c = "" + d.getUTCFullYear(); break;
+                case 'b': c = "" + monthNames[d.getUTCMonth()]; break;
+                case 'p': c = (isAM) ? ("" + "am") : ("" + "pm"); break;
+                case 'P': c = (isAM) ? ("" + "AM") : ("" + "PM"); break;
+                }
+                r.push(c);
+                escape = false;
+            }
+            else {
+                if (c == "%")
+                    escape = true;
+                else
+                    r.push(c);
+            }
+        }
+        return r.join("");
+    };
+    
+    // round to nearby lower multiple of base
+    function floorInBase(n, base) {
+        return base * Math.floor(n / base);
+    }
+    
+})(jQuery);