typo 5.3 → 5.4

data/app/controllers/application_controller.rb

@@ -0,0 +1,76 @@
+# The filters added to this controller will be run for all controllers in the application.
+# Likewise will all the methods added be available for all controllers.
+class ApplicationController < ActionController::Base
+  include ::LoginSystem
+  protect_from_forgery :only => [:edit, :update, :delete]
+  
+  before_filter :reset_local_cache, :fire_triggers, :load_lang
+  after_filter :reset_local_cache
+
+  class << self
+    unless self.respond_to? :template_root
+      def template_root
+        ActionController::Base.view_paths.last
+      end
+    end
+
+    # Log all path in file path_cache in Rails.root
+    # When we sweep all cache. We just need delete this file
+    def cache_page_with_log_page(content, path)
+      return unless perform_caching
+      cache_page_without_log_page(content, path)
+      CacheInformation.create(:path => page_cache_file(path))
+    end
+    alias_method_chain :cache_page, :log_page
+  end
+
+  protected
+
+  def setup_themer
+    # Ick!
+    self.view_paths = ::ActionController::Base.view_paths.dup.unshift("#{RAILS_ROOT}/themes/#{this_blog.theme}/views")
+  end
+
+  def error(message = "Record not found...", options = { })
+    @message = message.to_s
+    render :template => 'articles/error', :status => options[:status] || 404
+  end
+
+  def fire_triggers
+    Trigger.fire
+  end
+
+  def load_lang
+    Localization.lang = this_blog.lang
+    # _("Localization.rtl") 
+  end
+
+  def reset_local_cache
+    if !session
+      session :session => new
+    end
+    @current_user = nil
+  end
+
+  # The Blog object for the blog that matches the current request.  This is looked
+  # up using Blog.find_blog and cached for the lifetime of the controller instance;
+  # generally one request.
+  def this_blog
+    @blog ||= Blog.default
+  end
+
+  helper_method :this_blog
+
+  # The base URL for this request, calculated by looking up the URL for the main
+  # blog index page.  This is matched with Blog#base_url to determine which Blog
+  # is supposed to handle this URL
+  def blog_base_url
+    url_for(:controller => '/articles').gsub(%r{/$},'')
+  end
+
+  def add_to_cookies(name, value, path=nil, expires=nil)
+    cookies[name] = { :value => value, :path => path || "/#{controller_name}",
+                       :expires => 6.weeks.from_now }
+  end
+end
+

data/app/controllers/articles_controller.rb

@@ -5,7 +5,9 @@ class ArticlesController < ContentController
   layout :theme_layout, :except => [:comment_preview, :trackback]
 
   cache_sweeper :blog_sweeper
-  caches_page :index, :read, :archives, :view_page
+  caches_page :index, :read, :archives, :view_page, :if => Proc.new {|c|
+    c.request.query_string == ''
+  }
 
   helper :'admin/base'
 
@@ -109,19 +111,13 @@ class ArticlesController < ContentController
   end
   
   def send_feed(format)
-    if this_blog.feedburner_url.empty? or request.env["HTTP_USER_AGENT"][/Feedburner/] 
+    if this_blog.feedburner_url.empty? or request.env["HTTP_USER_AGENT"] =~ /FeedBurner/i
       render :partial => "articles/#{format}_feed", :object => @articles
     else
       redirect_to "http://feeds2.feedburner.com/#{this_blog.feedburner_url}"
     end
   end
   
-  alias_method :rescue_action_in_public, :error
-
-  def render_error(object = '', status = 500)
-    render(:text => (object.errors.full_messages.join(", ") rescue object.to_s), :status => status)
-  end
-
   def set_headers
     headers["Content-Type"] = "text/html; charset=utf-8"
   end

data/app/controllers/authors_controller.rb

