typo 4.0.3 → 4.1

data/app/views/admin/content/_pages.rhtml

@@ -1,3 +1,3 @@
-    <%= link_to "Previous page", { :id => pages.current.previous } if pages.current.previous -%>
+    <%= link_to _("Previous page"), { :id => pages.current.previous } if pages.current.previous -%>
     <%= pagination_links pages, :name => 'id' -%>
-    <%= link_to "Next page", { :id => pages.current.next } if pages.current.next -%>
+    <%= link_to _("Next page"), { :id => pages.current.next } if pages.current.next -%>

data/app/views/admin/content/_quick_post.rhtml

@@ -1,20 +1,20 @@
-  <%= start_form_tag :action=>"new" %>
+  <% form_tag :action=>"new" do %>
 <p>
-  <label for="articles_title">Title:</label><br />
+  <label for="articles_title"><%= _("Title")%>:</label><br />
   <%= text_field 'article', 'title'  %>
 </p>
 <p>
 <p>
-  <label for="categories[]">Categories:</label><br />
+  <label for="categories[]"><%= _("Categories")%>:</label><br />
   <select name="categories[]" multiple="multiple" size="3" style="width:250px;">
   <%= options_from_collection_for_select(@categories, "id", "name", @selected) %>
   </select>
 </p>
 <p>
-  <label for="articles_body">Article:</label><br />
+  <label for="articles_body"><%= _("Article")%>:</label><br />
   <%= text_area 'article', 'body', :rows => 10  %>
 </p>
 <div id="operations">
-  <%= save("Save Post") %> or <a href="#" onclick="new Effect.BlindUp('quick-post', {duration: 0.4}); return false;" >Cancel</a>
+  <%= save(_("Save Post")) %> or <a href="#" onclick="new Effect.BlindUp('quick-post', {duration: 0.4}); return false;" >Cancel</a>
 </div>
-<%= end_form_tag %>
+<% end %>

data/app/views/admin/content/_show_categories.rhtml

@@ -1,9 +1,9 @@
-  <h4>Currently this article is listed in following categories:</h4>
+  <h4><%= _("Currently this article is listed in following categories")%>:</h4>
   <% for category in @article.categories %>
     <%= link_to_remote "- #{category.name}", :url => { :action => "category_remove", :id => @article.id, :category_id => category.id }, :update => 'categories' %><br/>
   <% end %>
 
-  <h4>You can add it to the following categories:</h4>
+  <h4><%= _("You can add it to the following categories")%>:</h4>
   <% for category in @categories - @article.categories %>
     <%= link_to_remote "+ #{category.name}", :url => { :action => "category_add", :id => @article.id, :category_id => category.id }, :update => 'categories' %><br/>
   <% end %>

data/app/views/admin/content/_show_resources.rhtml

@@ -1,9 +1,9 @@
-    <h4>Currently this article has the following resources</h4>
+    <h4><%= _("Currently this article has the following resources")%></h4>
     <% for resource in @article.resources %>
       <%= link_to_remote "- #{resource.filename}", :url => { :action => "resource_remove", :id => @article.id, :resource_id => resource.id}, :update => 'resources' %><br/>
     <% end %>
 
-    <h4>You can associate the following resources</h4>
+    <h4><%= _("You can associate the following resources")%></h4>
     <% for resource in @resources - @article.resources %>
       <%= link_to_remote "+ #{resource.filename}", :url => { :action => "resource_add", :id => @article.id, :resource_id => resource.id}, :update => 'resources' %><br/>
     <% end %>

data/app/views/admin/content/destroy.rhtml

@@ -1,11 +1,11 @@
-  <% @page_heading = 'Articles' %>
+  <% @page_heading = _('Articles') %>
 
   <% content_for('tasks') do %>
-    <%= task_show "Show this article", @article.id %>
-  <% end %> 
+    <%= task_show _("Show this article"), @article.id %>
+  <% end %>
 
-  <p>Are you sure you want to delete this article ( <%=h @article.title -%> )?</p>
-  <%= start_form_tag :controller => 'content', :action => 'destroy' %>
-  <%= hidden_field "article", "id" %>
-  <%= confirm_delete("Delete this article") %>
-  <%= end_form_tag %>
+  <p><%= _("Are you sure you want to delete this article")%> ( <%=h @article.title -%> )?</p>
+  <% form_tag :controller => '/admin/content', :action => 'destroy' do %>
+  <%= hidden_field_tag "id", @article.id %>
+  <%= confirm_delete(_("Delete this article")) %>
+  <% end %>

data/app/views/admin/content/edit.rhtml

