Commit c43e126b authored by Paul Asmuth's avatar Paul Asmuth
Browse files

better navbar, datepicker wip, added fontawesome

parent 73fafbe9
Loading
Loading
Loading
Loading
+21 −9
Original line number Diff line number Diff line
@@ -2,7 +2,17 @@ FnordMetric v1.0
================


ROADMAP
BACKLOG
-------

- gauge-view: interval selection dropdown 
- interval selection top like gh.com/graphs/commit-activity) 52w history
- fix pie widget
- fix hash-history fu



BACKLOG
-------

  > Core: Backend
@@ -18,15 +28,11 @@ ROADMAP


  > Core: Frontend
    - gauge-view: interval selection dropdown 
    - interval selection top like gh.com/graphs/commit-activity) 52w history
    - overview view: gauge list (a'la github graphs landing)
    - overview view: num active users, system stats
    - fix pie widget
    - fix html widget
    - fix toplist widget
    - formatter: num, time, currency, percent, time_of_day
    - fix hash-history fu
    - minimize/pack js
    - put images into one sprite
    - nice empty states
@@ -36,6 +42,10 @@ ROADMAP
    - fix


  > Timeseries Widget
    - timeseries-widget: cardinal on/off should be skeuomorph


  > Timeseries Gauge
    - progressive_sum
    - restrict to max resolution
@@ -52,17 +62,19 @@ ROADMAP
  > Distribution Gauge
    - render std. deviation
    - render max/min/avg over time
    - histograms tab
    - export tab
    - display trends


  > Toplist Gauge
    - here be dragons
    - display trends
    - trending tab / display trends
    - compare tab
    - export tab
    - show multiple keywords


  > Timeseries Widget
    - timeseries-widget: cardinal on/off should be skeuomorph




+7 −0
Original line number Diff line number Diff line
@@ -30,4 +30,11 @@ private
    (match[1].to_i..match[2].to_i)
  end

  # FIXPAUL: move to apphelper or something
  def fancy_timerange(range)
    [range.first, range.last].map do |time|
      Time.at(time).strftime("%d.%m.%y %H:%M")
    end
  end

end
 No newline at end of file
+4 −4
Original line number Diff line number Diff line
@@ -22,22 +22,22 @@ class FnordMetric::TimeseriesGauge < FnordMetric::Gauge
  end

  def render(namespace, event)
    interval = parse_interval(event["interval"])
    @interval = parse_interval(event["interval"])
    colors = FnordMetric::COLORS.dup

    @series = Hash.new
    @zooms  = FnordMetric::TICKS[tick, interval.size]
    @zooms  = FnordMetric::TICKS[tick, @interval.size]
    
    @opts[:series].each do |series|
      ts = FnordMetric::Timeseries.new

      fraction_values_in(interval, series).each do |time, frac|
      fraction_values_in(@interval, series).each do |time, frac|
        ts.incr_fraction(time, *frac)
      end

      @series[series] = { 
        :color => colors.unshift(colors.pop).first,
        :data => Hash[@zooms.map{ |int| [int, ts.timeseries(interval, int) ] }]
        :data => Hash[@zooms.map{ |int| [int, ts.timeseries(@interval, int) ] }]
      }
    end

+31 −0
Original line number Diff line number Diff line
@@ -105,10 +105,41 @@ color:#000;
  background:#ddd;
}

.navbar a.button.datepicker{
  padding-left:0;
  padding-right:10px;
}

.navbar a.button.datepicker .date{
  background: white;
  padding: 0 13px;
  border-right: 1px solid #DDD;
  box-shadow: 0 0 2px #ddd inset;
  font-style:italic;
  display:inline-block;
  margin-right:10px;
}

.navbar a.button.datepicker i{
  font-size: 17px;
  float: right;
  margin-top: 0px;
}

.navbar + h1{
  margin-top:22px;
}

.navbar .button.navbutton{
  padding-right:13px;
}

.navbar .navbutton i{
  margin-left:-7px;
  margin-right:6px;
  display:inline-block;
}


.picto{ display:block; height:14px; width:14px; float:left; opacity:0.7; }
.picto.piechart{ background-position:-42px -173px; width:9px; margin-right:5px; }
+1 −0
Original line number Diff line number Diff line
@@ -22,6 +22,7 @@
    %script{:src => "/js/fnordmetric.dashboard_view.js", :type => "text/javascript"}
    %script{:src => "/js/fnordmetric.session_view.js", :type => "text/javascript"}
    %link{:href => "/vendor/rickshaw.css", :rel => "stylesheet", :type => "text/css"}
    %link{:href => "/vendor/font-awesome/css/font-awesome.css", :rel => "stylesheet", :type => "text/css"}
    %link{:href => "/fnordmetric.css", :rel => "stylesheet", :type => "text/css"}

  %body
Loading