Changeset 3275 for trunk/application

Timestamp:

08/06/2008 08:31:35 AM (4 months ago)

Author:

Shadowhand

Message:

Updated welcome controller to use the default kohana template added in r3274

Files:

• trunk/application/controllers/welcome.php (modified) (4 diffs)

trunk/application/controllers/welcome.php

@@ -9 +9 @@
  * @license    http://kohanaphp.com/license.html
  */
-class Welcome_Controller extends Controller {
+class Welcome_Controller extends Template_Controller {
 
         // Disable this controller when Kohana is set to production mode.
@@ -15 +15 @@
         const ALLOW_PRODUCTION = FALSE;
 
+        // Set the name of the template to use
+        public $template = 'kohana/template';
+
         public function index()
         {
                 // In Kohana, all views are loaded and treated as objects.
-                $welcome = new View('welcome');
+                $this->template->content = new View('welcome');
 
                 // You can assign anything variable to a view by using standard OOP
                 // methods. In my welcome view, the $title variable will be assigned
                 // the value I give it here.
-                $welcome->title = 'Welcome to Kohana!';
+                $this->template->title = 'Welcome to Kohana!';
 
                 // An array of links to display. Assiging variables to views is completely
                 // asyncronous. Variables can be set in any order, and can be any type
                 // of data, including objects.
-                $welcome->links = array
+                $this->template->content->links = array
                 (
                         'Home Page'     => 'http://kohanaphp.com/',
@@ -36 +39 @@
                         'Donate'        => 'http://kohanaphp.com/donate.html',
                 );
-
-                // Using views inside of views is completely transparent. In the welcome
-                // view, printing the $content variable will render the welcome_content view.
-                $welcome->content = new View('welcome_content');
-
-                // Using render(TRUE) forces the view to display now, instead of
-                // returning an HTML string.
-                $welcome->render(TRUE);
         }
 
         public function _default()
         {
+                // Disable auto-rendering
+                $this->auto_render = FALSE;
+
                 // By defining a method called _default, all pages routed to this controller
                 // that result in 404 errors will be handled by this method, instead of
@@ -54 +52 @@
         }
 
-}
+} // End Welcome Controller