diff --git a/plots.py b/plots.py
index 89fd7f7..770b156 100644
--- a/plots.py
+++ b/plots.py
@@ -13,8 +13,7 @@ def __init__(self, name):
self.snapshots = []
class Timeline(RequestHandler):
-
- def post(self):
+ def get(self):
experiment_name = self.request.get("experiment_name")
@@ -22,9 +21,9 @@ def post(self):
return
bingo_cache = BingoCache.get()
- experiment_model = bingo_cache.get_experiment(experiment_name)
+ experiment = bingo_cache.get_experiment(experiment_name)
- query = _GAEBingoSnapshotLog.all().ancestor(experiment_model)
+ query = _GAEBingoSnapshotLog.all().ancestor(experiment)
query.order('-time_recorded')
experiment_snapshots = query.fetch(1000)
@@ -57,7 +56,7 @@ def get_alternative_content_str(alt_num):
path = os.path.join(os.path.dirname(__file__), "templates/timeline.html")
self.response.out.write(
template.render(path, {
- "experiment_name": experiment_name,
+ "experiment": experiment,
"experiment_data": experiment_data,
})
)
diff --git a/static/images/chart.png b/static/images/chart.png
new file mode 100644
index 0000000..52865a6
Binary files /dev/null and b/static/images/chart.png differ
diff --git a/static/js/highcharts_gray_theme.js b/static/js/highcharts_gray_theme.js
deleted file mode 100644
index df40a54..0000000
--- a/static/js/highcharts_gray_theme.js
+++ /dev/null
@@ -1,262 +0,0 @@
-
-/**
- * Gray theme for Highcharts JS
- * @author Torstein Hønsi
- */
-
-Highcharts.theme = {
- colors: ["#DDDF0D", "#7798BF", "#55BF3B", "#DF5353", "#aaeeee", "#ff0066", "#eeaaee",
- "#55BF3B", "#DF5353", "#7798BF", "#aaeeee"],
- chart: {
- backgroundColor: {
- linearGradient: [0, 0, 0, 400],
- stops: [
- [0, 'rgb(96, 96, 96)'],
- [1, 'rgb(16, 16, 16)']
- ]
- },
- borderWidth: 0,
- borderRadius: 15,
- plotBackgroundColor: null,
- plotShadow: false,
- plotBorderWidth: 0
- },
- title: {
- style: {
- color: '#FFF',
- font: '16px Lucida Grande, Lucida Sans Unicode, Verdana, Arial, Helvetica, sans-serif'
- }
- },
- subtitle: {
- style: {
- color: '#DDD',
- font: '12px Lucida Grande, Lucida Sans Unicode, Verdana, Arial, Helvetica, sans-serif'
- }
- },
- xAxis: {
- gridLineWidth: 0,
- lineColor: '#999',
- tickColor: '#999',
- labels: {
- style: {
- color: '#999',
- fontWeight: 'bold'
- }
- },
- title: {
- style: {
- color: '#AAA',
- font: 'bold 12px Lucida Grande, Lucida Sans Unicode, Verdana, Arial, Helvetica, sans-serif'
- }
- }
- },
- yAxis: {
- alternateGridColor: null,
- minorTickInterval: null,
- gridLineColor: 'rgba(255, 255, 255, .1)',
- lineWidth: 0,
- tickWidth: 0,
- labels: {
- style: {
- color: '#999',
- fontWeight: 'bold'
- }
- },
- title: {
- style: {
- color: '#AAA',
- font: 'bold 12px Lucida Grande, Lucida Sans Unicode, Verdana, Arial, Helvetica, sans-serif'
- }
- }
- },
- legend: {
- itemStyle: {
- color: '#CCC'
- },
- itemHoverStyle: {
- color: '#FFF'
- },
- itemHiddenStyle: {
- color: '#333'
- }
- },
- labels: {
- style: {
- color: '#CCC'
- }
- },
- tooltip: {
- backgroundColor: {
- linearGradient: [0, 0, 0, 50],
- stops: [
- [0, 'rgba(96, 96, 96, .8)'],
- [1, 'rgba(16, 16, 16, .8)']
- ]
- },
- borderWidth: 0,
- style: {
- color: '#FFF'
- }
- },
-
-
- plotOptions: {
- line: {
- dataLabels: {
- color: '#CCC'
- },
- marker: {
- lineColor: '#333'
- }
- },
- spline: {
- marker: {
- lineColor: '#333'
- }
- },
- scatter: {
- marker: {
- lineColor: '#333'
- }
- },
- candlestick: {
- lineColor: 'white'
- }
- },
-
- toolbar: {
- itemStyle: {
- color: '#CCC'
- }
- },
-
- navigation: {
- buttonOptions: {
- backgroundColor: {
- linearGradient: [0, 0, 0, 20],
- stops: [
- [0.4, '#606060'],
- [0.6, '#333333']
- ]
- },
- borderColor: '#000000',
- symbolStroke: '#C0C0C0',
- hoverSymbolStroke: '#FFFFFF'
- }
- },
-
- exporting: {
- buttons: {
- exportButton: {
- symbolFill: '#55BE3B'
- },
- printButton: {
- symbolFill: '#7797BE'
- }
- }
- },
-
- // scroll charts
- rangeSelector: {
- buttonTheme: {
- fill: {
- linearGradient: [0, 0, 0, 20],
- stops: [
- [0.4, '#888'],
- [0.6, '#555']
- ]
- },
- stroke: '#000000',
- style: {
- color: '#CCC',
- fontWeight: 'bold'
- },
- states: {
- hover: {
- fill: {
- linearGradient: [0, 0, 0, 20],
- stops: [
- [0.4, '#BBB'],
- [0.6, '#888']
- ]
- },
- stroke: '#000000',
- style: {
- color: 'white'
- }
- },
- select: {
- fill: {
- linearGradient: [0, 0, 0, 20],
- stops: [
- [0.1, '#000'],
- [0.3, '#333']
- ]
- },
- stroke: '#000000',
- style: {
- color: 'yellow'
- }
- }
- }
- },
- inputStyle: {
- backgroundColor: '#333',
- color: 'silver'
- },
- labelStyle: {
- color: 'silver'
- }
- },
-
- navigator: {
- handles: {
- backgroundColor: '#666',
- borderColor: '#AAA'
- },
- outlineColor: '#CCC',
- maskFill: 'rgba(16, 16, 16, 0.5)',
- series: {
- color: '#7798BF',
- lineColor: '#A6C7ED'
- }
- },
-
- scrollbar: {
- barBackgroundColor: {
- linearGradient: [0, 0, 0, 20],
- stops: [
- [0.4, '#888'],
- [0.6, '#555']
- ]
- },
- barBorderColor: '#CCC',
- buttonArrowColor: '#CCC',
- buttonBackgroundColor: {
- linearGradient: [0, 0, 0, 20],
- stops: [
- [0.4, '#888'],
- [0.6, '#555']
- ]
- },
- buttonBorderColor: '#CCC',
- rifleColor: '#FFF',
- trackBackgroundColor: {
- linearGradient: [0, 0, 0, 10],
- stops: [
- [0, '#000'],
- [1, '#333']
- ]
- },
- trackBorderColor: '#666'
- },
-
- // special colors for some of the demo examples
- legendBackgroundColor: 'rgba(48, 48, 48, 0.8)',
- legendBackgroundColorSolid: 'rgb(70, 70, 70)',
- dataLabelsColor: '#444',
- textColor: '#E0E0E0',
- maskColor: 'rgba(255,255,255,0.3)'
-};
-
-
diff --git a/templates/base.html b/templates/base.html
index 51b2fe2..5b738c8 100644
--- a/templates/base.html
+++ b/templates/base.html
@@ -4,7 +4,7 @@
-
{% block title %}GAE/Bingo{% endblock %}
+ GAE/Bingo Experiments
diff --git a/templates/dashboard.html b/templates/dashboard.html
index 67dbe1d..de5a639 100644
--- a/templates/dashboard.html
+++ b/templates/dashboard.html
@@ -19,7 +19,7 @@
{% block body %}
-
+
{% if not experiment_results %}
@@ -30,39 +30,34 @@
No experiments yet.
{% for results in experiment_results %}
+
+
+
{{ results.0.pretty_name|escape }}
+
+ {% if results.0.live %}
+
+ Status:
+ Running {{ results.0.dt_started|timesince }}
+
+ {% else %}
+
+ {% endif %}
-
-
-
- {{ results.0.pretty_name|escape }}
-
- {% if results.0.live %}
-
- Status:
- Running {{ results.0.dt_started|timesince }}
-
- {% else %}
-
- {% endif %}
- |
-
-
- |
-
-
diff --git a/templates/timeline.html b/templates/timeline.html
index 54817af..1ce1a5d 100644
--- a/templates/timeline.html
+++ b/templates/timeline.html
@@ -6,8 +6,6 @@