Merge branch 'beta' of https://github.com/nloomans/rooster-mml into beta

2 files changed, 13 insertions, 39 deletions

diff --git a/views/index.jade b/views/index.jade
index c496bc0..de089e1 100644
--- a/views/index.jade
+++ b/views/index.jade
@@ -1,27 +1,7 @@
 extends layout
 
-block head_top
-  script.
-    function utmx_section(){}function utmx(){}(function(){var
-    k='129149775-1',d=document,l=d.location,c=d.cookie;
-    if(l.search.indexOf('utm_expid='+k)>0)return;
-    function f(n){if(c){var i=c.indexOf(n+'=');if(i>-1){var j=c.
-    indexOf(';',i);return escape(c.substring(i+n.length+1,j<0?c.
-    length:j))}}}var x=f('__utmx'),xx=f('__utmxx'),h=l.hash;d.write(
-    '<sc'+'ript src="'+'http'+(l.protocol=='https:'?'s://ssl':
-    '://www')+'.google-analytics.com/ga_exp.js?'+'utmxkey='+k+
-    '&utmx='+(x?x:'')+'&utmxx='+(xx?xx:'')+'&utmxtime='+new Date().
-    valueOf()+(h?'&utmxhash='+escape(h.substr(1)):'')+
-    '" type="text/javascript" charset="utf-8"><\/sc'+'ript>')})();
-  script.
-    utmx('url','A/B');
-
-
 block head
-  if version == 'new'
-    link(rel='stylesheet', href='/stylesheets/style_new.css')
-  else
-    link(rel='stylesheet', href='/stylesheets/style.css')
+  link(rel='stylesheet', href='/stylesheets/style.css')
   link(rel='stylesheet', href='/stylesheets/print.css', media='print')
   link(rel='stylesheet', href='https://fonts.googleapis.com/icon?family=Material+Icons')
   link(rel='stylesheet', href='https://code.getmdl.io/1.2.1/material.indigo-pink.min.css')
@@ -39,6 +19,9 @@ block content
 
   form#search
     .top-bar
+      .title
+        .logo
+        .text Rooster
       .input-wrapper
         input(type='text', placeholder='Zoeken')
         button.material-icons.fav(tabindex='0', type='button') &#xE83A;
@@ -48,7 +31,7 @@ block content
       ul.mdl-menu.mdl-menu--bottom-right.mdl-js-menu.mdl-js-ripple-effect(for='overflow-button')
         a(href='http://www.meetingpointmco.nl/Roosters-AL/doc/')
           li.mdl-menu__item Oud rooster gebruiken
-        a(href='javascript:window.print()')
+        a(href='javascript:window.print()').print-page
           li.mdl-menu__item.mdl-menu__item--full-bleed-divider#print-page Pagina printen
         li.mdl-menu__item(disabled) Gemaakt door Noah Loomans
     .autocomplete-wrapper
@@ -56,16 +39,13 @@ block content
   #week-selector
     #search-space-filler
     .week-wrapper
-      if version == 'new'
-        input(type='button', value='arrow_back').material-icons
-        span.current Loading...
-        input(type='button', value='arrow_forward').material-icons
-      else
-        input(type='button', value='Vorige')
-        span.current Loading...
-        input(type='button', value='Volgende')
+      input(type='button', value='arrow_back').material-icons
+      span.current Loading...
+      input(type='button', value='arrow_forward').material-icons
 
-  iframe(src='/hello', scrolling='no')#schedule
+  iframe(scrolling='no')#schedule
 
 block scripts
+  script.
+    !{flagsStr}
   script(src='/javascripts/bundle.js')
diff --git a/views/layout.jade b/views/layout.jade
index 10aa433..f7c47e0 100644
--- a/views/layout.jade
+++ b/views/layout.jade
@@ -9,14 +9,8 @@ html
     link(rel='manifest', href='/manifest.webmanifest')
     script(src='//d2wy8f7a9ursnm.cloudfront.net/bugsnag-3.min.js', data-apikey='bd5c41bb376798642d7ae4701a09a8fb')
     block head
-  body
+  body(style='opacity: 0;')
     block content
     script.
-      (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
-      (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
-      m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
-      })(window,document,'script','https://www.google-analytics.com/analytics.js','ga');
-
-      ga('create', 'UA-83684754-1', 'auto');
-      ga('send', 'pageview');
+      (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){(i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)})(window,document,'script','https://www.google-analytics.com/analytics.js','ga');ga('create', 'UA-83684754-1', 'auto');ga('send', 'pageview');
     block scripts