fat_free_crm 0.11.3 → 0.11.4

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

@@ -1,7 +1,7 @@
 page[dom_id(@opportunity)].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?("accounts")
   page << refresh_sidebar_for(:accounts, :show, :summary)
 elsif called_from_landing_page?("campaigns")

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

@@ -22,17 +22,14 @@ else # <----------------------------------------- Show requested [Edit Opportuni
     page.call "crm.highlight_off", id             # Disable onMouseOver for the list item.
     page.call "crm.hide_form", :create_opportunity# Hide [Create Opportunity] form if any.
     page[id].replace_html :partial => "edit"      # Show [Edit Opportunity] form.
-    page.call "crm.init_chosen_fields"
 
   elsif params[:cancel].false?                    # Called from title of the opportunity landing page...
     page[:edit_opportunity].replace_html :partial => "edit"
-    page.call "crm.init_chosen_fields"
     page.call "crm.flip_form", :edit_opportunity
     page.call "crm.set_title", :edit_opportunity, "#{t :edit} #{@opportunity.name}"
   end
 
   page.call "crm.create_or_select_account", request.referer =~ /\/accounts\// || @account.id.blank?
-  page.call "crm.date_select_popup", "opportunity_closes_on"
   page[:opportunity_name].focus
 
   hook(:edit_opportunity_rjs, self, :page => page)

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

@@ -1,28 +1,20 @@
 = styles_for :opportunity
 
-.title_tools
-  = link_to_inline(:create_opportunity, new_opportunity_path, :text => t(:create_opportunity)) << " | "
-  - if Setting.advanced_search_enabled
-    = link_to_inline(:advanced_search, advanced_search_opportunities_path, :text => t(:advanced_search)) << " | "
-  = link_to_inline(:options, options_opportunities_path, :text => t(:options))
+= render 'entities/title_bar'
 
-.title
-  %span#create_opportunity_title #{t :opportunities}
-  = 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_opportunity{ hidden }
 
+= render 'search'
+
+.remote#options{ hidden }
+
 .list#opportunities
   - if @opportunities.any?
     = render @opportunities
   - else
     = render "shared/empty"
 
-#paginate= render "shared/paginate"
+#paginate= render "shared/paginate_with_per_page"
 #export= render "shared/export"
 
 = hook(:opportunity_index_after, self)
-

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

@@ -3,4 +3,6 @@ if @opportunities.any?
 else
   page[:opportunities].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/opportunities/index.xls.builder

