radiant-forum-extension 2.0.9 → 2.1.1

data/README.md

@@ -21,7 +21,7 @@ As far as I know this is the best forum software available for rails. I look for
 
 ## Status
 
-This code has been surviving in the world for four or five years (and more, since some it originally came from Beast), but this version is about 75% new and you know what that means: new bugs. Github issues, please.
+This code has been surviving in the world for four or five years (and more, since some it originally came from Beast), but this version is about 75% new and you know what that means: new bugs. Github issues are always welcome.
 
 ## Latest
 
@@ -91,6 +91,12 @@ You probably also want to include this somewhere, as on all reader-service pages
 
 Have a look at the included sample layout for a starting point.
 
+## Speed and caching
+
+This version of the forum is designed to work from behind radiant's main cache. There is no context-specific material in any of the pages or page parts visible to a normal browsing user and the comment and reply forms are normally retrieved by ajax calls after the pages have loaded. For that you need to use the provided (jquery-based) forum.js, or write your own equivalent (or for a more robust but less helpful forum, skip the ajax and let people click through to the comment or reply form).
+
+The intention is to make this behaviour configurable but at the moment I'm finding the forum pages too slow if uncached. Most of the wait comes from the shared_layouts/radius template machinery but there are some slow queries too. With optimisation a live forum should be viable.
+
 ## Private discussion
 
 If you install the [reader_group](http://github.com/spanner/radiant-reader_group-extension) and [group_forum](http://github.com/spanner/radiant-group_forum-extension) extensions then your forums can be made visible only to designated groups, as with pages and other groupable items.

data/VERSION

@@ -1 +1 @@
-2.0.9
+2.1.1

data/app/controllers/posts_controller.rb

@@ -32,12 +32,16 @@ class PostsController < ForumBaseController
       format.html { 
         expires_now
       }
-      format.js { 
-        render :partial => 'posts/form', :layout => false 
+      format.js {
+        if @post.page
+          render :partial => 'pages/add_comment', :layout => false
+        else
+          render :partial => 'topics/reply', :layout => false
+        end
       }
     end
   end
-    
+  
   def create
     @post.save!
     Radiant::Cache.clear if @post.page
@@ -49,16 +53,14 @@ class PostsController < ForumBaseController
     flash[:error] = t("validation_failure")
     respond_to do |format|
       format.html { render :action => 'new' }
-      format.js { render :partial => 'posts/form' }
+      format.js { render :template => 'posts/new', :layout => false }
     end
   end
 
   def edit
     respond_to do |format| 
-      format.html { 
-        expires_now
-      }
-      format.js { render :partial => 'posts/form' }
+      format.html { expires_now }
+      format.js { render :template => 'posts/edit', :layout => false }
     end
   end
   
@@ -74,7 +76,7 @@ class PostsController < ForumBaseController
     flash[:error] = t("validation_failure")
     respond_to do |format|
       format.html { render :action => 'edit' }
-      format.js { render :partial => 'posts/form' }
+      format.js { render :template => 'posts/edit', :layout => false }
     end
   end
 

data/app/views/forums/_standard_parts.html.haml

@@ -1,23 +1,33 @@
-- add_reader_css '/stylesheets/forum.css'
-- if current_reader
+- content_for :forum_css do
+  %link{:rel => 'stylesheet', :type => 'text/css', :href => '/stylesheets/forum.css', :media => 'all'}
+
+- content_for :gallery_js do
+  %script{:src => '/javascripts/gallery.js', :type => 'text/javascript'}
+
+- content_for :forum_js do
+  %script{:src => '/javascripts/forum.js', :type => 'text/javascript'}
+
+- content_for :toolbar_js do
   - if Radiant::Config['forum.toolbar?']
-    - add_reader_js '/punymce/puny_mce_src.js'
-    - add_reader_js '/punymce/plugins/link/link.js'
-    - add_reader_js '/punymce/plugins/image/image.js'
-    - add_reader_js '/punymce/plugins/emoticons/emoticons.js'
-    - add_reader_js '/punymce/plugins/editsource/editsource.js'
-    - add_reader_js '/punymce/plugins/paste.js'
-  - add_reader_js '/javascripts/forum.js'
-  - add_reader_js '/javascripts/gallery.js'
+    %script{:src => '/punymce/puny_mce_src.js', :type => 'text/javascript'}
+    %script{:src => '/punymce/plugins/link/link.js', :type => 'text/javascript'}
+    %script{:src => '/punymce/plugins/image/image.js', :type => 'text/javascript'}
+    %script{:src => '/punymce/plugins/emoticons/emoticons.js', :type => 'text/javascript'}
+    %script{:src => '/punymce/plugins/editsource/editsource.js', :type => 'text/javascript'}
+    %script{:src => '/punymce/plugins/paste.js', :type => 'text/javascript'}
+
+- content_for :all_forum_js do
+  = yield :forum_js
+  = yield :gallery_js
+  = yield :toolbar_js
 
 - content_for :section_navigation do
   = link_to t('navigation.forum'), topics_url, :class => 'section'
   = link_to t('navigation.topics'), topics_url
   = link_to t('navigation.forums'), forums_url
-  = link_to t('navigation.readers'), readers_url
-  = link_to t('navigation.new_topic'), new_post_url
-  = link_to t('navigation.your_account'), reader_account_url
   = link_to t('navigation.search'), posts_url
+  = link_to t('navigation.new_topic'), new_post_url
+  = link_to t('navigation.loading'), reader_session_url, :class => "remotecontent"
   - if Radiant::Config['forum.help_url']
     = link_to t('navigation.forum_help'), Radiant::Config['forum.help_url']
 

data/app/views/pages/_add_comment.html.haml

@@ -0,0 +1,23 @@
+- page ||= @page
+
+- if page.commentable?
+  - if current_reader
+    - if current_reader.activated?
+      .post.replyform
+        .wrapper
+          .post_header
+            .speaker
+              = standard_gravatar_for(current_reader)
+            %h2.person
+              = t("add_comment")
+            %p.context
+              = t('if_you_not', :name => current_reader.name)
+              = link_to(t('log_out'), reader_logout_url) + '.'
+          = render :partial => 'posts/form', :locals => {:post => page.posts.build, :omit_label => true}
+    - else
+      = render :partial => 'reader_activations/activation_required', :locals => {:purpose => t('to_reply')}
+  - else
+    = render :partial => 'reader_sessions/login_form', :locals => {:purpose => t('to_reply')}
+- else
+  %p.administrative
+    = t("page_locked")

data/app/views/pages/_comments.html.haml

@@ -1,15 +1,13 @@
+- posts ||= @posts
+- page ||= @page
+
 #forum
   %h2
-    Comments on 
+    = t('comments_on')
     = page.title
 
-- if posts.nil?
-  %p None yet
-  %pre 
-    = posts.inspect
-
+- if posts.empty?
+  %p 
+    = t('none_yet')
 - else
-  %pre 
-    = posts.inspect
-  %p
-    = current_reader.inspect
+  = render :partial => 'posts/post', :collection => posts

data/app/views/posts/_edit_links.html.haml

@@ -3,7 +3,7 @@
   - if post.editable_by?(current_reader)
     - if post.editable_interval
       = t('time_remaining_to_edit', :time => distance_of_time_in_words(post.still_editable_for))
-    = link_to t('edit_your_post'), edit_topic_post_url(post.topic, post), :class => 'edit_post remote', :id => "revise_post_#{post.id}"
+    = link_to t('edit_your_post'), edit_topic_post_url(post.topic, post), :class => 'remote', :id => "revise_post_#{post.id}"
   - elsif admin?
     = link_to t("edit_minimal"), edit_topic_post_url(post.topic, post), :class => 'edit_post remote', :id => "revise_post_#{post.id}", :title => "edit post"
     = link_to t("remove_minimal"), remove_post_url(post), :class => 'delete_post remote', :id => "delete_post_#{post.id}", :title => "remove post"

data/app/views/posts/_post.html.haml

@@ -9,7 +9,7 @@
 - cssclasses << 'deleted' if post.frozen?
   
 .post{:id => post.dom_id, :class => cssclasses.join(' ')}
-  .post_wrapper
+  .wrapper
     - unless headless
       .speaker
         = standard_gravatar_for(post.reader)

data/app/views/posts/edit.html.haml

@@ -1,7 +1,7 @@
 = render :partial => 'forums/standard_parts'
 
 - content_for :form do
-  .post_wrapper
+  .wrapper
     .post_header
       .speaker
         = standard_gravatar_for(@post.reader)

data/app/views/posts/new.html.haml

@@ -2,7 +2,7 @@
 
 - content_for :form do
   .post
-    .post_wrapper
+    .wrapper
       .post_header
         .speaker
           = standard_gravatar_for(current_reader)

data/app/views/topics/_reply.html.haml

@@ -7,7 +7,7 @@
   - if current_reader
     - if current_reader.activated?
       .post.replyform
-        .post_wrapper
+        .wrapper
           .post_header
             .speaker
               = standard_gravatar_for(current_reader)

data/app/views/topics/_topic.html.haml

@@ -2,7 +2,7 @@
 
 %div{:id => topic.dom_id}
   .post
-    .post_wrapper
+    .wrapper
       .speaker
         = standard_gravatar_for(post.reader, forum_topic_url(topic.forum, topic))
       .post_header

data/app/views/topics/show.html.haml

@@ -44,8 +44,10 @@
   = yield :pagination if @posts.next_page
 
 - content_for :reply_form do
-  = render :partial => 'topics/reply', :locals => {:topic => @topic}
-
+  .new_post
+    .wrapper
+      %p.add_reply
+        = link_to t('add_reply'), new_topic_post_url(@topic), :class => 'remote autoload'
 
 
 #forum

data/config/locales/en.yml

@@ -1,6 +1,7 @@
 en:
   a_reply_to: "A reply to"
   add_post: "Add a %{message_type}"
+  add_comment: "Add a comment"
   add_reply: "Add a reply"
   ago: "ago"
   all: "all"
@@ -15,7 +16,13 @@ en:
   by: "by"
   by_content_and_author: "by content, author or category."
   comment: "comment"
+  comment_count:
+    zero: "No comments yet"
+    one: "One comment"
+    other: "%{count} comments."
   comment_on_page: "a comment added to the page"
+  comments_closed: "Comments closed."
+  comments_on: "Comments on"
   comments: "comments"
   config:
     forum:
@@ -106,6 +113,7 @@ en:
   now_has: "now has"
   of: "of"
   on_date: "on %{date}"
+  page_locked: "Sorry: comments are not allowed on this page"
   post: "comment"
   post_body: "Post body"
   post_count_from: 
@@ -168,7 +176,7 @@ en:
       yesterday: "yesterday at %l:%M%p"
   time_remaining_to_edit: "You have %{time} left to "
   to_comment: "To comment"
-  to_post: "To reply"
+  to_post: "To post messages"
   to_start_topic: "To start a topic"
   topic_count:
     zero: "No discussion."

data/config/routes.rb

@@ -13,4 +13,6 @@ ActionController::Routing::Routes.draw do |map|
   end
   
   map.forum_home "/forum.:format", :controller => 'topics', :action => 'index'
+  map.add_comment "/pages/:page_id/posts/new.:format", :controller => 'posts', :action => 'new'
+
 end

data/forum_extension.rb

@@ -1,7 +1,7 @@
 require_dependency 'application_controller'
 
 class ForumExtension < Radiant::Extension
-  version "2.0.9"
+  version "2.1.1"
   description "Nice clean forums and page comments for inclusion in your radiant site. Requires the reader extension and share_layouts."
   url "http://spanner.org/radiant/forum"
 

data/lib/commentable_model.rb

@@ -57,7 +57,7 @@ module CommentableModel # for inclusion into ActiveRecord::Base
     end
   
     def voice_count
-      posts.distinct_readers.count  #actually counting posts, but the total is the same
+      posts.distinct_readers.count  #nb. actually counting posts from distinct readers
     end
   
     def other_voices

data/lib/forum_page.rb

@@ -8,18 +8,27 @@ module ForumPage
   end
 
   module InstanceMethods     
-
-    def still_commentable?
-      commentable? && !comments_closed? && (!commentable_period || Time.now - self.created_at < commentable_period)
+    
+    def show_comments?
+      commentable?
     end
     
-    def commentable_period
-      Radiant::Config['forum.commentable_period'].to_i.days if Radiant::Config['forum.commentable_period']
+    def still_commentable?
+      return false unless Radiant::Config['forum.allow_page_comments?'] && commentable?
+      return false if comments_closed?
+      return true unless commentable_period && commentable_period > 0
+      return Time.now - self.created_at < commentable_period
     end
     
     def locked?
       !still_commentable?
     end
+
+  private
+  
+    def commentable_period
+      Radiant::Config['forum.commentable_period'].to_i.days if Radiant::Config['forum.commentable_period']
+    end
     
   end
 end

data/lib/forum_tags.rb

@@ -277,23 +277,25 @@ module ForumTags
     The address for add-a-comment links
   }
   tag 'comment_url' do |tag|
-    new_page_post_path(tag.locals.page)
+    add_comment_path(tag.locals.page)
   end
 
   tag 'comment_link' do |tag|
     options = tag.attr.dup
-    attributes = options.inject('') { |s, (k, v)| s << %{#{k.to_s.downcase}="#{v}" } }.strip
-    attributes = " #{attributes}" unless attributes.empty?
-    text = tag.double? ? tag.expand : I18n.t("Add a comment")
-    %{<a href="#{tag.render('comment_url')}"#{attributes}>#{text}</a>}
+    if tag.locals.page.still_commentable?
+      attributes = options.inject('') { |s, (k, v)| s << %{#{k.to_s.downcase}="#{v}" } }.strip
+      text = tag.double? ? tag.expand : I18n.t("add_comment")
+      %{<a href="#{tag.render('comment_url')}" #{attributes}>#{text}</a>}
+    else
+      I18n.t("comments_closed")
+    end
   end
 
   desc %{
     Anything between if_comments tags is displayed only - dramatic pause - if there are comments.
   }
   tag 'if_comments' do |tag|
-    raise TagError, "can't have if_comments without a page" unless page = tag.locals.page
-    tag.expand if page.posts.any?
+    tag.expand if tag.locals.page.posts.any?
   end
 
   desc %{
@@ -303,38 +305,41 @@ module ForumTags
     <pre><code><r:unless_comments>...</r:unless_comments></code></pre>
   }
   tag 'unless_comments' do |tag|
-    raise TagError, "can't have unless_comments without a page" unless page = tag.locals.page
-    tag.expand unless page.posts.any?
+    tag.expand unless tag.locals.page.posts.any?
   end
 
   tag 'comments' do |tag|
-    raise TagError, "can't have comments without a page" unless page = tag.locals.page
-    if page.commentable?
-      output = []
-      tag.locals.posts = tag.locals.paginated_list = page.posts.paginate
-      tag.expand
-    end
+    tag.expand if tag.locals.page.commentable?
   end
 
   desc %{
     Renders string (internationalised) like "1 comment", "27 comments" or "no comments yet".
   }
   tag 'comments:summary' do |tag|
-    I18n.t("comment_count", :count => tag.locals.posts.total_entries)
+    if tag.locals.posts.respond_to? :total_entries
+      I18n.t("comment_count", :count =>  tag.locals.posts.total_entries)
+    else
+      I18n.t("comment_count", :count =>  tag.locals.posts.length)
+    end
   end
 
   desc %{
-    Loops over the  (paginated) comment set in ascending order of date. Within the loop you can 
+    Loops over the (paginated) comment set in ascending order of date. Within the loop you can 
     use the r:comment shorthand or any r:forum:post:* tags. Note that r:forum:topic tags won't 
     work: there is no topic to show.
   }
   tag 'comments:each' do |tag|
     results = []
+    if paging = pagination_find_options
+      tag.locals.posts = tag.locals.paginated_list = page.posts.paginate(paging)
+    else
+      tag.locals.posts = page.posts
+    end
     tag.locals.posts.each do |post|
       tag.locals.post = post
       results << tag.expand
     end
-    results << tag.render('pagination', tag.attr.dup)
+    results << tag.render('pagination', tag.attr.dup) if paging
     results
   end
 
@@ -347,15 +352,19 @@ module ForumTags
     can hook into using the supplied forum javascript or your own equivalent.
   }
   tag 'comments:all' do |tag|
-    posts = tag.locals.posts
+    if tag.attr['paginated'] == 'true'
+      tag.locals.posts = tag.locals.paginated_list = tag.locals.page.posts.paginate(pagination_parameters)
+    else
+      tag.locals.posts = tag.locals.page.posts
+    end
     results = ""
     results << %{<div class="page_comments">}
     results << %{<p class="context">#{tag.render('comments:summary')}</p>}
-    posts.each do |post|
+    tag.locals.posts.each do |post|
       tag.locals.post = post
       results << tag.render('comment')
     end
-    results << %{<p class="add_comment">#{tag.render('comment_link', 'class' => 'remote')}</p>}
+    results << %{<div class="new_post"><div class="wrapper"><p class="add_comment">#{tag.render('comment_link', 'class' => 'remote')}</p></div></div>}
     results << tag.render('pagination', tag.attr.dup)
     results << "</div>"
     results
@@ -371,7 +380,7 @@ module ForumTags
       tag.locals.reader = post.reader
       tag.expand
     else
-      output = %{<div class="post"><div class="post_wrapper">}
+      output = %{<div class="post"><div class="wrapper">}
       output << %{<div class="post_header">}
       output << %{<h2>#{tag.render("forum:post:reader")}</h2>}
       output << %{<p class="context">#{tag.render("forum:post:context")}</p>}

data/public/javascripts/forum.js

@@ -1,5 +1,5 @@
 /*
-  Sample jquery-based forum scripts.
+  Sample jquery-based forum and gallery scripts.
   
   * inline editing of posts by authors and administrators.
   * attachment and upload of files.
@@ -10,21 +10,6 @@
 
 (function($) { 
 
-  $.ajaxSetup({
-    'beforeSend': function(xhr) {
-      xhr.setRequestHeader("Accept", "text/javascript");
-    }
-  });
-  
-  // general-purpose event blocker
-  function squash(e) {
-    if(e) {
-      e.preventDefault();
-      e.stopPropagation();
-      if (e.target) e.target.blur();
-    } 
-  }
-  
   function RemoteAction (url, holder) {
     var self = this;
 		$.extend(self, {
@@ -33,36 +18,41 @@
 		  container: null,
 		  form: null,
 
-		  getForm: function () {
+		  fetch: function () {
 		    if (self.showing()) self.hide();
         else if (self.form) self.show();
         else {
           self.wait();
-          self.container.load(self.url, self.captureForm);
+          $.get(self.url, self.step);  
         }
       },
-      captureForm: function () {
-        self.form = self.container.find('form');
-        self.form.submit(self.submitForm);
-        self.form.find('div.upload_stack').upload_stack();
-        self.form.find('a.cancel').click(self.cancel);
-        self.form.find("textarea.toolbarred").add_editor({});
-        
-        self.unwait();
-        self.show();
-      },
-      submitForm: function (event) {
+      submit: function (e) {
         var ajaxable = true;
         self.container.find('input:file').each(function () {
           var file = $(this).val();
           if (file && file != "") ajaxable = false;
         });
         if (ajaxable) {
-          squash(event);
+          e.preventDefault();
           self.form.find('textarea.toolbarred').read_editor();
-          $.post(self.form.attr('action'), self.form.serialize(), self.finish);  
+          $.post(self.form.attr('action'), self.form.serialize(), self.step);  
         } else {
           return true;  // allow event through so that uploads are sent by normal HTTP POST
+                        // toolbar is read in onSubmit
+        }
+      },
+      step: function (results) {
+        self.unwait();
+        if (results) self.container.html(results);
+        self.form = self.container.find('form');
+        if (self.form.length > 0) {
+          self.form.submit(self.submit);
+          self.form.find('div.upload_stack').upload_stack();
+          self.form.find('a.cancel').click(self.cancel);
+          self.form.find("textarea.toolbarred").add_editor({});
+          self.show();
+        } else {
+          holder.replaceWith(results);
         }
       },
       cancel: function (event) {
@@ -70,11 +60,6 @@
         self.unwait();
         self.hide();
       },
-      finish: function (results) {
-        self.unwait();
-        var newpost = holder.replaceWith(results);
-        newpost.blush();
-      },
       show: function () {
         self.unwait();
         self.holder.hide();
@@ -94,70 +79,73 @@
         holder.unwait();
       }
 		});
-		
-		self.container = $('<div class="post_form" />').hide();
+		self.container = $('<div class="remote_form" />').hide();
 		self.holder.append(self.container);
   }
   
-  
-	function EditablePost(container, conf) {   
+	function ActionHolder(container, conf) {   
     var self = this;
 		$.extend(self, {
 		  container: container,
-		  wrapper: container.find('.post_wrapper'),
-		  head: container.find('.post_header'),
-		  body: container.find('.post_body'),
+		  wrapper: container.find('.wrapper'),
 		  actions: {},
+		  initActions: function () {
+		    self.actions = {};
+    		self.container.find('a.remote').each(function () {
+    		  var a = $(this);
+    		  var href = a.attr('href');
+          self.addAction(href);
+          a.click(function (event) {
+            squash(event);
+            a.addClass('waiting');
+            self.showAction(href);
+          });
+          if (a.is('.autoload')) self.showAction(href);
+    		});
+		  },
       addAction: function (url) {
         if (!self.actions[url]) self.actions[url] = new RemoteAction(url, self);
         return self.actions[url];
       },
       showAction: function (url) {
         $.each(self.actions, function (key, action) { action.hide(); });
-        self.actions[url].getForm();
+        self.actions[url].fetch();
       },
       append: function (el) {
-        return self.wrapper.append(el);
+        return self.container.append(el);
       },
-      replaceWith: function (post) {
-        self.container.replaceWith(post);
-        return $(post).editable_post();
+      replaceWith: function (html) {
+        self.container.html(html);
+        self.wrapper = self.container.find('.wrapper');
+        self.initActions();
+        return self.container;
       },
       show: function () {
-        self.body.show();
+        self.wrapper.show();
       },
       hide: function () {
-        self.body.hide();
+        self.wrapper.hide();
       },
       toggle: function (event) {
         squash(event);
-        if (self.body.is(":visible")) self.hide();
+        if (self.wrapper.is(":visible")) self.hide();
         else self.show();
       },
       wait: function () {
         self.container.addClass('waiting');
+        self.container.find('a.remote').addClass('waiting');
       },
       unwait: function () {
         self.container.removeClass('waiting');
-        self.container.find('a').removeClass('waiting');
+        self.container.find('a.remote').removeClass('waiting');
       }
 		});
-		
-		container.find('a.remote').each(function () {
-		  var a = $(this);
-		  var href = a.attr('href');
-      self.addAction(href);
-      a.click(function (event) {
-        squash(event);
-        a.addClass('waiting');
-        self.showAction(href);
-      });
-		});
+		self.initActions();
 	}
 	
-	$.fn.editable_post = function(conf) { 
+	$.fn.enable_remote_actions = function(conf) {
 		this.each(function() {			
-			new EditablePost($(this), conf);
+			new ActionHolder($(this), conf);
 		});
 		return this;
 	};
@@ -182,10 +170,11 @@
         else self.show();
       }
 		});
-
-	  self.shower = $('<a href="#" class="shower">Hide</a>').appendTo(self.head.find('p.context'));
-    self.shower.click(self.toggle);
-    if ($('a.prev_page').length > 0) self.hide();
+    if ($('a.prev_page').length > 0) {
+  	  self.shower = $('<a href="#" class="shower">Hide</a>').appendTo(self.head.find('p.context'));
+      self.shower.click(self.toggle);
+      self.hide();
+    }
 	}
 
 	$.fn.hideable_post = function() { 
@@ -195,9 +184,6 @@
 		return this;
 	};
 
-
-
-	
 	function UploadStack(container) {   
     var self = this;
 		$.extend(self, {
@@ -289,147 +275,12 @@
 		});
 		return this;
 	};
-	
-  /*
-   * jQuery Color Animations
-   * Copyright 2007 John Resig
-   * Released under the MIT and GPL licenses.
-   * syntax corrected but otherwise untouched.
-   */
-  
-  // We override the animation for all of these color styles
-  $.each(['backgroundColor', 'borderBottomColor', 'borderLeftColor', 'borderRightColor', 'borderTopColor', 'color', 'outlineColor'], function(i, attr) {
-    $.fx.step[attr] = function(fx) {
-      if (!fx.colorInit) {
-        fx.start = getColor(fx.elem, attr);
-        fx.end = getRGB(fx.end);
-        fx.colorInit = true;
-      }
-
-      fx.elem.style[attr] = "rgb(" + [
-      Math.max(Math.min(parseInt((fx.pos * (fx.end[0] - fx.start[0])) + fx.start[0], 10), 255), 0),
-      Math.max(Math.min(parseInt((fx.pos * (fx.end[1] - fx.start[1])) + fx.start[1], 10), 255), 0),
-      Math.max(Math.min(parseInt((fx.pos * (fx.end[2] - fx.start[2])) + fx.start[2], 10), 255), 0)
-      ].join(",") + ")";
-    }
-  });
-
-  // Color Conversion functions from highlightFade
-  // By Blair Mitchelmore
-  // http://jquery.offput.ca/highlightFade/
-
-  // Parse strings looking for color tuples [255,255,255]
-  function getRGB(color) {
-      var result;
-
-      // Check if we're already dealing with an array of colors
-      if ( color && color.constructor == Array && color.length == 3 )
-          return color;
-
-      // Look for rgb(num,num,num)
-      if (result = /rgb\(\s*([0-9]{1,3})\s*,\s*([0-9]{1,3})\s*,\s*([0-9]{1,3})\s*\)/.exec(color))
-          return [parseInt(result[1], 10), parseInt(result[2], 10), parseInt(result[3], 10)];
-
-      // Look for rgb(num%,num%,num%)
-      if (result = /rgb\(\s*([0-9]+(?:\.[0-9]+)?)\%\s*,\s*([0-9]+(?:\.[0-9]+)?)\%\s*,\s*([0-9]+(?:\.[0-9]+)?)\%\s*\)/.exec(color))
-          return [parseFloat(result[1])*2.55, parseFloat(result[2])*2.55, parseFloat(result[3])*2.55];
-
-      // Look for #a0b1c2
-      if (result = /#([a-fA-F0-9]{2})([a-fA-F0-9]{2})([a-fA-F0-9]{2})/.exec(color))
-          return [parseInt(result[1],16), parseInt(result[2],16), parseInt(result[3],16)];
-
-      // Look for #fff
-      if (result = /#([a-fA-F0-9])([a-fA-F0-9])([a-fA-F0-9])/.exec(color))
-          return [parseInt(result[1]+result[1],16), parseInt(result[2]+result[2],16), parseInt(result[3]+result[3],16)];
-
-      // Look for rgba(0, 0, 0, 0) == transparent in Safari 3
-      if (result = /rgba\(0, 0, 0, 0\)/.exec(color))
-          return colors['transparent'];
-
-      // Otherwise, we're most likely dealing with a named color
-      return colors[jQuery.trim(color).toLowerCase()];
-  }
-
-  function getColor(elem, attr) {
-    var color;
-
-    do {
-      color = $.curCSS(elem, attr);
-
-      // Keep going until we find an element that has color, or we hit the body
-      if ( color != '' && color != 'transparent' || jQuery.nodeName(elem, "body") )
-        break;
-
-      attr = "backgroundColor";
-    } while ( elem = elem.parentNode );
-
-    return getRGB(color);
-  };
-
-  // Some named colors to work with
-  // From Interface by Stefan Petre
-  // http://interface.eyecon.ro/
-
-  var colors = {
-      aqua:[0,255,255],
-      azure:[240,255,255],
-      beige:[245,245,220],
-      black:[0,0,0],
-      blue:[0,0,255],
-      brown:[165,42,42],
-      cyan:[0,255,255],
-      darkblue:[0,0,139],
-      darkcyan:[0,139,139],
-      darkgrey:[169,169,169],
-      darkgreen:[0,100,0],
-      darkkhaki:[189,183,107],
-      darkmagenta:[139,0,139],
-      darkolivegreen:[85,107,47],
-      darkorange:[255,140,0],
-      darkorchid:[153,50,204],
-      darkred:[139,0,0],
-      darksalmon:[233,150,122],
-      darkviolet:[148,0,211],
-      fuchsia:[255,0,255],
-      gold:[255,215,0],
-      green:[0,128,0],
-      indigo:[75,0,130],
-      khaki:[240,230,140],
-      lightblue:[173,216,230],
-      lightcyan:[224,255,255],
-      lightgreen:[144,238,144],
-      lightgrey:[211,211,211],
-      lightpink:[255,182,193],
-      lightyellow:[255,255,224],
-      lime:[0,255,0],
-      magenta:[255,0,255],
-      maroon:[128,0,0],
-      navy:[0,0,128],
-      olive:[128,128,0],
-      orange:[255,165,0],
-      pink:[255,192,203],
-      purple:[128,0,128],
-      violet:[128,0,128],
-      red:[255,0,0],
-      silver:[192,192,192],
-      white:[255,255,255],
-      yellow:[255,255,0],
-      transparent: [255,255,255]
-  };
-
-  $.fn.blush = function(color, duration) {
-    color = color || "#FFFF9C";
-    duration = duration || 1500;
-    var backto = this.css("background-color");
-    if (backto == "" || backto == 'transparent') backto = '#ffffff';
-    this.css("background-color", color).animate({"background-color": backto}, duration);
-  };
-  
 
 })(jQuery);
 
 $(function() {
-  $(".post").editable_post({});
+  $(".post").enable_remote_actions({});
+  $(".new_post").enable_remote_actions({});
   $(".post.first").hideable_post({});
   $(".upload_stack").upload_stack({});
   $(".toolbarred").add_editor({});

data/public/javascripts/gallery.js

@@ -26,6 +26,8 @@
       closer: container.find('div.closer'),
       stack: [],
       item: null,
+      click_outside: null,
+      escape_key: null,
       add: function (a) {
         self.stack.push(new GalleryItem(a));
       },
@@ -46,9 +48,11 @@
         self.hide();
         self.mimic();
         self.zoomer.zoomUp(self.item, self.show);
+        self.setClosers();
       },
       zoomDown: function () {
         self.zoomer.zoomDown(self.item);
+        self.unsetClosers();
         self.hide();
       },
       crossfade: function () {
@@ -69,21 +73,38 @@
         return self.stack.indexOf(self.item);
       },
       next: function (e) {
-        e.preventDefault();
+        if (e) e.preventDefault();
         var at = self.current();
         var next = (at == self.stack.length-1) ? 0 : at + 1;
         self.display(self.stack[next]);
       },
       previous: function (e) {
-        e.preventDefault();
+        if (e) e.preventDefault();
         var at = self.current();
         var previous = (at == 0) ? self.stack.length-1 : at - 1;
         self.display(self.stack[previous]);
       },
       close: function (e) {
-        e.preventDefault();
+        if (e) e.preventDefault();
         self.zoomDown();
       },
+      setClosers: function (argument) {
+        self.click_outside = $('#pagecontent').click(self.close);
+        self.escape_key = $(document).keyup(function(e) {
+          if (e.keyCode == 27) self.close(e);
+          if (!e.metaKey) {
+            if (e.keyCode == 39) self.next(e);
+            if (e.keyCode == 37) self.previous(e);
+          }
+          return false;
+        });
+      },
+      unsetClosers: function (argument) {
+       if (self.click_outside) $('#pagecontent').unbind('click', self.click_outside);
+        if (self.escape_key) $(document).unbind('keyup', self.escape_key);
+      },
+
+
       show: function () {
         self.zoomer.hide();
         self.container.show();
@@ -112,7 +133,7 @@
           left: p.left + (self.image.innerWidth() - d.width)/2,
           top: p.top + (self.image.innerHeight() - d.height)/2
         };
-        if (resized.top <= 10) resized.top = 10;
+        if (r.top <= 10) r.top = 10;
         self.image.animate(d, 'fast');
         self.container.animate(r, 'fast');
         self.controls.css({left: (d.width - 96)/2});
@@ -172,10 +193,14 @@
       },
       zoomDown: function (item, onZoom) {
         if (!onZoom) onZoom = self.hide;
+        self.interrupt();
         self.show();
         self.sprite.css($.extend(self.defaultUpState, $.gallery.currentPosition()));
         self.sprite.animate($.extend({}, self.defaultDownState, item.position()), self.zoomDuration, onZoom);
       },
+      interrupt: function () {
+        self.sprite.stop(true, false);
+      },
       show: function () {
         self.sprite.show();
       },

data/radiant-forum-extension.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{radiant-forum-extension}
-  s.version = "2.0.9"
+  s.version = "2.1.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["spanner"]
-  s.date = %q{2011-02-07}
+  s.date = %q{2011-02-09}
   s.description = %q{Nice clean forums and page comments for inclusion in your radiant site. Derived long ago from beast. Requires the reader extension and share_layouts.}
   s.email = %q{will@spanner.org}
   s.extra_rdoc_files = [
@@ -57,7 +57,7 @@ Gem::Specification.new do |s|
      "app/views/forums/show.html.haml",
      "app/views/forums/show.rss.builder",
      "app/views/layouts/feed.rss.builder",
-     "app/views/pages/_comment.html.haml",
+     "app/views/pages/_add_comment.html.haml",
      "app/views/pages/_comments.html.haml",
      "app/views/posts/_attachment.html.haml",
      "app/views/posts/_attachments.html.haml",

data/spec/controllers/forums_controller_spec.rb

@@ -5,6 +5,7 @@ describe ForumsController do
 
   before do
     controller.stub!(:request).and_return(request)
+    Radiant::Config['forum.public?'] = true
   end
     
   describe "on get to index" do

data/spec/controllers/posts_controller_spec.rb

@@ -137,9 +137,9 @@ describe PostsController do
           xhr :get, :new, :topic_id => @topic.id, :forum_id => forum_id(:public)
         end
 
-        it "should render a bare post form" do
+        it "should render a bare reply form" do
           response.should be_success
-          response.should render_template('posts/_form')
+          response.should render_template('topics/_reply')
           response.layout.should be_nil
         end
       end
@@ -221,7 +221,7 @@ describe PostsController do
 
           it "should re-render the bare post form" do
             response.should be_success
-            response.should render_template('posts/_form')
+            response.should render_template('posts/new')
             response.layout.should be_nil
           end
           

data/spec/controllers/topics_controller_spec.rb

@@ -6,6 +6,7 @@ describe TopicsController do
   before do
     Page.current_site = sites(:test) if defined? Site
     controller.stub!(:request).and_return(request)
+    Radiant::Config['forum.public?'] = true
   end
 
   describe "on get to index" do

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: radiant-forum-extension
 version: !ruby/object:Gem::Version 
-  hash: 29
+  hash: 9
   prerelease: false
   segments: 
   - 2
-  - 0
-  - 9
-  version: 2.0.9
+  - 1
+  - 1
+  version: 2.1.1
 platform: ruby
 authors: 
 - spanner
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-07 00:00:00 +00:00
+date: 2011-02-09 00:00:00 +00:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -100,7 +100,7 @@ files:
 - app/views/forums/show.html.haml
 - app/views/forums/show.rss.builder
 - app/views/layouts/feed.rss.builder
-- app/views/pages/_comment.html.haml
+- app/views/pages/_add_comment.html.haml
 - app/views/pages/_comments.html.haml
 - app/views/posts/_attachment.html.haml
 - app/views/posts/_attachments.html.haml

data/app/views/pages/_comment.html.haml

@@ -1,10 +0,0 @@
-%div.post{:id => post.dom_id}
-  %div.post_header
-    %h2
-      %a{:href => "/readers/#{post.reader.id}", :class => 'main'}
-        = gravatar_for(post.reader, {:size => 40}, {:class => 'gravatar'}}
-        = post.reader.name
-    %p.context
-      = post.created_at
-    %div.post_body
-      = post.body