@@ -0,0 +1,21 @@
+class AuthorsController < ContentController
+  layout :theme_layout
+  
+  def show
+    @author = User.find_by_login(params[:id]) 
+    raise ActiveRecord::RecordNotFound unless @author
+
+    respond_to do |format|
+      format.html
+      format.rss do
+        @limit = this_blog.limit_rss_display
+        auto_discovery_feed(:only_path => false)
+        render :partial => "articles/rss20_feed", :object => @author.articles
+      end
+      format.atom do
+        @limit = this_blog.limit_rss_display
+        render :partial => "articles/atom_feed", :object => @author.articles
+      end
+    end
+  end
+end

data/app/controllers/backend_controller.rb

@@ -2,7 +2,6 @@ class BackendController < ContentController
   skip_before_filter :verify_authenticity_token
   require 'actionwebservice'
   cache_sweeper :blog_sweeper
-  session :off
 
   web_service_dispatching_mode :layered
   web_service_exception_reporting false

data/app/controllers/content_controller.rb

@@ -24,10 +24,6 @@ class ContentController < ApplicationController
 
   protected
 
-  def auto_discovery_defaults
-    auto_discovery_feed
-  end
-
   def auto_discovery_feed(options = { })
     with_options(options.reverse_merge(:only_path => true)) do |opts|
       @auto_discovery_url_rss = opts.url_for(:format => 'rss')
@@ -36,7 +32,7 @@ class ContentController < ApplicationController
   end
 
   def theme_layout
-    this_blog.current_theme.layout
+    this_blog.current_theme.layout(self.action_name)
   end
 
   helper_method :contents

data/app/controllers/feedback_controller.rb

@@ -1,7 +1,6 @@
 class FeedbackController < ApplicationController
   helper :theme
 
-  session :new_session => false
   before_filter :get_article, :only => [:create]
 
   cache_sweeper :blog_sweeper

data/app/controllers/grouping_controller.rb

@@ -3,8 +3,9 @@ class GroupingController < ContentController
   layout :theme_layout
   cache_sweeper :blog_sweeper
 
-  cached_pages = [:index, :show]
-  caches_page *cached_pages
+  caches_page :index, :show, :if => Proc.new {|c|
+    c.request.query_string == ''
+  }
 
   class << self
     def grouping_class(klass = nil)
@@ -34,12 +35,28 @@ class GroupingController < ContentController
 
   def show
     set_noindex
-    grouping = grouping_class.find_by_permalink(params[:id])
-    @page_title = "#{self.class.to_s.sub(/Controller$/,'').singularize} #{params[:id]}, #{_('everything about')} #{params[:id]}"
+    @grouping = grouping_class.find_by_permalink(params[:id])
+
+    @page_title = "#{_(self.class.to_s.sub(/Controller$/,'').singularize)} #{@grouping.name}, "
+
+    if @grouping.respond_to? :description and
+        not @grouping.description.nil?
+      @page_title += @grouping.description
+    else
+      @page_title += "#{_('everything about')} "
+
+      if @grouping.respond_to? :display_name and
+          not @grouping.display_name.nil?
+        @page_title += @grouping.display_name
+      else
+        @page_title += @grouping.name
+      end
+    end
+
     @page_title << " page " << params[:page] if params[:page]
-    @description = (grouping.description.blank?) ? "" : grouping.description
-    @keywords = (grouping.keywords.blank?) ? "" : grouping.keywords
-    @articles = grouping.articles.paginate(:page => params[:page], :conditions => { :published => true}, :per_page => 10)
+    @description = (@grouping.description.blank?) ? "" : @grouping.description
+    @keywords = (@grouping.keywords.blank?) ? "" : @grouping.keywords
+    @articles = @grouping.articles.paginate(:page => params[:page], :conditions => { :published => true}, :per_page => 10)
     render_articles
   end
 
@@ -98,4 +115,9 @@ class GroupingController < ContentController
     @noindex = 1 unless params[:page].blank?
   end
 
+  def template_exists?(path = default_template_name)
+    self.view_paths.find_template(path, response.template.template_format)
+  rescue ActionView::MissingTemplate
+    false
+  end
 end

data/app/controllers/previews_controller.rb

@@ -0,0 +1,10 @@
+class PreviewsController < ContentController
+  before_filter :login_required
+  layout :theme_layout
+  
+  def index
+    @article = Article.find(params[:id])
+    
+    render :template => '/articles/read'
+  end
+end

