Merge branch 'master' of github.com:fatfreecrm/fat_free_crm

.gitignore

@@ -11,6 +11,7 @@ db/*.sql*
 log/*.log
 
 public/avatars/**/*
+public/assets
 
 tmp
 Design

app/assets/stylesheets/common.sass

@@ -171,7 +171,7 @@ $sidebar_width:  210px
       input, select, textarea
         width: 240px
         display: block
-      input[type="checkbox"]
+      input[type="checkbox"], input[type="radio"]
         display: inline
         width: auto
       label

app/controllers/application_controller.rb

@@ -17,7 +17,9 @@
 
 class ApplicationController < ActionController::Base
 
-  # helper :all gets called authomagically in Rails3.
+  # TODO: This is a fix for plugin loading under Rails 3.1 otherwise we don't get helpers loaded correctly
+  helper :accounts, :addresses, :application, :authentications, :campaigns, :comments, :contacts, :emails, :fields, :home, :leads, :opportunities, :passwords, :tags, :tasks, :users
+
   helper_method :current_user_session, :current_user, :can_signup?
   helper_method :called_from_index_page?, :called_from_landing_page?
 

app/views/accounts/_account.html.haml

@@ -23,10 +23,10 @@
 
     - unless @current_user.preference[:accounts_outline] == "brief"
       %dt
-        = stars_for(account) + " | "
-        = link_to(account.website, account.website.to_url) << " | " if account.website.present?
-        = link_to_email(account.email) << " | " if account.email.present?
-        = t(:phone_small) << ": " << (account.toll_free_phone || account.phone) if account.toll_free_phone? || account.phone?
+        = stars_for(account)
+        = " | ".html_safe << link_to(account.website, account.website.to_url) if account.website.present?
+        = " | ".html_safe << link_to_email(account.email) if account.email.present?
+        = " | ".html_safe << t(:phone_small) << ": " << (account.toll_free_phone || account.phone) if account.toll_free_phone? || account.phone?
 
       - if account.tag_list.present?
         %dt

app/views/accounts/_new.html.haml

@@ -1,4 +1,3 @@
-
 = simple_form_for(@account, :html => one_submit_only(:account), :remote => true) do |f|
   = link_to_close new_account_path
   = f.hidden_field :user_id

app/views/accounts/_top_section.html.haml

@@ -1,4 +1,3 @@
-
 = hook(:account_top_section, self, :f => f) do
   .section
     %table

app/views/authentications/new.html.haml