@@ -1,28 +1,10 @@
-  <% @page_heading = 'Articles' %>
-  
-  <% content_for('tasks') do %>
-    <%= task_new 'Create new article' %>
-    <li><%= link_to 'View article on your blog', article_url(@article) %></li>
-  <% end %> 
-
-  <%= start_form_tag({ :action => "edit", :id => @article }, :id => "article_form", :enctype => "multipart/form-data") %>
-  <h3>Editing article</h3>
-
-  <div class="form">
-    <!-- LIVE PREVIEW -->
-    <div id="preview" class="post" style="display:none;"></div>
-    <!-- /LIVE PREVIEW -->	
-    <%= render_partial "form" %>
-  </div>
+  <% @page_heading = _('Edit Article') %>
 
-  <div id="operations">
-    <%= save %> or <%= cancel %>  
-  </div>
-
-  <%= end_form_tag %>
+  <% content_for('tasks') do %>
+    <%= task_overview %>
+	
+    <li><%= link_to _('View article on your blog'), @article.permalink_url %></li>
+  <% end %>
 
-  <%= observe_form "article_form", 
-        :frequency => 2, 
-        :update => "preview",
-        :complete => "Element.show('preview')",
-        :url => { :action => "preview" } %>      
+  <h3><%= _("Edit Article")%></h3>
+  <%= render :partial => "admin/shared/edit", :locals => { :form_type => "article", :form_action => { :action => "edit", :id => @article } } %>

data/app/views/admin/content/list.rhtml

@@ -1,9 +1,9 @@
-  <% @page_heading = 'Articles' %>
+  <% @page_heading = _('Manage Articles') %>
 
   <% content_for('tasks') do %>
-    <%= task_quickpost('Quick Post') %>
-    <%= task_new 'Create new article' %>
-    <%= task_quicknav('Navigate') %>
+	<%= tab _("Manage Pages"), :controller=>"pages", :action=>"list" %>
+	<%= tab _("Manage Categories"), :controller=>"categories", :action=>"index"%>
+	<%= tab _("Manage Resources"), :controller=>"resources", :action=>"list" %>
   <% end %> 
   <div id="quick-navigate" style="display:none;position:absolute;">
     <%= render :partial => 'admin/content/pages', :object => @articles_pages -%>

data/app/views/admin/content/new.rhtml

@@ -1,27 +1,7 @@
-  <% @page_heading = 'Articles' %>
+<% content_for('tasks') do %>
+	<%= tab _("Write a Page"), :controller=>"pages", :action=>"new" %>
+<% end %> 
 
-  <h3>Creating article</h3>
+  <% @page_heading = _('Write an Article') %>
 
-  <%= start_form_tag({ :action => "new" }, :id => "article_form", :enctype => "multipart/form-data") %>
-  
-  
-  <div class="form">	
-    <!-- LIVE PREVIEW --> 
-    <div id="preview" class="post" style="display: none;"></div>
-    <!-- /LIVE PREVIEW -->
-    <%= render_partial "form" %>
-  </div>
-
-  <div id="operations">
-    <%= save("Save this article") %> or <%= cancel %>  
-  </div>
-
-  <%= end_form_tag %>
-
-  <%= observe_form "article_form", 
-        :frequency => 2, 
-        :update => "preview",
-        :complete => "Element.show('preview')",
-        :url => { :action => "preview" } %>      
-
-      
+  <%= render :partial => "admin/shared/edit", :locals => { :form_type => "article", :form_action => { :action => "new" } } %>

data/app/views/admin/content/preview.rhtml

@@ -1,3 +1,10 @@
-<h4><%= @article[:title] %></h4>
+<div class="post">
+	<h2><%= @article[:title] %></h2>
+	<p class="auth">
+		<%_("Posted by")%>
+		<%= author_link(@article) %>
+		<%= js_distance_of_time_in_words_to_now @article[:published_at] %>
+	</p>
 
-<%= @article.full_html %>
+	<%= @article.html %>
+</div>

data/app/views/admin/content/show.rhtml

@@ -1,25 +1,26 @@
-  <% @page_heading = 'Articles' %>
+  <% @page_heading = _('Preview Article') %>
 
   <% content_for('tasks') do %>
-    <%= task_edit 'Edit this article', @article.id %>
-    <li><%= link_to 'View article on your blog', article_url(@article) %></li>
+    <%= task_edit _('Edit this article'), @article.id %>
+    <li><%= link_to _('View article on your blog'), @article.permalink_url %></li>
+	<%= task_overview %>
   <% end %>
 
   <h3><%=h @article.title %></h3>
 
   <div class="form">
