typo 5.1.3 → 5.1.98

data/app/views/admin/dashboard/_overview.html.erb

@@ -1,4 +1,9 @@
 <div class="dashboard">
-  <p>This place gives you a quick overview of what happens on your Typo blog and what you can do. Maybe will you want to <%= link_to(_('write a post'), :controller => 'content', :action => 'new') %>, <%= link_to(_('write a page'), :controller => 'page', :action => 'new') %>, or <%= link_to(_("Update your profile or change your password"), :controller => 'users', :action => 'edit', :id => session[:user_id]) -%>.</p>
-  <p>You can also do a bit of design and <%= link_to(_("Change your blog presentation"), :controller => 'themes') -%> or <%= link_to(_("enable plugins"), :controller => 'sidebar') -%>.</p>
+  <p> <%= _("This place gives you a quick overview of what happens on your Typo blog and what you can do. Maybe will you want to %s , %s or %s." , 
+            link_to(_('write a post'), :controller => 'content', :action => 'new'), 
+            link_to(_('write a page'), :controller => 'page', :action => 'new') , 
+            link_to(_("Update your profile or change your password"), :controller => 'users', :action => 'edit', :id => session[:user_id]) ) -%>.</p>
+  <p> <%= _("You can also do a bit of design, %s or %s." ,
+            link_to(_("Change your blog presentation"), :controller => 'themes') , 
+            link_to(_("enable plugins"), :controller => 'sidebar') ) -%></p>
 </div>

data/app/views/admin/dashboard/_sysinfo.html.erb

@@ -1,13 +1,13 @@
 <div class="dashboard-small">
   <h3><%= _("System information") %></h3>
   <ul> 
-    <li>You're running Typo <%= TYPO_VERSION %></li>
+    <li><%= _("You're running Typo %s", TYPO_VERSION) %></li>
   </ul>
   <h3><%= _("Statistics") %></h3>
   <ul> 
-    <li <%= alternate_class %>>Total posts : <%= @statposts %></li>
-    <li <%= alternate_class %>>Your posts : <%= @statuserposts %></li>
-    <li <%= alternate_class %>>Total comments : <%= @statcomments %></li>
-    <li <%= alternate_class %>>Spam comments : <%= @statspam %></li>
+    <li <%= alternate_class %>> <%= _("Total posts : %d", @statposts) %></li>
+    <li <%= alternate_class %>> <%= _("Your posts : %d" , @statuserposts) %></li>
+    <li <%= alternate_class %>> <%= _("Total comments : %d" , @statcomments) %></li>
+    <li <%= alternate_class %>> <%= _("Spam comments : %d" , @statspam) %></li>
   </ul>
 </div>

data/app/views/admin/dashboard/_typo_dev.html.erb

@@ -0,0 +1,21 @@
+<div class="dashboard">
+  <h3><%= _("Last news from Typo development blog") %></h3>
+  <% if @typo_links.nil? %>
+    <%= _('You have no internet connection') %>
+  <% else %>
+    <ul>
+      <% if @typo_links.size == 0 %>
+        <li <%= alternate_class %>><%= _("Oh no, nothing new") %></li>
+      <% else %>
+        <% @typo_links.each do |link| -%>
+          <li <%= alternate_class %>>
+            <%= link_to("<strong>#{link.title}</strong><br /", link.link) %>
+            <%= "#{link.date}<br />" %>
+            <%= link.description.strip_html.slice(0, 200) %>
+          </li>
+        <% end %>
+      <% end %>
+    </ul>
+  <% end %>
+  <hr />
+</div>

data/app/views/admin/dashboard/_welcome.html.erb

@@ -1,3 +1,3 @@
 <div class="dashboard-small">
-  Welcome<br /> back, <%= current_user.name %>!
+  <%=  _("Welcome back, %s!" ,current_user.name ) -%>
 </div>

data/app/views/admin/dashboard/index.html.erb

