fat_free_crm 0.11.3 → 0.11.4

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

@@ -22,17 +22,13 @@ else # <----------------------------------------  Show [Edit Campaign] form.
     page.call "crm.highlight_off", id             # Disable onMouseOver for the list item.
     page.call "crm.hide_form", :create_campaign   # Hide [Create Campaign] form if any.
     page[id].replace_html :partial => "edit"      # Show [Edit Campaign] form.
-    page.call "crm.init_chosen_fields"
 
   elsif params[:cancel].false?                    # Called from title of the campaign landing page...
     page[:edit_campaign].replace_html :partial => "edit"
-    page.call "crm.init_chosen_fields"
     page.call "crm.flip_form", :edit_campaign
     page.call "crm.set_title", :edit_campaign, "#{t :edit} #{@campaign.name}"
   end
 
-  page.call "crm.date_select_popup", :campaign_starts_on
-  page.call "crm.date_select_popup", :campaign_ends_on
   page[:campaign_name].focus
 
 end

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

@@ -1,25 +1,18 @@
 = styles_for :campaign
 
-.title_tools
-  = link_to_inline(:create_campaign, new_campaign_path, :text => t(:create_campaign)) << " | "
-  - if Setting.advanced_search_enabled
-    = link_to_inline(:advanced_search, advanced_search_campaigns_path, :text => t(:advanced_search)) << " | "
-  = link_to_inline(:options, options_campaigns_path, :text => t(:options))
+= render 'entities/title_bar'
 
-.title
-  %span#create_campaign_title #{t :campaigns}
-  = 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_campaign{ hidden }
 
+= render 'search'
+
+.remote#options{ hidden }
+
 .list#campaigns
   - if @campaigns.any?
     = render @campaigns
   - else
     = render "shared/empty"
 
-#paginate= render "shared/paginate"
+#paginate= render "shared/paginate_with_per_page"
 #export= render "shared/export"

data/app/views/campaigns/index.js.rjs

@@ -3,4 +3,6 @@ if @campaigns.any?
 else
   page[:campaigns].replace_html :partial => "shared/empty"
 end
-page[:paginate].replace_html :partial => "shared/paginate"
+page[:paginate].replace_html :partial => "shared/paginate_with_per_page"
+page[:export].replace_html :partial => "shared/export"
+page[:search_results_count].replace_html :text => t('search_results_count', :count => @search_results_count)

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

@@ -0,0 +1,75 @@
+xml.Worksheet 'ss:Name' => I18n.t(:tab_campaigns) do
+  xml.Table do
+    unless @campaigns.empty?
+      # Header.
+      xml.Row do
+        heads = [I18n.t('user'),
+                 I18n.t('assigned_to'),
+                 I18n.t('name'),
+                 I18n.t('access'),
+                 I18n.t('status'),
+                 I18n.t('budget'),
+                 I18n.t('option_target_leads'),
+                 I18n.t('target_conversion'),
+                 I18n.t('option_target_revenue'),
+                 I18n.t('number_of_leads'),
+                 I18n.t('total_opportunities'),
+                 I18n.t('revenue'),
+                 I18n.t('option_starts_on'),
+                 I18n.t('option_ends_on'),
+                 I18n.t('objectives'),
+                 I18n.t('background_info'),
+                 I18n.t('date_created'),
+                 I18n.t('date_updated')]
+        
+        # Append custom field labels to header
+        Campaign.fields.each do |field|
+          heads << field.label
+        end
+        
+        heads.each do |head|
+          xml.Cell do
+            xml.Data head,
+                     'ss:Type' => 'String'
+          end
+        end
+      end
+      
+      # Campaign rows.
+      @campaigns.each do |campaign|
+        xml.Row do
+          data    = [campaign.user.try(:name),
+                     campaign.assignee.try(:name),
+                     campaign.name,
+                     campaign.access,
+                     campaign.status,
+                     campaign.budget,
+                     campaign.target_leads,
+                     campaign.target_conversion,
+                     campaign.target_revenue,
+                     campaign.leads_count,
+                     campaign.opportunities_count,
+                     campaign.revenue,
+                     campaign.starts_on,
+                     campaign.ends_on,
+                     campaign.objectives,
+                     campaign.background_info,
+                     campaign.created_at,
+                     campaign.updated_at]
+          
+          # Append custom field values.
+          Campaign.fields.each do |field|
+            data << campaign.send(field.name)
+          end
+          
+          data.each do |value|
+            xml.Cell do
+              xml.Data value,
+                       'ss:Type' => "#{value.respond_to?(:abs) ? 'Number' : 'String'}"
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/app/views/campaigns/new.js.rjs

