radiant-forum-extension 2.0.1 → 2.0.2

data/VERSION

@@ -1 +1 @@
-2.0.1
+2.0.2

data/app/controllers/forum_base_controller.rb

@@ -4,6 +4,7 @@ class ForumBaseController < ReaderActionController
   radiant_layout { |c| Radiant::Config['forum.layout'] || Radiant::Config['reader.layout'] }
   before_filter :require_login_unless_public
   before_filter :establish_context
+  after_filter :clear_site_cache, :only => [:create, :update, :destroy]
   helper :forum, :reader
 
 protected
@@ -54,7 +55,10 @@ protected
 
   def render_page_or_feed(template_name = action_name)
     respond_to do |format|
-      format.html { render :action => template_name }
+      format.html { 
+        expires_in SiteController.cache_timeout, :public => true, :private => false
+        render :action => template_name 
+      }
       format.rss { render :action => template_name, :layout => 'feed' }
       format.js { render :action => template_name, :layout => false }
     end
@@ -75,4 +79,8 @@ protected
     false
   end
 
+  def clear_site_cache
+    Radiant::Cache.clear if defined?(Radiant::Cache)
+  end
+
 end

data/app/controllers/post_attachments_controller.rb

@@ -0,0 +1,13 @@
+class PostAttachmentsController < ForumBaseController
+
+  # this simple controller exists for two reasons: to use sendfile for attachments (but it doesn't, yet)
+  # and to allow other extensions (ie group_forum) to restrict access to post attachments
+  
+  def show
+    @attachment = PostAttachment.find(params[:id])
+    size = params[:size] || 'original'
+    expires_in SiteController.cache_timeout, :public => true, :private => false
+    send_file @attachment.file.path(size.to_sym), :type => @attachment.file_content_type, :disposition => 'inline'
+  end
+
+end

data/app/models/post_attachment.rb

@@ -37,7 +37,7 @@ class PostAttachment < ActiveRecord::Base
     },
     :whiny_thumbnails => false,
     :url => "/:class/:id/:basename:no_original_style.:extension",
-    :path => ":rails_root/public/:class/:id/:basename:no_original_style.:extension"
+    :path => ":rails_root/:class/:id/:basename:no_original_style.:extension"      # attachments can only be accessed through the PostAttachments controller, in case file security is required
 
   attr_protected :file_file_name, :file_content_type, :file_file_size
   validates_attachment_presence :file, :message => t('error.no_file')

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

@@ -1,4 +1,4 @@
-- add_reader_css '/stylesheets/reader.css'
+- add_reader_css '/stylesheets/forum.css'
 - if current_reader
   - if Radiant::Config['forum.toolbar?']
     - add_reader_js '/punymce/puny_mce_src.js'
@@ -8,7 +8,7 @@
     - 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'
 
 - content_for :section_navigation do
   = link_to t('navigation.forum'), topics_url, :class => 'section'
@@ -18,6 +18,7 @@
   = link_to t('navigation.new_topic'), new_post_url
   - if current_reader
     = link_to t('navigation.your_account'), reader_account_url
+    = link_to t('log_out'), reader_logout_url
   - else
     = link_to t('log_in'), reader_login_url
   - if Radiant::Config['forum.help_url']
@@ -47,3 +48,4 @@
 - content_for :newtopic do
   .newmessage
     = link_to t('new_topic'), new_post_url
+

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

@@ -0,0 +1,26 @@
+%h2
+  = t('busy_topics')
+%ul
+  - Topic.most_commented(10).each do |topic|
+    %li
+      = link_to topic.name, forum_topic_url(topic.forum, topic), :class => 'title'
+      = t('started_by')
+      = link_to(topic.reader.name, reader_url(topic.reader))
+      %br
+      = topic.posts.count
+      = t('posts') + ','
+      = t('most_recently')
+      = friendly_date(topic.replied_at) + '.'
+
+%h2
+  = t('busy_readers')
+%ul
+  - Reader.most_commenting(10).each do |reader|
+    %li
+      = link_to reader.name, reader_url(reader), :class => 'title'
+      = reader.posts.count
+      = t('posts') + ','
+      %br
+      = t('last_seen')
+      = time_ago_in_words(reader.posts.first.created_at)
+      = t('ago')

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

