fat_free_crm 0.12.3 → 0.13.0

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

@@ -0,0 +1,11 @@
+- entities = controller.controller_name # accounts
+- @entities = instance_variable_get("@#{entities}")
+
+- if @entities.any?
+  jQuery('##{entities}').html('#{ j render(@entities) }');
+- else
+  jQuery('##{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)) }');

data/app/views/leads/index.xls.builder

@@ -3,7 +3,8 @@ xml.Worksheet 'ss:Name' => I18n.t(:tab_leads) do
     unless @leads.empty?
       # Header.
       xml.Row do
-        heads = [I18n.t('user'),
+        heads = [I18n.t('id'),
+                 I18n.t('user'),
                  I18n.t('campaign'),
                  I18n.t('job_title'),
                  I18n.t('name'),
@@ -33,12 +34,12 @@ xml.Worksheet 'ss:Name' => I18n.t(:tab_leads) do
                  I18n.t('zipcode'),
                  I18n.t('country'),
                  I18n.t('address')]
-        
+
         # Append custom field labels to header
         Lead.fields.each do |field|
           heads << field.label
         end
-        
+
         heads.each do |head|
           xml.Cell do
             xml.Data head,
@@ -46,12 +47,13 @@ xml.Worksheet 'ss:Name' => I18n.t(:tab_leads) do
           end
         end
       end
-      
+
       # Lead rows.
       @leads.each do |lead|
         xml.Row do
           address = lead.business_address
-          data    = [lead.user.try(:name),
+          data    = [lead.id,
+                     lead.user.try(:name),
                      lead.campaign.try(:name),
                      lead.title,
                      lead.name,
@@ -81,12 +83,12 @@ xml.Worksheet 'ss:Name' => I18n.t(:tab_leads) do
                      address.try(:zipcode),
                      address.try(:country),
                      address.try(:full_address)]
-          
+
           # Append custom field values.
           Lead.fields.each do |field|
             data << lead.send(field.name)
           end
-          
+
           data.each do |value|
             xml.Cell do
               xml.Data value,

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

@@ -0,0 +1,11 @@
+- entity_name = controller.controller_name.singularize # account
+- create_id = "create_#{entity_name}"
+
+crm.flick('empty', 'toggle');
+crm.flip_form('#{create_id}');
+
+- unless params[:cancel].true?
+  jQuery('##{create_id}').html('#{ j render(:partial => "new") }');
+  crm.set_title('#{create_id}', '#{ j t(create_id) }');
+- else
+  crm.set_title('#{create_id}', '#{ j t(entity_name.pluralize) }');

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

@@ -0,0 +1,26 @@
+- entity_name = controller.controller_name.singularize.underscore #account
+- @entity = instance_variable_get("@#{entity_name}")
+- id = called_from_landing_page? ? "convert_#{entity_name}" : dom_id(@entity)
+
+- if @entity.status == "converted"
+  - if called_from_landing_page?
+    crm.flip_form('convert_#{entity_name}');
+    crm.set_title('convert_#{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 });
+    - if called_from_index_page?
+      = refresh_sidebar(:index, :filters)
+    - elsif called_from_landing_page?("campaigns")
+      = refresh_sidebar_for(:campaigns, :show, :summary)
+      - if @opportunity.id # Make sure the opportunity has been saved.
+        jQuery('#opportunities').prepend('#{ j render(:partial => "opportunities/opportunity", :collection => [ @opportunity ]) }');
+    - else
+      jQuery('#recently').replaceWith('#{ j render(:partial => "shared/recently") }');
+
+- else  
+  jQuery('##{id}').html('#{ j render(:partial => "convert") }');
+  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();

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

@@ -0,0 +1,12 @@
+- entity_name = controller.controller_name.singularize.underscore
+- @entity = instance_variable_get("@#{entity_name}")
+- id = dom_id(@entity)
+
+jQuery('##{id}').replaceWith('#{ j render(:partial => entity_name, :collection => [ @entity ]) }');
+jQuery('##{id}').effect("highlight", { duration:1500 });
+- if called_from_index_page?
+  = refresh_sidebar(:index, :filters)
+- elsif called_from_landing_page?("campaigns")
+  = refresh_sidebar_for(:campaigns, :show, :summary)
+- else
+  = refresh_sidebar(:show, :summary)

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

@@ -0,0 +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) }');
+= raw generate_js_for_popups(@entity, :tasks)

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

@@ -0,0 +1,26 @@
+- entity_name = controller.controller_name.singularize.underscore #account
+- @entity = instance_variable_get("@#{entity_name}")
+- id = called_from_landing_page? ? "edit_#{entity_name}" : dom_id(@entity)
+
+- if @entity.errors.empty?
+  - if called_from_landing_page?
+    crm.flip_form('edit_#{entity_name}');
+    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 });
+    - if called_from_index_page?
+      = refresh_sidebar(:index, :filters)
+    - elsif called_from_landing_page?("campaigns")
+      = refresh_sidebar_for(:campaigns, :show, :summary)
+    - else
+      jQuery('#recently').replaceWith('#{ j render(:partial => "shared/recently") }');
+
+- else
+  jQuery('##{id}').html('#{ j render(:partial => "edit") }');
+  jQuery('##{id}').effect("shake", { duration:250, distance: 6 });
+  - if @entity.errors[:first_name].blank? and entity.errors[:last_name].present?
+    jQuery('#lead_last_name').focus();
+  - else
+    jQuery('##{dom_id(@entity, :edit)} input[type!=hidden]').first().focus();

