typo 5.1.1 → 5.1.2

data/app/controllers/admin/content_controller.rb

@@ -142,7 +142,6 @@ class Admin::ContentController < Admin::BaseController
   def real_action_for(action); { 'add' => :<<, 'remove' => :delete}[action]; end
 
   def new_or_edit
-    @drafts = Article.find(:all, :conditions => "state='draft'")
     get_or_build_article
     params[:article] ||= {}
     params[:bookmarklet_link] && post_from_bookmarklet
@@ -152,6 +151,7 @@ class Admin::ContentController < Admin::BaseController
 
     setup_categories
     @selected = @article.categories.collect { |c| c.id }
+    @drafts = Article.find(:all, :conditions => "state='draft'")
     if request.post?
       set_article_author
       save_attachments
@@ -208,18 +208,16 @@ class Admin::ContentController < Admin::BaseController
   end
 
   def get_or_build_article
-    @article = case params[:action]
-               when 'new'
-                 returning(Article.new) do |art|
-                   art.allow_comments = this_blog.default_allow_comments
-                   art.allow_pings    = this_blog.default_allow_pings
-                   art.published      = true
-                 end
-               when 'edit'
-                 Article.find(params[:id])
-               else
-                 raise "Don't know how to get article for action: #{params[:action]}"
+    @article = case params[:id]
+             when nil
+               returning(Article.new) do |art|
+                 art.allow_comments = this_blog.default_allow_comments
+                 art.allow_pings    = this_blog.default_allow_pings
+                 art.published      = true
                end
+            else
+              Article.find(params[:id])
+            end
   end
 
   def setup_categories

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
-  protect_from_forgery :secret => '1c8b953667056f1a3c324d6b369f6158', :only => [:create, :edit, :update]
+  protect_from_forgery :secret => '1c8b953667056f1a3c324d6b369f6158', :only => [:edit, :update, :delete]
+  
   before_filter :reset_local_cache, :fire_triggers, :load_lang
   after_filter :reset_local_cache
 

data/app/controllers/comments_controller.rb

@@ -24,6 +24,10 @@ class CommentsController < FeedbackController
   end
 
   def preview
+    if !session
+      session :session => new
+    end
+    
     if (params[:comment][:body].blank? rescue true)
       render :nothing => true
       return

data/app/helpers/admin/base_helper.rb

@@ -67,9 +67,11 @@ module Admin::BaseHelper
   end
 
   def link_to_show(record, controller = @controller.controller_name)
-    link_to image_tag('admin/show.png', :alt => "show", :title => "Show content"), 
-      {:controller => controller, :action => 'show', :id => record.id}, 
-      {:class => "lbOn"}
+    if record.published?
+      link_to image_tag('admin/show.png', :alt => "show", :title => "Show content"), 
+        {:controller => controller, :action => 'show', :id => record.id}, 
+        {:class => "lbOn"}
+      end
   end
 
   def link_to_edit(record, controller = @controller.controller_name)

data/app/helpers/admin/content_helper.rb

@@ -12,4 +12,12 @@ module Admin::ContentHelper
       'searched[published]' => @search[:published] }
   end
 
+  def link_to_destroy_draft(record, controller = @controller.controller_name)
+    if record.state.to_s == "Draft"
+      link_to(_("Destroy this draft"), 
+        { :controller => controller, :action => 'destroy', :id => record.id },
+          :confirm => "Are you sure?", :method => :post )
+    end
+  end
+
 end

data/app/views/admin/content/_articles.html.erb

@@ -38,7 +38,7 @@
   <td><%= article.published_at.strftime("%d/%m/%Y at %H:%M") %></td>
   <td><%= author_link(article)%></td>
   <td class="operation"><%= (article.published?) ? image_tag('admin/checked.png', :alt => "online", :title => _("Online")) : image_tag('admin/cancel.png', :alt => "offline", :title => _("Offline")) %></td>
-  <td class="operation"><%= link_to_show article if article.published? %></td>
+  <td class="operation"><%= link_to_show article %></td>
   <td class="operation"><%= link_to_edit_with_profiles article %></td>
   <td class="operation"><%= link_to_destroy_with_profiles article %></td>
 </tr>

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