@@ -1,17 +1,14 @@
-<% content_for('tasks') do %>
-<%= subtab _("Typo documentation"), "", "http://typosphere.org/main_page" %>
-<% end %> 
-
-<hr />
-
-<%= render_partial "welcome" %>
-<%= render_partial "overview" %>
-
-<hr />
-
-<%= render_partial "sysinfo" %>
-<%= render_partial "comments" %>
-<%= render_partial "posts" %>
-<%= render_partial "popular" %>
-
-<hr />
+<div id="dashboard">
+  <%= render :partial => "welcome" %>
+  <%= render :partial => "overview" %>
+
+  <hr />
+
+  <%= render :partial => "sysinfo" %>
+  <%= render :partial => "inbound" %>
+  <%= render :partial => "comments" %>
+  <%= render :partial => "posts" %>
+  <%= render :partial => "popular" %>
+  <%= render :partial => "typo_dev" %>
+  <hr />
+</div>

data/app/views/admin/feedback/_button.html.erb

@@ -1,8 +1,9 @@
 <p>
   <%= hidden_field_tag "confirmed", params[:confirmed] %>
   <%= hidden_field_tag "published", params[:published] %>
-  <%= submit_tag "Delete Checked Items", {:class => 'submit'} %> &nbsp;
-  <%= submit_tag "Mark Checked Items as Ham", {:class => 'submit'} %>
-  <%= submit_tag "Mark Checked Items as Spam", {:class => 'submit'} %>
-  <%= submit_tag "Confirm Classification of Checked Items", {:class => 'submit'} %>
+  <%= hidden_field_tag "bulkop", "",{:id=>"bulkop"} %>
+  <%= submit_tag _("Delete Checked Items"), {:class => 'submit',:onclick=>"getElementById('bulkop').value='Delete Checked Items'"} %> &nbsp;
+  <%= submit_tag _("Mark Checked Items as Ham"), {:class => 'submit',:onclick=>"getElementById('bulkop').value='Mark Checked Items as Ham'"} %>
+  <%= submit_tag _("Mark Checked Items as Spam"), {:class => 'submit',:onclick=>"getElementById('bulkop').value='Mark Checked Items as Spam'"} %>
+  <%= submit_tag _("Confirm Classification of Checked Items"), {:class => 'submit', :onclick=>"getElementById('bulkop').value='Confirm Classification of Checked Items'"} %>
 </p>

data/app/views/admin/{comments → feedback}/_form.html.erb

@@ -1,5 +1,6 @@
 
 <%= error_messages_for 'comment' %>
+<%= hidden_field_tag 'article_id', @article.id %>
 <ul class="set admin" id="comment">
   <li>
     <label for="comment_author" class="block content"><%= _("Author")%></label>

data/app/views/admin/feedback/_item.html.erb

@@ -1,14 +1,12 @@
 <tr <%= alternate_class %>>
   <td class="field first"><input class= "feedback_check" type="checkbox" name="feedback_check[<%= item.id %>]"/></td>
   <td class="field"><%= item.state %></td>
-  <td class="field"><%= link_to_article_edit item.article %></td>
+  <td class="field"><%= link_to item.article.title, :controller => 'feedback', :action => 'article', :id => item.article_id %></td>
   <td class="field">
     <%= link_to_unless item.url.blank?, ((item.author || '(unknown)').slice(0,40)), item.url %><br />
     <%=h item.email.to_s.slice(0,40) %>
   </td>
-  <td class="field"><%=h truncate(item.body,100)%></td>
+  <td class="field" id="feedback_<%=item.id%>">
+    <%=link_to_remote(h(truncate(item.body, :length => 100)), :url => { :action => 'preview', :id => item.id })%></td>
   <td class="field"><%=h item.ip %></td>
-  <td class="operation"><%= link_to image_tag('admin/show.png', :alt => "show", :title => "Show content"), :controller => (item.class.to_s == 'Comment') ? 'comments' : 'trackbacks', :article_id => item.article_id, :action => 'show', :id => item.id %></td>
-  <td class="operation"><%= link_to image_tag('admin/edit.png', :alt => "edit", :title => "Edit content"), :controller => 'comments', :article_id => item.article_id, :action => 'edit', :id => item.id %></td>
-  <td class="operation last"><%= link_to image_tag('admin/delete.png'), {:action => 'delete', :id => item.id, :search => params[:search], :page => params[:page] },  :confirm => "Are you sure?", :method => :post %></td>
 </tr>