data/app/views/lists/_personal_sidebar.html.haml

@@ -0,0 +1,28 @@
+- @personal_lists = List.where(:user_id => current_user.id)
+- @list = List.new
+.panel#personal_lists
+  .caption #{t :personal_lists}
+  %ul
+    - if @personal_lists.none?
+      %div #{t :no_saved_lists}
+    - else
+      - @personal_lists.sort.each_with_index do |list, i|
+        %li[list]{ :class => i < @personal_lists.size - 1 ? "" : "last" }
+          %dt= link_to(truncate(list.name, :length => 25), list.url, :title => list.name)
+          %tt 
+            = link_to(url_for(list), :method => :delete, :confirm => 'Are you sure?', :remote => true, :class => "list_icon delete_on_hover") do
+              %i.fa{:"data-controller" => list.controller, class: get_icon(list.controller)}
+
+  .show_personal_lists_save_form{ hidden_if(!params[:q]) }
+    = link_to(t(:make_current_view_list), '#')
+
+  .save_peronal_list{ hidden }
+    = simple_form_for(@list, :html => one_submit_only, :remote => true) do |f|
+      = f.text_field :name, :size => 25
+      = image_tag("/assets/info_tiny.png", :title => t(:list_name_info), :class => "input_info")
+      = f.hidden_field :url, :id => "personal_list_url"
+      %input{:type => "hidden", :name => "is_global", :value => 0}
+      %div
+        = f.submit(t(:save), :id => "save_personal_list", :style => "vertical-align: bottom;")
+        #{t :or}
+        = link_to(t(:cancel), '#', :class => "hide_lists_save_personal_form")

data/app/views/lists/_sidebar.html.haml

@@ -1,24 +1,27 @@
-- @lists = List.all
+- @global_lists = List.where(:user_id => nil)
 - @list = List.new
 .panel#lists
-  .caption #{t :lists}
+  .caption #{t :global_lists}
   %ul
-    - if @lists.none?
+    - if @global_lists.none?
       %div #{t :no_saved_lists}
     - else
-      - @lists.sort.each_with_index do |list, i|
-        %li[list]{ :class => i < @lists.size - 1 ? "" : "last" }
+      - @global_lists.sort.each_with_index do |list, i|
+        %li[list]{ :class => i < @global_lists.size - 1 ? "" : "last" }
           %dt= link_to(truncate(list.name, :length => 25), list.url, :title => list.name)
-          %tt= link_to(image_tag("/assets/tab_icons/#{list.controller}_active.png", :"data-controller" => list.controller), url_for(list), :method => :delete, :confirm => 'Are you sure?', :remote => true, :class => "list_icon delete_on_hover")
+          %tt 
+            = link_to(url_for(list), :method => :delete, :confirm => 'Are you sure?', :remote => true, :class => "list_icon delete_on_hover") do
+              %i.fa{:"data-controller" => list.controller, class: get_icon(list.controller)}
 
   .show_lists_save_form{ hidden_if(!params[:q]) }
     = link_to(t(:make_current_view_list), '#')
 
   .save_list{ hidden }
-    = simple_form_for(@list, :html => one_submit_only(:list), :remote => true) do |f|
+    = simple_form_for(@list, :html => one_submit_only, :remote => true) do |f|
       = f.text_field :name, :size => 25
       = image_tag("/assets/info_tiny.png", :title => t(:list_name_info), :class => "input_info")
       = f.hidden_field :url
+      %input{:type => "hidden", :name => "is_global", :value => 1}
       %div
         = f.submit(t(:save), :id => "save_list", :style => "vertical-align: bottom;")
         #{t :or}

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

