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

jifty-commit at lists.jifty.org jifty-commit at lists.jifty.org
Tue Dec 19 03:06:04 EST 2006


Author: jesse
Date: Tue Dec 19 03:06:04 2006
New Revision: 2404

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

Log:
 r46261 at pinglin:  jesse | 2006-12-19 03:05:13 -0500
 * fixes to basic jifty templates
 


Modified: jifty/branches/template-declare/lib/Jifty/View/Declare/Base.pm
==============================================================================
--- jifty/branches/template-declare/lib/Jifty/View/Declare/Base.pm	(original)
+++ jifty/branches/template-declare/lib/Jifty/View/Declare/Base.pm	Tue Dec 19 03:06:04 2006
@@ -32,7 +32,7 @@
 sub page (&) {
     my $code = shift;
     sub {
-        $r->content_type('text/html; charset=utf-8');
+        Jifty->handler->apache->content_type('text/html; charset=utf-8');
         show('/_elements/nav');
         wrapper($code);
     };
@@ -58,7 +58,7 @@
 };
 
 sub render_header {
-    my ($self, $title) = @_;
+    my ($title) = @_;
     outs('<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">'
             . '<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">' );
     with( title => $title ), show('/_elements/header');
@@ -87,7 +87,7 @@
 
         local $Template::Declare::Tags::BUFFER = '';
 
-        $self->render_header($title);
+        render_header($title);
 
         $done_header = $Template::Declare::Tags::BUFFER;
 
@@ -167,14 +167,13 @@
         my @children = $menu->children;
         if (@children) {
             with( class => "menu" ), ul {
-                $self->render_menu($_) for @children;
+                render_menu($_) for @children;
               }
         }
     };
 };
 
 sub render_menu {
-    shift;
     my $item = shift;
     my @kids = $item->children;
     my @params;
@@ -188,7 +187,7 @@
 
         if (@kids) {
             with( class => "submenu" ), ul {
-                $self->render_menu($_) for @kids;
+                render_menu($_) for @kids;
               }
         }
       }
@@ -196,7 +195,7 @@
 
 template '_elements/header' => sub {
     my ($title) = get_current_attr(qw(title));
-    $r->content_type('text/html; charset=utf-8');
+    Jifty->handler->apache->content_type('text/html; charset=utf-8');
     head {
         with(
             'http-equiv' => "content-type",


More information about the Jifty-commit mailing list