diff options
| author | Daniel Friesel <derf@finalrewind.org> | 2015-08-13 22:27:52 +0200 |
|---|---|---|
| committer | Daniel Friesel <derf@finalrewind.org> | 2015-08-13 22:27:52 +0200 |
| commit | 65634e360e73592369616093ce5b49da38f28796 (patch) | |
| tree | 17b96994e811f8ac9a729a8a73a3aa13b00c0e03 | |
| parent | 146f9df71bfb6f883ba557510dc282458348e260 (diff) | |
| parent | 9bee75d432365d44af46f5d500f7d210b867cc18 (diff) | |
Merge branch 'master' of lastlight:var/git_root/vrr-fakedisplay
| -rw-r--r-- | index.pl | 10 | ||||
| -rw-r--r-- | templates/exception.html.ep | 2 | ||||
| -rw-r--r-- | templates/infoscreen.html.ep | 23 | ||||
| -rw-r--r-- | templates/main.html.ep | 6 | ||||
| -rw-r--r-- | templates/not_found.html.ep | 2 |
5 files changed, 26 insertions, 17 deletions
@@ -33,7 +33,7 @@ sub get_results { $expiry ||= 150; my $cache = Cache::File->new( - cache_root => '/tmp/vrr-fake', + cache_root => '/tmp/vrr-fakedisplay', default_expires => "${expiry} sec", lock_level => Cache::File::LOCK_LOCAL(), ); @@ -106,7 +106,7 @@ sub handle_request { $no_lines = $default{no_lines}; } - $self->stash( title => 'vrr-fakedisplay' ); + $self->stash( title => 'vrr-infoscreen' ); $self->stash( version => $VERSION ); $self->stash( params => $self->req->params->to_string ); @@ -122,7 +122,7 @@ sub handle_request { errstr => $errstr, title => $stop ? "departures for ${city} ${stop}" - : "vrr-fakedisplay ${VERSION}", + : "vrr-infoscreen ${VERSION}", ); return; @@ -342,7 +342,7 @@ sub render_html { $self->render( $template, - title => "vrr-fakedisplay v${VERSION}", + title => "vrr-infoscreen v${VERSION}", color => [ split( qr{,}, $color ) ], departures => \@departures, id_name => decode( 'UTF-8', $data->{id_name} ), @@ -522,7 +522,7 @@ get '/:stop' => \&handle_request; app->config( hypnotoad => { listen => ['http://*:8091'], - pid_file => '/tmp/vrr-fake.pid', + pid_file => '/tmp/vrr-fakedisplay.pid', workers => $ENV{DBFAKEDISPLAY_WORKERS} // 2, }, ); diff --git a/templates/exception.html.ep b/templates/exception.html.ep index 18a1402..ca66d7c 100644 --- a/templates/exception.html.ep +++ b/templates/exception.html.ep @@ -1,7 +1,7 @@ <!DOCTYPE html> <html> <head> - <title>vrr-fakedisplay</title> + <title>vrr-infoscreen</title> <meta charset="utf-8"> <meta name="viewport" content="width=device-width, initial-scale=1.0"> %= stylesheet '/main.css' diff --git a/templates/infoscreen.html.ep b/templates/infoscreen.html.ep index c20589d..4a4f309 100644 --- a/templates/infoscreen.html.ep +++ b/templates/infoscreen.html.ep @@ -76,7 +76,14 @@ </td> <td class="stop"><%= $stop->name %></td></tr> % } - <tr class="routenow"><td class="time"><%= $departure->time %></td> + <tr class="routenow"><td class="time"> +% if ($departure->can('sched_time')) { + <%= $departure->sched_time %> +% } +% else { + <%= $departure->time %> +% } + </td> <td class="stop"><%= $id_name %> <%= $id_stop %></td></tr> % for my $stop ($departure->route_post) { <tr class="routepost"><td class="time"> @@ -100,7 +107,7 @@ </span> <!-- moreinfo --> <span class="route"> % if ($departure->can('route_interesting') and $departure->route_interesting) { -%= join(' - ', map { $_->name_suf } ($departure->route_interesting)); +%= join(' - ', map { ref($_) ? $_->name_suf : $_ } ($departure->route_interesting)); % } % elsif ($departure->can('lineref') and $departure->lineref) { %= $departure->lineref->route @@ -124,11 +131,13 @@ <span class="delay"> FÄLLT AUS </span> % } % else { -% if ($departure->countdown > 0) { - <%= $departure->countdown %> min -% } -% else { - sofort +% if ($departure->can('countdown')) { +% if ($departure->countdown > 0) { + <%= $departure->countdown %> min +% } +% else { + sofort +% } % } % } </span> <!-- countdown --> diff --git a/templates/main.html.ep b/templates/main.html.ep index 151ae88..67a4c5b 100644 --- a/templates/main.html.ep +++ b/templates/main.html.ep @@ -81,7 +81,7 @@ change any time.</p> % else { <p> -VRR-Fakedisplay shows the next departures at a public transit stop, just like +VRR-Infoscreen shows the next departures at a public transit stop, just like the Lumino LED displays used at some stops. </p> @@ -168,10 +168,10 @@ other German transit networks. <ul> <li>The EFA backend does not support Umlauts</li> <li>For Düsseldorf, the DB backend usually gives better results</li> -<li>If you write the city correctly (like "Essen", not "essen"), vrr-fake can +<li>If you write the city correctly (like "Essen", not "essen"), vrr-infoscreen can shorten destination names</li> <li><a href="/Essen/Martinstr?no_lines=8">Example</a> -<li>See also <a href="http://dbf.finalrewind.org/">db-fakedisplay</a> for an +<li>See also <a href="http://dbf.finalrewind.org/">db-infoscreen</a> for an interface optimized for Deutsche Bahn departure data</li> </li> </ul> diff --git a/templates/not_found.html.ep b/templates/not_found.html.ep index 8d4883b..27cabc1 100644 --- a/templates/not_found.html.ep +++ b/templates/not_found.html.ep @@ -1,7 +1,7 @@ <!DOCTYPE html> <html> <head> - <title>vrr-fakedisplay</title> + <title>vrr-infoscreen</title> <meta charset="utf-8"> <meta name="viewport" content="width=device-width, initial-scale=1.0"> %= stylesheet '/main.css' |