@@ -1,4 +1,3 @@
-
 = content_for(:javascript_epilogue) do
   :plain
     document.observe("dom:loaded", function() {

app/views/campaigns/_new.html.haml

@@ -1,4 +1,3 @@
-
 = simple_form_for(@campaign, :html => one_submit_only(:campaign), :remote => true) do |f|
   = link_to_close new_campaign_path
   = f.hidden_field :user_id

app/views/campaigns/_top_section.html.haml

@@ -1,4 +1,3 @@
-
 = hook(:campaign_top_section, self, :f => f) do
   .section
     %table

app/views/campaigns/create.js.rjs

@@ -12,7 +12,7 @@ else
   page.call "crm.date_select_popup", :campaign_starts_on
   page.call "crm.date_select_popup", :campaign_ends_on
   page[:create_campaign].visual_effect :shake, :duration => 0.25, :distance => 6
-  if error_message_on(@campaign, :name).blank? and !error_message_on(@campaign, :ends_on).blank?
+  if @campaign.errors[:name].blank? and @campaign.errors[:ends_on].present?
     page[:campaign_ends_on].focus
   else
     page[:campaign_name].focus

app/views/campaigns/update.js.rjs

@@ -15,7 +15,7 @@ else
   page.call "crm.date_select_popup", :campaign_starts_on
   page.call "crm.date_select_popup", :campaign_ends_on
   page[id].visual_effect :shake, :duration => 0.25, :distance => 6
-  if error_message_on(@campaign, :name).blank? and !error_message_on(@campaign, :ends_on).blank?
+  if @campaign.errors[:name].blank? and @campaign.errors[:ends_on].present?
     page[:campaign_ends_on].focus
   else
     page[:campaign_name].focus

app/views/contacts/_new.html.haml

@@ -1,4 +1,3 @@
-
 = simple_form_for(@contact, :html => one_submit_only(:contact), :remote => true) do |f|
   = link_to_close new_contact_path
   = f.hidden_field :user_id

app/views/contacts/_top_section.html.haml

@@ -1,4 +1,3 @@
-
 = hook(:contact_top_section, self, :f => f) do
   .section
     %table

app/views/leads/_new.html.haml

@@ -1,4 +1,3 @@
-
 = simple_form_for(@lead, :html => one_submit_only(:lead), :remote => true) do |f|
   = link_to_close new_lead_path
   = f.hidden_field :user_id

app/views/leads/_opportunity.html.haml

@@ -1,4 +1,3 @@
-
 = fields_for(@opportunity) do |o|
   = o.hidden_field :user_id
   = o.hidden_field :access

app/views/leads/_top_section.html.haml

@@ -1,4 +1,3 @@
-
 = hook(:lead_top_section, self, :f => f) do
   .section
     %table

app/views/leads/update.js.rjs

@@ -19,7 +19,7 @@ if @lead.errors.empty?
 else
   page[id].replace_html :partial => "edit"
   page[id].visual_effect :shake, :duration => 0.25, :distance => 6
-  if error_message_on(@lead, :first_name).blank? and !error_message_on(@lead, :last_name).blank?
+  if @lead.errors[:first_name].blank? and @lead.errors[:last_name].present?
     page[:lead_last_name].focus
   else
     page[:lead_first_name].focus

app/views/opportunities/_new.html.haml

@@ -1,4 +1,3 @@
-
 = simple_form_for(@opportunity, :html => one_submit_only(:opportunity), :remote => true) do |f|
   = link_to_close new_opportunity_path
   = f.hidden_field :user_id

app/views/opportunities/_top_section.html.haml

@@ -1,4 +1,3 @@
-
 = hook(:opportunity_top_section, self, :f => f) do
   .section
     %table

app/views/shared/_paginate.haml

@@ -1,2 +1 @@
-
 = will_paginate :params => {:action => :index}

app/views/tasks/_new.html.haml

@@ -1,4 +1,3 @@
-
 = simple_form_for(@task, :html => one_submit_only(:task), :remote => true) do |f|
   = link_to_close new_task_path + "?view=#{@view}"
   = hidden_field_tag :view, @view

app/views/tasks/index.html.haml

@@ -1,4 +1,3 @@
-
 = styles_for :task
 
 - if @view == "completed"

app/views/users/change_password.js.rjs

@@ -7,7 +7,7 @@ if @user.errors.empty?
 else
   page[:change_password].replace_html :partial => "password"
   page[:change_password].visual_effect :shake, :duration => 0.25, :distance => 6
-  unless error_message_on(@user, :current_password).blank?
+  if @user.errors[:current_password].present?
     page[:current_password].focus
   else
     page[:user_password].focus

lib/tasks/rspec_compatibility.rake

@@ -8,7 +8,7 @@ namespace :spec do
         require 'active_record/fixtures'
         ActiveRecord::Base.establish_connection(Rails.env.to_sym)
         (ENV['FIXTURES'] ? ENV['FIXTURES'].split(/,/) : Dir.glob(File.join(Rails.root, 'spec', 'fixtures', '*.{yml,csv}'))).each do |fixture_file|
-          Fixtures.create_fixtures('spec/fixtures', File.basename(fixture_file, '.*'))
+          ActiveRecord::Fixtures.create_fixtures('spec/fixtures', File.basename(fixture_file, '.*'))
         end
       end
     end

spec/fixtures/emails.yml

@@ -49,7 +49,4 @@ email_<%= i %>:
   header          :
   sent_at         :
   received_at     :
-  deleted_at      :
-  created_at      :
-  updated_at      :
 <% end %>