fat_free_crm 0.11.3 → 0.11.4

data/app/views/layouts/header.xls.builder

@@ -0,0 +1,8 @@
+xml.instruct!
+xml.Workbook 'xmlns:x'    => 'urn:schemas-microsoft-com:office:excel',
+             'xmlns:ss'   => 'urn:schemas-microsoft-com:office:spreadsheet',
+             'xmlns:html' => 'http://www.w3.org/TR/REC-html40',
+             'xmlns'      => 'urn:schemas-microsoft-com:office:spreadsheet',
+             'xmlns:o'    => 'urn:schemas-microsoft-com:office:office' do
+  xml << yield
+end

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

@@ -13,8 +13,7 @@
         %td= spacer
         %td
           .label.top #{t :company}:
-          = f.text_field :company
-          = autocomplete_text_field 'lead_company', Account.order(:name).map(&:name)
+          = f.autocomplete_field :company, autocomplete_account_name_leads_path
       %tr
         %td
           .label #{t :alt_email}:

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

@@ -26,11 +26,10 @@
             %td= spacer
             %td
               .label.req #{t :assigned_to}:
-              = user_select(:account)
+              = user_select(:account, all_users, current_user)
     = render "leads/opportunity"
     = render "leads/convert_permissions"
     .buttonbar
       = f.submit t(:convert_lead)
       #{t :or}
       = link_to_cancel convert_lead_path(@lead)
-

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

@@ -6,21 +6,31 @@
   #lead_convert_permissions{ hidden_if(collapsed) }
     .radio_box
       = radio_button_tag "access", "Lead", true, :onclick => "$('people').hide(); $('account_access').value = $('opportunity_access').value = 'Lead'"
-      = label :access, :lead, t(:copy_permissions, t(:lead_small)), :style => "cursor:pointer"
+      = label :access, :Lead, t(:copy_permissions, t(:lead_small)), :style => "cursor:pointer"
     .radio_box
       = radio_button_tag "access", "Private", false, :onclick => "$('people').hide(); $('account_access').value = $('opportunity_access').value = 'Private'"
-      = label :access, :private, t(:keep_private), :style => "cursor:pointer"
+      = label :access, :Private, t(:keep_private), :style => "cursor:pointer"
     .radio_box
       = radio_button_tag "access", "Public", false, :onclick => "$('people').hide(); $('account_access').value = $('opportunity_access').value = 'Public'"
-      = label :access, :public, t(:make_public), :style => "cursor:pointer"
+      = label :access, :Public, t(:make_public), :style => "cursor:pointer"
     .radio_box
       = radio_button_tag "access", "Shared", false, :onclick => "$('people').show(); $('account_access').value = $('opportunity_access').value = 'Shared'"
-      = label :access, :shared, t(:share_with), :style => "cursor:pointer"
+      = label :access, :Shared, t(:share_with), :style => "cursor:pointer"
 
-    #people{ hidden }
-      %div{ :style => "padding: 6px 0px 0px 20px" }
-        - for user in @users
-          .check_box
-            -# Preserve state of the checkboxes if the form gets redrawn on errors.
-            = check_box_tag "users[]", user.id, params[:users] && params[:users].include?(user.id.to_s), :id => "user_#{user.id}", :id => "user_#{user.id}"
-            = label_tag "user_#{user.id}", h(user.full_name), :style => "cursor:pointer"
+    #people{ hidden_if(@lead.access != "Shared") }
+      %table
+        %tr
+          %td
+            = label_tag :lead_user_ids, "#{t(:users)}:"
+            %br
+            = select :lead, :user_ids, user_options, {}, :multiple => true
+            :javascript
+              new Chosen($('lead_user_ids'));
+
+        %tr
+          %td
+            = label_tag :lead_group_ids, "#{t(:groups)}:"
+            %br
+            = select :lead, :group_ids, group_options, {}, :multiple => true
+            :javascript
+              new Chosen($('lead_group_ids'));

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

@@ -6,11 +6,12 @@
     = f.error_messages :object_name => t('lead')
 
     = render "leads/top_section",    :f => f, :edit => true
+    = render "fields/edit_custom_field_group", :f => f, :edit => true
     = render "leads/status",         :f => f, :edit => true
     = render "leads/contact",        :f => f, :edit => true
     = render "leads/web",            :f => f, :edit => true
