[Jifty-commit] r6099 - in wifty/trunk/lib/Wifty: .

[Jifty commits]

Author: ruz
Date: Fri Dec 12 11:34:44 2008
New Revision: 6099

Modified:
   wifty/trunk/lib/Wifty/View.pm
   wifty/trunk/lib/Wifty/View/Page.pm

Log:
* switch to new page plugin

Modified: wifty/trunk/lib/Wifty/View.pm
==============================================================================
--- wifty/trunk/lib/Wifty/View.pm	(original)
+++ wifty/trunk/lib/Wifty/View.pm	Fri Dec 12 11:34:44 2008
@@ -130,24 +130,6 @@
     } };
 };
 
-private template 'menu' => sub {
-    my $wikiname = Jifty->config->app('WikiName') || "Wifty";
-    h1 { attr { id is 'wikiname' }
-        Jifty->web->link( url => "/", label => _($wikiname) )
-    }
-    div { attr { id => "navigation" };
-        Jifty->web->navigation->render_as_menu;
-    };
-};
-
-private template 'heading_in_wrapper' => sub {
-    h1 { attr { class => 'title' }; outs_raw(get('title')) };
-    Jifty->web->page_navigation->render_as_menu;
-#    show('/search_box');
-    hr { {class is 'clear'} }
-};
-
-
 private template markup => sub {
     return undef unless Jifty->config->app('Formatter') eq 'Markdown';
 

Modified: wifty/trunk/lib/Wifty/View/Page.pm
==============================================================================
--- wifty/trunk/lib/Wifty/View/Page.pm	(original)
+++ wifty/trunk/lib/Wifty/View/Page.pm	Fri Dec 12 11:34:44 2008
@@ -2,20 +2,43 @@
 use warnings;
 
 package Wifty::View::Page;
-use base qw(Jifty::View::Declare::Page);
+use base qw(Jifty::Plugin::ViewDeclarePage::Page);
 use Jifty::View::Declare::Helpers;
 
-sub render_body {
-    my ($self, $body_code) = @_;
+sub render_page {
+    my $self = shift;
 
-    my $logo = Jifty->config->app('Logo');
-    return $self->SUPER::render_body( $body_code ) unless $logo;
+    if ( my $logo = Jifty->config->app('Logo') ) {
+        div { attr { id is "logo" } 
+            img { src is $logo, alt is '' }
+        };
+    }
 
-    return $self->SUPER::render_body( sub {
-        div { attr { id is "logo" } img { src is $logo, alt is '' } };
-        $body_code->();
-    });
+    return $self->SUPER::render_page( @_ );
 }
 
-1;
+sub render_navigation {
+    my $self = shift;
+    my $wikiname = Jifty->config->app('WikiName') || "Wifty";
+    h1 { attr { id is 'wikiname' }
+        Jifty->web->link( url => "/", label => _($wikiname) )
+    };
+    return $self->SUPER::render_navigation( @_ );
+}
+
+sub render_title_inhead {
+    my $self = shift;
+    my $title = shift;
+    my $wikiname = Jifty->config->app('WikiName') || "Wifty";
+    return $self->SUPER::render_title_inhead( $title .' - '. $wikiname );
+}
 
+sub render_title_inpage {
+    my $self = shift;
+    $self->SUPER::render_title_inpage( @_ );
+#    show('/search_box');
+    hr { {class is 'clear'} };
+    return '';
+}
+
+1;