typo 5.1.3 → 5.1.98

data/app/controllers/admin/themes_controller.rb

@@ -1,5 +1,7 @@
 class Admin::ThemesController < Admin::BaseController
 
+  cache_sweeper :blog_sweeper
+
   def index
     @themes = Theme.find_all
     @themes.each do |theme|
@@ -15,8 +17,9 @@ class Admin::ThemesController < Admin::BaseController
   def switchto
     this_blog.theme = params[:theme]
     this_blog.save
-    redirect_to :action => 'index'
     zap_theme_caches
+    this_blog.current_theme(:reload)
+    redirect_to :action => 'index'
   end
 
   def editor
@@ -26,7 +29,7 @@ class Admin::ThemesController < Admin::BaseController
       if params[:file] =~ /css$/
         filename = params[:file]
       else
-        flash[:error] = "You are not authorized to open this file"
+        flash[:error] = _("You are not authorized to open this file")
         return
       end
     when "layout"
@@ -34,7 +37,7 @@ class Admin::ThemesController < Admin::BaseController
       if params[:file] =~ /rhtml$|erb$/
         filename = params[:file]
       else
-        flash[:error] = "You are not authorized to open this file"
+        flash[:error] = _("You are not authorized to open this file")
         return
       end
     end
@@ -47,11 +50,11 @@ class Admin::ThemesController < Admin::BaseController
             theme = File.new(path + filename, "r+")
             theme.write(params[:theme_body])
             theme.close
-            flash[:notice] = "File saved successfully"
+            flash[:notice] = _("File saved successfully")
             zap_theme_caches
           end
         else
-          flash[:notice] = "Unable to write file"
+          flash[:notice] = _("Unable to write file")
         end
         @file = ""
         file = File.readlines(path + filename, "r")

data/app/controllers/admin/users_controller.rb

@@ -1,13 +1,10 @@
 class Admin::UsersController < Admin::BaseController
 
-  def list
-    index
-    render :action => 'index' if current_user.profile.label == 'admin'
-  end
+  cache_sweeper :blog_sweeper
 
   def index
-    if current_user.profile.label == 'admin'
-      @users = User.find :all
+    if current_user.admin?
+      @users = User.paginate :page => params[:page], :order => 'login asc', :per_page => 10
     else
       redirect_to :action => 'edit'
     end
@@ -18,24 +15,29 @@ class Admin::UsersController < Admin::BaseController
     setup_profiles
     if request.post? and @user.save
       flash[:notice] = _('User was successfully created.')
-      redirect_to :action => 'list'
+      redirect_to :action => 'index'
     end
   end
 
   def edit
-    if current_user.profile.label == 'admin'
+    if current_user.admin?
       @user = User.find_by_id(params[:id])
     else
       if params[:id] and params[:id].to_i != current_user[:id]
         flash[:error] = _("Error, you are not allowed to perform this action")
       end
-      @user = User.find_by_id(current_user.id)
+    end
+    if @user.nil?
+      @user = current_user
     end
     setup_profiles
     @user.attributes = params[:user]
     if request.post? and @user.save
+      if @user.id = current_user.id
+        current_user = @user
+      end
       flash[:notice] = _('User was successfully updated.')
-      redirect_to :action => 'list'
+      redirect_to :action => 'index'
     end
   end
 
@@ -43,7 +45,7 @@ class Admin::UsersController < Admin::BaseController
     @user = User.find(params[:id])
     if request.post?
       @user.destroy if User.count > 1
-      redirect_to :action => 'list'
+      redirect_to :action => 'index'
     end
   end
 

data/app/controllers/application.rb

@@ -33,6 +33,7 @@ class ApplicationController < ActionController::Base
 
   def load_lang
     Localization.lang = this_blog.lang
+    # _("Localization.rtl") 
   end
 
   def reset_local_cache

data/app/controllers/articles_controller.rb

@@ -17,17 +17,30 @@ class ArticlesController < ContentController
   helper :'admin/base'
 
   def index