data/app/views/admin/feedback/article.html.erb

@@ -0,0 +1,33 @@
+<% @page_heading = _("Comments for %s (%s)","#{ link_to h(@article.title), :controller => '/admin/content', :action => 'new', :id => @article.id }","#{ link_to _('add a comment'), '#comment' }") %>
+
+<% content_for (:tasks) do %>
+  <%= subtab(_('All comments'),'', {:action => :article, :id => @article.id, :ham => 'y', :spam => 'y'} ) %>
+  <%= subtab(_('Limit to ham'), '', {:action => :article, :id => @article.id, :ham => 'y'}) %>
+  <%= subtab(_('Limit to spam'), '', {:action => :article, :id => @article.id, :spam => 'y'}) %>
+<% end %>
+
+<div class="list">
+  <ol>
+  <% for comment in @comments -%>
+    <li <%= alternate_class %>>
+      <p><strong><%= mail_to h(comment.email), h(comment.author) %></strong> |
+      <%= link_to_unless comment.url.blank?, h(comment.url), comment.url %> | 
+      IP: <%=h comment.ip %></p>
+      <%= comment.body %>
+      <p>
+        <%= comment.created_at.strftime("%m/%d/%Y %H:%M") %> – [ 
+        <%= link_to_edit _("Edit"), comment %> | 
+        <%= link_to _("Delete") , {:action => 'delete', :id => comment.id, :search => params[:search], :page => params[:page] },  :confirm => _("Are you sure?"), :method => :post %> |
+        <%= comment.state %> ]
+      </p>
+    </li>
+  <% end -%>
+  </ol>
+</div>
+
+<hr />  
+
+<% form_tag :action => "create" do %>
+  <%= render :partial => "form" %>
+  <%= cancel_or_save %>
+<% end %>

data/app/views/admin/feedback/edit.html.erb

@@ -0,0 +1,10 @@
+<% @page_heading = _("Comments for") + " #{ link_to h(@comment.article.title), :controller => '/admin/content', :action => 'new', :id => @comment.article.id }" %>
+
+<% form_tag :action => "update", :id => @comment.id do %>
+
+  <div class="admin set">
+    <%= render :partial => "form" %>
+  </div>
+
+  <%= cancel_or_save %>
+<% end %>

data/app/views/admin/feedback/index.html.erb

@@ -1,40 +1,37 @@
-<% @page_heading = _("Comments and Trackbacks for") + " #{ this_blog.settings['blog_name'] }" %>
+<% @page_heading =  _("Feedback for") + " #{ this_blog.settings['blog_name'] }" %>
 <% subtabs_for(:feedback) %>
 
 <div class="search">
   <% form_tag({:action => 'index'}, :method => :get) do %>
-    <label for="search"><%= _("Search Comments and Trackbacks that contain")%>...:</label><br /> 
-	<input type="text" id="feedback_search" name="search" value="<%=h params[:search] %>" size="30" />
-	<%= submit_tag "Search" %>
+  <label for="search"><%= _("Search Comments and Trackbacks that contain")%>...:</label><br /> 
+  <input type="text" id="feedback_search" name="search" value="<%=h params[:search] %>" size="30" />
+  <%= submit_tag _("Search") %>
   <% end %>
 </div>
 
 <div class="list">
   <% form_tag({:action => 'bulkops'}, :method => :post) do %>
-    <%= render :partial => 'button' %>
-	
+  <%= render :partial => 'button' %>
+
   <%= hidden_field_tag "search", params[:search]%>
   <%= hidden_field_tag "page", params[:page]%>
   <table>
