fat_free_crm 0.11.3 → 0.11.4

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

@@ -0,0 +1,15 @@
+#search
+  .tabs
+    %ul
+      %li
+        = link_to 'Basic Search', '#',    :"data-search-form" => "basic_search",    :class => (params[:q]  ? "" : " active")
+      %li
+        = link_to 'Advanced Search', '#', :"data-search-form" => "advanced_search", :class => (!params[:q] ? "" : " active")
+    
+    #search_results_count
+
+  .search_form#basic_search{ :style => (params[:q] ? 'display: none;' : '') }
+    = render "basic_search"
+
+  .search_form#advanced_search{ :style => (!params[:q] ? 'display: none;' : '') }
+    = ransack_ui_search :remote => true

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

@@ -0,0 +1,11 @@
+- entity_show = "#{entity.class.to_s.downcase}_show"
+- entity.field_groups.each do |field_group|
+  - if (fields = field_group.fields.without_pairs).any?
+    - unless field_group.name == 'custom_fields'
+      -# add a new section
+      %div[field_group]
+        - collapsed = session[dom_id(field_group, entity_show)].nil?
+        = section_title dom_id(field_group, entity_show), collapsed, field_group.label_i18n, t('show_tag_info_small', :tag => field_group.label_i18n)
+        .show_fields
+          %div{ hidden_if(collapsed).merge(:id => dom_id(field_group, entity_show)) }
+            = render "fields/group_view", :fields => fields, :entity => entity

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

@@ -0,0 +1,12 @@
+- model_name = controller_name.singularize
+- model_klass = model_name.camelcase.constantize
+
+.title_tools
+  #buttons
+    = view_buttons
+  .create_asset
+    = link_to_inline("create_#{model_name}".to_sym, send("new_#{model_name}_path"), :text => t("create_#{model_name}".to_sym))
+
+.title
+  %span{:id => "create_#{model_name}_title"} #{t controller_name.to_sym}
+  = image_tag("loading.gif", :size => :thumb, :id => "loading", :style => "display: none;")

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

@@ -4,7 +4,7 @@ if @attached
   if partial == "task"
     view = if @attachment.completed?
       "completed"
-    elsif @attachment.my?(@current_user)
+    elsif @attachment.my?(current_user)
       "pending"
     else
       "assigned"

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

@@ -1,3 +1,3 @@
 opportunities = entity.opportunities.paginate(:page => params[:page], :per_page => 20)
-page['opportunities'].replace_html :partial => 'opportunities/opportunity', :collection => @opportunities
+page['opportunities'].replace_html :partial => 'opportunities/opportunity', :collection => opportunities
 page['opportunities_pagination'].replace_html will_paginate(opportunities, :container => false, :params => {:action => :opportunities})

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

@@ -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/_edit_custom_field_group.html.haml

@@ -0,0 +1,8 @@
+
+= hook(:custom_field_top_section, self, :f => f) do
+  -# produce inputs for custom fields that do not belong to a particular field group
+  -# i.e. they belong to the 'custom_fields' group
+  - f.object.field_groups.select{|f| f.name == 'custom_fields'}.each do |field_group|
+    - if field_group.fields.present?
+      - field_groups[field_group.tag.name.downcase] = "#{field_group.key}_container" if field_group.tag
+      = render :partial => 'fields/group', :locals => {:f => f, :field_group => field_group}

data/app/views/fields/_group.html.haml

