diff options
| -rw-r--r-- | public/infoscreen.css | 20 | ||||
| -rw-r--r-- | templates/infoscreen.html.ep | 94 |
2 files changed, 57 insertions, 57 deletions
diff --git a/public/infoscreen.css b/public/infoscreen.css index b402483..e3988d1 100644 --- a/public/infoscreen.css +++ b/public/infoscreen.css @@ -11,12 +11,10 @@ div.displayclean { width:100%; } -div.displayclean ul { +div.displayclean > ul { position:absolute; width:100%; background-color:#F8F8F8; - top: -3px; - left: 0; list-style-type:none; margin:0; @@ -24,12 +22,10 @@ div.displayclean ul { border-bottom: 1px solid #cccccc; } -div.displayclean li { +div.displayclean > ul > li { height: 7em; background-color:#F8F8F8; display:block; - padding-bottom: 5px; - padding-top: 5px; border-width:1px 0; border-style:solid; border-color:#CCCCCC; @@ -41,7 +37,7 @@ div.displayclean li .line { color:#FFFFFF; background-color:#666666; font-weight:bold; - font-size: 3em; + font-size: 2.9em; padding:3px 8px 2px 5px; position:absolute; top:7px; @@ -83,15 +79,19 @@ div.displayclean li .route { div.displayclean li .dest { color:#000000; - font-weight:bold; font-size:4em; position:absolute; - top:0.8em; + top:0.65em; left:2.5em; width: 70%; + z-index: 1; overflow: hidden; } +div.displayclean li.cancelled { + background-color: #ffe7d0; +} + div.displayclean li .countdown { color:#000000; font-size:3em; @@ -121,7 +121,7 @@ div.displayclean li .countdown .delay { } div.displayclean li .time { - color:#000000; + color:#444444; font-size: 2.4em; position:absolute; right:5px; diff --git a/templates/infoscreen.html.ep b/templates/infoscreen.html.ep index 4ca6ad5..1fdada3 100644 --- a/templates/infoscreen.html.ep +++ b/templates/infoscreen.html.ep @@ -24,54 +24,54 @@ <div class="displayclean"> <ul> % for my $departure (@{$raw}) { -% my $linetype = q{}; -% if ($departure->can('type')) { -% given ($departure->type) { -% when ($_ =~ m{enbahn$}) { $linetype = 'tram' } -% when ('S-Bahn') { $linetype = 'sbahn' } -% when ([qw[NE Niederflurbus SB Bus]]) { $linetype = 'bus' } -% when ('U-Bahn') { $linetype = 'ubahn' } +% my $linetype = q{}; +% if ($departure->can('type')) { +% given ($departure->type) { +% when ($_ =~ m{enbahn$}) { $linetype = 'tram' } +% when ('S-Bahn') { $linetype = 'sbahn' } +% when ([qw[NE Niederflurbus SB Bus]]) { $linetype = 'bus' } +% when ('U-Bahn') { $linetype = 'ubahn' } +% } % } -% } -<li> -<span class="line <%= $linetype %>"> -%= $departure->line -</span> -<span class="route"> -% if ($departure->can('lineref') and $departure->lineref) { -%= $departure->lineref->route -% } -% elsif ($departure->can('route_timetable')) { -% my @first_deps = ($departure->route_timetable)[0..2]; -% delete $first_deps[2] unless defined $first_deps[2]; -% delete $first_deps[1] unless defined $first_deps[1]; -% delete $first_deps[0] unless defined $first_deps[0]; -%= join(' - ', map { $_->[1] } @first_deps ); -% } -</span> -<span class="dest"> -%= $departure->destination -</span> -<span class="countdown"> -% if ($departure->can('delay') and $departure->delay) { -<span class="delay"> (+<%= $departure->delay %>) </span> -% } -% if ($departure->can('is_cancelled') and $departure->is_cancelled) { -<span class="delay"> FÄLLT AUS </span> -% } -% else { -% if ($departure->countdown > 0) { -<%= $departure->countdown %> min -% } -% else { -sofort -% } -% } -</span> -<span class="time"> -%= $departure->time -</span> -</li> + <li> + <span class="line <%= $linetype %>"> + %= $departure->line + </span> <!-- line --> + <span class="route"> +% if ($departure->can('lineref') and $departure->lineref) { +%= $departure->lineref->route +% } +% elsif ($departure->can('route_timetable')) { +% my @first_deps = ($departure->route_timetable)[0..2]; +% delete $first_deps[2] unless defined $first_deps[2]; +% delete $first_deps[1] unless defined $first_deps[1]; +% delete $first_deps[0] unless defined $first_deps[0]; +%= join(' - ', map { $_->[1] } @first_deps ); +% } + </span> <!-- route --> + <span class="dest"> +%= $departure->destination + </span> <!-- dest --> + <span class="countdown"> +% if ($departure->can('delay') and $departure->delay) { + <span class="delay"> (+<%= $departure->delay %>) </span> +% } +% if ($departure->can('is_cancelled') and $departure->is_cancelled) { + <span class="delay"> FÄLLT AUS </span> +% } +% else { +% if ($departure->countdown > 0) { + <%= $departure->countdown %> min +% } +% else { + sofort +% } +% } + </span> <!-- countdown --> + <span class="time"> +%= $departure->time + </span> + </li> % } </ul> </div> |