typo 4.1 → 4.1.1

data/Rakefile

@@ -7,4 +7,4 @@ require 'rake'
 require 'rake/testtask'
 require 'rake/rdoctask'
 
-require 'tasks/rails'
+require 'tasks/rails'

data/TODO-4.2

@@ -0,0 +1,14 @@
+Short Term To-Do for 4.2
+------------------------
+
+– Fix bugs
+– Finish admin ergonomic revamping
+– Change admin theme
+– Change default theme for something more modern
+– Convert submited patches as plugins (see on the trac) 
+– Add users contributed translations (ES, JP, BR...)
+
+If I have the time :
+– Real mutiple users roles
+– Multi blogs
+– Go to the grocery and buy more beer

data/TODO.MULTIUSERS

@@ -0,0 +1,45 @@
+This documents aims at describing what I plan for Typo to go multiusers
+
+A profile :
+	has many right
+	
+A user :
+	has one profile
+	has many rights
+
+When a user is created, he's given a profile. His profile is marked as "clean"
+The administrator can assign specific rights to that user. His profile is marked as "tainted"
+When a profile is modified, changes are made on users who have a "clean" profile.
+
+Here are the profiles and rights :
+
+Administrator
+	- admin the blog
+	- create, edit, delete users
+	- create, edit, delete roles
+	- write, edit, publish, unpublish, delete drafts
+	- write, edit, publish, unpublish, delete posts
+	- write comments
+	- edit / delete his own comments
+	- edit / delete other people's comments
+	- moderate comments marked as spam
+	
+Publisher
+	- write, edit, publish, unpublish, delete drafts
+	- write, edit, publish, unpublish, delete posts
+	- write comments
+	- edit / delete his own comments
+	- moderate comments marked as spam
+
+Writer
+	- write, edit, publish, unpublish, delete drafts
+	- write comments
+
+Moderator
+	- write comments
+	- edit / delete his own comments
+	- edit / delete other people's comments
+	- moderate comments marked as spam
+
+Subscriber
+	- write comments

data/app/controllers/admin/base_controller.rb

@@ -1,6 +1,24 @@
 class Admin::BaseController < ApplicationController
   cattr_accessor :look_for_migrations
   @@look_for_migrations = true
+  if Blog.default && Blog.default.editor == 2
+    uses_tiny_mce(
+      :options => {
+        :theme => 'advanced',
+        :theme_advanced_toolbar_location => "top",
+        :theme_advanced_toolbar_align => "left",
+        :theme_advanced_resizing => true,
+        :theme_advanced_resize_horizontal => false,
+        :paste_auto_cleanup_on_paste => true,
+        :theme_advanced_buttons1 => %w{formatselect bold italic underline strikethrough
+                                       separator justifyleft justifycenter justifyright
+                                       separator bullist numlist forecolor backcolor
+                                       separator link unlink image},
+        :theme_advanced_buttons2 => [],
+        :theme_advanced_buttons3 => [],
+        :plugins => %w{contextmenu paste}},
+      :only => [:new, :edit])
+  end
 
   layout 'administration'
   before_filter :login_required, :except => [ :login, :signup ]

data/app/controllers/admin/general_controller.rb

@@ -1,4 +1,7 @@
 class Admin::GeneralController < Admin::BaseController
+  # Deprecation warning for plugins removal
+  before_filter :deprecation_warning
+  
   def index
     if this_blog.base_url.blank?
       this_blog.base_url = blog_base_url
@@ -38,5 +41,16 @@ class Admin::GeneralController < Admin::BaseController
     end
   end
 
+  # Deprecation warning for plugins removal
+  def deprecation_warning
+    if this_blog.deprecation_warning == 1
+      Blog.transaction do
+        this_blog.deprecation_warning = 0
+        this_blog.save
+      end
+      flash[:notice] = "Deprecation warning: please, notice that most plugins are going to be removed from the main engine in the next version. <a href='http://blog.typosphere.org/articles/2007/04/15/the-futur-of-typo-sidebar-plugins'>Read more on the official Typo blog</a>"
+    end
+  end
+
   private
 end

data/app/controllers/application.rb

@@ -2,7 +2,8 @@
 # Likewise will all the methods added be available for all controllers.
 class ApplicationController < ActionController::Base
   include LoginSystem
