fat_free_crm 0.12.3 → 0.13.0

data/app/views/contacts/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/contacts/index.xls.builder

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

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

@@ -0,0 +1,13 @@
+- entity_name = controller.controller_name.singularize
+- 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) }');
+  -# this function call is the only difference to normal new.js.haml
+  crm.create_or_select_account(#{ request.referer =~ /\/accounts\// || @account.id.blank? });
+- else
+  crm.set_title('#{create_id}', '#{ j t(entity_name.pluralize) }');

data/app/views/contacts/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, :opportunities)

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

@@ -0,0 +1,22 @@
+- 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)
+    - else
+      jQuery('#recently').replaceWith('#{ j render(:partial => "shared/recently") }');
+- else
+  jQuery('##{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();

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

@@ -0,0 +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);

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

@@ -1,5 +1,5 @@
 - edit ||= false
-- model = entity.class.name.downcase
+- model = entity.class.name.underscore
 - collapsed = session[:entity_permissions].nil?
 = subtitle :entity_permissions, collapsed, t(:permissions)
 .section

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

@@ -0,0 +1,21 @@
+- partial = params[:assets].singularize
+
+- if @attached
+  - if partial == "task"
+    - if @attachment.completed?
+      - view = "completed"
+    - elsif @attachment.my?(current_user)
+      - view = "pending"
+    - else
+      - view = "assigned"
+    jQuery('#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 ]) }');
+    - 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 });

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

@@ -0,0 +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}) }');

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

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

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

@@ -0,0 +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}) }');

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

@@ -0,0 +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}) }');

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

@@ -0,0 +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}) }');

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

@@ -0,0 +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}) }')

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

@@ -0,0 +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}) %>')
+<% end %>

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

@@ -10,11 +10,11 @@
     –
     %tt
       = account.location << ", " unless account.location.blank?
-      - user_name = account.user_id == current_user.id ? t(:me) : account.user.try(:full_name)
+      - user_name = account.user.try(:full_name)
       - if user_name
-        = t(:added_by, :time_ago => time_ago_in_words(account.created_at), :user => user_name)
+        = t(:added_by, :time_ago => timeago(account.created_at), :user => h(user_name)).html_safe
       - else
-        = t(:added_ago, :value => time_ago_in_words(account.created_at))
+        = t(:added_ago, :value => timeago(account.created_at)).html_safe
 
     - unless current_user.preference[:accounts_index_view] == "accounts_index_brief"
       %dt

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

@@ -10,11 +10,11 @@
       == #{t :from} #{link_to(h(opportunity.account.name), account_path(opportunity.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
     - unless current_user.preference[:opportunities_index_view] == "opportunities_index_brief"
       %dt
         %b= number_to_currency(opportunity.weighted_amount, :precision => 0) + " | "

data/app/views/home/index.atom.builder

@@ -5,8 +5,8 @@ assets = controller.instance_variable_get("@#{items}")
 
 atom_feed do |feed|
   feed.title t(:activities)
-  feed.updated @activities.max { |a, b| a.updated_at <=> b.updated_at }.try(:updated_at)
-  feed.generator  "Fat Free CRM v#{FatFreeCRM::Version}"
+  feed.updated @activities.max { |a, b| a.created_at <=> b.created_at }.try(:created_at)
+  feed.generator  "Fat Free CRM v#{FatFreeCRM::VERSION::STRING}"
   feed.author do |author|
     author.name  @current_user.full_name
     author.email @current_user.email
@@ -17,7 +17,7 @@ atom_feed do |feed|
       entry.title activity_title(activity)
 
       entry.author do |author|
-        author.name activity.user.full_name
+        author.name activity.user.try(:full_name) || I18n.t('version.anonymous')
       end
     end
   end

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

@@ -0,0 +1,7 @@
+- unless @activities.blank?
+  jQuery('#activities').html('#{ j render(:partial => "activity", :collection => @activities) }');
+- else
+  jQuery('#activities').html('#{ j t(:no_activity_records) }');
+
+-# jQuery('#paginate').html('#{ j render(:partial => "shared/paginate") }');
+jQuery('#export').html('#{ j render(:partial => "shared/export") }');

