Commit 46464a5e authored by Birte Kristina Friesel's avatar Birte Kristina Friesel
Browse files

infoscreen template: Improve RIS support

parent bab0e1e7

index.pl

+2 −0
Original line number Diff line number Diff line
@@ -560,6 +560,8 @@ sub handle_request { 
					canceled_stops   => [],

					replaced_by      => [],

					replacement_for  => [],

					route_timetable  => [ $result->route_timetable ],

					route_info       => $result->route_info,

				}

			);

		}

templates/clean.html.ep

+37 −5
Original line number Diff line number Diff line
@@ -51,14 +51,18 @@ 
%   }

    <div class="moreinfo">

    <div class="mheader">

    <span class="train-line"><%= $departure->{train_type} // q{???} %></span><!--

 --><span class="train-line"><%= $departure->{train_line} // q{} %></span>

%   if ($departure->{train_no} or $departure->{line_no}) {

      <span class="train-line"><%= $departure->{train_type} // q{???} %></span>

%     if ($departure->{train_line}) {

        <span class="train-no"><%= $departure->{train_no} // q{???} %></span>

%     }

%     else {

        <span class="train-line"><%= $departure->{train_no} // q{???} %></span>

%     }

%   }

%   else {

      <span class="train-line"><%= $departure->{train} // q{???} %></span>

%   }

%   if ($departure->{origin}) {

      :

      <span class="train-origin"><%= $departure->{origin} %></span>
@@ -87,6 +91,12 @@ 
          (heute <%= $departure->{departure} %>)

%       }

        <br/>

%     }

%     if (not ($departure->{sched_arrival} or $departure->{sched_departure})) {

        Abfahrt: <%= $departure->{time} %>

%       if ($departure->{delay}) {

          (heute +<%= $departure->{delay} %>)

%       }

%     }

      </div> <!-- timeinfo -->

%   }
@@ -113,6 +123,25 @@ 
%       }

      </div> <!-- mroute -->

%   }

%   elsif ($departure->{route_timetable}) {

      <div class="mroute">

      Über:

%       my $first = 0;

%       for my $stop (@{$departure->{route_timetable}}) {

%         my ($time, $name) = @{$stop};

%         if ($first++) {

            <span class="separator">–</span>

%         }

          <span class="generic-stop"><%= $time %></span>

%         if ($self->is_important($name)) {

            <span class="important-stop"><%= $name %></span>

%         }

%         else {

            <span class="generic-stop"><%= $name %></span>

%         }

%       }

      </div> <!-- mroute -->

%   }

%   if ($departure->{moreinfo} and @{$departure->{moreinfo}}) {

      Meldungen:

      <ul>
@@ -135,6 +164,9 @@ 
%=      $pair->[1]

        </span>

        </li>

%     }

%     if ($departure->{route_info}) {

        <li><%= $departure->{route_info} %></li>

%     }

      </ul>

%   }