[Jifty-commit] r2591 - in jifty/branches/template-declare: .

[jifty-commit at lists.jifty.org]

Author: jesse
Date: Fri Jan 26 08:12:35 2007
New Revision: 2591

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

Log:
 r21384 at hualien:  jesse | 2007-01-26 21:11:29 +0800
  * finish untangling templates and abstract base class


Modified: jifty/branches/template-declare/lib/Jifty/View/Declare/CoreTemplates.pm
==============================================================================
--- jifty/branches/template-declare/lib/Jifty/View/Declare/CoreTemplates.pm	(original)
+++ jifty/branches/template-declare/lib/Jifty/View/Declare/CoreTemplates.pm	Fri Jan 26 08:12:35 2007
@@ -3,38 +3,11 @@
 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, @_ );
-    }
-}
+use Jifty::View::Declare -base;
+
+use Scalar::Defer;
 
-# 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);
-    };
-}
 
 template '_elements/nav' => sub {
     my $top = Jifty->web->navigation;