From: Aaron Trevena <aaron.trevena@gmail.com>
Date: Fri, 19 Aug 2005 11:35:19 +0000 (+0000)
Subject: improvement to error reporting for template problems [bug 14133] in Maypole::View... 
X-Git-Tag: 2.11~146
X-Git-Url: https://git.decadent.org.uk/gitweb/?a=commitdiff_plain;h=284a7d7e5af74cc6979378cb428c20ef98b4068c;p=maypole.git

improvement to error reporting for template problems [bug 14133] in Maypole::View::Base

git-svn-id: http://svn.maypole.perl.org/Maypole/trunk@372 48953598-375a-da11-a14b-00016c27c3ee
---

diff --git a/lib/Maypole/View/Base.pm b/lib/Maypole/View/Base.pm
index 9615950..afba7a0 100644
--- a/lib/Maypole/View/Base.pm
+++ b/lib/Maypole/View/Base.pm
@@ -90,23 +90,31 @@ sub error {
         # a static page
         return -1 unless @{ $r->{objects} || [] };
 
+	my $template_error = $r->{error};
         $r->{error} = <<EOF;
 
-<H1> Template not found </H1>
+<h1> Template not found </h1>
 
-This template was not found while processing the following request:
+A template was not found while processing the following request:
 
-<B>@{[$r->{action}]}</B> on table <B>@{[ $r->{table} ]}</B> with objects:
+<strong>@{[$r->{action}]}</strong> on table
+<strong>@{[ $r->{table} ]}</strong> with objects:
 
-<PRE>
+<pre>
 @{[join "\n", @{$r->{objects}}]}
-</PRE>
+</pre>
 
-Looking for template <B>@{[$r->{template}]}</B> in paths:
 
-<PRE>
+The main template is <strong>@{[$r->{template}]}</strong>.
+The template subsystem's error message was
+<pre>
+$template_error
+</pre>
+We looked in paths:
+
+<pre>
 @{[ join "\n", $self->paths($r) ]}
-</PRE>
+</pre>
 EOF
         $r->{content_type} = "text/html";
         $r->{output}       = $r->{error};