@@ -1,9 +1,9 @@
 - af ||= false
 %li
   - if attachment.image?
-    = link_to image_tag(attachment.thumbnail), attachment.file.url
+    = link_to image_tag(post_attachment_url(attachment, :size => :thumbnail)), post_attachment_url(attachment), :class => 'thumbnail'
   - else
-    = link_to attachment.filename, attachment.file.url, :class => "attachment #{attachment.extension}"
+    = link_to attachment.filename, post_attachment_url(attachment), :class => "attachment #{attachment.extension}"
   - if af
     = af.check_box :_destroy, :class => 'checkbox'
     

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

@@ -4,10 +4,10 @@
       = t('attached') + ':'
     - post.attachments.images.each do |att|
       - display_size = Radiant::Config['forum.image_zoom_size'] || :original
-      = link_to image_tag(att.thumbnail), att.file.url(display_size), :class => :thumbnail
+      = link_to image_tag(post_attachment_url(att, :size => :thumbnail)), post_attachment_url(att, :size => display_size), :class => :thumbnail, :rel => post_attachment_url(att, :size => :original)
     - if post.attachments.non_images.any?
       %ul.attachments
         - post.attachments.non_images.each do |att|
           %li
-            = link_to att.filename, att.file.url, :class => "attachment #{att.extension}"
+            = link_to att.filename, post_attachment_url(att), :class => "attachment #{att.extension}"
 

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

@@ -9,6 +9,7 @@
 
 - content_for :sidebar do
   = render :partial => 'forums/latest'
+  = render :partial => 'forums/statistics'
 
 - content_for :pagination do
   = pagination_and_summary_for(@topics, t('topics'))

data/config/locales/en.yml

@@ -10,6 +10,8 @@ en:
   attach_file: "attach a file"
   author: "author"
   begun_on: "begun on %{date}"
+  busy_topics: "Biggest topics"
+  busy_readers: "Biggest talkers"
   by: "by"
   by_content_and_author: "by content, author or category."
   comment: "comment"
@@ -68,6 +70,7 @@ en:
       name: "Discussion title"
       sticky: "Sticky"
       locked: "Locked"
+  last_seen: "last here"
   latest_activity: "latest activity"
   latest_discussion: "Latest topics"
   latest_posts: "Latest comments"

data/config/routes.rb

@@ -3,6 +3,7 @@ ActionController::Routing::Routes.draw do |map|
     forum.resources :forums, :only => [:index, :show], :has_many => [:topics]
     forum.resources :topics, :only => [:index, :show], :has_many => [:posts]
     forum.resources :posts, :member => { :remove => :get }
+    forum.resources :post_attachments, :only => [:show]
   end
   
   map.namespace :admin, :member => { :remove => :get }, :path_prefix => 'admin/forum' do |admin|

data/forum_extension.rb

@@ -1,7 +1,7 @@
 require_dependency 'application_controller'
 
 class ForumExtension < Radiant::Extension
-  version "2.0.1"
+  version "2.0.2"
   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

@@ -1,6 +1,17 @@
 module CommentableModel # for inclusion into ActiveRecord::Base
   def self.included(base)
     base.extend ClassMethods
+    base.class_eval do
+      named_scope :most_commented, lambda { |count|
+        {
+          :select => "topics.*, count(posts.id) AS post_count", 
+          :joins => "INNER JOIN posts ON posts.topic_id = topics.id",
+          :group => "topics.id",
+          :order => "post_count DESC",
+          :limit => count
+        }
+      }
+    end
   end
 
   module ClassMethods

