typo 5.0.2 → 5.0.3.98

data/app/controllers/comments_controller.rb

@@ -24,7 +24,7 @@ class CommentsController < FeedbackController
     end
 
     set_headers
-    @comment = this_blog.comments.build(params[:comment])
+    @comment = Comment.new(params[:comment])
 
     render :template => 'articles/comment_preview'
   end
@@ -34,11 +34,9 @@ class CommentsController < FeedbackController
   def get_feedback
     @comments = \
       if params[:article_id]
-        this_blog.requested_article(params).published_comments
+        Article.find_by_params_hash(params).published_comments
       else
-        this_blog.published_comments.with_options(this_blog.rss_limit_params) do |c|
-          c.find(:all, :order => 'created_at DESC')
-        end
+        Comment.find_published(:all, this_blog.rss_limit_params.merge(:order => 'created_at DESC'))
       end
   end
 
@@ -46,7 +44,7 @@ class CommentsController < FeedbackController
     return { :ip  => request.remote_ip,
       :author     => 'Anonymous',
       :published  => true,
-      :user       => current_user,
+      :user       => @current_user,
       :user_agent => request.env['HTTP_USER_AGENT'],
       :referrer   => request.env['HTTP_REFERER'],
       :permalink  => article_path(@article) }

data/app/controllers/content_controller.rb

@@ -24,9 +24,6 @@ class ContentController < ApplicationController
   helper :theme
 #  before_filter :auto_discovery_defaults
 
-
-
-
   def self.caches_action_with_params(*actions)
     super
     around_filter ExpiryFilter.new, :only => actions
@@ -50,7 +47,7 @@ class ContentController < ApplicationController
   end
 
   def auto_discovery_feed(options = { })
-    with_options(options.reverse_merge(:only_path => false)) do |opts|
+    with_options(options.reverse_merge(:only_path => true)) do |opts|
       @auto_discovery_url_rss = opts.url_for(:format => 'rss')
       @auto_discovery_url_atom = opts.url_for(:format => 'atom')
     end

data/app/controllers/feedback_controller.rb

@@ -3,7 +3,7 @@ class FeedbackController < ApplicationController
 
   session :new_session => false
   before_filter :login_required, :only => [:update, :destroy]
-  before_filter :get_article, :only => [:create, :update]
+  before_filter :get_article, :only => [:create, :update, :show]
 
   cache_sweeper :blog_sweeper
 
@@ -12,7 +12,7 @@ class FeedbackController < ApplicationController
     respond_to do |format|
       format.html do
         if params[:article_id]
-          article = this_blog.requested_article(params)
+          article = Article.find_by_params_hash(params)
           redirect_to "#{article_path(article)}\##{@page_title.underscore}"
         else
           render :text => 'this space left blank'
@@ -23,6 +23,16 @@ class FeedbackController < ApplicationController
     end
   end
 
+  def show
+    @feedback = @article.feedback.find_by_guid(params[:id])
+
+    respond_to do |format|
+      format.html do
+        redirect_to article_path(@article) + "\##{dom_id(@feedback)}"
+      end
+    end
+  end
+
   def create
     raise "Subclass responsibility"
   end

data/app/controllers/grouping_controller.rb

@@ -3,7 +3,13 @@ class GroupingController < ContentController
   layout :theme_layout
   cache_sweeper :blog_sweeper
 
-  caches_action_with_params :index, :show
+  cached_pages = [:index, :show]
+
+  if Blog.default && Blog.default.cache_option == "caches_action_with_params"
+    caches_action_with_params *cached_pages
+  else
+    caches_page *cached_pages
+  end
 
   class << self
     def grouping_class(klass = nil)

data/app/controllers/redirect_controller.rb

@@ -2,6 +2,12 @@ class RedirectController < ContentController
   session :off
 
   def redirect
+    # Ugly way to manage redirects, anything better ?
+    if (request.request_uri =~ /^\/articles/)
+      redirect_to request.request_uri.gsub('/articles', ''), :status => 301
+      return
+    end
+
     r = Redirect.find_by_from_path(params[:from])
 
     if(r)

data/app/controllers/theme_controller.rb

@@ -33,13 +33,12 @@ class ThemeController < ContentController
     return (render :text => "Not Found", :status => 404) unless File.exists? src
 
     if perform_caching