data/app/views/home/index.rss.builder

@@ -2,14 +2,14 @@
 xml.instruct! :xml, :version => "1.0"
 xml.rss :version => "2.0" do
   xml.channel do
-    xml.generator  "Fat Free CRM v#{FatFreeCRM::Version}"
+    xml.generator  "Fat Free CRM v#{FatFreeCRM::VERSION::STRING}"
     xml.link       root_url
     xml.pubDate    Time.now.to_s(:rfc822)
     xml.title      t(:activities)
 
     @activities.each do |activity|
       xml.item do
-        xml.author      activity.user.full_name
+        xml.author      activity.user.try(:full_name)
         # xml.guid        activity.id
         # xml.link        nil
         xml.pubDate     activity.created_at.to_s(:rfc822)

data/app/views/home/options.js.haml

@@ -0,0 +1,7 @@
+crm.flip_form('options');
+
+- unless params[:cancel].true?
+  jQuery('#options').html('#{ j render(:partial => "options") }');
+  crm.set_title('title', '#{ j t(:recent_activity_options) }');
+- else
+  crm.set_title('title', '#{ j t(:recent_activity) }');

data/app/views/layouts/_footer.html.haml

@@ -1,10 +1,6 @@
 #footer
   Powered by #{link_to "Fat Free CRM", "http://www.fatfreecrm.com", :"data-popup" => true }
   v#{FatFreeCRM::VERSION::STRING} © 2008-#{Date.today.year} by Michael Dvorkin and contributors.
-  \|
-  = image_tag "iconset_attribution.png"
-  Icons from the 
-  = link_to 'Gentleface Mono Icon Set', "http://gentleface.com/free_icon_set.html"
 
   - unless tabless_layout?
     \|

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

@@ -9,4 +9,5 @@
   - rescue MissingTemplate
 
 = render "lists/sidebar"
+= render "lists/personal_sidebar"
 = render "shared/recently"

data/app/views/layouts/_tabbed.html.haml

@@ -3,10 +3,7 @@
     - tabs.each do |tab|
       %li
         = link_to(tab[:url], :class => tab[:active] ? "active" : nil) do
-          - unless request.fullpath.include?("/admin")
-            - img_base_path = "tab_icons/#{tab[:text].to_s.downcase.sub(/^tab_/, '')}"
-            - if Rails.application.assets.find_asset("#{img_base_path}.png")
-              = image_tag("#{img_base_path}#{tab[:active] ? "_active" : ""}.png")
+          %i.fa{class: tab[:icon]}
           = t(tab[:text])
 
 = show_flash

data/app/views/layouts/admin/application.html.haml

@@ -22,4 +22,3 @@
       = "crm.base_url = '#{Setting.base_url}';" unless Setting.base_url.blank?
       = get_browser_timezone_offset
       = yield :javascript_epilogue
-

data/app/views/layouts/application.html.haml

@@ -21,14 +21,12 @@
 
     :javascript
       crm.language = "#{I18n.locale}"
-      window.controller = "#{controller.controller_name}"
+      #{yield :javascript}
+      var _ffcrm_users = [
+      #{User.all.map{|u| "\"#{u.full_name} (@#{u.username})\"" }.join(",\n")}
+      ];
 
-    - if current_user.present?
-      :javascript
-        #{yield :javascript}
-        var _ffcrm_users = [
-        #{User.all.map{|u| "\"#{u.full_name} (@#{u.username})\"" }.join(",\n")}
-        ];
+      window.controller = "#{controller.controller_name}"
 
     <link rel="shortcut icon" href="/favicon.ico" type="image/x-icon">
     <link rel="icon" href="/favicon.ico" type="image/x-icon">

data/app/views/leads/_convert.html.haml

@@ -1,5 +1,5 @@
 .remote