-  before_filter :reset_local_cache, :fire_triggers
+  include Sitealizer
+  before_filter :use_sitealizer, :reset_local_cache, :fire_triggers
   after_filter :reset_local_cache
 
 

data/app/controllers/articles_controller.rb

@@ -89,33 +89,30 @@ class ArticlesController < ContentController
     end
 
     if request.post?
-      begin
-        @article = this_blog.published_articles.find(params[:id])
-        params[:comment].merge!({:ip => request.remote_ip,
-                                :published => true,
-                                :user => session[:user],
-                                :user_agent => request.env['HTTP_USER_AGENT'],
-                                :referrer => request.env['HTTP_REFERER'],
-                                :permalink => @article.permalink_url})
-        @comment = @article.comments.build(params[:comment])
-        @comment.author ||= 'Anonymous'
-        @comment.save!
-        add_to_cookies(:author, @comment.author)
-        add_to_cookies(:url, @comment.url)
-
-        set_headers
-        render :partial => "comment", :object => @comment
-      rescue ActiveRecord::RecordInvalid
-        STDERR.puts @comment.errors.inspect
-        render_error(@comment)
-      end
+      @article = this_blog.published_articles.find(params[:id])
+      params[:comment].merge!({:ip => request.remote_ip,
+                               :published => true,
+                               :user => session[:user],
+                               :user_agent => request.env['HTTP_USER_AGENT'],
+                               :referrer => request.env['HTTP_REFERER'],
+                               :permalink => @article.permalink_url})
+      @comment = @article.comments.build(params[:comment])
+      @comment.author ||= 'Anonymous'
+      @comment.save
+      add_to_cookies(:author, @comment.author)
+      add_to_cookies(:url, @comment.url)
+
+      set_headers
+      render :partial => "comment", :object => @comment
     end
   end
 
   # Receive trackbacks linked to articles
   def trackback
     @error_message = catch(:error) do
-      if params[:__mode] == "rss"
+      if this_blog.global_pings_disable
+        throw :error, "Trackback not saved"
+      elsif params[:__mode] == "rss"
         # Part of the trackback spec... will implement later
         # XXX. Should this throw an error?
       elsif !(params.has_key?(:url) && params.has_key?(:id))

data/app/helpers/admin/base_helper.rb

@@ -29,7 +29,7 @@ module Admin::BaseHelper
     unless session[:user]
       link_to "log in", :controller => "/accounts", :action=>"login"
     else
-      link_to "log out", :controller => "/accounts", :action=>"logout"
+      link_to _("log out"), :controller => "/accounts", :action=>"logout"
     end
   end
 
@@ -42,7 +42,7 @@ module Admin::BaseHelper
   end
 
   def cancel(url = {:action => 'list'})
-    link_to "Cancel", url
+    link_to _("Cancel"), url
   end
 
   def save(val = "Store")
@@ -54,7 +54,7 @@ module Admin::BaseHelper
   end
 
   def link_to_show(record)
-    link_to image_tag('go.png'), :action => 'show', :id => record.id
+    link_to image_tag('show.png'), :action => 'show', :id => record.id
   end
 
   def link_to_edit(record)
@@ -88,7 +88,7 @@ module Admin::BaseHelper
   end
 
   def task_overview
-    task('Back to overview', 'list')
+    task(_('Back to overview'), 'list')
   end
 
   def task_new(title)

data/app/helpers/admin/feedback_helper.rb

@@ -3,10 +3,10 @@ module Admin::FeedbackHelper
     link_to truncate(article.title, 60), :controller => '/admin/content', :action => 'edit', :id => article.id
   end
 
-  def task_showmod(title)
+  def task_showmod(title, action)
     content_tag :li,
