Commit f3694fdc authored by Birte Kristina Friesel's avatar Birte Kristina Friesel
Browse files

fix wagon images for trains consisting of different sub-types 

E.g. ICE T 411 + ICE T 415 or ICE 3 403.1 + ICE 3 403 Redesign
parent 789d604c

templates/_wagon.html.ep

+2 −2
Original line number Diff line number Diff line
@@ -51,7 +51,7 @@ 
  <div class="details" style="

  top: <%= $wagon->{position}{start_percent} %>%; bottom: <%= 100 - $wagon->{position}{end_percent} %>%;">

%   if ($exit_dir ne 'right') {

%     if (my $img = wagon_image($type, $wagon->type, $wagon->uic_id)) {

%     if (my $img = wagon_image($wagon->train_subtype // 'IC', $wagon->type, $wagon->uic_id)) {

        <a class="type" href="/w/<%= $img %>?n=<%= $wagon->number // '' %>&amp;s=<%= $wagon->section %>&amp;r=<%= $wref %>"><%= $wagon->type %></a>

%     }

%     else {
@@ -71,7 +71,7 @@ 
      <span class="uicexchange"><%= substr($uic_id, 0, 2) %></span><span class="uiccountry"><%= substr($uic_id, 2, 2) %></span><span class="uic56"><%= substr($uic_id, 4, 2) %></span><span class="uic78"><%= substr($uic_id, 6, 2) %></span><span class="uicno"><%= substr($uic_id, 8, 3) %></span><span class="uiccheck"><%= substr($uic_id, 11) %></span>

%   }

%   if ($exit_dir eq 'right') {

%     if (my $img = wagon_image($type, $wagon->type, $wagon->uic_id)) {

%     if (my $img = wagon_image($wagon->train_subtype // 'IC', $wagon->type, $wagon->uic_id)) {

        <a class="type" href="/w/<%= $img %>?n=<%= $wagon->number // '' %>&amp;s=<%= $wagon->section %>&amp;r=<%= $wref %>"><%= $wagon->type %></a>

%     }

%     else {

templates/wagenreihung.html.ep

+13 −23
Original line number Diff line number Diff line
@@ -8,9 +8,13 @@ 
% }

% else {

  % my $has_multi_dest = 0;

  % my $has_multi_desc = 0;

  % if (scalar $wr->destinations > 1) {

    % $has_multi_dest = 1;

  % }

  % if (scalar $wr->train_descriptions > 1) {

    % $has_multi_desc = 1;

  % }

  <div class="container">

    <div style="text-align: center;">

%=    join( ' / ', $wr->origins )
@@ -25,28 +29,14 @@ 
      </div>

    % }

    <%= $wr->station_name %> Gleis <%= $wr->platform %><br/>

    % if ($wr->train_type =~ m{^IC|EC}) {

      Zugtyp: <%= $wr->train_subtype // 'IC?' %>

    % }

	 % elsif ($wr->train_powertype) {

      %= $wr->train_type

    % for my $desc ($wr->train_descriptions) {

      % if ($desc->{text}) {

        %= $desc->{text}

        % if ($has_multi_desc) {

          in Abschnitt <%= join(q{}, sort @{$desc->{sections}}) %>

        % }

	 % my %translation = (

	 %   90 => 'mit sonstigem Antrieb',

	 %   91 => 'mit elektrischer Lokomotive',

	 %   92 => 'mit Diesellokomotive',

	 %   93 => 'Hochgeschwindigkeitszug',

	 %   94 => 'Elektrischer Triebzug',

	 %   95 => 'Diesel-Triebzug',

	 %   96 => 'mit speziellen Beiwagen',

	 %   97 => 'mit elektrischer Rangierlok',

	 %   98 => 'mit Diesel-Rangierlok',

	 %   99 => 'Sonderfahrzeug',

	 % );

	 % if (not $wr->train_powertype) {

        <br/>

      % }

	 % else {

      %= $translation{$wr->train_powertype};

    % }

  </div>

  <div class="container">
@@ -60,7 +50,7 @@ 
%       }

%     }

%     for my $wagon ($wr->wagons) {

%=      include '_wagon', direction => $wr->direction, wagon => $wagon, type => $wr->train_subtype // 'IC', wref => $wref, exit_dir => stash('exit_dir');

%=      include '_wagon', direction => $wr->direction, wagon => $wagon, wref => $wref, exit_dir => stash('exit_dir');

%     }

      </div>

<!--  <div>