data/lib/forum_reader.rb

@@ -4,6 +4,16 @@ module ForumReader
     base.class_eval {
       has_many :topics, :dependent => :nullify
       has_many :posts, :order => 'posts.created_at desc', :dependent => :nullify
+      
+      named_scope :most_commenting, lambda { |count|
+        {
+          :select => "readers.*, count(posts.id) AS post_count", 
+          :joins => "INNER JOIN posts ON posts.reader_id = readers.id",
+          :group => "readers.id",
+          :order => "post_count DESC",
+          :limit => count
+        }
+      }
     }
   end
 end

data/public/javascripts/forum.js

@@ -1,9 +1,11 @@
 /*
   Sample jquery-based forum scripts.
   
-  Two functions are handled here: 
   * inline editing of posts by authors and administrators.
   * attachment and upload of files.
+  * simple show and hide for first post
+  * toolbar hookup
+  * submit-button protection
 */
 
 (function($) { 
@@ -153,21 +155,14 @@
 		});
 	}
 	
-	$.tools.post = {
-		conf: {	
-
-		}
-	};
-
 	$.fn.editable_post = function(conf) { 
-		conf = $.extend({}, $.tools.post.conf, conf); 
 		this.each(function() {			
 			new EditablePost($(this), conf);
 		});
 		return this;
 	};
 