@@ -0,0 +1,10 @@
+- if @list.valid?
+  jQuery('#lists').replaceWith('#{ j render(:partial => "lists/sidebar") }');
+  jQuery('.show_lists_save_form').show();
+  jQuery('#personal_lists').replaceWith('#{ j render(:partial => "lists/personal_sidebar") }');
+  jQuery('.show_personal_lists_save_form').show();
+
+- else # Couldn't create the saved list -- validation failed.
+  jQuery('#new_list').effect("shake", { duration:250, distance: 6 });
+  jQuery('#list_name').focus();
+  jQuery('#save_list').enable();

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

@@ -0,0 +1 @@
+jQuery('##{dom_id(@list)}').css('background-color', '#ffe4e1').slideUp();

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

@@ -1,5 +1,5 @@
 .remote
-  = simple_form_for(@opportunity, :html => one_submit_only(:opportunity), :remote => true) do |f|
+  = simple_form_for(@opportunity, :html => one_submit_only, :remote => true) do |f|
     = link_to_close edit_opportunity_path(@opportunity)
     = f.hidden_field :user_id
     = f.hidden_field :campaign_id

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

@@ -20,10 +20,10 @@
       == #{t :from} #{link_to_if can?(:read, account), account.name, account_path(account)}
     %tt
       –
-      - user_name = opportunity.user_id == current_user.id ? t(:me) : opportunity.user.try(:full_name)
+      - user_name = opportunity.user.try(:full_name)
       - if user_name
-        = t(:added_by, :time_ago => time_ago_in_words(opportunity.created_at), :user => user_name)
+        = t(:added_by, :time_ago => timeago(opportunity.created_at), :user => h(user_name)).html_safe
       - else
-        = t(:added_ago, :value => time_ago_in_words(opportunity.created_at))
+        = t(:added_ago, :value => timeago(opportunity.created_at)).html_safe
 
     = hook(:opportunity_bottom, self, :opportunity => opportunity)

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

@@ -20,11 +20,11 @@
       == #{t :from} #{link_to_if can?(:read, account), account.name, account_path(account)}
     %tt
       –
-      - user_name = opportunity.user_id == current_user.id ? t(:me) : opportunity.user.try(:full_name)
+      - user_name = opportunity.user.try(:full_name)
       - if user_name
-        = t(:added_by, :time_ago => time_ago_in_words(opportunity.created_at), :user => user_name)
+        = t(:added_by, :time_ago => timeago(opportunity.created_at), :user => h(user_name)).html_safe
       - else
-        = t(:added_ago, :value => time_ago_in_words(opportunity.created_at))
+        = t(:added_ago, :value => timeago(opportunity.created_at)).html_safe
 
     %dt
       %b= number_to_currency(opportunity.weighted_amount, :precision => 0) + " | "

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

@@ -1,8 +1,7 @@
-= simple_form_for(@opportunity, :html => one_submit_only(:opportunity), :remote => true) do |f|
+= simple_form_for(@opportunity, :html => one_submit_only, :remote => true) do |f|
   = link_to_close new_opportunity_path
   = f.hidden_field :user_id
   = hidden_field_tag "contact",  "#{@contact.id  if @contact}"
-  = hidden_field_tag "campaign", "#{@campaign.id if @campaign}"
 
   = f.error_messages :object_name => t('opportunity')
 

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

@@ -43,6 +43,10 @@
           %td
             .label.req #{t :assigned_to}:
             = user_select(:opportunity, all_users, current_user)
+        %tr
+          %td
+            .label #{t :campaign}:
+            = f.collection_select "campaign_id", Campaign.all, :id, :name, { :selected => (@campaign.try(:id) || 0), :include_blank => true }
 
         - if Setting.background_info && Setting.background_info.include?(:opportunity)
           %tr

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

@@ -0,0 +1,3 @@
+- @contacts = @opportunity.contacts.paginate(:page => params[:page], :per_page => 20)
+jQuery('#contacts').html('#{ j render(:partial => 'contacts/contact', :collection => @contacts) }');
+jQuery('#contacts_pagination').replaceWith('#{ j will_paginate(@contacts, :id => :contacts_pagination, :params => {:action => :contacts}) }');

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

