community_engine 2.3.2 → 3.0.0

data/app/controllers/sessions_controller.rb

@@ -22,11 +22,12 @@ class SessionsController < BaseController
       redirect_back_or_default(dashboard_user_path(current_user))
     else
       flash[:notice] = :uh_oh_we_couldnt_log_you_in_with_the_username_and_password_you_entered_try_again.l
-      render :action => :new
+      render :action => :new, :email => params[:email]
     end
   end
 
   def destroy
+    redirect_to new_session_path and return if current_user_session.nil?
     current_user_session.destroy
     reset_session
     flash[:notice] = :youve_been_logged_out_hope_you_come_back_soon.l

data/app/controllers/sitemap_controller.rb

@@ -3,19 +3,19 @@ class SitemapController < BaseController
   caches_action :index
 
   def index
-    @users = User.active.select('id, login, updated_at, login_slug')
-    @posts = Post.select('posts.id, posts.user_id, posts.published_as, posts.published_at, users.id, users.login_slug').joins(:user)   #"LEFT JOIN users ON users.id = posts.user_id")
+    @users = User.active.select('id', 'login', 'updated_at', 'login_slug')
+    @posts = Post.select('posts.id', 'posts.user_id', 'posts.published_as', 'posts.published_at', 'users.id', 'users.login_slug').joins(:user)   #"LEFT JOIN users ON users.id = posts.user_id")
+
+    @categories = Category.all
 
-    @categories = Category.find(:all)
-  
     respond_to do |format|
       format.html {
         render :layout => 'application'
       }
-      format.xml 
+      format.xml
     end
   end
-  
-  
-  
+
+
+
 end

data/app/controllers/statistics_controller.rb

@@ -3,25 +3,26 @@ class StatisticsController < BaseController
   before_filter :admin_required
 
   def index
-    @total_users = User.count(:conditions => ['activated_at IS NOT NULL'])
-    @unactivated_users = User.count(:conditions => ['activated_at IS NULL'])
+    @total_users = User.where('activated_at IS NOT NULL').count
+    @unactivated_users = User.where('activated_at IS NULL').count
 
     @yesterday_new_users = find_new_users(1.day.ago.midnight, Date.today.midnight)
     @today_new_users = find_new_users(Date.today.midnight, Date.today.tomorrow.midnight)  
 
-    @active_users_count = Activity.count(:all, :group => "user_id", :conditions => ["created_at > ?", 1.month.ago]).size
+    # Query returns a hash of user_id to number of activities for that user.
+    @active_users_count = Activity.group("user_id").having("count(created_at > ?) > 0", 1.month.ago).count.keys.size
 
     @active_users = User.find_by_activity({:since => 1.month.ago})
     
-    @percent_reporting_zip = (User.count(:all, :conditions => "zip IS NOT NULL") / @total_users.to_f)*100
+    @percent_reporting_zip = (User.where("zip IS NOT NULL").count / @total_users.to_f)*100
     
-    users_reporting_gender = User.count(:all, :conditions => "gender IS NOT NULL")
-    @percent_male = (User.count(:all, :conditions => ['gender = ?', User::MALE ]) / users_reporting_gender.to_f) * 100
-    @percent_female = (User.count(:all, :conditions => ['gender = ?', User::FEMALE] ) / users_reporting_gender.to_f) * 100        
+    users_reporting_gender = User.where("gender IS NOT NULL").count
+    @percent_male = (User.where('gender = ?', User::MALE).count / users_reporting_gender.to_f) * 100
+    @percent_female = (User.where('gender = ?', User::FEMALE).count / users_reporting_gender.to_f) * 100
     
     @featured_writers = User.find_featured
 
-    @posts = Post.find(:all, :conditions => ['? <= posts.published_at AND posts.published_at <= ? AND users.featured_writer = ?', Time.now.beginning_of_month, (Time.now.end_of_month + 1.day), true], :include => :user)        
+    @posts = Post.includes(:user).where('? <= posts.published_at AND posts.published_at <= ? AND users.featured_writer = ?', Time.now.beginning_of_month, (Time.now.end_of_month + 1.day), true).includes(:users)
   end  
 
       

data/app/controllers/tags_controller.rb

@@ -1,36 +1,38 @@
 class TagsController < BaseController
   before_filter :login_required, :only => [:manage, :edit, :update, :destroy]
   before_filter :admin_required, :only => [:manage, :edit, :update, :destroy]