data/app/controllers/redirect_controller.rb

@@ -5,7 +5,9 @@ class RedirectController < ContentController
 
   cache_sweeper :blog_sweeper
 
-  caches_page :redirect
+  caches_page :redirect, :if => Proc.new {|c|
+    c.request.query_string == ''
+  }
 
   helper :'admin/base'
 

data/app/controllers/theme_controller.rb

@@ -1,6 +1,4 @@
 class ThemeController < ContentController
-#  caches_page :stylesheets, :javascript, :images
-  session :off
 
   def stylesheets
     render_theme_item(:stylesheets, params[:filename], 'text/css; charset=utf-8')
@@ -60,7 +58,5 @@ class ThemeController < ContentController
       'application/binary'
     end
   end
-
-
 end
 

data/app/controllers/xml_controller.rb

@@ -1,6 +1,7 @@
 class XmlController < ApplicationController
-  caches_page :feed
-  session :off
+  caches_page :feed, :if => Proc.new {|c|
+    c.request.query_string == ''
+  }
 
   NORMALIZED_FORMAT_FOR = {'atom' => 'atom', 'rss' => 'rss',
     'atom10' => 'atom', 'atom03' => 'atom', 'rss20' => 'rss',
@@ -23,12 +24,12 @@ class XmlController < ApplicationController
     when 'feed'
       redirect_to :controller => 'articles', :action => 'index', :format => @format, :status => 301
     when 'comments'
-      head :moved_permanently, :location => formatted_admin_comments_url(@format)
+      head :moved_permanently, :location => admin_comments_url(:format => @format)
     when 'article'
       head :moved_permanently, :location => Article.find(params[:id]).permalink_by_format(@format)
     when 'category', 'tag', 'author'
       head :moved_permanently, \
-        :location => self.send("formatted_#{params[:type]}_url", params[:id], @format)
+        :location => self.send("#{params[:type]}_url", params[:id], :format => @format)
     else
       @items = Array.new
       @blog = this_blog
@@ -45,6 +46,7 @@ class XmlController < ApplicationController
         return
       end
 
+      # TODO: Use templates from articles controller.
       respond_to do |format|
         format.googlesitemap
         format.atom
@@ -83,7 +85,7 @@ class XmlController < ApplicationController
     if params[:format]
       params[:format] = NORMALIZED_FORMAT_FOR[params[:format]]
     else
-      params[:foramt] = 'rss'
+      params[:format] = 'rss'
     end
     return true
   end

data/app/helpers/admin/base_helper.rb

@@ -15,7 +15,7 @@ module Admin::BaseHelper
   end
 
   def show_page_heading
-    content_tag(:h2, @page_heading) unless @page_heading.blank?
+    content_tag(:h2, @page_heading, :class => 'mb20') unless @page_heading.blank?
   end
 
   def cancel(url = {:action => 'index'})
@@ -23,7 +23,7 @@ module Admin::BaseHelper
   end
 
   def save(val = _("Store"))
-    '<input type="submit" value="' + val + '" class="submit" />'
+    '<input type="submit" value="' + val + '" class="save" />'
   end
 
   def confirm_delete(val = _("Delete"))
@@ -107,15 +107,11 @@ module Admin::BaseHelper
   end
   
   def class_content
-    if controller.controller_name  =~ /content|pages|categories|resources/
+    if controller.controller_name  =~ /content|pages|categories|resources|feedback/
       "current" if controller.action_name =~ /list|index|show/
     end
   end
 
-  def class_feedback
-    "current" if controller.controller_name  =~ /feedback/
-  end
-
   def class_themes
     "current" if controller.controller_name  =~ /themes|sidebar/
   end
@@ -131,9 +127,14 @@ module Admin::BaseHelper
   def class_settings
     controller.controller_name  =~ /settings|textfilter/ ? "current right" : "right"
   end
+  
+  def class_profile
+    controller.controller_name  =~ /profiles/ ? "current right" : "right"
+  end
+  
 
   def t_textarea(object_name, method, options)
-    return fckeditor_textarea(object_name, method, options) if current_user.editor == 'visual'
+    return ckeditor_textarea(object_name, method, options) if current_user.editor == 'visual'
     text_area(object_name, method, options)
   end
 
@@ -161,12 +162,12 @@ module Admin::BaseHelper
 
   def render_void_table(size, cols)
     if size == 0
-      "<tr>\n<td colspan=#{cols}>" + _("There is no %s yet. Why don't you start and create one?", _(controller.controller_name)) + "</td>\n</tr>\n"
+      "<tr>\n<td colspan=#{cols}>" + _("There are no %s yet. Why don't you start and create one?", _(controller.controller_name)) + "</td>\n</tr>\n"
     end
   end
   
   def cancel_or_save
-    result = '<p class="paginate r">'
+    result = '<p class="right">'
     result << cancel 
     result << " "
     result << _("or") 
@@ -183,7 +184,7 @@ module Admin::BaseHelper
   
   def macro_help_popup(macro, text)
     unless current_user.editor == 'visual'
-      "<a href=\"#{url_for :controller => 'textfilters', :action => 'macro_help', :id => macro.short_name}\" onclick=\"return popup(this, 'Typo Macro Help')\">#{text}</a>"
+      "<a rel='lightbox' href=\"#{url_for :controller => 'textfilters', :action => 'macro_help', :id => macro.short_name}\" onclick=\"return popup(this, 'Typo Macro Help')\">#{text}</a>"
     end    
   end
   
@@ -200,7 +201,7 @@ module Admin::BaseHelper
       result << "<tr #{alternate_class}>"
       result << "<td>#{macro_help_popup macro, macro.display_name}</td>"
       result << "<td>#{h macro.description}</td>"
-      result << "<td><code>&lt;typo:#{h macro.short_name}gt;</code></td>"
+      result << "<td><code>&lt;typo:#{h macro.short_name}&gt;</code></td>"
       result << "</tr>"
     end
     result << "</table>"
@@ -214,5 +215,10 @@ module Admin::BaseHelper
             :update => "#{update}")
     link << image_tag("spinner-blue.gif", :id => "update_spinner_#{id}", :style => 'display:none;')
   end
