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

[jifty-commit at lists.jifty.org]

Author: jesse
Date: Thu Feb  8 15:22:01 2007
New Revision: 2767

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

Log:
 r21887 at hualien:  jesse | 2007-02-08 15:19:56 -0500
 * wrapper was being misused


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	Thu Feb  8 15:22:01 2007
@@ -138,7 +138,7 @@
     );
 
     $action->sticky_on_failure(1);
-    wrapper {
+    page {
 
         form {
 
@@ -412,8 +412,8 @@
 
 };
 
-template '__jifty/admin/index' => sub {
-    with( title => 'Jifty Administrative Console' ), wrapper {
+template '__jifty/admin/index' => page {
+    title is 'Jifty Administrative Console' ;
 
         h1 { _('Database Administration') };
 
@@ -463,10 +463,9 @@
             to    => "/",
             label => _('Back to the application')
         );
-      }
 };
 
-template '__jifty/admin/model/dhandler' => sub {
+template '__jifty/admin/model/dhandler' => page {
     # XXX move to dispatcher
     my $object_type = die('$m->dhandler_arg');
 
@@ -474,7 +473,6 @@
       Jifty->app_class( "Model", $object_type . "Collection" );
     my $records = $collection_class->new();
     $records->unlimit;
-    wrapper {
         h1 { _( 'Manage records: [_1]', $object_type ) };
         form {
             Jifty->web->region(
@@ -494,7 +492,6 @@
             label => _('Back to the admin console')
         );
 
-      }
 };
 
 template '__jifty/autocomplete.xml' => sub {

Modified: jifty/branches/template-declare/lib/Jifty/View/Declare/Helpers.pm
==============================================================================
--- jifty/branches/template-declare/lib/Jifty/View/Declare/Helpers.pm	(original)
+++ jifty/branches/template-declare/lib/Jifty/View/Declare/Helpers.pm	Thu Feb  8 15:22:01 2007
@@ -105,7 +105,7 @@
 }
 
 
-sub wrapper (&) {
+sub wrapper ($) {
     my $content_code = shift;
 
     my ($title) = get_current_attr(qw(title));