summaryrefslogtreecommitdiff
path: root/templates
diff options
context:
space:
mode:
authorDaniel Friesel <derf@finalrewind.org>2019-12-21 23:53:49 +0100
committerDaniel Friesel <derf@finalrewind.org>2019-12-21 23:53:49 +0100
commit87a40ca57f724194d5f2f4a35731f08c3eb821d0 (patch)
treeff007202763346e7d656c53ed62c005c660ed563 /templates
parenta578f8f66613a9428617338f8270b9be21c7816b (diff)
more compact and less ugly wagon order display2.3.17
Diffstat (limited to 'templates')
-rw-r--r--templates/layouts/app.html.ep2
-rw-r--r--templates/layouts/legacy.html.ep2
-rw-r--r--templates/wagenreihung.html.ep34
3 files changed, 14 insertions, 24 deletions
diff --git a/templates/layouts/app.html.ep b/templates/layouts/app.html.ep
index 5a36685..2b2bf79 100644
--- a/templates/layouts/app.html.ep
+++ b/templates/layouts/app.html.ep
@@ -18,7 +18,7 @@
<meta http-equiv="refresh" content="<%= $self->stash('refresh_interval') %>"/>
% }
- % my $av = 'v20'; # asset version
+ % my $av = 'v21'; # asset version
%= stylesheet "/static/${av}/css/app.css"
%= stylesheet "/static/${av}/css/material-icons.css"
%= stylesheet "/static/${av}/css/jquery-ui.min.css"
diff --git a/templates/layouts/legacy.html.ep b/templates/layouts/legacy.html.ep
index 8b96c8f..e74d2e5 100644
--- a/templates/layouts/legacy.html.ep
+++ b/templates/layouts/legacy.html.ep
@@ -17,7 +17,7 @@
<meta http-equiv="refresh" content="<%= $self->stash('refresh_interval') %>"/>
% }
- % my $av = 'v20'; # asset version
+ % my $av = 'v21'; # 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/wagenreihung.html.ep b/templates/wagenreihung.html.ep
index b14c2dc..25a2153 100644
--- a/templates/wagenreihung.html.ep
+++ b/templates/wagenreihung.html.ep
@@ -37,17 +37,6 @@
% if ($wagon->is_locomotive or $wagon->is_powercar) {
% $bg = 'background-color: #cccccc;';
% }
- <div class="direction" style="
- top: <%= $wagon->{position}{start_percent} %>%; bottom: <%= 100 - $wagon->{position}{end_percent} %>%;">
-% if ($wr->has_bad_wagons) {
-% }
-% elsif ($wr->direction == 100) {
- ↓
-% }
-% else {
- ↑
-% }
- </div>
<div class="wagon" style="
top: <%= $wagon->{position}{start_percent} %>%; bottom: <%= 100 - $wagon->{position}{end_percent} %>%; <%= $bg %>">
% if ($wagon->is_locomotive or $wagon->is_powercar) {
@@ -76,30 +65,31 @@
<i class="material-icons">star</i>
% }
% }
- </div>
- <div class="details" style="
- top: <%= $wagon->{position}{start_percent} %>%; bottom: <%= 100 - $wagon->{position}{end_percent} %>%;">
-% if ($wagon->is_first_class) {
- <span class="firstclass">1</span>
+ <div class="direction">
+% if ($wr->has_bad_wagons) {
% }
-% elsif ($wagon->is_second_class) {
- <span class="secondclass">2</span>
+% elsif ($wr->direction == 100) {
+ <i class="material-icons">arrow_downward</i>
% }
% else {
- <span class="noclass"></span>
+ <i class="material-icons">arrow_upward</i>
% }
+ </div>
+ </div>
+ <div class="details" style="
+ top: <%= $wagon->{position}{start_percent} %>%; bottom: <%= 100 - $wagon->{position}{end_percent} %>%;">
<span class="type">
%= $wagon->type
</span>
% my $uic_id = $wagon->uic_id;
% if (length($uic_id) != 12) {
- <span style="color: #666666;"><%= $uic_id %></span>
+ <span class="uicunknown"><%= $uic_id %></span>
% }
% elsif ($wr->train_type eq 'ICE') {
- <span style="margin-right: 0.2em; color: #999999;"><%= substr($uic_id, 0, 2) %></span><span style="margin-right: 0.2em; color: #999999;"><%= substr($uic_id, 2, 2) %></span><span style="margin-right: 0.2em; color: #999999;"><%= substr($uic_id, 4, 1) %></span><span style="margin-right: 0.2em; font-weight: bold;"><%= substr($uic_id, 5, 3) %></span><span><%= substr($uic_id, 8, 3) %></span><span style="color: #999999;">-<%= substr($uic_id, 11) %></span>
+ <span class="uicexchange"><%= substr($uic_id, 0, 2) %></span><span class="uiccountry"><%= substr($uic_id, 2, 2) %></span><span class="uic5"><%= substr($uic_id, 4, 1) %></span><span class="uictype"><%= substr($uic_id, 5, 3) %></span><span class="uicno"><%= substr($uic_id, 8, 3) %></span><span class="uiccheck"><%= substr($uic_id, 11) %></span>
% }
% else {
- <span style="margin-right: 0.2em; color: #999999;"><%= substr($uic_id, 0, 2) %></span><span style="margin-right: 0.2em; color: #999999;"><%= substr($uic_id, 2, 2) %></span><span style="font-weight: bold;"><%= substr($uic_id, 4, 2) %></span>-<span style="margin-right: 0.2em; font-weight: bold;"><%= substr($uic_id, 6, 2) %></span><span><%= substr($uic_id, 8, 3) %></span><span style="color: #999999;">-<%= substr($uic_id, 11) %></span>
+ <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>
% }
</div>
% }