fat_free_crm 0.19.2 → 0.20.0

data/app/controllers/lists_controller.rb

@@ -13,7 +13,7 @@ class ListsController < ApplicationController
 
     # Find any existing list with the same name (case insensitive)
     if @list = List.where("lower(name) = ?", list_params[:name].downcase).where(user_id: list_params[:user_id]).first
-      @list.update_attributes(list_params)
+      @list.update(list_params)
     else
       @list = List.create(list_params)
     end

data/app/controllers/tasks_controller.rb

@@ -90,7 +90,7 @@ class TasksController < ApplicationController
                                  end
 
     respond_with(@task) do |_format|
-      if @task.update_attributes(task_params)
+      if @task.update(task_params)
         @task.bucket = @task.computed_bucket
         if called_from_index_page?
           @empty_bucket = @task_before_update.bucket if Task.bucket_empty?(@task_before_update.bucket, current_user, @view)
@@ -118,7 +118,7 @@ class TasksController < ApplicationController
   #----------------------------------------------------------------------------
   def complete
     @task = Task.tracked_by(current_user).find(params[:id])
-    @task&.update_attributes(completed_at: Time.now, completed_by: current_user.id)
+    @task&.update(completed_at: Time.now, completed_by: current_user.id)
 
     # Make sure bucket's div gets hidden if it's the last completed task in the bucket.
     @empty_bucket = params[:bucket] if Task.bucket_empty?(params[:bucket], current_user)
@@ -131,7 +131,7 @@ class TasksController < ApplicationController
   #----------------------------------------------------------------------------
   def uncomplete
     @task = Task.tracked_by(current_user).find(params[:id])
-    @task&.update_attributes(completed_at: nil, completed_by: nil)
+    @task&.update(completed_at: nil, completed_by: nil)
 
     # Make sure bucket's div gets hidden if we're deleting last task in the bucket.
     @empty_bucket = params[:bucket] if Task.bucket_empty?(params[:bucket], current_user, @view)

data/app/controllers/users_controller.rb

@@ -32,7 +32,7 @@ class UsersController < ApplicationController
   # PUT /users/1.js
   #----------------------------------------------------------------------------
   def update
-    @user.update_attributes(user_params)
+    @user.update(user_params)
     flash[:notice] = t(:msg_user_updated)
     respond_with(@user)
   end
@@ -117,6 +117,8 @@ class UsersController < ApplicationController
     return {} unless params[:user]
 
     params[:user][:email].try(:strip!)
