fat_free_crm 0.13.2 → 0.13.3

data/app/views/contacts/_contacts.html.haml

@@ -4,4 +4,4 @@
   - contacts = object.contacts.order('updated_at desc').paginate(:page => 1, :per_page => 20)
   = render :partial => "contacts/contact", :collection => contacts
 
-= will_paginate contacts, :id => 'contacts_pagination', :params => {:action => :contacts}
+= paginate( collection: contacts, id: 'contacts_pagination', params: { action: 'contacts' } )

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

@@ -11,6 +11,7 @@
     = render "contacts/web",         :f => f, :edit => true
     = render "fields/groups",        :f => f, :edit => true
     = render "entities/permissions", :f => f, :edit => true, :entity => @contact
+    = hook(:entity_form, self, {f: f, entity: @contact}) {}
 
     .buttonbar
       = f.submit t(:save_contact), :onclick => "crm.save_contact()"

data/app/views/contacts/_index_brief.html.haml

@@ -2,7 +2,7 @@
   = avatar_for(contact, :size => "16x16")
 
   %ul.tools
-    = hook(:contact_tools_before, self, :contact => contact)
+    = hook(:contact_tools_before, self, :contact => contact) {}
 
     - if can?(:update, contact)
       %li= link_to_edit(contact)
@@ -22,4 +22,4 @@
         –
         == #{t :referred_by_small} #{lead.referred_by}
 
-    = hook(:contact_bottom, self, :contact => contact)
+    = hook(:contact_bottom, self, :contact => contact) {}

data/app/views/contacts/_index_full.html.haml

@@ -2,7 +2,7 @@
   = avatar_for(contact, :size => "30x30")
 
   %ul.tools
