Changeset 1683

Show
Ignore:
Timestamp:
04/06/08 16:17:25 (1 month ago)
Author:
neuro
Message:

Adds tags management to the back office. Still needs tag merging... later

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/app/models/tag.rb

    r1679 r1683  
    22  has_and_belongs_to_many :articles, :order => 'created_at DESC' 
    33  validates_uniqueness_of :name 
    4  
     4  
    55  def self.get(name) 
    66    tagname = name.tr(' ', '').downcase 
    …… 
    2323 
    2424  def ensure_naming_conventions 
    25     if self.display_name.blank? 
     25    if self.display_name.blank? or self.display_name != self.name 
    2626      self.display_name = self.name 
    2727    end 
    …… 
    3232  before_save :ensure_naming_conventions 
    3333 
    34   def self.find_all_with_article_counters(limit = 20) 
     34  def self.find_all_with_article_counters(limit = 20, orderby='article_counter DESC') 
    3535    # Only count published articles 
    3636    self.find_by_sql([%{ 
    …… 
    4242      WHERE articles.published = ? 
    4343      GROUP BY tags.id, tags.name, tags.display_name 
    44       ORDER BY article_counter DESC 
     44      ORDER BY #{orderby}  
    4545      LIMIT ? 
    4646      },true, limit]).each{|item| item.article_counter = item.article_counter.to_i } 

  • trunk/app/views/admin/categories/list.html.erb

    r1634 r1683  
    22 
    33  <% content_for('tasks') do -%> 
    4         <%= subtab _("Manage posts"), "", {:controller=>"content", :action=>"list"} %> 
    5         <%= subtab _("Manage pages"), "", {:controller=>"pages", :action=>"list"} %> 
    6         <%= subtab _("Manage categories"), "current", {:controller=>"categories", :action=>"index"} %> 
    7         <%= subtab _("Manage uploads"), "", {:controller=>"resources", :action=>"list"} %> 
     4          <%= subtab _("Manage posts"), "", {:controller=>"content", :action=>"list"} %> 
     5          <%= subtab _("Manage pages"), "", {:controller=>"pages", :action=>"list"} %> 
     6          <%= subtab _("Manage categories"), "current", {:controller=>"categories", :action=>"index"} %> 
     7          <%= subtab _("Manage uploads"), "", {:controller=>"resources", :action=>"list"} %> 
     8          <%= subtab _("Manage tags"), "", {:controller=>"tags", :action=>"list"} %> 
    89  <% end -%>  
    910 

  • trunk/app/views/admin/content/list.html.erb

    r1634 r1683  
    22 
    33  <% content_for('tasks') do %> 
    4         <%= subtab _("Manage posts"), "current", {:controller=>"content", :action=>"list"} %> 
    5         <%= subtab _("Manage pages"), "", {:controller=>"pages", :action=>"list"} %> 
    6         <%= subtab _("Manage categories"), "", {:controller=>"categories", :action=>"index"} %> 
    7         <%= subtab _("Manage uploads"), "", {:controller=>"resources", :action=>"list"} %> 
     4          <%= subtab _("Manage posts"), "current", {:controller=>"content", :action=>"list"} %> 
     5          <%= subtab _("Manage pages"), "", {:controller=>"pages", :action=>"list"} %> 
     6          <%= subtab _("Manage categories"), "", {:controller=>"categories", :action=>"index"} %> 
     7          <%= subtab _("Manage uploads"), "", {:controller=>"resources", :action=>"list"} %> 
     8          <%= subtab _("Manage tags"), "", {:controller=>"tags", :action=>"list"} %> 
    89  <% end %>  
    910  <div id="quick-navigate" style="display:none;position:absolute;"> 

  • trunk/app/views/admin/pages/list.html.erb

    r1634 r1683  
    22 
    33  <% content_for('tasks') do %> 
    4         <%= subtab _("Manage posts"), "", {:controller=>"content", :action=>"list"} %> 
    5         <%= subtab _("Manage pages"), "current", {:controller=>"pages", :action=>"list"} %> 
    6         <%= subtab _("Manage categories"), "", {:controller=>"categories", :action=>"index"} %> 
    7         <%= subtab _("Manage uploads"), "", {:controller=>"resources", :action=>"list"} %> 
     4          <%= subtab _("Manage posts"), "", {:controller=>"content", :action=>"list"} %> 
     5          <%= subtab _("Manage pages"), "current", {:controller=>"pages", :action=>"list"} %> 
     6          <%= subtab _("Manage categories"), "", {:controller=>"categories", :action=>"index"} %> 
     7          <%= subtab _("Manage uploads"), "", {:controller=>"resources", :action=>"list"} %> 
     8          <%= subtab _("Manage tags"), "", {:controller=>"tags", :action=>"list"} %> 
    89  <% end %>  
    910 

  • trunk/app/views/admin/resources/list.html.erb

    r1587 r1683  
    11  <% @page_heading = _('Uploads') + '(' + link_to(_("add new"), :action => 'new') + ')' %> 
    22  <% content_for('tasks') do %> 
    3         <%= subtab _("Posts"), "", {:controller=>"content", :action=>"list"} %> 
    4         <%= subtab _("Pages"), "", {:controller=>"pages", :action=>"list"} %> 
    5         <%= subtab _("Categories"), "", {:controller=>"categories", :action=>"index"} %> 
    6         <%= subtab _("Uploads"), "current", {:controller=>"resources", :action=>"list"} %> 
     3          <%= subtab _("Manage posts"), "", {:controller=>"content", :action=>"list"} %> 
     4          <%= subtab _("Manage pages"), "", {:controller=>"pages", :action=>"list"} %> 
     5          <%= subtab _("Manage categories"), "", {:controller=>"categories", :action=>"index"} %> 
     6          <%= subtab _("Manage uploads"), "current", {:controller=>"resources", :action=>"list"} %> 
     7          <%= subtab _("Manage tags"), "", {:controller=>"tags", :action=>"list"} %> 
    78  <% end %>  
    89