typo 5.1.98 → 5.2

data/app/controllers/admin/blacklist_controller.rb

@@ -17,15 +17,21 @@ class Admin::BlacklistController < Admin::BaseController
 
     if request.post? and @blacklist_pattern.save
       flash[:notice] = _('Blacklist Pattern was successfully created.')
-      redirect_to :action => 'index'
+    else
+      flash[:error] = _('Blacklist Pattern could not be created.')
     end
+    redirect_to :action => 'index'
   end
 
   def edit
     @blacklist_pattern = BlacklistPattern.find(params[:id])
     @blacklist_pattern.attributes = params[:blacklist_pattern]
-    if request.post? and @blacklist_pattern.save
-      flash[:notice] = _('BlacklistPattern was successfully updated.')
+    if request.post? 
+      if @blacklist_pattern.save
+        flash[:notice] = _('BlacklistPattern was successfully updated.')
+      else
+        flash[:error] = _('Blacklist Pattern could not be updated.')
+      end
       redirect_to :action => 'index'
     end
   end

data/app/controllers/admin/content_controller.rb

@@ -132,7 +132,7 @@ class Admin::ContentController < Admin::BaseController
     
     params[:article] ||= {}
 
-    @resources = Resource.find(:all, :order => 'created_at DESC')
+    @resources = Resource.find(:all, :order => 'filename')
     @article.attributes = params[:article]
     
     setup_categories

data/app/controllers/admin/feedback_controller.rb

@@ -128,6 +128,8 @@ class Admin::FeedbackController < Admin::BaseController
     when 'Confirm Classification of Checked Items'
       update_feedback(items, :confirm_classification!)
       flash[:notice] = _("Confirmed classification of %s item(s)",ids.size)
+    when 'Delete all spam'
+      delete_all_spam
     else
       flash[:notice] = _("Not implemented")
     end
@@ -137,6 +139,13 @@ class Admin::FeedbackController < Admin::BaseController
 
   protected
 
+  def delete_all_spam
+    if request.post?
+      Feedback.delete_all('state in ("presumed_spam", "spam")')
+      flash[:notice] = _("All spam have been deleted")
+    end
+  end
+
   def update_feedback(items, method)
     items.each do |value|
       value.send(method)

data/app/controllers/admin/themes_controller.rb

@@ -1,4 +1,7 @@
 class Admin::ThemesController < Admin::BaseController
+  require 'open-uri'
+  require 'time'
+  require 'rexml/document'
 
   cache_sweeper :blog_sweeper
 
@@ -65,9 +68,52 @@ class Admin::ThemesController < Admin::BaseController
     end
   end
 
+  def catalogue
+    # Data get by this URI is a JSON formatted
+    # The return is a list. All element represent a item
+    # Each item is a hash with this key :
+    #  * uid
+    #  * download_uri
+    #  * name
+    #  * author
+    #  * description
+    #  * tags
+    #  * screenshot_uri
+    url = "http://www.dev411.com/typo/themes_2-1.txt"
+    open(url) do |http|
+      @themes = parse_catalogue_by_json(http.read)
+    end
+  rescue OpenURI::HTTPError
+    @themes = []
+    @error = true
+  end
+
   protected
 
   def zap_theme_caches
     FileUtils.rm_rf(%w{stylesheets javascript images}.collect{|v| page_cache_directory + "/#{v}/theme"})
   end
+
+  private
+  
+  class ThemeItem < Struct.new(:image, :name, :url, :author, :description)
+    def to_s; name; end
+  end
+
+  def parse_catalogue_by_json(body)
+    items_json = JSON.parse(body)
+    items = []
+    items_json.each do |elem|
+      next unless elem['download_uri'] # No display theme without download URI
+      item = ThemeItem.new
+      item.image = elem['screenshot_uri']
+      item.url = elem['download_uri']
+      item.name = elem['name']
+      item.author = elem['author']
+      item.description = elem['description']
+      items << item
+    end
+    items
+    items.sort_by { |item| item.name }
+  end
 end

