community_engine 2.3.2 → 3.0.0

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

@@ -1,8 +1,8 @@
--box do
-  %h3=:go_check_your_e_mail.l
-  %ul.list.checks
-    %li= :look_for_a_message_from.l :from => configatron.community_name
-    %li= :see_you_back_here_in_a_short_while.l        
+-@page_title=:go_check_your_e_mail.l
 
-  %h3= :no_activation_email.l
-  = link_to(:resend_my_activation_e_mail.l, "/resend_activation?id=#{@user.to_param}", :method => 'post')
+%ul
+  %li= :look_for_a_message_from.l :from => configatron.community_name
+  %li= :see_you_back_here_in_a_short_while.l        
+
+%h2= :no_activation_email.l
+= button_to :resend_my_activation_e_mail.l, "/resend_activation?id=#{@user.to_param}", :class => 'btn btn-primary'

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

@@ -1,9 +1,10 @@
 -box do
-  = form_tag( statistics_user_path(@user), :class => "MainForm", :method => :get) do
-    %label= :month.l+":"
-    = select_month(@month)
-    = select_year(@month, :start_year => 1.years.ago.year, :end_year => 1.years.from_now.year)
-    %p= submit_tag :go.l
+  = bootstrap_form_tag :url => statistics_user_path(@user), :layout => :horiztonal do
+    .form-group
+      %label.control-label= :month.l
+      = select_month(@month)
+      = select_year(@month, :start_year => 1.years.ago.year, :end_year => 1.years.from_now.year)
+    = submit_tag :go.l, :class => 'btn btn-primary'
 
     - if current_user.admin?
       %p= link_to :back_to_all_statistics.l, statistics_path
@@ -11,18 +12,16 @@
         =:estimated_total_for_this_month.l+":"
         %strong= "$#{@estimated_payment}"
 
-    %table{"width"=>"100%"}
+    %table.table.table-bordered.table-striped
       - @posts.group_by(&:category).each do |category, posts|
-        %thead
+        %tr
+          %th
+            = "#{category.name}:" if category
+            = "#{posts.size} "+:posts.l
+          %th=:comments.l
+          %th=:view.l.pluralize
+        - posts.each do |post|
           %tr
-            %th
-              = "#{category.name}:" if category
-              = "#{posts.size} "+:posts.l
-            %th=:comments.l
-            %th{"width"=>"7%"} Views
-        %tbody
-          - posts.each do |post|
-            %tr
-              %td= post.title
-              %td= post.comments.count
-              %td= post.view_count
+            %td= post.title
+            %td= post.comments.count
+            %td= post.view_count

data/app/views/users/update.js.erb

@@ -0,0 +1 @@
+What does this do?

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

@@ -1,15 +1,10 @@
--box :id => "profile_details" do
-  = form_for :avatar, :url => upload_profile_photo_user_url(@user), :method => 'put', :multipart =>true, :html => {:class => 'MainForm'} do |f|
-
-    = error_messages_for :avatar
-    %h3=:profile_photo.l
-      
-    = @user.vendor ? "<div class='right_corner'><div class='community_pro'></div></div>" : ''
-    = image_tag( @user.avatar_photo_url(:medium), :class => "polaroid" )
-
-    %label
-      =:choose_a_photo_for_your_profile.l
-    = f.file_field :photo, :size => "20"
-  
-    %p
-      = submit_tag :save_changes.l
+-@page_title=:profile_photo.l
+
+= bootstrap_form_for :avatar, :url => upload_profile_photo_user_url(@user), :method => 'put', :multipart => true, :layout => :horiztonal do |f|
+
+  = @user.vendor ? "<div class='right_corner'><div class='community_pro'></div></div>" : ''
+  = image_tag( @user.avatar_photo_url(:medium), :class => "thumbnail" )
+
+  = f.file_field :photo, :label => :choose_a_photo_for_your_profile.l
+
+  = f.primary :save_changes.l

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

@@ -1,69 +1,62 @@
-.yui-b
-  -box :class => "alt first_alt" do 
-    %h3
-      =:get_started.l + ' ' + :tell_us_about_yourself.l
-    = render :partial => 'shared/bio_help'
-    %p
+-@page_title=:about_you.l
+-widget do
+  %h4
+    .small=:get_started.l + ' ' + :tell_us_about_yourself.l
+  = render :partial => 'shared/bio_help'
+  %ul.list-unstyled
+    %li
       =:remember_you_can_always_change_this_later.l
-    %p
+    %li
       = link_to :skip_this_step.l, welcome_invite_user_path(@user)