-    @articles = Article.find_all_by_date(*params.values_at(:year, :month, :day))
-
+    respond_to do |format|
+      format.html { @limit = this_blog.limit_article_display }
+      format.rss { @limit = this_blog.limit_rss_display }
+      format.atom { @limit = this_blog.limit_rss_display }
+    end
+    
+    unless params[:year].blank?
+      @articles = Article.paginate :page => params[:page], :conditions => { :published_at => time_delta(*params.values_at(:year, :month, :day)), :published => true }, :order => 'created_at DESC', :per_page => @limit
+    else
+      @articles = Article.paginate :page => params[:page], :conditions => { :published => true }, :order => 'created_at DESC', :per_page => @limit      
+    end
+    
     @page_title = index_title
-
+    @description = index_description
+    @keywords = (this_blog.meta_keywords.empty?) ? "" : this_blog.meta_keywords
+    
     respond_to do |format|
       format.html { render_paginated_index }
       format.atom do
-        render :partial => 'articles/atom_feed', :object => @articles[0,this_blog.limit_rss_display]
+        render :partial => 'articles/atom_feed', :object => @articles
       end
       format.rss do
-        render :partial => 'articles/rss20_feed', :object => @articles[0,this_blog.limit_rss_display]
+        auto_discovery_feed(:only_path => false)
+        render :partial => 'articles/rss20_feed', :object => @articles
       end
     end
   end
@@ -36,6 +49,8 @@ class ArticlesController < ContentController
     @article      = this_blog.requested_article(params)
     @comment      = Comment.new
     @page_title   = @article.title
+    article_meta
+    
     auto_discovery_feed
     respond_to do |format|
       format.html { render :action => 'read' }
@@ -48,15 +63,18 @@ class ArticlesController < ContentController
   end
 
   def search
-    @articles = this_blog.articles_matching(params[:q])
-    render_paginated_index("No articles found...")
+    @articles = this_blog.articles_matching(params[:q], :page => params[:page], :per_page => @limit)
+    return error(on_empty, :status => 200) if @articles.empty?
+    render :action => 'search'
   end
 
   ### Deprecated Actions ###
 
   def archives
     @articles = Article.find_published
-    @page_title = "Archives"
+    @page_title = "#{_('Archives for')} #{this_blog.blog_name}"
+    @keywords = (this_blog.meta_keywords.empty?) ? "" : this_blog.meta_keywords
+    @description = "#{_('Archives for')} #{this_blog.blog_name} - #{this_blog.blog_subtitle}"
   end
 
   def comment_preview
@@ -112,24 +130,28 @@ class ArticlesController < ContentController
     render(:text => (object.errors.full_messages.join(", ") rescue object.to_s), :status => status)
   end
 
+  def article_meta
+    @keywords = ""
+    @keywords << @article.categories.map { |c| c.name }.join(", ") << ", " unless @article.categories.empty?
+    @keywords << @article.tags.map { |t| t.name }.join(", ") unless @article.tags.empty?  
+    @description = "#{@article.title}, " 
+    @description << @article.categories.map { |c| c.name }.join(", ") << ", " unless @article.categories.empty?
+    @description << @article.tags.map { |t| t.name }.join(", ") unless @article.tags.empty?
+    @description << " #{this_blog.blog_name}"
+  end
+  
   def set_headers
     headers["Content-Type"] = "text/html; charset=utf-8"
   end
 
-  def render_paginated_index(on_empty = "No posts found...")
+  def render_paginated_index(on_empty = _("No posts found..."))
     return error(on_empty, :status => 200) if @articles.empty?
-
-    @pages = Paginator.new self, @articles.size, this_blog.limit_article_display, params[:page]
-    start = @pages.current.offset
-    stop  = (@pages.current.next.offset - 1) rescue @articles.size
-    # Why won't this work? @articles.slice!(start..stop)
-    @articles = @articles.slice(start..stop)
     render :action => 'index'
   end
 
   def index_title
     returning('') do |page_title|
