From e91c540c8e5562f938dd329df43fcfc393599c12 Mon Sep 17 00:00:00 2001
From: Daniel Friesel <derf@finalrewind.org>
Date: Wed, 10 Apr 2019 17:51:51 +0200
Subject: [PATCH] history: Show time next to station

---
 public/static/css/local.css       |  4 ++++
 templates/_history_trains.html.ep | 37 ++++++++++++++++++-------------
 2 files changed, 26 insertions(+), 15 deletions(-)

diff --git a/public/static/css/local.css b/public/static/css/local.css
index 26ad1e3..a9848cc 100644
--- a/public/static/css/local.css
+++ b/public/static/css/local.css
@@ -10,6 +10,10 @@ td.cancelled {
 	text-decoration: line-through;
 }
 
+a.unmarked {
+	color: rgba(0, 0, 0, 0.87);
+}
+
 h1 {
 	font-size: 2.92rem;
 	margin: 1.9466666667rem 0 1.168rem 0;
diff --git a/templates/_history_trains.html.ep b/templates/_history_trains.html.ep
index 2044f7b..a105dff 100644
--- a/templates/_history_trains.html.ep
+++ b/templates/_history_trains.html.ep
@@ -4,9 +4,9 @@
 			<thead>
 				<tr>
 					<th>Datum</th>
-					<th>Zeit</th>
 					<th>Zug</th>
-					<th>Strecke</th>
+					<th>Von</th>
+					<th>Nach</th>
 				</tr>
 			</thead>
 			<tbody>
@@ -14,8 +14,25 @@
 					% if ($travel->{completed}) {
 						% my $detail_link = '/journey/' . current_user()->{id} . '-' . $travel->{ids}->[1];
 						<tr>
-							<td><%= $travel->{sched_departure}->strftime('%d.%m.%Y') %></td>
+							<td><%= $travel->{sched_departure}->strftime('%d.%m.') %></td>
+							<td><a href="<%= $detail_link %>"><%= $travel->{type} %> <%= $travel->{line} // '' %> <%= $travel->{no} %></a></td>
 							<td>
+							<a href="<%= $detail_link %>" class="unmarked">
+							% if (param('cancelled')) {
+								%= $travel->{sched_departure}->strftime('%H:%M')
+							% }
+							% else {
+								<%= $travel->{rt_departure}->strftime('%H:%M') %>
+								% if ($travel->{sched_departure} != $travel->{rt_departure}) {
+									(<%= sprintf('%+d', ($travel->{rt_departure}->epoch - $travel->{sched_departure}->epoch) / 60) %>)
+								% }
+							% }
+							<br/>
+							<%= $travel->{from_name} %>
+							</a>
+							</td>
+							<td>
+							<a href="<%= $detail_link %>" class="unmarked">
 							% if (param('cancelled') and $travel->{sched_arrival}->epoch != 0) {
 								%= $travel->{sched_arrival}->strftime('%H:%M')
 							% }
@@ -30,18 +47,8 @@
 								% }
 							% }
 							<br/>
-							% if (param('cancelled')) {
-								%= $travel->{sched_departure}->strftime('%H:%M')
-							% }
-							% else {
-								<%= $travel->{rt_departure}->strftime('%H:%M') %>
-								% if ($travel->{sched_departure} != $travel->{rt_departure}) {
-									(<%= sprintf('%+d', ($travel->{rt_departure}->epoch - $travel->{sched_departure}->epoch) / 60) %>)
-								% }
-							% }
-							</td>
-							<td><a href="<%= $detail_link %>"><%= $travel->{type} %> <%= $travel->{line} // '' %> <%= $travel->{no} %></a></td>
-							<td><a href="<%= $detail_link %>"><%= $travel->{from_name} %> → <%= $travel->{to_name} %></a></td>
+							<%= $travel->{to_name} %>
+							</a></td>
 						</tr>
 					% }
 				% }