-    = render "fields/groups", :f => f, :edit => true
-    = render "leads/permissions",    :f => f, :edit => true
+    = render "fields/groups",        :f => f, :edit => true
+    = render "entities/permissions", :f => f, :edit => true, :entity => @lead
 
     .buttonbar
       - if Setting.compound_address

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

@@ -0,0 +1,41 @@
+%li.highlight[lead]
+  - if lead.status
+    .strip{:class => lead.status}= t lead.status
+  - else
+    .strip{:style => "color: gray;"}= t :other
+
+  %ul.tools
+    - if can?(:update, lead)
+      %li= link_to_edit(lead)
+
+    - if %w(converted rejected).include?(lead.status)
+      %li
+        %font{ :color => 'silver' }= t :convert
+    - elsif can?(:update, lead)
+      %li= link_to_convert(lead)
+
+    - if lead.status == "rejected"
+      %li
+        %font{ :color => 'silver' }= t :reject
+    - elsif can?(:update, lead)
+      %li= link_to_reject(lead)
+
+    - if shown_on_landing_page?
+      %li= link_to_discard(lead)
+
+    - if can?(:destroy, lead)
+      %li= link_to_delete(lead)
+
+  .indent
+    = link_to_if can?(:read, lead), lead.full_name(current_user.preference[:leads_naming]), lead
+    %tt
+      - if lead.company? && lead.title?
+        = t(:works_at, :job_title => lead.title, :company => lead.company)
+      - else
+        = lead.company if lead.company?
+        = lead.title if lead.title?
+      - if lead.referred_by?
+        –
+        == #{t :referred_by_small} #{lead.referred_by}
+
+    = hook(:lead_bottom, self, :lead => lead)

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

@@ -0,0 +1,62 @@
+%li.highlight[lead]
+  - if lead.status
+    .strip{:class => lead.status}= t lead.status
+  - else
+    .strip{:style => "color: gray;"}= t :other
+
+  %ul.tools
+    - if can?(:update, lead)
+      %li= link_to_edit(lead)
+
+    - if %w(converted rejected).include?(lead.status)
+      %li
+        %font{ :color => 'silver' }= t :convert
+    - elsif can?(:update, lead)
+      %li= link_to_convert(lead)
+
+    - if lead.status == "rejected"
+      %li
+        %font{ :color => 'silver' }= t :reject
+    - elsif can?(:update, lead)
+      %li= link_to_reject(lead)
+
+    - if shown_on_landing_page?
+      %li= link_to_discard(lead)
+
+    - if can?(:destroy, lead)
+      %li= link_to_delete(lead)
+
+  .indent
+    = link_to_if can?(:read, lead), lead.full_name(current_user.preference[:leads_naming]), lead
+    %tt
+      - if lead.company? && lead.title?
+        = t(:works_at, :job_title => lead.title, :company => lead.company)
+      - else
+        = lead.company if lead.company?
+        = lead.title if lead.title?
+      - if lead.referred_by?
+        –
+        == #{t :referred_by_small} #{lead.referred_by}
+
+    %dt
+      = stars_for(lead)
+      |
+      - if can?(:read, lead)
+        - if lead.email.present?
+          = link_to_email(lead.email)
+          |
+        - if lead.phone.present?
+          == #{t :phone_small}:
+          %b= lead.phone
+          |
+        - if lead.mobile.present?
+          == #{t :mobile_small}:
+          %b= lead.mobile
+          |
+      = t(:added_ago, time_ago_in_words(lead.created_at))
+    
+    - if lead.tag_list.present?
+      %dt
+        .tags= tags_for_index(lead)
+
+    = hook(:lead_bottom, self, :lead => lead)

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

