[Jifty-commit] r2590 - in jifty/branches/template-declare: . lib/Jifty lib/Jifty/View

jifty-commit at lists.jifty.org jifty-commit at lists.jifty.org
Fri Jan 26 08:11:51 EST 2007


Author: jesse
Date: Fri Jan 26 08:11:51 2007
New Revision: 2590

Added:
   jifty/branches/template-declare/lib/Jifty/View/Declare/BaseClass.pm
Modified:
   jifty/branches/template-declare/   (props changed)
   jifty/branches/template-declare/lib/Jifty/Handler.pm
   jifty/branches/template-declare/lib/Jifty/View/Declare.pm

Log:
 r21383 at hualien:  jesse | 2007-01-26 21:08:33 +0800
 


Modified: jifty/branches/template-declare/lib/Jifty/Handler.pm
==============================================================================
--- jifty/branches/template-declare/lib/Jifty/Handler.pm	(original)
+++ jifty/branches/template-declare/lib/Jifty/Handler.pm	Fri Jan 26 08:11:51 2007
@@ -158,6 +158,8 @@
 =cut
 
 sub templatedeclare_config {
+    
+    use Jifty::View::Declare::CoreTemplates;
     my %config = (
         roots => [ 'Jifty::View::Declare::CoreTemplates' ],
         %{ Jifty->config->framework('Web')->{'TemplateDeclareConfig'} ||{}},

Modified: jifty/branches/template-declare/lib/Jifty/View/Declare.pm
==============================================================================
--- jifty/branches/template-declare/lib/Jifty/View/Declare.pm	(original)
+++ jifty/branches/template-declare/lib/Jifty/View/Declare.pm	Fri Jan 26 08:11:51 2007
@@ -1,9 +1,9 @@
 package Jifty::View::Declare;
-use Jifty::View::Declare::CoreTemplates ();
+use Jifty::View::Declare::BaseClass ();
 
 use strict;
 use warnings;
-use constant BaseClass => 'Jifty::View::Declare::CoreTemplates';
+use constant BaseClass => 'Jifty::View::Declare::BaseClass';
 
 =head1 SYNOPSIS
 

Added: jifty/branches/template-declare/lib/Jifty/View/Declare/BaseClass.pm
==============================================================================
--- (empty file)
+++ jifty/branches/template-declare/lib/Jifty/View/Declare/BaseClass.pm	Fri Jan 26 08:11:51 2007
@@ -0,0 +1,39 @@
+package Jifty::View::Declare::BaseClass;
+
+use strict;
+use warnings;
+use vars qw( $r );
+use base qw/Jifty::View::Declare::Helpers/;
+use Scalar::Defer;
+use Template::Declare::Tags;
+use Jifty::View::Declare::Helpers;
+
+our @EXPORT = (
+    @Jifty::View::Declare::Helpers::EXPORT,
+    @Template::Declare::Tags::EXPORT,
+    qw( page ),
+);
+
+{
+    no warnings 'redefine';
+
+    sub show {
+        # Handle relative path here!
+
+        my $path = shift;
+        $path =~ s{^/}{};
+        Jifty::View::Declare::Helpers->can('show')->( $path, @_ );
+    }
+}
+
+# template 'foo' => page {{ title is 'Foo' } ... };
+sub page (&) {
+    my $code = shift;
+    sub {
+        Jifty->handler->apache->content_type('text/html; charset=utf-8');
+        show('/_elements/nav');
+        wrapper($code);
+    };
+}
+
+1;


More information about the Jifty-commit mailing list