introducing page templates - need to add edit capabilities

renamed the custom template folder

forgot one fix for the new custom template path

page templates refined

renamed page attribute template to template_name as i suspected it to be a reserved word. it still didn't work until i discovered that simon defined the accessible attributes! That costed me 40 minutes of lifetime. But he apologized ;)

tests for public and custom page templates

1 files changed, 8 insertions, 2 deletions

diff --git a/app/controllers/content_controller.rb b/app/controllers/content_controller.rb
index 0fa9832..706cfcd 100644
--- a/app/controllers/content_controller.rb
+++ b/app/controllers/content_controller.rb
@@ -10,8 +10,14 @@ class ContentController < ApplicationController
     
     @page = Node.find_page(path)
     
-    # Replace with real 404
-    unless @page
+    if @page
+     template = @page.valid_template
+
+      render(
+        :file => template,
+        :layout => true
+      )
+    else
       render( 
         :file => File.join(RAILS_ROOT, 'public', '404.html'),
         :status => 404