@@ -1,62 +1,5 @@
-%li.highlight[lead]
-  - if lead.status
-    .strip{:class => lead.status}= t lead.status
-  - else
-    .strip{:style => "color: gray;"}= t :other
-
-  %ul.tools
-    - if can?(:update, lead)
-      %li= link_to_edit(lead)
-
-    - if %w(converted rejected).include?(lead.status)
-      %li
-        %font{ :color => 'silver' }= t :convert
-    - elsif can?(:update, lead)
-      %li= link_to_convert(lead)
-
-    - if lead.status == "rejected"
-      %li
-        %font{ :color => 'silver' }= t :reject
-    - elsif can?(:update, lead)
-      %li= link_to_reject(lead)
-
-    - if shown_on_landing_page?
-      %li= link_to_discard(lead)
-
-    - if can?(:destroy, lead)
-      %li= link_to_delete(lead)
-
-  .indent
-    = link_to_if can?(:read, lead), lead.full_name(@current_user.preference[:leads_naming]), lead
-    %tt
-      - if lead.company? && lead.title?
-        = t(:works_at, :job_title => lead.title, :company => lead.company)
-      - else
-        = lead.company if lead.company?
-        = lead.title if lead.title?
-      - if lead.referred_by?
-        –
-        == #{t :referred_by_small} #{lead.referred_by}
-
-    - unless @current_user.preference[:leads_outline] == "brief"
-      %dt
-        = stars_for(lead)
-        |
-        - if can?(:read, lead)
-          - if lead.email.present?
-            = link_to_email(lead.email)
-            |
-          - if lead.phone.present?
-            == #{t :phone_small}:
-            %b= lead.phone
-            |
-          - if lead.mobile.present?
-            == #{t :mobile_small}:
-            %b= lead.mobile
-            |
-        = t(:added_ago, time_ago_in_words(lead.created_at))
-      - if lead.tag_list.present?
-        %dt
-          .tags= tags_for_index(lead)
-
-      = hook(:lead_bottom, self, :lead => lead)
+- if (params['controller'] == 'leads') and (template = template_for_current_view).present?
+  = render(template, :lead => lead)
+- else
+  -# default view
+  = render 'leads/index_brief', :lead => lead

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

@@ -6,11 +6,13 @@
   = f.error_messages :object_name => t('lead')
 
   = render "leads/top_section",    :f => f
+  = render "fields/edit_custom_field_group", :f => f
   = render "leads/status",         :f => f
   = render "leads/contact",        :f => f
+  = render "shared/add_comment",   :f => f
   = render "leads/web",            :f => f
-  = render "fields/groups", :f => f
-  = render "leads/permissions",    :f => f
+  = render "fields/groups",        :f => f
+  = render "entities/permissions", :f => f, :entity => @lead
 
   .buttonbar
     - if Setting.compound_address

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

@@ -22,7 +22,7 @@
       %tr
         %td
           .label #{t :close_date}:
-          = o.text_field :closes_on, :style => "width:110px;", :autocomplete => :off
+          = o.text_field :closes_on, :style => "width:110px;", :autocomplete => :off, :class => 'date'
         %td= spacer
         %td
           .label #{t :probability} (%):

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

@@ -1,16 +1,16 @@
 .filters#filters
-  = render "shared/search"
+  .caption= t :lead_statuses
   - Setting.lead_status.each do |key|
     .check_box{:style => "border-bottom: 1px silver dotted;"}
       %div{:style => "float:right;"}
         = @lead_status_total[key]
-      = lead_status_checbox(key, @lead_status_total[key])
+      = lead_status_checkbox(key, @lead_status_total[key])
       = label_tag(key, t(key))
 
   .check_box{:style => "border-bottom: 1px silver dotted;"}
     %div{:style => "float:right;"}
       = @lead_status_total[:other]
-    = lead_status_checbox("other", @lead_status_total[:other])
+    = lead_status_checkbox("other", @lead_status_total[:other])
     = label_tag(:other, t(:other))
 
   .check_box

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

@@ -1,5 +1,5 @@
 .panel#summary
-  %span{:style => "float:right"}= gravatar_for(@lead, :size => "50x50")
+  %span{:style => "float:right"}= avatar_for(@lead, :size => "50x50")
   %h4= h(@lead.full_name)
   - if !@lead.title.blank? && !@lead.company.blank?
     -# works_at: "{{job_title}} at {{company}}"
@@ -35,9 +35,9 @@
     %dt= @lead.referred_by ? truncate(@lead.referred_by, :length => 16) : t(:n_a)
     %tt #{t :referred_by}:
   %li
-    %dt= truncate((@lead.assigned_to ? @lead.assignee.full_name : @lead.user.full_name), :length => 16)
+    %dt= @lead.assigned_to ? truncate(@lead.assignee.full_name, :length => 16) : nil
     %tt #{t :assigned_to}:
-  %li.last
+  %li
     %dt
       - if @lead.campaign
         = link_to(truncate(@lead.campaign.name, :length => 16), @lead.campaign, :title => @lead.campaign.name)

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

@@ -10,7 +10,7 @@
       %tr
         %td
           .label.top #{t :assigned_to}:
-          = user_select(:lead)
+          = user_select(:lead, all_users, current_user)
         %td= spacer
         %td
           .label.top #{t :status}:

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

