community_engine 2.3.1 → 2.3.2

data/app/models/user.rb

@@ -35,7 +35,7 @@ class User < ActiveRecord::Base
   end
 
   acts_as_taggable
-  acts_as_commentable
+  acts_as_moderated_commentable
   has_enumerated :role
   tracks_unlinked_activities [:logged_in, :invited_friends, :updated_profile, :joined_the_site]
 
@@ -115,7 +115,8 @@ class User < ActiveRecord::Base
     :firstname, :fullname, :gender, :lastname, :login, :metro_area_id,
     :middlename, :notify_comments, :notify_community_news,
     :notify_friend_requests, :password, :password_confirmation,
-    :profile_public, :state_id, :stylesheet, :time_zone, :vendor, :zip, :avatar_attributes, :birthday
+    :profile_public, :state_id, :stylesheet, :time_zone, :vendor, :zip, :avatar_attributes, :birthday,
+    :activated_at, :activation_code
 
   attr_accessor :authorizing_from_omniauth
 

data/app/views/admin/comments.html.haml

@@ -3,7 +3,7 @@
 
   -box do
     = form_for @search, :url => admin_comments_path, :html => {:class => "MainForm"} do |f|
-    
+
       %label= :commentable_type.l
       = f.text_field :commentable_type_like
 
@@ -14,7 +14,7 @@
       = f.text_field :author_email_or_user_email_like
 
       %p= f.submit :search.l
-  
+
 
 
 
@@ -32,14 +32,17 @@
           %thead
             %tr
               %th{:width => '30px', :colspan => '2'}
-              %th=:author.l          
+              %th=:author.l
               %th{:width => "250px"}=:body_text.l
               %th=:on_commentable.l
 
           %tbody
             - @comments.each do |comment|
               %tr{:id => "comment_#{comment.id}"}
-                %td=link_to_remote(image_tag('icons/delete.png'), {:url => commentable_comment_path(comment.commentable_type, comment.commentable_id, comment), :method => :delete, 500 => 'alert(\'Sorry, there was a server error\'); return false',  :success => visual_effect(:fade, "comment_#{comment.id}"), :confirm => "Are you sure you want to permanently delete this comment"} )                                                
+                %td=link_to_remote(image_tag('icons/delete.png'), {:url => commentable_comment_path(comment.commentable_type, comment.commentable_id, comment), :method => :delete, 500 => 'alert(\'Sorry, there was a server error\'); return false',  :success => visual_effect(:fade, "comment_#{comment.id}"), :confirm => "Are you sure you want to permanently delete this comment"} )
+                %td.approve
+                  -if comment.pending?
+                    =link_to_remote(image_tag('icons/accept.png'), {:url => approve_commentable_comment_path(comment.commentable_type, comment.commentable_id, comment, :approve => true), :method => :put, :confirm => "Approve this comment?"} )
                 %td= check_box_tag "delete[]", comment.id
                 %td
                   .left
@@ -48,7 +51,7 @@
                       %br
                       %small= comment.user.email
                     -else
-                      = link_to_unless(comment.author_url.blank?, h(comment.username), h(comment.author_url)){ h(comment.username) }              
+                      = link_to_unless(comment.author_url.blank?, h(comment.username), h(comment.author_url)){ h(comment.username) }
                       %br
                       %small=comment.author_email
                       %br
@@ -61,12 +64,12 @@
             %tr
               %td{ :colspan => "4" }
                 -if @comments.any?
-                  %a{:href=>"#", :onclick=>"checkboxes.each(function(e){ e.checked = (e.checked == 0 ? 1 : 0) }); return false;"} Toggle all              
-                  %p= submit_tag :delete_selected.l              
+                  %a{:href=>"#", :onclick=>"checkboxes.each(function(e){ e.checked = (e.checked == 0 ? 1 : 0) }); return false;"} Toggle all
+                  %p= submit_tag :delete_selected.l
 
       = paginate @comments
 
 -content_for :end_javascript do
   :javascript
     var form = $('comments');
-    checkboxes = form.getInputs('checkbox');
+    checkboxes = form.getInputs('checkbox');

data/app/views/admin/users.html.haml

@@ -32,7 +32,7 @@
             - @users.each do |user|
               %tr{:id => "user_#{user.id}"}
                 %td
