[Jifty-commit] r2136 - in jifty/branches/template-declare: . examples/HelloKitty/lib/HelloKitty lib/Jifty/View/Declare

jifty-commit at lists.jifty.org jifty-commit at lists.jifty.org
Sun Nov 12 04:50:12 EST 2006


Author: jesse
Date: Sun Nov 12 04:50:12 2006
New Revision: 2136

Modified:
   jifty/branches/template-declare/   (props changed)
   jifty/branches/template-declare/examples/HelloKitty/lib/HelloKitty/View.pm
   jifty/branches/template-declare/examples/HelloKitty/var/jifty-server.pid
   jifty/branches/template-declare/lib/Jifty/View/Declare/Handler.pm
   jifty/branches/template-declare/lib/Jifty/View/Declare/Templates.pm

Log:
 r44753 at pinglin:  jesse | 2006-11-12 02:54:23 -0500
 *checkpoint


Modified: jifty/branches/template-declare/examples/HelloKitty/lib/HelloKitty/View.pm
==============================================================================
--- jifty/branches/template-declare/examples/HelloKitty/lib/HelloKitty/View.pm	(original)
+++ jifty/branches/template-declare/examples/HelloKitty/lib/HelloKitty/View.pm	Sun Nov 12 04:50:12 2006
@@ -16,8 +16,7 @@
 };
 
 template content => sub {
-    form { outs 'woot'};
-
+    form {'woot'};
 };
 
 1;

Modified: jifty/branches/template-declare/examples/HelloKitty/var/jifty-server.pid
==============================================================================
--- jifty/branches/template-declare/examples/HelloKitty/var/jifty-server.pid	(original)
+++ jifty/branches/template-declare/examples/HelloKitty/var/jifty-server.pid	Sun Nov 12 04:50:12 2006
@@ -1 +1 @@
-13043
\ No newline at end of file
+26267
\ No newline at end of file

Modified: jifty/branches/template-declare/lib/Jifty/View/Declare/Handler.pm
==============================================================================
--- jifty/branches/template-declare/lib/Jifty/View/Declare/Handler.pm	(original)
+++ jifty/branches/template-declare/lib/Jifty/View/Declare/Handler.pm	Sun Nov 12 04:50:12 2006
@@ -49,25 +49,25 @@
 sub resolve_template {
     my $self         = shift;
     my $templatename = shift;    # like /admin/ui/new
+    warn "Looking at $templatename";
 
     my @components = split( '/', $templatename );
     my $template   = pop @components;
+    warn "The tempalte is $template";
 
-    my $package
-        = $self->root_class;     # join('::',$self->root_class, at components);
-    warn "The user is looking for $package $template";
+    my $package =  join('::',$self->root_class,grep { $_ } @components);
+    warn "The package is $package";
+    Jifty::Util->require($package);
     unless ( $package->isa('Jifty::View::Declare::Templates') ) {
         $self->log->error( "$package (" . $self->root_class . " / $templatename) isn't a valid template package." );
-        return undef;
+        #return undef;
     }
-    warn "The package is $package -- $template";
-    unless ( $package->has_template($template) ) {
+    unless ( $package->can('has_template') &&  $package->has_template($template) ) {
         $self->log->error("$package has no template $template.");
         return undef;
 
     }
 
-    warn "Resolved $package -> $template";
     return ( $package, $template );
 
 }

Modified: jifty/branches/template-declare/lib/Jifty/View/Declare/Templates.pm
==============================================================================
--- jifty/branches/template-declare/lib/Jifty/View/Declare/Templates.pm	(original)
+++ jifty/branches/template-declare/lib/Jifty/View/Declare/Templates.pm	Sun Nov 12 04:50:12 2006
@@ -6,7 +6,7 @@
 use Template::Declare::Tags;
 
 use base qw/Template::Declare/;
-our @EXPORT = qw(form);
+our @EXPORT = qw(form hyperlink tangent redirect new_action form_submit form_next_page request get);
 
 
 sub form (&){
@@ -19,4 +19,35 @@
 }
 
 
+sub hyperlink(@) {
+    Jifty->web->link(@_);
+}
+
+sub tangent(@) {
+    Jifty->web->tangent(@_);
+}
+sub redirect(@) {
+    Jifty->web->redirect(@_);
+}
+
+sub new_action(@){
+    Jifty->web->new_action(@_);
+}
+
+sub form_submit(@){
+    Jifty->web->form->submit(@_);
+}
+
+sub form_next_page(@){
+    Jifty->web->form->next_page(@_);
+}
+
+sub request {
+    Jifty->web->request;
+}
+
+sub get {
+    return map { request->argument($_) }  @_;
+}
+
 1;


More information about the Jifty-commit mailing list