:) (31f44f3f) · Commits · github_fork / Clip

web/fnordquery.css

+3 −1

Original line number	Diff line number	Diff line
		@@ -238,6 +238,8 @@ text-shadow: 1px 0px 2px rgba(255, 255, 255, 1);

		.headbar .button:active{ background:#ddd; }

		.headbar .btn_group.mr{ margin-right:17px; }

		.headbar .btn_group .button{
		border-radius:0;
		}
		@@ -350,7 +352,7 @@ ul.ui_tabs li.active a{


		.rickshaw_graph .y_ticks path { stroke:#fff; }
		.rickshaw_graph .y_grid .tick { stroke:#ddd; }
		.rickshaw_graph .y_grid .tick { stroke:rgba(0,0,0,.1); }

		.rickshaw_graph .x_tick {
		border-left: none;

web/src/fnordquery.timeseries_widget.js

+58 −11

Original line number	Diff line number	Diff line
		@@ -18,7 +18,9 @@ fnordquery.widgets.timeseries_widget = function(){
		element: $('.container', opts.elem)[0],
		width: width,
		height: height,
		renderer: 'line',
		renderer: 'stack',
		offset: 'wiggle',
		interpolation: 'cardinal',
		stroke: true,
		series: opts.series,
		} );
		@@ -75,8 +77,56 @@ fnordquery.widgets.timeseries_widget = function(){
		$(opts.elem)
		.append(
		$('<div></div>')
		.attr('class', 'headbar')
		.addClass('headbar')
		.append($('<h2></h2>').html(opts.title))
		.append(
		$('<div class="btn_group mr"></div>')
		.append(
		$('<div></div>')
		.addClass('button')
		.append($('<span>').html('Flow'))
		.attr('data', 'line')
		.click(change_style)
		)
		.append(
		$('<div></div>')
		.addClass('button')
		.append($('<span>').html('Stack'))
		.attr('data', 'line')
		.click(change_style)
		)
		.append(
		$('<div></div>')
		.addClass('button')
		.append($('<span>').html('Area'))
		.attr('data', 'line')
		.click(change_style)
		)
		.append(
		$('<div></div>')
		.addClass('button')
		.append($('<span>').html('Line'))
		.attr('data', 'line')
		.click(change_style)
		)
		)
		.append(
		$('<div class="btn_group mr"></div>')
		.append(
		$('<div></div>')
		.addClass('button mr')
		.append($('<span>').html('Off'))
		.attr('data', 'line')
		.click(change_style)
		)
		.append(
		$('<div></div>')
		.addClass('button')
		.append($('<span>').html('On'))
		.attr('data', 'line')
		.click(change_style)
		)
		)
		)
		.append(
		$('<div></div>')
		@@ -89,19 +139,16 @@ fnordquery.widgets.timeseries_widget = function(){


		// if(opts.ticks){
		// $('.headbar', opts.elem).append('<div class="tick_btns btn_group"></div>');
		// $('.headbar', opts.elem);
		// for(__tick in opts.ticks){
		// var _tick = opts.ticks[__tick];
		// $('.tick_btns', opts.elem).append(
		// $('<div></div>').attr('class', 'button tick').append($('<span></span>')
		// .html(FnordMetric.util.formatTimeRange(_tick)))
		// .attr('data-tick', _tick)
		// .click(changeTick)
		// );
		// $('.tick_btns', opts.elem)
		// }
		// }
		}

		function change_style(){}



		return {

web/test.html

+10 −0

Original line number	Diff line number	Diff line
		@@ -106,6 +106,16 @@
		{ x: 1336875946, y: 38 },
		{ x: 1336876946, y: 30 },
		{ x: 1336877946, y: 32 } ]
		},
		{
		color: '#66CC00',
		name: "fnord",
		data: [
		{ x: 1336873946, y: 23 },
		{ x: 1336874946, y: 54 },
		{ x: 1336875946, y: 36 },
		{ x: 1336876946, y: 43 },
		{ x: 1336877946, y: 19 } ]
		}
		]
		})

Admin message