-      %br
+    %li
       = link_to :go_to_your_profile.l, user_path(@user)
 
-  - if @user.avatar_photo_url
-    -box :class => "alt" do 
-      %h3=:your_profile_photo.l
-      .centered
-        = @user.vendor ? "<div class='right_corner'><div class='community_pro'></div></div>" : ''
-        = image_tag( @user.avatar_photo_url(:medium), :class => "polaroid", :style=>"width:250px" )
-      =link_to :profile_photo_crop.l, crop_profile_photo_user_path(@user)        
+- if @user.avatar_photo_url
+  -widget do
+    %h3=:your_profile_photo.l
+    = @user.vendor ? "<div class='right_corner'><div class='community_pro'></div></div>" : ''
+    = image_tag @user.avatar_photo_url(:medium), :class => "img-responsive"
+    = link_to :profile_photo_crop.l, crop_profile_photo_user_path(@user)
 
-#yui-main
-  -box :class => "yui-b" do
-    = form_tag user_path(:welcome => 'invite'), :method => 'put', :multipart =>true, :class => "MainForm" do
-      %h3=:about_you.l
-      = text_area :user, :description, :rows => 30, :style => 'width:100%', :class => "rich_text_editor"
-      
-      %h3=:gender.l
-      %fieldset
-        %label
-          = radio_button :user, :gender, User::MALE
-          =:male.l
-        %label
-          = radio_button :user, :gender, User::FEMALE
-          =:female.l
-                
-      %h3=:more_about_you.l
-      .yui-g
-        .yui-u.first
-          -box :class => "alt" do 
-            %h3
-              =:choose_your_location.l
-            %br
-            =:postal_code.l
-            %br
-            = text_field :user, :zip, :size => 10
-            %br
-            %br
-            = render :partial => 'shared/location_chooser', :locals => {:selected_country => @user.country_id, :selected_state => @user.state_id, :selected_metro_area => @user.metro_area_id, :states => @states, :metro_areas => @metro_areas}
-        .yui-u
-          -box :class => "alt" do 
-            %h3= :tag_yourself.l
-            = text_field_tag 'tag_list', @user.tag_list, {:autocomplete => "off"}
-            #tag_list_auto_complete.auto_complete/
-            
-            -content_for :end_javascript do
-              = auto_complete_field 'tag_list', {:url => { :controller => "tags", :action => 'auto_complete_for_tag_name'}, :tokens => [','] }
+= bootstrap_form_tag :url => user_path(:welcome => 'invite'), :method => 'put', :multipart => true do
 
-            %br
-            %small
-              =:comma_separated_keywords_that_describe_you.l
-              %br
-              =:you_could_tag_yourself.l
-              - if @user.vendor?
-                =:custom_friendly_local.l
-              - else
-                = configatron.meta_keywords.split(",")[0..3].join(', ')
+  %fieldset
+    %legend= :description.l
+    = text_area :user, :description, :rows => 30, :style => 'width:100%', :class => "rich_text_editor"
 
 
-        %p= submit_tag :save_and_continue_to_step_three.l
+  %fieldset
+    %legend=:gender.l
+    %label.radio-inline
+      = radio_button :user, :gender, User::MALE
+      =:male.l
+    %label.radio-inline
+      = radio_button :user, :gender, User::FEMALE
+      =:female.l
+
+  %fieldset
+    %legend=:choose_your_location.l
+    .form-group
+      %label.control-label=:postal_code.l
+      = text_field :user, :zip, :size => 10, :class => "form-control"
+    = render :partial => 'shared/location_chooser', :locals => {:selected_country => @user.country_id, :selected_state => @user.state_id, :selected_metro_area => @user.metro_area_id, :states => @states, :metro_areas => @metro_areas}
+
+  %fieldset
+    %legend= :tag_yourself.l
+    .form-group
+      %label.control-label= :tags.l
+      = text_field_tag 'tag_list', @user.tag_list, {:autocomplete => "off"}
+      .help-block
+        =:comma_separated_keywords_that_describe_you.l
+        %br
+        =:you_could_tag_yourself.l
+        - if @user.vendor?
+          =:custom_friendly_local.l
+        - else
+          = configatron.meta_keywords.split(",")[0..3].join(', ')
+
+    -content_for :end_javascript do
+      = tag_auto_complete_field 'tag_list', {:url => { :controller => "tags", :action => 'auto_complete_for_tag_name'}, :tokens => [','] }
+
+
+  = submit_tag :save_and_continue_to_step_three.l, :class => 'btn btn-primary'

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

