radiant-forum-extension 3.0.0 → 3.0.1

data/app/views/admin/pages/_edit_commentability.html.haml

@@ -1,12 +1,10 @@
 - include_stylesheet 'admin/forum'
 
 - fields_for :page do |f|
-  .commentability
+  %p.commentability
     %label
       = t('forum_extension.comments').titlecase
-    %br
     = f.check_box :commentable, {:onclick => "if (this.checked) { $('page_comments_closed').enable(); $('comments_closed_label').removeClassName('disabled'); } else { $('page_comments_closed').disable(); $('comments_closed_label').addClassName('disabled'); }"}
-    = f.label :commentable
-    %br
+    = f.label :commentable, nil, :class => 'checkbox'
     = f.check_box :comments_closed, :disabled => !@page.commentable?
-    = f.label :comments_closed, nil, :id => 'comments_closed_label', :class => !@page.commentable? ? 'disabled' : ''
+    = f.label :comments_closed, nil, :id => 'comments_closed_label', :class => !@page.commentable? ? 'checkbox disabled' : 'checkbox'

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

@@ -7,7 +7,6 @@
       .post_header
         %h2
           = link_to_topic(topic)
-          = feed_link(topic_path(topic, :format => :rss))
           
         = render :partial => "topics/context", :locals => {:topic => topic}
 

data/config/locales/en.yml

@@ -124,6 +124,7 @@ en:
       topics: "Latest"
     new_comment: "Add a comment"
     new_forum: "New forum"
+    new_reply: "Add a reply"
     new_reply_to: "New reply to"
     new_reply_from: "New reply from"
     new_topic: "Start discussion"

data/lib/radiant-forum-extension.rb

@@ -1,5 +1,5 @@
 module RadiantForumExtension
-  VERSION = '3.0.0'
+  VERSION = '3.0.1'
   SUMMARY = %q{Forum and Comment Extension for Radiant CMS}
   DESCRIPTION = %q{Nice clean forums and page comments for inclusion in your radiant site.}
   URL = "http://radiant.spanner.org/forum"

data/public/javascripts/forum.js

