From aa9d969df0b2aae30d0d6158f41d66f6c797c9a1 Mon Sep 17 00:00:00 2001 From: BuildTools Date: Mon, 5 Dec 2016 21:05:23 +0100 Subject: added clean start spage --- views/index.jade | 42 +++++++++++------------------------------- views/layout.jade | 10 ++-------- 2 files changed, 13 insertions(+), 39 deletions(-) (limited to 'views') 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>')})(); - 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')  @@ -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 -- cgit v1.1 From 309781965eb9fbc6e035bbe7a774f2a90f021c52 Mon Sep 17 00:00:00 2001 From: Noah Loomans Date: Tue, 6 Dec 2016 16:14:27 +0100 Subject: optimized file size --- views/index.jade | 11 +---------- views/layout.jade | 1 - 2 files changed, 1 insertion(+), 11 deletions(-) (limited to 'views') diff --git a/views/index.jade b/views/index.jade index de089e1..82c12e1 100644 --- a/views/index.jade +++ b/views/index.jade @@ -8,15 +8,6 @@ block head script(defer='', src='https://code.getmdl.io/1.2.1/material.min.js') block content - #data(style='display: none;') - each user in users - .data-user - .data-type= user.type - .data-value= user.value - .data-index= user.index - .data-other= user.other - .data-isID= user.isID - form#search .top-bar .title @@ -47,5 +38,5 @@ block content block scripts script. - !{flagsStr} + !{flagsStr}!{usersStr} script(src='/javascripts/bundle.js') diff --git a/views/layout.jade b/views/layout.jade index f7c47e0..a7b9d93 100644 --- a/views/layout.jade +++ b/views/layout.jade @@ -7,7 +7,6 @@ html meta(name='viewport', content='width=device-width, initial-scale=1') link(href='https://fonts.googleapis.com/css?family=Roboto', rel='stylesheet') link(rel='manifest', href='/manifest.webmanifest') - script(src='//d2wy8f7a9ursnm.cloudfront.net/bugsnag-3.min.js', data-apikey='bd5c41bb376798642d7ae4701a09a8fb') block head body(style='opacity: 0;') block content -- cgit v1.1 From 6bc04592cc7511775cdec9902c841aca7a0d2a6c Mon Sep 17 00:00:00 2001 From: BuildTools Date: Tue, 6 Dec 2016 18:49:25 +0100 Subject: fixed week buttons for IE9 --- views/index.jade | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'views') diff --git a/views/index.jade b/views/index.jade index 82c12e1..941d657 100644 --- a/views/index.jade +++ b/views/index.jade @@ -30,9 +30,9 @@ block content #week-selector #search-space-filler .week-wrapper - input(type='button', value='arrow_back').material-icons + button(type='button').material-icons  span.current Loading... - input(type='button', value='arrow_forward').material-icons + button(type='button').material-icons  iframe(scrolling='no')#schedule -- cgit v1.1 From 3b14fbf32d87668a3fbbf561a4d6dfaddaa0bcc9 Mon Sep 17 00:00:00 2001 From: Noah Loomans Date: Wed, 7 Dec 2016 12:17:30 +0100 Subject: switched to input[type='search'] --- views/index.jade | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'views') diff --git a/views/index.jade b/views/index.jade index 941d657..dc4a5d6 100644 --- a/views/index.jade +++ b/views/index.jade @@ -14,7 +14,7 @@ block content .logo .text Rooster .input-wrapper - input(type='text', placeholder='Zoeken') + input(type='search', placeholder='Zoeken') button.material-icons.fav(tabindex='0', type='button')  button#overflow-button(type='button') i.material-icons  -- cgit v1.1 From 73af3c8dee488ba962e44343f1e57a5ca3deb428 Mon Sep 17 00:00:00 2001 From: Noah Loomans Date: Wed, 7 Dec 2016 12:48:14 +0100 Subject: add tooltip --- views/index.jade | 2 ++ 1 file changed, 2 insertions(+) (limited to 'views') diff --git a/views/index.jade b/views/index.jade index dc4a5d6..6d2aa17 100644 --- a/views/index.jade +++ b/views/index.jade @@ -16,6 +16,8 @@ block content .input-wrapper input(type='search', placeholder='Zoeken') button.material-icons.fav(tabindex='0', type='button')  + .tooltip + span Voer hier een docenten afkorting, klas, leerlingen nummer of lokaal nummer in. button#overflow-button(type='button') i.material-icons  -- cgit v1.1 From fa4cb48e2ca2186a9fb82407a9d1febd438e61c7 Mon Sep 17 00:00:00 2001 From: Noah Loomans Date: Wed, 7 Dec 2016 13:00:18 +0100 Subject: improved tooltip --- views/index.jade | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'views') diff --git a/views/index.jade b/views/index.jade index 6d2aa17..dff671e 100644 --- a/views/index.jade +++ b/views/index.jade @@ -17,7 +17,7 @@ block content input(type='search', placeholder='Zoeken') button.material-icons.fav(tabindex='0', type='button')  .tooltip - span Voer hier een docenten afkorting, klas, leerlingen nummer of lokaal nummer in. + span Voer hier een docentafkorting, klas, leerlingnummer of lokaalnummer in. button#overflow-button(type='button') i.material-icons  -- cgit v1.1