@@ -1,20 +1,11 @@
-- collapsed = session[field_group.key].nil?
-
-%div{ :id => "#{field_group.key}_container", :"data-tag" => field_group.tag.try(:name) }
-  = subtitle field_group.key, collapsed, t(field_group.name, :default => field_group.label)
-  .section
-    %small{ hidden_if(!collapsed).merge(:id => "#{field_group.key}_intro") }
-    %div[field_group]{ hidden_if(collapsed) }
-      %table
-        - field_group.custom_fields.in_groups_of(2, false) do |group|
-          %tr
-            - group.each_with_index do |field, i|
-              %td
-                - if field.hint.present?
-                  = image_tag "info_tiny.png", :title => field.hint, :class => "tooltip-icon"
-                - if field.as == 'check_boxes'
-                  - value = f.object.send(field.name)
-                  - checked = YAML.load(value.to_s)
-                = f.input field.name, field.input_options.merge(:checked => checked)
-              - if i == 0
-                %td= spacer
+- if field_group.name != 'custom_fields'
+  -# start a new section
+  - collapsed = session[field_group.key].nil?
+  %div{ :id => "#{field_group.key}_container", :"data-tag" => field_group.tag.try(:name) }
+    = subtitle field_group.key, collapsed, t(field_group.name, :default => field_group.label)
+    .section
+      %small{ hidden_if(!collapsed).merge(:id => "#{field_group.key}_intro") }
+      %div[field_group]{ hidden_if(collapsed) }
+        = render :partial => 'fields/group_table', :locals => {:f => f, :field_group => field_group}
+- else
+  .section= render :partial => 'fields/group_table', :locals => {:f => f, :field_group => field_group}

data/app/views/fields/_group_table.html.haml

@@ -0,0 +1,13 @@
+%table
+  - field_group.fields.without_pairs.in_groups_of(2, false) do |group|
+    %tr
+      - group.each_with_index do |field, i|
+        %td
+          - if field.hint.present?
+            = image_tag "info_tiny.png", :title => field.hint, :class => "tooltip-icon"
+          - if field.as == 'check_boxes'
+            - value = f.object.send(field.name)
+            - checked = YAML.load(value.to_s)
+          = f.input field.name, field.input_options.merge(:checked => checked)
+        - if i == 0
+          %td= spacer

data/app/views/fields/_group_view.html.haml

@@ -0,0 +1,7 @@
+%table.asset_attributes
+  - groups = fields.in_groups_of(2, false)
+  - groups.each_with_index do |group, i|
+    %tr
+      - group.each do |field|
+        = col(field.label, field.render_value(entity), (i == groups.size - 1) ? :last : nil)
+        = "<th class='last'></th><td class='last'></td>".html_safe if group.size == 1

data/app/views/fields/_groups.html.haml

@@ -1,11 +1,8 @@
 - asset = controller_name.singularize
-- f.object.tags = unsaved_param_tags(asset) if params[asset] and params[asset][:tag_list]
 - field_groups = {}
 
 #field_groups
   - f.object.field_groups.each do |field_group|
-    - if field_group.fields.present?
-
+    - if field_group.fields.present? and field_group.name != 'custom_fields'
       - field_groups[field_group.tag.name.downcase] = "#{field_group.key}_container" if field_group.tag
-
       = render :partial => 'fields/group', :locals => {:f => f, :field_group => field_group}

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

@@ -1,8 +1,9 @@
 - asset.field_groups.each do |field_group|
-  - if field_group.fields.select{|f| asset.send(f.name).present? }.any?
+  - fg = field_group.fields.without_pairs
+  - if fg.select{|f| asset.send(f.name).present? }.any?
     %div
-      .caption #{field_group.label_i18n}
-      - field_group.custom_fields.each do |field|
+      - unless field_group.name == 'custom_fields'
+        .caption #{field_group.label_i18n}
+      - fg.each do |field|
         - if (value = field.render_value(asset)).present?
           == #{field.label}:<br /> <b>#{truncate(value, :length => 35)}</b><br />
-

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

