radiant-forum-extension 2.0.2 → 2.0.3

data/VERSION

@@ -1 +1 @@
-2.0.2
+2.0.3

data/app/controllers/forum_base_controller.rb

@@ -4,7 +4,6 @@ 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
@@ -55,10 +54,7 @@ protected
 
   def render_page_or_feed(template_name = action_name)
     respond_to do |format|
-      format.html { 
-        expires_in SiteController.cache_timeout, :public => true, :private => false
-        render :action => template_name 
-      }
+      format.html { render :action => template_name }
       format.rss { render :action => template_name, :layout => 'feed' }
       format.js { render :action => template_name, :layout => false }
     end
@@ -79,8 +75,4 @@ protected
     false
   end
 
-  def clear_site_cache
-    Radiant::Cache.clear if defined?(Radiant::Cache)
-  end
-
 end

data/app/controllers/post_attachments_controller.rb

@@ -1,13 +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
+  # this simple controller is only here to restrict access to post attachments
+  # if the forum is private, and to allow other extensions to add further restrictions
   
   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'
+    expires_in 1.week, :public => true, :private => false
+    send_file @attachment.file.path(size.to_sym), :type => @attachment.file_content_type
   end
 
 end

data/app/controllers/posts_controller.rb

@@ -16,12 +16,6 @@ class PostsController < ForumBaseController
     render_page_or_feed
   end
 
-  def monitored
-    @topics = current_reader.monitored_topics
-    @posts = Post.in_topics(@topics).paginate(pagination_parameters)
-    render_page_or_feed
-  end
-
   def show
     respond_to do |format|
       format.html { redirect_to_post }

data/app/helpers/forum_helper.rb

@@ -3,12 +3,8 @@ require "sanitize/config/forum"
 
 module ForumHelper
   
-  def feed_tag(text, url, options={})
-    link_to text, url, options.merge(:class => 'floating feedlink')
-  end
-
   def feed_link(url)
-    link_to image_tag('/images/furniture/feed_14.png', :class => 'feedicon', :alt => t('rss_feed'), :size => '14x20'), url
+    link_to image_tag('/images/furniture/feed_14.png', :alt => t('rss_feed')), url, :class => "rssfeed"
   end
 
   def clean_textilize(text) # adding smilies to the default reader method
@@ -21,20 +17,6 @@ module ForumHelper
     end
   end
   
-  def watch_tag(topic, label='watching', formclass=nil)
-    if current_user
-      monitoring = current_user.monitoring?(topic)
-    	%{
-    	  <form action="#{monitorship_path(topic.forum, topic)}" method="post" class="#{formclass}"><div>
-    	  <input id="monitor_checkbox_#{topic.id}" name="monitor_checkbox" class="monitor_checkbox" type="checkbox"#{ ' checked="checked"' if monitoring } />
-    	  <label class="monitor_label" for="monitor_checkbox_#{topic.id}">#{label}</label>
-    	  #{hidden_field_tag '_method', monitoring ? 'delete' : ''}
-    	  #{submit_tag :set, :class => 'monitor_submit'}
-    	  </div></form>
-    	}
-    end
-  end
-
   def paginated_post_url(post)
     param_name = WillPaginate::ViewHelpers.pagination_options[:param_name]
     if post.page

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

@@ -1,11 +1,9 @@
 - post ||= @post
 - unless post.frozen?
   - if post.editable_by?(current_reader)
-    %div.edit_me
-      - 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}"
+    - 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}"
   - elsif admin?
-    %div.edit_me
-      = 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"
+    = 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

@@ -22,12 +22,11 @@
           %h2
             = post.reader.name
 
-      = render :partial => 'posts/edit_links', :locals => {:post => post}
-
       %p.context
         - if with_context
           = render :partial => 'posts/context', :locals => {:post => post}
         = friendly_date(post.created_at) + '.'
+        = render :partial => 'posts/edit_links', :locals => {:post => post}
 
     .post_body
       = clean_textilize(post.body)

data/app/views/posts/_post.rss.builder

@@ -9,5 +9,5 @@ xm.item do
   xm.description clean_textilize(truncate_words(post.body, 64))
   xm.pubDate post.created_at.to_s(:rfc822)
   xm.guid [ActionController::Base.session_options[:session_key], post.forum_id.to_s, post.topic_id.to_s, post.id.to_s].join(":"), "isPermaLink" => "false"