-  <tr class="first">
- 	<th class="first"><input class="feedback_check" type="checkbox" name="checkall" id="checkall" onclick="check_all(this);"/></th>
-	<th><%= _("Status")%></th>
-	<th><%= _("Article")%></th>
-    <th><%= _("Author")%></th>
-    <th><%= _("Comment Excerpt")%></th>
-    <th><%= _("IP")%></th>
-		<th><%= _("View")%></th>
-		<th><%= _("Edit")%></th>
-    <th class="last"><%= _("Delete") %></th>
-  </tr>
-  <%= render :partial => 'item', :collection => @feedback %>
+    <tr>
+      <th><input class="feedback_check" type="checkbox" name="checkall" id="checkall" onclick="check_all(this);"/></th>
+      <th><%= _("Status")%></th>
+      <th><%= _("Article")%></th>
+      <th><%= _("Author")%></th>
+      <th><%= _("Comment Excerpt")%></th>
+      <th><%= _("IP")%></th>
+    </tr>
+    <tr class="menubar">
+      <td colspan="6">&nbsp;</td>
+    </tr>
+    <%= render :partial => 'item', :collection => @feedback %>
+    <tr><td class="paginate" colspan="9"><%= will_paginate @feedback %></td></tr>
   </table>
-	<div class="paginate">
-		<%= link_to _("Previous page"), { :page => @pages.current.previous, :search => params[:search] } if @pages.current.previous %>
-		<%= pagination_links(@pages, :params => {:search => params[:search]}) %>
-		<%= link_to _("Next page"), { :page => @pages.current.next, :search => params[:search] } if @pages.current.next %>
-	</div>
-    <%= render :partial => 'button' %>
+
+  <%= render :partial => 'button' %>
   <% end %>
 </div>
 

data/app/views/admin/pages/_form.html.erb

@@ -6,33 +6,25 @@
     <%= text_field 'page', 'title', :class => 'large'  %>
   </li>
   <li>
-    <label for="page_body" class="block content"><%= _("Content")%></label>
-    <%= t_textarea 'page', 'body', {:height => '300', :class => 'large'} %> 
-  </li>
-  <li class="paginate l">
-    <label for="options">
-      <%= link_to_function _("Options") + " (+/-)",update_page { |page| page.visual_effect(:toggle_blind, "options", :duration => 0.2) } %>
-    </label>
-    <ul>
-      <li id="options" style='display: none;'>
-        <ul>
-          <li>
-            <label for="page_name" class="float"><%= _("Permalink")%>:</label>
-            <%= text_field 'page', 'name', :size => 25  %>
-          </li>
-          <li>
-            <label for="page_published" class="float"><%= _("Online")%>:</label>
-            <%= check_box 'page', 'published'  %>
-            <%= hidden_field_tag 'text_filter', this_blog.text_filter %>
-          </li>
-        </ul>
-      </li>
-    </ul>
+    <div style="float: right; width: 230px;">
+      <label class="block content"><%= _("Options") %></label>
+      <p class="paginate r paginate_1">
+          <label for="page_name"><%= _("Permalink")%>:</label><br />
+          <%= text_field 'page', 'name', :size => 25  %>
+          <label for="page_published"><%= _("Online")%>:</label>
+          <%= check_box 'page', 'published'  %><br />
+        <%= link_to_destroy_with_profiles @page%>
+        <%= save( _("Publish") + " &raquo;") %>
+      </p>
+    </div>
+    <div id="editor">
+      <label for="page_body" class="block content"><%= _("Content")%></label>
+      <% unless current_user.editor == 2 -%>
+        <script type="text/javascript">edToolbar('page_body');</script>
+      <% end -%>
+      <%= t_textarea 'page', 'body', {:height => '300', :class => 'large'} %> 
+      <%= render_macros(@macros) unless current_user.editor == 2 %>
+    </div>
+    <%= hidden_field_tag 'text_filter', this_blog.text_filter %>
   </li>
 </ul>
-
-<p class="paginate r">
-  <%= save("Publish" + " &raquo") %>
-</p>
-
-<!--[eoform:pages]-->

data/app/views/admin/pages/_pages.html.erb

@@ -1,49 +1,38 @@
 <% form_tag({:action => 'index'}, :method => :get, :name => 'search') do %>
 <table cellspacing="1" cellpadding="0">
