typo 5.0.1 → 5.0.2

data/app/controllers/accounts_controller.rb

@@ -30,7 +30,7 @@ class AccountsController < ApplicationController
     if request.post? and @user.save
       session[:user_id] = @user.id
       flash[:notice]  = "Signup successful"
-      redirect_to :controller => "admin/general", :action => "index"
+      redirect_to :controller => "admin/settings", :action => "index"
       return
     end
   end

data/app/controllers/admin/cache_controller.rb

@@ -14,7 +14,7 @@ class Admin::CacheController < Admin::BaseController
     expire_fragment(/.*/)
 
     flash[:notice] = _('Cache was cleared')
-    redirect_to :controller => '/admin/general'
+    redirect_to :controller => '/admin/settings'
   end
 
   def sweep_html
@@ -22,7 +22,7 @@ class Admin::CacheController < Admin::BaseController
     expire_fragment(/^contents_html.*/)
 
     flash[:notice] = _('HTML was cleared')
-    redirect_to :controller => '/admin/general'
+    redirect_to :controller => '/admin/settings'
   end
 
 end

data/app/controllers/admin/general_controller.rb

@@ -1,16 +1,8 @@
 class Admin::GeneralController < Admin::BaseController
-
   def index
-    if this_blog.base_url.blank?
-      this_blog.base_url = blog_base_url
-    end
+    redirect_to :controller => 'settings'
   end
-
-  def redirect
-    flash[:notice] = "Please review and save the settings before continuing"
-    redirect_to :action => "index"
-  end
-
+  
   def update_database
     @current_version = Migrator.current_schema_version
     @needed_version = Migrator.max_schema_version
@@ -26,17 +18,5 @@ class Admin::GeneralController < Admin::BaseController
       redirect_to :action => 'update_database'
     end
   end
-
-  def update
-    if request.post?
-      Blog.transaction do
-        params[:setting].each { |k,v| this_blog.send("#{k.to_s}=", v) }
-        this_blog.save
-        flash[:notice] = _('config updated.')
-      end
-      redirect_to :action => 'index'
-    end
-  end
-
   private
 end

data/app/controllers/admin/settings_controller.rb

@@ -0,0 +1,58 @@
+class Admin::SettingsController < Admin::BaseController
+  def index
+    if this_blog.base_url.blank?
+      this_blog.base_url = blog_base_url
+    end
+    
+    if request.post?
+      self.update
+    end
+  end
+  
+  def read
+    if request.post?
+      self.update
+    end    
+  end
+  
+  def write
+    if request.post?
+      self.update
+    end    
+  end
+
+  def feedback
+    if request.post?
+      self.update
+    end    
+  end
+
+  def spam
+    if request.post?
+      self.update
+    end    
+  end
+  
+  def podcast
+    if request.post?
+      self.update
+    end    
+  end
+  
+  def redirect
+    flash[:notice] = "Please review and save the settings before continuing"
+    redirect_to :action => "index"
+  end
+
+  def update
+    if request.post?
+      Blog.transaction do
+        params[:setting].each { |k,v| this_blog.send("#{k.to_s}=", v) }
+        this_blog.save
+        flash[:notice] = _('config updated.')
+      end
+      redirect_to :action => 'index'
+    end
+  end
+  
+end

data/app/controllers/admin/sidebar_controller.rb

@@ -46,7 +46,9 @@ class Admin::SidebarController < Admin::BaseController
     Sidebar.transaction do
       position = 0
       params[:configure] ||= { }
-      this_blog.sidebars.update_all('active_position = null')
+      # Crappy workaround to rails update_all bug with PgSQL / SQLite
+#      this_blog.sidebars.update_all('active_position = null')
+      ActiveRecord::Base.connection.execute("update sidebars set active_position=null where blog_id = #{this_blog.id}")
       flash[:sidebars].each do |id|
         sidebar = Sidebar.find(id)
         sb_attribs = params[:configure][id.to_s] || {}

data/app/controllers/articles_controller.rb

@@ -35,6 +35,7 @@ class ArticlesController < ContentController
       end
     end
     if params[:page]
+      @page_title = 'Older posts,' if @page_title.blank?
       @page_title << " page " << params[:page]
     end
 