@@ -79,6 +79,7 @@
 <br />
 
 <p class="paginate r">
+  <%= link_to_destroy_draft @article %>
   <input type="submit" name="article[draft]" class="submit" value="<%= _('Save as draft')%> &raquo;" />
   <%= save("Publish" + " &raquo;") %>
 </p>
@@ -86,7 +87,7 @@
 <% if this_blog.editor == 0 %>
   <%= hidden_field_tag 'id', @article.id unless @article.id.nil? %>
   <%= observe_form "article_form",
-      :frequency => 5,
+      :frequency => 30,
       :update => 'autosave',
       :url => { :action => "autosave" }  %>
 <% end %>

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

@@ -40,7 +40,7 @@
     <%= image_tag('admin/cancel.png', :alt => "offline", :title => _("Offline"))  %>
     <% end %>
     </td>
-    <td class='operation'><%= link_to_show page if page.published?  %></td>
+    <td class='operation'><%= link_to_show page %></td>
     <td class='operation'><%= link_to_edit_with_profiles page %></td>
     <td class="operation"><%= link_to_destroy_with_profiles page %></td>
   </tr>

data/config/environments/development.rb

@@ -8,7 +8,7 @@ config.whiny_nils        = true
 
 # Show full error reports and disable caching
 config.action_controller.consider_all_requests_local = true
-config.action_controller.perform_caching             = false
+config.action_controller.perform_caching             = true
 
 # Don't care if the mailer can't send
 config.action_mailer.raise_delivery_errors = false

data/config/initializers/access_rules.rb

@@ -41,7 +41,7 @@
 # 
 # For example, whe can decide that an Account with role :customers can see only, the module project :store.
 
-AccessControl.map :require => [ :admin, :publisher ]  do |map|
+AccessControl.map :require => [ :admin, :publisher, :contributor ]  do |map|
   map.permission "admin/base"
 
   map.project_module :dashboard, "admin/dashboard" do |project|

data/lib/tasks/release.rake

@@ -1,7 +1,7 @@
 require 'rake/gempackagetask'
 require 'rake/contrib/rubyforgepublisher'
 
-PKG_VERSION = "5.1.1"
+PKG_VERSION = "5.1.2"
 PKG_NAME = "typo"
 PKG_FILE_NAME = "#{PKG_NAME}-#{PKG_VERSION}"
 RUBY_FORGE_PROJECT = 'typo'

data/lib/typo_version.rb

@@ -1 +1 @@
-TYPO_VERSION = '5.1.1'
+TYPO_VERSION = '5.1.2'

data/public/javascripts/lang/en_US.js

@@ -0,0 +1,21 @@
+window._lang = "en_US" ;
+window._l10s = window._l10s || { } ;
+window._l10s["en_US"] = {
+ 
+  "#{0} from now": "#{0} from now",
+  "#{0} ago": "#{0} ago",
+  "on #{0}": "on #{0}",
+  "less than a minute": "less than a minute",
+  "#{0} minute": "#{0} minute",
+  "#{0} minutes": "#{0} minutes",
+  "about one hour": "about one hour",
+  "#{0} hours": "#{0} hours",
+  "one day": "one day",
+  "about one day": "about one day",
+  "#{0} days": "#{0} days"
+
+} ;
+
+
+
+

data/public/stylesheets/user-styles.css

@@ -14,3 +14,9 @@
         display: block;
         padding: 8px;
 }
+
+.gravatar {
+	float: left;
+	margin-right: 3px;
+	margin-bottom: 3px;
+}

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: typo
 version: !ruby/object:Gem::Version 
-  version: 5.1.1
+  version: 5.1.2
 platform: ruby
 authors: 
 - "Fr\xC3\xA9d\xC3\xA9ric de Villamil"
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-07-21 00:00:00 +02:00
+date: 2008-07-26 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -1074,6 +1074,7 @@ files:
 - public/javascripts/fckeditor/license.txt
 - public/javascripts/lang
 - public/javascripts/lang/default.js
+- public/javascripts/lang/en_US.js
 - public/javascripts/lang/fr_FR.js
 - public/javascripts/lightbox.js
 - public/javascripts/prototype.js