-      dst = "/#{page_cache_directory}/#{type}/theme/#{file}"
+      dst = "#{page_cache_directory}/#{type}/theme/#{file}"
       FileUtils.makedirs(File.dirname(dst))
       FileUtils.cp(src, "#{dst}.#{$$}")
       FileUtils.ln("#{dst}.#{$$}", dst) rescue nil
       FileUtils.rm("#{dst}.#{$$}", :force => true)
-    end
-
+    end 
     send_file(src, :type => mime, :disposition => 'inline', :stream => true)
   end
 

data/app/controllers/trackbacks_controller.rb

@@ -6,10 +6,10 @@ class TrackbacksController < FeedbackController
       elsif params[:__mode] == 'rss'
         # Part of the trackback spec... not sure what we should be doing here though.
       else
-          begin  
+          begin
               @trackback =  this_blog.ping_article!(
                 params.merge(:ip => request.remote_ip, :published => true))
-              ""    
+              ""
           rescue ActiveRecord::RecordNotFound, ActiveRecord::StatementInvalid
             throw :error, "Article id #{params[:id]} not found."
           rescue ActiveRecord::RecordInvalid
@@ -29,11 +29,9 @@ class TrackbacksController < FeedbackController
   def get_feedback
     @trackbacks =
       if params[:article_id]
-        this_blog.requested_article(params).published_trackbacks
+        Article.find_by_params_hash(params).published_trackbacks
       else
-        this_blog.published_trackbacks.with_options(this_blog.rss_limit_params) do |t|
-          t.find(:all, :order => 'created_at DESC')
-        end
+        this_blog.published_trackbacks.find(:all, this_blog.rss_limit_params(:order => 'created_at DESC'))
       end
   end
 

data/app/controllers/xml_controller.rb

@@ -86,7 +86,7 @@ class XmlController < ApplicationController
 
   def fetch_items(association, order='published_at DESC', limit=nil)
     if association.instance_of?(Symbol)
-      association = this_blog.send(association)
+      association = association.to_s.singularize.classify.constantize
     end
     limit ||= this_blog.limit_rss_display
     @items += association.find_already_published(:all, :limit => limit, :order => order)

data/app/helpers/admin/base_helper.rb

@@ -1,6 +1,15 @@
 module Admin::BaseHelper
   include ActionView::Helpers::DateHelper
 
+  def subtabs_for(current_module)
+    output = []
+    AccessControl.project_module(current_user.profile.label, current_module).submenus.each_with_index do |m,i| 
+      current = (m.url[:controller] == params[:controller] && m.url[:action] == params[:action]) ? "current" : ""
+      output << subtab(m.name, current, m.url)
+    end     
+    content_for(:tasks) { output.join("\n") }
+  end
+
   def state_class(item)
     item.state.to_s
   end
@@ -27,7 +36,7 @@ module Admin::BaseHelper
 
   def current_user_notice
     unless current_user
-      link_to "log in", :controller => "/accounts", :action=>"login"
+      link_to _("log in"), :controller => "/accounts", :action=>"login"
     else
       link_to _("log out"), :controller => "/accounts", :action=>"logout"
     end
@@ -42,7 +51,7 @@ module Admin::BaseHelper
   end
   
   def subtab(label, style, options = {})
-    content_tag :li, link_to(label, options, {"class"=> style})
+    content_tag :li, link_to(label, options, { "class"=> style })
   end
 
   def cancel(url = {:action => 'list'})
@@ -59,7 +68,8 @@ module Admin::BaseHelper
 
   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
+      {:controller => controller, :action => 'show', :id => record.id}, 
+      {:class => "lbOn"}
   end
 
   def link_to_edit(record, controller = @controller.controller_name)
@@ -95,7 +105,7 @@ module Admin::BaseHelper
   end
 
   def task_overview
-    task(_('Back to overview'), 'list')
+    task(_('Back to overview'), 'index')
   end
 
   def task_new(title)
@@ -154,7 +164,7 @@ module Admin::BaseHelper
     end
   end
   
-  def class_manage
+  def class_content
     if controller.controller_name  =~ /content|pages|categories|resources/
       if controller.action_name =~ /list|index|show/
         "current"
@@ -174,7 +184,7 @@ module Admin::BaseHelper
     end
   end
 
-  def class_plugins
+  def class_sidebar
     if controller.controller_name  =~ /sidebar|textfilter/
     "current"
     end