-                  = link_to_remote(image_tag('icons/delete.png'), {:url => user_path(user), :method => :delete, :success => visual_effect(:fade, "user_#{user.id}"), :confirm => "Are you sure you want to permanently delete this user"} )                                                                          
+                  = link_to_remote(image_tag('icons/delete.png'), {:url => user_path(user), :method => :delete, :success => visual_effect(:fade, "user_#{user.id}"), :confirm => "Are you sure you want to permanently delete this user?"} )
                 %td
                   -if !configatron.akismet_key.nil?                
                     = link_to_remote(image_tag('icons/bad-flag.png'), {:url => user_path(user, :spam => true), :method => :delete, 500 => 'alert(\'Sorry, there was a server error\'); return false',  :success => visual_effect(:fade, "user_#{user.id}"), :confirm => "Are you sure you want to permanently delete this user and mark it as spam!?"} )                                                
@@ -41,14 +41,16 @@
                 %td
                   -if user.avatar
                     = image_tag user.avatar.photo.url(:thumb), :width => 25, :height => 25
-                  = link_to h(user.login), user_path(user)
+                  = link_to_if user.active?, h(user.login), user_path(user)
                 %td
                   = h user.email
                 %td
                   = user.active? ? :active.l : :inactive.l
                 %td
-                  = link_to( :assume_id.l , assume_user_path(user), :method => :post )
-                  = " | #{link_to(:activate.l, :controller => "/admin", :action => "activate_user", :id => user.id)}".html_safe unless user.active?
+                  -if user.active?
+                    = link_to(:assume_id.l , assume_user_path(user), :method => :post)
+                  -else
+                    = link_to(:activate.l, :controller => "/admin", :action => "activate_user", :id => user.id)
 
           %tfoot
             %tr

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

@@ -1,3 +1,6 @@
+-if comment.pending?
+  %em This comment is awaiting approval
+
 -if comment.user
   .hentry{:id => "comment_#{comment.id}"}
     .vcard.author

data/app/views/comments/approve.js.haml

@@ -0,0 +1 @@
+$$('#comment_#{@comment.id} .approve a').invoke('hide');

data/app/views/layouts/application.html.haml

@@ -12,27 +12,27 @@
 
     - if @rss_title && @rss_url
       = auto_discovery_link_tag(:rss, @rss_url, {:title => @rss_title})
-      
-    = render :partial => "shared/scripts_and_styles"      
-    
+
+    = render :partial => "shared/scripts_and_styles"
+
   %body
-    -unless configatron.auth_providers.facebook.key.blank?    
-      =render :partial => 'facebook/fb_require'    
-      
+    -unless configatron.auth_providers.facebook.key.blank?
+      =render :partial => 'facebook/fb_require'
+
     #doc2{:class => "yui-t#{@sidebar_left ? 3 : 6}"}
       = render :partial => "shared/header"
-            
+
       #bd
         = render :partial => "shared/messages"
-                  
+
         = yield
-        
-                            
+
+
       #ft
-        -if show_footer_content?    
+        -if show_footer_content?
           .yui-gc#footer_content
             = image_tag 'spinner.gif', :plugin => 'community_engine'
-            =:loading_recent_content.l       
+            =:loading_recent_content.l
 
 
       #CommunityFooter
@@ -41,7 +41,7 @@
             %a{:href=>home_url, :title=>"#{configatron.community_name} " + :home.l}= :home.l
           - if !logged_in?
             %li
-              = link_to :log_in.l , login_path 
+              = link_to :log_in.l , login_path
           - else
             %li
               %a{:href=>logout_url, :title=>:log_out_of_your.l + " #{configatron.community_name} " + :account.l}
@@ -49,8 +49,8 @@
 
           - Page.find(:all).each do |page|
             - if (logged_in? || page.page_public)
-              %li= link_to page.title, pages_path(page) 
-              
+              %li= link_to page.title, pages_path(page)
+
           - if @rss_title && @rss_url
             %li#rss= link_to :rss.l, @rss_url, {:title => @rss_title}
 
@@ -58,4 +58,4 @@
           = :community_tagline.l
 
     = render :partial => "shared/end_javascript"
-    = yield :end_javascript
+    = yield :end_javascript