@@ -0,0 +1,29 @@
+- entity_name = controller.controller_name.singularize.underscore
+- @entity = instance_variable_get("@#{entity_name}")
+- 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 });
+
+  - if called_from_index_page?
+    = refresh_sidebar(:index, :filters)
+    jQuery('#paginate').html('#{ j render(:partial => "shared/paginate_with_per_page") }');
+  - elsif called_from_landing_page?("accounts") # Opportunity created on Account landing page: refresh Account summary.
+    - @account.reload
+    = refresh_sidebar_for(:accounts, :show, :summary)
+  - elsif called_from_landing_page?("campaigns") # Opportunity created on Campaign landing page: refresh Campaign summary.
+    - @campaign.reload
+    = refresh_sidebar_for(:campaigns, :show, :summary)
+  - else # Opportunity created on Contact landing page: refresh recent items list.
+    jQuery('#recently').html('#{ j render(:partial => "shared/recently") }');
+  crm.flick('empty', 'remove');
+
+- else
+  jQuery('##{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();

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

@@ -0,0 +1,13 @@
+- entity_name = controller.controller_name.singularize.underscore
+- @entity = instance_variable_get("@#{entity_name}")
+
+jQuery('##{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") }');
+- elsif called_from_landing_page?("accounts")
+  = refresh_sidebar_for(:accounts, :show, :summary)
+- elsif called_from_landing_page?("campaigns")
+  = refresh_sidebar_for(:campaigns, :show, :summary)
+- else
+  jQuery('#recently').replaceWith('#{ j render(:partial => "shared/recently") }');

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

@@ -0,0 +1,35 @@
+- entity_name = controller.controller_name.singularize.underscore #account
+- @entity = instance_variable_get("@#{entity_name}")
+- id = dom_id(@entity)
+
+- if params[:cancel].true? # <--------------------- Hide [Edit]
+
+  - if called_from_landing_page?
+    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 ]) }');
+
+- else # <----------------------------------------- Show requested [Edit Opportunity] form.
+
+  - if params[:cancel].blank?                       # Called from opportunities list item...
+    - if @previous                                  # Hide open [Edit Opportunity] form if any.
+      - if @previous.is_a?(Opportunity)
+        jQuery('##{dom_id(@previous)}').replaceWith('#{ j render(:partial => entity_name, :collection => [ @previous ]) }');
+      - else
+        crm.flick('#{entity_name}_#{@previous}', 'remove');
+
+    -# Disable onMouseOver for the list item.
+    crm.highlight_off('#{id}');
+    -# Hide [Create] form if any.
+    crm.hide_form('create_#{entity_name}');
+    -# Show [Edit] form.
+    jQuery('##{id}').html('#{ j render(:partial => "edit") }');
+
+  - elsif params[:cancel].false?                    # Called from title of the opportunity landing page...
+    jQuery('#edit_#{entity_name}').html('#{ j render(:partial => "edit") }');
+    crm.flip_form('edit_#{entity_name}');
+    crm.set_title('edit_#{entity_name}', "#{t :edit} #{h @opportunity.name}");
+
+  crm.create_or_select_account(#{ request.referer =~ /\/accounts\// || @account.id.blank? });
+  jQuery('#new_#{entity_name} input[type!=hidden]').first().focus();

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

@@ -0,0 +1,11 @@
+- entities = controller.controller_name # accounts
+- @entities = instance_variable_get("@#{entities}")
+
+- if @entities.any?
+  jQuery('##{entities}').html('#{ j render(@entities) }');
+- else
+  jQuery('##{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)) }');

data/app/views/opportunities/index.xls.builder

@@ -3,7 +3,8 @@ xml.Worksheet 'ss:Name' => I18n.t(:tab_opportunities) do
     unless @opportunities.empty?
       # Header.
       xml.Row do
-        heads = [I18n.t('user'),
+        heads = [I18n.t('id'),
+                 I18n.t('user'),
                  I18n.t('campaign'),
                  I18n.t('assigned_to'),
                  I18n.t('account'),
@@ -18,12 +19,12 @@ xml.Worksheet 'ss:Name' => I18n.t(:tab_opportunities) do
                  I18n.t('option_closes_on'),
                  I18n.t('date_created'),
                  I18n.t('date_updated')]
-        
+
         # Append custom field labels to header
         Opportunity.fields.each do |field|
           heads << field.label
         end
-        
+
         heads.each do |head|
           xml.Cell do
             xml.Data head,
@@ -31,11 +32,12 @@ xml.Worksheet 'ss:Name' => I18n.t(:tab_opportunities) do
           end
         end
       end
-      
+
       # Opportunity rows.
       @opportunities.each do |opportunity|
         xml.Row do
-          data = [opportunity.user.try(:name),
+          data = [opportunity.id,
+                  opportunity.user.try(:name),
                   opportunity.campaign.try(:name),
                   opportunity.assignee.try(:name),
                   opportunity.account.try(:name),
@@ -50,12 +52,12 @@ xml.Worksheet 'ss:Name' => I18n.t(:tab_opportunities) do
                   opportunity.closes_on,
                   opportunity.created_at,
                   opportunity.updated_at]
-          
+
           # Append custom field values.
           Opportunity.fields.each do |field|
             data << opportunity.send(field.name)
           end
-          
+
           data.each do |value|
             xml.Cell do
               xml.Data value,