-  
+
+  def display_pagination(collection, cols)
+    if WillPaginate::ViewHelpers.total_pages_for_collection(collection) > 1
+      return "<tr><td colspan=#{cols} class='paginate'>#{will_paginate(collection)}</td></tr>"
+    end
+  end 
 end

data/app/helpers/admin/users_helper.rb

@@ -1,2 +1,14 @@
 module Admin::UsersHelper
+  def get_select(needle, haystack)
+    return 'selected="selected"' if needle.to_s == haystack.to_s
+  end
+  
+  def render_options_for_display_name
+    options = "<option value='#{@user.login}' #{get_select(@user.name, @user.login)}>#{@user.login}</option>"
+    options << "<option value='#{@user.nickname}' #{get_select(@user.name, @user.nickname)}>#{@user.nickname}</option>" unless @user.nickname.nil?
+    options << "<option value='#{@user.firstname}' #{get_select(@user.name, @user.firstname)}>#{@user.firstname}</option>" unless @user.firstname.nil?
+    options << "<option value='#{@user.lastname}' #{get_select(@user.name, @user.lastname)}>#{@user.lastname}</option>" unless @user.lastname.nil?
+    options << "<option value='#{@user.firstname} #{@user.lastname}' #{get_select(@user.name, @user.firstname + @user.lastname)}>#{@user.firstname} #{@user.lastname}</option>" unless (@user.firstname.nil? or @user.lastname.nil?)
+    return options
+  end
 end

data/app/helpers/application_helper.rb

@@ -16,12 +16,10 @@ module ApplicationHelper
   # Produce a link to the permalink_url of 'item'.
   def link_to_permalink(item, title, anchor=nil, style=nil, nofollow=nil)
     anchor = "##{anchor}" if anchor
