app/controllers/comments_controller.rb app/helpers/comments_helper.rb app/helpers/gravatar_helper.rb app/views/shared/_comment.html.erb app/views/shared/_comment_form.html.erb app/views/shared/_comment_info_link.html.erb app/views/shared/_comments.html.erb db/migrate/20090125222830_create_comments.rb public/Song.mp3 public/audioplayer.as public/audioplayer.fla public/audioplayer.swf public/example-01.html public/example-02.html public/expressInstall.swf public/javascripts/jquery.fdslider.js public/javascripts/jquery.mediaplayer.js public/playlist_item_songs/3/original/Song.mp3 public/stylesheets/comments.css test/fixtures/comments.yml test/unit/comment_test.rb vendor/plugins/acts_as_commentable/.gitignore vendor/plugins/acts_as_commentable/CHANGELOG vendor/plugins/acts_as_commentable/MIT-LICENSE vendor/plugins/acts_as_commentable/OLD_README vendor/plugins/acts_as_commentable/README vendor/plugins/acts_as_commentable/Rakefile vendor/plugins/acts_as_commentable/acts_as_commentable.gemspec vendor/plugins/acts_as_commentable/init.rb vendor/plugins/acts_as_commentable/install.rb vendor/plugins/acts_as_commentable/lib/acts_as_commentable.rb vendor/plugins/acts_as_commentable/lib/comment.rb vendor/plugins/acts_as_commentable/tasks/acts_as_commentable_tasks.rake vendor/plugins/acts_as_commentable/test/acts_as_commentable_test.rb vendor/plugins/ansuz_plugin_media_player vendor/plugins/ansuz_taxonomy_system/init.rb @@ -22,6 +22,8 @@ class Page < ActiveRecord::Base include AASM include ActionView::Helpers::DateHelper + acts_as_commentable + named_scope :visible, :conditions => ["(expires_on > ? OR expires_on IS NULL) AND published = ? AND (publish_at <= ? OR publish_at IS NULL )", Time.now.getgm, true, Time.now.getgm] named_scope :self_and_siblings, lambda {|page| {:conditions => ["parent_id = ?", page.parent_id], :order => 'page_order'}} named_scope :expired, lambda {|p| { :conditions => ["expires_on < ?", Time.now.getgm] } } @@ -177,7 +179,7 @@ class Page < ActiveRecord::Base def self.find_page_by_path(path) #logger.error("==> find_page_by_path: path = [ #{path.join("/")} ]") page = Page.root - return nil if Page.root.nil? + return nil if page.nil? # Not DRY. This piece of code handles multipage root return page.split_page! if path.length < 1 or page.name == path[0] app/models/page.rb @@ -2,3 +2,5 @@ <h2><%= @page.full_title %></h2> <% end %> <%= render :partial => 'content/page', :object => @page %> +<%= show_comments_for(@page) %> +<%= show_comment_form_for(@page, :return_path => @page.ancestor_path) %> app/views/content/page.html.erb @@ -1,4 +1,4 @@ - <%= javascript_include_tag :defaults, 'effects', 'builder', 'lightbox', 'niftycube', 'handle_rounded_corners', 'jquery', 'jquery.scrollable.js', 'jquery.cycle.all.pack.js', 'fckeditor/fckeditor', 'jquery.jsgal.js', 'jquery.popeye-0.2.1.js' -%> +<%= javascript_include_tag :defaults, 'effects', 'builder', 'lightbox', 'niftycube', 'handle_rounded_corners', 'jquery', 'jquery.scrollable.js', 'jquery.cycle.all.pack.js', 'fckeditor/fckeditor', 'jquery.jsgal.js', 'jquery.popeye-0.2.1.js' -%> <%= javascript_include_tag "jquery.lightbox-0.5.js", "jquery.lightbox.handler.js" %> <%= javascript_tag "jQuery.noConflict();" -%> <%= javascript_include_tag 'jqModal', 'jquery.growl.js', 'ansuz/growls', 'jquery.feedreader.js', 'jquery.cycle.all.pack.js' -%> app/views/shared/_javascripts.html.erb @@ -6,6 +6,7 @@ <%= stylesheet_link_tag 'jquery.lightbox-0.5.css' %> <%= stylesheet_link_tag 'jquery.popeye.css' %> <%= stylesheet_link_tag 'galimg' %> +<%= stylesheet_link_tag 'comments' %> <style type='text/css'> <%= get_setting(:custom_css) %> </style> app/views/shared/_stylesheets.html.erb @@ -57,7 +57,7 @@ Rails::Initializer.run do |config| # Only load the plugins named here, in the order given. By default, all plugins # in vendor/plugins are loaded in alphabetical order. # :all can be used as a placeholder for all plugins not explicitly named - config.plugins = [ :has_settings, :stringex, :userstamp, :all ] + config.plugins = [ :has_settings, :stringex, :userstamp, :paperclip, :all ] # Add additional load paths for your own custom dirs # config.load_paths += %W( #{RAILS_ROOT}/extras ) config/environment.rb @@ -15,9 +15,11 @@ ActionController::Routing::Routes.draw do |map| map.from_plugin :ansuz_twitterati map.from_plugin :ansuz_database_dumper map.from_plugin :ansuz_user_system + map.from_plugin :ansuz_plugin_media_player map.resources :tags map.resources :users + map.resources :comments # <admin routes> map.namespace :admin do |admin| config/routes.rb @@ -9,7 +9,7 @@ # # It's strongly recommended to check this file into your version control system. -ActiveRecord::Schema.define(:version => 20090114005523) do +ActiveRecord::Schema.define(:version => 20090125222830) do create_table "ansuz_themes", :force => true do |t| t.string "name" @@ -40,6 +40,17 @@ ActiveRecord::Schema.define(:version => 20090114005523) do t.integer "deleter_id" end + create_table "comments", :force => true do |t| + t.string "name" + t.string "email" + t.string "website" + t.text "comments" + t.string "commentable_type" + t.integer "commentable_id" + t.datetime "created_at" + t.datetime "updated_at" + end + create_table "content_section_versions", :force => true do |t| t.integer "content_section_id" t.integer "version" @@ -124,6 +135,19 @@ ActiveRecord::Schema.define(:version => 20090114005523) do t.string "configurable_type" end + create_table "media_player_playlist_items", :force => true do |t| + t.integer "media_player_id" + t.string "playlist_item_song_file_name" + t.string "playlist_item_song_content_type" + t.integer "playlist_item_song_file_size" + end + + add_index "media_player_playlist_items", ["media_player_id"], :name => "index_media_player_playlist_items_on_media_player_id" + + create_table "media_players", :force => true do |t| + t.string "name" + end + create_table "menu_entries", :force => true do |t| t.string "name" t.string "link" @@ -170,7 +194,6 @@ ActiveRecord::Schema.define(:version => 20090114005523) do t.string "name" t.string "title" t.string "full_title" - t.string "status" t.text "body" t.datetime "created_at" t.datetime "updated_at" @@ -181,6 +204,7 @@ ActiveRecord::Schema.define(:version => 20090114005523) do t.boolean "published", :default => true t.boolean "linked", :default => true t.boolean "show_sub_menu", :default => false + t.string "status" t.datetime "publish_at" t.datetime "expires_on" end @@ -203,6 +227,11 @@ ActiveRecord::Schema.define(:version => 20090114005523) do t.string "display_type" end + create_table "plugin_schema_info", :id => false, :force => true do |t| + t.string "plugin_name" + t.integer "version" + end + create_table "posts", :force => true do |t| t.integer "user_id" t.integer "topic_id" db/schema.rb @@ -4,6 +4,7 @@ module Ansuz acts_as_taggable acts_as_url :title stampable + acts_as_commentable validates_uniqueness_of :url vendor/plugins/ansuz_blog/app/models/blog_post.rb @@ -1,7 +1,8 @@ <div class='blog_post' id='<%= dom_id(article) -%>'> - <h2><%=h article.title -%></h2> + <h2><%= link_to(h(article.title), article_path(article)) -%></h2> <h3 class='supplemental'>Posted on <%= article.created_at.strftime("%B %e, %Y") %> by <%= article.creator.login %>.</h3> <div class='contents'> <%= article.contents -%> </div> + <%= show_comment_info_link_for(article, :path => article_path(article)) %> </div> vendor/plugins/ansuz_blog/app/views/articles/_article.html.erb @@ -1,4 +1,7 @@ <%= render :partial => 'articles/article', :locals => { :article => @blog_post } %> +<%= show_comments_for(@blog_post) %> +<%= show_comment_form_for(@blog_post, :return_path => article_path(@blog_post)) %> + <div class='post-blog-post'> <%= render_special "post_blog_post" %> </div> vendor/plugins/ansuz_blog/app/views/articles/show.html.erb @@ -1,6 +1,5 @@ # Include hook code here require 'blog_post' -require 'blog_comment' Ansuz::PluginManagerInstance.register_plugin_nav('Blog', '/articles') Ansuz::PluginManagerInstance.register_admin_menu_entry('Manage', 'Blog Entries', '/admin/blog_posts') Ansuz::PluginManagerInstance.register_admin_menu_entry('Create', 'Blog Entry', '/admin/blog_posts/new') vendor/plugins/ansuz_blog/init.rb @@ -2,4 +2,3 @@ Ansuz::PluginManagerInstance.register_plugin(Ansuz::JAdams::ContentSection) Ansuz::PluginManagerInstance.add_gem_dependency("RedCloth", :lib => "redcloth") Ansuz::PluginManagerInstance.add_gem_dependency("BlueCloth", :lib => "bluecloth") Ansuz::PluginManagerInstance.register_page_type("Content Page", ["Ansuz::JAdams::ContentSection"]) - vendor/plugins/ansuz_content_section/init.rb vendor/plugins/ansuz_blog/app/models/blog_comment.rb 2d8cba977f1181ad12e52fb4ee30bfa45e9eda64 Josh Adams jadams@goro.(none) http://github.com/knewter/ansuz/commit/5806857e00702b2880739b13cdd416ca5d26a8c7 5806857e00702b2880739b13cdd416ca5d26a8c7 2009-01-25T15:32:16-08:00 2009-01-25T15:32:16-08:00 added comments system, media player page plugin [won't work until rhulse's media-player works with jQuery.noConflict() though], and base [empty] taxonomy system plugin f2b5971c8f8277843aa3244ed1e3d7008977c6d6 Josh Adams jadams@goro.(none)