-  skip_before_filter :verify_authenticity_token, :only => 'auto_complete_for_tag_name'
+  skip_before_filter :verify_authenticity_token, :only => [:auto_complete_for_tag_name]
 
   caches_action :show, :cache_path => Proc.new { |controller| controller.send(:tag_url, controller.params[:id]) }, :if => Proc.new{|c| c.cache_action? }
   def cache_action?
     !logged_in? && params[:type].blank?
-  end  
+  end
 
   def auto_complete_for_tag_name
-    @tags = ActsAsTaggableOn::Tag.find(:all, :limit => 10, :conditions => [ 'LOWER(name) LIKE ?', '%' + (params[:id] || params[:tag_list]) + '%' ])
-    render :inline => "<%= auto_complete_result(@tags, 'name') %>"
+    @tag_names = ActsAsTaggableOn::Tag.pluck(:name)
+    respond_to do |format|
+      format.json {render :inline => @tag_names.to_json}
+    end
   end
-  
-  def index  
-    @tags = popular_tags(100)
 
-    @user_tags = popular_tags(75, 'User')
-    
-    @post_tags = popular_tags(75, 'Post')
+  def index
+    @tags = popular_tags(100).to_a
+
+    @user_tags = popular_tags(75, 'User').to_a
+
+    @post_tags = popular_tags(75, 'Post').to_a
 
-    @photo_tags = popular_tags(75, 'Photo')
+    @photo_tags = popular_tags(75, 'Photo').to_a
 
-    @clipping_tags = popular_tags(75, 'Clipping')  
+    @clipping_tags = popular_tags(75, 'Clipping').to_a
   end
-  
-  def manage    
-    @search = ActsAsTaggableOn::Tag.search(params[:search])
-    @search.meta_sort ||= 'name.asc'    
-    @tags = @search.page(params[:page]).per(100)
+
+  def manage
+    @search = ActsAsTaggableOn::Tag.search(params[:q])
+    @tags = @search.result
+    @tags = @tags.order('name ASC').distinct.page(params[:page]).per(100)
   end
-  
+
 
   def edit
     @tag = ActsAsTaggableOn::Tag.find_by_name(URI::decode(params[:id]))
@@ -38,7 +40,7 @@ class TagsController < BaseController
 
   def update
     @tag = ActsAsTaggableOn::Tag.find_by_name(URI::decode(params[:id]))
-    
+
     respond_to do |format|
       if @tag.update_attributes(params[:tag])
         flash[:notice] = :tag_was_successfully_updated.l
@@ -46,7 +48,7 @@ class TagsController < BaseController
         format.xml  { render :nothing => true }
       else
         format.html { render :action => "edit" }
-        format.xml  { render :xml => @tag.errors.to_xml }        
+        format.xml  { render :xml => @tag.errors.to_xml }
       end
     end
   end
@@ -54,9 +56,9 @@ class TagsController < BaseController
   def destroy
     @tag = ActsAsTaggableOn::Tag.find_by_name(URI::decode(params[:id]))
     @tag.destroy
-    
+
     respond_to do |format|