@@ -1,13 +1,9 @@
 page.call "crm.flick", :empty, :toggle
-page.call "crm.hide_form", :options if called_from_index_page?
 page.call "crm.flip_form", :create_campaign
 
 unless params[:cancel].true?
   page[:create_campaign].replace_html :partial => "new"
-  page.call "crm.init_chosen_fields"
   page.call "crm.set_title", :create_campaign, t(:create_campaign)
-  page.call "crm.date_select_popup", :campaign_starts_on
-  page.call "crm.date_select_popup", :campaign_ends_on
 else
   page.call "crm.set_title", :create_campaign, t(:campaigns)
 end

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

@@ -1,24 +1,26 @@
-= styles_for :task, :lead, :opportunity
+- if (template = template_for_current_view)
+  = render(template, :campaign => @campaign)
+- else
 
-#confirm{ hidden }
-.title_tools#menu
-  = link_to_inline(:edit_campaign, edit_campaign_path(@campaign), :text => t(:edit)) + " | "
-  = link_to_function(t(:delete) + '?', confirm_delete(@campaign))
-.title#edit_campaign_title= h(@campaign.name)
+  -# default view
 
-%div#edit_campaign{ hidden }
+  = styles_for :task, :lead, :opportunity
 
-= render "comments/new", :commentable => @campaign
-= render :partial => "shared/timeline", :collection => @timeline
+  = render 'campaigns/title_bar', :campaign => @campaign
 
-= hook(:show_campaign_bottom, self) do
+  = render "comments/new", :commentable => @campaign
+  = render :partial => "shared/timeline", :collection => @timeline
 
-  = render :partial => "tasks/tasks", :locals => {:object => @campaign}
+  = hook(:show_campaign_bottom, self) do
 
-  = render :partial => "leads/leads", :locals => {:object => @campaign}
+    = render "tasks/tasks", :object => @campaign
 
-  = render :partial => "opportunities/opportunities", :locals => {:object => @campaign}
+    = render "leads/leads", :object => @campaign
 
-  = render :partial => "versions/versions", :locals => {:object => @campaign}
+    = render "opportunities/opportunities", :object => @campaign
 
-  = load_select_popups_for(@campaign, :tasks, :leads, :opportunities)
+    = render "versions/versions", :object => @campaign
+
+    = load_select_popups_for(@campaign, :tasks, :leads, :opportunities)
+
+  #export= render "shared/export", :action => :show

data/app/views/campaigns/show.js.erb

@@ -0,0 +1,2 @@
+jQuery('#main').html('<%= j (render :template => "campaigns/show.html", :campaign => @campaign) %>')
+<%= raw generate_js_for_popups(@campaign, :tasks, :leads, :opportunities) %>

data/app/views/campaigns/update.js.rjs

@@ -12,8 +12,6 @@ if @campaign.errors.empty?
   end
 else
   page[id].replace_html :partial => "edit"
-  page.call "crm.date_select_popup", :campaign_starts_on
-  page.call "crm.date_select_popup", :campaign_ends_on
   page[id].visual_effect :shake, :duration => 0.25, :distance => 6
   if @campaign.errors[:name].blank? and @campaign.errors[:ends_on].present?
     page[:campaign_ends_on].focus

data/app/views/comments/_comment.html.haml