-  = form_for(@lead, :url => promote_lead_path(@lead), :html => one_submit_only(:lead), :remote => true) do |f|
+  = form_for(@lead, :url => promote_lead_path(@lead), :html => one_submit_only, :remote => true) do |f|
     = link_to_close convert_lead_path(@lead)
     = fields_for(@account) do |a|
       = a.hidden_field :user_id

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

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

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

@@ -53,8 +53,8 @@
           == #{t :mobile_small}:
           %b= lead.mobile
           |
-      = t(:added_ago, time_ago_in_words(lead.created_at))
-    
+      = t(:added_ago, value: timeago(lead.created_at)).html_safe
+
     - if lead.tag_list.present?
       %dt
         .tags= tags_for_index(lead)

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

@@ -1,4 +1,4 @@
-= simple_form_for(@lead, :html => one_submit_only(:lead), :remote => true) do |f|
+= simple_form_for(@lead, :html => one_submit_only, :remote => true) do |f|
   = link_to_close new_lead_path
   = f.hidden_field :user_id
   = hidden_field_tag "campaign", "#{@campaign.id if @campaign}"

data/app/views/leads/convert.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('convert_#{entity_name}');
+    crm.set_title('convert_#{entity_name}', '#{h @entity.full_name}');
+  - else                                            # Called from index page...
+    jQuery('##{id}').replaceWith('#{ j render(:partial => entity_name, :collection => [ @entity ]) }');
+
+- else # <----------------------------------------  Show [Edit] form.
+
+  - if params[:cancel].blank?                       # Called from index page...
+    - if @previous                                  # Hide open [Edit] form if any.
+      - if @previous.is_a?(@entity.class)
+        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 => "convert") }');
+
+  - elsif params[:cancel].false?                    # Called from title of the lead landing page...
+    jQuery('#convert_#{entity_name}').html('#{ j render(:partial => "convert") }');
+    crm.hide_form('edit_lead');
+    crm.flip_form('convert_#{entity_name}');
+    crm.set_title('convert_#{entity_name}', "#{t :convert} #{h @entity.full_name}");
+
+  crm.create_or_select_account(#{ request.referer =~ /\/accounts\// || @account.id.blank? });
+  jQuery('#new_#{entity_name} input[type!=hidden]').first().focus();

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

@@ -0,0 +1,21 @@
+- entity_name = controller.controller_name.singularize.underscore #account
+- @entity = instance_variable_get("@#{entity_name}")
+- create_id = "create_#{entity_name}" # create_account
+
+- 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?("campaigns")
+    - @campaign.reload
+    = refresh_sidebar_for(:campaigns, :show, :summary)
+  crm.flick('empty', 'remove');
+- else
+  jQuery('##{create_id}').html('#{ j render(:partial => "new") }');
+  jQuery('##{create_id}').effect("shake", { duration:250, distance: 6 });
+  jQuery('#new_#{entity_name} input[type!=hidden]').first().focus();

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

@@ -0,0 +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);
+- if called_from_index_page?
+  = refresh_sidebar(:index, :filters)
+  jQuery('#paginate').replaceWith('#{ j render(:partial => "shared/paginate_with_per_page") }');
+- elsif called_from_landing_page?("campaigns")
+  = refresh_sidebar_for(:campaigns, :show, :summary)

data/app/views/leads/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.full_name}');
+  - else                                            # Called from index page...
+    jQuery('##{id}').replaceWith('#{ j render(:partial => entity_name, :collection => [ @entity ]) }');
+
+- else # <----------------------------------------  Show [Edit] form.
+
+  - if params[:cancel].blank?                       # Called from index page...
+    - if @previous                                  # Hide open [Edit] form if any.
+      - if @previous.is_a?(@entity.class)
+        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 landing page...
+    jQuery('#edit_#{entity_name}').html('#{ j render(:partial => "edit") }');
+    - unless %w(converted rejected).include? @entity.status
+      crm.hide_form('convert_lead');
+    crm.flip_form('edit_#{entity_name}');
+    crm.set_title('edit_#{entity_name}', "#{t :edit} #{h @entity.full_name}");
+
+  jQuery('#new_#{entity_name} input[type!=hidden]').first().focus();