gauge rendering w/ widget rendering working (99cfe046) · Commits · github_fork / Clip

lib/fnordmetric/gauge_rendering.rb

+8 −2

Original line number	Diff line number	Diff line
		@@ -5,13 +5,19 @@ module FnordMetric::GaugeRendering
		end

		def render_to_event(*args)
		{ :title => name, :html => render(*args) }
		{ :title => name }.merge(render(*args))
		end

		def render_haml(in_file, out_file)
		def render_haml(in_file)
		haml_engine = Haml::Engine.new(File.read(
		File.expand_path("../../../web/haml/#{in_file}.haml", __FILE__)
		)).render(binding)
		end

		def render_file(in_file)
		File.read(
		File.expand_path("../../../web/#{in_file}", __FILE__)
		)
		end

		end
		No newline at end of file

+4 −1

Original line number	Diff line number	Diff line
		@@ -49,7 +49,10 @@ class FnordMetric::NumericTimeseriesGauge < FnordMetric::Gauge

		# end

		render_haml(:numeric_timeseries_gauge, 'report.html')
		{
		:html => render_haml(:numeric_timeseries_gauge),
		:exec => render_file('fnordmetric.numeric_timeseries_gauge.js')
		}
		end

		def renderable?

+6 −10

Original line number	Diff line number	Diff line
		@@ -9,19 +9,12 @@ FnordMetric.views.gaugeView = (function(gauge_name, conf){
		viewport.html('');
		viewport.append('<div class="navbar"></div>');

		console.log(conf);

		viewport.append(
		$('<div class="gauge_viewport"></div>').html(conf.html)
		);

		for(_wkey in conf.widgets){
		if(!conf.widgets[_wkey].tab){
		conf.widgets[_wkey].tab = "Overview"
		}
		if(tabs.indexOf(conf.widgets[_wkey].tab) == -1){
		tabs.push(conf.widgets[_wkey].tab)
		}
		}

		FnordMetric.ui.navbar($('.navbar', viewport), {
		breadcrumb: [
		["Fnord", "/group/fnord"],
		@@ -31,10 +24,13 @@ FnordMetric.views.gaugeView = (function(gauge_name, conf){
		["Export Data", function(){ alert(23); }]
		]
		});

		if(conf.exec){
		eval(conf.exec);
		}
		}

		function close(){
		$('body').trigger('fm_dashboard_close');
		}

		function resize(){

0 → 100644

+11 −0

Original line number	Diff line number	Diff line
		FnordMetric.widgets.timeseries_widget().render({
		title: "Fnord!!!!",
		elem: $('.mywidget'),
		default_style: 'flow',
		series: [{
		data: [{x:0, y:1},{x:2, y:5}],
		name: "fnord",
		color: "0f0"
		}]
		//series: #{@series_render.to_json}
		});

+0 −8

Original line number	Diff line number	Diff line
		@@ -25,11 +25,3 @@
		%span.desc 30sec avg.
		%span.value 3.37


		:javascript
		FnordMetric.widgets.timeseries_widget().render({
		title: "Fnord!!!!",
		elem: $('.mywidget'),
		default_style: 'flow',
		series: #{@series_render.to_json}
		});