Loading fnordmetric-core/lib/fnordmetric/widgets/numbers_widget.rb +1 −1 Original line number Diff line number Diff line Loading @@ -22,7 +22,7 @@ class FnordMetric::NumbersWidget < FnordMetric::Widget vals.values.compact.map(&:to_f).inject(&:+) elsif at =~ /avg\((.+)\)/ vals = gauge.values_in(FnordMetric::Util.parse_time($1).._t+gauge.tick) vals.values.compact.map(&:to_f).inject(&:+) / vals.size.to_f (vals.values.compact.map(&:to_f).inject(&:+) || 0) / vals.size.to_f else gauge.value_at(FnordMetric::Util.parse_time(at)).to_i end Loading fnordmetric-core/web/css/fnordmetric.core.css +1 −0 Original line number Diff line number Diff line Loading @@ -785,6 +785,7 @@ input.input.lopen{ padding:20px; float:left; border-right:1px solid #efefef; margin-top:45px; } .ge_controlpanel label{ Loading fnordmetric-core/web/js/fnordmetric.js +3 −3 Original line number Diff line number Diff line Loading @@ -54,14 +54,14 @@ var FnordMetric = (function(pre_init){ if (!conf.hide_gauge_explorer) { sidebar_overview .append($('<li class="overview">') .append($('<a href="#" class="title">').html('Gauge Explorer')) .append($('<a href="#" class="title">').html('<i class="icon-bar-chart"></i> Gauge Explorer')) .click(function(){ renderGaugeExplorer(); })); } if (!conf.hide_active_users) { sidebar_overview .append($('<li class="overview">') .append($('<a href="#" class="title">').html('Active Users')) .append($('<a href="#" class="title">').html('<i class="icon icon-group"></i> Active Users')) .click(function(){ renderSessionView(); })); } Loading @@ -75,7 +75,7 @@ var FnordMetric = (function(pre_init){ ul.append($('<li class="gauge">') .attr('data-token', gkey) .attr('data-view', gauges[gkey].view_type) .append('<i class="icon-folder-close">') .append('<i class="icon-arrow-right">') .append($('<a href="#" class="title">').html(gauges[gkey].title))); } Loading fnordmetric-core/web/vendor/font-awesome/css/font-awesome.css +4 −4 Original line number Diff line number Diff line Loading @@ -22,10 +22,10 @@ */ @font-face { font-family: 'FontAwesome'; src: url('../font/fontawesome-webfont.eot?v=3.0.1'); src: url('../font/fontawesome-webfont.eot?#iefix&v=3.0.1') format('embedded-opentype'), url('../font/fontawesome-webfont.woff?v=3.0.1') format('woff'), url('../font/fontawesome-webfont.ttf?v=3.0.1') format('truetype'); src: url('/vendor/font-awesome/font/fontawesome-webfont.eot?v=3.0.1'); src: url('/vendor/font-awesome/font/fontawesome-webfont.eot?#iefix&v=3.0.1') format('embedded-opentype'), url('/vendor/font-awesome/font/fontawesome-webfont.woff?v=3.0.1') format('woff'), url('/vendor/font-awesome/font/fontawesome-webfont.ttf?v=3.0.1') format('truetype'); font-weight: normal; font-style: normal; } Loading Loading
fnordmetric-core/lib/fnordmetric/widgets/numbers_widget.rb +1 −1 Original line number Diff line number Diff line Loading @@ -22,7 +22,7 @@ class FnordMetric::NumbersWidget < FnordMetric::Widget vals.values.compact.map(&:to_f).inject(&:+) elsif at =~ /avg\((.+)\)/ vals = gauge.values_in(FnordMetric::Util.parse_time($1).._t+gauge.tick) vals.values.compact.map(&:to_f).inject(&:+) / vals.size.to_f (vals.values.compact.map(&:to_f).inject(&:+) || 0) / vals.size.to_f else gauge.value_at(FnordMetric::Util.parse_time(at)).to_i end Loading
fnordmetric-core/web/css/fnordmetric.core.css +1 −0 Original line number Diff line number Diff line Loading @@ -785,6 +785,7 @@ input.input.lopen{ padding:20px; float:left; border-right:1px solid #efefef; margin-top:45px; } .ge_controlpanel label{ Loading
fnordmetric-core/web/js/fnordmetric.js +3 −3 Original line number Diff line number Diff line Loading @@ -54,14 +54,14 @@ var FnordMetric = (function(pre_init){ if (!conf.hide_gauge_explorer) { sidebar_overview .append($('<li class="overview">') .append($('<a href="#" class="title">').html('Gauge Explorer')) .append($('<a href="#" class="title">').html('<i class="icon-bar-chart"></i> Gauge Explorer')) .click(function(){ renderGaugeExplorer(); })); } if (!conf.hide_active_users) { sidebar_overview .append($('<li class="overview">') .append($('<a href="#" class="title">').html('Active Users')) .append($('<a href="#" class="title">').html('<i class="icon icon-group"></i> Active Users')) .click(function(){ renderSessionView(); })); } Loading @@ -75,7 +75,7 @@ var FnordMetric = (function(pre_init){ ul.append($('<li class="gauge">') .attr('data-token', gkey) .attr('data-view', gauges[gkey].view_type) .append('<i class="icon-folder-close">') .append('<i class="icon-arrow-right">') .append($('<a href="#" class="title">').html(gauges[gkey].title))); } Loading
fnordmetric-core/web/vendor/font-awesome/css/font-awesome.css +4 −4 Original line number Diff line number Diff line Loading @@ -22,10 +22,10 @@ */ @font-face { font-family: 'FontAwesome'; src: url('../font/fontawesome-webfont.eot?v=3.0.1'); src: url('../font/fontawesome-webfont.eot?#iefix&v=3.0.1') format('embedded-opentype'), url('../font/fontawesome-webfont.woff?v=3.0.1') format('woff'), url('../font/fontawesome-webfont.ttf?v=3.0.1') format('truetype'); src: url('/vendor/font-awesome/font/fontawesome-webfont.eot?v=3.0.1'); src: url('/vendor/font-awesome/font/fontawesome-webfont.eot?#iefix&v=3.0.1') format('embedded-opentype'), url('/vendor/font-awesome/font/fontawesome-webfont.woff?v=3.0.1') format('woff'), url('/vendor/font-awesome/font/fontawesome-webfont.ttf?v=3.0.1') format('truetype'); font-weight: normal; font-style: normal; } Loading