@@ -1,5 +1,5 @@
-- truncated = simple_format h(truncate(comment.comment.gsub("\n", " "), :length => 125))
-- formatted = defined?(RedCloth) ? RedCloth.new(h(comment.comment)).to_html.html_safe : simple_format(h(comment.comment)).html_safe
+- truncated = simple_format(truncate(comment.comment.gsub("\n", " "), :length => 125))
+- formatted = defined?(RedCloth) ? RedCloth.new(comment.comment).to_html : simple_format(comment.comment)
 - collapsable = formatted.size > 150
 - commentable = comment.commentable
 
@@ -16,13 +16,14 @@
     %tt
       added note #{t(:time_ago, distance_of_time_in_words(Time.now, comment.created_at))}
       - if collapsable && can?(:read, commentable)
-        = " | ".html_safe + link_to_function(comment.collapsed? ? t(:more) : t(:less), "crm.flip_note_or_email(this, '#{t(:more)}', '#{t(:less)}')", :class => "toggle")
+        = " | "
+        = link_to_function(comment.collapsed? ? t(:more) : t(:less), "crm.flip_note_or_email(this, '#{t(:more)}', '#{t(:less)}')", :class => "toggle")
 
     - if can?(:read, commentable)
       - if collapsable
         %dt{ hidden_if(comment.expanded?), :id => dom_id(comment, :truncated) }
           = truncated
         %dt.textile{ hidden_if(comment.collapsed?), :id => dom_id(comment, :formatted) }
-          = auto_link(formatted).html_safe
+          = sanitize auto_link(formatted)
       - else
-        %dt.textile= auto_link(formatted).html_safe
+        %dt.textile= sanitize auto_link(formatted)

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

@@ -1,12 +1,12 @@
-- class_name = commentable.class.name.downcase
+- class_name = commentable.class.name.underscore
 .comment{:style => "margin: 5px 0px 0px 0px"}
-  = link_to avatar_for(@current_user, :size => :small), user_path(@current_user)
+  = link_to avatar_for(current_user, :size => :small), user_path(current_user)
   = form_for(@comment, :remote => true) do |f|
-    = hidden_field_tag "comment[user_id]", @comment.user_id || @current_user.id
+    = hidden_field_tag "comment[user_id]", @comment.user_id || current_user.id
     = hidden_field_tag "comment[commentable_id]", commentable.id
-    = hidden_field_tag "comment[commentable_type]", class_name.capitalize
+    = hidden_field_tag "comment[commentable_type]", class_name.classify
     = f.text_area :comment, :id => dom_id(@comment, :text)
     %div{:style => "padding:6px 0px 0px 40px;"}
       = f.submit t(:save_note)
       #{t :or}
-      = link_to(t(:cancel), edit_comment_path("#{class_name}_id" => commentable) + '?cancel=true', :remote => true)
+      = link_to(t(:cancel), edit_comment_path("#{class_name}_id" => commentable, :cancel => true), :remote => true)

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

@@ -1,7 +1,8 @@
-- class_name = commentable.class.name.downcase
+- class_name = commentable.class.name.underscore
 - id_prefix = "#{class_name}_#{commentable.id}"
+- @comment = @comment || Comment.new
 .comment.highlight.new_comment{ :id => "#{id_prefix}_comment_new" }
-  - subscribed_users = commentable.subscribed_users.map{|uid| User.find_by_id(uid) unless uid == @current_user.id }.compact
+  - subscribed_users = commentable.subscribed_users.map{|uid| User.find_by_id(uid) unless uid == current_user.id }.compact
   - if notification_emails_configured? && subscribed_users.any?
     = t(:following_users_will_be_notified) << ":"
     = subscribed_user_links(subscribed_users)
@@ -11,16 +12,16 @@
   = hidden_field_tag :shown_notes, "#{commentable.comment_ids.join(',')}", :id => "#{id_prefix}_shown_notes"
   = hidden_field_tag :shown_emails, "#{commentable.email_ids.join(',')}", :id => "#{id_prefix}_shown_emails"
 