@@ -117,7 +118,7 @@ class ArticlesController < ContentController
     if User.count == 0
       redirect_to :controller => "accounts", :action => "signup"
     elsif ! this_blog.configured?
-      redirect_to :controller => "admin/general", :action => "redirect"
+      redirect_to :controller => "admin/settings", :action => "redirect"
     else
       return true
     end

data/app/controllers/content_controller.rb

@@ -43,10 +43,6 @@ class ContentController < ApplicationController
     end
   end
 
-  def self.expire_page(path)
-    PageCache.zap_pages(path)
-  end
-
   protected
 
   def auto_discovery_defaults

data/app/helpers/admin/base_helper.rb

@@ -168,12 +168,18 @@ module Admin::BaseHelper
     end
   end
 
-  def class_presentation
-    if controller.controller_name  =~ /sidebar|themes|textfilters/
+  def class_themes
+    if controller.controller_name  =~ /themes/
     "current"
     end
   end
 
+  def class_plugins
+    if controller.controller_name  =~ /sidebar|textfilter/
+    "current"
+    end
+  end
+  
   def class_users
     if controller.controller_name  =~ /users/
     "current"
@@ -187,7 +193,7 @@ module Admin::BaseHelper
   end    
 
   def class_admin
-    if controller.controller_name  =~ /general|advanced/
+    if controller.controller_name  =~ /settings/
     "current"
     end
   end

data/app/helpers/admin/general_helper.rb

@@ -1,18 +1,2 @@
 module Admin::GeneralHelper
-  require 'find'
-  
-  def fetch_langs
-    options = content_tag(:option, "en_US", :value => 'en_US')
-	Find.find(RAILS_ROOT + "/lang") do |lang|
-	  if lang =~ /\.rb$/
-        lang_pattern = File.basename(lang).gsub(".rb", '')
-        if this_blog.lang == lang_pattern
-          options << content_tag(:option, lang_pattern, :value => lang_pattern, :selected => 'selected')
-        else
-          options << content_tag(:option, lang_pattern, :value => lang_pattern)
-        end
-	  end
-	end
-	options
-  end
 end

data/app/helpers/admin/settings_helper.rb

@@ -0,0 +1,18 @@
+module Admin::SettingsHelper
+  require 'find'
+  
+  def fetch_langs
+    options = content_tag(:option, "en_US", :value => 'en_US')
+	Find.find(RAILS_ROOT + "/lang") do |lang|
+	  if lang =~ /\.rb$/
+        lang_pattern = File.basename(lang).gsub(".rb", '')
+        if this_blog.lang == lang_pattern
+          options << content_tag(:option, lang_pattern, :value => lang_pattern, :selected => 'selected')
+        else
+          options << content_tag(:option, lang_pattern, :value => lang_pattern)
+        end
+	  end
+	end
+	options
+  end
+end

data/app/models/blog.rb

@@ -78,8 +78,8 @@ class Blog < CachedModel
   setting :itunes_copyright,           :string, ''
 
   # Mostly Behaviour
-  setting :text_filter,                :string, ''
-  setting :comment_text_filter,        :string, ''
+  setting :text_filter,                :string, 'markdown smartypants'
+  setting :comment_text_filter,        :string, 'markdown smartypants'
   setting :limit_article_display,      :integer, 10
   setting :limit_rss_display,          :integer, 10
   setting :default_allow_pings,        :boolean, false

data/app/models/blog_sweeper.rb

@@ -2,6 +2,7 @@ class BlogSweeper < ActionController::Caching::Sweeper
   observe Category, Blog, Sidebar, User, Article, Page, Categorization
 
   def after_comments_create
+    logger.debug 'BlogSweeper#after_comments_create'
     expire_for(controller.send(:instance_variable_get, :@comment))
   end
 
@@ -9,16 +10,19 @@ class BlogSweeper < ActionController::Caching::Sweeper
   alias_method :after_articles_comment, :after_comments_create
 
   def after_comments_destroy
+    logger.debug 'BlogSweeper#after_comments_destroy'
     expire_for(controller.send(:instance_variable_get, :@comment), true)
   end
 
   alias_method :after_articles_nuke_comment, :after_comments_destroy
 
   def after_articles_trackback
+    logger.debug 'BlogSweeper#after_articles_trackback'
     expire_for(controller.send(:instance_variable_get, :@trackback))
   end
 
   def after_articles_nuke_trackback