-  xm.link paged_post_url(post)
+  xm.link paginated_post_url(post)
 end

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

@@ -7,9 +7,10 @@
       %br
       %span.context
         - if topic.has_replies?
-          = t('new_reply_from')
-          = link_to topic.replied_by.name, reader_url(topic.replied_by)
-          = friendly_date(topic.replied_at)
+          - if topic.replied_by
+            = t('new_reply_from')
+            = link_to topic.replied_by.name, reader_url(topic.replied_by)
+            = friendly_date(topic.replied_at)
         - else
           = t('started_by')
           = link_to topic.reader.name, reader_url(topic.reader)

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

@@ -6,8 +6,8 @@
 - else
   - if current_reader
     - if current_reader.activated?
-      .post
-        .post_wrapper.reply
+      .post.replyform
+        .post_wrapper
           .post_header
             .speaker
               = standard_gravatar_for(current_reader)

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

@@ -8,9 +8,11 @@
       .post_header
         %h2
           = link_to topic.name, forum_topic_url(topic.forum, topic)
-        = render :partial => 'posts/edit_links', :locals => {:post => post}
+          = feed_link(topic_path(topic, :format => :rss))
+          
         %p.context
           = render :partial => "topics/context", :locals => {:topic => topic}
+          = render :partial => 'posts/edit_links', :locals => {:post => post}
 
       .post_body
         = truncate_and_textilize(post.body, 100)

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

@@ -23,7 +23,7 @@
   = t('topics_heading')
 
 - content_for :feedlink do
-  = feed_link(topics_path(:format => :rss))
+  = feed_link(topics_url(:format => :rss))
 
 - content_for :introduction do
   %p

data/app/views/topics/show.rss.builder

@@ -10,5 +10,6 @@ xml.channel do
   xml.language "en-us"
   xml.ttl "60"
 
+  render :partial => "posts/post", :object => @topic.posts.first, :locals => {:xm => xml}
   render :partial => "posts/post", :collection => @posts, :locals => {:xm => xml}
 end

data/config/locales/en.yml

@@ -136,6 +136,7 @@ en:
   reply_posted: "reply posted"
   reply_to: "Reply to"
   reply: "reply"
+  rss: "RSS"
   rss_feed: "RSS feed"
   save_changes: "Save changes"
   save_post: "Save post"

data/forum_extension.rb

@@ -1,7 +1,7 @@
 require_dependency 'application_controller'
 
 class ForumExtension < Radiant::Extension
-  version "2.0.2"
+  version "2.0.3"
   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/public/stylesheets/sass/forum.sass

@@ -1,10 +1,6 @@
 @import compass/css3
 @import reader.sass
-
-p.context
-  +functional
-  line-height: 1.2
-  margin: 0 0 10px 0
+@import gallery.sass
 
 div#forum
   div.forum
@@ -37,22 +33,25 @@ div#forum
               &:hover
                 color: $accent
         a
-          &.edit_post
-            color: green
-          &.delete_post
-            padding-left: 5px
-            color: red
           &:hover
             color: $accent
           &.waiting
             color: $mid
             padding-left: 18px
             background: transparent url(/images/furniture/wait_16_grey.gif) no-repeat left top
-        div.edit_me
-          float: right
-          +strong
-          color: $dark
-          margin: 0 0 0 10px
+          &.edit_post, &.delete_post
+            color: white
+            padding: 1px 3px
+            +border-radius(3px)
+            font-size: 75%
+            opacity: 0.2
+            &:hover
+              opacity: 1
+              color: white
+          &.edit_post
+            background-color: green
+          &.delete_post
+            background-color: red
       div.post_body
         position: relative
         p
@@ -97,6 +96,11 @@ div#forum
         color: green
         font-size: 1.4
 
+  p.context
+    +functional
+    line-height: 1.2
+    margin: 0 0 10px 0
+
   div#search
     overflow: hidden
     margin: 0 0 2em 0
@@ -178,6 +182,12 @@ div#forum_search
 img.feedicon
   margin: 8px 0
 
+a.rssfeed
+  display: inline
+  margin: 0
+  padding: 0
+  width: 14px
+
 .context, .updatenote
   +functional
   color: $pale