-      format.html { 
+      format.html {
         flash[:notice] = :tag_was_successfully_deleted.l
         redirect_to admin_tags_url
       }
@@ -66,8 +68,8 @@ class TagsController < BaseController
 
   def show
     tag_array = ActsAsTaggableOn::TagList.from( URI::decode(params[:id]) )
-    
-    @tags = ActsAsTaggableOn::Tag.find(:all, :conditions => [ 'name IN (?)', tag_array ] )
+
+    @tags = ActsAsTaggableOn::Tag.where('name IN (?)', tag_array)
     if @tags.nil? || @tags.empty?
       flash[:notice] = :tag_does_not_exists.l_with_args(:tag => tag_array)
       redirect_to :action => :index and return

data/app/controllers/topics_controller.rb

@@ -11,14 +11,14 @@ class TopicsController < BaseController
     respond_to do |format|
       format.html { redirect_to forum_path(params[:forum_id]) }
       format.xml do
-        @topics = @forum.topics.find(:all, :order => 'sticky desc, replied_at desc', :limit => 25)
+        @topics = @forum.topics.order('sticky desc, replied_at desc').limit(25)
         render :xml => @topics.to_xml
       end
     end
   end
 
   def new
-    @topic = Topic.new(params[:topic])
+    @topic = Topic.new
     @topic.sb_posts.build
   end
 
@@ -48,7 +48,7 @@ class TopicsController < BaseController
   end
 
   def create
-    @topic = @forum.topics.new(params[:topic])
+    @topic = @forum.topics.new(topic_params)
     assign_protected
 
     @post = @topic.sb_posts.first
@@ -79,7 +79,7 @@ class TopicsController < BaseController
   def update
     assign_protected
     @topic.tag_list = params[:tag_list] || ''
-    @topic.update_attributes!(params[:topic])
+    @topic.update_attributes!(topic_params)
     respond_to do |format|
       format.html { redirect_to forum_topic_path(@forum, @topic) }
       format.xml  { head 200 }
@@ -103,10 +103,10 @@ class TopicsController < BaseController
 
       # admins and moderators can sticky and lock topics
       return unless admin? or current_user.moderator_of?(@topic.forum)
-      @topic.sticky, @topic.locked = params[:topic][:sticky], params[:topic][:locked]
+      @topic.sticky, @topic.locked = topic_params[:sticky], topic_params[:locked]
       # only admins can move
       return unless admin?
-      @topic.forum_id = params[:topic][:forum_id] if params[:topic][:forum_id]
+      @topic.forum_id = topic_params[:forum_id] if topic_params[:forum_id]
     end
 
     def find_forum_and_topic
@@ -118,4 +118,8 @@ class TopicsController < BaseController
     def authorized?
       %w(new create).include?(action_name) || @topic.editable_by?(current_user)
     end
+
+  def topic_params
+    params[:topic].permit(:title, :sticky, :locked, {:sb_posts_attributes => [:body]}, :forum_id)
+  end
 end

data/app/controllers/users_controller.rb

@@ -65,31 +65,31 @@ class UsersController < BaseController
 
   def show
     @friend_count               = @user.accepted_friendships.count
-    @accepted_friendships       = @user.accepted_friendships.find(:all, :limit => 5).collect{|f| f.friend }
+    @accepted_friendships       = @user.accepted_friendships.limit(5).to_a.collect{|f| f.friend }
     @pending_friendships_count  = @user.pending_friendships.count()
 
-    @comments       = @user.comments.find(:all, :limit => 10, :order => 'created_at DESC')
+    @comments       = @user.comments.limit(10).order('created_at DESC')
     @photo_comments = Comment.find_photo_comments_for(@user)
     @users_comments = Comment.find_comments_by_user(@user).limit(5)
 
-    @recent_posts   = @user.posts.recent.find(:all, :limit => 2)
-    @clippings      = @user.clippings.find(:all, :limit => 5)
-    @photos         = @user.photos.find(:all, :limit => 5)
-    @comment        = Comment.new(params[:comment])
+    @recent_posts   = @user.posts.recent.limit(2)
+    @clippings      = @user.clippings.limit(5)
+    @photos         = @user.photos.limit(5)
+    @comment        = Comment.new
 
-    @my_activity = Activity.recent.by_users([@user.id]).find(:all, :limit => 10)
+    @my_activity = Activity.recent.by_users([@user.id]).limit(10)
 
     update_view_count(@user) unless current_user && current_user.eql?(@user)
   end
 
   def new
-    @user         = User.new( {:birthday => Date.parse((Time.now - 25.years).to_s) }.merge(params[:user] || {}) )
+    @user         = User.new(:birthday => Date.parse((Time.now - 25.years).to_s))
     @inviter_id   = params[:id]
     @inviter_code = params[:code]
   end
 
   def create
-    @user       = User.new(params[:user])
+    @user       = User.new(user_params)
     @user.role  = Role[:member]
 
     if (!configatron.require_captcha_on_signup || verify_recaptcha(@user)) && @user.save
@@ -119,16 +119,20 @@ class UsersController < BaseController
 
     @user.tag_list = params[:tag_list] || ''
 
-    params[:user][:avatar_attributes].merge!(:user_id => @user.id) if params[:user] && params[:user][:avatar_attributes]
-
-    if @user.update_attributes(params[:user])
-      @user.track_activity(:updated_profile)
-
-      flash[:notice] = :your_changes_were_saved.l
-      unless params[:welcome]
-        redirect_to user_path(@user)
+    if user_params
+      attributes = user_params.permit!
+      attributes[:avatar_attributes][:user_id] = @user.id if attributes[:avatar_attributes]
+      if @user.update_attributes(attributes)
+        @user.track_activity(:updated_profile)
+
+        flash[:notice] = :your_changes_were_saved.l
+        unless params[:welcome]
+          redirect_to user_path(@user)
+        else
+          redirect_to :action => "welcome_#{params[:welcome]}", :id => @user
+        end
       else
-        redirect_to :action => "welcome_#{params[:welcome]}", :id => @user
+        render :action => 'edit'
       end
     else
       render :action => 'edit'
@@ -143,6 +147,10 @@ class UsersController < BaseController
       flash[:error] = :you_cant_delete_that_user.l
     end
     respond_to do |format|
+      format.js   {
+        render :inline => flash[:error], :status => 500 if flash[:error]
+        render :nothing => true if flash[:notice]
+      }
       format.html { redirect_to users_url }
     end
   end
@@ -166,15 +174,15 @@ class UsersController < BaseController
       flash[:notice] = :no_profile_photo.l
       redirect_to upload_profile_photo_user_path(@user) and return
     end
-    return unless request.put?
+    return unless request.put? || request.patch?
 
     @photo.update_attributes(:crop_x => params[:crop_x], :crop_y => params[:crop_y], :crop_w => params[:crop_w], :crop_h => params[:crop_h])
     redirect_to user_path(@user)
   end
 
   def upload_profile_photo
-    @avatar       = Photo.new(params[:avatar])
-    return unless request.put?
+    @avatar       = Photo.new(avatar_params)
+    return unless request.put? || request.patch?
 
     @avatar.user  = @user
     if @avatar.save
@@ -193,7 +201,7 @@ class UsersController < BaseController
   def update_account
     @user             = current_user
 
-    if @user.update_attributes(params[:user])
+    if @user.update_attributes(user_params)
       flash[:notice] = :your_changes_were_saved.l
       respond_to do |format|
         format.html {redirect_to user_path(@user)}
@@ -214,7 +222,7 @@ class UsersController < BaseController
   def update_pro_details
     @user = User.find(params[:id])
 
-    if @user.update_attributes(params[:user])
+    if @user.update_attributes(user_params)
       respond_to do |format|
         format.html {
           flash[:notice] = :your_changes_were_saved.l
@@ -329,9 +337,9 @@ class UsersController < BaseController
     states  = country ? country.states : []
 
     if states.any?
-      metro_areas = state ? state.metro_areas.order("name ASC").all : []
+      metro_areas = state ? state.metro_areas.order("name ASC") : []
     else
-      metro_areas = country ? country.metro_areas.order("name ASC").all : []
+      metro_areas = country ? country.metro_areas.order("name ASC") : []
     end
 
     respond_to do |format|
@@ -355,8 +363,12 @@ class UsersController < BaseController
 
   def toggle_moderator
     @user = User.find(params[:id])
-    @user.role = @user.moderator? ? Role[:member] : Role[:moderator]
-    @user.save!
+    if not @user.admin?
+      @user.role = @user.moderator? ? Role[:member] : Role[:moderator]
+      @user.save!
+    else
+      flash[:error] = :you_cannot_make_an_administrator_a_moderator.l
+    end
     redirect_to user_path(@user)
   end
 
@@ -371,10 +383,9 @@ class UsersController < BaseController
     start_date  = @month.beginning_of_month
     end_date    = @month.end_of_month.end_of_day
 
-    @posts = @user.posts.find(:all,
-      :conditions => ['? <= published_at AND published_at <= ?', start_date, end_date])
+    @posts = @user.posts.where('? <= published_at AND published_at <= ?', start_date, end_date)
 
-    @estimated_payment = @posts.sum do |p|
+    @estimated_payment = @posts.to_a.sum do |p|
       7
     end
 
@@ -391,18 +402,18 @@ class UsersController < BaseController
       params[:delete].each { |id|
         user = User.find(id)
         unless user.admin? || user.featured_writer?
-          user.spam! if params[:spam] && !configatron.akismet_key.nil?
+          user.spam! if params[:spam] && configatron.has_key?(:akismet_key)
           user.destroy
         end
       }
     end
-    flash[:notice] = :the_user_was_deleted.l
+    flash[:notice] = :the_selected_users_were_deleted.l
     redirect_to admin_users_path
   end
 
   protected
     def setup_metro_areas_for_cloud
-      @metro_areas_for_cloud = MetroArea.find(:all, :conditions => "users_count > 0", :order => "users_count DESC", :limit => 100)
+      @metro_areas_for_cloud = MetroArea.where("users_count > 0", :order => "users_count DESC").limit(100)
       @metro_areas_for_cloud = @metro_areas_for_cloud.sort_by{|m| m.name}
     end
 
@@ -411,7 +422,7 @@ class UsersController < BaseController
 
       states = user.country.states if user.country
 
-      metro_areas = user.state.metro_areas.all(:order => "name") if user.state
+      metro_areas = user.state.metro_areas.order("name") if user.state
 
       return metro_areas, states
     end
@@ -420,4 +431,22 @@ class UsersController < BaseController
       current_user && (current_user.admin? || @is_current_user) ? true : access_denied
     end
 
+
+  def avatar_params
+    params[:avatar] && params[:avatar].permit(:name, :description, :album_id, :photo)
+  end
+
+  def user_params
+    params[:user].permit(:avatar_id, :company_name, :country_id, :description, :email,
+                                 :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,
+                                 :tag_list,
+                                 {:avatar_attributes => [:id, :name, :description, :album_id, :user, :user_id, :photo, :photo_remote_url]}, :birthday) if params[:user]
+  end
+
+  def comment_params
+    params[:comment].permit(:author_name, :author_email, :notify_by_email, :author_url, :comment)
+  end
 end

data/app/helpers/base_helper.rb

@@ -46,6 +46,31 @@ module BaseHelper
     block_to_partial('shared/box', html_options, &block)
   end
 
+
+
+  def widget(html_options = {}, &block)
+    @widgets ||= ''
+    @widgets << render(:partial => 'shared/widget', :locals => {:body => capture(&block), :html_options => html_options})
+    return ''
+  end
+
+  def render_widgets
+    if @widgets
+      @widgets.html_safe
+    end
+  end
+
+  def jumbotron(html_options = {}, &block)
+    @jumbotron = render(:partial => 'shared/jumbotron', :locals => {:body => capture(&block), :html_options => html_options})
+    return ''
+  end
+
+  def render_jumbotron
+    if @jumbotron
+      @jumbotron.html_safe
+    end
+  end
+
   def city_cloud(cities, classes)
     max, min = 0, 0
     cities.each { |c|
@@ -152,19 +177,70 @@ module BaseHelper
     title
   end
 
+  def container_title
+    app_base = configatron.community_name
+    title = app_base
+
+    case controller.controller_name
+      when 'pages'
+        if @page and @page.title
+          title = @page.title
+        end
+      when 'posts'
+        if @post and @post.title
+          title = @post.title
+          @canonical_url = user_post_url(@post.user, @post)
+        end
+      when 'users'
+        if @user && !@user.new_record? && @user.login
+          title = @user.login
+          @canonical_url = user_url(@user)
+        else
+          title = :showing_users.l
+        end
+      when 'photos'
+        if @user and @user.login
+          title = :users_photos.l(:user => @user.login)
+        end
+      when 'clippings'
+        if @user and @user.login
+          title = :user_clippings.l(:user => @user.login)
+        end
+      when 'tags'
+        case controller.action_name
+          when 'show'
+            if params[:type]
+              title = I18n.translate('all_' + params[:type].downcase.pluralize + '_tagged', :tag_name => @tags.map(&:name).join(', '))
+            else
+              title = :posts_photos_and_bookmarks.l(:name => @tags.map(&:name).join(', '))
+            end
+            title += " (#{:related_tags.l}: #{@related_tags.join(', ')})" if @related_tags
+            @canonical_url = tag_url(URI.escape(URI.escape(@tags_raw), /[\/.?#]/)) if @tags_raw
+          else
+            title = "Showing tags"
+          end
+      when 'categories'
+        if @category and @category.name
+          title = :posts_photos_and_bookmarks.l(:name => @category.name)
+        else
+          title = :showing_categories.l
+        end
+      when 'sessions'
+        title = :login.l
+    end
+
+    if @page_title
+      title = @page_title
+    elsif title == app_base
+      title = :showing.l + ' ' + controller.controller_name
+    end
+
+    title
+  end
+
   def add_friend_link(user = nil)
-		html = "<span class='friend_request' id='friend_request_#{user.id}'>"
-    html += link_to_remote :request_friendship.l,
-				{ :update => "friend_request_#{user.id}",
-					:loading => "$$('span#friend_request_#{user.id} span.spinner')[0].show(); $$('span#friend_request_#{user.id} a.add_friend_btn')[0].hide()",
-					:complete => visual_effect(:highlight, "friend_request_#{user.id}", :duration => 1),
-          500 => "alert('#{escape_javascript(:sorry_there_was_an_error_requesting_friendship.l)}')",
-					:url => hash_for_user_friendships_url(:user_id => current_user.id, :friend_id => user.id),
-					:method => :post
-				}, {:class => "add_friend button"}
-		html +=	"<span style='display:none;' class='spinner'>"
-		html += image_tag('spinner.gif')
-		html += "#{:requesting_friendship.l} ...</span></span>"
+		html = ""
+    html << render(:partial => 'shared/add_friend_link', :locals => {:user => user})
 		html.html_safe
   end
 
@@ -177,10 +253,10 @@ module BaseHelper
   end
 
   def more_comments_links(commentable)
-    html = link_to "&raquo; ".html_safe + :all_comments.l, commentable_comments_url(commentable.class.to_s.tableize, commentable.to_param)
+    html = link_to fa_icon('plus-circle', :text => :all_comments.l), commentable_comments_url(commentable.class.to_s.tableize, commentable.to_param)
     html += "<br />".html_safe
-		html += link_to "&raquo; ".html_safe + :comments_rss.l, commentable_comments_url(commentable.class.to_s.tableize, commentable.to_param, :format => :rss)
-		html.html_safe
+    html += link_to fa_icon('rss', :text => :comments_rss.l), commentable_comments_url(commentable.class.to_s.tableize, commentable.to_param, :format => :rss)
+    html.html_safe
   end
 
   def show_footer_content?
@@ -192,7 +268,7 @@ module BaseHelper
   end
 
   def paginating_links(paginator, options = {}, html_options = {})
-    paginate paginator
+    paginate paginator, :theme => 'bootstrap'
   end
 
   def last_active
@@ -200,16 +276,11 @@ module BaseHelper
   end
 
   def ajax_spinner_for(id, spinner="spinner.gif")
-    "<img src='/assets/#{spinner}' style='display:none; vertical-align:middle;' id='#{id.to_s}_spinner'> ".html_safe
+    image_tag spinner, class: 'hide', id: "#{id.to_s}_spinner"
   end
 
   def avatar_for(user, size=32)
-    image_tag user.avatar_photo_url(:medium), :size => "#{size}x#{size}", :class => 'photo'
-  end
-
-  def feed_icon_tag(title, url)
-    (@feed_icons ||= []) << { :url => url, :title => title }
-    link_to image_tag('feed.png', :size => '14x14', :alt => :subscribe_to.l+" #{title}", :plugin => 'community_engine'), url
+    image_tag user.avatar_photo_url(:thumb), :class => 'thumbnail'
   end
 
   def search_posts_title
@@ -236,9 +307,9 @@ module BaseHelper
     case distance_in_minutes
       when 0              then :a_few_seconds_ago.l
       when 1..59          then :minutes_ago.l(:count => distance_in_minutes)
-      when 60..1339       then :hours_ago.l(:count => (distance_in_minutes.to_f / 60.0).round)
-      when 1440..2880     then :days_ago.l(:count => (distance_in_minutes.to_f / 1440.0).round) # 1 days to 2 days
-      else I18n.l(from_time.to_date, :format => :published_date)
+      when 60..1440       then :hours_ago.l(:count => (distance_in_minutes.to_f / 60.0).round)
+      when 1440..2880     then :days_ago.l(:count => (distance_in_minutes.to_f / 1440.0).round) # 1.5 days to 2 days
+      else I18n.l(from_time, :format => :short)
     end
   end
 
@@ -248,7 +319,7 @@ module BaseHelper
     elsif date.to_date.eql?(Time.now.to_date - 1)
       display = :yesterday.l
     else
-      display = I18n.l(date.to_date, :format => :date_ago)
+      display = I18n.l(date.to_date, :format => :short)
     end
   end
 
@@ -277,8 +348,27 @@ module BaseHelper
 
   def tiny_mce_init_if_needed
     if !@uses_tiny_mce.blank?
-      tinymce_js = tinymce_javascript(@tiny_mce_configuration)
-      javascript_tag(tinymce_js)
+      javascript_tag(tiny_mce_js)
+    end
+  end
+
+  def tiny_mce_js
+    selector = @tiny_mce_configuration['selector']
+    "jQuery(function(){jQuery('#{selector}').RichTextEditor(#{@tiny_mce_configuration.to_json})});".html_safe
+  end
+
+  def flash_class(level)
+    case level
+      when :notice then "alert-info"
+      when :error then "alert-danger"
+      when :alert then "alert-warning"
     end
   end
+
+  def tag_auto_complete_field(id, options = {})
+    options[:url][:format] = 'json'
+    html = ""
+    html << render(:partial => 'shared/tag_auto_complete', :locals => {:id => id, :options => options})
+    html.html_safe
+  end
 end