public/static/css/material-icons.css

@@ -2,12 +2,12 @@
   font-family: 'Material Icons';
   font-style: normal;
   font-weight: 400;
-  src: url(/static/v95/fonts/MaterialIcons-Regular.eot); /* For IE6-8 */
+  src: url(/static/v96/fonts/MaterialIcons-Regular.eot); /* For IE6-8 */
   src: local('Material Icons'),
        local('MaterialIcons-Regular'),
-       url(/static/v95/fonts/MaterialIcons-Regular.woff2) format('woff2'),
-       url(/static/v95/fonts/MaterialIcons-Regular.woff) format('woff'),
-       url(/static/v95/fonts/MaterialIcons-Regular.ttf) format('truetype');
+       url(/static/v96/fonts/MaterialIcons-Regular.woff2) format('woff2'),
+       url(/static/v96/fonts/MaterialIcons-Regular.woff) format('woff'),
+       url(/static/v96/fonts/MaterialIcons-Regular.ttf) format('truetype');
 }
 
 .material-icons {

sass/app.scss

@@ -618,17 +618,42 @@ div.app {
 				list-style-type: circle;
 			}
 
+			.time-early {
+				color: $early-stop-color;
+			}
+
+			.time-delayed {
+				color: $delayed-stop-color;
+			}
+
+			.time-sched-only {
+				color: $delayed-stop-color;
+			}
+
+			.time-sched-ontime {
+				color: $early-stop-color;
+			}
+
+
 			.annotation {
 				color: $fg2;
 				list-style-type: none;
 				padding-left: 3em;
 			}
 
-			.sched-delayed:before {
+			.-sched:before {
+				content: " ";
+			}
+
+			.time-sched:after {
+				content: " ";
+			}
+
+			.time-sched-only:before {
 				content: "(";
 			}
 
-			.sched-delayed:after {
+			.time-sched-only:after {
 				content: ")";
 			}
 

sass/dark.scss

@@ -39,6 +39,9 @@ $undelaynorm-color: #99dd99;
 $additional-stop-color: #77ff77;
 $cancelled-stop-color: #ff7777;
 
+$early-stop-color: #ccffcc;
+$delayed-stop-color: #ff9999;
+
 $cancelled-bg-color: #512f00;
 $past-bg-color: $bg05;
 

sass/light.scss

@@ -39,6 +39,9 @@ $undelaynorm-color: #338833;
 $additional-stop-color: #009900;
 $cancelled-stop-color: #cc0000;
 
+$early-stop-color: #007700;
+$delayed-stop-color: #990000;
+
 $cancelled-bg-color: #ffe7d0;
 $past-bg-color: $bg05;
 

templates/_train_details.html.ep

@@ -271,13 +271,13 @@
             generic-stop
 %         }
 %         if (($stop->{rt_dep} and $stop->{dep_delay}) or (not $stop->{rt_dep} and $stop->{rt_arr} and $stop->{arr_delay})) {
-            "><%= ($stop->{rt_dep} // $stop->{rt_arr})->strftime('%H:%M') %> <span class="sched-delayed"><%= ($stop->{sched_dep} // $stop->{sched_arr})->strftime('%H:%M') %></span>
+            "><span class="time-sched-only"><%= ($stop->{sched_dep} // $stop->{sched_arr})->strftime('%H:%M') %></span> <span class="time-delayed"><%= ($stop->{rt_dep} // $stop->{rt_arr})->strftime('%H:%M') %></span>
 %         }
-%         else {
-            "><%= ($stop->{sched_dep} // $stop->{sched_arr}) ? ($stop->{sched_dep} // $stop->{sched_arr})->strftime('%H:%M') : q{} %>
-%           if ($stop->{rt_bogus}) {
-              <i class="material-icons" aria-label="Echtzeitdaten fehlen">gps_off</i>
+%         elsif (($stop->{rt_dep} and defined $stop->{dep_delay}) or (not $stop->{rt_dep} and $stop->{rt_arr} and defined $stop->{arr_delay})) {
+            "><span class="time-sched-ontime"><%= ($stop->{sched_dep} // $stop->{sched_arr}) ? ($stop->{sched_dep} // $stop->{sched_arr})->strftime('%H:%M') : q{} %></span>
 %         }
+%         else {
+            "><span class="time-sched"><%= ($stop->{sched_dep} // $stop->{sched_arr}) ? ($stop->{sched_dep} // $stop->{sched_arr})->strftime('%H:%M') : q{} %></span>
 %         }
 %         if ($stop->{tz_offset} and $stop->{local_dt_da}) {
             (lokal <%= $stop->{local_dt_da}->strftime('%H:%M') %>)
@@ -305,16 +305,23 @@
             </li>
 %         }
           <li class="<%= $departure->{is_cancelled} ? 'cancelled-stop' : q{} %> <%= $departure->{isPast} ? 'past-stop' : 'future-stop' %>">
-%=          $departure->{departure} // $departure->{arrival} // $departure->{sched_departure} // $departure->{sched_arrival} // q{}
 %           if ($departure->{departure} and $departure->{sched_departure} and $departure->{departure} ne $departure->{sched_departure}) {
-              <span class="sched-delayed"><%= $departure->{sched_departure} // $departure->{sched_arrival} // q{} %></span>
+              <span class="time-sched-only"><%= $departure->{sched_departure} // $departure->{sched_arrival} // q{} %></span><span class="time-delayed">
+%           }
+%           elsif ($departure->{departure} and $departure->{sched_departure} and $departure->{departure} eq $departure->{sched_departure} and not $departure->{no_realtime_yet}) {
+              <span class="time-sched-ontime">
 %           }
 %           elsif ($departure->{arrival} and $departure->{sched_arrival} and $departure->{arrival} ne $departure->{sched_arrival}) {
-              <span class="sched-delayed"><%= $departure->{sched_departure} // $departure->{sched_arrival} // q{} %></span>
+              <span class="time-sched-only"><%= $departure->{sched_departure} // $departure->{sched_arrival} // q{} %></span><span class="time-delayed">
+%           }
+%           elsif ($departure->{arrival} and $departure->{sched_arrival} and $departure->{arrival} eq $departure->{sched_arrival} and not $departure->{no_realtime_yet}) {
+              <span class="time-sched-ontime">
 %           }
-%           if ($departure->{missing_realtime} or $departure->{no_realtime_yet}) {
-              <i class="material-icons" aria-label="Echtzeitdaten fehlen">gps_off</i>
+%           else {
+              <span class="time-sched">
 %           }
+%=          $departure->{departure} // $departure->{arrival} // $departure->{sched_departure} // $departure->{sched_arrival} // q{}
+            </span>
 %           if ($departure->{tz_offset} and $departure->{local_dt_da}) {
               (lokal <%= $departure->{local_dt_da}->strftime('%H:%M') %>)
 %           }
@@ -355,13 +362,13 @@
             generic-stop
 %         }
 %         if (($stop->{rt_arr} and $stop->{arr_delay}) or (not $stop->{rt_arr} and $stop->{rt_dep} and $stop->{dep_delay})) {
-            "><%= ($stop->{rt_arr} // $stop->{rt_dep})->strftime('%H:%M') %> <span class="sched-delayed"><%= ($stop->{sched_arr} // $stop->{sched_dep})->strftime('%H:%M') %></span>
+            "><span class="time-sched-only"><%= ($stop->{sched_arr} // $stop->{sched_dep})->strftime('%H:%M') %></span> <span class="time-delayed"><%= ($stop->{rt_arr} // $stop->{rt_dep})->strftime('%H:%M') %></span>
 %         }
-%         else {
-            "><%= ($stop->{sched_arr} // $stop->{sched_dep}) ? ($stop->{sched_arr} // $stop->{sched_dep})->strftime('%H:%M') : q{} %>
-%           if ($stop->{rt_bogus}) {
-              <i class="material-icons" aria-label="Echtzeitdaten fehlen">gps_off</i>
+%         elsif (($stop->{rt_arr} and defined $stop->{arr_delay}) or (not $stop->{rt_arr} and $stop->{rt_dep} and defined $stop->{dep_delay})) {
+            "><span class="time-sched-ontime"><%= ($stop->{sched_arr} // $stop->{sched_dep}) ? ($stop->{sched_arr} // $stop->{sched_dep})->strftime('%H:%M') : q{} %></span>
 %         }
+%         else {
+            "><span class="time-sched"><%= ($stop->{sched_arr} // $stop->{sched_dep}) ? ($stop->{sched_arr} // $stop->{sched_dep})->strftime('%H:%M') : q{} %></span>
 %         }
 %         if ($stop->{tz_offset} and $stop->{local_dt_ad}) {
             (lokal <%= $stop->{local_dt_ad}->strftime('%H:%M') %>)

templates/layouts/app.html.ep

@@ -18,7 +18,7 @@
 	<meta http-equiv="refresh" content="<%= $self->stash('refresh_interval') %>"/>
 % }
 
-	% my $av = 'v95'; # asset version
+	% my $av = 'v96'; # asset version
 	% if (session('theme') and session('theme') eq 'dark' or param('dark')) {
 		%= stylesheet "/static/${av}/css/dark.min.css", id => 'theme'
 	% }

templates/layouts/legacy.html.ep

@@ -17,7 +17,7 @@
 	<meta http-equiv="refresh" content="<%= $self->stash('refresh_interval') %>"/>
 % }
 
-	% my $av = 'v95'; # asset version
+	% my $av = 'v96'; # asset version
 	%= stylesheet "/static/${av}/css/legacy.css"
 	%= stylesheet "/static/${av}/css/material-icons.css"
 	%= stylesheet "/static/${av}/css/jquery-ui.min.css"