-  = link_to avatar_for(@current_user, :size => :small), user_path(@current_user)
+  = link_to avatar_for(current_user, :size => :small), user_path(current_user)
   .tools
     = link_to_function(t(:expand_all), "crm.flip_notes_and_emails('#{t(:expanded)}', '#{t(:more)}', '#{t(:less)}', '#{id_prefix}')") << " | "
     = link_to_function(t(:collapse_all), "crm.flip_notes_and_emails('#{t(:collapsed)}', '#{t(:more)}', '#{t(:less)}', '#{id_prefix}')")
 
   %div{ {:id => "#{id_prefix}_post"}.merge(hidden_if(true))}
     = form_for(@comment, :remote => true, :html => {:id => "#{id_prefix}_new_comment"}) do |f|
-      = hidden_field_tag "comment[user_id]", @current_user.id, :id => "#{id_prefix}_comment_user_id"
+      = hidden_field_tag "comment[user_id]", current_user.id, :id => "#{id_prefix}_comment_user_id"
       = hidden_field_tag "comment[commentable_id]", commentable.id, :id => "#{id_prefix}_comment_commentable_id"
-      = hidden_field_tag "comment[commentable_type]", class_name.capitalize, :id => "#{id_prefix}_comment_commentable_type"
+      = hidden_field_tag "comment[commentable_type]", class_name.classify, :id => "#{id_prefix}_comment_commentable_type"
       = f.text_area :comment, :id => "#{id_prefix}_comment_comment"
       %div{:style => "padding:6px 0px 0px 40px;"}
         = f.submit t(:add_note), :id => "#{id_prefix}_comment_submit"

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

@@ -1,4 +1,4 @@
-class_name = @comment.commentable.class.name.downcase
+class_name = @comment.commentable.class.name.underscore
 id_prefix = "#{class_name}_#{@comment.commentable.id}"
 
 if @comment.valid?

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

@@ -1,52 +1,5 @@
-- gravatar_size = @current_user.preference[:contacts_outline] == "brief" ? "16x16" : "30x30"
-
-%li.highlight[contact]
-  = gravatar_for(contact, :size => gravatar_size)
-
-  %ul.tools
-    = hook(:contact_tools_before, self, :contact => contact)
-
-    - if can?(:update, contact)
-      %li= link_to_edit(contact)
-
-    - if shown_on_landing_page?
-      %li= link_to_discard(contact)
-
-    - if can?(:destroy, contact)
-      %li= link_to_delete(contact)
-
-  .indentslim
-    = link_to_if can?(:read, contact), contact.full_name(@current_user.preference[:contacts_naming]), contact
-    %tt
-      - if contact.title? && contact.department?
-        == #{contact.title}, #{contact.department}
-      - else
-        = contact.title if contact.title?
-
-      - if (account = contact.account) and account.name?
-        == #{t :at} #{link_to_if can?(:read, account), account.name, account_path(account)}
-
-      - if (lead = contact.lead) and lead.referred_by?
-        –
-        == #{t :referred_by_small} #{lead.referred_by}
-
-    - unless @current_user.preference[:contacts_outline] == "brief"
-      %dt{ :style => "padding: 2px 0px 0px 0px" }
-        - if can?(:read, contact)
-          - if contact.email.present?
-            = link_to_email(contact.email)
-            |
-          - if contact.phone.present?
-            == #{t :phone_small}:
-            %b= contact.phone
-            |
-          - if contact.mobile.present?
-            == #{t :mobile_small}:
-            %b= contact.mobile
-            |
-        = t(:added_ago, time_ago_in_words(contact.created_at))
-      - if contact.tag_list.present?
-        %dt
-          .tags= tags_for_index(contact)
-
-      = hook(:contact_bottom, self, :contact => contact)
+- if (params['controller'] == 'contacts') and (template = template_for_current_view).present?
+  = render(template, :contact => contact)
+- else
+  -# default view
+  = render 'contacts/index_long', :contact => contact

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

