Merge branch 'template-panel'

4 files changed, 47 insertions, 1 deletions

diff --git a/app.psgi b/app.psgi
index f19069042..cf88b8473 100644
--- a/app.psgi
+++ b/app.psgi
@@ -8,7 +8,7 @@ use Catalyst::Utils;
 my $app = FixMyStreet::App->apply_default_middlewares(FixMyStreet::App->psgi_app);
 
 builder {
-    enable 'Debug', panels => [ qw(Parameters Response DBIC::QueryLog CatalystLog Timer Memory) ]
+    enable 'Debug', panels => [ qw(Parameters Response DBIC::QueryLog CatalystLog Timer Memory FixMyStreet::Template) ]
         if Catalyst::Utils::env_value( 'FixMyStreet::App', 'DEBUG' );
 
     $app;
diff --git a/cpanfile b/cpanfile
index 9b0ff6d93..ab1382c30 100644
--- a/cpanfile
+++ b/cpanfile
@@ -118,6 +118,7 @@ requires 'File::Find::Rule';
 # Modules used for development
 requires 'Plack::Middleware::Debug';
 requires 'Plack::Middleware::Debug::DBIC::QueryLog';
+requires 'Plack::Middleware::Debug::Template';
 recommends 'Linux::Inotify2' if $^O eq 'linux';
 recommends 'Mac::FSEvents' if $^O eq 'darwin';
 
diff --git a/cpanfile.snapshot b/cpanfile.snapshot
index 7e516ecff..ec9e8494c 100644
--- a/cpanfile.snapshot
+++ b/cpanfile.snapshot
@@ -4853,6 +4853,18 @@ DISTRIBUTIONS
       Test::Fatal 0
       Test::More 0.96
       perl 5.008008
+  Plack-Middleware-Debug-Template-1.00
+    pathname: M/MY/MYSOCIETY/Plack-Middleware-Debug-Template-1.00.tar.gz
+    provides:
+      Plack::Middleware::Debug::Template 1.00
+    requirements:
+      Class::Method::Modifiers 0
+      ExtUtils::MakeMaker 0
+      Plack::Middleware::Debug 0
+      Test::More 0
+      Text::MicroTemplate 0
+      Time::HiRes 0
+      perl 5.006
   Plack-Middleware-ReverseProxy-0.15
     pathname: M/MI/MIYAGAWA/Plack-Middleware-ReverseProxy-0.15.tar.gz
     provides:
diff --git a/perllib/Plack/Middleware/Debug/FixMyStreet/Template.pm b/perllib/Plack/Middleware/Debug/FixMyStreet/Template.pm
new file mode 100644
index 000000000..05cb9f18a
--- /dev/null
+++ b/perllib/Plack/Middleware/Debug/FixMyStreet/Template.pm
@@ -0,0 +1,33 @@
+package Plack::Middleware::Debug::FixMyStreet::Template;
+
+=head1 NAME
+
+Plack::Middleware::Debug::FixMyStreet::Template -
+small subclass for FixMyStreet-specific tweaks.
+
+=head1 VERSION
+
+Version 1.00
+
+=cut
+
+our $VERSION = '1.00';
+
+use strict;
+use warnings;
+use parent qw(Plack::Middleware::Debug::Template);
+
+sub show_pathname { 1 }
+
+sub hook_pathname {
+    my ($self, $name) = @_;
+    $name =~ s/^.*templates\/web\///;
+    $name;
+}
+
+sub ignore_template {
+    my ($self, $template) = @_;
+    return 1 if $template eq 'site-name.html';
+}
+
+1;