Commit 8f06accb authored by Paul Asmuth's avatar Paul Asmuth
Browse files

cleaning up

parent c46f786a
Loading
Loading
Loading
Loading
+6 −0
Original line number Diff line number Diff line
@@ -170,6 +170,7 @@ color:#000;
.navbar a.button.datepicker{
  padding-left:0;
  padding-right:10px;
  margin-right:15px;
}

.navbar a.button.datepicker .date{
@@ -180,6 +181,7 @@ color:#000;
  font-style:italic;
  display:inline-block;
  margin-right:10px;
  color:#555;
}

.navbar a.button.datepicker i{
@@ -203,6 +205,10 @@ color:#000;
}


.navbar a.button:first-child{
  margin-right:38px;
}

.picto{ display:block; height:14px; width:14px; float:left; opacity:0.7; }
.picto.piechart{ background-position:-42px -173px; width:9px; margin-right:5px; }

+3 −1
Original line number Diff line number Diff line
@@ -18,7 +18,9 @@ FnordMetric.views.gaugeView = (function(gauge_name){
        ["Fnord", "/group/fnord"],
        [conf.title, "/gauge/"+gauge_name]
      ],
      buttons: [],
      buttons: [
        ["<i class='icon-refresh'></i>Refresh", function(){ load(viewport); }]
      ],
      datepicker: true
    });

+4 −5
Original line number Diff line number Diff line
@@ -90,8 +90,10 @@ var FnordMetric = (function(){

      renderSidebar();

      if(!currentView){
      if(!currentView && (window.location.hash.length < 2)){
        sidebarClick.apply($('#sidebar li:first'));
      } else if(!currentView){      
        navigateViaHash();
      }
    }
  }
@@ -145,10 +147,7 @@ var FnordMetric = (function(){
    connect();

    $('#app').html(_wrap_elem);

    $(window).resize(resizeView);    
    window.setTimeout(navigateViaHash, 200);
    
    resizeView();
  };

+3 −3
Original line number Diff line number Diff line
@@ -18,7 +18,6 @@ FnordMetric.ui.navbar = function(elem, opts){
    }
    head.append(cur);
  };
  elem.append(head);

  for(ind in opts.buttons){
    var btn = $('<a>')
@@ -29,11 +28,12 @@ FnordMetric.ui.navbar = function(elem, opts){
  }

  if(opts.datepicker){
    elem.prepend(
      $('<a class="button datepicker mr">')
    elem.append(
      $('<a class="button datepicker">')
        .html('<div class="date">22.05.12 15:00 &nbsp;&mdash;&nbsp; 23.05.12 15:00</div><i class="icon-calendar"></i>'));  
  }

  elem.append(head);
}

FnordMetric.ui.modal = function(opts){