diff --git a/infoscreen/static/css/hsl.css b/infoscreen/static/css/hsl.css index bccc000..7f407a1 100644 --- a/infoscreen/static/css/hsl.css +++ b/infoscreen/static/css/hsl.css @@ -1,5 +1,5 @@ table { - font-size: 3vw; + font-size: 5vh; font-family: 'Droid Sans Mono', monospace; } .red { @@ -39,3 +39,36 @@ table { 50% { opacity: 0.1; } 100% { opacity: 1.0; } } +thead{ + background: #f0f0f0; +} +.header-row{ + background: #f0f0f0; + font-size: 7vh; + font-family: 'Droid Sans Mono', monospace; + text-align: center; +} + +.container { + width: 100vw; + padding: 0 0 0 0; +} + +.container .table { + margin-left: 0; + margin-right: 0; +} +.repeat-item.ng-leave { + -webkit-transition:0.5s linear all; + transition:0.5s linear all; +} + +.repeat-item.ng-leave.ng-leave-active { + opacity: 0; + font-size: 0vh; +} + +.repeat-item.ng-leave{ + opacity: 1; + font-size: 5vh; +} diff --git a/infoscreen/static/html/hsl.html b/infoscreen/static/html/hsl.html index f237ab5..48baab6 100644 --- a/infoscreen/static/html/hsl.html +++ b/infoscreen/static/html/hsl.html @@ -1,38 +1,43 @@ -
- - - - - - - - - - - - - - - - - -
- Aika - - Numero - - Pysäkki - - Päätepysäkki -
- {{x.time}} - - {{x.bus}} - - {{x.stop}} - - {{x.laststop}} -
+
+
+
+
HSL-Aikataulut
+

{{ clock | date:'HH:mm'}}

+
+ + + + + + + + + + + + + + + + + +
+ Aika + + Linja + + Pysäkki + + Päätepysäkki +
+ {{x.timedelta < 10 ?x.timedelta + ' min' : x.time}} + + {{x.bus}} + + {{x.stop}} + + {{x.laststop}} +
diff --git a/infoscreen/static/js/infoscreen_controllers.js b/infoscreen/static/js/infoscreen_controllers.js index 4f744ba..48427e2 100644 --- a/infoscreen/static/js/infoscreen_controllers.js +++ b/infoscreen/static/js/infoscreen_controllers.js @@ -83,6 +83,7 @@ app.controller('timetableCtrl', $scope.$on('$destroy', function() { $interval.cancel(inter1); $interval.cancel(inter2); + $interval.cancel(inter3); }); var objects; $scope.arr=[]; @@ -169,6 +170,7 @@ app.controller('timetableCtrl', d.setHours(time[0]); d.setMinutes(time[1]); var diff=(d.getTime()-f.getTime()); + $scope.arr[a]['timedelta']=Math.floor(diff/60000); if(diff < tooSoon*60000) { $scope.arr.splice(a,1); } @@ -177,10 +179,14 @@ app.controller('timetableCtrl', } } } - + function updateTime(){ + $scope.clock = Date.now(); + } + $scope.clock = Date.now(); load(); var inter1=$interval(delOld,2000); var inter2=$interval(load,10000); + var inter3=$interval(updateTime, 1000); } );