@@ -1,33 +1,24 @@
+-@page_title= :get_started.l + ' ' + :invite_some_friends.l
+-@page_title= :invite_some_customers.l if @user.vendor?
+
 %script{"type"=>"text/javascript", "src"=>"http://www.plaxo.com/css/m/js/util.js"}
 %script{"type"=>"text/javascript", "src"=>"http://www.plaxo.com/css/m/js/basic.js"}
 %script{"type"=>"text/javascript", "src"=>"http://www.plaxo.com/css/m/js/abc_launcher.js"}
 
+%p
+  =:invite_message.l(:site=> configatron.community_name)
+%p=:people_who_sign_up_using_your_invitation_will_automatically_be_added_as_your_friends.l
 
--box do
-  %h3
-    = :get_started.l + ' ' + :invite_some_friends.l
-    = :invite_some_customers.l if @user.vendor?
-  %p
-    =:invite_message.l(:site=> configatron.community_name)
-  %p=:people_who_sign_up_using_your_invitation_will_automatically_be_added_as_your_friends.l
-    
-  = form_for(:invitation, :url => user_invitations_path(:user_id => @user.id), :html => {:class => "MainForm"} ) do |f|  
+= bootstrap_form_for :invitation, :url => user_invitations_path(:user_id => @user.id), :layout => :horizontal do |f|
 
-    %label{"for"=>"email_addresses"} 
-      .left{:style => 'margin-right: 1em'}
-        %a{"href"=>"#", "onclick"=>"showPlaxoABChooser('invitation_email_addresses', '/base/plaxo'); return false;"}
-          %img{"src"=>"http://www.plaxo.com/images/abc/buttons/add_button.gif", "alt"=>:add_from_my_address_book.l}/
-    
-      =:enter_e_mail_addresses.l
-      %em= :comma_separated.l
-      \:
-    .clear 
-    = f.text_area :email_addresses , :size => "83x5"
+  .pull-right
+    %a{"href"=>"#", "onclick"=>"showPlaxoABChooser('invitation_email_addresses', '/base/plaxo'); return false;"}
+      %img{"src"=>"http://www.plaxo.com/images/abc/buttons/add_button.gif", "alt"=>:add_from_my_address_book.l}
 
-    %label{"for"=>"message"}=:write_a_message.l
-    = f.text_area :message, :size => "83x5", :value => "#{configatron.community_name} "+:is_great_check_it_out_youll_love_it.l+" #{}"
+  = f.text_area :email_addresses, :rows => 5, :label => :enter_e_mail_addresses.l, :help => :comma_separated.l
+  = f.text_area :message, :rows => 5, :label => :write_a_message.l, :value => "#{configatron.community_name} "+:is_great_check_it_out_youll_love_it.l+" #{}"
 
-    %p
-      = submit_tag :send_invitations.l
-      %br/
-      = link_to :skip_this_and_go_to_your_profile.l, user_path(@user)
+  = f.form_group :submit_buttons_group do
+    .btn-group
+      = submit_tag :send_invitations.l, :class => 'btn btn-primary'
+      = link_to :skip_this_and_go_to_your_profile.l, user_path(@user), :class => 'btn btn-primary'

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

@@ -1,29 +1,20 @@
-.yui-b
-  -box :class => "alt first_alt" do 
-    %h3=:get_started.l + ' ' + :upload_a_profile_photo.l
-    %p
-      =:photo_message.l :site => configatron.community_name
-    = link_to :skip_this_step.l, welcome_about_user_path(@user)
-    %br/
-    = link_to :go_to_your_profile.l, user_path(@user)
+-@page_title=:profile_photo.l
+-widget do
+  %h4
+    .small=:get_started.l + ' ' + :upload_a_profile_photo.l
+  %p
+    =:photo_message.l :site => configatron.community_name
+  %ul.list-unstyled
+    %li= link_to :skip_this_step.l, welcome_about_user_path(@user)
+    %li= link_to :go_to_your_profile.l, user_path(@user)
 
-#yui-main
-  .yui-b
-    -box do 
-      = form_for( @user, :url => user_path(:welcome => 'about'), :method => :put, :multipart => true, :html => {:class => "MainForm"}) do |f|
-        %h3=:profile_photo.l
-        %p.centered
-          = image_tag( @user.avatar_photo_url(:medium), :class => "right" )
-            
-        = f.fields_for :avatar, @avatar do |avatar_form|
-          %label
-            =:choose_a_photo_to_upload.l
-            %em          
-              - if @user.vendor?
-                =:vendor_avatar_hint.l
-              =:photos_should_be_x_pixels.l
+= bootstrap_form_for @user, :url => user_path(:welcome => 'about'), :method => :put, :multipart => true, :layout => :horizontal do |f|
+  -if @user.avatar_photo_url
+    = image_tag @user.avatar_photo_url(:medium), :class => "pull-right"
 
