6 files changed, 25 insertions, 9 deletions
diff --git a/app/views/layouts/admin.html.erb b/app/views/layouts/admin.html.erb
index 840c37c..bede781 100644
--- a/app/views/layouts/admin.html.erb
+++ b/app/views/layouts/admin.html.erb
@@ -20,7 +20,8 @@
      theme_advanced_buttons2 : "",
      theme_advanced_buttons3 : "",
      extended_valid_elements : "aggregate[tags|limit|order_by|order_direction|partial]",
-      relative_urls : false
+      relative_urls : false,
+      entity_encoding : "raw"
    });
    </script>
  </head>
diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb
index be7e044..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>
@@ -25,19 +26,19 @@
            <div id="topnav">
                <ul id="navlist">
                    <li>
-                        <a href="<%= params[:locale] %>/club">Kennenlernen</a>
+                      <%= link_to_path "Kennenlernen", "club" %>
                    </li>
                    <li>
                        &bull;
                    </li>
                    <li>
-                        <a href="<%= params[:locale] %>/support">Unterstützen</a>
+                      <%= link_to_path "Unterstützen", "support" %>
                    </li>
                    <li>
                        &bull;
                    </li>
                    <li>
-                        <a href="<%= params[:locale] %>/contact">Erreichen</a>
+                      <%= link_to_path "Erreichen", "contact" %>
                    </li>
                    <% if current_user %>
                    <li>
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/edit.html.erb b/app/views/nodes/edit.html.erb
index 929bbf6..2dade0f 100644
--- a/app/views/nodes/edit.html.erb
+++ b/app/views/nodes/edit.html.erb
@@ -13,9 +13,14 @@
    <%= f.error_messages %>
    
    <% fields_for @draft do |d| %>
+    
+    <p>
+      <%= d.label :published_at %><br />
+      <%= d.datetime_select :published_at %>
+    </p>
    <p>
      <%= d.label :template_name %>
-      <%= d.select :template_name, custom_page_templates %>
+      <%= d.select :template_name, custom_page_templates, {:prompt => 'Select Template'} %>
    </p>
    <p>
      <%= d.label :title %><br />
diff --git a/app/views/nodes/index.html.erb b/app/views/nodes/index.html.erb
index 833ffed..a2a42b1 100644
--- a/app/views/nodes/index.html.erb
+++ b/app/views/nodes/index.html.erb
@@ -11,6 +11,7 @@
      <th class="path">Path</th>
      <th class="actions">Actions</th>
      <th class="editor">Locked by</th>
+      <th class="revision">Rev.</th>
    </tr>
    <% @nodes.each do |node| %>
    <tr class="<%= cycle("even", "odd") %>">
@@ -29,6 +30,9 @@
      <td>
        <%= "#{node.draft.user.login}" if node.draft && node.draft.user %>
      </td>
+      <td>
+        <%= node.head.revision if node.head %>
+      </td>
    </tr>
    <% end %>
  </table>
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/views/layouts/admin.html.erb b/app/views/layouts/admin.html.erb index 840c37c..bede781 100644 --- a/app/views/layouts/admin.html.erb +++ b/app/views/layouts/admin.html.erb
@@ -20,7 +20,8 @@
20	theme_advanced_buttons2 : "",	20	theme_advanced_buttons2 : "",
21	theme_advanced_buttons3 : "",	21	theme_advanced_buttons3 : "",
22	extended_valid_elements : "aggregate[tags\|limit\|order_by\|order_direction\|partial]",	22	extended_valid_elements : "aggregate[tags\|limit\|order_by\|order_direction\|partial]",
23	relative_urls : false	23	relative_urls : false,
		24	entity_encoding : "raw"
24	});	25	});
25	</script>	26	</script>
26	</head>	27	</head>


diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index be7e044..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>
@@ -25,19 +26,19 @@
25	<div id="topnav">	26	<div id="topnav">
26	<ul id="navlist">	27	<ul id="navlist">
27	<li>	28	<li>
28	<a href="<%= params[:locale] %>/club">Kennenlernen</a>	29	<%= link_to_path "Kennenlernen", "club" %>
29	</li>	30	</li>
30	<li>	31	<li>
31	•	32	•
32	</li>	33	</li>
33	<li>	34	<li>
34	<a href="<%= params[:locale] %>/support">Unterstützen</a>	35	<%= link_to_path "Unterstützen", "support" %>
35	</li>	36	</li>
36	<li>	37	<li>
37	•	38	•
38	</li>	39	</li>
39	<li>	40	<li>
40	<a href="<%= params[:locale] %>/contact">Erreichen</a>	41	<%= link_to_path "Erreichen", "contact" %>
41	</li>	42	</li>
42	<% if current_user %>	43	<% if current_user %>
43	<li>	44	<li>


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/edit.html.erb b/app/views/nodes/edit.html.erb index 929bbf6..2dade0f 100644 --- a/app/views/nodes/edit.html.erb +++ b/app/views/nodes/edit.html.erb
@@ -13,9 +13,14 @@
13	<%= f.error_messages %>	13	<%= f.error_messages %>
14		14
15	<% fields_for @draft do \|d\| %>	15	<% fields_for @draft do \|d\| %>
		16
		17	<p>
		18	<%= d.label :published_at %><br />
		19	<%= d.datetime_select :published_at %>
		20	</p>
16	<p>	21	<p>
17	<%= d.label :template_name %>	22	<%= d.label :template_name %>
18	<%= d.select :template_name, custom_page_templates %>	23	<%= d.select :template_name, custom_page_templates, {:prompt => 'Select Template'} %>
19	</p>	24	</p>
20	<p>	25	<p>
21	<%= d.label :title %><br />	26	<%= d.label :title %><br />


diff --git a/app/views/nodes/index.html.erb b/app/views/nodes/index.html.erb index 833ffed..a2a42b1 100644 --- a/app/views/nodes/index.html.erb +++ b/app/views/nodes/index.html.erb
@@ -11,6 +11,7 @@
11	<th class="path">Path</th>	11	<th class="path">Path</th>
12	<th class="actions">Actions</th>	12	<th class="actions">Actions</th>
13	<th class="editor">Locked by</th>	13	<th class="editor">Locked by</th>
		14	<th class="revision">Rev.</th>
14	</tr>	15	</tr>
15	<% @nodes.each do \|node\| %>	16	<% @nodes.each do \|node\| %>
16	<tr class="<%= cycle("even", "odd") %>">	17	<tr class="<%= cycle("even", "odd") %>">
@@ -29,6 +30,9 @@
29	<td>	30	<td>
30	<%= "#{node.draft.user.login}" if node.draft && node.draft.user %>	31	<%= "#{node.draft.user.login}" if node.draft && node.draft.user %>
31	</td>	32	</td>
		33	<td>
		34	<%= node.head.revision if node.head %>
		35	</td>
32	</tr>	36	</tr>
33	<% end %>	37	<% end %>
34	</table>	38	</table>


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