-  <tr class="first">
+  <tr>
     <th><%= _("Title") %></th>
-    <th><%= _("Permalink")%></th>
     <th><%= _("Date") %></th>
     <th><%= _("Author")%></th>
     <th><%= _("Status") %></th>
-    <th><%= _("Preview")%></th>
-    <th><%= _("Edit")%></th>
-    <th><%= _("Delete")%></th>
+    <th><%= _("Permalink")%></th>
   </tr>
   <tr class="menubar">
-    <td colspan=2>&nbsp;</td>
+    <td>&nbsp;</td>
     <td>
     <%= collection_select_with_current(:search, :published_at, Page.find_by_published_at, "publication", "publication", @search[:published_at].to_s, true) %>      
     </td>
     <td><%= collection_select_with_current(:search, :user_id, User.find(:all), "id", "name", @search[:user_id].to_i, true) %></td>
     <td>
       <select name="search[published]">
-        <option value="">Please select</option>
-        <option value="0">Unpublished</option>
-        <option value="1">Published</option>
+        <%= options_for_select([[_("Please select"), ""], [_("Unpublished"), "0"], [ _("Published"), "1"]], @search[:published]) %>
       </select>
     </td>
-    <td colspan="3"><input type="submit" value="Filter" />
+    <td><input type="submit" value="<%= _("Filter") %>" />
   </tr>
-  <%= render_void_table(@pages.size, 8)  %>
+  <%= render_void_table(@pages.size, 5)  %>
 
   <% for page in @pages %>
   <tr <%= alternate_class %>>
-    <td><%= link_to_permalink(page, page.title) %></td>
-    <td><%= page.name%></td>
-    <td><%= page.created_at.strftime('%d/%m/%Y at %H:%M') %></td>
+    <td><%= link_to_edit_with_profiles page.title, page %></td>
+    <td><%= page.created_at.strftime('%d/%m/%Y') %></td>
     <td><%= author_link(page) %></td>
-    <td class="operation">
-    <% if page.published? %>
-    <%= image_tag('admin/checked.png', :alt => "online", :title => _("Online")) %>
-    <% else %>
-    <%= image_tag('admin/cancel.png', :alt => "offline", :title => _("Offline"))  %>
-    <% end %>
-    </td>
-    <td class='operation'><%= link_to_show page %></td>
-    <td class='operation'><%= link_to_edit_with_profiles page %></td>
-    <td class="operation"><%= link_to_destroy_with_profiles page %></td>
+    <td><%= link_to_published page %></td>
+    <td><%= page.name%></td>
   </tr>
   <% end %>
+  <tr>
+    <td colspan="5"><%= will_paginate @pages %></td>
+  </tr>
   </table>
-<% end %>
+<% end %>

data/app/views/admin/resources/_metadata_edit.html.erb

@@ -1,7 +1,7 @@
 <% form_tag({ :action => "update" }, :id => id, :enctype => "multipart/form-data") do %>
 <div class="form">
   <b><%= _("Resource MetaData")%></b><br />
-  <%= link_to _("Remove iTunes Metadata"), { :action => "remove_itunes_metadata", :id => resource.id}, :confirm => "Are you sure?"%><br />
+  <%= link_to _("Remove iTunes Metadata"), { :action => "remove_itunes_metadata", :id => resource.id}, :confirm => _("Are you sure?")%><br />
     <label for="resource_itunes_author_<%= id %>"><%= _("Author")%>:</label><br />
     <input name="resource[itunes_author]" size="25" id="resource_itunes_author_<%= id %>" type="text" value="<%=h resource.itunes_author %>" /><br />
     <label for="resource_itunes_subtitle_<%= id %>"><%= _("Subtitle")%>:</label><br />

data/app/views/admin/resources/_resources.html.erb

@@ -1,16 +1,19 @@
 <table>
-<tr class="first">
+<tr>
   <th><%= _("Filename")%> <small>(<%= _('right-click for link')%>)</small></th>
   <th><%= _("Content Type")%></th>
   <th><%= _("MetaData")%></th>
   <th><%= _("File Size")%></th>
   <th><%= _("Date")%></th>
