0
@@ -2,10 +2,9 @@
0
 <!-- begin action nav -->
0
 <div id="page-nav">
0
   <ul id="act-nav" class="clear">
0
-    <li><%= link_to 'Edit',                :id => @article, :action => 'edit' %></li>
0
-    <li><%= link_to 'All Comments',        :filter => nil %></li>
0
-    <li><%= link_to 'Unapproved Comments', :filter => :unapproved %></li>
0
-    <li><%= link_to 'Approved Comments',   :filter => :approved %></li>
0
+    <li><%= link_to 'All',        :filter => nil %></li>
0
+    <li><%= link_to 'Unapproved', :filter => :unapproved %></li>
0
+    <li><%= link_to 'Approved',   :filter => :approved %></li>
0
     <li><%= link_to_remote 'Delete Visible', :confirm => "Are you sure you wish to delete all visible comments?",
0
       :url => { :action => 'destroy_comment', :id => @article }, :with => "ArticleForm.getAvailableComments().toQueryString('comment')"
0
     %></li>
0
@@ -29,30 +28,4 @@
0
 </div>
0
 <% end -%>
0
 
0
-<% content_for :sidebar do %>
0
-  <div class="sgroup">
0
-    <% unless Akismet.api_key && Akismet.blog -%>
0
-    <%= form_remote_tag :url => { :action => 'set_akismet' }, :html => { :id => 'akismet' } %>
0
-      <p>
0
-        Set an <%= link_to 'Akismet', 'http://akismet.com' %> to automatically approve spam.
0
-        <%= link_to_function 'How?', "Effect.toggle('akismet-how', 'blind')" %>
0
-      </p>
0
-      <pre id="akismet-how" style="display:none">
0
-    # database.yml
0
-    production:
0
-      adapter: postgresql
0
-      database: mephisto_dev
0
-      host: localhost
0
-      username: USERNAME
0
-      password: PASSWORD
0
-      min_messages: warning
0
-      akismet_api_key: APIKEY
0
-      akismet_blog: BLOG
0
-    </pre>
0
-      <p><label>API Key</label> <%= text_field_tag :api_key, Akismet.api_key %></p>
0
-      <p><label>Blog</label> <%= text_field_tag :blog, Akismet.blog %></p>
0
-      <p><%= submit_tag :Save %> without restarting.</p>
0
-    </form>
0
-    <% end -%>
0
-  </div>
0
-<% end -%>
0
+

0
@@ -36,6 +36,19 @@
0
     
0
   </dl>
0
 </div>
0
+
0
+<div id="spam" class="setgroup">
0
+  <h3>Spam prevention</h3>
0
+  <p>At the moment Mephisto uses <%= link_to 'Akismet', 'http://akismet.com' %> to automatically handle spam.</p>
0
+  <dl class="setform">
0
+    <dt><label>Akismet API Key</label></dt> 
0
+    <dd><%= text_field_tag :api_key, Akismet.api_key %></dd>
0
+    <dt><label>Blog url</label></dt> 
0
+    <dd><%= text_field_tag :blog, Akismet.blog %></dd>
0
+  </dl>
0
+</div>
0
+
0
+
0
 <p class="btns"><%= submit_tag 'Save and apply settings' %></p>
0
 <%= end_form_tag %>
0
     

0
@@ -313,6 +313,11 @@ input[type='text']:focus, textarea:focus {
0
   border-bottom: 1px dotted #ccc;
0
 }
0
 
0
+#main h3 {
0
+  font-size: 100%;
0
+  color: #033;
0
+}
0
+
0
 #main p {
0
   padding: 0 5px 5px 5px;
0
 }
0
@@ -752,7 +757,7 @@ img.avatar {
0
 }
0
 
0
 #overview {
0
-  margin: 0;
0
+  margin: 40px 0 0 0;
0
 }
0
 
0
 #overview h3 {