@@ -192,13 +202,52 @@ module Admin::BaseHelper
     end
   end    
 
-  def class_admin
+  def class_settings
     if controller.controller_name  =~ /settings/
     "current"
     end
   end
+
+  def t_textarea(object_name, method, options)
+    if this_blog.editor == 2
+      fckeditor_textarea(object_name, method, options)
+    else
+      text_area(object_name, method, options)
+    end
+  end
+  
+  def collection_select_with_current(object, method, collection, value_method, text_method, current_value, prompt=false)
+    result = "<select name='#{object}[#{method}]'>\n" 
+      
+    if prompt == true
+      result << "<option value=''>Please select</option>"
+    end
+    for element in collection
+      if current_value and current_value == element.send(value_method)
+        result << "<option value='#{element.send(value_method)}' selected='selected'>#{element.send(text_method)}</option>\n" 
+      else
+        result << "<option value='#{element.send(value_method)}'>#{element.send(text_method)}</option>\n" 
+      end
+    end
+    result << "</select>\n" 
+    return result
+  end
+
+  def render_void_table(size, cols)
+    if size == 0
+      "<tr>\n<td colspan=#{cols}>There is no #{controller.controller_name} yet. Why don't you start and create one?</td>\n</tr>\n"
+    end
+  end
   
-  def order_link(title, controller, action, order)
-    link_to _(title), :controller => controller, :action => action, :order => order, :sense => (params[:sense] and params[:sense] == 'asc') ?  'desc' : 'asc'
+  def cancel_or_save
+    result = '<p class="paginate r">'
+    result << cancel 
+    result << " "
+    result << _("or") 
+    result << " "
+    result << save("Save" + " &raquo")
+    result << '</p>'
+    return result
   end
+  
 end

data/app/helpers/admin/content_helper.rb

@@ -5,4 +5,11 @@ module Admin::ContentHelper
     [@article]
   end
 
+  def params_qsa
+    { 'search[category]' => @search[:category], 
+      'search[user_id]' => @search[:user_id], 
+      'search[published_at]' => @search[:published_at], 
+      'searched[published]' => @search[:published] }
+  end
+
 end

data/app/helpers/admin/pages_helper.rb

@@ -4,4 +4,25 @@ module Admin::PagesHelper
   def contents
     [@page]
   end
+  
+  def display_page_row(page)
+    result = "<tr alternate_class>\n"
+    result << "<td>#{link_to_permalink(page,page.title)}</td>\n"
+    result << "<td>/pages/#{page.name}</td>\n"
+    result << "<td>#{page.created_at.strftime('%d/%m/%Y at %H:%M')}</td>\n"
+    result << "<td>#{author_link(page)}</td>\n"
+    result << "<td class='operation'>" 
+    if page.published?
+      result << image_tag('admin/checked.png', :alt => "online", :title => _("Online")) 
+    else
+      result << image_tag('admin/cancel.png', :alt => "offline", :title => _("Offline")) 
+    end 
+    result << "</td>\n"
+    result << "<td class='operation'>#{link_to image_tag('admin/show.png', :alt => 'View page', :title => 'Preview page'), {:action => 'show', :id => page.id}}</td>\n"
+    result << "<td class='operation'>#{link_to_edit page}</td>\n"
+    result << "<td class='operation'>#{link_to_destroy page}</td>\n"
+    result << "</tr>\n"
+    return result
+  end
+  
 end

data/app/helpers/admin/settings_helper.rb

@@ -2,7 +2,7 @@ module Admin::SettingsHelper
   require 'find'
   
   def fetch_langs
-    options = content_tag(:option, "en_US", :value => 'en_US')
+    options = content_tag(:option, "Select lang", :value => 'en_US')
 	Find.find(RAILS_ROOT + "/lang") do |lang|
 	  if lang =~ /\.rb$/
         lang_pattern = File.basename(lang).gsub(".rb", '')

data/app/helpers/application_helper.rb

@@ -26,7 +26,7 @@ module ApplicationHelper
 
   # The '5 comments' link from the bottom of articles
   def comments_link(article)
-    link_to_permalink(article,pluralize(article.published_comments.size, 'comment'),'comments')
+    link_to_permalink(article,pluralize(article.published_comments.size, _('comment')),'comments')
   end
 
   def trackbacks_link(article)
