wiki page, comment views

app/views/wiki_pages/_form.html.erb

@@ -1,8 +1,27 @@
-<% if @wiki_page.new_record? || CurrentUser.is_moderator? %>
-  <%= f.input :title %>
-<% end %>
-<%= f.input :body %>
-<% if CurrentUser.is_janitor? %>
-  <%= f.input :is_locked %>
-<% end %>
-<%= f.button :submit, "Save" %><%= f.button :submit, "Cancel" %><%= f.button :submit, "Preview" %>  
+<div id="form-content">
+  <%= error_messages_for("wiki_page") %>
+
+  <%= simple_form_for(@wiki_page) do |f| %>
+    <%= f.input :title %>
+    <%= f.input :body %>
+
+    <% if CurrentUser.is_janitor? %>
+      <%= f.input :is_locked %>
+    <% end %>
+
+    <%= f.button :submit, "Submit" %>
+    <%= f.button :submit, "Preview" %>
+  <% end %>
+</div>
+
+<div id="form-aside">
+  <div id="preview">
+    <div class="content dtext">
+      
+    </div>
+    <p><a href="#" name="toggle-preview">Hide</a></p>
+  </div>
+  <div id="dtext-help">
+    <%= render "dtext/help" %>
+  </div>
+</div>

app/views/wiki_pages/edit.html.erb

@@ -1,19 +1,11 @@
 <div id="c-wiki-pages">
   <div id="a-edit">
     <%= render "sidebar" %>
-
+    
     <section id="content">
-      <h1 id="wiki-page-title"><%= @wiki_page.pretty_title %> (Editing)</h1>
-
-      <div id="preview" class="dtext">
-      </div>
-
-      <%= simple_form_for(@wiki_page) do |f| %>
-        <%= render :partial => "form", :locals => {:f => f} %>
-      <% end %>
+      <%= render "form" %>
     </section>
-
-    <%= render "secondary_links" %>    
   </div>
 </div>
 
+<%= render "secondary_links" %>    

app/views/wiki_pages/index.html.erb

@@ -3,7 +3,7 @@
     <%= render :partial => "sidebar" %>
 
     <section id="content">
-      <table>
+      <table class="striped" width="100%">
         <tr>
           <th>Title</th>
           <th>Last edited</th>

app/views/wiki_pages/new.html.erb

@@ -1,16 +1,9 @@
 <div id="c-wiki-pages">
   <div id="a-new">
     <%= render "sidebar" %>
-
+    
     <section id="content">
-      <h1>New Wiki Page</h1>
-
-      <div id="preview" class="dtext">
-      </div>
-
-      <%= simple_form_for(@wiki_page) do |f| %>
-        <%= render :partial => "form", :locals => {:f => f} %>
-      <% end %>
+      <%= render "form" %>
     </section>
   </div>
 </div>