From b48996cff3bc4e72bf017b2b3fdcffcfd3780a5f Mon Sep 17 00:00:00 2001
From: Daniel Friesel <derf@finalrewind.org>
Date: Mon, 10 Jun 2019 16:26:32 +0200
Subject: add head nav and prominent geolocation link to app template

---
 lib/DBInfoscreen.pm                         |  8 +++----
 lib/DBInfoscreen/Controller/Stationboard.pm | 35 ++++++++++++++---------------
 2 files changed, 21 insertions(+), 22 deletions(-)

(limited to 'lib')

diff --git a/lib/DBInfoscreen.pm b/lib/DBInfoscreen.pm
index d83f58f..44a5520 100644
--- a/lib/DBInfoscreen.pm
+++ b/lib/DBInfoscreen.pm
@@ -261,7 +261,7 @@ sub startup {
 
 	$r->get('/_wr/:train/:departure')->to('wagenreihung#wagenreihung');
 
-	$self->defaults( layout => 'default' );
+	$self->defaults( layout => 'app' );
 	$self->sessions->default_expiration( 3600 * 24 * 28 );
 
 	$r->get('/')->to('stationboard#handle_request');
@@ -270,12 +270,12 @@ sub startup {
 
 	$self->config(
 		hypnotoad => {
-			accepts  => $ENV{DBFAKEDISPLAY_ACCEPTS} // 100,
-			clients  => $ENV{DBFAKEDISPLAY_CLIENTS} // 10,
+			accepts => $ENV{DBFAKEDISPLAY_ACCEPTS} // 100,
+			clients => $ENV{DBFAKEDISPLAY_CLIENTS} // 10,
 			listen   => [ $ENV{DBFAKEDISPLAY_LISTEN} // 'http://*:8092' ],
 			pid_file => $ENV{DBFAKEDISPLAY_PID_FILE}
 			  // '/tmp/db-fakedisplay.pid',
-			spare   => $ENV{DBFAKEDISPLAY_SPARE} // 2,
+			spare   => $ENV{DBFAKEDISPLAY_SPARE}   // 2,
 			workers => $ENV{DBFAKEDISPLAY_WORKERS} // 2,
 		},
 	);
diff --git a/lib/DBInfoscreen/Controller/Stationboard.pm b/lib/DBInfoscreen/Controller/Stationboard.pm
index 862ba12..e0e778d 100644
--- a/lib/DBInfoscreen/Controller/Stationboard.pm
+++ b/lib/DBInfoscreen/Controller/Stationboard.pm
@@ -373,22 +373,22 @@ sub handle_request {
 	my $via     = $self->param('via');
 
 	my @platforms = split( /,/, $self->param('platforms') // q{} );
-	my @lines     = split( /,/, $self->param('lines') // q{} );
-	my $template  = $self->param('mode') // 'app';
-	my $hide_low_delay = $self->param('hidelowdelay') // 0;
-	my $hide_opts      = $self->param('hide_opts') // 0;
+	my @lines     = split( /,/, $self->param('lines')     // q{} );
+	my $template       = $self->param('mode')          // 'app';
+	my $hide_low_delay = $self->param('hidelowdelay')  // 0;
+	my $hide_opts      = $self->param('hide_opts')     // 0;
 	my $show_realtime  = $self->param('show_realtime') // 0;
-	my $show_details   = $self->param('detailed') // 0;
-	my $backend        = $self->param('backend') // 'iris';
-	my $admode         = $self->param('admode') // 'deparr';
-	my $dark_layout    = $self->param('dark') // 0;
-	my $apiver         = $self->param('version') // 0;
+	my $show_details   = $self->param('detailed')      // 0;
+	my $backend        = $self->param('backend')       // 'iris';
+	my $admode         = $self->param('admode')        // 'deparr';
+	my $dark_layout    = $self->param('dark')          // 0;
+	my $apiver         = $self->param('version')       // 0;
 	my $callback       = $self->param('callback');
 	my $with_related   = !$self->param('no_related');
 	my $save_defaults  = $self->param('save_defaults') // 0;
-	my $limit          = $self->param('limit') // 0;
-	my @train_types    = split( /,/, $self->param('train_types') // q{} );
-	my %opt            = (
+	my $limit          = $self->param('limit')         // 0;
+	my @train_types = split( /,/, $self->param('train_types') // q{} );
+	my %opt         = (
 		cache_hafas     => $self->app->cache_hafas,
 		cache_iris_main => $self->app->cache_iris_main,
 		cache_iris_rt   => $self->app->cache_iris_rt,
@@ -423,6 +423,9 @@ sub handle_request {
 	elsif ( defined $station and $station =~ s{ [.] json $ }{}x ) {
 		$template = 'json';
 	}
+	elsif ( $template ne 'app' ) {
+		$self->stash( layout => 'legacy' );
+	}
 
 	# Historically, there were two JSON APIs: 'json' (undocumented, raw
 	# passthrough of serialized Travel::Status::DE::IRIS::Result /
@@ -452,11 +455,7 @@ sub handle_request {
 				$self->param( $param => $self->session($param) );
 			}
 		}
-		$self->render(
-			'landingpage',
-			hide_opts  => 0,
-			show_intro => 1
-		);
+		$self->render( 'landingpage', show_intro => 1 );
 		return;
 	}
 
@@ -554,7 +553,7 @@ sub handle_request {
 
 	for my $result (@results) {
 		my $platform = ( split( qr{ }, $result->platform // '' ) )[0];
-		my $delay = $result->delay;
+		my $delay    = $result->delay;
 		if ( $backend eq 'iris' and $admode eq 'arr' and not $result->arrival )
 		{
 			next;
-- 
cgit v1.2.3