4 files changed, 19 insertions, 5 deletions
diff --git a/app/controllers/nodes_controller.rb b/app/controllers/nodes_controller.rb
index 81ead62..f82ab82 100644
--- a/app/controllers/nodes_controller.rb
+++ b/app/controllers/nodes_controller.rb
@@ -40,7 +40,15 @@ class NodesController < ApplicationController
  end
  def show
-    @nodes = Node.find(params[:id]).children
+    @page = Node.find(params[:id]).draft
+    
+    if @page
+     template = @page.valid_template
+     render(
+       :file => template,
+       :layout => "application"
+     )
+    end
  end
  def edit
diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb
index 1446e14..e6317fd 100644
--- a/app/views/layouts/application.html.erb
+++ b/app/views/layouts/application.html.erb
@@ -12,10 +12,11 @@
        <![endif]-->
    </head>
    <body>
+        <%= render :partial => 'nodes/preview' if params[:action] == "show" %>
        <div id="logo">
            <a href="index.html" title="Startseite"><img src="/images/chaosknot.gif" alt="Chaosknoten" /></a>
        </div>
-        <!-- HEAD -->
+        <!-- HEAD -->        
        <div id="header">
            <div id="yellow">
            </div>
diff --git a/app/views/nodes/_preview.html.erb b/app/views/nodes/_preview.html.erb
new file mode 100644
index 0000000..e8d7b9f
--- /dev/null
+++ b/app/views/nodes/_preview.html.erb
@@ -0,0 +1,5 @@
+<div id="preview_disclaimer">
+  <strong>Preview draft.</strong>
+  Clicking on links will redirected you to the public site.
+  <%= link_to 'Back to admin interface', nodes_path %>
+</div
+\ No newline at end of file
diff --git a/app/views/nodes/show.html.erb b/app/views/nodes/show.html.erb
index dd37c28..67dd7fc 100644
--- a/app/views/nodes/show.html.erb
+++ b/app/views/nodes/show.html.erb
@@ -1,5 +1,5 @@
 <h1>Node</h1>
-<%= @node.unique_name %>
+There is no draft to preview. Click <%= link_to 'edit', edit_node_path %> to 
+create one or view the currently 
-<%= link_to 'Edit', edit_node_path %>
-\ No newline at end of file
+<%= link_to_path 'published version', @node.unique_path %>. 
+\ No newline at end of file

diff --git a/app/controllers/nodes_controller.rb b/app/controllers/nodes_controller.rb index 81ead62..f82ab82 100644 --- a/app/controllers/nodes_controller.rb +++ b/app/controllers/nodes_controller.rb
@@ -40,7 +40,15 @@ class NodesController < ApplicationController
40	end	40	end
41		41
42	def show	42	def show
43	@nodes = Node.find(params[:id]).children	43	@page = Node.find(params[:id]).draft
		44
		45	if @page
		46	template = @page.valid_template
		47	render(
		48	:file => template,
		49	:layout => "application"
		50	)
		51	end
44	end	52	end
45		53
46	def edit	54	def edit


diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index 1446e14..e6317fd 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb
@@ -12,10 +12,11 @@
12	<![endif]-->	12	<![endif]-->
13	</head>	13	</head>
14	<body>	14	<body>
		15	<%= render :partial => 'nodes/preview' if params[:action] == "show" %>
15	<div id="logo">	16	<div id="logo">
16	<a href="index.html" title="Startseite"><img src="/images/chaosknot.gif" alt="Chaosknoten" /></a>	17	<a href="index.html" title="Startseite"><img src="/images/chaosknot.gif" alt="Chaosknoten" /></a>
17	</div>	18	</div>
18	<!-- HEAD -->	19	<!-- HEAD -->
19	<div id="header">	20	<div id="header">
20	<div id="yellow">	21	<div id="yellow">
21	</div>	22	</div>


diff --git a/app/views/nodes/_preview.html.erb b/app/views/nodes/_preview.html.erb new file mode 100644 index 0000000..e8d7b9f --- /dev/null +++ b/app/views/nodes/_preview.html.erb
@@ -0,0 +1,5 @@
		1	<div id="preview_disclaimer">
		2	<strong>Preview draft.</strong>
		3	Clicking on links will redirected you to the public site.
		4	<%= link_to 'Back to admin interface', nodes_path %>
		5	</div \ No newline at end of file


diff --git a/app/views/nodes/show.html.erb b/app/views/nodes/show.html.erb index dd37c28..67dd7fc 100644 --- a/app/views/nodes/show.html.erb +++ b/app/views/nodes/show.html.erb
@@ -1,5 +1,5 @@
1	<h1>Node</h1>	1	<h1>Node</h1>
2		2
3	<%= @node.unique_name %>	3	There is no draft to preview. Click <%= link_to 'edit', edit_node_path %> to
4		4	create one or view the currently
5	<%= link_to 'Edit', edit_node_path %> \ No newline at end of file	5	<%= link_to_path 'published version', @node.unique_path %>. \ No newline at end of file