Unverified Commit 327b46b6 authored by Birte Kristina Friesel's avatar Birte Kristina Friesel
Browse files

train detail links: incorporate dbris

parent c00f7851

public/static/js/collapse.js

+2 −0
Original line number Diff line number Diff line
@@ -130,6 +130,8 @@ function dbf_reg_handlers() { 
			history.pushState({'page':'traindetail','jid':trainElem.data('jid')}, 'test', '/z/' + trainElem.data('jid') + suffix);

		} else if (param.get('efa') && param.get('efa') != '0') {

			history.pushState({'page':'traindetail','jid':trainElem.data('jid')}, 'test', '/z/' + trainElem.data('jid') + suffix);

		} else if (param.get('dbris') && param.get('dbris') != '0') {

			history.pushState({'page':'traindetail','jid':trainElem.data('jid')}, 'test', '/z/' + trainElem.data('jid') + suffix);

		} else {

			history.pushState({'page':'traindetail','station':station,'train':trainElem.data('no')}, 'test', '/z/' + trainElem.data('train') + '/' + trainElem.data('station') + suffix);

		}

templates/app.html.ep

+6 −3
Original line number Diff line number Diff line
@@ -30,7 +30,7 @@ 
%     $route_str .= $stop . ($via_cur < $via_max ? ' - ' : q{});

%   }

    <li

% if (param('hafas') or param('efa')) {

% if (param('dbris') or param('hafas') or param('efa')) {

      data-jid="<%= $departure->{journey_id} =~ s{#}{%23}gr %>"

% }

      data-train="<%= ($departure->{train_type} // q{}) %> <%= ($departure->{train_no} // $departure->{train} // q{}) %>"
@@ -53,10 +53,13 @@ 
      >

%   }

%   if (param('hafas')) {

      <a href="/z/<%= Mojo::Util::url_escape($departure->{journey_id}) . '?hafas=' . Mojo::Util::url_escape(param('hafas')) . '&highlight=' .  Mojo::Util::url_escape($departure->{station} // $station) %>">

      <a href="/z/<%= Mojo::Util::url_escape($departure->{journey_id}) . '?hafas=' . Mojo::Util::url_escape(param('hafas')) . '&amp;highlight=' .  Mojo::Util::url_escape($departure->{station} // $station) %>">

%   }

%   elsif (param('efa')) {

      <a href="/z/<%= Mojo::Util::url_escape($departure->{journey_id}) . '?efa=' . Mojo::Util::url_escape(param('efa')) . '&highlight=' .  Mojo::Util::url_escape($departure->{station} // $station) %>">

      <a href="/z/<%= Mojo::Util::url_escape($departure->{journey_id}) . '?efa=' . Mojo::Util::url_escape(param('efa')) . '&amp;highlight=' .  Mojo::Util::url_escape($departure->{station} // $station) %>">

%   }

%   elsif (param('dbris')) {

      <a href="/z/<%= Mojo::Util::url_escape($departure->{journey_id}) . '?dbris=' . Mojo::Util::url_escape(param('dbris')) . '&amp;highlight=' .  Mojo::Util::url_escape($departure->{station} // $station) %>">

%   }

%   else {

      <a href="/z/<%= Mojo::Util::url_escape(($departure->{train_type} // q{}) . ' ' . ($departure->{train_no} // $departure->{train} // q{})) . '/' .  Mojo::Util::url_escape($departure->{station} // $station) %>">