@@ -9,8 +9,278 @@
 */
 
 (function($) { 
+
   $.ajaxSettings.accepts.html = $.ajaxSettings.accepts.script;
 
+  /* 
+   * Some easing functions borrowed from the effects library to save loading the whole lot.
+   * Glide is really quartic out. Boing is back 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,
+      click_outside: null,
+      escape_key: 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);
+        self.controls.find('a.download').attr('href', self.item.download_url());
+        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);
+        self.setClosers();
+      },
+      zoomDown: function () {
+        self.zoomer.zoomDown(self.item);
+        self.unsetClosers();
+        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) {
+        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) {
+        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) {
+        if (e) e.preventDefault();
+        if (self.visible) self.zoomDown();
+      },
+      setClosers: function (argument) {
+        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.escape_key) $(document).unbind('keyup', self.escape_key);
+      },
+
+
+      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");
+      },
+      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();
+        var r = {
+          left: p.left + (self.image.innerWidth() - d.width)/2,
+          top: p.top + (self.image.innerHeight() - d.height)/2
+        };
+        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});
+      },
+      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 (p.top <= 10) p.top = 10;
+        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.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();
+      },
+      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);
+    });
+  };
+
+  // Edit in place for forum posts
+
   function RemoteAction (url, holder) {
     var self = this;
     $.extend(self, {
@@ -27,6 +297,7 @@
           $.get(self.url, self.step, 'html');  
         }
       },
+      
       submit: function (e) {
         var ajaxable = true;
         // file to upload means not ajaxable at all
@@ -35,7 +306,7 @@
           if (file && file != "") ajaxable = false;
         });
         // presence of title field means not ajaxable because that appears elsewhere on the page
-        if (self.container.find('input:text').length > 0) ajaxable = false;
+        if (self.container.find('input.titular').length > 0) ajaxable = false;
 
         if (ajaxable) {
           e.preventDefault();
@@ -56,10 +327,12 @@
         self.container.find('.cancel').click(self.cancel);
         self.form = self.container.find('form');
         if (self.form.length > 0) {
+          // intermediate step: hook up the new form
           self.form.submit(self.submit);
           self.form.init_forum();
           self.show();
         } else {
+          // final step: complete replacement with outcome
           $(results).init_forum();
           holder.replaceWith(results);
         }
@@ -159,6 +432,8 @@
     return this;
   };
 
+  // First post on pages after 1 is hidden but can be revealed for reference
+
   function HideablePost(container, conf) {   
     var self = this;
     $.extend(self, {
@@ -193,6 +468,9 @@
     return this;
   };
 
+  // The upload stack is a friendly attacher and uploader.
+  // the edit in place functionality will check for uploads and route over normal http if any are found.
+
   function UploadStack(container) {   
     var self = this;
     $.extend(self, {
@@ -204,15 +482,19 @@
       
       addUpload: function(event) {
         if (event) event.preventDefault();
-        var upload_field = self.file_field.clone();
+        var title = self.file_field.val().replace(/C:\\fakepath\\/, '');
+        var empty_field = self.file_field.clone();
+        var upload_field = self.file_field;
         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>');
+        var container = $('<li class="attachment unsaved">' + title + '</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));
         container.append(upload_field);
         container.add_remover();
         container.appendTo(self.uploads_list).slideDown('slow');
-        self.file_field.val(null);
+        empty_field.val(null);
+        self.file_field = empty_field;
+        self.selector.prepend(empty_field);
         self.selector.find('a').text = 'attach another file';
       },
       
@@ -259,23 +541,7 @@
     return self;
   };
 
-  $.fn.add_editor = function() { 
-    if(window.punymce !== undefined) {
-      this.each(function() {
-        var self = $(this);
-        var editor = new punymce.Editor({
-          id : self.attr('id'),
-          plugins : 'Link,Image,Emoticons,EditSource',
-          toolbar : 'bold,italic,link,unlink,image,emoticons,editsource',
-          width : 510,
-          height : 375,
-          resize : true
-        });
-        self.data('editor', editor);
-      });
-    }
-    return this;
-  };
+  // turns the standard search box into a remote form with dropdown results list
 
   $.fn.capture_search = function() { 
     this.each(function() { 
@@ -298,14 +564,19 @@
     return this;
   };
   
+  // adds a cleditor toolbar to a textarea
+  
   $.fn.add_rte = function() { 
     this.cleditor({
       width: 630,
       height: 400,
-      controls: "bold italic underline strikethrough size removeformat | bullets numbering outdent indent | icon image link unlink | source"
+      controls: "bold italic underline strikethrough size removeformat | bullets numbering outdent indent | icon link unlink | source"
     });
   };
   
+  // initializes forum functionality in any block of html
+  // including, initially, the document.
+
   $.fn.init_forum = function () {
     this.each(function() { 
       var self = $(this);

data/public/stylesheets/sass/forum.sass

@@ -140,6 +140,9 @@ div.upload_stack, div.post_attachments
   li
     clear: none
     margin: 0
+    &.unsaved
+      background-image: url(/images/furniture/attachment_over.png)
+      padding-left: 18px
   a.attachment
     background: url(/images/furniture/attachment_link.png) no-repeat 0 2px
     padding-left: 18px
@@ -158,7 +161,7 @@ div.upload_stack, div.post_attachments
     img
       border: 4px solid white
       +box-shadow
-
+  
 div.upload_stack
   ul.attachments input, ul.uploads input
     display: none
@@ -273,3 +276,6 @@ img.emoticon
   &.cool
     background-position: -176px 0
 
+span.excerpt
+  +small
+  line-height: 1.2

data/spec/lib/forum_tags_spec.rb

@@ -17,11 +17,11 @@ describe "Forum Tags" do
     it { should render(%{<r:forum:topic id="#{topic.id}"><r:forum:topic:author /></r:forum:topic>}).as("Normal") }
     it { should render(%{<r:forum:topic id="#{topic.id}"><r:forum:topic:date /></r:forum:topic>}).as(on_date) }
     it { should render(%{<r:forum:topic id="#{topic.id}"><r:forum:topic:url /></r:forum:topic>}).as("/forum/forums/#{topic.forum.id}/topics/#{topic.id}") }
-    it { should render(%{<r:forum:topic id="#{topic.id}"><r:forum:topic:context /></r:forum:topic>}).as(%{reply from <a href="/readers/#{reader_id(:normal)}">Normal</a>}) }
+    it { should render(%{<r:forum:topic id="#{topic.id}"><r:forum:topic:context /></r:forum:topic>}).as(%{reply from <a href="#{reader_url(reader_id(:normal))}">Normal</a>}) }
     it { should render(%{<r:forum:topic id="#{topic.id}"><r:forum:topic:body /></r:forum:topic>}).as("<p>original topic message</p>") }
     it { should render(%{<r:forum:topic id="#{topic.id}"><r:forum:topic:link /></r:forum:topic>}).as(%{<a href="/forum/forums/#{topic.forum.id}/topics/#{topic.id}">#{topic.name}</a>}) }
-    it { should render(%{<r:forum:topic id="#{topic.id}"><r:forum:topic:summary /></r:forum:topic>}).as(%{<li><a href="/forum/forums/#{topic.forum.id}/topics/#{topic.id}">#{topic.name}</a><br />reply from <a href="/readers/#{reader_id(:normal)}">Normal</a></li>}) }
-    it { should render(%{<r:forum:topic id="#{sticky.id}"><r:forum:topic:summary /></r:forum:topic>}).as(%{<li><a href="/forum/forums/#{sticky.forum.id}/topics/#{sticky.id}">#{sticky.name}</a><br />Started by <a href="/readers/#{reader_id(:normal)}">Normal</a></li>}) }
+    it { should render(%{<r:forum:topic id="#{topic.id}"><r:forum:topic:summary /></r:forum:topic>}).as(%{<li><a href="/forum/forums/#{topic.forum.id}/topics/#{topic.id}">#{topic.name}</a><br />reply from <a href=#{reader_url(reader_id(:normal))}">Normal</a></li>}) }
+    it { should render(%{<r:forum:topic id="#{sticky.id}"><r:forum:topic:summary /></r:forum:topic>}).as(%{<li><a href="/forum/forums/#{sticky.forum.id}/topics/#{sticky.id}">#{sticky.name}</a><br />Started by <a href="#{reader_url(reader_id(:normal))}">Normal</a></li>}) }
   end
 
   describe "r:forum:post tags" do

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: radiant-forum-extension
 version: !ruby/object:Gem::Version 
-  hash: 7
+  hash: 5
   prerelease: 
   segments: 
   - 3
   - 0
-  - 0
-  version: 3.0.0
+  - 1
+  version: 3.0.1
 platform: ruby
 authors: 
 - William Ross
@@ -15,8 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-09-06 00:00:00 +01:00
-default_executable: 
+date: 2011-10-05 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: radiant-reader-extension
@@ -257,11 +256,10 @@ files:
 - spec/models/topic_spec.rb
 - spec/spec.opts
 - spec/spec_helper.rb
-has_rdoc: true
 homepage: http://radiant.spanner.org/forum
 licenses: []
 
-post_install_message: "\n  Add this to the Gemfile in your radiant project:\n\n    gem 'radiant-forum-extension', '~> 3.0.0'\n\n  "
+post_install_message: "\n  Add this to the Gemfile in your radiant project:\n\n    gem 'radiant-forum-extension', '~> 3.0.1'\n\n  "
 rdoc_options: []
 
 require_paths: 
@@ -287,7 +285,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.5.3
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: Forum and Comment Extension for Radiant CMS