app/plugins/feather-comments/vendor/splam/MIT-LICENSE app/plugins/feather-comments/vendor/splam/README app/plugins/feather-comments/vendor/splam/Rakefile app/plugins/feather-comments/vendor/splam/init.rb app/plugins/feather-comments/vendor/splam/install.rb app/plugins/feather-comments/vendor/splam/lib/splam.rb app/plugins/feather-comments/vendor/splam/lib/splam/rule.rb app/plugins/feather-comments/vendor/splam/lib/splam/rules.rb app/plugins/feather-comments/vendor/splam/lib/splam/rules/arms_race.rb app/plugins/feather-comments/vendor/splam/lib/splam/rules/bad_words.rb app/plugins/feather-comments/vendor/splam/lib/splam/rules/bbcode.rb app/plugins/feather-comments/vendor/splam/lib/splam/rules/chinese.rb app/plugins/feather-comments/vendor/splam/lib/splam/rules/good_words.rb app/plugins/feather-comments/vendor/splam/lib/splam/rules/href.rb app/plugins/feather-comments/vendor/splam/lib/splam/rules/html.rb app/plugins/feather-comments/vendor/splam/lib/splam/rules/line_length.rb app/plugins/feather-comments/vendor/splam/lib/splam/rules/punctuation.rb app/plugins/feather-comments/vendor/splam/lib/splam/rules/russian.rb app/plugins/feather-comments/vendor/splam/lib/splam/rules/word_length.rb app/plugins/feather-comments/vendor/splam/tasks/splam_tasks.rake app/plugins/feather-comments/vendor/splam/test/fixtures/comment/ham/api-1.txt app/plugins/feather-comments/vendor/splam/test/fixtures/comment/ham/api-2.txt app/plugins/feather-comments/vendor/splam/test/fixtures/comment/ham/api-3.txt app/plugins/feather-comments/vendor/splam/test/fixtures/comment/ham/api-4.txt app/plugins/feather-comments/vendor/splam/test/fixtures/comment/ham/api-5.txt app/plugins/feather-comments/vendor/splam/test/fixtures/comment/ham/api.txt app/plugins/feather-comments/vendor/splam/test/fixtures/comment/ham/api_bug.txt app/plugins/feather-comments/vendor/splam/test/fixtures/comment/ham/backtrace.txt app/plugins/feather-comments/vendor/splam/test/fixtures/comment/ham/epic.txt app/plugins/feather-comments/vendor/splam/test/fixtures/comment/ham/epic_warehouse.txt app/plugins/feather-comments/vendor/splam/test/fixtures/comment/ham/extra_fields.txt app/plugins/feather-comments/vendor/splam/test/fixtures/comment/ham/feedlinks.txt app/plugins/feather-comments/vendor/splam/test/fixtures/comment/ham/github.txt app/plugins/feather-comments/vendor/splam/test/fixtures/comment/ham/hub.txt app/plugins/feather-comments/vendor/splam/test/fixtures/comment/ham/mario.txt app/plugins/feather-comments/vendor/splam/test/fixtures/comment/ham/mylyn.txt app/plugins/feather-comments/vendor/splam/test/fixtures/comment/ham/omg_thanks_again_finally_warehouse.txt app/plugins/feather-comments/vendor/splam/test/fixtures/comment/ham/omg_thanks_again_warehouse.txt app/plugins/feather-comments/vendor/splam/test/fixtures/comment/ham/problem.txt app/plugins/feather-comments/vendor/splam/test/fixtures/comment/ham/sample_html.txt app/plugins/feather-comments/vendor/splam/test/fixtures/comment/ham/short_reply.txt app/plugins/feather-comments/vendor/splam/test/fixtures/comment/ham/tags.txt app/plugins/feather-comments/vendor/splam/test/fixtures/comment/ham/thanks_warehouse.txt app/plugins/feather-comments/vendor/splam/test/fixtures/comment/ham/thx.txt app/plugins/feather-comments/vendor/splam/test/fixtures/comment/spam/125_spam-12420.txt app/plugins/feather-comments/vendor/splam/test/fixtures/comment/spam/40_pharmacia.txt app/plugins/feather-comments/vendor/splam/test/fixtures/comment/spam/amazon.txt app/plugins/feather-comments/vendor/splam/test/fixtures/comment/spam/bluebichen.txt app/plugins/feather-comments/vendor/splam/test/fixtures/comment/spam/boobz.txt app/plugins/feather-comments/vendor/splam/test/fixtures/comment/spam/buffy.txt app/plugins/feather-comments/vendor/splam/test/fixtures/comment/spam/chinese.txt app/plugins/feather-comments/vendor/splam/test/fixtures/comment/spam/comment_bbc.txt app/plugins/feather-comments/vendor/splam/test/fixtures/comment/spam/comment_cnn.txt app/plugins/feather-comments/vendor/splam/test/fixtures/comment/spam/comment_randi.txt app/plugins/feather-comments/vendor/splam/test/fixtures/comment/spam/comment_wordy.txt app/plugins/feather-comments/vendor/splam/test/fixtures/comment/spam/consent.txt app/plugins/feather-comments/vendor/splam/test/fixtures/comment/spam/december.txt app/plugins/feather-comments/vendor/splam/test/fixtures/comment/spam/digital_rights.txt app/plugins/feather-comments/vendor/splam/test/fixtures/comment/spam/dyed_wool.txt app/plugins/feather-comments/vendor/splam/test/fixtures/comment/spam/hairbrush_sex.txt app/plugins/feather-comments/vendor/splam/test/fixtures/comment/spam/handbag.txt app/plugins/feather-comments/vendor/splam/test/fixtures/comment/spam/inqius.txt app/plugins/feather-comments/vendor/splam/test/fixtures/comment/spam/kidneys.txt app/plugins/feather-comments/vendor/splam/test/fixtures/comment/spam/madonna.txt app/plugins/feather-comments/vendor/splam/test/fixtures/comment/spam/make_plans.txt app/plugins/feather-comments/vendor/splam/test/fixtures/comment/spam/oem.txt app/plugins/feather-comments/vendor/splam/test/fixtures/comment/spam/oem2.txt app/plugins/feather-comments/vendor/splam/test/fixtures/comment/spam/oem_intl.txt app/plugins/feather-comments/vendor/splam/test/fixtures/comment/spam/omg_sex.txt app/plugins/feather-comments/vendor/splam/test/fixtures/comment/spam/ottersex.txt app/plugins/feather-comments/vendor/splam/test/fixtures/comment/spam/pr0n.txt app/plugins/feather-comments/vendor/splam/test/fixtures/comment/spam/property.txt app/plugins/feather-comments/vendor/splam/test/fixtures/comment/spam/pyromancy.txt app/plugins/feather-comments/vendor/splam/test/fixtures/comment/spam/rapid.txt app/plugins/feather-comments/vendor/splam/test/fixtures/comment/spam/russki.txt app/plugins/feather-comments/vendor/splam/test/fixtures/comment/spam/russki2.txt app/plugins/feather-comments/vendor/splam/test/fixtures/comment/spam/shipping.txt app/plugins/feather-comments/vendor/splam/test/fixtures/comment/spam/short_n_sweet.txt app/plugins/feather-comments/vendor/splam/test/fixtures/comment/spam/spam-13232.txt app/plugins/feather-comments/vendor/splam/test/fixtures/comment/spam/spam-13518.txt app/plugins/feather-comments/vendor/splam/test/fixtures/comment/spam/spam-13519.txt app/plugins/feather-comments/vendor/splam/test/fixtures/comment/spam/spam-13520.txt app/plugins/feather-comments/vendor/splam/test/fixtures/comment/spam/spam-13521.txt app/plugins/feather-comments/vendor/splam/test/fixtures/comment/spam/spam-13982.txt app/plugins/feather-comments/vendor/splam/test/fixtures/comment/spam/spam-14178.txt app/plugins/feather-comments/vendor/splam/test/fixtures/comment/spam/spam-14447.txt app/plugins/feather-comments/vendor/splam/test/fixtures/comment/spam/spam-14718.txt app/plugins/feather-comments/vendor/splam/test/fixtures/comment/spam/spam0113081.txt app/plugins/feather-comments/vendor/splam/test/fixtures/comment/spam/tk.txt app/plugins/feather-comments/vendor/splam/test/fixtures/comment/spam/troubles.txt app/plugins/feather-comments/vendor/splam/test/fixtures/comment/spam/url_only_idiot.txt app/plugins/feather-comments/vendor/splam/test/fixtures/comment/spam/webcam.txt app/plugins/feather-comments/vendor/splam/test/splam_rule_test.rb app/plugins/feather-comments/vendor/splam/test/splam_test.rb app/plugins/feather-comments/vendor/splam/test/test_helper.rb app/plugins/feather-comments/vendor/splam/uninstall.rb @@ -2,21 +2,27 @@ module Feather module Admin class Comments < Base include_plugin_views __FILE__ - before :find_comment, :only => %w(edit update delete show) + before :find_comment, :only => %w(delete show) def index - @page_count, @comments = Feather::Comment.paginated(:page => params[:page], :per_page => 10, :order => [:created_at.desc]) + @page_count, @comments = Feather::Comment.paginated(:page => (params[:page] || 1).to_i, :per_page => 20, :order => [:created_at.desc]) display @comments end - def update - @comment.published = (params[:published] == "true" ? true : false) if params[:published] - @comment.save - render_js - end - def delete - @comment.destroy + # Make sure we have a comment + unless @comment.nil? + # See if we're marking this as spam (i.e. looking to remove others just like it) + if params[:spam] && params[:spam] == "true" + # If so, we want to remove all other comments with the same IP, e-mail, website or name + Feather::Comment.all(:conditions => {:ip_address => @comment.ip_address}).each { |c| c.destroy } + Feather::Comment.all(:conditions => {:email_address => @comment.email_address}).each { |c| c.destroy } + Feather::Comment.all(:conditions => {:website => @comment.website}).each { |c| c.destroy } + Feather::Comment.all(:conditions => {:name => @comment.name}).each { |c| c.destroy } + end + # Now remove the comment itself + @comment.destroy + end redirect url(:admin_comments) end @@ -26,7 +32,7 @@ module Feather private def find_comment - @comment = Comment[params[:id]] + @comment = Feather::Comment.get(params[:id]) end end end app/plugins/feather-comments/controllers/admin/comments.rb @@ -1,24 +1,13 @@ module Feather class Comments < Application def create - if (!CommentSetting.current.negative_captcha || params[:comment][:notes].nil? || params[:comment][:notes] == "") + if params[:comment][:title].blank? @comment = Comment.new(params[:comment]) @comment.ip_address = request.remote_ip - @comment.published = !CommentSetting.current.moderation - if !@comment.save - session[:comment_error] = @comment.errors.collect { |e| e[1].first } - else - article = Article[@comment.article_id] - # Send e-mail notification if that setting is enabled - if CommentSetting.current.email_notification - email_params = { :from => CommentSetting.current.from_email, :to => CommentSetting.current.to_email, :subject => "New comment - RE: #{article.title}" } - params = { :comment => @comment, :article => article, :request => request } - send_mail(CommentMailer, :notify, email_params, params) - end - redirect article.permalink - end + @comment.save + @article = Article[@comment.article_id] end - redirect request.env["HTTP_REFERER"] + redirect @article.nil? ? request.env["HTTP_REFERER"] : @article.permalink end end end \ No newline at end of file app/plugins/feather-comments/controllers/comments.rb @@ -1,15 +1,16 @@ +$:.unshift(File.join(File.dirname(__FILE__), "vendor", "splam", "lib")) +require 'splam' +require 'splam/rule' +require 'splam/rules' + require File.join(File.dirname(__FILE__), "controllers", "admin", "comments") -require File.join(File.dirname(__FILE__), "controllers", "admin", "comment_settings") require File.join(File.dirname(__FILE__), "controllers", "comments") -require File.join(File.dirname(__FILE__), "mailers", "comment_mailer") require File.join(File.dirname(__FILE__), "models", "feather", "comment") -require File.join(File.dirname(__FILE__), "models", "feather", "comment_setting") Feather::Hooks::Routing.register_route do |r| r.resources :comments, :controller => "comments" r.namespace "feather/admin", :path => "admin", :name_prefix => "admin" do r.resources :comments, :path => "admin/comments", :name_prefix => "admin", :controller => "admin/comments" - r.resource :comment_setting, :path => "admin/comment_setting", :name_prefix => "admin", :controller => "admin/comment_settings" end end app/plugins/feather-comments/init.rb @@ -1,2 +1 @@ -Feather::Database::migrate(Feather::Comment) -Feather::Database::migrate(Feather::CommentSetting) \ No newline at end of file +Feather::Database::migrate(Feather::Comment) \ No newline at end of file app/plugins/feather-comments/install.rb @@ -1,6 +1,12 @@ module Feather class Comment include DataMapper::Resource + + include Splam + splammable :comment do |splam| + splam.threshold = 40 + splam.rules = [:bad_words, :html, :bbcode, :href] + end is_paginated @@ -13,21 +19,33 @@ module Feather property :email_address, String property :formatter, String, :default => "default" property :ip_address, String, :default => "127.0.0.1" - property :published, Boolean, :default => true - # Gotta have this lame dummy property for the negative captcha - property :notes, String belongs_to :article validates_present :name, :comment, :article_id + before :save, :check_for_spam + def check_for_spam + throw :halt if self.splam? + end + before :save, :prepend_http_if_needed belongs_to :article after :save, :fire_after_comment_event after :create, :set_create_activity + after :save, :expire_cache + after :destroy, :expire_cache + + # Dummy honeypot propery + attr_accessor :title + + # This expires the article page that the comment belongs to + def expire_cache + Feather::Article.expire_article_page(self.article_id) + end def self.all_for_post(article_id, method = :all) - self.send(method, {:article_id => article_id, :published => true, :order => [:created_at.asc]}) + self.send(method, {:article_id => article_id, :order => [:created_at.asc]}) end ## app/plugins/feather-comments/models/feather/comment.rb @@ -3,11 +3,10 @@ </h5> <p><a href="#comment-form">Leave a response</a></p> <ol class="comments" id="comments"> - <% Feather::Comment.all_for_post(@article.id).each do |comment| %> <li id="comment-<%= comment.id %>" class="comment"> <div class="author"> - <cite><span class="author"><span><%= comment.website.blank? ? h(comment.name) : link_to(h(comment.name), comment.website) %></span></span></cite> – + <cite><span class="author"><span><%= comment.website.blank? ? h(comment.name) : link_to(h(comment.name), comment.website, :rel => "nofollow") %></span></span></cite> – <abbr title="<%= comment.created_at %>"><span class="date"><%= TZInfo::Timezone.get(@article.user.time_zone).utc_to_local(comment.created_at).strftime("%b %d %y @ %I:%M%p") %></span></abbr> </div> <div class="content"> @@ -18,23 +17,13 @@ </ol> <div> <%= form_for :comment, :action => url(:comments), :id => 'comment-form' do %> - <% if session[:comment_error] %> - <ul id="comment-errors"> - <% session[:comment_error].each do |err| %> - <li><%= err %></li> - <% end %> - </ul> - <% session[:comment_error] = nil %> - <% end %> <fieldset> <legend>Comment</legend> <%= hidden_field :name => "comment[article_id]", :value => @article.id %> - <% if Feather::CommentSetting.current.negative_captcha %> - <%= text_field :name => "comment[notes]", :id => "comment_notes" %> - <script type="text/javascript"> - document.getElementById('comment_notes').style.display = "none"; - </script> - <% end %> + <p class="comment_title"> + <label for="comment_title" class="text">Title:</label> + <%= text_field :name => 'comment[title]', :size => 30, :id => 'comment_title' %> + </p> <p> <label for="comment_name" class="text">Name:</label> <%= text_field :name => 'comment[name]', :size => 30, :id => 'comment_name' %> @@ -61,3 +50,6 @@ </fieldset> <% end =%> </div> +<style> + p.comment_title { display: none; } +</style> \ No newline at end of file app/plugins/feather-comments/views/after_article/_comments.html.erb @@ -3,5 +3,6 @@ <td><%= comment.website %></td> <td><%= comment.email_address %></td> <td><%= comment.ip_address %></td> - <td><%= link_to 'Delete', url(:delete_admin_comment, comment), {:method => :delete, :onclick => "return confirm('Are you sure?')"} %></td> + <td><%= link_to 'Delete', url(:delete_admin_comment, comment), {:method => :delete, :onclick => "return confirm('Are you sure you want to delete this comment?')"} %></td> + <td><%= link_to 'SPAM', url(:delete_admin_comment, comment, :spam => true), {:method => :delete, :onclick => "return confirm('Are you sure you want to delete this comment and any others like it?')"} %></td> </tr> \ No newline at end of file app/plugins/feather-comments/views/feather/admin/comments/_comment.html.erb @@ -2,15 +2,9 @@ <h4>View Comments</h4> <p> Comments are left on your blog by visitors. - <br /> - <%= link_to "View comment settings", url(:admin_comment_setting) %> </p> <% end %> -<div id="action"> - <%= link_to "View comment settings", url(:admin_comment_setting) %> -</div> - <h1>View Comments</h1> <table class='tabular'> @@ -21,7 +15,17 @@ <th>E-mail address</th> <th>IP address</th> <th> </th> + <th> </th> </tr> </thead> <%= partial('feather/admin/comments/comment', :with => @comments) %> -</table> \ No newline at end of file +</table> + +<% 1.upto(@page_count) do |page| %> + <% if page.to_i == (params[:page] || 1).to_i %> + <%= page %> + <% else %> + <%= link_to page, url(:admin_comments, :page => page) %> + <% end %> + <%= ' |' unless page == @page_count %> +<% end %> \ No newline at end of file app/plugins/feather-comments/views/feather/admin/comments/index.html.erb @@ -5,36 +5,6 @@ </p> <% end %> -<script lang="text/javascript"> -var Comments = { - publish: function(id) { - new Ajax.Request("/admin/comments/" + id + "?published=true", { - asynchronous:'true', - evalScripts:'true', - method:'put', - onLoading: function() { - $('comment-published').hide(); - $('comment-display').innerText = "Saving..." - }, - onFailure: function() { alert('Something went wrong...') }, - }); - }, - - unpublish: function(id) { - new Ajax.Request("/admin/comments/" + id + "?published=false", { - asynchronous:'true', - evalScripts:'true', - method:'put', - onLoading: function() { - $('comment-unpublished').hide(); - $('comment-display').innerText = "Saving..." - }, - onFailure: function() { alert('Something went wrong...') }, - }); - } -} -</script> - <h1>View Comment</h1> <p> @@ -55,16 +25,4 @@ var Comments = { <%= render_text(@comment.formatter, @comment.comment) %> </p> -<p> - <div id="comment_published" style="display: <%= @comment.published ? 'block' : 'none' %>;"> - Published - <a href="#" id="comment_unpublish" onclick="Comments.unpublish(<%= @comment.id %>);">Click to unpublish</a> - </div> - <div id="comment_unpublished" style="display: <%= @comment.published ? 'none' : 'block' %>;"> - Isn't published - <a href="#" id="comment_publish" onclick="Comments.publish(<%= @comment.id %>);">Click to publish</a> - </div> - <div id="comment_display"></div> -</p> - <%= link_to "Back to comments", url(:admin_comments) %> \ No newline at end of file app/plugins/feather-comments/views/feather/admin/comments/show.html.erb @@ -1,8 +1,8 @@ <?xml version="1.0" encoding="UTF-8"?> <feed xmlns="http://www.w3.org/2005/Atom"> - <title><%= Feather::Configuration.current.title %></title> - <% if Feather::Configuration.current.tag_line %> - <subtitle><%= Feather::Configuration.current.tag_line %></subtitle> + <title><%= Feather::Configuration.current[:title] %></title> + <% if Feather::Configuration.current[:tag_line] %> + <subtitle><%= Feather::Configuration.current[:tag_line] %></subtitle> <% end %> <link rel="self" href="<%= "http://#{request.host}#{request.uri}" %>"/> <link href="<%= "http://#{request.host}" %>"/> app/plugins/feather-feeds/views/feather/feeds/articles.atom.erb @@ -1,13 +1,13 @@ <?xml version="1.0" encoding="UTF-8"?> <rss xmlns:atom="http://www.w3.org/2005/Atom" version="2.0" xmlns:dc="http://purl.org/dc/elements/1.1/"> <channel> - <title><%= Feather::Configuration.current.title %></title> + <title><%= Feather::Configuration.current[:title] %></title> <atom:link rel="self" href="<%= "http://#{request.host}#{request.uri}" %>"/> <link><%= "http://#{request.host}#{request.uri}" %></link> <% if @articles.length > 0 %> <pubDate><%= rfc822(@articles.first.published_at) %></pubDate> <% end %> - <description><%= Feather::Configuration.current.tag_line %></description> + <description><%= Feather::Configuration.current[:tag_line] %></description> <% @articles.each do |article| %> <item> <title><%= article.title %></title> app/plugins/feather-feeds/views/feather/feeds/articles.rss.erb @@ -1,8 +1,8 @@ <?xml version="1.0" encoding="UTF-8"?> <feed xmlns="http://www.w3.org/2005/Atom"> - <title><%= Feather::Configuration.current.title %></title> - <% if Feather::Configuration.current.tag_line %> - <subtitle><%= Feather::Configuration.current.tag_line %></subtitle> + <title><%= Feather::Configuration.current[:title] %></title> + <% if Feather::Configuration.current[:tag_line] %> + <subtitle><%= Feather::Configuration.current[:tag_line] %></subtitle> <% end %> <link rel="self" href="<%= "http://#{request.host}#{request.uri}" %>"/> <link href="<%= "http://#{request.host}" %>"/> app/plugins/feather-feeds/views/feather/feeds/comments.atom.erb @@ -1,13 +1,13 @@ <?xml version="1.0" encoding="UTF-8"?> <rss xmlns:atom="http://www.w3.org/2005/Atom" version="2.0" xmlns:dc="http://purl.org/dc/elements/1.1/"> <channel> - <title><%= "#{Feather::Configuration.current.title}: comments" %></title> + <title><%= "#{Feather::Configuration.current[:title]}: comments" %></title> <atom:link rel="self" href="<%= "http://#{request.host}#{request.uri}" %>"/> <link><%= "http://#{request.host}#{request.uri}" %></link> <% if @comments.length > 0 %> <pubDate><%= rfc822(@comments.first.created_at) %></pubDate> <% end %> - <description><%= Feather::Configuration.current.tag_line %></description> + <description><%= Feather::Configuration.current[:tag_line] %></description> <% @comments.each do |comment| %> <% article = Feather::Article[comment.article_id] %> <% if article %> app/plugins/feather-feeds/views/feather/feeds/comments.rss.erb @@ -3,13 +3,11 @@ module Feather include_plugin_views __FILE__ def show(id) - @tag = Tag.get(id) - @tag = Tag.first(:conditions => {:name => id}) if @tag.nil? + @tag = Tag.first(:conditions => {:name => id}) display @tag end def index - @tags = Tag.all display @tags end end app/plugins/feather-tagging/controllers/tags.rb @@ -10,6 +10,38 @@ end Feather::Article.class_eval do include DataMapper::Tags has_tags + + after :save, :update_tags + after :destroy, :update_tags + + def update_tags + Merb::Cache[:feather].delete "#{Tag.name}" + Merb::Cache[:feather].delete "#{Tagging.name}" + end +end + +Feather::Application.class_eval do + before :grab_tags + + def grab_tags + @tags = Merb::Cache[:feather].fetch "#{Tag.name}" do + Tag.all.collect { |t| t.attributes.merge(:display_name => t.display_name) } + end + @taggings = Merb::Cache[:feather].fetch "#{Tagging.name}" do + Tagging.all.collect { |t| t.attributes } + end + end +end + +Tag.class_eval do + before :save, :no_spaces + def no_spaces + self.name.gsub!(" ", "-") + end + + def display_name + self.name.gsub("-", " ") + end end Feather::Hooks::Routing.register_route do |r| app/plugins/feather-tagging/init.rb @@ -1,16 +1,20 @@ module Merb module GlobalHelpers - def tag_cloud(tags, classes) + def tag_cloud(tags, taggings, classes) return "" if tags.nil? || tags.empty? max, min = 0, 0 + counter = {} + taggings.each do |t| + counter[t[:tag_id]].nil? ? counter[t[:tag_id]] = 1 : counter[t[:tag_id]] += 1 + end tags.each do |t| - count = ::Feather::Article.tagged_with(t.name).size.to_i + count = counter[t[:id]] || 0 max = count if count > max min = count if count < min end divisor = ((max - min) / classes.size) + 1 tags.each do |t| - count = ::Feather::Article.tagged_with(t.name).size.to_i + count = counter[t[:id]] || 0 yield t, classes[count / divisor] unless count == 0 end end app/plugins/feather-tagging/lib/global_helpers.rb @@ -7,9 +7,9 @@ <% unless @tags.empty? %> <ul> <% @tags.each do |tag| %> - <li><%= tag.name %></li> + <li><%= tag[:display_name] %></li> <ul> - <% Feather::Article.tagged_with(tag.name).each do |a| %> + <% Feather::Article.tagged_with(tag[:name]).each do |a| %> <li><%= link_to(a.title, a.permalink) %></li> <% end %> </ul> app/plugins/feather-tagging/views/feather/tags/index.html.erb @@ -1,17 +1,19 @@ <% throw_content :title do %> - Articles tagged with <%= @tag.name %> + <% if @tag.nil? %> + Unable to find tag '<%= params[:id] %>'. + <% else %> + Articles tagged with <%= @tag[:display_name] %> + <% end %> <% end %> -<h1>Articles Tagged with '<%= @tag.name %>'</h1> - -<%= error_messages_for @tag %> +<% if @tag.nil? %> + Unable to find tag '<%= params[:id] %>'. +<% else %> + <h1>Articles Tagged with '<%= @tag[:display_name] %>'</h1> -<% unless @tag.nil? %> <ul> - <% Feather::Article.tagged_with(@tag.name).each do |a| %> + <% Feather::Article.tagged_with(@tag[:name]).each do |a| %> <li><%= link_to(a.title, a.permalink) %></li> <% end %> </ul> -<% else %> - No articles found for <%= @tag.name %>. -<% end %> +<% end %> \ No newline at end of file app/plugins/feather-tagging/views/feather/tags/show.html.erb @@ -1,3 +1,3 @@ <% unless article.tag_list.empty? %> - | tagged with: <% article.tags.each_with_index do |t, i| %><%= link_to(t.name, "/tags/#{t.id}") %><%= i == (article.tag_list.length - 1) ? "" : ", " %><% end %> + | tagged with: <% article.tags.each_with_index do |t, i| %><%= link_to(t.display_name, "/tags/#{t.id}") %><%= i == (article.tag_list.length - 1) ? "" : ", " %><% end %> <% end %> app/plugins/feather-tagging/views/meta_section/_tag_list.html.erb @@ -10,8 +10,8 @@ <% unless @tags.empty? %> <div style="margin-top: 20px"> <h3>Tags</h3> - <% tag_cloud @tags, %w(tag1 tag2 tag3 tag4 tag5) do |tag, css_class| %> - <%= link_to(tag.name, url(:tag, tag), :class => css_class) %> + <% tag_cloud @tags, @tagging, %w(tag1 tag2 tag3 tag4 tag5) do |tag, css_class| %> + <%= link_to(tag[:display_name], url(:tag, tag), :class => css_class) %> <% end %> </div> <% end %> app/plugins/feather-tagging/views/sidebar/_tag_cloud.html.erb @@ -17,6 +17,9 @@ module Feather def set_default if params[:default_theme] && Feather::Theme.get(params[:default_theme]) Feather::PluginSetting.write('theme', params[:default_theme]) + # Expire all pages as the theme has changed + Feather::Article.expire_article_index_page + Feather::Article.expire_article_pages end redirect url(:admin_themes) end app/plugins/feather-themes/controllers/admin/themes.rb @@ -20,8 +20,12 @@ module Feather end def _theme_template_location(action, type = nil, controller = controller_name) - theme = Feather::PluginSetting.read('theme') - template = "#{theme}/views/#{controller}/#{action}.#{type}" + if Feather::Plugin.get("feather-themes").active + theme = Feather::PluginSetting.read('theme') + template = "#{theme}/views/#{controller}/#{action}.#{type}" + else + template = "views/#{controller}/#{action}.#{type}" + end end end end app/plugins/feather-themes/init.rb @@ -1,5 +1,5 @@ <p> - <b><%= article.title %></b> + <b><%= link_to_article(article.title, article) %></b> </p> <p> app/themes/override/views/feather/articles/_article.html.erb @@ -8,13 +8,13 @@ </head> <body> <%#= message[:notice] %> - <h1><%= @settings.title %></h1> - <h3><%= @settings.tag_line %></h3> + <h1><%= @settings[:title] %></h1> + <h3><%= @settings[:tag_line] %></h3> Click <%= link_to "here", "/" %> to return to the host app. Click <%= link_to "here", "/blog/admin" %> for the blog admin. <br /><br /> <%= catch_content :for_layout %> <br /><br /> - <b>About this blog: <%= @settings.about %></b> + <b>About this blog: <%= @settings[:about] %></b> <br /> Articles: (<%= link_to "RSS", url(:feeds, :action => :articles, :format => :rss) %>|<%= link_to "Atom", url(:feeds, :action => :articles, :format => :atom) %>) </body> app/themes/override/views/layout/application.html.erb db/feather_development.db aa219f5d31c8a2b0f8854db03188f9a920f18603 El Draper el@eldiablo.co.uk http://github.com/edraper/feather-sample-slice-host/commit/62d363cef0f000ed8e0461129b0c71edb0407d6e 62d363cef0f000ed8e0461129b0c71edb0407d6e

2009-03-23T16:15:55-07:00

updating the slice example app inline with recent changes to core code and plugins e36cb5c282c6bf312d46ba1323f350a4834bb23f El Draper el@eldiablo.co.uk