-      link_to(title, :published => (title =~ /spam/ ? 'f' : ''),
-                     :confirmed => (title =~ /unconfirmed/ ? 'f' : ''),
+      link_to(title, :published => (action =~ /spam/ ? 'f' : ''),
+                     :confirmed => (action =~ /unconfirmed/ ? 'f' : ''),
                      :search => params[:search])
   end
 end

data/app/helpers/application_helper.rb

@@ -46,12 +46,8 @@ module ApplicationHelper
   end
 
   def js_distance_of_time_in_words_to_now(date)
-    if date
-      time = date.utc.strftime("%a, %d %b %Y %H:%M:%S GMT") 
-    else
-      time = Time.now
-    end
-      "<span class=\"typo_date\" title=\"#{time}\">#{time}</span>" 
+    time = date.utc.strftime("%a, %d %b %Y %H:%M:%S GMT")
+    "<span class=\"typo_date\" title=\"#{time}\">#{time}</span>"
   end
 
   def meta_tag(name, value)

data/app/helpers/sidebar_helper.rb

@@ -1,6 +1,6 @@
 module SidebarHelper
-  def render_sidebars
-    this_blog.sidebars.inject('') do |acc, sb|
+  def render_sidebars(*sidebars)
+    (sidebars.blank? ? this_blog.sidebars : sidebars).inject('') do |acc, sb|
       @sidebar = sb
       sb.parse_request(contents, params)
       controller.response.lifetime = sb.lifetime if sb.lifetime

data/app/models/blog.rb

@@ -78,11 +78,15 @@ class Blog < CachedModel
   setting :ping_urls,                  :string, "http://rpc.technorati.com/rpc/ping\nhttp://ping.blo.gs/\nhttp://rpc.weblogs.com/RPC2"
   setting :send_outbound_pings,        :boolean, true
   setting :email_from,                 :string, 'typo@example.com'
+  setting :editor,                     :integer, 1
 
   # Jabber config
   setting :jabber_address,             :string, ''
   setting :jabber_password,            :string, ''
 
+  #deprecation warning for plugins removal
+  setting :deprecation_warning,        :integer, 1
+
   def initialize(*args)
     super
     # Yes, this is weird - PDC
@@ -109,7 +113,11 @@ class Blog < CachedModel
     settings[:blog_id] = self.id
     article_id = settings[:id]
     settings.delete(:id)
-    trackback = published_articles.find(article_id).trackbacks.create!(settings)
+    article = published_articles.find(article_id)
+    unless article.allow_pings?
+      throw :error, "Trackback not saved"
+    end
+    article.trackbacks.create!(settings)
   end
 
   # Check that all required blog settings have a value.

data/app/models/category.rb

@@ -5,15 +5,15 @@ class Category < ActiveRecord::Base
     :order => "published_at DESC, created_at DESC"
 
   def self.find_all_with_article_counters(maxcount=nil)
-    self.find_by_sql([%{
-      SELECT categories.id, categories.name, categories.permalink, categories.position, COUNT(articles.id) AS article_counter
-      FROM #{Category.table_name} categories
-        LEFT OUTER JOIN #{Category.table_name_prefix}categorizations#{Category.table_name_suffix} articles_categories
-          ON articles_categories.category_id = categories.id
-        LEFT OUTER JOIN #{Article.table_name} articles
-          ON (articles_categories.article_id = articles.id AND articles.published = ?)
-      GROUP BY categories.id, categories.name, categories.position, categories.permalink
-      ORDER BY position
+    self.find_by_sql([%{ 
+      SELECT categories.id, categories.name, categories.permalink, categories.position, COUNT(articles.id) AS article_counter 
+      FROM #{Category.table_name} categories 
+        LEFT OUTER JOIN #{Category.table_name_prefix}categorizations#{Category.table_name_suffix} articles_categories 
+          ON articles_categories.category_id = categories.id 
+        LEFT OUTER JOIN #{Article.table_name} articles 
+          ON (articles_categories.article_id = articles.id AND articles.published = ?) 
+      GROUP BY categories.id, categories.name, categories.position, categories.permalink 
+      ORDER BY position 
       }, true]).each {|item| item.article_counter = item.article_counter.to_i }
   end
 

data/app/models/comment.rb

@@ -21,7 +21,7 @@ class Comment < Feedback
   def notify_user_via_jabber(user)
     if user.notify_via_jabber?
       JabberNotify.send_message(user, "New comment", "A new comment was posted to '#{article.title}' on #{blog.blog_name} by #{author}: 
-        #{body} (#{controller.url_for :anchor => 'comments', :action => 'read', :id => article.id})", self.body_html) 
+        #{body}", self.html(:body)) 
     end
   end
 

data/app/models/content_state/presumed_ham.rb

@@ -29,9 +29,9 @@ module ContentState
       'Ham?'
     end
     
-    def send_notifications(content, controller) 
+    def send_notifications(content) 
       content.interested_users.each do |user| 
-        content.send_notification_to_user(controller, user) 
+        content.send_notification_to_user(user) 
       end
     end   
   end

data/app/models/resource.rb

@@ -1,3 +1,5 @@
+require 'tempfile'
+
 class Resource < ActiveRecord::Base
   validates_uniqueness_of :filename
   after_destroy :delete_filename_on_disk

data/app/views/admin/categories/_categories.rhtml

@@ -1,14 +1,18 @@
 <table>
   <tr>
-    <th><%= _("Category title")%></th>
-    <th><%= _("Articles")%></th>
-    <th><%= _("Delete")%></th>
+    <th><%= _("Category title") %></th>
+    <th><%= _("Articles") %></th>
+    <th><%= _("Status") %></th>
+    <th colspan="3"><%= _("Action") %></th>
   </tr>
   <% for category in @categories -%>
   <tr <%= alternate_class -%> id="category_<%= category.id -%>">
-    <td><%= image_tag 'checked.gif' %> <%= link_to category.name, :action => 'show', :id => category.id %></td>
-    <td><%= link_to pluralize(category.articles.size, 'article'), :action => 'show', :id => category.id %></td>
-    <td class="operation"><%= link_to_destroy category %></td>    
+    <td><%= category.name %></td>
+    <td><%= pluralize(category.articles.size, 'article') %></td>
+    <td class="operation"><%= image_tag 'checked.png' %></td>
+    <td class="operation"><%= link_to_show category %></td>
+    <td class="operation"><%= link_to_edit category %></td>
+    <td class="operation"><%= link_to_destroy category %></td>
   </tr>  
   <% end -%>
 </table>

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

@@ -1,5 +1,7 @@
   <% @page_heading = _('Categories') %>
-
+  <% content_for('tasks') do %>
+    <%= task_overview %>
+  <% end %>
   <% form_tag :action=>"edit", :id => @category.id do %>
   <h3><% _("Editing category")%></h3>
   <div class="form">

data/app/views/admin/comments/_form.rhtml

@@ -2,15 +2,15 @@
 <!--[form:comment]-->
 <p>
   <label for="comment_author"><%= _("Author")%>:</label><br/>
-  <%= text_field 'comment', 'author'  %>
+  <%= text_field 'comment', 'author', "value" => (session[:user][:name] if controller.action_name == "new") %>
 </p>
 <p>
   <label for="comment_url"><%= _("Url") %>:</label><br/>
-  <%= text_field 'comment', 'url'  %>
+  <%= text_field 'comment', 'url', "value" => (this_blog.base_url if controller.action_name == "new")  %>
 </p>
 <p>
   <label for="comment_email"><%= _("Email")%>:</label><br/>
-  <%= text_field 'comment', 'email'  %>
+  <%= text_field 'comment', 'email', "value" => (session[:user][:email] if controller.action_name == "new") %>
 </p>
 <p>
   <label for="comment_body"><%= _("Body")%>:</label><br/>

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

@@ -13,16 +13,18 @@
       <th><%= _("Body")%></th>
       <th><%= _("IP")%></th>
       <th><%= _("Posted date")%></th>
-      <th><%= _("Edit")%></th>
-      <th><%= _("Delete")%></th>
+	  <th><%= _("Status")%></th>
+	  <th colspan="3"><%= _("Action") %></th>
     </tr>
     <% for comment in @comments -%>
     <tr>
-      <td class="field"><%= image_tag 'checked.gif' %> <%=link_to_unless comment.url.blank?, h(comment.author), comment.url %></td>
+      <td class="field"> <%=link_to_unless comment.url.blank?, h(comment.author), comment.url %></td>
       <td class="field"><%=h comment.email %></td>
-      <td class="field"><%=link_to truncate((comment.body).strip_html), :action => 'show', :id => comment.id %> <%= link_to_permalink comment,image_tag('go.png') %></td>
+      <td class="field"><%= link_to_permalink comment, truncate((comment.body).strip_html) %></td>
       <td class="field"><%=h comment.ip %></td>
-      <td class="field"><%=h distance_of_time_in_words_to_now(comment.created_at) %></td>
+      <td class="field"><%=comment.created_at.strftime("%d/%m/%Y at %H:%M") %></td>
+	  <td class="operation"><%= image_tag 'checked.png' %></td>
+	  <td class="operation"><%= link_to_show comment %></td>
       <td class="operation"><%= link_to_edit comment %></td>
       <td class="operation"><%= link_to_destroy comment %></td>    
     </tr>  

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

@@ -1,5 +1,7 @@
   <% @page_heading = _("Comments for") + " #{ link_to h(@article.title), :controller => '/admin/content', :action => 'show', :id => @article }" %>
-
+  <% content_for('tasks') do %>
+	<%= task_overview %>
+  <% end %>
   <h3><%= _("Creating comment")%></h3>
 
   <% form_tag :action=>"new" do %>

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

@@ -1,5 +1,7 @@
   <% @page_heading = _("Comments for") + " #{ link_to h(@article.title), :controller => '/admin/content', :action => 'show', :id => @article }" %>
-
+  <% content_for('tasks') do %>
+	<%= task_overview %>
+  <% end %>
   <div class="form">	
     <label><%= _("Author")%>:</label> <span class="static"><%=h @comment.author %></span><br/>
     <label><%= _("URL")%>:</label> <span class="static"><%=h @comment.url %></span><br/>

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

@@ -10,7 +10,7 @@
 <% for article in @articles %>
 <tr <%= alternate_class %>>
   <td> <%= link_to_permalink article, h(article.title) %></td>
-  <td><%= article.published_at.strftime("%d/%m/%Y at %H:%M")%></td>
+  <td><%= article.published_at.strftime("%d/%m/%Y at %H:%M") %></td>
   <td><%= link_to _(pluralize(article.comments.size, 'comment')), :controller => '/admin/comments', :article_id => article, :action => 'list' %></td>
   <td><%= link_to _(pluralize(article.trackbacks.size, 'trackback')), :controller => '/admin/trackbacks', :article_id => article, :action => 'list' %></td>
   <td class="operation"><%= (article.published?) ? image_tag('checked.png', :alt => "online", :title => _("Online")) : image_tag('cancel.png', :alt => "offline", :title => _("Offline")) %></td>

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

@@ -3,7 +3,7 @@
 <fieldset class="set admin" style="display: block">
   <legend><%=_("Article Body")%></legend>
   <iframe id="preview" class="post" style="display: none;"></iframe>
-  <div style="width: 48%; float: left;">
+  <div <%='style="width: 48%; float: left;"' if this_blog.editor == 1 %>>
      <ul>
        <li>
           <label for="article_title" class="block">Title:</label>
@@ -14,10 +14,12 @@
           <%= markup_help_popup @article.text_filter, image_tag('help.png', :alt => "markup help", :title => "Markup Help") %>
           <%= text_area 'article', 'body', :rows => 25, :style => 'width: 100%;'  %>
        </li>
+       <li>
+          <%= link_to_function _("Toggle Extended Content") + " (+/-)",update_page { |page| page.visual_effect(:toggle_blind, "extended", :duration => 0.5) } %>
+       </li>
        <li id="extended"<%- if @article.extended.blank? -%> style="display:none;"<%- end -%>>
           <label for="article_extended"><%= _("Extended Content")%>:</label>
           <%= text_area 'article', 'extended', :rows => 30, :style => 'width: 100%;'  %>
-          <%= link_to_function "Toggle Extended Content (+/-)",update_page { |page| page.visual_effect(:toggle_blind, "extended", :duration => 0.5) } %>
        </li>
        <li>
           <label for="categories" class="block"><%= _("Categories")%>:</label>

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

@@ -1,5 +1,6 @@
 <% content_for('tasks') do %>
 	<%= tab _("Write a Page"), :controller=>"pages", :action=>"new" %>
+	<li><%= task_overview %></li>
 <% end %> 
 
   <% @page_heading = _('Write an Article') %>

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

@@ -1,10 +1,10 @@
 <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>
+    <h2><%= @article[:title] %></h2>
+    <p class="auth">
+        <%_("Posted by")%>
+        <%= author_link(@article) %>
+        <%= js_distance_of_time_in_words_to_now(@article[:published_at] || Time.now) %>
+    </p>
 
-	<%= @article.html %>
-</div>
+    <%= @article.html %>
+</div>

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

@@ -12,6 +12,8 @@
   </td>
   <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"><%=item.created_at.strftime("%d/%m/%Y at %H:%M")%></td>
+  <td class="operation"><%= link_to image_tag('show.png', :alt => "show", :title => "Show content"), :controller => 'comments', :article_id => item.article_id, :action => 'show', :id => item.id %></td>
+  <td class="operation"><%= link_to image_tag('edit.png', :alt => "edit", :title => "Edit content"), :controller => 'comments', :article_id => item.article_id, :action => 'edit', :id => item.id %></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,9 +1,9 @@
 <% @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'), "Limit to spam") %>
+  <%= task_showmod(_("Limit to unconfirmed"), "Limit to unconfirmed") %>
+  <%= task_showmod(_("Limit to unconfirmed spam"), "Limit to unconfirmed spam") %>
   <%= tab _("Blacklist"), :controller=>"blacklist", :action=>"index"%>
 <% end %>
 
@@ -34,7 +34,7 @@
     <th><%= _("Body")%></th>
     <th><%= _("IP")%></th>
     <th><%= _("Posted date")%></th>
-    <th><%= _("Delete") %></th>
+    <th colspan="3"><%= _("Action") %></th>
   </tr>
   <%= render :partial => 'item', :collection => @feedback %>
   </table>

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

@@ -81,8 +81,21 @@
 
 	<fieldset id="write" class="set">
 		<legend><%= _("Write")%></legend>
-
 		<ul>
+			<li>
+				<label class="float"><%= _("Editor")%>:</label>
+				<input type="radio" name="setting[editor]" value="2" id="editor_2" <%= 'checked="checked"' if this_blog.editor == 2 %>/>
+				<label for="editor_2"><%= _("Use visual rich editor")%></label>
+				<span class="float">
+					<input type="radio" name="setting[editor]" value="1" id="editor_1" <%= 'checked="checked"' if this_blog.editor == 1 %>/>
+					<label for="editor_1"><%= _("Use simple editor with live preview (default)")%></label>
+				</span>
+				<span class="float">
+					<input type="radio" name="setting[editor]" value="0" id="editor_0" <%= 'checked="checked"' if this_blog.editor == 0 %>/>
+				    <label for="editor_0"><%= _("Use simple editor without live preview")%></label>
+				</span>
+		  	</li>
+
 			<li>
 		        <label class="float" for="text_filter"><%= _("Article filter")%>:</label>
 		        <select name="setting[text_filter]" id="text_filter">

data/app/views/admin/pages/_form.rhtml

@@ -3,7 +3,7 @@
 <fieldset class="set admin" style="display: block">
   <legend><%= _("Page Body")%></legend>
   <iframe id="preview" class="post" style="display: none;"></iframe>
-  <div style="width: 48%; float: left;">
+  <div <%='style="width: 48%; float: left;"' if this_blog.editor == 1 %>>
      <ul>
        <li>
           <label for="page_title" class="block"><%= _("Title")%>:</label>

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

@@ -1,4 +1,4 @@
-  <% @page_heading = <%= _("Pages") %>
+  <% @page_heading = _("Pages") %>
 
   <% content_for('tasks') do %>
     <%= task_show _("Show this page"), @page.id %>

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

@@ -1,5 +1,6 @@
 <% content_for('tasks') do %>
 	<%= tab _("Write an Article"), :controller=>"content", :action=>"new" %>
+	<li><%= task_overview %></li>
 <% end %> 
 
   <% @page_heading = _('Write a Page') %>

data/app/views/admin/shared/_edit.rhtml

@@ -6,7 +6,7 @@
   <%= render :partial => "form" %>
 
 <div id="operations" class="tasks">
-  <p class="r"><%= save(_("Save")) %> or <%= cancel %></p>
+  <p class="r"><%= save(_("Save")) %> <%= _("or") %> <%= cancel %></p>
 </div>
 
 <% end %>
@@ -14,4 +14,4 @@
 <%= observe_form "#{form_type}_form",
       :frequency => 2,
       :complete => "$('preview').src = request.responseText; Element.show('preview');",
-      :url => { :action => "preview" } %>
+      :url => { :action => "preview" } if this_blog.editor == 1  %>