-  <th class="last"><%= _("Delete")%></th>
+  <th><%= _("Delete")%></th>
 </tr>
-<% blog_root = request.relative_url_root -%>
+<tr class="menubar">
+  <td colspan="6">&nbsp;</td>
+</tr
+>
 <% for upload in resources -%>
 <tr <%= alternate_class -%>>
-  <td><%= link_to "#{upload.filename}", "#{blog_root}/files/#{upload.filename}" -%></td>
+  <td><%= link_to "#{upload.filename}", "#{this_blog.base_url}/files/#{upload.filename}" -%></td>
   <td>
     <%= task_edit_resource_mime(upload.mime, upload.id) %>
     <div id="edit-resource-mime-<%= upload.id %>" style="display:none;position:absolute;">
@@ -34,7 +37,7 @@
   <% end -%>
   <td><%=h upload.size rescue 0 -%> bytes</td>
   <td><%=h upload.created_at.strftime('%Y-%m-%d %H:%M:%S') -%></td>
-  <td class="operation"><%= link_to image_tag('admin/delete.png'), {:action => 'destroy', :id => upload.id, :search => params[:search], :page => params[:page] },  :confirm => "Are you sure?", :method => :post %></td>
+  <td class="operation"><%= link_to _("delete"), {:action => 'destroy', :id => upload.id, :search => params[:search], :page => params[:page] },  :confirm => _("Are you sure?"), :method => :post %></td>
     
 </tr>  
 <% end -%>

data/app/views/admin/resources/index.html.erb

@@ -5,8 +5,6 @@
     <%= render :partial => 'resources' -%>
   </div>
 	<div class="paginate">
-		<%= link_to _("Previous page"), { :page => @resources_pages.current.previous } if @resources_pages.current.previous %>
-		<%= pagination_links(@resources_pages) %>
-		<%= link_to _("Next page"), { :page => @resources_pages.current.next } if @resources_pages.current.next %>
+    <%= will_paginate @resources %>
 	</div>
 	

data/app/views/admin/settings/_submit.html.erb

@@ -1,3 +1,3 @@
-<div id="operations" class="paginate r">
-  <%= save(_("Save Settings")) %>
+<div class="paginate r">
+  <%= save(_("Save")) %>
 </div>

data/app/views/admin/settings/feedback.html.erb

@@ -1,59 +1,96 @@
-	<% @page_heading = _('Feedback') %>
-  <% subtabs_for(:settings) %>
-	<% form_tag :action => 'feedback' do %>
+<% @page_heading = _('Feedback') %>
+<% subtabs_for(:settings) %>
 
+<% form_tag :action => 'update' do %>
 <div class="admin">
-	<fieldset id="discuss" class="set">
-		<legend><%= _("Feedback")%></legend>
-		<ul>
-			<li class="checkbox">
-		        <label class="float" for="default_allow_pings"><%= _("Enable Trackbacks by default")%>:</label>
-		      	<input name="setting[default_allow_pings]" id="default_allow_pings" type="checkbox" value="1" <%= 'checked="checked"' if this_blog.default_allow_pings%> />
-		      	<input name="setting[default_allow_pings]" type="hidden" value="0" />
-			</li>
-			<li class="checkbox">
-	        	<label class="float" for="default_allow_comments"><%= _("Enable comments by default")%>:</label>
-				<input name="setting[default_allow_comments]" id="default_allow_comments" type="checkbox" value="1" <%= 'checked="checked"' if this_blog.default_allow_comments%> />
-		      	<input name="setting[default_allow_comments]" type="hidden" value="0" />
-			</li>
-			<li class="checkbox">
-		      <label class="float" for="use_gravatar"><%= _("Enable gravatars")%>:</label>
-		      <input name="setting[use_gravatar]" id="use_gravatar" type="checkbox" value="1" <%= 'checked="checked"' if this_blog.use_gravatar %> />
-		      <input name="setting[use_gravatar]" type="hidden" value="0" />
-			</li>
+  <fieldset id="discuss" class="set">
+    <legend><%= _("Feedback")%></legend>
+    <ul>
+      <li class="checkbox">
+        <label class="float" for="default_allow_pings"><%= _("Enable Trackbacks by default")%>:</label>
+        <input name="setting[default_allow_pings]" id="default_allow_pings" type="checkbox" value="1" <%= 'checked="checked"' if this_blog.default_allow_pings%> />
+        <input name="setting[default_allow_pings]" type="hidden" value="0" />
+      </li>
+      <li class="checkbox">
+        <label class="float" for="default_allow_comments"><%= _("Enable comments by default")%>:</label>
+        <input name="setting[default_allow_comments]" id="default_allow_comments" type="checkbox" value="1" <%= 'checked="checked"' if this_blog.default_allow_comments%> />
+        <input name="setting[default_allow_comments]" type="hidden" value="0" />
+      </li>
+      <li class="checkbox">
+        <label class="float" for="use_gravatar"><%= _("Enable gravatars")%>:</label>
+        <input name="setting[use_gravatar]" id="use_gravatar" type="checkbox" value="1" <%= 'checked="checked"' if this_blog.use_gravatar %> />
+        <input name="setting[use_gravatar]" type="hidden" value="0" />
+      </li>
       <li>