@@ -1,3 +1,4 @@
+
 = section(object, :contacts)
 .list#contacts
   - contacts = object.contacts.paginate(:page => 1, :per_page => 20)

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

@@ -6,10 +6,11 @@
     = f.error_messages :object_name => t('contact')
 
     = render "contacts/top_section", :f => f, :edit => true
+    = render "fields/edit_custom_field_group", :f => f, :edit => true
     = render "contacts/extra",       :f => f, :edit => true
     = render "contacts/web",         :f => f, :edit => true
-    = render "fields/groups", :f => f, :edit => true
-    = render "contacts/permissions", :f => f, :edit => true
+    = render "fields/groups",        :f => f, :edit => true
+    = render "entities/permissions", :f => f, :edit => true, :entity => @contact
 
     .buttonbar
       = f.submit t(:save_contact), :onclick => "crm.save_contact()"

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

@@ -0,0 +1,25 @@
+%li.highlight[contact]
+  = avatar_for(contact, :size => "16x16")
+
+  %ul.tools
+    = hook(:contact_tools_before, self, :contact => contact)
+
+    - if can?(:update, contact)
+      %li= link_to_edit(contact)
+
+    - if shown_on_landing_page?
+      %li= link_to_discard(contact)
+
+    - if can?(:destroy, contact)
+      %li= link_to_delete(contact)
+
+  .indentslim
+    = link_to_if can?(:read, contact), contact.full_name(@current_user.preference[:contacts_naming]), contact
+    %tt
+      = brief_account_info(contact)
+
+      - if (lead = contact.lead) and lead.referred_by?
+        –
+        == #{t :referred_by_small} #{lead.referred_by}
+
+    = hook(:contact_bottom, self, :contact => contact)

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

@@ -0,0 +1,57 @@
+%li.highlight[contact]
+  = avatar_for(contact, :size => "30x30")
+
+  %ul.tools
+    = hook(:contact_tools_before, self, :contact => contact)
+
+    - if can?(:update, contact)
+      %li= link_to_edit(contact)
+
+    - if shown_on_landing_page?
+      %li= link_to_discard(contact)
+
+    - if can?(:destroy, contact)
+      %li= link_to_delete(contact)
+
+  .indentslim
+    = link_to_if can?(:read, contact), contact.full_name(@current_user.preference[:contacts_naming]), contact
+    %tt
+      - if contact.title? && contact.department?
+        == #{contact.title}, #{contact.department}
+      - else
+        = contact.title if contact.title?
+
+      - if (account = contact.account) and account.name?
+        == #{t :at} #{link_to_if can?(:read, account), account.name, account_path(account)}
+
+      - if (lead = contact.lead) and lead.referred_by?
+        –
+        == #{t :referred_by_small} #{lead.referred_by}
+
+    %dt{ :style => "padding: 2px 0px 0px 0px" }
+      - if can?(:read, contact)
+        - if contact.email.present?
+          = link_to_email(contact.email)
+          |
+        - if contact.phone.present?
+          == #{t :phone_small}:
+          %b= contact.phone
+          |
+        - if contact.mobile.present?
+          == #{t :mobile_small}:
+          %b= contact.mobile
+          |
+      = t(:added_ago, time_ago_in_words(contact.created_at))
+    - if contact.tag_list.present?
+      %dt
+        .tags= tags_for_index(contact)
+
+    = hook(:contact_bottom, self, :contact => contact)
+
+    %dt{ :style => "padding: 2px 0px 0px 0px" }
+      - if can?(:read, contact)
+        = render "contacts/section_general", :contact => contact
+        = render "contacts/section_extra", :contact => contact
+        = render "entities/section_custom_fields", :entity => contact
+        = render "comments/new", :commentable => contact
+      = render :partial => "shared/timeline", :collection => (contact.comments + contact.emails).sort { |x, y| y.created_at <=> x.created_at }