-      page_title << formatted_date_selector('Archives for ')
+      page_title << formatted_date_selector(_('Archives for '))
 
       if params[:page]
         page_title << 'Older posts' if page_title.blank?
@@ -138,6 +160,32 @@ class ArticlesController < ContentController
     end
   end
   
+  def index_description
+    returning('') do |page_description|
+      if this_blog.meta_description.empty?
+      page_description << "#{this_blog.blog_name} #{this_blog.blog_subtitle}" 
+      else
+        page_description << this_blog.meta_description
+      end
+      
+      page_description << formatted_date_selector(_(', Articles for '))
+      
+      if params[:page]
+        page_description << ", page " << params[:page]
+      end
+    end
+  end
+  
+  def time_delta(year, month = nil, day = nil)
+    from = Time.mktime(year, month || 1, day || 1)
+
+    to = from.next_year
+    to = from.next_month unless month.blank?
+    to = from + 1.day unless day.blank?
+    to = to - 1 # pull off 1 second so we don't overlap onto the next day
+    return from..to
+  end
+    
   def formatted_date_selector(prefix = '')
     return '' unless params[:year]
     format = prefix

data/app/controllers/backend_controller.rb

@@ -1,6 +1,6 @@
 class BackendController < ContentController
   skip_before_filter :verify_authenticity_token
-  
+  require 'actionwebservice'
   cache_sweeper :blog_sweeper
   session :off
 
@@ -11,5 +11,11 @@ class BackendController < ContentController
   web_service(:mt)          { MovableTypeService.new(self) }
   web_service(:blogger)     { BloggerService.new(self) }
 
-  alias xmlrpc api
+  def xmlrpc
+    api
+  end
+  
+  def api
+    dispatch_web_service_request
+  end
 end

data/app/controllers/grouping_controller.rb

@@ -28,16 +28,22 @@ class GroupingController < ContentController
   end
 
   def index
-    self.groupings = grouping_class.find_all_with_article_counters(1000)
+    self.groupings = grouping_class.paginate(:page => params[:page], :per_page => 100)
     @page_title = "#{self.class.to_s.sub(/Controller$/,'')}"
+    @keywords = ""
+    @description = "#{_(self.class.to_s.sub(/Controller$/,''))} #{'for'} #{this_blog.blog_name}"
+    @description << "#{_('page')} #{params[:page]}" if params[:page]
     render_index(groupings)
   end
 
   def show
     grouping = grouping_class.find_by_permalink(params[:id])
-    @page_title = "#{self.class.to_s.sub(/Controller$/,'').singularize} #{params[:id]}, everything about #{params[:id]}"
+    @page_title = "#{self.class.to_s.sub(/Controller$/,'').singularize} #{params[:id]}, #{_('everything about')} #{params[:id]}"
     @page_title << " page " << params[:page] if params[:page]
-    render_articles(grouping.published_articles)
+    @description = (grouping.description.blank?) ? "" : grouping.description
+    @keywords = (grouping.keywords.blank?) ? "" : grouping.keywords
+    @articles = grouping.articles.paginate(:page => params[:page], :conditions => { :published => true})
+    render_articles
   end
 
   protected
@@ -66,19 +72,19 @@ class GroupingController < ContentController
     end
   end
 
-  def render_articles(articles)
+  def render_articles
     respond_to do |format|
       format.html do
-        return error("Can't find any articles for '#{params[:id]}'") if articles.empty?
-
-        @pages = Paginator.new self, articles.size, this_blog.limit_article_display, params[:page]
-        @articles = articles.slice(@pages.current.offset, this_blog.limit_article_display)
+        if @articles.empty?
+          redirect_to this_blog.base_url, :status => 301
+          return
+        end
 
         render :template => 'articles/index' unless template_exists?
       end
 
-      format.atom { render_feed 'atom_feed',  articles }
-      format.rss  { render_feed 'rss20_feed', articles }
+      format.atom { render_feed 'atom_feed',  @articles }
+      format.rss  { render_feed 'rss20_feed', @articles }
     end
   end
 