-          <%= _("This setting allows you to disable trackbacks for every article in your blog.  It won't remove existing trackbacks, but it will prevent any further attempt to add a trackback anywhere on your blog.")%>
+        <%= _("This setting allows you to disable trackbacks for every article in your blog.  It won't remove existing trackbacks, but it will prevent any further attempt to add a trackback anywhere on your blog.")%>
       </li>
       <li class="checkbox">
-          <label class="float" for="global_pings_disable"><%= _("Disable trackbacks site-wide")%>:</label>
-          <input name="setting[global_pings_disable]" id="global_pings_disable" type="checkbox" value="1" <%= 'checked="checked"' if this_blog.global_pings_disable%> />
-          <input name="setting[global_pings_disable]" type="hidden" value="0" />
+        <label class="float" for="global_pings_disable"><%= _("Disable trackbacks site-wide")%>:</label>
+        <input name="setting[global_pings_disable]" id="global_pings_disable" type="checkbox" value="1" <%= 'checked="checked"' if this_blog.global_pings_disable%> />
+        <input name="setting[global_pings_disable]" type="hidden" value="0" />
       </li>
       <li><%= _("You can enable site wide feeback moderation. If you do so, no comment or trackback will appear on your blog unless you validate it")%>.</li>
       <li class="checkbox">