@@ -196,9 +206,9 @@ div.speaker
   float: left
   width: 50px
   height: 50px
-  margin-right: 0
+  margin-right: 8px
 
-///////////////////////////// emoticons in message display are interpolated by our redcloth extension as span class="emoticon something"
+// emoticons in message display are interpolated by our redcloth extension as <img class="emoticon something" />
 
 img.emoticon
   overflow: hidden
@@ -233,93 +243,3 @@ img.emoticon
   &.cool
     background-position: -176px 0
 
-///////////////////////////// pictures
-
-img.bordered
-  border: 16px solid white
-  +box-shadow
-  &.thin
-    border: 8px solid white
-  &.thinner
-    border: 4px solid white
-
-p.caption
-  color: $mid
-  margin: 4px 20px 20px 20px
-  a
-    color: $dark
-    &:hover
-      color: $accent
-
-img.grower
-  position: absolute
-  border: 20px solid white
-  +box-shadow
-
-img.preloader
-  visibility: hidden
-  
-div.gallery
-  position: absolute
-  overflow: hidden
-  display: none
-  background-color: white
-  +box-shadow
-  img
-    overflow: hidden
-    border: 20px solid white
-  p.caption
-    width: 480px
-    overflow: hidden
-    margin: 10px 0 0 0
-    +small
-    color: $mid
-    a
-      color: $dark
-      &:hover
-        color: $accent
-  div.closer
-    position: absolute
-    top: 32px
-    right: 32px
-    width: 32px
-    height: 32px
-    background-color: white
-    +border-radius
-    +box-shadow
-    a
-      position: relative
-      display: block
-      width: 32px
-      height: 32px
-      background: transparent url('/images/furniture/gallerylinks.png') no-repeat -96px 0
-      &:hover
-        background-image: url('/images/furniture/gallerylinks_over.png')
-  div.controls
-    position: absolute
-    display: none
-    width: 96px
-    height: 32px
-    bottom: 50px
-    left: 50px
-    background-color: white
-    +border-radius
-    +box-shadow
-    a
-      position: relative
-      display: block
-      float: left
-      width: 32px
-      height: 32px
-      background: transparent url('/images/furniture/gallerylinks.png') no-repeat 0 0
-      &:hover
-        background-image: url('/images/furniture/gallerylinks_over.png')
-      &.disabled
-        background-image: url('/images/furniture/gallerylinks_disabled.png')
-      &.download
-        background-position: -32px 0
-      &.next
-        background-position: -64px 0
-      &.close
-        background-position: -96px 0
-    

data/public/stylesheets/sass/gallery.sass

@@ -0,0 +1,83 @@
+@import compass/css3
+@import reader.sass
+
+p.caption
+  color: $mid
+  margin: 4px 20px 20px 20px
+  a
+    color: $dark
+    &:hover
+      color: $accent
+
+img.grower
+  position: absolute
+  border: 20px solid white
+  +box-shadow
+
+img.preloader
+  visibility: hidden
+  
+div.gallery
+  position: absolute
+  overflow: hidden
+  display: none
+  background-color: white
+  +box-shadow
+  img
+    overflow: hidden
+    border: 20px solid white
+  p.caption
+    width: 480px
+    overflow: hidden
+    margin: -10px 0 10px 20px
+    +small
+    color: $mid
+    a
+      color: $dark
+      &:hover
+        color: $accent
+  div.closer
+    position: absolute
+    top: 32px
+    right: 32px
+    width: 32px
+    height: 32px
+    background-color: white
+    +border-radius
+    +box-shadow
+    a
+      position: relative
+      display: block
+      width: 32px
+      height: 32px
+      background: transparent url('/images/furniture/gallerylinks.png') no-repeat -96px 0
+      &:hover
+        background-image: url('/images/furniture/gallerylinks_over.png')
+  div.controls
+    position: absolute
+    display: none
+    width: 96px
+    height: 32px
+    bottom: 50px
+    left: 50px
+    background-color: white
+    +border-radius
+    +box-shadow
+    a
+      position: relative
+      display: block
+      float: left
+      width: 32px
+      height: 32px
+      background: transparent url('/images/furniture/gallerylinks.png') no-repeat 0 0
+      &:hover
+        background-image: url('/images/furniture/gallerylinks_over.png')
+      &.disabled
+        background-image: url('/images/furniture/gallerylinks_disabled.png')
+      &.download
+        background-position: -32px 0
+      &.next
+        background-position: -64px 0
+      &.close
+        background-position: -96px 0
+    

