Commit 68cff058 authored by Paul Asmuth's avatar Paul Asmuth
Browse files

more distribution + timeseries gauge layout

parent 30e54324
Loading
Loading
Loading
Loading
+17 −1
Original line number Diff line number Diff line
@@ -17,6 +17,11 @@ h3{
  font-weight:500;
}

hr{
  border:none;
  border-top:1px solid #ddd;  
}

a.link{
  color:#2281CF;
  text-decoration:none;
@@ -208,7 +213,11 @@ text-shadow: 1px 0px 2px rgba(255, 255, 255, 1);
.numbers_container.size_4{ width:358px; }
.numbers_container.size_5{ width:450px; }

.numbers_container .title{ padding:4px 0 1px 0; color:#333; font-size:14px; display:block;font-weight:400; }
.numbers_container .title{ padding:4px 0 1px 0; color:#333; font-size:14px; display:block; 
font-weight:400; }
.numbers_container .title.with_swatch{ margin-bottom:4px; }
.numbers_container .title.with_swatch span{ padding-left:20px; }
.numbers_container .title .swatch{ display:block; float:left; position:absolute; margin-top:3px; margin-right:5px; }

.numbers_container.numbers_pad_bottom .number{ padding-bottom:19px; }
.numbers_container.numbers_pad_bottom{ border-bottom:none; }
@@ -448,3 +457,10 @@ position: relative;
.ui_sidebar_toplist .toplist_item.active{
  margin-right:-1px;
}

.swatch {
  width: 10px;
  height: 10px;
  border: 1px solid rgba(0, 0, 0, 0.2);
  border-radius:2px;
}
 No newline at end of file
+8 −1
Original line number Diff line number Diff line
@@ -6,6 +6,8 @@
  %ul.ui_tabs.tabs
    %li.active{"data-tab" => "Overview"}
      %a{:href => "#"} Overview
    %li{"data-tab" => "Overview"}
      %a{:href => "#"} Histograms

  .headbar
    %h2 Histogram: #{@opts[:title]}
@@ -33,13 +35,18 @@
          %span.desc Mode
          %span.value= 0

    %hr

    .clearfix
      %h2(style="margin:20px 0 -3px 20px;") Standard Deviation


  .widget_histogram_bars.resizable(data-width="60")

  .resizable(data-width="60")

    .headbar.small
      Standard Deviation
      Average, Min and Max over Time



+20 −7
Original line number Diff line number Diff line
@@ -14,19 +14,34 @@

  .widget_timeseries

  .headbar.small= @opts[:title]
  .resizable(data-width="25" style="border-right:1px solid #ddd;")
    .headbar.small Realtime
    %br
    %br
    %br

  .resizable(data-width="40" style="border-right:1px solid #ddd;")
    .headbar.small Series Values
    - @series_numbers.each do |series, nums|
    %div
      .numbers_container
        .title= series
      .clearfix.numbers_container(style="width:auto; float:none; margin-right:20px;")
        .title.with_swatch
          .swatch(style="background:#{@series_colors[series]};")
          %span= series

        .number{:data => nums[:total], :"data-current" => 0}
          %span.desc Total
          %span.value 0


  .resizable(data-width="35")
    .headbar.small Series Weights


:gaugejs

  FnordMetric.ui.resizable('.report_view');
  FnordMetric.util.updateNumbers('.report_view', 4);

  FnordMetric.widgets.timeseriesWidget().render({
    title: "Fnord!!!!",
    elem: $('.widget_timeseries'),
@@ -34,5 +49,3 @@
    default_style: 'stack',
    series: #{@series_render.to_json}
  });

  FnordMetric.util.updateNumbers('.report_view', 4);
 No newline at end of file
+1 −1
Original line number Diff line number Diff line
@@ -63,7 +63,7 @@ FnordMetric.ui.resizable = function(elem){
    var wwidth = $('.viewport_inner').width() * (wwperc/100.0);
    if(wwperc==100){ $(this).addClass('full_width'); } 
    else if($(this).hasClass('right')) { $(this).css('float', 'right'); }
    else { $(this).css('float', 'left'); }
    else { wwidth -= 1; $(this).css('float', 'left'); }
    $(this).css('overflow', 'hidden');
    $(this).width(wwidth);
  });
+0 −5
Original line number Diff line number Diff line
@@ -237,11 +237,6 @@
.rickshaw_legend:hover {
	z-index: 10;
}
.rickshaw_legend .swatch {
	width: 10px;
	height: 10px;
	border: 1px solid rgba(0, 0, 0, 0.2);
}
.rickshaw_legend .line {
	clear: both;
	line-height: 140%;