works with FF, Safari, Chrome. use logo as toggle

2 files changed, 6 insertions, 5 deletions

diff --git a/tools/template/models/app.js b/tools/template/models/app.js
index f6166644c00..bc1b5652c7e 100644
--- a/tools/template/models/app.js
+++ b/tools/template/models/app.js
@@ -15,6 +15,7 @@ var App = module.exports = AmpersandState.extend({
     stats: StatCollection
   },
   parse: function (attrs, options) {
+    var year = new Date().getFullYear();
     var groups = {};
     var stats = _.map(attrs.series, function (serie) {
       var tokens = serie.key.split(':');
@@ -22,7 +23,10 @@ var App = module.exports = AmpersandState.extend({
       var name = tokens[1].trim();
       var data = _.sortBy(
         _.map(serie.values, function (v, k) {
-          return {x: new Date(k), y: v};
+          var tokens = k.split(' ');
+          tokens.splice(2, 0, year.toString());
+          var d = tokens.join(' ');
+          return {x: Date.parse(d), y: v};
         }), 'x');
       // calculate relative x values per series
       var minx = Math.min.apply(null, data.map(function (d) { return d.x }));
diff --git a/tools/template/views/templates/app.jade b/tools/template/views/templates/app.jade
index 27bba338e22..e7b0f8f6db2 100644
--- a/tools/template/views/templates/app.jade
+++ b/tools/template/views/templates/app.jade
@@ -3,10 +3,7 @@
     .container-fluid
       .navbar-header
         .navbar-brand 
-          .menu-toggle
-            a(data-hook='menu-toggle')
-              i.fa.fa-bars
-          .brand-image
+          .brand-image(data-hook='menu-toggle')
 
       ul.nav.navbar-right
         li(data-hook='sample-warning').navbar-text