-    = hook(:contact_tools_before, self, :contact => contact)
+    = hook(:contact_tools_before, self, :contact => contact {}
 
     - if can?(:update, contact)
       %li= link_to_edit(contact)
@@ -46,7 +46,7 @@
       %dt
         .tags= tags_for_index(contact)
 
-    = hook(:contact_bottom, self, :contact => contact)
+    = hook(:contact_bottom, self, :contact => contact) {}
 
     %dt{ :style => "padding: 2px 0px 0px 0px" }
       - if can?(:read, contact)

data/app/views/contacts/_index_long.html.haml

@@ -2,7 +2,7 @@
   = avatar_for(contact, :size => "30x30")
 
   %ul.tools
-    = hook(:contact_tools_before, self, :contact => contact)
+    = hook(:contact_tools_before, self, :contact => contact) {}
 
     - if can?(:update, contact)
       %li= link_to_edit(contact)
@@ -41,4 +41,4 @@
       %dt
         .tags= tags_for_index(contact)
 
-    = hook(:contact_bottom, self, :contact => contact)
+    = hook(:contact_bottom, self, :contact => contact) {}

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

@@ -12,6 +12,7 @@
   = render "contacts/web",         :f => f
   = render "fields/groups",        :f => f
   = render "entities/permissions", :f => f, :entity => @contact
+  = hook(:entity_form, self, {f: f, entity: @contact}) {}
 
   .buttonbar
     = f.submit t(:create_contact), :onclick => "crm.create_contact()"

data/app/views/contacts/_section_general.html.haml

@@ -17,6 +17,7 @@
         = col(t(:tags), contact.tag_list.map{|tag| content_tag(:span, tag, :class => "fbtag")}.join(' '))
 
     -# Show custom fields that are in the default field group
-    - custom_field_group = contact.field_groups.select{|f| f.name == 'custom_fields'}
-    - fields = custom_field_group.first.try(:fields).try(:without_pairs)
-    = render("fields/group_view", :fields => fields, :entity => contact) unless fields.nil?
+    - custom_field_group = contact.field_groups.select{|f| f.name == 'custom_fields'}.first
+    - if custom_field_group.present?
+      - fields = custom_field_group.fields.without_pairs
+      = render("fields/group_view", :fields => fields, :entity => contact) unless fields.nil?

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

@@ -49,4 +49,4 @@
     %dt
       .tags= tags_for_index(@contact)
 
-  = hook(:show_contact_sidebar_bottom, self, :contact => @contact)
+  = hook(:show_contact_sidebar_bottom, self, :contact => @contact) {}

data/app/views/contacts/_top_section.html.haml

@@ -42,4 +42,4 @@
 
         = render :partial => "/shared/tags", :locals => {:f => f, :span => 3}
 
-        = hook(:contact_top_section_bottom, self, :f => f)
+        = hook(:contact_top_section_bottom, self, :f => f) {}

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

@@ -3,21 +3,21 @@
 - create_id = "create_#{entity_name}"
 
 - if @entity.valid?
-  jQuery('##{create_id}_arrow').html(crm.COLLAPSED);
-  jQuery('##{create_id}_title').html('#{ j t(entity_name.pluralize) }');
-  jQuery('##{create_id}').slideUp(250);
-  jQuery('##{entity_name.pluralize}').prepend('#{ j render(:partial => entity_name, :collection => [ @entity ]) }');
-  jQuery('##{dom_id(@entity)}').effect("highlight", { duration:1500 });
+  $('##{create_id}_arrow').html(crm.COLLAPSED);
+  $('##{create_id}_title').html('#{ j t(entity_name.pluralize) }');
+  $('##{create_id}').slideUp(250);
+  $('##{entity_name.pluralize}').prepend('#{ j render(:partial => entity_name, :collection => [ @entity ]) }');
+  $('##{dom_id(@entity)}').effect("highlight", { duration:1500 });
 
   - if called_from_index_page?
     = refresh_sidebar(:index)
-    jQuery('#paginate').html('#{ j render(:partial => "shared/paginate_with_per_page") }');
+    $('#paginate').html('#{ j render(:partial => "shared/paginate_with_per_page") }');
   - else
-    jQuery('#recently').html('#{ j render(:partial => "shared/recently") }');
+    $('#recently').replaceWith('#{ j render(:partial => "shared/recently") }');
   crm.flick('empty', 'remove');
 
 - else
-  jQuery('##{create_id}').html('#{ j render(:partial => "new") }');
+  $('##{create_id}').html('#{ j render(:partial => "new") }');
   crm.create_or_select_account(#{ request.referer =~ /\/accounts\// || @account.id.blank? });
-  jQuery('##{create_id}').effect("shake", { duration:250, distance: 6 });
-  jQuery('#new_#{entity_name} input[type!=hidden]').first().focus();
+  $('##{create_id}').effect("shake", { duration:250, distance: 6 });
+  $('#new_#{entity_name} input[type!=hidden]').first().focus();

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

@@ -1,9 +1,9 @@
 - entity_name = controller.controller_name.singularize.underscore
 - @entity = instance_variable_get("@#{entity_name}")
 
-jQuery('##{dom_id(@entity)}').css('background-color', '#ffe4e1').slideUp(250);
+$('##{dom_id(@entity)}').css('background-color', '#ffe4e1').slideUp(250);
 - if called_from_index_page?
   = refresh_sidebar(:index, :filters)
-  jQuery('#paginate').html('#{ j render(:partial => "shared/paginate_with_per_page") }');
+  $('#paginate').html('#{ j render(:partial => "shared/paginate_with_per_page") }');
 - else
-  jQuery('#recently').replaceWith('#{ j render(:partial => "shared/recently") }');
+  $('#recently').replaceWith('#{ j render(:partial => "shared/recently") }');

data/app/views/contacts/edit.js.haml

@@ -8,7 +8,7 @@
     crm.flip_form('edit_#{entity_name}');
     crm.set_title('edit_#{entity_name}', '#{h @entity.name}');
   - else                                            # Called from index page...
-    jQuery('##{id}').replaceWith('#{ j render(:partial => entity_name, :collection => [ @entity ]) }');
+    $('##{id}').replaceWith('#{ j render(:partial => entity_name, :collection => [ @entity ]) }');
 
 
 - else # <----------------------------------------- Show [Edit Contact] form.
@@ -16,7 +16,7 @@
   - if params[:cancel].blank?                       # Called from contacts list item...
     - if @previous                                  # Hide open [Edit Contact] form if any.
       - if @previous.is_a?(Contact)
-        jQuery('##{dom_id(@previous)}').replaceWith('#{ j render(:partial => entity_name, :collection => [ @previous ]) }');
+        $('##{dom_id(@previous)}').replaceWith('#{ j render(:partial => entity_name, :collection => [ @previous ]) }');
       - else
         crm.flick('#{entity_name}_#{@previous}', 'remove');
     -# Disable onMouseOver for the list item.
@@ -24,12 +24,12 @@
     -# Hide [Create] form if any.
     crm.hide_form('create_#{entity_name}');
     -# Show [Edit] form.
-    jQuery('##{id}').html('#{ j render(:partial => "edit") }');
+    $('##{id}').html('#{ j render(:partial => "edit") }');
 
   - elsif params[:cancel].false?                    # Called from title of the contact landing page...
-    jQuery('#edit_#{entity_name}').html('#{ j render(:partial => "edit") }');
+    $('#edit_#{entity_name}').html('#{ j render(:partial => "edit") }');
     crm.flip_form('edit_#{entity_name}');
     crm.set_title('edit_#{entity_name}', "#{t :edit} #{h @entity.full_name}");
 
   crm.create_or_select_account(#{ request.referer =~ /\/accounts\// || @account.id.blank? });
-  jQuery('#new_#{entity_name} input[type!=hidden]').first().focus();
+  $('#new_#{entity_name} input[type!=hidden]').first().focus();

data/app/views/contacts/index.js.haml

@@ -2,10 +2,10 @@
 - @entities = instance_variable_get("@#{entities}")
 
 - if @entities.any?
-  jQuery('##{entities}').html('#{ j render(@entities) }');
+  $('##{entities}').html('#{ j render(@entities) }');
 - else
-  jQuery('##{entities}').html('#{ j render(:partial => "shared/empty") }');
+  $('##{entities}').html('#{ j render(:partial => "shared/empty") }');
 
-jQuery('#paginate').html('#{ j render(:partial => "shared/paginate_with_per_page") }');
-jQuery('#export').html('#{ j render(:partial => "shared/export") }');
-jQuery('#search_results_count').html('#{ j render(:text => t('search_results_count', :count => @search_results_count)) }');
+$('#paginate').html('#{ j render(:partial => "shared/paginate_with_per_page") }');
+$('#export').html('#{ j render(:partial => "shared/export") }');
+$('#search_results_count').html('#{ j render(:text => t('search_results_count', :count => @search_results_count)) }');

data/app/views/contacts/new.js.haml

@@ -5,7 +5,7 @@ crm.flick('empty', 'toggle');
 crm.flip_form('#{create_id}');
 
 - unless params[:cancel].true?
-  jQuery('##{create_id}').html('#{ j render(:partial => "new") }');
+  $('##{create_id}').html('#{ j render(:partial => "new") }');
   crm.set_title('#{create_id}', '#{ j t(create_id) }');
   -# this function call is the only difference to normal new.js.haml
   crm.create_or_select_account(#{ request.referer =~ /\/accounts\// || @account.id.blank? });

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

@@ -11,7 +11,7 @@
   = render "comments/new", :commentable => @contact
   = render :partial => "shared/timeline", :collection => @timeline
 
-  = hook(:show_contact_bottom, self) do
+  = hook(:show_contact_bottom, self, {entity: @contact}) do
 
     = render :partial => "tasks/tasks", :locals => {:object => @contact}
 

data/app/views/contacts/show.js.haml

@@ -1,5 +1,5 @@
 - entity_name = controller.controller_name.singularize.underscore #account
 - @entity = instance_variable_get("@#{entity_name}")
 
-jQuery('#main').html('#{ j (render :template => "#{entity_name.pluralize}/show.html", entity_name => @entity) }');
+$('#main').html('#{ j (render :template => "#{entity_name.pluralize}/show.html", entity_name => @entity) }');
 = raw generate_js_for_popups(@entity, :tasks, :opportunities)

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

@@ -9,14 +9,16 @@
     crm.set_title('edit_#{entity_name}', '#{h @entity.full_name}');
     = refresh_sidebar(:show, :summary)
   - else
-    jQuery('##{id}').replaceWith('#{ j render(:partial => entity_name, :collection => [ @entity ]) }');
-    jQuery('##{id}').effect("highlight", { duration:1500 });
+    $('##{id}').replaceWith('#{ j render(:partial => entity_name, :collection => [ @entity ]) }');
+    $('##{id}').effect("highlight", { duration:1500 });
     - if called_from_index_page?
       = refresh_sidebar(:index)
     - else
-      jQuery('#recently').replaceWith('#{ j render(:partial => "shared/recently") }');
+      $('#recently').replaceWith('#{ j render(:partial => "shared/recently") }');
 - else
-  jQuery('##{id}').html('#{ j render(:partial => "edit") }');
+  $('##{id}').html('#{ j render(:partial => "edit") }');
   crm.create_or_select_account(#{ request.referer =~ /\/accounts\// || @account.id.blank? });
-  jQuery('##{id}').effect("shake", { duration:250, distance: 6 });
-  jQuery('##{dom_id(@entity, :edit)} input[type!=hidden]').first().focus();
+  $('##{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/emails/destroy.js.haml

@@ -1,5 +1,5 @@
 - class_name = @email.mediator.class.name.downcase
 - id_prefix = "#{class_name}_#{@email.mediator.id}"
 
-jQuery('##{id_prefix}_shown_emails').val('#{ j @email.mediator.email_ids.join(',') }');
-jQuery('##{dom_id(@email)}').css('background-color', '#ffe4e1').slideUp(250);
+$('##{id_prefix}_shown_emails').val('#{ j @email.mediator.email_ids.join(',') }');
+$('##{dom_id(@email)}').css('background-color', '#ffe4e1').slideUp(250);

data/app/views/entities/_basic_search.html.haml

@@ -7,16 +7,19 @@
   %span.sorting_options
     -# sort_by_displaying: Sort {{models}} by {{field}} displaying first name {{position}} last name.
     = t(:sort_by, :models => t(:"#{controller_name}_small"), :field => link_to(current_sort_by, "#", :id => :sort_by)).html_safe
-  
-  :javascript
-    new Form.Element.Observer('query', 1.5, function(element, value) {
-      crm.search(value, '#{controller_name}');
-    });
 
-  :javascript
-    new crm.Menu({
-      trigger   : "sort_by",
-      fade      : 0.5,
-      appear    : 0.5,
-      menu_items: [ #{sort_by_menu_items.join(",")} ]
-    });
+:javascript
+  var searchTimeout;
+
+  $('#query').on('keydown', function(event) {
+    $el = $(event.target)
+    if (searchTimeout) clearTimeout(searchTimeout);
+    searchTimeout = setTimeout(function () { crm.search($el.val(), '#{controller_name}'); }, 500);
+  });
+
+  new crm.Menu({
+    trigger   : "#sort_by",
+    fade      : 500,
+    appear    : 500,
+    menu_items: [ #{sort_by_menu_items.join(",")} ]
+  });

data/app/views/entities/_permissions.html.haml

@@ -7,13 +7,13 @@
     = get_default_permissions_intro(entity.access, t("#{model}_small")) unless edit
   #entity_permissions{ hidden_if(collapsed) }
     .radio_box
-      = f.radio_button :access, "Private", :onclick => "$('people').hide()"
+      = f.radio_button :access, "Private", :onclick => "$('#people').hide()"
       = f.label :access_private, t(:keep_private), :style => "cursor:pointer"
     .radio_box
-      = f.radio_button :access, "Public", :onclick => "$('people').hide()"
+      = f.radio_button :access, "Public", :onclick => "$('#people').hide()"
       = f.label :access_public, t(:make_public), :style => "cursor:pointer"
     .radio_box
-      = f.radio_button :access, "Shared", :onclick => "$('people').show()"
+      = f.radio_button :access, "Shared", :onclick => "$('#people').show()"
       = f.label :access_shared, t(:share_with), :style => "cursor:pointer"
 
     #people{ hidden_if(entity.access != "Shared") }
@@ -22,20 +22,15 @@
           %td
             = f.label :user_ids, "#{t(:users)}:"
             %br
-            = f.select :user_ids, user_options, {}, :multiple => true
-            :javascript
-              new Chosen($('#{model}_user_ids'));
-
+            = f.select :user_ids, user_options, {}, :multiple => true, :class => 'select2'
         %tr
           %td
             = f.label :group_ids, "#{t(:groups)}:"
             %br
-            = f.select :group_ids, group_options, {}, :multiple => true
-            :javascript
-              new Chosen($('#{model}_group_ids'));
+            = f.select :group_ids, group_options, {}, :multiple => true, :class => 'select2'
 
     - if !edit and entity.is_a?(Lead)
       .radio_box
-        = f.radio_button :access, t(:campaign), :onclick => "$('people').hide(); $('lead_access_campaign').value = 'Campaign'", :disabled => true
+        = f.radio_button :access, t(:campaign), :onclick => "$('#people').hide(); $('#lead_access_campaign').val('Campaign');", :disabled => true
         %font{ :id => :copy_permissions, :color => :grey }
           = t(:copy_permissions, t(:campaign_small))

data/app/views/entities/attach.js.haml

@@ -8,14 +8,14 @@
       - view = "pending"
     - else
       - view = "assigned"
-    jQuery('#tasks').prepend('#{ j render(:partial => "tasks/#{view}", :collection => [ @attachment ], :locals => { :bucket => @attachment.computed_bucket }) }');
+    $('#tasks').prepend('#{ j render(:partial => "tasks/#{view}", :collection => [ @attachment ], :locals => { :bucket => @attachment.computed_bucket }) }');
 
 
   - else
-    jQuery('##{h params[:assets]}').prepend('#{ j render(:partial => "#{params[:assets]}/#{partial}", :collection => [ @attachment ]) }');
+    $('##{h params[:assets]}').prepend('#{ j render(:partial => "#{params[:assets]}/#{partial}", :collection => [ @attachment ]) }');
     - if called_from_landing_page?(:accounts)
       = refresh_sidebar_for(:accounts, :show, :summary)
     - elsif called_from_landing_page?(:campaigns)
       = refresh_sidebar_for(:campaigns, :show, :summary)
 
-jQuery('##{partial}_#{h params[:asset_id]}').effect("highlight", { duration:1500 });
+$('##{partial}_#{h params[:asset_id]}').effect("highlight", { duration:1500 });

data/app/views/entities/contacts.js.haml

@@ -1,3 +1,3 @@
 - contacts = entity.contacts.order('updated_at DESC').paginate(:page => params[:page], :per_page => 20)
-jQuery('#contacts').html('#{ j render(:partial => 'contacts/contact', :collection => contacts) }');
-jQuery('#contacts_pagination').html('#{ j will_paginate(contacts, :container => false, :params => {:action => :contacts}) }');
+$('#contacts').html('#{ j render(:partial => 'contacts/contact', :collection => contacts) }');
+$('#contacts_pagination').html('#{ j paginate(collection: contacts, container: false, params: { action: 'contacts' } ) }');

data/app/views/entities/discard.js.haml

@@ -1,4 +1,4 @@
-jQuery('##{dom_id(@attachment)}').slideUp(250);
+$('##{dom_id(@attachment)}').slideUp(250);
 
 - if called_from_landing_page?(:accounts)
   = refresh_sidebar_for(:accounts, :show, :summary)

data/app/views/entities/leads.js.haml

@@ -1,3 +1,3 @@
 - leads = entity.leads.order('updated_at DESC').paginate(:page => params[:page], :per_page => 20)
-jQuery('#leads').html('#{ j render(:partial => 'leads/lead', :collection => leads) }');
-jQuery('#leads_pagination').html('#{ j will_paginate(leads, :container => false, :params => {:action => :leads}) }');
+$('#leads').html('#{ j render(:partial => 'leads/lead', :collection => leads) }');
+$('#leads_pagination').html('#{ j paginate(collection: leads, container: false, params: { action: 'leads' } ) }');

data/app/views/entities/opportunities.js.haml

@@ -1,3 +1,3 @@
 - opportunities = entity.opportunities.order('updated_at DESC').paginate(:page => params[:page], :per_page => 20)
-jQuery('#opportunities').html('#{ j render(:partial => 'opportunities/opportunity', :collection => opportunities) }');
-jQuery('#opportunities_pagination').html('#{ j will_paginate(opportunities, :container => false, :params => {:action => :opportunities}) }');
+$('#opportunities').html('#{ j render(:partial => 'opportunities/opportunity', :collection => opportunities) }');
+$('#opportunities_pagination').html('#{ j paginate(collection: opportunities, container: false, params: { action: 'opportunities' } ) }');

data/app/views/entities/subscription_update.js.haml

@@ -1,4 +1,4 @@
 - class_name = entity.class.name.underscore
 - id = "#{class_name}_#{entity.id}_subscribe"
 
-jQuery('##{id}').html('#{ j render(:partial => "comments/subscription_links", :locals => {:entity => entity}) }');
+$('##{id}').html('#{ j render(:partial => "comments/subscription_links", :locals => {:entity => entity}) }');

data/app/views/entities/versions.js.haml

@@ -1,3 +1,3 @@
 - versions = Version.history(entity).paginate(:page => params[:page], :per_page => 20)
-jQuery('#versions .list').html('#{ j(render :partial => 'versions/version', :collection => versions) }')
-jQuery('#versions_pagination').html('#{ j will_paginate(versions, :container => false, :params => {:action => :versions}) }')
+$('#versions .list').html('#{ j(render :partial => 'versions/version', :collection => versions) }')
+$('#versions_pagination').html('#{ j paginate(collection: versions, container: false, params: { action: 'versions' } ) }')

data/app/views/fields/group.js.erb

@@ -1,3 +1,3 @@
 <%= simple_fields_for(@asset) do |f| %>
-  jQuery('#field_groups').append('<%= j render(:partial => 'fields/group', :locals => {:f => f, :field_group => @field_group, :fields => @field_group.fields}) %>')
+  $('#field_groups').append('<%= j render(:partial => 'fields/group', :locals => {:f => f, :field_group => @field_group, :fields => @field_group.fields}) %>')
 <% end %>

data/app/views/home/_account.html.haml

@@ -23,7 +23,7 @@
         = t(:phone_small) << ": " << (account.toll_free_phone || account.phone) << " | " if account.toll_free_phone? || account.phone?
         = t('pluralize.contact', account.contacts.count) << " | "
         = t('pluralize.opportunity', account.opportunities.count)
-      - if account.tag_list.present?
+      - if account.tags.any?
         %dt
           .tags= tags_for_dashboard(account)
-      = hook(:account_bottom, self, :account => account)
+      = hook(:account_bottom, self, :account => account) {}

data/app/views/home/_assets_menu.html.haml

@@ -1,7 +1,7 @@
 :plain
   new crm.Menu({
-    trigger   : "asset",
-    fade      : 0.5,
-    appear    : 0.5,
+    trigger   : "#asset",
+    fade      : 500,
+    appear    : 500,
     menu_items: [ #{sort_by_assets.join(",")} ]
   });

data/app/views/home/_duration_menu.html.haml

@@ -1,8 +1,8 @@
 :plain
   new crm.Menu({
-    trigger   : "duration",
-    fade      : 0.5,
-    appear    : 0.5,
+    trigger   : "#duration",
+    fade      : 500,
+    appear    : 500,
     width     : 165,
     menu_items: [ #{sort_by_duration.join(",")} ]
   });

data/app/views/home/_events_menu.html.haml

@@ -1,8 +1,8 @@
 :plain
   new crm.Menu({
-    trigger   : "event",
-    fade      : 0.5,
-    appear    : 0.5,
+    trigger   : "#event",
+    fade      : 500,
+    appear    : 500,
     menu_items: [ #{sort_by_events.join(",")} ]
   });
 

data/app/views/home/_opportunity.html.haml

@@ -35,7 +35,7 @@
             %span.warn= t(:past_due, distance_of_time_in_words(opportunity.closes_on, Date.today))
         - else
           = t(:no_closing_date)
-      - if opportunity.tag_list.present?
+      - if opportunity.tags.any?
         %dt
           .tags= tags_for_dashboard(opportunity)
-      = hook(:opportunity_bottom, self, :opportunity => opportunity)
+      = hook(:opportunity_bottom, self, :opportunity => opportunity) {}