-          = avatar_form.file_field :photo, :size => '15'
-            
-        %p
-          = submit_tag :upload_and_continue_to_step_two.l
+  = f.fields_for :avatar, @avatar do |avatar_form|
+    - if @user.vendor?
+      =:vendor_avatar_hint.l
+    = avatar_form.file_field :photo, :label => :choose_a_photo_to_upload.l, :help => :photos_should_be_x_pixels.l
+
+  = f.primary :upload_and_continue_to_step_two.l

data/app/views/votes/create.js.erb

@@ -0,0 +1,5 @@
+<% if @vote.valid? %>
+  $("#poll_ui_<%= @choice.poll.id.to_s %>").html("<%= (render :partial => 'polls/poll_ui', :locals => {:poll => @choice.poll}).gsub('"', '\\"').gsub("\n", "").html_safe %>");
+<% else %>
+  alert("<%= @vote.errors.full_messages.join(', ') %>");
+<% end %>

data/community_engine.gemspec

@@ -3,55 +3,63 @@ lib = File.expand_path('../lib/', __FILE__)
 $:.unshift lib unless $:.include?(lib)
 require 'community_engine/version'
 
-
 Gem::Specification.new do |s|
-  s.name = "community_engine"
-  s.version = CommunityEngine::Version::STRING
-  s.summary = "CommunityEngine for Rails 3"
+  s.name        = "community_engine"
+  s.version     = CommunityEngine::Version::STRING
+  s.summary     = "CommunityEngine for Rails 4"
   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.homepage    = "http://www.communityengine.org"
 
   s.required_rubygems_version = Gem::Requirement.new("> 1.3.1") if s.respond_to? :required_rubygems_version=
-  s.authors = ["Bruno Bornsztein"]
-  s.date = "2013-08-13"
-  s.email = "admin@curbly.com"
+  s.authors          = ["Bruno Bornsztein"]
+  s.email            = "admin@curbly.com"
   s.extra_rdoc_files = [
-    "LICENSE",
-    "README.markdown"
+      "LICENSE",
+      "README.markdown"
   ]
-  s.require_paths = ["lib"]
+  s.require_paths    = ["lib"]
   s.rubygems_version = "1.8.11"
+  s.licenses = ["MIT", "see each plugin"]
 
-  s.files       = `git ls-files`.split("\n") rescue ''
-  s.test_files  = `git ls-files -- {test}/*`.split("\n")
+  s.files = `git ls-files`.split("\n") rescue ''
+  s.test_files = `git ls-files -- {test}/*`.split("\n")
 
