From 7e6c7b269ab3bf3759d5f04568d13065343f89f8 Mon Sep 17 00:00:00 2001 From: Daniel Friesel Date: Wed, 9 Oct 2013 13:22:11 +0200 Subject: show error messages directly in HTML --- cgi/index.pl | 4 ++++ cgi/templates/main.html.ep | 22 ++++++++++++++++++++-- 2 files changed, 24 insertions(+), 2 deletions(-) diff --git a/cgi/index.pl b/cgi/index.pl index 25a4da1..118df7d 100644 --- a/cgi/index.pl +++ b/cgi/index.pl @@ -77,6 +77,9 @@ sub handle_request { my $no_lines = $self->param('no_lines'); my $frontend = $self->param('frontend') // 'png'; + my (undef, $errstr) = get_results( $self->param('backend') // $default{backend}, + $city, $stop); + if ( not $no_lines or $no_lines < 1 or $no_lines > 40 ) { $no_lines = $default{no_lines}; } @@ -94,6 +97,7 @@ sub handle_request { stop => $stop, version => $VERSION, frontend => $frontend, + errstr => $errstr, title => $city ? "departures for ${city} ${stop}" : "vrr-fakedisplay ${VERSION}", diff --git a/cgi/templates/main.html.ep b/cgi/templates/main.html.ep index 54b3196..c9ab3cf 100644 --- a/cgi/templates/main.html.ep +++ b/cgi/templates/main.html.ep @@ -23,6 +23,16 @@ text-decoration: none; } + div.error { + font-size: 150%; + font-weight: bold; + color: #dd0000; + } + + pre { + margin-bottom: 2em; + } + span.optional { color: #666666; } @@ -56,12 +66,20 @@ } - + % if ($city and $stop) { -% if ($frontend eq 'png') { +% if ($errstr) { +
Error from backend:
+
+
+%= $errstr
+
+
+% } +% elsif ($frontend eq 'png') { % } -- cgit v1.2.3