From 160651f0bb465074b3b6ff1a0faa613da5586fb1 Mon Sep 17 00:00:00 2001
From: Daniel Friesel <derf@finalrewind.org>
Date: Mon, 29 Mar 2021 12:01:52 +0200
Subject: add train search (beta, not linked yet)

---
 templates/geolocation.html.ep    |  5 -----
 templates/geostop.html.ep        |  5 +++++
 templates/geotrain.html.ep       |  5 +++++
 templates/landingpage.html.ep    |  2 +-
 templates/layouts/app.html.ep    | 13 ++++++++-----
 templates/layouts/legacy.html.ep |  7 ++-----
 6 files changed, 21 insertions(+), 16 deletions(-)
 delete mode 100644 templates/geolocation.html.ep
 create mode 100644 templates/geostop.html.ep
 create mode 100644 templates/geotrain.html.ep

(limited to 'templates')

diff --git a/templates/geolocation.html.ep b/templates/geolocation.html.ep
deleted file mode 100644
index 843892d..0000000
--- a/templates/geolocation.html.ep
+++ /dev/null
@@ -1,5 +0,0 @@
-<div class="geolocation">
-<div class="candidateheader">Nächstgelegene Stationen:</div>
-<div class="candidatestatus">Bitte warten…</div>
-<div class="candidatelist"></div>
-</div> <!-- geolocation -->
diff --git a/templates/geostop.html.ep b/templates/geostop.html.ep
new file mode 100644
index 0000000..843892d
--- /dev/null
+++ b/templates/geostop.html.ep
@@ -0,0 +1,5 @@
+<div class="geolocation">
+<div class="candidateheader">Nächstgelegene Stationen:</div>
+<div class="candidatestatus">Bitte warten…</div>
+<div class="candidatelist"></div>
+</div> <!-- geolocation -->
diff --git a/templates/geotrain.html.ep b/templates/geotrain.html.ep
new file mode 100644
index 0000000..b79747e
--- /dev/null
+++ b/templates/geotrain.html.ep
@@ -0,0 +1,5 @@
+<div class="geolocation">
+<div class="candidateheader">Experimentelles Beta-Feature. URL und API können sich jederzeit ändern.<br/><br/>Züge auf der Strecke:</div>
+<div class="candidatestatus">Bitte warten…</div>
+<div class="candidatelist"></div>
+</div> <!-- geolocation -->
diff --git a/templates/landingpage.html.ep b/templates/landingpage.html.ep
index f95fe44..23aa428 100644
--- a/templates/landingpage.html.ep
+++ b/templates/landingpage.html.ep
@@ -9,7 +9,7 @@
   Verfügbarkeitsgarantie. Alle Angaben ohne Gewähr.
 </p>
 <p class="geolink">
-<a class="button" href="<%= url_for('_auto')->to_abs->scheme('https') %>">Bahnhöfe im Umfeld suchen</a>
+<a class="button" href="<%= url_for('_autostop')->to_abs->scheme('https') %>">Bahnhöfe im Umfeld suchen</a>
 </p>
 <p>
 Oder hier angeben:
diff --git a/templates/layouts/app.html.ep b/templates/layouts/app.html.ep
index 9380a81..75dca45 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 = 'v47'; # asset version
+	% my $av = 'v48'; # asset version
 	% if (session('theme') and session('theme') eq 'dark' or param('dark')) {
 		%= stylesheet "/static/${av}/css/dark.min.css", id => 'theme'
 	% }
@@ -55,8 +55,11 @@
 	%= javascript '/static/js/jquery-3.4.1.min.js', defer => undef
 	%= javascript "/static/${av}/js/jquery-ui.min.js", defer => undef
 	%= javascript "/static/${av}/js/dbf.min.js", defer => undef
-	% if (stash('with_geolocation')) {
-	%= javascript "/static/${av}/js/geolocation.min.js", defer => undef
+	% if (stash('with_geostop')) {
+	%= javascript "/static/${av}/js/geostop.min.js", defer => undef
+	% }
+	% if (stash('with_geotrain')) {
+	%= javascript "/static/${av}/js/geotrain.min.js", defer => undef
 	% }
 	% if (stash('with_map')) {
 	%= stylesheet "/static/${av}/leaflet/leaflet.css"
@@ -89,7 +92,7 @@
 				% else {
 					<li><a href="#stationinput"><i class="material-icons" aria-label="Menü">edit</i></a></li>
 				% }
-				<li><a href="/_auto"><i class="material-icons" aria-label="Stationen in der Umgebung suchen">my_location</i></a></li>
+				<li><a href="/_autostop"><i class="material-icons" aria-label="Stationen in der Umgebung suchen">my_location</i></a></li>
 			</ul>
 		</div>
 	</nav>
@@ -140,7 +143,7 @@ Bitte eine Station aus der Liste auswählen</div>
   % if (not stash('show_intro')) {
     <div class="break"></div>
     <div class="field">
-      <a class="button" href="<%= url_for('_auto')->to_abs->scheme('https') %>">Bahnhöfe im Umfeld suchen</a>
+      <a class="button" href="<%= url_for('_autostop')->to_abs->scheme('https') %>">Bahnhöfe im Umfeld suchen</a>
     </div>
   % }
   <div class="break"></div>
diff --git a/templates/layouts/legacy.html.ep b/templates/layouts/legacy.html.ep
index 306b980..a169e8a 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 = 'v47'; # asset version
+	% my $av = 'v48'; # asset version
 	%= stylesheet "/static/${av}/css/default.css"
 	%= stylesheet "/static/${av}/css/material-icons.css"
 	%= stylesheet "/static/${av}/css/jquery-ui.min.css"
@@ -38,9 +38,6 @@
 	%= javascript "/static/${av}/js/jquery-ui.min.js", defer => undef
 	%= javascript "/static/${av}/js/dbf.min.js", defer => undef
 	% }
-	% if (stash('with_geolocation')) {
-	%= javascript "/static/${av}/js/geolocation.min.js", defer => undef
-	% }
 </head>
 <body style="<%= (param('dark') ? 'background-color: #000000; color: #ffffff;' : q{}) %>">
 
@@ -99,7 +96,7 @@ Bitte eine Station aus der Liste auswählen</div>
   % if (not stash('show_intro')) {
     <div class="break"></div>
     <div class="field">
-      <a class="button" href="<%= url_for('_auto')->to_abs->scheme('https') %>">Bahnhöfe im Umfeld suchen</a>
+      <a class="button" href="<%= url_for('_autostop')->to_abs->scheme('https') %>">Bahnhöfe im Umfeld suchen</a>
     </div>
   % }
   <div class="break"></div>
-- 
cgit v1.2.3