data/radiant-forum-extension.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{radiant-forum-extension}
-  s.version = "2.0.2"
+  s.version = "2.0.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["spanner"]
-  s.date = %q{2011-01-31}
+  s.date = %q{2011-02-01}
   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,9 +57,6 @@ 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/monitorships/create.rjs.erb",
-     "app/views/monitorships/destroy.rjs.erb",
-     "app/views/monitorships/index.html.erb",
      "app/views/pages/_comment.html.haml",
      "app/views/pages/_comments.html.haml",
      "app/views/posts/_attachment.html.haml",
@@ -209,6 +206,7 @@ Gem::Specification.new do |s|
      "public/punymce/puny_mce_full.js",
      "public/punymce/puny_mce_src.js",
      "public/stylesheets/sass/forum.sass",
+     "public/stylesheets/sass/gallery.sass",
      "radiant-forum-extension.gemspec",
      "spec/controllers/admin/forums_controller_spec.rb",
      "spec/controllers/forums_controller_spec.rb",

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: radiant-forum-extension
 version: !ruby/object:Gem::Version 
-  hash: 11
+  hash: 9
   prerelease: false
   segments: 
   - 2
   - 0
-  - 2
-  version: 2.0.2
+  - 3
+  version: 2.0.3
 platform: ruby
 authors: 
 - spanner
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-31 00:00:00 +00:00
+date: 2011-02-01 00:00:00 +00:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -100,9 +100,6 @@ files:
 - app/views/forums/show.html.haml
 - app/views/forums/show.rss.builder
 - app/views/layouts/feed.rss.builder
-- app/views/monitorships/create.rjs.erb
-- app/views/monitorships/destroy.rjs.erb
-- app/views/monitorships/index.html.erb
 - app/views/pages/_comment.html.haml
 - app/views/pages/_comments.html.haml
 - app/views/posts/_attachment.html.haml
@@ -252,6 +249,7 @@ files:
 - public/punymce/puny_mce_full.js
 - public/punymce/puny_mce_src.js
 - public/stylesheets/sass/forum.sass
+- public/stylesheets/sass/gallery.sass
 - radiant-forum-extension.gemspec
 - spec/controllers/admin/forums_controller_spec.rb
 - spec/controllers/forums_controller_spec.rb

data/app/views/monitorships/create.rjs.erb

@@ -1 +0,0 @@
-page[:monitor_label].innerHTML = "Watching topic"

data/app/views/monitorships/destroy.rjs.erb

@@ -1 +0,0 @@
-page[:monitor_label].innerHTML = "Watch topic"

data/app/views/monitorships/index.html.erb

@@ -1,35 +0,0 @@
-<%= render :partial => 'forums/controls' %>
-<%= render :partial => 'forums/notification' %>
-
-<div id="forum_preamble" class="contentblock">
-  <h2>Watch list</h2>
-  
-  <p>
-		New posts in any these topics will show up in your personal feed, which you can see as a <%= link_to "web page", monitored_posts_url %> or an <%= link_to "rss feed", formatted_monitored_posts_url(current_user, :rss), :class => 'feedlink' %>.
-		To add a topic to this list, click on the 'watch this' link at the top of the topic page.
-	</p>
-	
-  <% @topics.group_by(&:forum).each do |forum, topics| %>
-		<h3 class="section""><%= forum.name %></h3>
-		
-		<% topics.each do |topic| %>
-			<%= watch_tag(topic, topic.title) %>
-		<% end %>
-	<% end%>
-
-	<p>
-		You can remove any of these topics from your feed by clicking it in the list above (or on the topic page). It will remain in this list so you can easily reactivate the subscription.
-	</p>
-
-</div>
-
-<% content_for :breadcrumbs do %>
-  <%= link_to 'Home', '/' %> &gt;
-  <%= link_to 'Forum', '/forums' %> &gt;
-  <%= link_to 'You', '/users/me' %> &gt;
-  Subscriptions
-<% end %>
-
-<% content_for :title do %>
-  Your subscriptions
-<% end %>