@@ -0,0 +1,29 @@
+- amount = account.opportunities.not_lost.map(&:weighted_amount).sum
+%li.highlight[account]
+  - if account.category
+    .strip{:class => account.category} #{t(account.category)}
+  - else
+    .strip{:style => "color: gray;"} #{t :other}
+
+  .indent
+    = link_to(h(account.name), account)
+    –
+    %tt
+      = account.location << ", " unless account.location.blank?
+      - user_name = account.user_id == current_user.id ? t(:me) : account.user.try(:full_name)
+      - if user_name
+        = t(:added_by, :time_ago => time_ago_in_words(account.created_at), :user => user_name)
+      - else
+        = t(:added_ago, :value => time_ago_in_words(account.created_at))
+
+    - unless current_user.preference[:accounts_index_view] == "accounts_index_brief"
+      %dt
+        = link_to(account.website, account.website.to_url) << " | " if account.website.present?
+        = link_to_email(account.email) << " | " if account.email.present?
+        = 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?
+        %dt
+          .tags= tags_for_dashboard(account)
+      = hook(:account_bottom, self, :account => account)

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

@@ -10,14 +10,24 @@
   - elsif item.respond_to?(:name)
     - content_tag :span, item.name, :style => "color:black;" # Individual tasks have no landing pages where we could link to.
 
-- if user.present? and subject.present?
+- known_event = t('action_' + activity.event, :default => 0) != 0
+
+- if (user.present? && subject.present?) || !known_event
   %li[activity]
     .tools
       %small
         = l(activity.created_at, :format => :short)
     %tt
-      = link_to avatar_for(activity.user, :size => :thumb), user_path(activity.user)
-
-      - action = t('action_' + activity.event)
-      - type = t('subject_' + activity.item_type.downcase)
-      = t("activity_text", :user => user, :action => action, :type => type, :subject => subject, :default => "#{user} #{action} #{type} #{subject}").html_safe # locales optionally can change the word order for activities using 'activity_text'
+      - if known_event
+        - action = t('action_' + activity.event)
+        - type = t('subject_' + activity.item_type.downcase)
+        = link_to avatar_for(activity.user, :size => :thumb), user_path(activity.user)
+        = t("activity_text", :user => user, :action => action, :type => type, :subject => subject, :default => "#{user} #{action} #{type} #{subject}").html_safe # locales optionally can change the word order for activities using 'activity_text'
+        - if ((item = activity.item).class == Comment) and Setting.comments_visible_on_dashboard
+          = t('action_create_comment', :comment => truncate(h(item.comment), :length => 90)).html_safe
+      - else
+        - type = t(activity.item_type.downcase)
+        - if item.respond_to? :email
+          = avatar_for(item, :size => "16x16")
+        = "#{type} #{subject}:".html_safe
+        = auto_link(t(activity.event)).html_safe

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

@@ -0,0 +1,41 @@
+%li.highlight[opportunity]
+  - if opportunity.stage
+    .strip{:class => opportunity.stage}= t(opportunity.stage)
+  - else
+    .strip.white #{t :other}
+
+  .indent
+    = link_to(h(opportunity.name), opportunity)
+    - if opportunity.account
+      == #{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)
+      - if user_name
+        = t(:added_by, :time_ago => time_ago_in_words(opportunity.created_at), :user => user_name)
+      - else
+        = t(:added_ago, :value => time_ago_in_words(opportunity.created_at))
+    - unless current_user.preference[:opportunities_index_view] == "opportunities_index_brief"
+      %dt
+        %b= number_to_currency(opportunity.weighted_amount, :precision => 0) + " | "
+        - won_or_lost = %w(won lost).include?(opportunity.stage)
+        - unless won_or_lost
+          = t(:probability_number, (opportunity.probability || 0).to_s + '%') + " | "
+        - if opportunity.closes_on
+          - if won_or_lost
+            - if opportunity.closes_on >= Date.today
+              = t(:closing_date, l(opportunity.closes_on, :format => :mmddyy))
+            - else
+              = t(:closed_ago_on, :time_ago => distance_of_time_in_words(opportunity.closes_on, Date.today), :date => l(opportunity.closes_on, :format => :mmddyy))
+          - elsif opportunity.closes_on > Date.today
+            = t(:expected_to_close,  :time => distance_of_time_in_words(Date.today, opportunity.closes_on), :date => l(opportunity.closes_on, :format => :mmddyy))
+          - elsif opportunity.closes_on == Date.today
+            %span.warn= t(:closes_today)
+          - else
+            %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?
+        %dt
+          .tags= tags_for_dashboard(opportunity)
+      = hook(:opportunity_bottom, self, :opportunity => opportunity)

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