data/app/controllers/comments_controller.rb

@@ -36,7 +36,11 @@ class CommentsController < FeedbackController
     set_headers
     @comment = Comment.new(params[:comment])
 
-    render :template => 'articles/comment_preview'
+    unless Article.find_by_params_hash(params).comments_closed?
+      render :template => 'articles/comment_preview'
+    else
+      render :text => 'Comment are closed'
+    end
   end
 
   protected

data/app/helpers/admin/base_helper.rb

@@ -169,7 +169,8 @@ module Admin::BaseHelper
   end
   
   def link_to_published(item)
-    item.published? ? link_to_permalink(item, _("published")) : _("unpublished")
+    
+    item.published? ? link_to_permalink(item, _("published"), '', 'published') : "<span class='unpublished'>#{_("unpublished")}</span>"  
   end
   
   def macro_help_popup(macro, text)

data/app/helpers/admin/feedback_helper.rb

@@ -1,2 +1,5 @@
 module Admin::FeedbackHelper
+  def comment_class state
+    (state.to_s =~ /Ham/) ? 'published' : 'unpublished'
+  end
 end

data/app/helpers/application_helper.rb

@@ -205,9 +205,10 @@ module ApplicationHelper
     end.flatten.uniq
     (
     <<-HTML
-<meta http-equiv="content-type" content="text/html; charset=utf-8" />
+  <meta http-equiv="content-type" content="text/html; charset=utf-8" />
   #{ meta_tag 'ICBM', this_blog.geourl_location unless this_blog.geourl_location.blank? }
   #{ meta_tag 'description', @description unless @description.blank? }
+  <meta name="generator" content="Typo #{TYPO_VERSION}">
   #{ meta_tag 'keywords', @keywords unless @keywords.blank? }
   <link rel="EditURI" type="application/rsd+xml" title="RSD" href="#{ url_for :controller => '/xml', :action => 'rsd' }" />
   <link rel="alternate" type="application/atom+xml" title="Atom" href="#{ @auto_discovery_url_atom }" />

data/app/helpers/theme_helper.rb

@@ -1,3 +1,7 @@
 module ThemeHelper
-
+  # adds per theme helpers if file exists. Ugly but at least it works.
+  # Use : just add your methods in yourtheme/helpers/theme_helper.rb
+  unless Blog.default.nil?
+    require "#{Blog.default.current_theme.path}/helpers/theme_helper.rb" if File.exists? "#{Blog.default.current_theme.path}/helpers/theme_helper.rb"
+  end
 end

data/app/models/article.rb

@@ -313,6 +313,7 @@ class Article < Content
     !(allow_comments? && in_feedback_window?)
   end
 
+  # check if time to comment is open or not
   def in_feedback_window?
     self.blog.sp_article_auto_close.zero? ||
       self.created_at.to_i > self.blog.sp_article_auto_close.days.ago.to_i
@@ -470,12 +471,16 @@ class Article < Content
     else
       rss_desc = ""
     end
-
-    post = html(blog.show_extended_on_rss ? :all : :body)
+    
+    # This HTMLEntities is use to convert bad entities on dabase. We can check 
+    # some bad data insert by FCKEditor. We can found to &eacute; by exemple.
+    # If we doesn't change that, the atom feed is invalid
+    coder = HTMLEntities.new
+    post = coder.decode(html(blog.show_extended_on_rss ? :all : :body))
     content = blog.rss_description ? post + rss_desc : post
 
     xml.summary "type" => "xhtml" do
-      xml.div(:xmlns => "http://www.w3.org/1999/xhtml") {xml << html(:body) }
+      xml.div(:xmlns => "http://www.w3.org/1999/xhtml") {xml << coder.decode(html(:body)) }
     end
     if blog.show_extended_on_rss
       xml.content(:type => "xhtml") do

data/app/models/blacklist_pattern.rb

@@ -2,6 +2,7 @@ class BlacklistPattern < ActiveRecord::Base
 end
 
 class RegexPattern < BlacklistPattern
+  validates_presence_of :pattern
   def matches?(string)
     string.match(/#{pattern}/)
   end
@@ -12,6 +13,7 @@ class RegexPattern < BlacklistPattern
 end
 
 class StringPattern < BlacklistPattern
+  validates_presence_of :pattern
   def matches?(string)
     string.match(/\b#{Regexp.quote(pattern)}\b/)
   end

data/app/models/feedback.rb

@@ -5,7 +5,7 @@ class Feedback < Content
 
   include TypoGuid
 
-  validates_age_of :article_id
+  validate_on_create :feedback_not_closed
 
   before_create :create_guid, :article_allows_this_feedback
   before_save :correct_url
@@ -157,4 +157,10 @@ class Feedback < Content
     confirm_classification
     self.save
   end
+
+  def feedback_not_closed
+    if article.comments_closed?
+      errors.add(:article_id, 'Comment are closed')
+    end
+  end
 end

data/app/views/admin/blacklist/_blacklist_patterns.html.erb

@@ -1,13 +1,13 @@
 <table cellspacing="1" cellpadding="0">
-<tr>
-  <th><%= _("Pattern") %></th>
-  <th><%= _("Type") %></th>
-</tr>
-<% for blacklist_pattern in @blacklist_patterns -%>
-<tr <%= alternate_class -%>>  
-  <td class="field"><%= link_to h(blacklist_pattern.pattern), :action => "edit", :id => blacklist_pattern.id %></td>
-  <td class="field"><%= blacklist_pattern.class %></td>
-</tr>  
+  <tr>
+    <th><%= _("Pattern") %></th>
+    <th><%= _("Type") %></th>
+  </tr>
+  <% for blacklist_pattern in @blacklist_patterns -%>
+  <tr <%= alternate_class -%>>  
+    <td><%= link_to h(blacklist_pattern.pattern), :action => "edit", :id => blacklist_pattern.id %></td>
+    <td><%= blacklist_pattern.class %></td>
+  </tr>  
 <% end -%>
-<tr class="paginate"><td colspan="3"><%= will_paginate @blacklist_patterns %></td></tr>
+  <tr class="paginate"><td colspan="3"><%= will_paginate @blacklist_patterns %></td></tr>
 </table>

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

@@ -1,6 +1,6 @@
 <%= error_messages_for 'blacklist_pattern' %>
 
-<ul class="admin set">
+<ul class="admin">
   <li>
     <label for="blacklist_pattern_pattern" class="block"><%= _("Pattern")%></label> 
     <%= text_field 'blacklist_pattern', 'pattern'  %>    

data/app/views/admin/blacklist/_quick_post.html.erb

@@ -3,6 +3,7 @@
   <%= render :partial => "form" %>
 
   <p class="paginate r">
-    <a href="#" onclick="new Effect.BlindUp('quick-post', {duration: 0.4}); return false;" ><%= _("Cancel")%></a> <%= _("or")%> <%= save(_("Save") + "&raquo;") %> 
+    <a href="#" onclick="new Effect.BlindUp('quick-post', {duration: 0.4}); return false;" >
+    <%= _("Cancel")%></a> <%= _("or")%> <%= save(_("Save") + "&raquo;") %> 
   </p>
 <% end %>

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

@@ -1,5 +1,5 @@
 <%= error_messages_for 'category' %>
-<ul class="set admin" id="article_form">
+<ul class="admin" id="article_form">
   <li>
     <label for="category_name" class="title block"><%= _("Name")%></label> 
     <%= text_field 'category', 'name', :class => 'medium'  %>

data/app/views/admin/categories/new.html.erb

@@ -1,7 +1,7 @@
   <% @page_heading = _("#{controller.action_name.capitalize} Category") %>
   <% subtabs_for(:content) %>
   <% form_tag :action=>"edit", :id => @category.id do %>
-  <div class="admin set">
+  <div class="admin">
     <%= render :partial => "form" %>
   </div>
 

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

@@ -1,7 +1,7 @@
 <%= error_messages_for 'article' %>
 <div id="autosave"></div>
 <div id="article_keywords_auto_complete" class="auto_complete"></div>
-<ul class="set admin">
+<ul class="admin">
   <li>
     <label for="article_title" class="block title"><%= _("Title")%></label>
     <%= text_field 'article', 'title', :class => 'large' %>
@@ -12,7 +12,7 @@
       <div id="categories" style="height: 170px;">
         <%= checkboxes_from_collection(@categories, "id", "name", @selected) %>        
       </div>
-      <p class="paginate r paginate_1">
+      <p class="paginate r">
           <label for="article_allow_comments"><%= _("Allow comments") %>: </label>
           <%= check_box 'article', 'allow_comments'  %><br />
           <label for="article_allow_pings"><%= _("Allow trackbacks")%>: </label>
@@ -20,8 +20,9 @@
           <label for="article_published"><%= _("Published")%>:</label>
           <%= check_box 'article', 'published'  %><br />
         <%= link_to_destroy_draft @article %>
+        <input class="submit" type="submit" value="<%= _('Save as draft') %> &raquo;" name="article[draft]"/>&nbsp;
+        <%= save( _("Publish") + " &raquo;") %><br />
         <%= link_to_destroy_with_profiles @article%>
-        <%= save( _("Publish") + " &raquo;") %>
       </p>
     </div>
     <div id="editor">
@@ -34,23 +35,35 @@
     </div>
   </li>
   <li>
-    <label class="block tags" for="article_keywords"><%= _("Tags") %></label>
+    <label class="block content" for="article_keywords"><%= _("Tags") %></label>
     <%= text_field 'article', 'keywords', {:autocomplete => 'off', :class => 'large'} %>
     <%= auto_complete_field 'article_keywords', { :url => { :action => "auto_complete_for_article_keywords"}, :tokens => ','}%>
   </li>
 </ul>
 
-<ul class="admin set">
-  <li class="paginate l paginate_1">
+<ul class="admin">
+  <li class="paginate l">
+    <label class="block">
+      <%= link_to_function _("Excerpt") + " (+/-)",update_page { |page| page.visual_effect(:toggle_blind, "excerpt", :duration => 0.2) } %>
+    </label>
+    <ul id="excerpt" <%= "style='display: none;'" if @article.excerpt.blank? %>>
+      <li>
+        <%= t_textarea 'article', 'excerpt', {:height => '150', :class => 'medium', :rows => '8'} %>
+      </li>     
+    </ul>
+  </li>
+    
+  <li class="paginate l">
     <label class="block">
       <%= link_to_function _("Uploads") + " (+/-)",update_page { |page| page.visual_effect(:toggle_blind, "attachments", :duration => 0.2) } %>
     </label>
     <ul id="attachments" <%= 'style="display: none"' unless @article.resources.count > 0 %>>
+      <li><small>Uploads will be displayed as attachments in your RSS feed, but won't appear in your articles.</small></li>
       <%= render :partial => 'admin/content/attachment', :locals => { :attachment_num => 1, :hidden => false } -%>
     </ul>
   </li>
 
-  <li class="paginate l paginate_1">
+  <li class="paginate l">
     <label class="block">
       <%= link_to_function _("Post settings") + " (+/-)",update_page { |page| page.visual_effect(:toggle_blind, "publishing_options", :duration => 0.2) } %>
     </label>
@@ -64,6 +77,6 @@
         <span id="permalink"><%= text_field 'article', 'permalink' %></span>
       </li>     
     </ul>
-  </li>
+  </li>  
 </ul>
 <%= hidden_field_tag 'text_filter', this_blog.text_filter %>

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

@@ -12,8 +12,8 @@
   :complete => "Element.hide('spinner')" \
   do %>
 
-  <label><%= _("Search articles that contains...")%></label><br />  
-  <input type="text" name="search[searchstring]" size="30" />
+  <label for="search"><%= _("Search articles that contains...")%></label><br />  
+  <input id="search" type="text" name="search[searchstring]" size="30" />
   <%= submit_tag _("Search") %>
   <span id='spinner' style="display:none;"><%= image_tag('spinner.gif') %></span>
 

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

@@ -2,11 +2,11 @@
   <h3><%= _("Last Comments") %></h3>
   <ul>
     <% if @comments.size == 0 %>
-      <li <%= alternate_class %>><%= _("No comments yet") %></li>
+      <li><%= _("No comments yet") %></li>
     <% else %>
       <% for comment in @comments -%>
-        <li <%= alternate_class %>>
-          <%= link_to_permalink comment,h( _("by %s on %s", comment.author , comment.article.title) ) %>
+        <li>
+          <%= link_to_permalink comment, h(_("by %s on %s", comment.author, comment.article.title)) %>
         </li>
       <% end %>
     <% end %>

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

@@ -5,10 +5,10 @@
   <% else %>
     <ul>
       <% if @inbound_links.size == 0 %>
-        <li <%= alternate_class %>><%= _("No one made a link to you yet") %></li>
+        <li><%= _("No one made a link to you yet") %></li>
       <% else %>
         <% for link in @inbound_links -%>
-          <li <%= alternate_class %>>
+          <li>
             <%= link_to(link.author, link.link) + _(" made a link to you saying ") + link.description.slice(0, 50) %> 
           </li>
         <% end %>

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

@@ -2,10 +2,10 @@
   <h3><%= _("Most popular") %></h3>
   <ul>
     <% if @bestof.size == 0 %>
-      <li <%= alternate_class %>><%= _("Nothing to show yet") %> !</li>
+      <li><%= _("Nothing to show yet") %> !</li>
     <% else %>
       <% for article in @bestof -%>
-        <li <%= alternate_class %>><%= link_to_permalink article, article.title  %> (<%= link_to_permalink article, article.comment_count %>)</li>
+        <li><%= link_to_permalink article, article.title  %> (<%= link_to_permalink article, article.comment_count %>)</li>
       <% end %>
     <% end -%>
   </ul>

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

@@ -2,10 +2,10 @@
   <h3><%= _("Last posts") %></h3>
   <ul>
 	<% if @recent_posts.size == 0 %>
-      <li <%= alternate_class %>> <%= link_to _("No posts yet, why don't you start and write one"), :controller => 'content', :action => 'new' %> ?</li>
+      <li> <%= link_to _("No posts yet, why don't you start and write one"), :controller => 'content', :action => 'new' %> ?</li>
     <% else %>
       <% for post in @recent_posts -%>
-        <li <%= alternate_class %>>
+        <li>
           <%= link_to_permalink post, post.title %> (<%= link_to_permalink(post, post.published_comments.size) %>)
         </li>
       <% end %> 

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

@@ -5,9 +5,9 @@
   </ul>
   <h3><%= _("Statistics") %></h3>
   <ul> 
-    <li <%= alternate_class %>> <%= _("Total posts : %d", @statposts) %></li>
-    <li <%= alternate_class %>> <%= _("Your posts : %d" , @statuserposts) %></li>
-    <li <%= alternate_class %>> <%= _("Total comments : %d" , @statcomments) %></li>
-    <li <%= alternate_class %>> <%= _("Spam comments : %d" , @statspam) %></li>
+    <li> <%= _("Total posts : %d", @statposts) %></li>
+    <li> <%= _("Your posts : %d" , @statuserposts) %></li>
+    <li> <%= _("Total comments : %d" , @statcomments) %></li>
+    <li> <%= _("Spam comments : %d" , @statspam) %></li>
   </ul>
 </div>