-    case item
-    when Article
-      "<a href=\"#{item.permalink_url}#{anchor}\" rel=\"#{nofollow}\" class=\"#{style}\">#{title}</a>"
-    else
-      "<a href=\"#{item.permalink_url}#{anchor}\" rel=\"#{nofollow}\" class=\"#{style}\">#{title}</a>"
-    end
+    class_attr = "class=\"#{style}\"" if style
+    rel_attr = "rel=\"#{nofollow}\"" if nofollow
+
+    "<a href=\"#{item.permalink_url}#{anchor}\" #{rel_attr} #{class_attr}>#{title}</a>"
   end
 
   # The '5 comments' link from the bottom of articles
@@ -68,52 +66,6 @@ module ApplicationHelper
       ''
     end
   end
-  
-  # Deprecated helpers
-  typo_deprecate :server_url_for => :url_for
-
-  def config_value(name)
-    typo_deprecated "Use this_blog.#{name} instead."
-    this_blog.send(name)
-  end
-
-  def config
-    typo_deprecated "Use this_blog.configname instead of config[:configname]"
-    raise "Unimplemented"
-  end
-
-  def item_link(title, item, anchor=nil)
-    typo_deprecated "Use link_to_permalink instead of item_link"
-    link_to_permalink(item, title, anchor)
-  end
-
-  alias_method :article_link,     :item_link
-  alias_method :page_link,        :item_link
-  alias_method :comment_url_link, :item_link
-
-  def url_of(item, only_path=true, anchor=nil)
-    typo_deprecated "Use item.permalink_url instead"
-    item.permalink_url
-  end
-
-  alias_method :trackback_url, :url_of
-  alias_method :comment_url,   :url_of
-  alias_method :article_url,   :url_of
-  alias_method :page_url,      :url_of
-
-  def html(content, what = :all, deprecated = false)
-    if deprecated
-      msg = "use html(#{content.class.to_s.underscore}" + ((what == :all) ? "" : ", #{what.inspect}") + ")"
-      typo_deprecated(msg)
-    end
-
-    content.html(what)
-  end
-
-  def strip_html(text)
-    typo_deprecated "use text.strip_html"
-    text.strip_html
-  end
 
   def onhover_show_admin_tools(type, id = nil)
     tag = []
@@ -144,12 +96,21 @@ module ApplicationHelper
   end
 
   def feed_title
-    return @feed_title if @feed_title
-    return @page_title \
-      ? "#{this_blog.blog_name} : #{@page_title}" \
-      : this_blog.blog_name
+    case
+    when @feed_title
+      return @feed_title
+    when (@page_title and not @page_title.blank?)
+      return "#{this_blog.blog_name} : #{@page_title}"
+    else
+      return this_blog.blog_name
+    end
   end
 
+  def html(content, what = :all, deprecated = false)
+    content.html(what)
+  end
+
+
   def author_link(article)
     if this_blog.link_to_author and article.user and article.user.email.to_s.size>0
       "<a href=\"mailto:#{h article.user.email}\">#{h article.user.name}</a>"
@@ -191,7 +152,7 @@ module ApplicationHelper
   #{ meta_tag 'ICBM', this_blog.geourl_location unless this_blog.geourl_location.blank? }
   #{ meta_tag 'description', @description unless @description.blank? }
   #{ meta_tag 'robots', 'noindex, follow' unless @noindex.nil? }
-  <meta name="generator" content="Typo #{TYPO_VERSION}">
+  <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="#{ feed_atom }" />
@@ -203,6 +164,7 @@ module ApplicationHelper
   #{ javascript_tag "window._token = '#{form_authenticity_token}'"}
   #{ javascript_include_tag "prototype" }
   #{ javascript_include_tag "effects" }
+  #{ javascript_include_tag "builder" }
   #{ javascript_include_tag "typo" }
   #{ page_header_includes.join("\n") }
   <script type="text/javascript">#{ @content_for_script }</script>
@@ -218,5 +180,5 @@ module ApplicationHelper
   def feed_rss
     url_for(:format => :rss, :only_path => false)
   end
-
+  
 end