+    params[:user][:alt_email].try(:strip!)
+
     params[:user].permit(
       :username,
       :email,

data/app/helpers/accounts_helper.rb

@@ -104,4 +104,16 @@ module AccountsHelper
         end
     text.html_safe
   end
+
+  # We have too much logic in the account views
+  # - a helper that abstracts the logic to the backend
+  def display_value(value)
+    return "N/A" if value.zero?
+    number_to_currency(value, precision: 0)
+  end
+
+  def display_assigned(account)
+    return truncate(account.assignee.full_name, length: 16) if account.assigned_to
+    nil
+  end
 end

data/app/helpers/application_helper.rb

@@ -88,7 +88,6 @@ module ApplicationHelper
   #----------------------------------------------------------------------------
   def link_to_inline(id, url, options = {})
     text = options[:text] || t(id, default: id.to_s.titleize)
-    text = (arrow_for(id) + text) unless options[:plain]
     related = (options[:related] ? "&related=#{options[:related]}" : '')
 
     link_to(text,
@@ -234,16 +233,15 @@ module ApplicationHelper
 
   # Reresh sidebar using the action view within the current controller.
   #----------------------------------------------------------------------------
-  def refresh_sidebar(action = nil, shake = nil)
-    refresh_sidebar_for(controller.controller_name, action, shake)
+  def refresh_sidebar(action = nil)
+    refresh_sidebar_for(controller.controller_name, action)
   end
 
   # Refresh sidebar using the action view within an arbitrary controller.
   #----------------------------------------------------------------------------
-  def refresh_sidebar_for(view, action = nil, shake = nil)
+  def refresh_sidebar_for(view, action = nil)
     text = ""
     text += "$('#sidebar').html('#{j render(partial: 'layouts/sidebar', locals: { view: view, action: action })}');"
-    text += "$('##{j shake.to_s}').effect('shake', { duration:200, distance: 3 });" if shake
     text.html_safe
   end
 

data/app/helpers/tasks_helper.rb

@@ -128,7 +128,7 @@ module TasksHelper
     else
       text << replace_content(@task, @task.bucket)
     end
-    text << refresh_sidebar(:index, :filters)
+    text << refresh_sidebar(:index)
     text
   end
 
@@ -136,7 +136,7 @@ module TasksHelper
   def reschedule(task)
     text = hide_task_and_possibly_bucket(task, @task_before_update.bucket)
     text += insert_content(task, task.bucket, @view)
-    text += refresh_sidebar(:index, :filters)
+    text += refresh_sidebar(:index)
     text
   end
 end

data/app/models/entities/account.rb

@@ -65,7 +65,7 @@ class Account < ActiveRecord::Base
   acts_as_commentable
   uses_comment_extensions
   acts_as_taggable_on :tags
-  has_paper_trail class_name: 'Version', ignore: [:subscribed_users]
+  has_paper_trail versions: { class_name: 'Version' }, ignore: [:subscribed_users]
   has_fields
   exportable
   sortable by: ["name ASC", "rating DESC", "created_at DESC", "updated_at DESC"], default: "created_at DESC"

data/app/models/entities/account_contact.rb

@@ -21,7 +21,7 @@ class AccountContact < ActiveRecord::Base
   belongs_to :account, counter_cache: :contacts_count
   belongs_to :contact
 
-  has_paper_trail class_name: 'Version', meta: { related: :contact },
+  has_paper_trail versions: { class_name: 'Version' }, meta: { related: :contact },
                   ignore: %i[id created_at updated_at contact_id]
 
   validates_presence_of :account_id

data/app/models/entities/account_opportunity.rb

@@ -22,7 +22,7 @@ class AccountOpportunity < ActiveRecord::Base
   belongs_to :opportunity
   validates_presence_of :account_id, :opportunity_id
 
-  has_paper_trail class_name: 'Version'
+  has_paper_trail versions: { class_name: 'Version' }
 
   ActiveSupport.run_load_hooks(:fat_free_crm_account_opportunity, self)
 end

data/app/models/entities/campaign.rb

@@ -53,7 +53,7 @@ class Campaign < ActiveRecord::Base
   acts_as_commentable
   uses_comment_extensions
   acts_as_taggable_on :tags
-  has_paper_trail class_name: 'Version', ignore: [:subscribed_users]
+  has_paper_trail versions: { class_name: 'Version' }, ignore: [:subscribed_users]
   has_fields
   exportable
   sortable by: ["name ASC", "target_leads DESC", "target_revenue DESC", "leads_count DESC", "revenue DESC", "starts_on DESC", "ends_on DESC", "created_at DESC", "updated_at DESC"], default: "created_at DESC"

data/app/models/entities/contact.rb

@@ -88,7 +88,7 @@ class Contact < ActiveRecord::Base
   acts_as_commentable
   uses_comment_extensions
   acts_as_taggable_on :tags
-  has_paper_trail class_name: 'Version', ignore: [:subscribed_users]
+  has_paper_trail versions: { class_name: 'Version' }, ignore: [:subscribed_users]
 
   has_fields
   exportable

data/app/models/entities/lead.rb

@@ -66,7 +66,7 @@ class Lead < ActiveRecord::Base
   acts_as_commentable
   uses_comment_extensions
   acts_as_taggable_on :tags
-  has_paper_trail class_name: 'Version', ignore: [:subscribed_users]
+  has_paper_trail versions: { class_name: 'Version' }, ignore: [:subscribed_users]
   has_fields
   exportable
   sortable by: ["first_name ASC", "last_name ASC", "company ASC", "rating DESC", "created_at DESC", "updated_at DESC"], default: "created_at DESC"

data/app/models/entities/opportunity.rb

@@ -73,7 +73,7 @@ class Opportunity < ActiveRecord::Base
   acts_as_commentable
   uses_comment_extensions
   acts_as_taggable_on :tags
-  has_paper_trail class_name: 'Version', ignore: [:subscribed_users]
+  has_paper_trail versions: { class_name: 'Version' }, ignore: [:subscribed_users]
   has_fields
   exportable
   sortable by: ["name ASC", "amount DESC", "amount*probability DESC", "probability DESC", "closes_on ASC", "created_at DESC", "updated_at DESC"], default: "created_at DESC"

data/app/models/fields/custom_field_pair.rb

@@ -28,9 +28,9 @@ class CustomFieldPair < CustomField
     pair = params.delete('pair')
     base_params = fields.delete_if { |k, _v| !%w[field_group_id label as].include?(k) }
     field1 = CustomFieldPair.find(params['id'])
-    field1.update_attributes(base_params.merge(pair['0']))
+    field1.update(base_params.merge(pair['0']))
     field2 = field1.paired_with
-    field2.update_attributes(base_params.merge(pair['1']).merge('required' => field1.required, 'disabled' => field1.disabled))
+    field2.update(base_params.merge(pair['1']).merge('required' => field1.required, 'disabled' => field1.disabled))
     [field1, field2]
   end
 

data/app/models/observers/opportunity_observer.rb

@@ -24,7 +24,7 @@ class OpportunityObserver < ActiveRecord::Observer
       if original.stage != "won" && item.stage == "won" # :other to :won -- add to total campaign revenue.
         update_campaign_revenue(item.campaign, item.amount.to_f - item.discount.to_f)
         item.update_attribute(:probability, 100) # Set probability to 100% if won
-        return log_activity(item, :won)
+        log_activity(item, :won)
       elsif original.stage == "won" && item.stage != "won" # :won to :other -- substract from total campaign revenue.
         update_campaign_revenue(original.campaign, -(original.amount.to_f - original.discount.to_f))
       elsif original.stage != "lost" && item.stage == "lost"

data/app/models/polymorphic/address.rb

@@ -28,7 +28,7 @@
 class Address < ActiveRecord::Base
   belongs_to :addressable, polymorphic: true
 
-  has_paper_trail class_name: 'Version', meta: { related: :addressable }
+  has_paper_trail versions: { class_name: 'Version' }, meta: { related: :addressable }
 
   scope :business, -> { where("address_type='Business'") }
   scope :billing,  -> { where("address_type='Billing'") }

data/app/models/polymorphic/comment.rb

@@ -28,7 +28,7 @@ class Comment < ActiveRecord::Base
   scope :created_by, ->(user) { where(user_id: user.id) }
 
   validates_presence_of :user, :commentable, :comment
-  has_paper_trail class_name: 'Version', meta: { related: :commentable },
+  has_paper_trail versions: { class_name: 'Version' }, meta: { related: :commentable },
                   ignore: [:state]
 
   before_create :subscribe_mentioned_users

data/app/models/polymorphic/email.rb

@@ -33,7 +33,7 @@ class Email < ActiveRecord::Base
   belongs_to :mediator, polymorphic: true, optional: true # TODO: Is this really optional?
   belongs_to :user, optional: true # TODO: Is this really optional?
 
-  has_paper_trail class_name: 'Version', meta: { related: :mediator },
+  has_paper_trail versions: { class_name: 'Version' }, meta: { related: :mediator },
                   ignore: [:state]
 
   def expanded?

data/app/models/polymorphic/task.rb

@@ -107,7 +107,7 @@ class Task < ActiveRecord::Base
   }
 
   acts_as_commentable
-  has_paper_trail class_name: 'Version', meta: { related: :asset },
+  has_paper_trail versions: { class_name: 'Version' }, meta: { related: :asset },
                   ignore: [:subscribed_users]
   has_fields
   exportable

data/app/models/setting.rb

@@ -26,6 +26,7 @@
 # `config/settings.default.yml`, and settings in the database table have the highest priority.
 
 class Setting < ActiveRecord::Base
+  validates :name, presence: true, allow_blank: false
   serialize :value
 
   # Use class variables for cache and yaml settings.
@@ -69,9 +70,10 @@ class Setting < ActiveRecord::Base
     # Set setting value
     #-------------------------------------------------------------------
     def []=(name, value)
-      return nil unless database_and_table_exists?
+      raise ArgumentError, "name cannot be blank" if name.blank?
 
-      setting = find_by_name(name.to_s) || new(name: name)
+      return nil unless database_and_table_exists?
+      setting = find_by_name(name.to_s) || new(name: name.to_s)
       setting.value = value
       setting.save
       cache[name] = value

data/app/models/users/preference.rb

@@ -28,7 +28,7 @@ class Preference < ActiveRecord::Base
     return cached_prefs[name.to_s] if cached_prefs.key?(name.to_s)
 
     cached_prefs[name.to_s] = if user.present? && pref = Preference.find_by_name_and_user_id(name.to_s, user.id)
-                                Marshal.load(Base64.decode64(pref.value))
+                                JSON.parse(Base64.decode64(pref.value), symbolize_name: true)
     end
   end
 
@@ -36,7 +36,7 @@ class Preference < ActiveRecord::Base
   def []=(name, value)
     return super(name, value) if name.to_s == "user_id" # set the value of belongs_to
 
-    encoded = Base64.encode64(Marshal.dump(value))
+    encoded = Base64.encode64(value.to_json)
     if pref = Preference.find_by(name: name.to_s, user_id: user.id)
       pref.update_attribute(:value, encoded)
     else

data/app/models/users/user.rb

@@ -65,7 +65,7 @@ class User < ActiveRecord::Base
   has_many :lists
   has_and_belongs_to_many :groups
 
-  has_paper_trail class_name: 'Version', ignore: [:last_sign_in_at]
+  has_paper_trail versions: { class_name: 'Version' }, ignore: [:last_sign_in_at]
 
   scope :by_id, -> { order('id DESC') }
   # TODO: /home/clockwerx/.rbenv/versions/2.5.3/lib/ruby/gems/2.5.0/gems/activerecord-5.2.3/lib/active_record/scoping/named.rb:175:in `scope': You tried to define a scope named "without" on the model "User", but ActiveRecord::Relation already defined an instance method with the same name. (ArgumentError)
@@ -93,7 +93,7 @@ class User < ActiveRecord::Base
   validates :username,
             uniqueness: { message: :username_taken, case_sensitive: false },
             presence: { message: :missing_username },
-            format: { with: /[a-z0-9_-]+/i }
+            format: { with: /\A[a-z0-9_-]+\z/i }
   validates :password,
             presence: { if: :password_required? },
             confirmation: true

data/app/views/accounts/_edit.html.haml

@@ -14,8 +14,8 @@
 
     .buttonbar
       - if Setting.compound_address
-        = f.submit t(:save_account), onclick: "crm.clear_all_hints()"
+        = f.submit t(:save_account), onclick: "crm.clear_all_hints()", class: 'btn btn-primary'
       - else
-        = f.submit t(:save_account)
+        = f.submit t(:save_account), class: 'btn btn-primary'
       #{t :or}
       = link_to_cancel edit_account_path(@account)

data/app/views/accounts/_new.html.haml

@@ -14,8 +14,8 @@
 
   .buttonbar
     - if Setting.compound_address
-      = f.submit t(:create_account), onclick: "crm.clear_all_hints()"
+      = f.submit t(:create_account), onclick: "crm.clear_all_hints()", class: 'btn btn-primary'
     - else
-      = f.submit t(:create_account)
+      = f.submit t(:create_account), class: 'btn btn-primary'
     #{t :or}
     = link_to_cancel new_account_path

data/app/views/accounts/_sidebar_index.html.haml

@@ -1,13 +1,13 @@
 .filters#filters
   .caption= t :account_categories
   - Setting.account_category.each do |key|
-    .check_box{style: "border-bottom: 1px silver dotted;"}
+    .check_box
       %div{style: "float:right;"}
         = @account_category_total[key]
       = account_category_checkbox(key, @account_category_total[key])
       = label_tag(key, t(key))
 
-  .check_box{style: "border-bottom: 1px silver dotted;"}
+  .check_box
     %div{style: "float:right;"}
       = @account_category_total[:other]
     = account_category_checkbox("other", @account_category_total[:other])

data/app/views/accounts/_sidebar_show.html.haml

@@ -3,7 +3,6 @@
 - pipeline = @account.opportunities.pipeline.map(&:weighted_amount).compact.sum
 
 .panel#summary
-  %h4= h(@account.name)
   - if @account.website
     %div
       %b= link_to(truncate(@account.website, length: 30), @account.website.to_url, :"data-popup" => true, title: t(:open_in_window, @account.website))
@@ -25,24 +24,25 @@
   %div= render "shared/address_show", asset: @account, type: 'shipping', title: :shipping_address
 
   .caption #{t :account_summary}
-  %li
-    %dt= pipeline != 0.0 ? number_to_currency(pipeline, precision: 0) : t(:n_a)
-    %tt #{t :pipeline}:
-  %li
-    %dt= won != 0.0 ? number_to_currency(won, precision: 0) : t(:n_a)
-    %tt #{t :won}:
-  %li
-    %dt= lost != 0.0 ? number_to_currency(lost, precision: 0) : t(:n_a)
-    %tt #{t :lost}:
-  %li
-    %dt= @account.category ? t(@account.category) : t(:other)
-    %tt #{t :category}:
-  %li
-    %span{style: "float:right;"}= stars_for(@account)
-    %tt #{t :rating}:
-  %li
-    %dt= @account.assigned_to ? truncate(@account.assignee.full_name, length: 16) : nil
-    %tt #{t :assigned_to}:
+  %dl
+    %li
+      %dt= display_value(pipeline)
+      %tt #{t :pipeline}:
+    %li
+      %dt= display_value(won)
+      %tt #{t :won}:
+    %li
+      %dt= display_value(lost)
+      %tt #{t :lost}:
+    %li
+      %dt= @account.category ? t(@account.category) : t(:other)
+      %tt #{t :category}:
+    %li
+      %span{style: "float:right;"}= stars_for(@account)
+      %tt #{t :rating}:
+    %li
+      %dt= display_assigned(@account)
+      %tt #{t :assigned_to}:
 
   - unless @account.background_info.blank?
     .caption #{t :background_info}

data/app/views/accounts/create.js.haml

@@ -8,10 +8,9 @@
   $('##{create_id}').slideUp(250);
   $('##{entity_name.pluralize}').prepend('#{ j render(partial: entity_name, collection: [ @entity ]) }');
   $('##{dom_id(@entity)}').effect("highlight", { duration:1500 });
-  = refresh_sidebar(:index, :filters)
+  = refresh_sidebar(:index)
   $('#paginate').html('#{ j render(partial: "shared/paginate_with_per_page") }');
   crm.flick('empty', 'remove');
 - else
   $('##{create_id}').html('#{ j render(partial: "new") }');
-  $('##{create_id}').effect("shake", { duration:250, distance: 6 });
   $('#new_#{entity_name} input[type!=hidden]').first().focus();

data/app/views/accounts/destroy.js.haml

@@ -2,5 +2,5 @@
 - @entity = instance_variable_get("@#{entity_name}")
 
 $('##{dom_id(@entity)}').css('background-color', '#ffe4e1').slideUp(250);
-= refresh_sidebar(:index, :filters)
+= refresh_sidebar(:index)
 $('#paginate').replaceWith('#{ j render(partial: "shared/paginate_with_per_page") }');

data/app/views/accounts/show.html.haml

@@ -7,6 +7,7 @@
   = styles_for :task, :contact, :opportunity
 
   = render 'accounts/title_bar', account: @account
+  = render 'accounts/sidebar_show', account: @account
 
   %div#edit_account{ hidden }
 

data/app/views/accounts/update.js.haml

@@ -6,14 +6,13 @@
   - if called_from_landing_page?
     crm.flip_form('edit_#{entity_name}');
     crm.set_title('edit_#{entity_name}', '#{j @entity.name}');
-    = refresh_sidebar(:show, :summary)
+    = refresh_sidebar(:show)
   - else
     $('##{id}').replaceWith('#{ j render(partial: entity_name, collection: [ @entity ]) }');
     $('##{id}').effect("highlight", { duration:1500 });
-    = refresh_sidebar(:index, :filters)
+    = refresh_sidebar(:index)
 - else
   $('##{id}').html('#{ j render(partial: "edit") }');
-  $('##{id}').effect("shake", { duration:250, distance: 6 });
   $('##{dom_id(@entity, :edit)} input[type!=hidden]').first().focus();
 
 = hook(:entity_update, self, {entity: @entity})

data/app/views/admin/field_groups/create.js.haml

@@ -11,4 +11,3 @@
 
 - else
   $('##{id}').html('#{ j render(partial: "new") }');
-  $('##{id}').effect("shake", { duration:250, distance: 6 });

data/app/views/admin/field_groups/destroy.js.haml

@@ -3,7 +3,6 @@
 - if @field_group.destroyed?
   $('##{id}').css('background-color', '#ffe4e1').slideUp(250);
 - else
-  $('##{id}').effect("shake", { distance:5 }, 250);
   $('#flash').html('#{ j t(:msg_cant_delete_field_group) }');
   crm.flash('warning');
   - flash[:warning] = nil

data/app/views/admin/field_groups/update.js.haml

@@ -5,4 +5,3 @@
   crm.set_title('#{dom_id(@field_group)}', '#{field_group_subtitle(@field_group)}');
 - else
   $('##{id}').html('#{ j render(partial: 'edit') }');
-  $('##{id}').effect('shake', { distance:5 }, 250);

data/app/views/admin/fields/create.js.haml

@@ -13,5 +13,4 @@
   $('##{container_id}').sortable('reset');
 - else
   $('##{id}').html('#{ j render(partial: "admin/fields/form", locals: {field_group_id: @field.field_group_id}) }')
-  $('##{id}').effect("shake", { duration:250, distance: 6 });
   $('##{id}').find('input[type="text"]').first().focus()

data/app/views/admin/fields/destroy.js.haml

@@ -2,7 +2,6 @@
 - if @field.destroyed?
   $('li##{id}').css('background-color', '#ffe4e1').slideUp(250);
 - else
-  $('li##{id}').effect("shake", { duration:250, distance: 6});
   $('#flash').html('#{ j flash[:warning] }')
   $(crm.flash('warning'))
   - flash[:warning] = nil

data/app/views/admin/fields/update.js.haml

@@ -9,5 +9,4 @@
 - else
   html = $.parseHTML('#{ j(render partial: "form") }');
   $('##{id}').find('.edit_field').replaceWith( html );
-  $('##{id}').effect("shake", { duration:250, distance: 6 });
   $('##{id}').find('input[type="text"]').first().focus();

data/app/views/admin/groups/create.js.haml

@@ -6,5 +6,4 @@
   $('##{dom_id(@group)}').effect("highlight", { duration:1500 });
 - else
   $('#create_group').html('#{ j render(partial: "new") }');
-  $('#create_group').effect("shake", { duration:250, distance: 6 });
   $('#group_name').focus();

data/app/views/admin/groups/destroy.js.haml

@@ -3,7 +3,6 @@
   $('##{id}').css('background-color', '#ffe4e1').slideUp(250);
 - else
   crm.flick("#{dom_id(@group, :confirm)}, 'remove')");
-  $('##{id}').effect("shake", { duration:250, distance: 6 });
   $('#flash').html('#{ j flash[:warning] }');
   crm.flash('warning');
   - flash[:warning] = nil

data/app/views/admin/groups/update.js.haml

@@ -5,5 +5,4 @@
   $('##{id}').effect("highlight", { duration:1000 });
 - else
   $('##{id}').html('#{j render(partial: "edit") }')
-  $('##{id}').effect("shake", { duration:250, distance: 6 });
   $('#group_name').focus()

data/app/views/admin/tags/create.js.haml

@@ -7,5 +7,4 @@
   crm.flick('empty', 'remove');
 - else
   $('#create_tag').html('#{ j render(partial: 'new') }');
-  $('#create_tag').effect("shake", { duration:250, distance: 6 });
   $('#tag_name').focus();

data/app/views/admin/tags/destroy.js.haml

@@ -4,7 +4,6 @@
   $('##{id}').css('background-color', '#ffe4e1').slideUp(250);
 - else
   crm.flick("#{dom_id(@tag, :confirm)}, 'remove')");
-  $('##{id}').effect("shake", { duration:250, distance: 6 });
   $('#flash').html('#{ j flash[:warning] }');
   crm.flash('warning');
   - flash[:warning] = nil

data/app/views/admin/tags/update.js.haml

@@ -5,5 +5,4 @@
   $('##{id}').effect('highlight', { duration: 1000 });
 - else
   $('##{id}').html('#{ j render(partial: "edit") }');
-  $('##{id}').effect("shake", { duration:250, distance: 6 });
   $('#tag_tagname').focus();

data/app/views/admin/users/create.js.haml

@@ -6,5 +6,4 @@
   $('##{dom_id(@user)}').effect("highlight", { duration:1500 });
 - else
   $('#create_user').html('#{ j (render partial: "new") }');
-  $('#create_user').effect("shake", { duration:250, distance: 6 });
   $('#group_username').focus();

data/app/views/admin/users/destroy.js.haml

@@ -4,7 +4,6 @@
   $('##{id}').css('background-color', '#ffe4e1').slideUp(250).remove();
 - else
   crm.flick('#{dom_id(@user, :confirm)}', 'remove');
-  $('##{id}').effect('shake', { duration:250, distance: 6 });
   $('#flash').html('#{j flash[:warning]}');
   crm.flash('warning');
   - flash[:warning] = nil

data/app/views/admin/users/update.js.haml

@@ -5,5 +5,4 @@
   $('##{id}').effect("highlight", { duration:1000 });
 - else
   $('##{id}').html('#{j render(partial: "edit") }')
-  $('##{id}').effect("shake", { duration:250, distance: 6 });
   $('#user_username').focus()

data/app/views/campaigns/_edit.html.haml

@@ -13,6 +13,6 @@
     = hook(:entity_form, self, {f: f, entity: @campaign})
 
     .buttonbar
-      = f.submit t(:save_campaign)
+      = f.submit t(:save_campaign), class: 'btn btn-primary'
       #{t :or}
       = link_to_cancel edit_campaign_path(@campaign)

data/app/views/campaigns/_new.html.haml

@@ -13,6 +13,6 @@
   = hook(:entity_form, self, {f: f, entity: @campaign})
 
   .buttonbar
-    = f.submit t(:create_campaign)
+    = f.submit t(:create_campaign), class: 'btn btn-primary'
     #{t :or}
     = link_to_cancel new_campaign_path

data/app/views/campaigns/_sidebar_index.html.haml

@@ -1,13 +1,13 @@
 .filters#filters
   .caption= t :campaign_statuses
   - Setting.campaign_status.each do |key|
-    .check_box{style: "border-bottom: 1px silver dotted;"}
+    .check_box
       %div{style: "float:right;"}
         = @campaign_status_total[key]
       = campaign_status_checkbox(key, @campaign_status_total[key])
       = label_tag(key, t(key))
 
-  .check_box{style: "border-bottom: 1px silver dotted;"}
+  .check_box
     %div{style: "float:right;"}
       = @campaign_status_total[:other]
     = campaign_status_checkbox("other", @campaign_status_total[:other])