@@ -1,6 +1,6 @@
 %p
   = link_to_close url_for(:action => "options")
-  = hidden_field_tag "account[user_id]", @current_user.id
+  = hidden_field_tag "account[user_id]", current_user.id
 
   -# activity_options: Show %{models} %{action_type} performed by %{user} in the past %{period}
   = t(:activity_options, :models => link_to(t(@asset).singularize.downcase, "#", :id => :asset), :action_type => link_to(t(@action + "_past_participle").downcase, "#", :id => :event), :user => link_to(t(@user), "#", :id => :user), :period => link_to(t(@duration).downcase, "#", :id => :duration)).html_safe

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

@@ -0,0 +1,46 @@
+%li.highlight[task]
+  - unless task.category.blank?
+    .strip{:class => task.category}= t(task.category)
+  - else
+    .strip.white #{t :other}
+  .indent
+    %label{ :id => dom_id(task, :name) }
+      - if task.user.id != current_user.id
+        = t(:task_from, link_to(task.user.full_name, user_path(task.user))).html_safe << ':'
+      = link_to(h(task.name), tasks_path)
+      - if task.asset_id?
+        == #{t :related} #{link_to(h(task.asset.name), polymorphic_url(task.asset))}
+      &ndash;
+    %tt
+      - if task.bucket == "due_asap"
+        %span.urgent= t(:task_due_now)
+
+      - elsif task.bucket == "due_later"
+        = t(:task_due_later)
+
+      - else
+        - if task.at_specific_time?
+          - if task.due_at < Time.now
+            %span.warn
+              = distance_of_time_in_words(task.due_at, Time.now)
+              = t(:task_overdue)
+              = l(task.due_at.localtime, :format => :mmddhhss)
+          - else
+            = t(:task_due_in, distance_of_time_in_words(Time.now, task.due_at))
+            = '(' << l(task.due_at.localtime, :format => :mmddhhss) << ')'
+
+        - else
+          - if task.due_at < Date.today
+            %span.warn
+              = distance_of_time_in_words(task.due_at, Time.now)
+              = t(:task_overdue)
+              = l(task.due_at.localtime.to_date, :format => :mmdd)
+          - elsif task.due_at > Date.today
+            = t(:task_due_in, distance_of_time_in_words(Time.now, task.due_at.localtime.end_of_day))
+            = ' (' << l(task.due_at.localtime.to_date, :format => :mmdd) << ')'
+          - else
+            %span.cool= t(:task_due_today)
+
+    - unless task.background_info.blank?
+      %div
+        %dt= h(task.background_info)

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

@@ -1,3 +1,33 @@
+
+= styles_for :task, :opportunity, :account
+
+.title
+  %span#title #{t :my_tasks}
+%ul.list#tasks
+  - unless @my_tasks.empty?
+    = render :partial => "home/task", :collection => @my_tasks.limit(10)
+    = show_hidden_entities_message(@my_tasks.count, 'task', 10)
+  - else
+    #{t :no_task_records}
+
+.title
+  %span#title #{t :my_opportunities}
+%ul.list#opportunities
+  - unless @my_opportunities.empty?
+    = render :partial => "home/opportunity", :collection => @my_opportunities.limit(10)
+    = show_hidden_entities_message(@my_opportunities.count, 'opportunity', 10)
+  - else
+    #{t :no_opportunity_records}
+
+.title
+  %span#title #{t :my_accounts}
+%ul.list#accounts
+  - unless @my_accounts.empty?
+    = render :partial => "home/account", :collection => @my_accounts.limit(10)
+    = show_hidden_entities_message(@my_accounts.count, 'account', 10)
+  - else
+    #{t :no_account_records}
+
 .title_tools
   = link_to_inline(:options, url_for(:action => :options), :text => t(:options))
 
