diff options
| author | Birte Kristina Friesel <derf@finalrewind.org> | 2025-02-09 09:23:35 +0100 |
|---|---|---|
| committer | Birte Kristina Friesel <derf@finalrewind.org> | 2025-02-09 09:23:35 +0100 |
| commit | 5d3cf2ccab4a1f521273d2171b112c1badd8b996 (patch) | |
| tree | fc1750d76c4b350088e0a102397fbab977e4103a | |
| parent | 5c528816500535628571cf65da622aca6dfdeaa6 (diff) | |
Make "Zuglauf" links work for non-DB checkins2.9.20
replaces text with "Details" for those
| -rw-r--r-- | templates/_checked_in.html.ep | 18 | ||||
| -rw-r--r-- | templates/_public_status_card.html.ep | 9 |
2 files changed, 14 insertions, 13 deletions
diff --git a/templates/_checked_in.html.ep b/templates/_checked_in.html.ep index 797ff57..a5611e9 100644 --- a/templates/_checked_in.html.ep +++ b/templates/_checked_in.html.ep @@ -356,24 +356,20 @@ % } </div> <div class="card-action"> - % my $url = 'https://bahn.expert/details/'; - % if ($journey->{train_id} =~ m{[|]}) { - % if ($journey->{train_type} and $journey->{train_no}) { - % $url .= $journey->{train_type} . ' ' . $journey->{train_no}; - % } - % $url .= '/' . $journey->{sched_departure}->epoch . '000?jid=' . $journey->{train_id} =~ s{#}{%23}gr; - % } - % else { - % $url .= $journey->{train_type} . ' ' . $journey->{train_no} . '/' . $journey->{sched_departure}->epoch . '000?station=' . $journey->{dep_eva}; + % my $url = 'https://dbf.finalrewind.org/z/'; + % if ($journey->{is_hafas}) { + % $url .= $journey->{train_id} =~ s{#}{%23}gr . '?hafas=' . $journey->{backend_name}; + <a style="margin-right: 0;" href="<%= $url %>"><i class="material-icons left" aria-hidden="true">timeline</i> Details</a> % } - % if ($journey->{backend_id} <= 1) { + % elsif ($journey->{extra_data}{trip_id}) { + % $url .= $journey->{extra_data}{trip_id} =~ s{#}{%23}gr; <a style="margin-right: 0;" href="<%= $url %>"><i class="material-icons left" aria-hidden="true">timeline</i> Zuglauf</a> % } % else { % } % if ($journey->{extra_data}{trip_id}) { - <a class="right" style="margin-right: 0;" href="https://dbf.finalrewind.org/map/<%= $journey->{extra_data}{trip_id} =~ s{#}{%23}gr %>/<%= $journey->{train_line} || 0 %>?hafas=<%= $journey->{backend_name} // 'DB' %>&from=<%= $journey->{dep_name} %>&to=<%= $journey->{arr_name} %>&dark=<%= (session('theme') and session('theme') eq 'dark') ? 1 : 0 %>"><i class="material-icons left" aria-hidden="true">map</i> Karte</a> + <a class="right" style="margin-right: 0;" href="https://dbf.finalrewind.org/map/<%= $journey->{extra_data}{trip_id} =~ s{#}{%23}gr %>/<%= $journey->{train_line} || 0 %>?hafas=<%= $journey->{backend_name} // 'VRN' %>&from=<%= $journey->{dep_name} %>&to=<%= $journey->{arr_name} %>"><i class="material-icons left" aria-hidden="true">map</i> Karte</a> % } </div> </div> diff --git a/templates/_public_status_card.html.ep b/templates/_public_status_card.html.ep index 6dda46d..84708ef 100644 --- a/templates/_public_status_card.html.ep +++ b/templates/_public_status_card.html.ep @@ -168,8 +168,13 @@ <div class="card-action"> % if ($journey->{traewelling_url}) { <a style="margin-right: 0;" href="<%= $journey->{traewelling_url} %>"><i class="material-icons left">timeline</i> Träwelling</a> - % } elsif ($journey->{backend_id} <= 1) { - % my $url = 'https://bahn.expert/details/' . $journey->{train_type} . ' ' . $journey->{train_no} . '/' . DateTime->now(time_zone => 'Europe/Berlin')->epoch . '000'; + % } + % elsif ($journey->{is_hafas}) { + % my $url = 'https://dbf.finalrewind.org/z/' . $journey->{train_id} =~ s{#}{%23}gr . '?hafas=' . $journey->{backend_name}; + <a style="margin-right: 0;" href="<%= $url %>"><i class="material-icons left">timeline</i> Details</a> + % } + % elsif ($journey->{extra_data}{trip_id}) { + % my $url = 'https://dbf.finalrewind.org/z/' . $journey->{extra_data}{trip_id} =~ s{#}{%23}gr; <a style="margin-right: 0;" href="<%= $url %>"><i class="material-icons left">timeline</i> Zuglauf</a> % } % else { |