-    <div><%= @article.full_html %></div>
-    <p class="meta"><label>Posted:</label> <%=h @article.published_at.to_formatted_s(:long_weekday) %> by <%=h @article.author %></p>
-    <p class="meta"><label>Last updated:</label> <%=h @article.updated_at.to_formatted_s(:long_weekday) %></p>
-    <p class="meta"><label>Published:</label> <%=h (@article.published? ? "Yes" : "No") %></p>
+    <div><%= @article.html %></div>
+    <p class="meta"><label><%= _("Posted date")%>:</label> <%=h @article.published_at.to_formatted_s(:long_weekday) %> by <%=h @article.author %></p>
+    <p class="meta"><label><%= _("Last updated")%>:</label> <%=h @article.updated_at.to_formatted_s(:long_weekday) %></p>
+    <p class="meta"><label><%= _("Online")%>:</label> <%=h (@article.published? ? "Yes" : "No") %></p>
   </div>
 
-  <h3>Categories</h3>
+  <h3><%= _("Categories")%></h3>
   <div id="categories" class="form">
     <%= render :partial => 'show_categories' -%>
   </div>
 
-  <h3>Attachments</h3>
+  <h3><%= _("Attachments")%></h3>
   <div id="resources" class="form">
     <%= render :partial => 'show_resources' -%>
   </div>

data/app/views/admin/feedback/_item.rhtml

@@ -1,6 +1,6 @@
 <tr class="<%= state_class(item) %>">
   <td class="field"><input class= "feedback_check" type="checkbox" name="feedback_check[<%= item.id %>]"/></td>
-  <td class="state"><%= item.state %></td>
+  <td class="operation"><%=h item.state %></td>
   <td class="field"><%=h item.class %></td>
   <td class="field"><%= link_to_article_edit item.article %></td>
   <td class="field">
@@ -13,5 +13,5 @@
   <td class="field"><%=h truncate(item.body,80)%></td>
   <td class="field"><%=h item.ip %></td>
   <td class="field"><%=h distance_of_time_in_words_to_now(item.created_at) %> ago</td>