-	function FirstPost(container, conf) {   
+	function HideablePost(container, conf) {   
     var self = this;
 		$.extend(self, {
 		  head: container.find('.post_header'),
@@ -175,11 +170,11 @@
 		  shower: null,
       show: function () {
         self.body.slideDown();
-        self.shower.text('Hide first post');
+        self.shower.text('Hide');
       },
       hide: function () {
         self.body.slideUp();
-        self.shower.text('Show first post');
+        self.shower.text('Show');
       },
       toggle: function (event) {
         squash(event);
@@ -188,14 +183,14 @@
       }
 		});
 
-	  self.shower = $('<a href="#" class="shower">Hide first post</a>').appendTo(self.head.find('p.context'));
+	  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();
 	}
 
-	$.fn.first_post = function() { 
+	$.fn.hideable_post = function() { 
 		this.each(function() {			
-			new FirstPost($(this));
+			new HideablePost($(this));
 		});
 		return this;
 	};
@@ -215,7 +210,7 @@
 			addUpload: function(event) {
         squash(event);
         var upload_field = self.file_field.clone();
-        var nest_id = self.uploadCount() + 1;
+        var nest_id = self.attachmentCount() + self.uploadCount();  // nb. starts at zero so this total is +1
         var container = $('<li class="attachment">' + upload_field.val() + '</li>');
         upload_field.attr("id", upload_field.attr('id').replace(/\d+/, nest_id));
         upload_field.attr("name", upload_field.attr('name').replace(/\d+/, nest_id));
@@ -245,15 +240,8 @@
     self.attachments_list.find('li').add_remover();
     self.file_field.change(self.addUpload);
 	}
-
-	$.tools.stack = {
-		conf: {	
-
-		}
-	};
 	
 	$.fn.upload_stack = function(conf) { 
-		conf = $.extend({}, $.tools.stack.conf, conf); 
 		this.each(function() {			
 			el = new UploadStack($(this), conf);
 		});
@@ -442,7 +430,7 @@
 
 $(function() {
   $(".post").editable_post({});
-  $(".post.first").first_post({});
+  $(".post.first").hideable_post({});
   $(".upload_stack").upload_stack({});
   $(".toolbarred").add_editor({});
   $("input:submit").live('click', function (event) {

data/public/javascripts/gallery.js

@@ -0,0 +1,249 @@
+(function($) { 
+
+  /* 
+   * Some easing functions borrowed from the effects library to save loading the whole lot.
+   * Glide is really quartic out. Boing is back out. Bounce is bounce out.
+   */
+
+  $.easing.glide = function (x, t, b, c, d) {
+    return -c * ((t=t/d-1)*t*t*t - 1) + b;
+  }
+  
+  $.easing.boing = function (x, t, b, c, d, s) {
+    if (s == undefined) s = 1.70158;
+    return c*((t=t/d-1)*t*((s+1)*t + s) + 1) + b;
+  };
+
+  function Gallery() {
+    var self = this;
+    var container = $('<div class="gallery"><img class="preview" /><p class="caption" /><div class="controls"><a href="#" class="previous" /><a href="#" class="download" /><a href="#" class="next" /></a></div><div class="closer"><a href="#" /></div></div>').hide().appendTo($('body'));
+    $.extend(self, {
+      container: container,
+      zoomer: new Zoomer(),
+      image: container.find('img.preview'),
+      caption: container.find('p.caption'),
+      controls: container.find('div.controls'),
+      closer: container.find('div.closer'),
+      stack: [],
+      item: null,
+      add: function (a) {
+        self.stack.push(new GalleryItem(a));
+      },
+      display: function (item) {
+        self.item = item;
+        if (self.visible()) self.crossfade();
+        else self.zoomUp();
+      },
+      
+      mimic: function () {
+        self.zoomer.setImage(self.item.src);
+        self.image.attr('src', self.item.src);
+        if (self.item.caption.html()) self.caption.html(self.item.caption.html()).show();
+        else self.caption.hide();
+      },
+      zoomUp: function () {
+        self.hide();
+        self.mimic();
+        self.zoomer.zoomUp(self.item, self.show);
+      },
+      zoomDown: function () {
+        self.zoomer.zoomDown(self.item);
+        self.hide();
+      },
+      crossfade: function () {
+        self.fadeDown(self.fadeUp);
+      },
+      fadeDown: function (onFade) {
+        self.caption.fadeTo('fast', 0.2);
+        self.image.fadeTo('fast', 0.2, onFade);
+      },
+      fadeUp: function (onFade) {
+        self.mimic();
+        self.resize();
+        self.caption.fadeTo('fast', 1);
+        self.image.fadeTo('fast', 1, onFade);
+      },
+
+      current: function () {
+        return self.stack.indexOf(self.item);
+      },
+      next: function (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();
+        var at = self.current();
+        var previous = (at == 0) ? self.stack.length-1 : at - 1;
+        self.display(self.stack[previous]);
+      },
+      close: function (e) {
+        e.preventDefault();
+        self.zoomDown();
+      },
+      show: function () {
+        self.zoomer.hide();
+        self.container.show();
+      },
+      hide: function () {
+        self.container.hide();
+      },
+      visible: function () {
+        return self.container.is(':visible');
+      },
+      showControls: function (e) {
+        self.controls.fadeIn("fast");
+        self.closer.fadeIn("fast");
+        self.controls.find('a.download').attr('href', self.item.download_url());
+      },
+      hideControls: function (e) {
+        self.controls.fadeOut("fast");
+        self.closer.fadeOut("fast");
+      },
+      
+      resize: function (item) {
+        if (!item) item = self.item;
+        var w = $(window);
+        var d = item.imageSize();
+        var p = self.container.offset();
+        self.image.animate(d, 'fast');
+        self.container.animate({
+          left: p.left + (self.image.innerWidth() - d.width)/2,
+          top: p.top + (self.image.innerHeight() - d.height)/2
+        }, 'fast');
+        self.controls.css({left: (d.width - 96)/2});
+      },
+      reposition: function (item) {
+        if (!item) item = self.item;
+        var w = $(window);
+        var d = item.imageSize();
+        var p = {
+          top: w.scrollTop() + (w.height() - d.height)/2,
+          left: w.scrollLeft() + (w.width() - d.width)/2
+        };
+        if (self.visible) {
+          self.image.animate(d, 'fast');
+          self.container.animate(p, 'fast');
+        } else {
+          self.image.css(d);
+          self.container.css(p);
+        }
+        self.controls.css({left: (d.width - 96)/2});
+        return $.extend(d,p);
+      },
+      currentPosition: function () {
+        var p = self.container.offset();
+        return {
+          left: p.left,
+          top: p.top,
+          width: self.image.innerWidth(),
+          height: self.image.innerHeight()
+        };
+      }
+    });
+    
+    self.closer.find('a').click(self.close);
+    self.controls.find('a.previous').click(self.previous);
+    self.controls.find('a.next').click(self.next);
+    self.container.hover(self.showControls, self.hideControls);
+  };
+  
+  function Zoomer() {
+    var self = this;
+    var sprite = $('<img class="grower" />').hide().appendTo($('body'));
+    $.extend(self, {
+      sprite: sprite,
+      defaultUpState: {position: 'absolute', opacity: 1, borderLeftWidth: 20, borderRightWidth: 20, borderTopWidth: 20, borderBottomWidth: 20},
+      defaultDownState: {position: 'absolute', opacity: 0, borderLeftWidth: 4, borderRightWidth: 4, borderTopWidth: 4, borderBottomWidth: 4},
+      zoomDuration: 'slow',
+      setImage: function (src) {
+        self.sprite.attr('src', src);
+      },
+      zoomUp: function (item, onZoom) {
+        if (!onZoom) onZoom = self.hide;
+        self.sprite.css($.extend(self.defaultDownState, item.position()));
+        self.show();
+        self.sprite.animate($.extend({}, self.defaultUpState, $.gallery.reposition()), self.zoomDuration, onZoom);
+      },
+      zoomDown: function (item, onZoom) {
+        if (!onZoom) onZoom = self.hide;
+        self.show();
+        self.sprite.css($.extend(self.defaultUpState, $.gallery.currentPosition()));
+        self.sprite.animate($.extend({}, self.defaultDownState, item.position()), self.zoomDuration, onZoom);
+      },
+      show: function () {
+        self.sprite.show();
+      },
+      hide: function () {
+        self.sprite.hide();
+      }
+    });
+  }
+
+
+  function GalleryItem(a) {   
+    var self = this;
+    var link = $(a);
+    $.extend(self, {
+      link: link,
+      thumb: link.find('img'),
+      image: $('<img class="preloader" />').css({visibility: 'hidden'}).appendTo($('body')),
+      caption: link.next('.caption'),
+      src: link.attr('href'),
+      deactivate: function (event) {
+        self.thumb.fadeTo('slow', 0.3);
+        self.thumb.css('cursor', 'text');
+        self.image.bind("load", self.activate);
+        self.image.attr('src', self.src);
+      },
+      activate: function () {
+        self.thumb.fadeTo('slow', 1);
+        self.thumb.css('cursor', 'pointer');
+        self.link.click(function (e) {
+          if (e) {
+            e.preventDefault();
+            e.stopPropagation();
+          }
+          $.gallery.display(self);
+        });
+      },
+      position: function () {
+        var p = self.thumb.offset();
+        return {
+          left: p.left,
+          top: p.top,
+          width: self.thumb.outerWidth(),
+          height: self.thumb.outerHeight()
+        };
+      },
+      imageSize: function () {
+        return {
+          width: self.image.innerWidth(),
+          height: self.image.innerHeight()
+        };
+      },
+      download_url: function () {
+        return self.link.attr('rel');
+      }
+    });
+    if (!self.image.complete) {
+      self.deactivate();
+    } else {
+      self.activate();
+    }
+  }
+
+  $.fn.galleried = function() { 
+    this.each(function() {
+      if (!$.gallery) $.gallery = new Gallery();
+      $.gallery.add(this);
+    });
+  };
+
+})(jQuery);
+
+$(function() {
+  $("a.thumbnail").galleried();
+});