@@ -6,12 +36,13 @@
   = image_tag("loading.gif", :size => :thumb, :id => "loading", :style => "display: none;")
 .remote#options{ hidden }
 
-.list#activities
+%ul.list#activities
   - unless @activities.empty?
     = render :partial => "activity", :collection => @activities
   - else
     #{t :no_activity_records}
 
+
 #export= render "shared/export"
 /
   Check out HTML source to view the output of the hook if you have sample plugin installed

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

@@ -4,3 +4,4 @@ else
   page[:activities].replace_html t(:no_activity_records)
 end
 # page[:paginate].replace_html render(:partial => "shared/paginate")
+page[:export].replace_html render(:partial => "shared/export")

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

@@ -1,14 +1,14 @@
 #header
   #welcome
-    - if @current_user
+    - if current_user
       #{t :welcome},
       -# This span gets updated on the fly if user changes her name.
-      %span#welcome_username= @current_user.name
+      %span#welcome_username= current_user.name
       %span> !  
 
       = link_to(t(:quick_find), "#", :id => "jumper") << " |"
       = link_to(t(:profile), profile_path) << " |"
-      - if @current_user.admin?
+      - if current_user.admin?
         = link_to(t(:admin), admin_path) << " |"
       = link_to(t(:logout), logout_path, :method => :delete)
       = render "/layouts/jumpbox"

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

@@ -8,7 +8,5 @@
   = render sidebar
   - rescue MissingTemplate
 
-- if Setting.advanced_search_enabled  
-  = render "shared/lists"
-  
+= render "lists/sidebar"
 = render "shared/recently"

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

@@ -1,8 +1,8 @@
-#tabs
+.tabs
   %ul
     - tabs.each do |tab|
       %li
-        = link_to(tab[:url], :class => tab[:active] ? "active" : "") do
+        = 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")
@@ -16,4 +16,3 @@
       = render "layouts/sidebar"
     %td{ :class => :main, :id => :main, :valign => :top }
       = yield
-

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

@@ -1,3 +1,3 @@
 = show_flash(:sticky => true)
 .tabless= yield
-%center= render "layouts/footer"
+= render "layouts/footer"

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

@@ -2,7 +2,7 @@
   #welcome
     %span 
       #{t :welcome},
-      = @current_user.name
+      = current_user.name
     %span> !  
 
     = link_to(t(:quick_find), "#", :id => "jumper") << " |"

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

@@ -6,14 +6,15 @@
     == <!-- #{controller.controller_name} : #{controller.action_name} -->
     = stylesheet_link_tag :application
     = stylesheet_link_tag :print, :media => 'print'
-    - unless tabless_layout?
-      = stylesheet_link_tag 'calendar_date_select/default'
+    = hook(:stylesheet_includes, self) do
+      #{yield :stylesheet_includes}
     %style= yield :styles
 
     = javascript_include_tag :application
 
-    - unless tabless_layout?
-      = javascript_include_tag "calendar_date_select/format_#{t(:calendar_date_select_format, :default => 'american')}"
+    - unless tabless_layout? || %w(en-US en-GB).include?(I18n.locale.to_s)
+      = javascript_include_tag "jquery_ui_datepicker/jquery.ui.datepicker-#{I18n.locale}"
+      = javascript_include_tag "jquery_ui_datepicker/jquery-ui-timepicker-#{I18n.locale}"
 
     = csrf_meta_tag
     = hook(:javascript_includes, self)
@@ -24,6 +25,8 @@
       #{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">
 
@@ -35,12 +38,8 @@
       = render "layouts/tabbed"
       = render "layouts/footer"
 
-    - unless tabless_layout? || I18n.locale == "en-US"
-      = localize_calendar_date_select
-
     %script{:type => "text/javascript"}
       = "crm.base_url = '#{Setting.base_url}';" unless Setting.base_url.blank?
       = get_browser_timezone_offset
       = content_for :javascript_epilogue
       = hook(:javascript_epilogue, self)
-