data/app/controllers/redirect_controller.rb

@@ -4,7 +4,7 @@ class RedirectController < ContentController
   def redirect
     if (params[:from].first == 'articles')
       path = request.path.sub('/articles', '')
-      url_root = request.relative_url_root
+      url_root = self.class.relative_url_root
       path = url_root + path unless url_root.nil?
       redirect_to path, :status => 301
       return
@@ -14,7 +14,7 @@ class RedirectController < ContentController
 
     if(r)
       path = r.to_path
-      url_root = request.relative_url_root
+      url_root = self.class.relative_url_root
       path = url_root + path unless url_root.nil? or path[0,url_root.length] == url_root
       redirect_to path, :status => 301
     else

data/app/controllers/users_controller.rb

@@ -0,0 +1,4 @@
+class UsersController < GroupingController
+  # index - inherited
+  # show - inherited
+end

data/app/controllers/xml_controller.rb

@@ -32,7 +32,9 @@ class XmlController < ApplicationController
     else
       @items = Array.new
       @blog = this_blog
-      @feed_title = this_blog.blog_name
+      # We use @feed_title.<< to destructively modify @feed_title, below, so
+      # make sure we have our own copy to modify.
+      @feed_title = this_blog.blog_name.dup
       @link = this_blog.base_url
 
       if respond_to?("prep_#{params[:type]}")

data/app/helpers/admin/base_helper.rb

@@ -5,105 +5,59 @@ module Admin::BaseHelper
     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)
+      output << subtab(_(m.name), current, m.url)
     end     
     content_for(:tasks) { output.join("\n") }
   end
 
-  def state_class(item)
-    item.state.to_s
-  end
-
-  def render_flash
-    output = []
-
-    for key,value in flash
-      output << "<span class=\"#{key.to_s.downcase}\">#{value}</span>"
-    end if flash
-
-    output.join("<br/>\n")
-  end
-
-  def render_tasks
-     output = []
-
-      for key,value in @tasks
-      output << "<a href=\"#{value}\">#{key}</a>"
-    end if @tasks
-
-    output.join("<br />\n")
-  end
-
-  def current_user_notice
-    unless current_user
-      link_to _("log in"), :controller => "/accounts", :action=>"login"
-    else
-      link_to _("log out"), :controller => "/accounts", :action=>"logout"
-    end
-  end
-
-  def tab(label, options = {})
-    if controller.controller_name =~ /#{options[:controller].split('/').last}/
-      content_tag :li, link_to(label, options, {"class"=> ""}), {"class"=> ""}
-    else
-      content_tag :li, link_to(label, options)
-    end
-  end
-  
   def subtab(label, style, options = {})
     content_tag :li, link_to(label, options, { "class"=> style })
   end
 
-  def cancel(url = {:action => 'list'})
+  def show_page_heading
+    content_tag(:h2, @page_heading) unless @page_heading.blank?
+  end
+
+  def cancel(url = {:action => 'index'})
     link_to _("Cancel"), url
   end
 
-  def save(val = "Store")
+  def save(val = _("Store"))
     '<input type="submit" value="' + val + '" class="submit" />'
   end
 
-  def confirm_delete(val = "Delete")
+  def confirm_delete(val = _("Delete"))
    '<input type="submit" value="' + val + '" />'
   end
 
   def link_to_show(record, controller = @controller.controller_name)
     if record.published?
-      link_to image_tag('admin/show.png', :alt => "show", :title => "Show content"), 
+      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)
-    link_to image_tag('admin/edit.png', :alt => "edit", :title => "Edit content"),
-      :controller => controller, :action => 'edit', :id => record.id
+  def link_to_edit(label, record, controller = @controller.controller_name)
+    link_to label, :controller => controller, :action => 'edit', :id => record.id
   end
   