-  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>, [">= 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"])
-  s.add_dependency(%q<sass-rails>, ["~> 3.2.3"])
-  s.add_dependency(%q<ri_cal>, [">= 0"])
-  s.add_dependency(%q<rakismet>, [">= 0"])
-  s.add_dependency(%q<aws-sdk>, [">= 0"])
-  s.add_dependency(%q<kaminari>, [">= 0"])
-  s.add_dependency(%q<dynamic_form>, [">= 0"])
-  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>, ["~> 4.0.1"])
-  s.add_dependency(%q<recaptcha>, [">= 0"])
-  s.add_dependency(%q<omniauth>, ["~> 1.1.0"])
-  s.add_dependency(%q<prototype-rails>, [">= 0"])
-  s.add_dependency(%q<rails_autolink>, [">= 0"])
-  s.add_dependency(%q<meta_search>, ["= 1.1.3"])
-  s.add_dependency(%q<koala>, [">= 0"])
-  s.add_dependency(%q<tinymce-rails>, ["~> 3.5.4"])
-  s.add_dependency(%q<bborn-acts-as-taggable-on>, ['~> 2.2.1'])
-  s.add_dependency(%q<sanitize>, [">= 2.0.3"])
+  s.add_dependency "actionpack-action_caching", ">= 0"
+  s.add_dependency "actionpack-page_caching",   ">= 0"
+  s.add_dependency "acts_as_commentable",       "~> 4.0.2"
+  s.add_dependency "acts_as_list",              ">= 0.3.0"
+  s.add_dependency "acts-as-taggable-on",       '~> 2.4.1'
+  s.add_dependency "authlogic",                 ">= 3.3.0"
+  s.add_dependency "aws-sdk",                   ">= 0"
+  s.add_dependency "bcrypt",                    ">= 0"
+  s.add_dependency "cocaine",                   "~> 0.5.1"
+  s.add_dependency "configatron",               "~> 4.2.0"
+  s.add_dependency "dynamic_form",              ">= 0"
+  s.add_dependency "friendly_id",               "~> 5.0.0.beta1"
+  s.add_dependency "haml",                      ">= 0"
+  s.add_dependency "hpricot",                   ">= 0"
+  s.add_dependency "htmlentities",              ">= 0"
+  s.add_dependency "kaminari",                  ">= 0"
+  s.add_dependency "koala",                     "~> 1.6.0"
+  s.add_dependency "omniauth",                  "~> 1.1.4"
+  s.add_dependency "rails_autolink",            ">= 0"
+  s.add_dependency "paperclip",                 "~> 3.5.1"
+  s.add_dependency "power_enum",                "~> 2.0.1"
+  s.add_dependency "rack",                      ">= 1.5.2"
+  s.add_dependency "rails",                     "~> 4.0.0"
+  s.add_dependency "rails-observers",           ">= 0"
+  s.add_dependency "rakismet",                  ">= 0"
+  s.add_dependency "ransack",                   "~> 1.0.0"
+  s.add_dependency "recaptcha",                 ">= 0"
+  s.add_dependency "ri_cal",                    ">= 0"
+  s.add_dependency "sanitize",                  ">= 2.0.6"
+  s.add_dependency "bootstrap-sass",            '~> 3.2.0'
+  s.add_dependency "bootstrap_form",            ">= 0"
+  s.add_dependency "font-awesome-rails",        ">= 0"
+  s.add_dependency "jquery-rails",              ">= 0"
+  s.add_dependency "jquery-ui-rails",           "~> 5.0.0"
+  s.add_dependency "sass-rails",                "~> 4.0.0"
+  s.add_dependency "sprockets",                 "~> 2.10.0"
+  s.add_dependency "tinymce-rails",             "~> 4.0.2"
 end
 

data/config/application_config.rb

@@ -1,4 +1,4 @@
-configuration = {
+configatron.configure_from_hash(
 
   :app_host => "example.com", #override this in your application.yml
 
@@ -43,6 +43,13 @@ configuration = {
   :min_age => 16,
   :max_age => 90,
 
+  :authlogic => {
+    :password_length => 6..20,
+    :login_length => 5..100,
+    :email_length => 3..100,
+    :email_case_sensitive => true
+  },
+
   :regexes => {
     :login => /\A[\sA-Za-z0-9_-]+\z/,
     :email => /\A([^@\s]+)@((?:[-a-z0-9A-Z]+\.)+[a-zA-Z]{2,})\z/
@@ -60,7 +67,10 @@ configuration = {
           :geometry => "100x100#",
           :processors => [:cropper]
         },
-        :medium => "290x320#",
+        :medium => {
+          :geometry => "290x320#",
+          :processors => [:cropper]
+        },
         :large => "465>"
       }
     },
@@ -72,11 +82,7 @@ configuration = {
 
   :feature => {
     :use_thumbs => true,
-    :dimensions => [150, 635],
     :paperclip_options => {
-      :default_url => "",
-      :path => "#{Rails.root}/public/system/:attachment/:id/:style/:filename",
-      :url => "/system/:attachment/:id/:style/:filename",
       :styles => {
         :original => '465>',
         :thumb => "45x45#",
@@ -91,9 +97,6 @@ configuration = {
 
   :clipping => {
     :paperclip_options => {
-      :default_url => "",
-      :path => "#{Rails.root}/public/system/:attachment/:id/:style/:filename",
-      :url => "/system/:attachment/:id/:style/:filename",
       :styles => {
         :thumb => "100x100#",
         :medium => "290x320#",
@@ -107,7 +110,6 @@ configuration = {
   },
 
   :reserved_logins => [
-    'about',
     'account',
     'activities',
     'admin',
@@ -123,10 +125,8 @@ configuration = {
     'clipping_images',
     'comments',
     'countries',
-    'css_help',
     'events',
     'favorites',
-    'faq',
     'featured',
     'forums',
     'friendships',
@@ -170,7 +170,4 @@ configuration = {
     'users',
     'votes'
   ]
-
-}
-
-configatron.configure_from_hash(configuration)
+)