data/app/views/messages/_sent.html.haml

@@ -18,11 +18,11 @@
                   .photo= link_to image_tag( message.recipient.avatar_photo_url(:thumb), "height"=>"50px", "alt"=>"#{message.recipient.login}", "width"=>"50px" ), user_path(message.recipient), :title => :users_profile.l(:user => message.recipient.login)
 
                 %td
-                  = link_to h(message.subject), user_message_path(@user, message)                  
+                  = link_to h(message.subject), user_message_path(message.sender, message)
                   %br
                   = :to.l 
                   \:
-                  = link_to h(message.recipient.login), user_path(@user)                  
+                  = link_to h(message.recipient.login), user_path(message.recipient)
                 %td.meta{:width => '150px'}
                   = time_ago_in_words_or_date(message.created_at)                                  
             

data/app/views/users/_search_options.html.haml

@@ -1,5 +1,5 @@
-  
--box :class => 'alt' do
+
+-box :class => 'alt first_alt' do
   %h3= :metro_areas.l
   - city_cloud @metro_areas_for_cloud, %w(nube1 nube2 nube3 nube4 nube5) do |city, css_class|
     = link_to city.name, users_path(:metro_area_id => city.id), :class => css_class

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

@@ -3,10 +3,10 @@
     %h3
       =:why_sign_up.l
     %ul.list.checks
-    %li
-      = :sign_up_reason_1.l
-    %li
-      = :sign_up_reason_2.l
+      %li
+        = :sign_up_reason_1.l
+      %li
+        = :sign_up_reason_2.l
 
   -box :class => 'alt' do
     %h3=:tips.l

data/community_engine.gemspec

@@ -10,6 +10,7 @@ Gem::Specification.new do |s|
   s.summary = "CommunityEngine for Rails 3"
   s.description = "CommunityEngine is a free, open-source social network platform for Ruby on Rails applications. Drop it into your new or existing application, and you’ll instantly have all the features of a basic community site."
   s.homepage = "http://www.communityengine.org"
+  s.licenses = ["MIT", "see each plugin"]
 
   s.required_rubygems_version = Gem::Requirement.new("> 1.3.1") if s.respond_to? :required_rubygems_version=
   s.authors = ["Bruno Bornsztein"]
@@ -28,8 +29,8 @@ Gem::Specification.new do |s|
   s.add_dependency(%q<rails>, [">= 3.2.0"])
   s.add_dependency(%q<rack>, [">= 1.4.1"])
   s.add_dependency(%q<authlogic>, [">= 0"])
-  s.add_dependency(%q<bcrypt-ruby>, [">= 0"])
-  s.add_dependency(%q<configatron>, [">= 0"])
+  s.add_dependency(%q<bcrypt>, [">= 0"])
+  s.add_dependency(%q<configatron>, ["~> 2.0"])
   s.add_dependency(%q<hpricot>, [">= 0"])
   s.add_dependency(%q<htmlentities>, [">= 0"])
   s.add_dependency(%q<haml>, [">= 0"])
@@ -42,7 +43,7 @@ Gem::Specification.new do |s|
   s.add_dependency(%q<friendly_id>, ["~> 3.3"])
   s.add_dependency(%q<paperclip>, ["~> 3.5.1"])
   s.add_dependency(%q<cocaine>, ["0.5.1"])
-  s.add_dependency(%q<acts_as_commentable>, ["= 3.0.1"])
+  s.add_dependency(%q<acts_as_commentable>, ["~> 4.0.1"])
   s.add_dependency(%q<recaptcha>, [">= 0"])
   s.add_dependency(%q<omniauth>, ["~> 1.1.0"])
   s.add_dependency(%q<prototype-rails>, [">= 0"])

data/config/locales/en.yml

@@ -1117,8 +1117,8 @@ en:
   required: required
   #en: required_we_will_send_a_confirmation_e_mail_to_the_address_you_enter: "(Required: We will send a confirmation e-mail to the address you enter.)"
   required_we_will_send_a_confirmation_e_mail_to_the_address_you_enter: "(Required: We will send a confirmation e-mail to the address you enter.)"
