0
@@ -25,19 +25,13 @@
0
 </div>
0
 <!-- /end required fields -->
0
 
0
-
0
 <!-- begin optional fields -->
0
 <dl class="optional">
0
   <dt><%= label_tag 'article_created_at', 'Publish on this date:' %></dt>
0
   <dd><%= datetime_select 'article', 'published_at', :discard_year => true %></dd>
0
   <dt><label for="article_permalink">Permanent link</label></dt>
0
   <dd><%= form.text_field :permalink %></dd>
0
-  <dt><label for="article_filters">Article Markup</label></dt>
0
-  <dd>
0
-    <select name="article[filters][]" id="article_filters">
0
-      <%= options_for_select(filter_options, (@article.filters || []).first.to_s) %>
0
-    </select>
0
-  </dd>
0
+
0
 <% if false -%>
0
   <dt><strong><%= link_to_function("Invite people to review and revise this article&hellip;", "Element.toggle('invites');", :id => 'invite') %></strong></dt>
0
   <dd id="invites" class="indent-box" style="display:none;">
0
@@ -53,7 +47,23 @@
0
 <!-- /end optional fields -->
0
 
0
 <% content_for :sidebar do %>
0
-
0
+  <div class="sgroup">
0
+    <h3>Publish in these sections (FIXME)</h3>
0
+    <ul class="slist">
0
+      <% @sections.each do |section| %>
0
+        <li>
0
+          <%= check_box_tag 'article[section_ids][]', section.id, @article.has_section?(section), 
0
+                :id => "article_section_ids_#{section.id}" %>
0
+          <label for="article_section_ids_<%= section.id %>"><%= section.name %></label>
0
+        </li>
0
+      <% end %>
0
+    </ul>
0
+  </div>
0
+  
0
+  <div class="sgroup">
0
+    <h3>Comments</h3>
0
+    <p><%= check_box_tag 'allow_comments' %> Allow comments</p>
0
+  </div>
0
 <% end %>
0
 
0
 <%# observe_form "article-form", :frequency => 2, :with => %(Form.serialize('article-form')), :url => { :action => "live_preview" } %>      
0
\ No newline at end of file

0
@@ -1 +1 @@
0
-page["comment-#{@comment.id}"].visual_effect :drop_out
0
\ No newline at end of file
0
+page["comment-#{@comment.id}"].visual_effect :fade
0
\ No newline at end of file

0
@@ -1,4 +1,4 @@
0
-<h2>Creating a new article</h2>
0
+<!-- FIXME:  Closing tag for form needs to be after the sidebar content in order to add options to sidebar -->
0
 <% form_for :article, @article, :url => { :action => 'create' }, :html => {:id => 'article-form'} do |f| -%>
0
   <%= render :partial => 'form', :object => f %>
0
   
0
@@ -8,4 +8,5 @@
0
     <%= link_to "cancel", :controller => "articles" %>
0
     <%= hidden_field_tag 'draft', @draft.id if @draft %>
0
   </p>
0
-<% end -%>
0
\ No newline at end of file
0
+  
0
+<% end -%>

0
@@ -2,14 +2,14 @@
0
      :url => { :action => (@section.new_record? ? 'create' : 'update'), :id => @section }, :html => { :id => 'section-form' } do |f| %>
0
 <div class="group">
0
   <dl>
0
-    <dt><label for="section_name">Name</label></dt>
0
+    <dt><label for="section_name">Section name</label></dt>
0
     <dd><%= f.text_field :name, :class => 'big' %></dd>
0
-    <dt><label for="section_show_paged_articles">Type of Section</label></dt>
0
+    <dt><label for="section_show_paged_articles">Type of section</label></dt>
0
     <dd>
0
       <select id="section_show_paged_articles" name="section[show_paged_articles]" onchange="SectionForm.toggle_settings();">
0
         <%= options_for_select [
0
-              ['Area with multiple articles (blog)', '0'], 
0
-              ['Area with multiple pages (one article per page)', '1']], 
0
+              ['Section with multiple articles (blog)', '0'], 
0
+              ['Section with multiple pages (one article per page)', '1']], 
0
               (@section.show_paged_articles? ? '1' : '0') %>
0
       </select>
0
     </dd>

0
@@ -47,6 +47,8 @@
0
     <dd><%= text_field_tag :blog, Akismet.blog %></dd>
0
     <dt><label>Allow comments?</label></dt>
0
     <dd><%= check_box_tag 'allow_comments' %> Yes, I would like to accept comments.</dd>
0
+    <dt><label for="moderate_comments">Will you approve comments?</label></dt>
0
+    <dd><%= check_box_tag 'moderate_comments' %> Yes, All comments require approval before being published.</dd>
0
     <dt><label for="comment_lifetime">Close comments</label></dt>
0
     <dd>
0
       <select name="comment_lifetime">

0
@@ -35,9 +35,23 @@
0
         <% end -%>
0
       </div> 
0
       <!-- /div.nav -->  
0
+  	  
0
+  	  <!-- TODO: Figure out where to put this
0
+  	  <div id="search">
0
+    	    <form action="#">
0
+    	      <input type="text" name="q" />
0
+    	      <select name="context">
0
+    	        <%= options_for_select %w(Comments Articles) %>
0
+    	      </select>
0
+    	    </form>
0
+    	  </div>
0
+    	-->
0
+    	
0
     </div>
0
     <!-- /div.header -->
0
-      	
0
+  	
0
+
0
+      	  
0
     <div id="container">    
0
       
0
       <!-- div.content -->
0
@@ -73,6 +87,7 @@
0
       
0
       <!-- begin div.footer -->
0
       <div id="footer">
0
+
0
       </div>
0
     </div>
0
   </body>

0
@@ -10,6 +10,7 @@ body {
0
   font: normal 12px/1.5em "Lucida Grande", Lucida, Helvetica, sans-serif;
0
   background: #99D3D5;
0
   color: #333;
0
+  min-width: 950px;
0
 }
0
 
0
 ul, li, form, dt, dl, dd, ol, div, p, 
0
@@ -26,6 +27,12 @@ blockquote, h1, h2, h3, h4, h5, h6, a {
0
   padding-top: 1px;
0
 }
0
 
0
+#search {
0
+  position: absolute;
0
+  right: 10px;
0
+  top: 115px;
0
+}
0
+
0
 #container {
0
   margin: 0 auto;
0
   text-align: left;
0
@@ -68,8 +75,10 @@ a:hover {
0
   margin: 0 0;
0
   padding: 4px;
0
   min-height: 40px;
0
-  color: #cfc;
0
+  font-size: 90%;
0
   text-align: center;
0
+  width: 68%;
0
+  color: #366;
0
 }
0
 
0
 
0
@@ -917,8 +926,8 @@ h3.withcontrol {
0
 }
0
 
0
 .group {
0
-  background: #eee;
0
-  border: 1px solid #ccc;
0
+  background: #f3f3f3;
0
+  border-top: 4px solid #ccc;
0
   padding: 10px;
0
   margin: 20px 0;
0
 }