Changeset 12376

Timestamp:

05/26/08 00:58:09 (6 months ago)

Author:

tokuhirom

Message:

topic pages is replaced by Template::Declare.

Location:

lang/perl/mobirc/trunk

Files:

• assets/tmpl/mobile/topics.html (deleted)
• assets/tmpl/pc/topics.html (deleted)
• lib/App/Mobirc/HTTPD/Controller.pm (modified) (3 diffs)
• lib/App/Mobirc/HTTPD/Template/Pages.pm (added)
• lib/App/Mobirc/HTTPD/View.pm (modified) (1 diff)

lang/perl/mobirc/trunk/lib/App/Mobirc/HTTPD/Controller.pm

@@ -138 +138 @@
     my ($class, $c) = @_;
 
-    return render(
-        $c,
-        'topics' => {
-            channels => [$c->{global_context}->channels],
-        },
-    );
+    my $html = App::Mobirc::HTTPD::View->show(
+        'topics',
+        $c->{mobile_agent}, App::Mobirc->context->server
+    );
+    make_response($c, $html);
 }
 
@@ -229 +228 @@
 }
 
-sub render {
-    my ( $c, $name, $args ) = @_;
-
-    croak "invalid args : $args" unless ref $args eq 'HASH';
-
-    DEBUG "rendering template";
-
-    # set default vars
-    $args = {
-        docroot              => $c->{config}->{httpd}->{root},
-        render_line          => sub { render_line( $c, @_ ) },
-        user_agent           => $c->{user_agent},
-        mobile_agent         => $c->{mobile_agent},
-        title                => $c->{config}->{httpd}->{title},
-        version              => $App::Mobirc::VERSION,
-        now                  => time(),
-
-        %$args,
-    };
-
-    my $tmpl_dir = $c->{mobile_agent}->is_non_mobile ? 'pc' : 'mobile';
-    DEBUG "tmpl_dir: $tmpl_dir";
-
-    my $tt = Template->new(
-        LOAD_TEMPLATES => [
-            Template::Provider::Encoding->new(
-                ABSOLUTE => 1,
-                INCLUDE_PATH => dir( $c->{config}->{global}->{assets_dir}, 'tmpl', $tmpl_dir, )->stringify,
-            )
-        ],
-    );
-    $tt->process("$name.html", $args, \my $out)
-        or die $tt->error;
-
-    DEBUG "rendering done";
+sub make_response {
+    my ( $c, $out ) = @_;
 
     $out = _html_filter($c, $out);
@@ -293 +259 @@
 }
 
+sub render {
+    my ( $c, $name, $args ) = @_;
+
+    croak "invalid args : $args" unless ref $args eq 'HASH';
+
+    DEBUG "rendering template";
+
+    # set default vars
+    $args = {
+        docroot              => $c->{config}->{httpd}->{root},
+        render_line          => sub { render_line( $c, @_ ) },
+        user_agent           => $c->{user_agent},
+        mobile_agent         => $c->{mobile_agent},
+        title                => $c->{config}->{httpd}->{title},
+        version              => $App::Mobirc::VERSION,
+        now                  => time(),
+
+        %$args,
+    };
+
+    my $tmpl_dir = $c->{mobile_agent}->is_non_mobile ? 'pc' : 'mobile';
+    DEBUG "tmpl_dir: $tmpl_dir";
+
+    my $tt = Template->new(
+        LOAD_TEMPLATES => [
+            Template::Provider::Encoding->new(
+                ABSOLUTE => 1,
+                INCLUDE_PATH => dir( $c->{config}->{global}->{assets_dir}, 'tmpl', $tmpl_dir, )->stringify,
+            )
+        ],
+    );
+    $tt->process("$name.html", $args, \my $out)
+        or die $tt->error;
+
+    DEBUG "rendering done";
+
+    return make_response($c, $out);
+}
+
 sub dispatch_static {
     my ($class, $c, $file_name, $content_type) = @_;

lang/perl/mobirc/trunk/lib/App/Mobirc/HTTPD/View.pm

@@ -4 +4 @@
 use Template::Declare;
 use App::Mobirc::HTTPD::Template::IRCMessage;
+use App::Mobirc::HTTPD::Template::Pages;
 
-Template::Declare->init(roots => ['App::Mobirc::HTTPD::Template::IRCMessage']);
+Template::Declare->init(roots => ['App::Mobirc::HTTPD::Template::IRCMessage', 'App::Mobirc::HTTPD::Template::Pages']);
 
 sub show {