From 202b7e81982ce73ede96852ca69b0813bcd0de9d Mon Sep 17 00:00:00 2001 From: Daniel Friesel Date: Fri, 1 Jan 2021 13:45:38 +0100 Subject: wagon view: improve diretion and exit direction display --- templates/layouts/app.html.ep | 2 +- templates/layouts/legacy.html.ep | 2 +- templates/wagen.html.ep | 78 ++++++++++++++++++++++++++-------------- 3 files changed, 54 insertions(+), 28 deletions(-) (limited to 'templates') diff --git a/templates/layouts/app.html.ep b/templates/layouts/app.html.ep index b776d21..ebaf1cb 100644 --- a/templates/layouts/app.html.ep +++ b/templates/layouts/app.html.ep @@ -18,7 +18,7 @@ % } - % my $av = 'v43'; # asset version + % my $av = 'v44'; # asset version % if (session('theme') and session('theme') eq 'dark' or param('dark')) { %= stylesheet "/static/${av}/css/dark.min.css", id => 'theme' % } diff --git a/templates/layouts/legacy.html.ep b/templates/layouts/legacy.html.ep index a861488..b45ae6c 100644 --- a/templates/layouts/legacy.html.ep +++ b/templates/layouts/legacy.html.ep @@ -17,7 +17,7 @@ % } - % my $av = 'v43'; # asset version + % my $av = 'v44'; # asset version %= stylesheet "/static/${av}/css/default.css" %= stylesheet "/static/${av}/css/material-icons.css" %= stylesheet "/static/${av}/css/jquery-ui.min.css" diff --git a/templates/wagen.html.ep b/templates/wagen.html.ep index 145b3fd..efc2e32 100644 --- a/templates/wagen.html.ep +++ b/templates/wagen.html.ep @@ -1,48 +1,74 @@ -
- % if ($wref->{s} and $wref->{p} and $wref->{ws}) { +
+ % if (not $wref->{e} and $wref->{s} and $wref->{p} and $wref->{ws}) {

- <%= $wref->{s} %>: Gleis <%= $wref->{p} %> <%= $wref->{ws} %> + <%= $wref->{s} %> Gleis <%= $wref->{p} %> <%= $wref->{ws} %>

% } % if ($wref->{e} eq 'u') { -
arrow_upward
-
arrow_upward
- % } - % for my $wagon_file (@{$wagon_files // [] }) { - % if (defined $wref->{d}) { -
- % if ($wref->{d} == 0) { - arrow_back - % } - % else { - arrow_forward - % } + % if ($wref->{s} and $wref->{p} and $wref->{ws}) { +
+ <%= $wref->{s} %>
Gleis <%= $wref->{p} %> <%= $wref->{ws} %> +
arrow_upward
+
arrow_upward
% } -
- -
% } - % if ($wref->{e} eq 'd') { -
arrow_downward
-
arrow_downward
+ % elsif (defined $wref->{d} and $wref->{e} ne 'u') { + % if ($wref->{d} == 0) { +
arrow_back
+
arrow_back
+
arrow_back
+ % } + % else { +
arrow_forward
+
arrow_forward
+
arrow_forward
+ % } % } - % if (defined $wref->{d}) { -
+ % for my $wagon_file (@{$wagon_files // [] }) { + % if ($wagon_file ne $wagon_files->[0] and defined $wref->{d}) { % if ($wref->{d} == 0) { - arrow_back +
arrow_back
+
arrow_back
+
arrow_back
% } % else { - arrow_forward +
arrow_forward
+
arrow_forward
+
arrow_forward
% } + % } +
+
% } + % if ($wref->{e} eq 'd') { +
arrow_downward
+
arrow_downward
+ % if ($wref->{s} and $wref->{p} and $wref->{ws}) { +
+ <%= $wref->{s} %>
Gleis <%= $wref->{p} %> <%= $wref->{ws} %> +
+ % } + % } + % elsif (defined $wref->{d} and $wref->{e} ne 'd') { + % if ($wref->{d} == 0) { +
arrow_back
+
arrow_back
+
arrow_back
+ % } + % else { +
arrow_forward
+
arrow_forward
+
arrow_forward
+ % } + % } % if ($wagon_data->{name}) {

<%= $wagon_data->{name} %>

% } - -- cgit v1.2.3