diff options
| -rw-r--r-- | lib/DBInfoscreen/Controller/Stationboard.pm | 19 | ||||
| -rw-r--r-- | public/static/js/collapse.js | 4 | ||||
| -rw-r--r-- | templates/_train_details.html.ep | 4 | ||||
| -rw-r--r-- | templates/layouts/app.html.ep | 2 | ||||
| -rw-r--r-- | templates/layouts/legacy.html.ep | 2 |
5 files changed, 16 insertions, 15 deletions
diff --git a/lib/DBInfoscreen/Controller/Stationboard.pm b/lib/DBInfoscreen/Controller/Stationboard.pm index 6931e42..24df23e 100644 --- a/lib/DBInfoscreen/Controller/Stationboard.pm +++ b/lib/DBInfoscreen/Controller/Stationboard.pm @@ -1104,15 +1104,16 @@ sub handle_result { my @departures; my @platforms = split( /,/, $self->param('platforms') // q{} ); - my $template = $self->param('mode') // 'app'; - my $hide_low_delay = $self->param('hidelowdelay') // 0; - my $hide_opts = $self->param('hide_opts') // 0; - my $show_realtime = $self->param('show_realtime') // 0; - my $show_details = $self->param('detailed') // 0; - my $admode = $self->param('admode') // 'deparr'; - my $apiver = $self->param('version') // 0; - my $callback = $self->param('callback'); - my $via = $self->param('via'); + my $template = $self->param('mode') // 'app'; + my $hide_low_delay = $self->param('hidelowdelay') // 0; + my $hide_opts = $self->param('hide_opts') // 0; + my $show_realtime = $self->param('rt') // $self->param('show_realtime') + // 0; + my $show_details = $self->param('detailed') // 0; + my $admode = $self->param('admode') // 'deparr'; + my $apiver = $self->param('version') // 0; + my $callback = $self->param('callback'); + my $via = $self->param('via'); my $now = DateTime->now( time_zone => 'Europe/Berlin' ); diff --git a/public/static/js/collapse.js b/public/static/js/collapse.js index 95088e4..82420c7 100644 --- a/public/static/js/collapse.js +++ b/public/static/js/collapse.js @@ -102,8 +102,8 @@ function dbf_reg_handlers() { if (window.location.href.includes('past=1')) { suffix += '&past=1'; } - if (window.location.href.includes('show_realtime=1')) { - suffix += '&show_realtime=1'; + if (window.location.href.includes('rt=1') || window.location.href.includes('show_realtime=1')) { + suffix += '&rt=1'; } history.pushState({'page':'traindetail','station':station,'train':trainElem.data('no')}, 'test', '/z/' + trainElem.data('train') + '/' + trainElem.data('station') + suffix); dbf_show_moreinfo(trainElem, false); diff --git a/templates/_train_details.html.ep b/templates/_train_details.html.ep index 121f46d..7ef2138 100644 --- a/templates/_train_details.html.ep +++ b/templates/_train_details.html.ep @@ -195,7 +195,7 @@ <ul class="mroute"> % for my $stop (@{$departure->{route_pre_diff}}) { <li class="<%= $stop->{isPast} ? 'past-stop' : 'future-stop' %>"> - <a href="<%= url_for('station', station => $stop->{name})->query({detailed => param('detailed'), past => param('past'), show_realtime => param('show_realtime')}) %>#<%= ($departure->{train_type} // q{x}) . ($departure->{train_no} // q{x}) %>" class=" + <a href="<%= url_for('station', station => $stop->{name})->query({detailed => param('detailed'), past => param('past'), rt => param('rt')}) %>#<%= ($departure->{train_type} // q{x}) . ($departure->{train_no} // q{x}) %>" class=" % if ($stop->{isAdditional}) { additional-stop % } @@ -240,7 +240,7 @@ % } % for my $stop (@{$departure->{route_post_diff}}) { <li class="<%= $stop->{isPast} ? 'past-stop' : 'future-stop' %>"> - <a href="<%= url_for('station', station => $stop->{name})->query({detailed => param('detailed'), past => param('past'), show_realtime => param('show_realtime')}) %>#<%= ($departure->{train_type} // q{x}) . ($departure->{train_no} // q{x}) %>" class=" + <a href="<%= url_for('station', station => $stop->{name})->query({detailed => param('detailed'), past => param('past'), rt => param('rt')}) %>#<%= ($departure->{train_type} // q{x}) . ($departure->{train_no} // q{x}) %>" class=" % if ($stop->{isAdditional}) { additional-stop % } diff --git a/templates/layouts/app.html.ep b/templates/layouts/app.html.ep index f3db4a8..7b48d6d 100644 --- a/templates/layouts/app.html.ep +++ b/templates/layouts/app.html.ep @@ -145,7 +145,7 @@ Bitte eine Station aus der Liste auswählen</div> <div class="moresettings moresettings-collapsed"> <div class="field"> <div class="desc"> - %= check_box 'show_realtime' => 1, id => 'id_show_realtime' + %= check_box 'rt' => 1, id => 'id_show_realtime' <label for="id_show_realtime"> Zeiten inkl. Verspätung angeben </label> diff --git a/templates/layouts/legacy.html.ep b/templates/layouts/legacy.html.ep index 47c7e49..f2c7ca4 100644 --- a/templates/layouts/legacy.html.ep +++ b/templates/layouts/legacy.html.ep @@ -158,7 +158,7 @@ Bitte eine Station aus der Liste auswählen</div> </div> <div class="field"> <div class="desc"> - %= check_box 'show_realtime' => 1, id => 'id_show_realtime' + %= check_box 'rt' => 1, id => 'id_show_realtime' <label for="id_show_realtime"> Echtzeitangaben statt Fahrplandaten anzeigen </label> |