-  def link_to_edit_with_profiles(record, controller = @controller.controller_name)
-    if current_user.profile.label == 'admin'
-    link_to image_tag('admin/edit.png', :alt => "edit", :title => "Edit content"),
-      :controller => controller, :action => 'edit', :id => record.id
-    else
-      link_to(image_tag('admin/edit.png', :alt => "edit", :title => "Edit content"),
-        :controller => controller, :action => 'edit', :id => record.id) if current_user.id == record.user_id
+  def link_to_edit_with_profiles(label, record, controller = @controller.controller_name)
+    if current_user.admin? || current_user.id == record.user_id
+      link_to label, :controller => controller, :action => 'edit', :id => record.id 
     end
   end
 
   def link_to_destroy(record, controller = @controller.controller_name)
-    link_to image_tag('admin/delete.png', :alt => "delete", :title => "Delete content"),
+    link_to image_tag('admin/delete.png', :alt => _("delete"), :title => _("Delete content")),
       :controller => controller, :action => 'destroy', :id => record.id
   end
 
   def link_to_destroy_with_profiles(record, controller = @controller.controller_name)
-    if current_user.profile.label == 'admin'
-      link_to(image_tag('admin/delete.png', :alt => "delete", :title => "Delete content"), 
-      { :controller => controller, :action => 'destroy', :id => record.id, :search => params[:search], 
-        :page => params[:page] },  :confirm => "Are you sure?", :method => :post)
-    else
-      link_to(image_tag('admin/delete.png', :alt => "delete", :title => "Delete content"), 
-      { :controller => controller, :action => 'destroy', :id => record.id, :search => params[:search], 
-        :page => params[:page] },  :confirm => "Are you sure?", :method => :post) if current_user.id == record.user_id
-    end
+    if current_user.admin? || current_user.id == record.user_id
+      link_to(_("delete"), 
+        { :controller => controller, :action => 'destroy', :id => record.id }, :confirm => _("Are you sure?"), :method => :post, :title => _("Delete content"))
+      end
   end
 
   def text_filter_options
@@ -125,11 +79,7 @@ module Admin::BaseHelper
   end
 
   def task_overview
-    task(_('Back to overview'), 'index')
-  end
-
-  def task(title, action, id = nil)
-    content_tag :li, link_to(title, :action => action, :id => id)
+    content_tag :li, link_to(_('Back to overview'), :action => 'index')
   end
 
   def task_add_resource_metadata(title,id)
@@ -144,72 +94,40 @@ module Admin::BaseHelper
     link_to_function(title, toggle_effect('edit-resource-mime-' + id.to_s, 'Effect.BlindUp', "duration:0.4", "Effect.BlindDown", "duration:0.4"))
   end
 
-  def time_delta_from_now_in_words(timestamp)
-    distance_of_time_in_words_to_now(timestamp) + ((Time.now < timestamp) ? ' from now' : ' ago')
-  end
-
-  def link_to_bookmarklet
-    "javascript:if(navigator.userAgent.indexOf('Safari') >= 0)" + \
-    "{Q=getSelection();}" + \
-    "else{Q=document.selection?document.selection.createRange().text:document.getSelection();}" + \
-    "location.href='#{this_blog.base_url}/admin/content/new?bookmarklet_text='+encodeURIComponent(Q)" + \
-    "+'&bookmarklet_link='+encodeURIComponent(location.href)+'&bookmarklet_title='+encodeURIComponent(document.title);"
-  end
-    
   def class_write
     if controller.controller_name == "content" or controller.controller_name == "pages"
-      if controller.action_name == "new"
-        "current"
-      end
+      "current" if controller.action_name == "new"
     end
   end
   
   def class_content
     if controller.controller_name  =~ /content|pages|categories|resources/
-      if controller.action_name =~ /list|index|show/
-        "current"
-      end
+      "current" if controller.action_name =~ /list|index|show/
     end
   end
 
   def class_feedback
-    if controller.controller_name  =~ /feedback/
-    "current"
-    end
+    "current" if controller.controller_name  =~ /feedback/
   end
 
   def class_themes
