From 7e4727af603cdd8bbb3746842a9603054ddca7cb Mon Sep 17 00:00:00 2001
From: Daniel Friesel <derf@finalrewind.org>
Date: Fri, 4 Jan 2019 00:02:31 +0100
Subject: Add color coding for trains not accepting DB tickets

---
 public/static/default.css         | 40 +++++++++++++++++++++++++--------------
 public/static/v1                  |  1 -
 public/static/v2                  |  1 +
 templates/app.html.ep             |  8 +++++++-
 templates/infoscreen.html.ep      |  7 ++++++-
 templates/layouts/default.html.ep |  2 +-
 6 files changed, 41 insertions(+), 18 deletions(-)
 delete mode 120000 public/static/v1
 create mode 120000 public/static/v2

diff --git a/public/static/default.css b/public/static/default.css
index 0be22fa..9610bea 100644
--- a/public/static/default.css
+++ b/public/static/default.css
@@ -97,7 +97,9 @@ div.appdark li .sbahn {
 	background-color:#115511;
 }
 
-div.app li .bahn {
+div.app li .bahn,
+div.app li .fern,
+div.app li .ext {
 	font-weight:bold;
 	border-radius: 5px;
 	padding:3px 5px 2px 5px;
@@ -111,12 +113,6 @@ div.appdark li .bahn {
 	background-color: #333333;
 }
 
-div.app li .fern {
-	font-weight:bold;
-	border-radius: 5px;
-	padding:3px 5px 2px 5px;
-}
-
 div.applight li .fern {
 	background-color: #ffdddd;
 }
@@ -125,6 +121,16 @@ div.appdark li .fern {
 	background-color: #551111;
 }
 
+div.applight li .ext {
+	background-color: #ffdddd;
+	border: 2px solid #ff6666;
+}
+
+div.appdark li .ext {
+	background-color: #551111;
+	border: 2px solid #993333;
+}
+
 div.app li .route {
 	background-color: transparent;
 	font-size:2.1em;
@@ -461,7 +467,9 @@ div.infoscreendark li .sbahn {
 	background-color:#115511;
 }
 
-div.infoscreen li .bahn {
+div.infoscreen li .bahn,
+div.infoscreen li .fern,
+div.infoscreen li .ext {
 	font-weight:bold;
 	border-radius: 5px;
 	padding:3px 5px 2px 5px;
@@ -475,12 +483,6 @@ div.infoscreendark li .bahn {
 	background-color: #333333;
 }
 
-div.infoscreen li .fern {
-	font-weight:bold;
-	border-radius: 5px;
-	padding:3px 5px 2px 5px;
-}
-
 div.infoscreenlight li .fern {
 	background-color: #ffdddd;
 }
@@ -489,6 +491,16 @@ div.infoscreendark li .fern {
 	background-color: #551111;
 }
 
+div.infoscreenlight li .ext {
+	background-color: #ffdddd;
+	border: 2px solid #ff6666;
+}
+
+div.infoscreendark li .ext {
+	background-color: #551111;
+	border: 2px solid #993333;
+}
+
 div.infoscreen li .route {
 	background-color: transparent;
 	font-size:2.1em;
diff --git a/public/static/v1 b/public/static/v1
deleted file mode 120000
index 945c9b4..0000000
--- a/public/static/v1
+++ /dev/null
@@ -1 +0,0 @@
-.
\ No newline at end of file
diff --git a/public/static/v2 b/public/static/v2
new file mode 120000
index 0000000..945c9b4
--- /dev/null
+++ b/public/static/v2
@@ -0,0 +1 @@
+.
\ No newline at end of file
diff --git a/templates/app.html.ep b/templates/app.html.ep
index 80e17d2..8c7d079 100644
--- a/templates/app.html.ep
+++ b/templates/app.html.ep
@@ -33,9 +33,15 @@
 %   elsif ( $departure->{train_type} eq 'IC'
 %          or $departure->{train_type} eq 'ICE'
 %          or $departure->{train_type} eq 'EC'
-%          or $departure->{train_type} eq 'THA' ) {
+%          or $departure->{train_type} eq 'EN') {
 %     $linetype = 'fern';
 %   }
+%   elsif ( $departure->{train_type} eq 'THA'
+%          or $departure->{train_type} eq 'FLX'
+%          or $departure->{train_type} eq 'NJ') {
+%     $linetype = 'ext';
+%   }
+%
     <div class="line <%= $linetype %>">
     % if ($departure->{train_type} and $departure->{train_no}) {
 %=    $departure->{train_type}
diff --git a/templates/infoscreen.html.ep b/templates/infoscreen.html.ep
index 9c244a0..1202dd7 100644
--- a/templates/infoscreen.html.ep
+++ b/templates/infoscreen.html.ep
@@ -33,8 +33,13 @@
 %   elsif ( $departure->{train_type} eq 'IC'
 %          or $departure->{train_type} eq 'ICE'
 %          or $departure->{train_type} eq 'EC'
-%          or $departure->{train_type} eq 'THA' ) {
+%          or $departure->{train_type} eq 'EN') {
 %     $linetype = 'fern';
+%   }
+%   elsif ( $departure->{train_type} eq 'THA'
+%          or $departure->{train_type} eq 'FLX'
+%          or $departure->{train_type} eq 'NJ') {
+%     $linetype = 'ext';
 %   }
     <div class="line <%= $linetype %>">
     % if ($departure->{train_type} and $departure->{train_no}) {
diff --git a/templates/layouts/default.html.ep b/templates/layouts/default.html.ep
index f540847..5b6dec8 100644
--- a/templates/layouts/default.html.ep
+++ b/templates/layouts/default.html.ep
@@ -8,7 +8,7 @@
 	<meta http-equiv="refresh" content="<%= $self->stash('refresh_interval') %>"/>
 % }
 
-	% my $av = 'v1'; # asset version
+	% my $av = 'v2'; # asset version
 	%= stylesheet "/static/${av}/default.css"
 	%= stylesheet "/static/${av}/jquery-ui.min.css"
 % my $force_mobile = param('force_mobile') // -1;
-- 
cgit v1.2.3