@@ -0,0 +1,69 @@
+xml.Worksheet 'ss:Name' => I18n.t(:tab_opportunities) do
+  xml.Table do
+    unless @opportunities.empty?
+      # Header.
+      xml.Row do
+        heads = [I18n.t('user'),
+                 I18n.t('campaign'),
+                 I18n.t('assigned_to'),
+                 I18n.t('account'),
+                 I18n.t('name'),
+                 I18n.t('access'),
+                 I18n.t('source'),
+                 I18n.t('stage'),
+                 I18n.t('probability'),
+                 I18n.t('amount'),
+                 I18n.t('discount'),
+                 I18n.t('weighted_amount'),
+                 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,
+                     'ss:Type' => 'String'
+          end
+        end
+      end
+      
+      # Opportunity rows.
+      @opportunities.each do |opportunity|
+        xml.Row do
+          data = [opportunity.user.try(:name),
+                  opportunity.campaign.try(:name),
+                  opportunity.assignee.try(:name),
+                  opportunity.account.try(:name),
+                  opportunity.name,
+                  opportunity.access,
+                  opportunity.source,
+                  opportunity.stage,
+                  opportunity.probability,
+                  opportunity.amount,
+                  opportunity.discount,
+                  opportunity.weighted_amount,
+                  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,
+                       'ss:Type' => "#{value.respond_to?(:abs) ? 'Number' : 'String'}"
+            end
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -1,16 +1,12 @@
 page.call "crm.flick", :empty, :toggle
-page.call "crm.hide_form", :options if called_from_index_page?
 page.call "crm.flip_form", :create_opportunity
 
 unless params[:cancel].true?
   page[:create_opportunity].replace_html :partial => "new"
-  page.call "crm.init_chosen_fields"
   page.call "crm.set_title", :create_opportunity, t(:create_opportunity)
   # Opportunity 'create' form defaults to select account instead of create new account
-  page.call "crm.select_account", true
-  page.call "crm.date_select_popup", "opportunity_closes_on"
+  page.call "crm.create_or_select_account", request.referer =~ /\/accounts\// || @account.id.blank?
   hook(:new_opportunity_rjs, self, :page => page)
 else
   page.call "crm.set_title", :create_opportunity, t(:opportunities)
 end
-

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

@@ -1,22 +1,22 @@
-= styles_for :task, :contact
+- if (template = template_for_current_view)
+  = render(template, :opportunity => @opportunity)
+- else
 
-#confirm{ hidden }
-.title_tools#menu
-  = link_to_inline(:edit_opportunity, edit_opportunity_path(@opportunity), :text => t(:edit)) + " | "
-  = link_to_function(t(:delete) + '?', confirm_delete(@opportunity))
-.title#edit_opportunity_title= h(@opportunity.name)
+  -# default view
 
-%div#edit_opportunity{ hidden }
+  = styles_for :task, :contact
 
-= render "comments/new", :commentable => @opportunity
-= render :partial => "shared/timeline", :collection => @timeline
+  = render 'opportunities/title_bar', :opportunity => @opportunity
 
-= hook(:show_opportunity_bottom, self) do
+  = render "comments/new", :commentable => @opportunity
+  = render :partial => "shared/timeline", :collection => @timeline
 
-  = render :partial => "tasks/tasks", :locals => {:object => @opportunity}
+  = hook(:show_opportunity_bottom, self) do
 
-  = render :partial => "contacts/contacts", :locals => {:object => @opportunity}
+    = render "tasks/tasks", :object => @opportunity
 
-  = render :partial => "versions/versions", :locals => {:object => @opportunity}
+    = render "contacts/contacts", :object => @opportunity
 
-  = load_select_popups_for(@opportunity, :tasks, :contacts)
+    = render "versions/versions", :object => @opportunity
+
+    = load_select_popups_for(@opportunity, :tasks, :contacts)

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

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

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

@@ -21,7 +21,6 @@ if @opportunity.errors.empty?
 else
   page[id].replace_html :partial => "edit"
   page.call "crm.create_or_select_account", request.referer =~ /\/accounts\// || @account.id.blank?
-  page.call "crm.date_select_popup", "opportunity_closes_on"
   page[id].visual_effect :shake, :duration => 0.25, :distance => 6
   page[:opportunity_name].focus
 end

data/app/views/passwords/new.html.haml

@@ -1,5 +1,5 @@
 .standalone
-  - form_tag(passwords_path, one_submit_only(:passwords)) do
+  = form_tag(passwords_path, one_submit_only(:passwords)) do
     .title #{t :forgot_password}
     .intro #{t :password_intro}
     .section

data/app/views/shared/_add_comment.html.haml

@@ -0,0 +1,8 @@
+- edit ||= false
+- collapsed = @comment_body.nil?  && f.object.errors.empty?
+= subtitle :comment, collapsed, t(:comment)
+.section
+  %small#comment_intro{ hidden_if(!collapsed) }
+    = t(:comment_intro)
+  #campaign_comment{ hidden_if(collapsed) }
+    = text_area_tag :comment_body, @comment_body

data/app/views/shared/_address.html.haml

@@ -41,4 +41,4 @@
           = address_field(a, address, :zipcode, "width:80px;")
         %td= spacer
         %td
-          = a.country_select(:country, nil, { :include_blank => "" }, {:"data-placeholder" => t(:select_a_country), :style => "width:150px; margin-top:6px"})
+          = a.country_select(:country, priority_countries, { :include_blank => "" }, {:"data-placeholder" => t(:select_a_country), :style => "width:150px; margin-top:6px"})

data/app/views/shared/_address_show.html.haml

@@ -1,5 +1,6 @@
 - address_attr = "#{type}_address"
 - address = get_address(asset, address_attr)
+- title ||= nil
 
 - unless address.blank?
   - if Setting.compound_address
@@ -21,4 +22,3 @@
       %b #{t title}
       %br
       = h(address.full_address).n2br
-

data/app/views/shared/_edit_comment.html.haml

@@ -1,9 +1,9 @@
 - class_name = commentable.class.name.downcase
 .comment#comment_edit{: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)
   #post
     = form_for(@comment, :remote => true) do |f|
-      = hidden_field_tag "comment[user_id]", @current_user.id
+      = hidden_field_tag "comment[user_id]", current_user.id
       = hidden_field_tag "comment[commentable_id]", commentable.id
       = hidden_field_tag "comment[commentable_type]", class_name.capitalize
       = f.text_area :comment

data/app/views/shared/_export.html.haml

@@ -1 +1,2 @@
-= raw links_to_export
+- action = nil unless defined?(action)
+= raw links_to_export(action)

data/app/views/shared/_paginate_with_per_page.html.haml

@@ -0,0 +1,14 @@
+
+= will_paginate :params => {:action => :index}
+
+- entities = instance_variable_get("@#{controller_name}")
+- if entities.count > @per_page.to_i
+  .per_page_options
+    %span.per_page_label
+      = t('entities_per_page', :entity => t(controller_name))
+
+    - [ 10, 20, 30, 50 ].each do |count|
+      - if count == @per_page.to_i
+        %em.current= count
+      - else
+        = link_to count, send("redraw_#{controller.controller_name}_path", :per_page => count, :query => params[:query], :q => params[:q])

data/app/views/shared/_recently.html.haml

@@ -1,4 +1,4 @@
-- @versions = Version.recent_for_user(@current_user)
+- @versions = Version.recent_for_user(current_user)
 .panel#recently
   .caption #{t :recent_items}
   - if @versions.present?

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

@@ -4,7 +4,7 @@
 %h4 #{t(:search_assets, t(controller.controller_name + "_small"))}
 %div{ :style => "margin: 0px 0px 6px 0px" }
   = text_field_tag('query', @current_query, :size => 23)
-
+  
 :javascript
   new Form.Element.Observer('query', 1.5, function(element, value) {
     crm.search(value, '#{path}')

data/app/views/shared/_tags.html.haml

@@ -1,9 +1,8 @@
 - asset = controller_name.singularize
-- f.object.tags = unsaved_param_tags(asset) if params[asset] && params[asset][:tag_list]
 %tr
   %td{ :valign => :top, :colspan => span }
     .label Tags:
     = f.select :tag_list, Tag.all.map{|t| [t.name, t.name] }, {:value => f.object.tags.map{|t| t.name }}, {:multiple => true, :"data-placeholder" => t(:select_or_create_tags), :style => "width: 500px;"}
 
     :javascript
-      crm.chosen_taglist('#{asset}', '#{controller_name}', '#{params[:id]}');
+      crm.chosen_taglist('#{asset}', '#{controller_name}', '#{params[:id]}');

data/app/views/shared/_tasks.html.haml

@@ -2,9 +2,9 @@
 - asset.tasks.each do |task|
   - if task.completed_at?
     = render "tasks/completed", :completed => task, :bucket => nil
-  - elsif task.my?(@current_user)
+  - elsif task.my?(current_user)
     = render "tasks/pending", :pending => task, :bucket => nil
-  - elsif task.assigned_by?(@current_user)
+  - elsif task.assigned_by?(current_user)
     = render "tasks/assigned", :assigned => task, :bucket => nil
   - else
     = render "tasks/related", :related => task, :bucket => nil

data/app/views/tasks/_completed.html.haml

@@ -6,8 +6,8 @@
 
   .tools
     - if shown_on_landing_page?
-      = link_to_discard(completed) + (@current_user == completed.user ? ' | ' : '')
-    = link_to_task_delete(completed, bucket) if @current_user == completed.user
+      = link_to_discard(completed) + (current_user == completed.user ? ' | ' : '')
+    = link_to_task_delete(completed, bucket) if current_user == completed.user
 
   .indent
     %strike= auto_link h(completed.name)
@@ -17,7 +17,7 @@
     %tt
       %span.cool
         -# :task_completed_by: "completed {{time_ago}} ago by {{user}}"
-        = t(:task_completed_by, :time_ago => distance_of_time_in_words(completed.completed_at, Time.now), :date => l(completed.completed_at, :format => :long), :user => ((completed.completor.id != @current_user.id) ? link_to(completed.completor.full_name, user_path(completed.completor)) : t(:me))).html_safe
+        = t(:task_completed_by, :time_ago => distance_of_time_in_words(completed.completed_at, Time.now), :date => l(completed.completed_at, :format => :long), :user => ((completed.completor.id != current_user.id) ? link_to(completed.completor.full_name, user_path(completed.completor)) : t(:me))).html_safe
     - unless completed.background_info.blank?
       %div
         %dt= h(completed.background_info)

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

@@ -1,7 +1,7 @@
 = simple_form_for(@task, :html => one_submit_only(:task), :remote => true) do |f|
   = link_to_close new_task_path + "?view=#{@view}"
   = hidden_field_tag :view, @view
-  = hidden_field_tag "task[user_id]", @current_user.id
+  = hidden_field_tag "task[user_id]", current_user.id
   = hidden_field_tag "task[asset_id]", "#{@asset.id if @asset}"
   = hidden_field_tag "task[asset_type]", "#{@asset.class if @asset}"
 

data/app/views/tasks/_pending.html.haml

@@ -13,7 +13,7 @@
 
   .indentwide
     %label{ :id => dom_id(pending, :name) }
-      - if pending.user.id != @current_user.id
+      - if pending.user.id != current_user.id
         = t(:task_from, link_to(pending.user.full_name, user_path(pending.user))).html_safe << ':'
       = auto_link h(pending.name)
       - if pending.asset_id?
@@ -33,7 +33,7 @@
             = t(:task_overdue)
             = l(pending.due_at.localtime, :format => :mmddhhss)
           - else
-            = t(:task_due_in, distance_of_time_in_words(Time.now, pending.due_at))
+            = t(:task_due_in, distance_of_time_in_words(Time.now, pending.due_at.localtime))
             = '(' << l(pending.due_at.localtime, :format => :mmddhhss) << ')'
 
         - else
@@ -49,4 +49,3 @@
     - unless pending.background_info.blank?
       %div
         %dt= h(pending.background_info)
-

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

@@ -5,13 +5,13 @@
       .check_box{:style => "border-bottom: 1px silver dotted;"}
         %div{:style => "float:right;"}
           = @task_total[key]
-        = task_filter_checbox(@view, key, @task_total[key]) << " " << t(value)
+        = task_filter_checkbox(@view, key, @task_total[key]) << " " << t(value)
   - else # @view == "completed"
     - Setting.unroll(:task_completed).each do |value, key|
       .check_box{:style => "border-bottom: 1px silver dotted;"}
         %div{:style => "float:right;"}
           = @task_total[key]
-        = task_filter_checbox(@view, key, @task_total[key]) << " " << t(value)
+        = task_filter_checkbox(@view, key, @task_total[key]) << " " << t(value)
   .check_box
     %div{:style => "float:right;"}
       %b= @task_total[:all]

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

@@ -8,16 +8,18 @@
       %td
         .label.req #{t :due}:
         - bucket = (params[:bucket].blank? ? @task.bucket : params[:bucket]) || "due_asap"
+        - with_time = Setting.task_calendar_with_time
         - if @task.bucket != "specific_time"
           = f.select :bucket, @bucket, { :selected => bucket.to_sym }, { :style => "width:160px;", :onchange => "crm.flip_calendar(this.value)" }
-          = f.text_field :calendar, :style => "width:160px; display:none;", :autocomplete => :off
+          = f.text_field :calendar, :style => "width:160px; display:none;", :autocomplete => :off, :class => (with_time ? 'datetime' : 'date')
         - else
           = f.select :bucket, @bucket, { :selected => :specific_time }, { :style => "width:160px; display:none;", :onchange => "crm.flip_calendar(this.value)" }
-          = f.text_field :calendar, :value => (Setting.task_calendar_with_time ? l(f.object.due_at.localtime, :format => :mmddyyyy_hhmm) : l(f.object.due_at.to_date, :format => :mmddyyyy)), :style => "width:160px;", :autocomplete => :off
+          - fmt = with_time ? '%Y-%m-%d %H:%M' : '%Y-%m-%d'
+          = f.text_field :calendar, :value => f.object.due_at.strftime(fmt), :style => "width:160px;", :autocomplete => :off, :class => (with_time ? 'datetime' : 'date')
       %td= spacer
       %td
         .label.req #{t :assign_to}:
-        = user_select(:task)
+        = user_select(:task, all_users, current_user)
       %td= spacer
       %td
         .label.req #{t :category}:

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

@@ -6,7 +6,7 @@ if @task.valid?
     page[:title].replace_html(@view == "assigned" ? t(:assigned_tasks) : t(:tasks))
 
     # Show flash if assigned to somebody else from the [Pending Tasks] page.
-    if @view == "pending" && @task.assigned_to && @task.assigned_to != @current_user.id
+    if @view == "pending" && @task.assigned_to && @task.assigned_to != current_user.id
       page << tasks_flash("#{t :task_created} #{t(:task_assigned_to, @task.assignee.full_name)} (" << link_to(t(:view_assigned_tasks), url_for(:view => "assigned")) << ").")
       page[:recently].replace :partial => "shared/recently"
 
@@ -28,15 +28,14 @@ if @task.valid?
   else # Inline [Create Task] form reqested from any of the core asset landing pages.
     page[:create_task_title].replace_html(t :tasks)
 
-    partial = (@task.assigned_to && @task.assigned_to != @current_user.id) ? "assigned" : "pending"
+    partial = (@task.assigned_to && @task.assigned_to != current_user.id) ? "assigned" : "pending"
     page.insert_html :top, :tasks, :partial => "tasks/#{partial}", :collection => [@task], :locals => { :bucket => nil }
     page[dom_id(@task)].visual_effect :highlight, :duration => 1.5
     page[:recently].replace :partial => "shared/recently"
   end
 
 else # Couldn't create the task -- validation failed.
-  page.call "crm.date_select_popup", :task_calendar, :task_bucket, Setting.task_calendar_with_time
   page[:create_task].visual_effect :shake, :duration => 0.25, :distance => 6
   page[:task_name].focus
-  page[:task_submit].enable
+  page << "$$('#new_task input[type=submit]').invoke('enable')"
 end