@@ -39,8 +39,9 @@ module ApplicationHelper
   end
 
   def js_distance_of_time_in_words_to_now(date)
-    time = date.utc.strftime("%a, %d %b %Y %H:%M:%S GMT")
-    "<span class=\"typo_date\" title=\"#{time}\">#{time}</span>"
+    time = _(date.utc.strftime(_("%%a, %%d %%b %%Y %%H:%%M:%%S GMT", date.utc)))
+    timestamp = date.utc.to_i ;
+    "<span class=\"typo_date date gmttimestamp-#{timestamp}\" title=\"#{time}\" >#{time}</span>"
   end
 
   def meta_tag(name, value)
@@ -48,7 +49,7 @@ module ApplicationHelper
   end
 
   def date(date)
-    "<span class=\"typo_date\">#{date.utc.strftime("%d. %b")}</span>"
+    "<span class=\"typo_date\">" + date.utc.strftime(_("%%d. %%b", date.utc)) + "</span>"
   end
 
   def render_theme(options)
@@ -164,11 +165,9 @@ module ApplicationHelper
 
   def feed_title
     return @feed_title if @feed_title
-    returning(this_blog.blog_name.dup) do |title|
-      if @page_title
-        title << " : #{@page_title}"
-      end
-    end
+    return @page_title \
+      ? "#{this_blog.blog_name} : #{@page_title}" \
+      : this_blog.blog_name
   end
 
   def author_link(article)
@@ -198,6 +197,9 @@ module ApplicationHelper
   <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 }" />
   <link rel="alternate" type="application/rss+xml" title="RSS" href="#{ @auto_discovery_url_rss }" />
+  #{ stylesheet_link_tag 'typo_code.css', :media => 'all' }
+  #{ stylesheet_link_tag 'user-styles.css', :media => 'all' }
+  #{ javascript_include_tag "lang/" + Localization.lang.to_s }
   #{ javascript_include_tag "cookies" }
   #{ javascript_include_tag "prototype" }
   #{ javascript_include_tag "effects" }

data/app/helpers/content_helper.rb

@@ -7,15 +7,6 @@ module ContentHelper
          (min_class + ((max_class-min_class) * articles.to_f / max_articles).to_i).to_s)
   end
 
-  def link_to_grouping(grp)
-    link_to( grp.display_name, urlspec_for_grouping(grp),
-             :rel => "tag", :title => title_for_grouping(grp) )
-  end
-
-  def urlspec_for_grouping(grouping)
-    { :controller => "/articles", :action => grouping.class.to_prefix, :id => grouping.permalink }
-  end
-
   def title_for_grouping(grouping)
     "#{pluralize(grouping.article_counter, 'post')} with #{grouping.class.to_s.underscore} '#{grouping.display_name}'"
   end
@@ -33,7 +24,7 @@ module ContentHelper
 
   def page_title
     blog_name = this_blog.blog_name || "Typo"
-    if @page_title
+    if !@page_title.blank?
       # this is where the page title prefix (string) should go
       (this_blog.title_prefix == 1 ? blog_name + " : " : '') + @page_title + (this_blog.title_prefix == 2 ? " : " + blog_name : '')
     else
@@ -70,21 +61,21 @@ module ContentHelper
   end
 
   def category_links(article)
-    "Posted in " + article.categories.map { |c| link_to h(c.name), category_url(c), :rel => 'tag'}.join(", ")
+    _("Posted in") + " " + article.categories.map { |c| link_to h(c.name), category_url(c), :rel => 'tag'}.join(", ")
   end
 
   def tag_links(article)
-    "Tags " + article.tags.map { |tag| link_to tag.display_name, tag.permalink_url, :rel => "tag"}.sort.join(", ")
+    _("Tags") + " " + article.tags.map { |tag| link_to tag.display_name, tag.permalink_url, :rel => "tag"}.sort.join(", ")
   end
 
   def next_link(article)
     n = article.next
-    return  n ? n.link_to_permalink("#{n.title} »") : ''
+    return  n ? link_to_permalink(n, "#{n.title} »") : ''
   end
 
   def prev_link(article)
     p = article.previous
-    return p ? n.link_to_permalink("« #{p.title}") : ''
+    return p ? link_to_permalink(p, "« #{p.title}") : ''
   end
 
   def render_to_string(*args, &block)