-  #en: required_you_must_be_at_least_years_old_to_sign_up: "(Required: you must be at least %{min_age} years old to sign up.)"
-  required_you_must_be_at_least_years_old_to_sign_up: "(Required: you must be at least %{min_age} years old to sign up.)"
+  #en: required_you_must_be_at_least_years_old_to_sign_up: "(Required: You must be at least %{min_age} years old to sign up.)"
+  required_you_must_be_at_least_years_old_to_sign_up: "(Required: You must be at least %{min_age} years old to sign up.)"
   #en: required_your_username_must_not_contain_numerals_spaces_or_special_characters: "(Required: Your username must not contain spaces or special characters.)"
   required_your_username_must_not_contain_numerals_spaces_or_special_characters: "(Required: Your username must not contain spaces or special characters.)"
   #en: resend_my_activation_e_mail: Resend my activation e-mail
@@ -1293,8 +1293,8 @@ en:
   tags_are_keywords_you_use_to_organize_your_clippings_separate_multiple_tags_with_commas: Tags are keywords you use to organize your clippings. Separate multiple tags with commas.
   #en: tags_are_keywords_you_use_to_organize_your_photos: Tags are keywords you use to organize your photos. Separate multiple tags with commas.
   tags_are_keywords_you_use_to_organize_your_photos: Tags are keywords you use to organize your photos. Separate multiple tags with commas.
-  #en: tags_are_one_word_descriptors_users_assign_to_blog_posts_pictures_and_clippings_on: Tags are one-word descriptors user assign to blog posts, pictures and clippings on
-  tags_are_one_word_descriptors_users_assign_to_blog_posts_pictures_and_clippings_on: Tags are one-word descriptors user assign to blog posts, pictures and clippings on
+  #en: tags_are_one_word_descriptors_users_assign_to_blog_posts_pictures_and_clippings_on: Tags are one-word descriptors users assign to blog posts, pictures and clippings on
+  tags_are_one_word_descriptors_users_assign_to_blog_posts_pictures_and_clippings_on: Tags are one-word descriptors users assign to blog posts, pictures and clippings on
   #en: tagged: tagged
   tagged: tagged
   #en: tags_page: tags page
@@ -1660,3 +1660,9 @@ en:
   cancel_and_go_back_to_photo_manager: "Cancel and go back to photo manager"
   #en: back_to_photo_manager: "Back to photo manager"
   back_to_photo_manager: "Back to photo manager"
+  #en: photo_presence_error: "is not present."
+  photo_presence_error: "is not present."
+  #en: photo_content_type_error: "is not a supported image type."
+  photo_content_type_error: "is not a supported image type."
+  #en: photo_size_limit_error: "must be less than %{count}MB."
+  photo_size_limit_error: "must be less than %{count}MB."

data/config/routes.rb

@@ -7,14 +7,14 @@ Rails.application.routes.draw do
   resources :authorizations
   match '/auth/:provider/callback' => 'authorizations#create', :as => :callback
   get '/auth/failure' => 'authorizations#failure'
-  
+
   resources :sb_posts, :as => 'all_sb_posts' do
     collection do
       get :search
       get :monitored
     end
   end
-    
+
   resources :monitorship
   resources :sb_posts do
     collection do
@@ -25,7 +25,7 @@ Rails.application.routes.draw do
 
   resources :forums do
     resources :sb_posts
-    
+
     resources :moderators
     resources :topics do
       resources :sb_posts
@@ -37,9 +37,9 @@ Rails.application.routes.draw do
 
   get 'sitemap.xml' => 'sitemap#index', :format => 'xml'
   get 'sitemap' => 'sitemap#index'
-  
+
   get '/' => 'base#site_index', :as => :home
-  
+
   scope "/admin" do
     get 'dashboard' => 'homepage_features#index', :as => :admin_dashboard
     get 'users' => 'admin#users', :as => :admin_users
@@ -51,33 +51,33 @@ Rails.application.routes.draw do
     get 'subscribers(.:format)' => "admin#subscribers", :as => :admin_subscribers
     get 'activate_user' => "admin#activate_user", :as => :admin_activate_user
     get 'deactivate_user' => 'admin#deactivate_user', :as => :admin_deactivate_user
-    
+
     resources :pages, :as => :admin_pages do
       member do
         get :preview
       end
     end
   end
-  
+
   get 'pages/:id' => 'pages#show', :as => :pages