-          <label class="float" for="default_moderate_comments"><%= _("Enable feedback moderation")%>:</label>
-          <input name="setting[default_moderate_comments]" id="default_moderate_comments" type="checkbox" value="1" <%= 'checked="checked"' if this_blog.default_moderate_comments %> />
-          <input name="setting[default_moderate_comments]" type="hidden" value="0" />
-      </li>
-      <li class="checkbox">
-          <label class="float" for="link_to_author"><%= _("Show your email address") %>:</label>
-          <input name="setting[link_to_author]" id="link_to_author" type="checkbox" value="1" <%= 'checked="checked"' if this_blog.link_to_author%> />
-          <input name="setting[link_to_author]" type="hidden" value="0" />
-      </li>
-		</ul>
-	</fieldset>
-	
-	<fieldset id="notification" class="set">
-      <legend><%= _("Notification")%></legend>
-      <ul>
-          <li><%= _("Typo can notify you when new articles or comments are posted")%></li>
-          <li>
-              <label class="float" for="email_from"><%= _("Source Email")%>:</label>
-              <input name="setting[email_from]" size="25" id="email_from" type="text" value="<%= this_blog.email_from %>" />
-              <span class="float"><%= _("Email address used by Typo to send notifications")%>.</span>
-          </li>
-      </ul>
+        <label class="float" for="default_moderate_comments"><%= _("Enable feedback moderation")%>:</label>
+        <input name="setting[default_moderate_comments]" id="default_moderate_comments" type="checkbox" value="1" <%= 'checked="checked"' if this_blog.default_moderate_comments %> />
+        <input name="setting[default_moderate_comments]" type="hidden" value="0" />
+      </li>
+      <li class="checkbox">
+        <label class="float" for="link_to_author"><%= _("Show your email address") %>:</label>
+        <input name="setting[link_to_author]" id="link_to_author" type="checkbox" value="1" <%= 'checked="checked"' if this_blog.link_to_author%> />
+        <input name="setting[link_to_author]" type="hidden" value="0" />
+      </li>
+    </ul>
+  </fieldset>
+
+  <fieldset id="notification" class="set">
+    <legend><%= _("Notification")%></legend>
+    <ul>
+      <li><%= _("Typo can notify you when new articles or comments are posted")%></li>
+      <li>
+        <label class="float" for="email_from"><%= _("Source Email")%>:</label>
+        <input name="setting[email_from]" size="25" id="email_from" type="text" value="<%= this_blog.email_from %>" />
+        <span class="float"><%= _("Email address used by Typo to send notifications")%>.</span>
+      </li>
+    </ul>
+  </fieldset>
+
+  <fieldset id="spam" class="set">
+    <legend><%= _("Spam")%></legend>
+    <ul>
+      <li><%= _("Enabling spam protection will make typo compare the IP address of posters as well as the contents of their posts against local and remote blacklists. Good defense against spam bots")%>.</li>
+      <li class="checkbox">
+        <label for="sp_global" class="float"><%= _("Enable spam protection")%>:</label>
+        <input name="setting[sp_global]" id="sp_global" type="checkbox" value="1" <%= 'checked="checked"' if this_blog.sp_global%> /><input name="setting[sp_global]" type="hidden" value="0" />
+      </li>
+      <li><%= _("Typo can (optionally) use the %s spam-filtering service.  You need to register with Akismet and receive an API key before you can use their service.  If you have an Akismet key, enter it here", '<a href="http://akismet.com">Akismet</a>')%> .
+      </li>
+      <li>
+        <label class="float" for="sp_akismet_key"><%= _("Akismet Key")%>:</label>
+        <input name="setting[sp_akismet_key]" id="sp_akismet_key" type="text" value="<%=h this_blog.sp_akismet_key %>" />
+      </li>
+      <li>
+        <%= _("You can optionally disable non-Ajax comments. Typo will always use Ajax for comment submission if Javascript is enabled, so non-Ajax comments are either from spammers or users without Javascript.")%>
+      </li>
+      <li class="checkbox">
+        <label for="sp_allow_non_ajax_comments" class="float"><%= _("Allow non-ajax comments") %>:</label>
+        <input name="setting[sp_allow_non_ajax_comments]" id="sp_allow_non_ajax_comments" type="checkbox" value="1" <%= 'checked="checked"' if this_blog.sp_allow_non_ajax_comments%> />
+        <input name="setting[sp_allow_non_ajax_comments]" type="hidden" value="0" />
+      </li>
+      <li>
+        <label for="sp_article_auto_close" class="float"><%= _("Disable comments after")%></label>
+        <input name="setting[sp_article_auto_close]" size="4" id="sp_article_auto_close" type="text" value="<%= this_blog.sp_article_auto_close %>" /> <%= _("days") %>
+        <span class="float"><%= _("Set to 0 to never disable comments")%></span>
+      </li>
+      <li>
+        <p><%= _("Typo will automatically reject comments and trackbacks which contain over a certain amount of links in them")%>.</p>
+        <label class="float" for="sp_url_limit"><%= _("Max Links")%>:</label>
+        <input name="setting[sp_url_limit]" size="4" id="sp_url_limit" type="text" value="<%= this_blog.sp_url_limit %>" />
+        <span class="float"><%= _("Set to 0 to never reject comments")%></span>
+      </li>
+    </ul>
   </fieldset>
-<%= render :partial => 'submit' %>
+  <%= hidden_field_tag 'from', 'feedback' %>
+  <%= render :partial => 'submit' %>
 </div>
-  <% end %>
+<% end %>