@@ -0,0 +1,16 @@
+#confirm{ hidden }
+.title_tools#menu
+  - unless %w(converted rejected).include?(@lead.status)
+    = link_to_inline(:convert_lead, convert_lead_path(@lead), :text => t(:convert)) + " | "
+  = link_to_inline(:edit_lead, edit_lead_path(@lead), :text => t(:edit)) + " | "
+  - if @lead.status != "rejected"
+    = link_to_function(t(:reject) + '?', confirm_reject(@lead)) + " | "
+  = link_to_function(t(:delete) + '?', confirm_delete(@lead))
+.title_tools#buttons
+  = view_buttons
+.title#title
+  = h(@lead.full_name)
+  = image_tag("loading.gif", :size => :thumb, :id => "loading", :style => "display: none;")
+
+%div#convert_lead{ hidden }
+%div#edit_lead{ hidden }

data/app/views/leads/convert.js.rjs

@@ -31,7 +31,6 @@ else # <----------------------------------------  Show [Convert Lead] form.
   end
 
   page.call "crm.create_or_select_account", request.referer =~ /\/accounts\// || @account.id.blank?
-  page.call "crm.date_select_popup", "opportunity_closes_on"
   page[:account_name].focus
 
   hook(:convert_lead_rjs, self, :page => page)

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

@@ -6,7 +6,7 @@ if @lead.valid?
   page[dom_id(@lead)].visual_effect :highlight, :duration => 1.5
   if called_from_index_page?
     page << refresh_sidebar(:index, :filters)
-    page[:paginate].replace_html :partial => "shared/paginate"
+    page[:paginate].replace_html :partial => "shared/paginate_with_per_page"
   elsif called_from_landing_page?("campaigns")
     @campaign.reload
     page << refresh_sidebar_for(:campaigns, :show, :summary)
@@ -14,7 +14,6 @@ if @lead.valid?
   page.call "crm.flick", :empty, :remove
 else
   page[:create_lead].replace_html :partial => "new"
-  page.call "crm.init_chosen_fields"
   page[:create_lead].visual_effect :shake, :duration => 0.25, :distance => 6
   page[:lead_first_name].focus
 end

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

@@ -1,7 +1,7 @@
 page[dom_id(@lead)].visual_effect :blind_up, :duration => 0.25
 if called_from_index_page?
   page << refresh_sidebar(:index, :filters)
-  page[:paginate].replace_html :partial => "shared/paginate"
+  page[:paginate].replace_html :partial => "shared/paginate_with_per_page"
 elsif called_from_landing_page?("campaigns")
   page << refresh_sidebar_for(:campaigns, :show, :summary)
 end

data/app/views/leads/edit.js.rjs

@@ -22,11 +22,9 @@ else # <----------------------------------------  Show [Edit Campaign] form.
     page.call "crm.highlight_off", id             # Disable onMouseOver for the list item.
     page.call "crm.hide_form", :create_lead       # Hide [Create Lead] form if any.
     page[id].replace_html :partial => "edit"      # Show [Edit Lead] form.
-    page.call "crm.init_chosen_fields"
 
   elsif params[:cancel].false?                    # Called from title of the lead landing page...
     page[:edit_lead].replace_html :partial => "edit"
-    page.call "crm.init_chosen_fields"
     unless %w(converted rejected).include? @lead.status
       page.call "crm.hide_form", :convert_lead
     end

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

@@ -1,25 +1,18 @@
 = styles_for :lead
 
-.title_tools
-  = link_to_inline(:create_lead, new_lead_path, :text => t(:create_lead)) << " | "
-  - if Setting.advanced_search_enabled
-    = link_to_inline(:advanced_search, advanced_search_leads_path, :text => t(:advanced_search)) << " | "
-  = link_to_inline(:options, options_leads_path, :text => t(:options))
+= render 'entities/title_bar'
 
-.title
-  %span#create_lead_title #{t :leads}
-  = image_tag("loading.gif", :size => :thumb, :id => "loading", :style => "display: none;")
-.remote#options{ hidden }
-.remote#advanced_search{ hidden_if(!params[:q]) }
-  - if params[:q]
-    = render :partial => "advanced_search"
 .remote#create_lead{ hidden }
 
+= render 'search'
+
+.remote#options{ hidden }
+
 .list#leads
   - if @leads.any?
     = render @leads
   - else
     = render "shared/empty"
 
-#paginate= render "shared/paginate"
+#paginate= render "shared/paginate_with_per_page"
 #export= render "shared/export"