-    if controller.controller_name  =~ /themes/
-    "current"
-    end
-  end
-
-  def class_sidebar
-    if controller.controller_name  =~ /sidebar/
-    "current"
-    end
+    "current" if controller.controller_name  =~ /themes|sidebar/
   end
   
   def class_users
-    if controller.controller_name  =~ /users/
-    "current"
-    end
+    controller.controller_name  =~ /users/ ? "current right" : "right"
   end
 
   def class_dashboard
-    if controller.controller_name  =~ /dashboard/
-    "current"
-    end
+    controller.controller_name  =~ /dashboard/ ? "current right" : "right"
   end    
 
   def class_settings
-    if controller.controller_name  =~ /settings|textfilter/
-    "current"
-    end
+    controller.controller_name  =~ /settings|textfilter/ ? "current right" : "right"
   end
 
   def t_textarea(object_name, method, options)
-    if this_blog.editor == 2
+    if current_user.editor == 2
       fckeditor_textarea(object_name, method, options)
     else
       text_area(object_name, method, options)
@@ -220,7 +138,7 @@ module Admin::BaseHelper
     result = "<select name='#{object}[#{method}]'>\n" 
       
     if prompt == true
-      result << "<option value=''>Please select</option>"
+      result << "<option value=''>" << _("Please select") << "</option>"
     end
     for element in collection
       if current_value and current_value == element.send(value_method)
@@ -235,7 +153,7 @@ module Admin::BaseHelper
 
   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"
+      "<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"
     end
   end
   
@@ -245,9 +163,38 @@ module Admin::BaseHelper
     result << " "
     result << _("or") 
     result << " "
-    result << save("Save" + " &raquo")
+    result << save( _("Save") + " &raquo")
     result << '</p>'
     return result
   end
   
+  def link_to_published(item)
+    item.published? ? link_to_permalink(item, _("published")) : _("unpublished")
+  end
+  
+  def macro_help_popup(macro, text)
+    unless current_user.editor == 2
+      "<a href=\"#{url_for :controller => 'textfilters', :action => 'macro_help', :id => macro.short_name}\" onclick=\"return popup(this, 'Typo Macro Help')\">#{text}</a>"
+    end    
+  end
+  
+  def render_macros(macros)
+    result = link_to_function _("Show help on Typo macros") + " (+/-)",update_page { |page| page.visual_effect(:toggle_blind, "macros", :duration => 0.2) }
+    result << "<table id='macros' style='display: none;'>"
+    result << "<tr>"
+    result << "<th>#{_('Name')}</th>"
+    result << "<th>#{_('Description')}</th>"
+    result << "<th>#{_('Tag')}</th>"
+    result << "</tr>"
+    
+    for macro in macros.sort_by { |f| f.short_name }
+      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 << "</tr>"
+    end
+    result << "</table>"
+  end
+  
 end

data/app/helpers/admin/content_helper.rb

@@ -16,8 +16,26 @@ module Admin::ContentHelper
     if record.state.to_s == "Draft"
       link_to(_("Destroy this draft"), 
         { :controller => controller, :action => 'destroy', :id => record.id },
-          :confirm => "Are you sure?", :method => :post )
+          :confirm => _("Are you sure?"), :method => :post )
     end
   end
 
+  def checkbox_for_collection(container, selected = nil)
+    container = container.to_a if Hash === container
+
+    options_for_select = container.inject([]) do |options, element|
+      text, value = option_text_and_value(element)
+      selected_attribute = ' checked' if option_value_selected?(value, selected)
+      options << %(<input type="checkbox" name="categories[]" id="category_#{html_escape(value.to_s)}" value="#{html_escape(value.to_s)}"#{selected_attribute} /><label for="category_#{html_escape(value.to_s)}">#{html_escape(text.to_s)}</label>)
+    end
+
+    options_for_select.join("<br />")
+  end
+
+  def checkboxes_from_collection(collection, value_method, text_method, selected = nil)
+    options = collection.map do |element|
+      [element.send(text_method), element.send(value_method)]
+    end
+    checkbox_for_collection(options, selected)
+  end
 end