show line and train number in IRIS detail header

2 files changed, 18 insertions, 24 deletions

diff --git a/public/static/default.css b/public/static/default.css
index 5e73936..e833c07 100644
--- a/public/static/default.css
+++ b/public/static/default.css
@@ -34,9 +34,7 @@ div.displayclean > ul > li {
 div.displayclean li .line {
 	color:#FFFFFF;
 	background-color:#666666;
-	font-weight:bold;
 	font-size: 2.9em;
-	padding:3px 8px 2px 5px;
 	position:absolute;
 	top:7px;
 	left:2px;
@@ -62,26 +60,21 @@ div.displayclean li .lineinfo .replaced {
 	color: #660000;
 }
 
-div.displayclean li .tram {
-	background-color: #CC0000;
-}
-
 div.displayclean li .sbahn {
+	font-weight:bold;
+	color:#FFFFFF;
 	background-color:#006E10;
 	-webkit-border-radius: 30px;
 	-moz-border-radius: 30px;
 	border-radius: 30px;
+	padding:3px 8px 2px 5px;
 }
 
-div.displayclean li .ubahn {
-	background-color:#001090;
-}
-
-div.displayclean li .bus {
-	background-color:#991199;
-	-webkit-border-radius: 10px;
-	-moz-border-radius: 10px;
-	border-radius: 10px;
+div.displayclean li .bahn {
+	font-weight:bold;
+	color:#FFFFFF;
+	background-color:#666666;
+	padding:3px 8px 2px 5px;
 }
 
 div.displayclean li .route {
diff --git a/templates/clean.html.ep b/templates/clean.html.ep
index 538102f..fb1463f 100644
--- a/templates/clean.html.ep
+++ b/templates/clean.html.ep
@@ -21,7 +21,7 @@
 %   else {
       <li>
 %   }
-%   my $linetype = q{};
+%   my $linetype = 'bahn';
 %   if ( $departure->{train_type} eq 'S' ) {
 %     $linetype = 'sbahn';
 %   }
@@ -51,24 +51,25 @@
 %   }
     <div class="moreinfo">
     <div class="mheader">
-%   if ($departure->{train_no} or $departure->{line_no}) {
-      <span class="train-line"><%= $departure->{train_type} // q{???} %></span>
+    <div>
+%   if ($departure->{train_no} or $departure->{train_line}) {
+      <span class="train-line <%= $linetype %>"><%= $departure->{train_type} %>
+      <%= $departure->{train_line} // $departure->{train_no} %></span>
 %     if ($departure->{train_line}) {
-        <span class="train-no"><%= $departure->{train_no} // q{???} %></span>
-%     }
-%     else {
-        <span class="train-line"><%= $departure->{train_no} // q{???} %></span>
+        <span class="train-no"><%= $departure->{train_no} %></span>
 %     }
 %   }
 %   else {
       <span class="train-line"><%= $departure->{train} // q{???} %></span>
 %   }
+    </div>
+    <div>
 %   if ($departure->{origin}) {
-      :
       <span class="train-origin"><%= $departure->{origin} %></span>
+      →
 %   }
-    →
     <span class="train-dest"><%= $departure->{destination} // q{???} %></span>
+    </div>
 %   if ($departure->{is_cancelled}) {
       <div class="minfo">Fahrt fällt aus</div>
 %   }