-  <td class="field"><%= link_to image_tag('delete'), {:action => 'delete', :id => item.id, :search => params[:search], :page => params[:page] },  :confirm => "Are you sure?", :post => true %></td>
+  <td class="operation"><%= link_to image_tag('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/list.rhtml

@@ -1,19 +1,20 @@
-<% @page_heading = "Comments and Trackbacks for #{ this_blog.settings['blog_name'] }" %>
+<% @page_heading = _("Comments and Trackbacks for") + " #{ this_blog.settings['blog_name'] }" %>
 
 <% content_for('tasks') do %>
-  <%= task_showmod 'Limit to spam' %>
-  <%= task_showmod 'Limit to unconfirmed' %>
-  <%= task_showmod 'Limit to unconfirmed spam' %>
+  <%= task_showmod _('Limit to spam') %>
+  <%= task_showmod _("Limit to unconfirmed") %>
+  <%= task_showmod _('Limit to unconfirmed spam') %>
+  <%= tab _("Blacklist"), :controller=>"blacklist", :action=>"index"%>
 <% end %>
 
 <div class="search">
-  <%= form_tag({:action => 'index'}, :method => :get) %>
-    <label for="search">Feedback Search:</label><input type="text" id="feedback_search" name="search" value="<%=h params[:search] %>" size="15" />
-  <%= end_form_tag %>
+  <% form_tag({:action => 'index'}, :method => :get) do %>
+    <label for="search"><%= _("Feedback Search")%>:</label><input type="text" id="feedback_search" name="search" value="<%=h params[:search] %>" size="15" />
+  <% end %>
 </div>
 
 <div class="list">
-  <%= form_tag({:action => 'bulkops'}, :method => :post) %>
+  <% form_tag({:action => 'bulkops'}, :method => :post) do %>
   <br/>
   <%= submit_tag "Delete Checked Items" %> &nbsp;
   <%= submit_tag "Mark Checked Items as Ham" %>
@@ -25,15 +26,15 @@
 
   <table>
   <tr>
-        <th><input class="feedback_check" type="checkbox" name="checkall" id="checkall" onclick="check_all(this);"/></th>
-        <th>State</th>
-        <th>Type</th>
-        <th>Article</th>
-    <th>Author</th>
-        <th>Body</th>
-    <th>IP</th>
-    <th>Posted date</th>
-    <th>Delete</th>
+  	<th><input class="feedback_check" type="checkbox" name="checkall" id="checkall" onclick="check_all(this);"/></th>
+	<th><%= _("Status")%></th>
+	<th><%= _("Type")%></th>
+	<th><%= _("Article")%></th>
+    <th><%= _("Author")%></th>
+    <th><%= _("Body")%></th>
+    <th><%= _("IP")%></th>
+    <th><%= _("Posted date")%></th>
+    <th><%= _("Delete") %></th>
   </tr>
   <%= render :partial => 'item', :collection => @feedback %>
   </table>
@@ -41,10 +42,10 @@
   <%= submit_tag "Mark Checked Items as Ham" %>
   <%= submit_tag "Mark Checked Items as Spam" %>
   <%= submit_tag "Confirm Classification of Checked Items" %>
-  </form>
+  <% end %>
 </div>
 
-<%= link_to "Previous page", { :page => @pages.current.previous, :search => params[:search] } if @pages.current.previous %>
+<%= 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 %>
+<%= link_to _("Next page"), { :page => @pages.current.next, :search => params[:search] } if @pages.current.next %>
 

data/app/views/admin/general/index.rhtml

@@ -1,246 +1,268 @@
-  <% @page_heading = 'Blog settings' %>
-
-  <%= start_form_tag :action => 'update'%>
-
-  <div class="tasks">
-    <h3>Which settings group would you like to edit?</h3>
-    <ul>
-      <li><a href="#gensettings" onclick="new Effect.ScrollTo('gensettings'); return false">General Settings</a></li>
-      <li><a href="#textfilter" onclick="new Effect.ScrollTo('textfilter'); return false">Text Filter</a></li>
-      <li><a href="#spam" onclick="new Effect.ScrollTo('spam'); return false">Spam Protection</a></li>
-      <li><a href="#resources" onclick="new Effect.ScrollTo('resources'); return false">Resource Defaults</a></li>
-      <li><a href="#misc" onclick="new Effect.ScrollTo('misc'); return false">Cache</a></li>
-    </ul>
-    <div style="clear:both;"></div>
-  </div>
+	<% @page_heading = _('Blog settings') %>
+
+	<% form_tag :action => 'update' do %>
 
-  <div id="settings">
-  <div id="gensettings" class="set" style="margin-top:10px;">
-  <h3>General Settings</h3>
-    <p>
-      <label for="blog_name">Blog name:</label>
-      <input name="setting[blog_name]" id="blog_name" type="text" value="<%=h this_blog.blog_name %>" />
-    </p>
-    <p>
-      <label for="blog_subtitle">Blog subtitle:</label>
-      <input name="setting[blog_subtitle]" id="blog_subtitle" type="text" value="<%=h this_blog.blog_subtitle %>" />
-    </p>
-    <p>
-      <input name="setting[title_prefix]" id="blog_title_prefix" type="checkbox" value="1" <%= 'checked="checked"' if this_blog.title_prefix %> />
-      <label for="blog_title_prefix">Prefix page title with blog name</label>
-    </p>
-    <p>
-      <label for="canonical_server_url">Canonical Server Url:</label>
-      <input name="setting[canonical_server_url]" id="canonical_server_url" type="text" value="<%= this_blog.canonical_server_url %>" />
-    </p>
-    <p>
-      <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"/>
-        <label for="default_allow_comments">Enable comments by default</label>
-    </p>
-    <p>
-      <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"/>
-        <label for="default_allow_pings">Enable Trackbacks by default</label>
-    </p>
-    <p>
-      <label for="limit_article_display">Display </label>
-      <input name="setting[limit_article_display]" size="4" id="limit_article_display" type="text" value="<%= this_blog.limit_article_display %>" /> articles on my homepage by default.
-    </p>
-    <p>
-      <label for="limit_rss_display">Display </label>
-      <input name="setting[limit_rss_display]" size="4" id="limit_rss_display" type="text" value="<%= this_blog.limit_rss_display %>" /> articles in my rss feed by default.
-    </p>
-    <p>
-      <input name="setting[show_extended_on_rss]" id="show_extended_on_rss" type="checkbox" value="1" <%= 'checked="checked"' if this_blog.show_extended_on_rss%> />
-      <input name="setting[show_extended_on_rss]" type="hidden" value="0"/>
-        <label for="show_extended_on_rss">Show full article on rss feed</label>
-    </p>
-
-    <hr />
-
-    <p>Should the blog show mailto: links to your email address?</p>
-    <p><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"/> <label for="link_to_author">Enable E-Mail public display</label></p>
-
-    <hr />
-
-    <p>Should the blog use of the <a href="http://www.gravatar.com/">Globally Recognized Avatar (Gravatar)</a> service in comments?</p>
-    <p>
-      <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"/>
-      <label for="use_gravatar">Enable Gravatar integration</label>
-    </p>
-
-    <hr />
-
-    <p>Would you like to include your latitude and longitude in your blog's HTML pages? See <a href="http://geourl.org">GeoURL</a> for details.  <br/>Example: <tt>47.774,-122.201</tt></p>
-
-    <p>
-      <label for="geourl_location">Latitude, Longitude:</label>
-      <input name="setting[geourl_location]" size="20" id="geourl_location" type="text" value="<%= this_blog.geourl_location %>" />
-    </p>
-
-    <hr/>
-
-    <p>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.  You can
-	enable or disable trackbacks per-article using the article's extended
-	settings.  See also the 
-      <a href="#gensettings" onclick="new Effect.ScrollTo('gensettings'); return false">"Enable Trackbacks by default" setting</a> above.
-	</p>
-    <p>
-      <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 for="global_pings_disable">Disable trackbacks site-wide</label>
-
-    </p>
-
-    <hr />
-
-    <p>Should Typo send trackbacks to websites that you link to?  This should be disabled
-       for private blogs, as it will leak non-public information to sites that you're discussing.
-       For public blogs, there's no real point in disabling this.</p>
-    <p>
-      <input name="setting[send_outbound_pings]" id="send_outbound_pings" type="checkbox" value="1" <%= 'checked="checked"' if this_blog.send_outbound_pings%> />
-         <input name="setting[send_outbound_pings]" type="hidden" value="0"/>
-           <label for="send_outbound_pings">Send trackbacks to external sites</label>
-
-    </p>
-
-    <p>
-      <label for="ping_urls">URLs to ping automatically:</label><br/>
-      <textarea name="setting[ping_urls]" id="ping_urls" rows="5" cols="50"><%=h this_blog.ping_urls %></textarea>
-    </p>
-
-    <p class="r"><%= save("Save My Settings") %></p>
+	<div class="tasks">
+		<h3><%= _("Which settings group would you like to edit")%>?</h3>
+    	<ul>
+      		<li><a href="#gensettings" onclick="new Effect.ScrollTo('gensettings'); return false"><%= _("General Settings")%></a></li>
+      		<li><a href="#read" onclick="new Effect.ScrollTo('read'); return false"><%= _("Read")%></a></li>
+      		<li><a href="#write" onclick="new Effect.ScrollTo('write'); return false"><%= _("Write")%></a></li>
+      		<li><a href="#discuss" onclick="new Effect.ScrollTo('discuss'); return false"><%= _("Discuss")%></a></li>
+      		<li><a href="#notification" onclick="new Effect.ScrollTo('notification'); return false"><%= _("Notification")%></a></li>
+      		<li><a href="#spam" onclick="new Effect.ScrollTo('spam'); return false"><%= _("Spam Protection")%></a></li>
+      		<li><a href="#resources" onclick="new Effect.ScrollTo('resources'); return false"><%= _("Resource Settings")%></a></li>
+      		<li><a href="#misc" onclick="new Effect.ScrollTo('misc'); return false"><%= _("Cache")%></a></li>
+    	</ul>
+    <p style="clear:both;"></p>
   </div>
 
+<div class="admin">
+	<fieldset id="gensettings" class="set" style="margin-top:10px;">
+		<legend><%= _("General settings")%></legend>
 
-  <div id="textfilter" class="set">
-  <h3>Text Filter</h3>
-        <p class="note">Typo supports a number of text filtering options.  To add new filters, see the "filters" tab on the toolbar above.</p>
-      <p>
-        <select name="setting[text_filter]" id="text_filter">
-          <%= options_for_select text_filter_options, TextFilter.find_by_name(this_blog.text_filter) %>
-        </select>
-        <label for="text_filter">Article filter</label>
-      </p>
-      <p>
-        <select name="setting[comment_text_filter]" id="comment_text_filter">
-        <%= options_for_select text_filter_options, TextFilter.find_by_name(this_blog.comment_text_filter) %>
-        </select>
-        <label for="comment_text_filter">Comments filter</label>
-      </p>
-      <p class="r"><%= save("Save My Settings") %></p>
-    </div>
-
-    <div id="notification" class="set">
-    <h3>Notification</h3>
-    <p>Typo can notify you when new articles or comments are posted</p>
-    <p>
-      <label for="email_from">Email address to use in From: field when Typo sends mail:</label>
-      <input name="setting[email_from]" size="20" id="email_from" type="text" value="<%= this_blog.email_from %>" />
-    </p>
-    <p>
-      <label for="jabber_address">Jabber account to use when sending Jabber notifications:</label>
-      <input name="setting[jabber_address]" size="20" id="jabber_address" type="text" value="<%= this_blog.jabber_address %>" />
-    </p>
-    <p>
-      <label for="jabber_password">Password for Jabber account:</label>
-      <input name="setting[jabber_password]" size="20" id="jabber_password" type="password" value="<%= this_blog.jabber_password %>" />
-    </p>
-      <p class="r"><%= save("Save My Settings") %></p>
-    </div>
-
-
-    <div id="spam" class="set">
-        <h3>Spam Protection</h3>
-        <p>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.</p>
-        <p>
-          <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"/>
-          <label for="sp_global">Enable spam protection</label>
-        </p>
-		<p>Typo can (optionally) use the <a href="http://akismet.com">Akismet</a> 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.
-		</p>
-        <p>
-          <label 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 %>"/>
-        </p>
-		<p>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.
-		</p>
-        <p>
-          <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" />
-          <label for="sp_allow_non_ajax_comments">Allow non-ajax comments</label>
-          <br /><small>(Spam bots usually don't know anything about ajax comments)</small>
-        </p>
-        <p>
-          <label for="sp_article_auto_close">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
-          <br /><small>(Set to 0 to never disable comments)</small>
-        </p>
-        <p>Typo will automatically reject comments and trackbacks which contain over a certain amount of links in them.</p>
-        <p>
-          <label for="sp_url_limit">Max URLs:</label>
-          <input name="setting[sp_url_limit]" size="4" id="sp_url_limit" type="text" value="<%= this_blog.sp_url_limit %>" /> links
-          <br /><small>(Set to 0 to never reject comments)</small>
-        </p>
-        <p class="r"><%= save("Save My Settings") %></p>
-    </div>
-    <div id="resources" class="set">
-        <h3>Resource Defaults</h3>
-        <p>
-          The below settings act as defaults when you choose to publish an enclosure with iTunes metadata.
-        </p>
-        <p>
-          <label for="itunes_author">Author:</label>
-          <input name="setting[itunes_author]" size="25" id="itunes_author" type="text" value="<%= this_blog.itunes_author %>" />
-        </p>
-        <p>
-          <label for="itunes_subtitle">Subtitle:</label>
-          <input name="setting[itunes_subtitle]" size="25" id="itunes_subtitle" type="text" value="<%= this_blog.itunes_subtitle %>" /><small>(setting for channel)</small>
-        </p>
-        <p>
-        <label for="itunes_summary">Summary:<small>(setting for channel)</small>
-</label> <br />
-          <textarea name="setting[itunes_summary]" cols="40" rows="3"><%=h this_blog.itunes_summary %></textarea>
-        </p>
-        <p>
-          <label for="itunes_email">Email:</label>
-          <input name="setting[itunes_email]" size="25" id="itunes_email" type="text" value="<%= this_blog.itunes_email %>" /> <small> Not Published by Apple</small>
-        </p>
-        <p>
-          <label for="itunes_name">Optional Name:</label>
-          <input name="setting[itunes_name]" size="25" id="itunes_name" type="text" value="<%= this_blog.itunes_name %>" /> <small> Not Published by Apple</small>
-
-        </p>
-        <p>
-          <label for="itunes_copyright">Copyright Information:</label>
-          <input name="setting[itunes_copyright]" size="25" id="itunes_copyright" type="text" value="<%= this_blog.itunes_copyright %>" />
-        </p>
-        <p>
-          <label for="itunes_explicit">Explicit:</label>
-          <input name="setting[itunes_explicit]" id="itunes_explicit" type="checkbox"  value="1" <%= 'checked="checked"' if this_blog.itunes_explicit%> /><input name="setting[itunes_explicit]" type="hidden" value="0" />
-        </p>
-        <p class="r"><%= save("Save My Settings") %></p>
-    </div>
- </div>
-
- <div id="misc" class="set">
-   <h3>Cache</h3>
-   <%= link_to 'Empty Fragment Cache', :controller => 'cache', :action => 'sweep' %><br />
-   <%= link_to 'Rebuild cached HTML', :controller => 'cache', :action => 'sweep_html' %><br />
-   <div id="users">
-     <p>There are <%= @page_cache_size %> entries in the cache</p>
-   </div>
-</div>
+		<ul>
+			<li>
+				<label for="blog_name" class="float"><%= _("Blog name")%>:</label>
+				<input name="setting[blog_name]" id="blog_name" type="text" value="<%=h this_blog.blog_name %>" size="<%= this_blog.blog_name.length %>" />
+			</li>
+			<li>
+				<label class="float" for="blog_subtitle"><%= _("Blog subtitle")%>:</label>
+				<input name="setting[blog_subtitle]" id="blog_subtitle" type="text" value="<%=h this_blog.blog_subtitle %>" size="<%= this_blog.blog_subtitle.length%>" />
+		    </li>
+			<li>
+				<label class="float" for="base_url"><%= _("Blog URL")%>:</label>
+				<input name="setting[base_url]" id="base_url" type="text" value="<%=h this_blog.base_url %>" size="<%= this_blog.base_url.length %> " />
+			</li>
+			<li>
+				<label class="float" for="geourl_location"><%= _("Latitude, Longitude")%>:</label>
+				<input name="setting[geourl_location]" size="20" id="geourl_location" type="text" value="<%= this_blog.geourl_location %>" />
+				<span class="float"><%= _("Display")%> <a href="http://geourl.org"><%= _("your lattitude and longitude")%></a> (<%= _("exemple")%> <tt>47.774,-122.201</tt>)</span>
+			</li>
+			<li>
+				<label class="float"><%= _("Show blog name")%>:</label>
+				<input type="radio" name="setting[title_prefix]" value="1" id="blog_title_prefix_1" <%= 'checked="checked"' if this_blog.title_prefix == 1 %>/>
+				<label for="blog_title_prefix_1"><%= _("At the beginning of page title")%></label>
+				<span class="float">
+					<input type="radio" name="setting[title_prefix]" value="2" id="blog_title_prefix_2" <%= 'checked="checked"' if this_blog.title_prefix == 2 %>/>
+					<label for="blog_title_prefix_2"><%= _("At the end of page title")%></label>
+				</span>
+				<span class="float">
+					<input type="radio" name="setting[title_prefix]" value="0" id="blog_title_prefix_0" <%= 'checked="checked"' if this_blog.title_prefix == 0 %>/>
+				    <label for="blog_title_prefix_0"><%= _("Don't show blog name in page title")%></label>
+				</span>
+		  	</li>
+		</ul>
+    	<p class="r"><%= save(_("Save Settings")) %></p>
+  	</fieldset>
 
+	<fieldset id="read" class="set">
+		<legend><%= _("Read")%></legend>
 
-  <div id="operations" class="tasks">
-    <%= save("Save My Settings") %>
-  </div>
+		<ul>
+			<li>
+				<label for="limit_article_display" class="float"><%= _("Display")%> </label>
+				<input name="setting[limit_article_display]" size="4" id="limit_article_display" type="text" value="<%= this_blog.limit_article_display %>" />
+				<%= _("articles on my homepage by default")%>
+			</li>
+			<li>
+			    <label for="limit_rss_display" class="float"><%= _("Display")%> </label>
+			    <input name="setting[limit_rss_display]" size="4" id="limit_rss_display" type="text" value="<%= this_blog.limit_rss_display %>" />
+				<%= _("articles in my news feed by default")%>.
+			</li>
+			<li class="checkbox">
+				<label class="float" for="show_extended_on_rss"><%= _("Show full article on feed")%>:</label>
+			    <input name="setting[show_extended_on_rss]" id="show_extended_on_rss" type="checkbox" value="1" <%= 'checked="checked"' if this_blog.show_extended_on_rss%> />
+			    <input name="setting[show_extended_on_rss]" type="hidden" value="0" />
+			</li>
+		</ul>
+	  <p class="r"><%= save(_("Save Settings")) %></p>
+	</fieldset>
+
+	<fieldset id="write" class="set">
+		<legend><%= _("Write")%></legend>
+
+		<ul>
+			<li>
+		        <label class="float" for="text_filter"><%= _("Article filter")%>:</label>
+		        <select name="setting[text_filter]" id="text_filter">
+		          <%= options_for_select text_filter_options, TextFilter.find_by_name(this_blog.text_filter) %>
+		        </select>
+			</li>
+			<li>
+				<label for="comment_text_filter" class="float"><%= _("Comments filter")%>:</label>
+		        <select name="setting[comment_text_filter]" id="comment_text_filter">
+		        <%= options_for_select text_filter_options, TextFilter.find_by_name(this_blog.comment_text_filter) %>
+		        </select>
+			</li>
+			<li>
+				<%= _("When publishing articles, Typo can send trackbacks to websites that you link to. This should be disabled for private blogs as it will leak non-public information to sites that you're discussing. For public blogs, there's no real point in disabling this.")%>
+			</li>
+			<li class="checkbox">
+	          <label class="float" for="send_outbound_pings"><%= _("Send trackbacks")%>:</label>
+		      <input name="setting[send_outbound_pings]" id="send_outbound_pings" type="checkbox" value="1" <%= 'checked="checked"' if this_blog.send_outbound_pings%> />
+	         <input name="setting[send_outbound_pings]" type="hidden" value="0" />
+			</li>
+			<li>
+				<label class="float" for="ping_urls"><%= _("URLs to ping automatically")%>:</label>
+		      	<textarea name="setting[ping_urls]" id="ping_urls" rows="5" cols="50"><%=h this_blog.ping_urls %></textarea>
+			</li>
+		</ul>
+		<p class="r"><%= save(_("Save Settings")) %></p>
+	</fieldset>
+
+	<fieldset id="discuss" class="set">
+		<legend><%= _("Discuss")%></legend>
+		<ul>
+			<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.")%>
+			</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" />
+			</li>
+			<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><%= _("You can enable site wide comment 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 comments 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="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="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>
+			<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>
+				<%= _("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>
+
+      <p class="r"><%= save(_("Save Settings")) %></p>
+	</fieldset>
 
-  <%= end_form_tag %>
+	<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>
+			<li>
+				<label for="jabber_address" class="float"><%=_("Jabber account")%>:</label>
+				<input name="setting[jabber_address]" size="20" id="jabber_address" type="text" value="<%= this_blog.jabber_address %>" />
+				<span class="float"><%= _("Jabber account to use when sending Jabber notifications") %>.</span>
+			</li>
+			<li>
+				<label class="float" for="jabber_password"><%= _("Jabber password")%>:</label>
+		      	<input name="setting[jabber_password]" size="20" id="jabber_password" type="password" value="<%= this_blog.jabber_password %>" />
+			</li>
+		</ul>
+      <p class="r"><%= save(_("Save Settings")) %></p>
+	</fieldset>
+
+	<fieldset id="spam" class="set">
+		<legend><%= _("Spam protection")%></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>
+		</ul>
+        <p class="r"><%= save(_("Save Settings")) %></p>
+	</fieldset>
+
+	<fieldset id="resources" class="set">
+		<legend><%= _("Resource Settings")%></legend>
+		<ul>
+			<li><%= _("The below settings act as defaults when you choose to publish an enclosure with iTunes metadata")%>.</li>
+			<li>
+				<label for="itunes_author" class="float"><%= _("Author")%>:</label>
+	          	<input name="setting[itunes_author]" size="25" id="itunes_author" type="text" value="<%= this_blog.itunes_author %>" />
+			</li>
+			<li>
+	          	<label for="itunes_subtitle" class="float"><%= _("Subtitle")%>: <span class="mandatory">*</span></label>
+	          	<input name="setting[itunes_subtitle]" size="25" id="itunes_subtitle" type="text" value="<%= this_blog.itunes_subtitle %>" />
+			</li>
+			<li>
+				<label class="float" for="itunes_summary"><%= _("Summary")%>: <span class="mandatory">*</span></label>
+				<textarea name="setting[itunes_summary]" cols="40" rows="3"><%=h this_blog.itunes_summary %></textarea>
+				<span class="float mandatory">* <%= _("Setting for channel")%></span>
+			</li>
+			<li>
+	          <label class="float" for="itunes_email"><%= _("Email")%>: <span class="mandatory">**</span></label>
+	          <input name="setting[itunes_email]" size="25" id="itunes_email" type="text" value="<%= this_blog.itunes_email %>" />
+			</li>
+			<li>
+				<label class="float" for="itunes_name"><%= _("Optional Name")%>: <span class="mandatory">**</span></label>
+				<input name="setting[itunes_name]" size="25" id="itunes_name" type="text" value="<%= this_blog.itunes_name %>" />
+				<span class="float mandatory">** <%= _("Not published by Apple")%></span>
+			</li>
+			<li>
+				<label class="float" for="itunes_copyright"><%= _("Copyright Information")%>:</label>
+	          	<input name="setting[itunes_copyright]" size="25" id="itunes_copyright" type="text" value="<%= this_blog.itunes_copyright %>" />
+			</li>
+			<li class="checkbox">
+				<label class="float" for="itunes_explicit"><%= _("Explicit")%>:</label>
+	          	<input name="setting[itunes_explicit]" id="itunes_explicit" type="checkbox"  value="1" <%= 'checked="checked"' if this_blog.itunes_explicit%> />
+				<input name="setting[itunes_explicit]" type="hidden" value="0" />
+			</li>
+		</ul>
+        <p class="r"><%= save(_("Save Settings")) %></p>
+	</fieldset>
+
+	<fieldset id="misc" class="set">
+		<legend><%= _("Cache")%></legend>
+		<ul>
+			<li><%= link_to _('Empty Fragment Cache'), :controller => '/admin/cache', :action => 'sweep' %></li>
+			<li><%= link_to _('Rebuild cached HTML'), :controller => '/admin/cache', :action => 'sweep_html' %></li>
+	     	<p id="users"><%= _("There are %d entries in the cache", @page_cache_size) %></p>
+		</ul>
+	</fieldset>
+
+	<div id="operations" class="tasks">
+    <%= save(_("Save Settings")) %>
+  </div>
+</div>
+  <% end %>