+    logger.debug 'BlogSweeper#after_articles_nuke_trackback'
     expire_for(controller.send(:instance_variable_get, :@trackback), true)
   end
 
@@ -61,13 +65,17 @@ class BlogSweeper < ActionController::Caching::Sweeper
 
   def sweep_articles
     expire_fragment(%r{.*/articles/.*})
-    PageCache.zap_pages('index.*', 'articles')
+    unless Blog.default && Blog.default.cache_option == "caches_action_with_params"
+      PageCache.zap_pages('index.*', 'articles')
+    end
   end
 
   def sweep_pages(record = nil)
     expire_fragment(/.*\/pages\/.*/)
     expire_fragment(/.*\/view_page.*/)
-    PageCache.zap_pages('pages')
+    unless Blog.default && Blog.default.cache_option == "caches_action_with_params"
+      PageCache.zap_pages('pages')
+    end
   end
 
   def logger

data/app/models/page_cache.rb

@@ -4,19 +4,25 @@ class PageCache < ActiveRecord::Base
   end
 
   def self.sweep_all
-    self.zap_pages('index.*', 'articles', 'pages')
+    logger.debug "PageCache - sweep_all called"
+    unless Blog.default && Blog.default.cache_option == "caches_action_with_params"
+      self.zap_pages('index.*', 'articles', 'pages')
+    end
   end
 
   def self.sweep_theme_cache
+    logger.debug "PageCache - sweep_theme_cache called"
     self.zap_pages('images/theme', 'stylesheets/theme', 'javascripts/theme')
   end
 
   def self.zap_pages(*paths)
+    logger.debug "PageCache - About to zap: #{paths.inspect}"
     srcs = paths.inject([]) { |o,v|
       o + Dir.glob(public_path + "/#{v}")
     }
     return true if srcs.empty?
-    trash = Dir::tmpdir
+    logger.debug "PageCache - About to delete: #{srcs.inspect}"
+    trash = Dir::tmpdir + "/typodel.#{UUID.random_create}"
     FileUtils.makedirs(trash)
     FileUtils.mv(srcs, trash, :force => true)
     FileUtils.rm_rf(trash)

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

@@ -11,169 +11,7 @@
     <% form_tag :action => 'update' do %>
 
 <div class="admin">
-    <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>
-        </ul>
-    </fieldset>
 
-    <fieldset id="publish" class="set">
-        <legend><%= _("Publish")%></legend>
-        <ul>
-            <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>
-            <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>
-
-        </ul>
-    </fieldset>
-
-    <fieldset id="seo" class="set" style="margin-top:10px;">
-        <legend><%= _("Search Engine Optimisation")%></legend>
-        <ul>
-            <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>
-    </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><%= _("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>
-            <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>
-
-    <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>
-    </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>
-    </fieldset>
 
     <div id="operations" class="paginate r">
     <%= save(_("Save Settings")) %>

data/app/views/admin/general/update_database.html.erb

@@ -34,7 +34,7 @@
 
 
 <% form_tag :action => 'migrate' do %>
- <div id="operations" class="tasks">
+ <div id="operations" class="paginate l">
    <% if @current_version == @needed_version %>
      <strong><%= _("You are up to date!")%></strong>
    <% else %>

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

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

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

@@ -0,0 +1,77 @@
+	<% @page_heading = _('Feedback') %>
+
+  <% content_for('tasks') do -%>
+	<%= subtab _("General settings"), "", {:controller => "settings"} %>
+	<%= subtab _("Read"), "", { :controller => 'settings', :action => 'read' } %>
+	<%= subtab _("Write"), "", { :controller => 'settings', :action => 'write' } %>
+	<%= subtab _("Feedback"), "current", { :controller => 'settings', :action => 'feedback' } %>
+	<%= subtab _("Spam"), "", { :controller => 'settings', :action => 'spam' } %>
+	<%= subtab _("Podcasts"), "", { :controller => 'settings', :action => 'podcast' } %>
+  <% end -%> 
+
+	<% form_tag :action => 'feedback' 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>
+      <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><%= _("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>
+          <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>
+  </fieldset>
+<%= render :partial => 'submit' %>
+</div>
+  <% end %>