-  
-  
+
+
   get '/login' => 'sessions#new', :as => :login
   get '/signup' => 'users#new', :as => :signup
   get '/logout' => 'sessions#destroy', :as => :logout
-  
+
   get '/signup/:inviter_id/:inviter_code' => 'users#new', :as => :signup_by_id
   get '/forgot_password' => 'password_resets#new', :as => :forgot_password
   resources :password_resets
   get '/forgot_username' => 'users#forgot_username', :as => :forgot_username
   post '/forgot_username' => 'users#forgot_username'
   post '/resend_activation' => 'users#resend_activation', :as => :resend_activation
-  
+
   get '/new_clipping' => 'clippings#new_clipping'
-  post '/load_images_from_uri' => 'clippings#load_images_from_uri', :format => 'js'  
+  post '/load_images_from_uri' => 'clippings#load_images_from_uri', :format => 'js'
   get '/clippings(/page/:page)' => 'clippings#site_index', :as => :site_clippings
   get '/clippings.rss' => 'clippings#site_index', :as => :rss_site_clippings, :format => 'rss'
-  
+
   get '/featured(/page/:page)' => 'posts#featured', :as => :featured
   get '/featured.rss' => 'posts#featured', :as => :featured_rss, :format => 'rss'
   get '/popular(/page/:page)' => 'posts#popular', :as => :popular
@@ -113,7 +113,7 @@ Rails.application.routes.draw do
   end
   get '/tags/:id/:type' => 'tags#show', :as => :show_tag_type
   get '/search/tags' => 'tags#show', :as => :search_tags
-  
+
   resources :categories
   post '/categories/show_tips' => 'categories#show_tips', :as => :categories_show_tips
 
@@ -133,25 +133,26 @@ Rails.application.routes.draw do
     resources :favorites
   end
   scope "/:commentable_type/:commentable_id" do
-    resources :comments, :as => :commentable_comments do 
+    resources :comments, :as => :commentable_comments do
       member do
         get :unsubscribe
-      end      
+        put :approve
+      end
     end
   end
   resources :comments
   delete '/comments/delete_selected' => 'comments#delete_selected', :as => :delete_selected_comments
-  
+
   resources :homepage_features
   resources :metro_areas
   resources :ads
 
   resources :activities
-  
+
   resources :users do
-    
+
     get 'page/:page', :action => :index, :on => :collection
-    
+
     collection do
       post 'return_admin'
       delete 'delete_selected'
@@ -160,30 +161,30 @@ Rails.application.routes.draw do
       get 'dashboard'
       get 'edit_account'
       get 'invite'
-      get 'signup_completed'      
+      get 'signup_completed'
       get 'activate'
-      
+
       put 'toggle_moderator'
       put 'toggle_featured'
 
       put 'change_profile_photo'
       put 'update_account'
-      put 'deactivate'      
-      
+      put 'deactivate'
+
       get 'welcome_photo'
       get 'welcome_about'
       get 'welcome_invite'
       get 'welcome_complete'
-      
-      post 'assume'               
-      
+
+      post 'assume'
+
       get 'statistics'
       get 'crop_profile_photo'
       put 'crop_profile_photo'
       get 'upload_profile_photo'
       put 'upload_profile_photo'
     end
-    
+
     resources :friendships do
       collection do
         get :accepted
@@ -201,13 +202,13 @@ Rails.application.routes.draw do
     end
 
     resources :posts do
-      get 'page/:page', :action => :index, :on => :collection            
-      
-      collection do 
+      get 'page/:page', :action => :index, :on => :collection
+
+      collection do
         # get 'manage(/page/:page)', :action => :manage
         get :manage
       end
-      
+
       member do
         post :send_to_friend
         put :update_views
@@ -219,7 +220,7 @@ Rails.application.routes.draw do
     resources :clippings
 
     resources :activities do
-      get 'page/:page', :action => :index, :on => :collection  
+      get 'page/:page', :action => :index, :on => :collection
       collection do
         get :network
       end
@@ -256,4 +257,4 @@ Rails.application.routes.draw do
   get '/users/:user_id/posts/category/:category_name' => 'posts#index', :as => :users_posts_in_category
   post '/users/metro_area_update' => 'users#metro_area_update', :as => :users_metro_area_update
 
-end
+end