fat_free_crm 0.13.2 → 0.13.3

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

@@ -4,7 +4,6 @@
 
   -# 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
-%p
 
 %script
   = render "assets_menu"

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

@@ -1,8 +1,8 @@
 :plain
   new crm.Menu({
-    trigger   : "user",
-    fade      : 0.5,
-    appear    : 0.5,
+    trigger   : "#user",
+    fade      : 500,
+    appear    : 500,
     width     : 180,
     menu_items: [ #{sort_by_users.join(",")} ]
   });

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

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

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

@@ -1,7 +1,7 @@
 crm.flip_form('options');
 
 - unless params[:cancel].true?
-  jQuery('#options').html('#{ j render(:partial => "options") }');
+  $('#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/_about.html.haml

@@ -1,7 +1,7 @@
 #about{ hidden }
   %h3
     #{t :about_ffc_version}
-    %span.cool== v#{FatFreeCRM::VERSION}
+    %span.cool== v#{FatFreeCRM::VERSION::STRING}
     == (#{ActiveRecord::Base.connection.adapter_name.downcase})
   %p
     #{t :about_thank_you}
@@ -9,8 +9,8 @@
   #{t :about_ffc_resources}:
   %ul{:style => "margin: 0px 0px 0px 15px"}
     %li== » #{link_to t(:about_home_page), "http://www.fatfreecrm.com", :"data-popup" => true}
-    %li== » #{link_to t(:about_project_page), "http://github.com/michaeldv/fat_free_crm/tree/master", :"data-popup" => true}
-    %li== » #{link_to t(:about_features), "http://fatfreecrm.lighthouseapp.com", :"data-popup" => true}
+    %li== » #{link_to t(:about_project_page), "http://github.com/fatfreecrm/fat_free_crm/tree/master", :"data-popup" => true}
+    %li== » #{link_to t(:about_features), "http://github.com/fatfreecrm/fat_free_crm/issues", :"data-popup" => true}
     %li== » #{link_to t(:about_twitter), "http://twitter.com/fatfreecrm", :"data-popup" => true}
     %li== » #{link_to t(:about_user_group), "http://groups.google.com/group/fat-free-crm-users", :"data-popup" => true}
     %li== » #{link_to t(:about_dev_group), "http://groups.google.com/group/fat-free-crm-dev", :"data-popup" => true}

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

@@ -4,6 +4,6 @@
 
   - unless tabless_layout?
     \|
-    = link_to(t(:about_ffc), "#", :title => t(:about_ffc), :onclick => "Modalbox.show($('about'), { title: this.title }); return false;")
+    = link_to(t(:about_ffc), "#", :title => t(:about_ffc), :onclick => "$('#about').dialog({ title: this.title, modal: true }); return false;")
 %br
 = render "layouts/about"

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

@@ -15,6 +15,6 @@
     - else
       = link_to(t(:login), login_path) << " |"
       = link_to(t(:sign_up), signup_path) << " |" if can_signup?
-      = link_to(t(:about), "#", :title => t(:about_ffc), :onclick => "Modalbox.show($('about'), { title: this.title }); return false;")
+      = link_to(t(:about), "#", :title => t(:about_ffc), :onclick => "$('#about').dialog({ title: this.title, modal: true }); return false;")
   %h3
     = link_to("Fat Free CRM", root_path)

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

@@ -1,28 +1,30 @@
 - current_auto_complete = session[:auto_complete] || :leads
 = content_for(:javascript_epilogue) do
   :plain
-    document.observe("dom:loaded", function() {
-      new crm.Popup({
-        trigger     : "jumper",
-        target      : "jumpbox",
-        under       : "welcome",
-        appear      : 0.3,
-        fade        : 0.3,
-        before_show : function() {
-          $("jumper").className = "selected";
-          $("jumpbox_label").innerHTML = ""
-          $("jumpbox_label").hide();
-          $("jumpbox_menu").show();
-          crm.auto_complete("#{current_auto_complete}");
-        },
-        after_show  : function() {
-          $("auto_complete_query").focus();
-        },
-        after_hide  : function() {
-          $("jumper").className = "";
-        }
+    (function ($) {
+      $(function() {
+        new crm.Popup({
+          trigger     : "#jumper",
+          target      : "#jumpbox",
+          under       : "#welcome",
+          appear      : 300,
+          fade        : 300,
+          before_show : function() {
+            $("#jumper").addClass("selected");
+            $("#jumpbox_label").html("");
+            $("#jumpbox_label").hide();
+            $("#jumpbox_menu").show();
+            crm.auto_complete("#{current_auto_complete}");
+          },
+          after_show  : function() {
+            $("#auto_complete_query").focus();
+          },
+          after_hide  : function() {
+            $("#jumper").removeClass("selected");
+          }
+        });
       });
-    });
+  })($);
 
 #jumpbox{ hidden }
   %span#jumpbox_menu= jumpbox(current_auto_complete)

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

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

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

@@ -9,7 +9,7 @@
     %style= yield :styles
 
     = javascript_include_tag :application
-    = hook(:javascript_includes, self)
+    = hook(:javascript_includes, self) {}
 
     %script{:type => "text/javascript"}= yield :javascript
     = csrf_meta_tag

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

@@ -17,7 +17,7 @@
       = javascript_include_tag "jquery_ui_datepicker/jquery-ui-timepicker-#{I18n.locale}"
 
     = csrf_meta_tag
-    = hook(:javascript_includes, self)
+    = hook(:javascript_includes, self) {}
 
     :javascript
       crm.language = "#{I18n.locale}"
@@ -27,7 +27,7 @@
       :javascript
         #{yield :javascript}
         var _ffcrm_users = [
-        #{User.all.map{|u| "\"#{u.full_name} (@#{u.username})\"" }.join(",\n")}
+        #{User.all.map{|u| "\"#{j u.full_name} (@#{j u.username})\"" }.join(",\n")}
         ];
 
     <link rel="shortcut icon" href="/favicon.ico" type="image/x-icon">
@@ -45,4 +45,4 @@
       = "crm.base_url = '#{Setting.base_url}';" unless Setting.base_url.blank?
       = get_browser_timezone_offset
       = content_for :javascript_epilogue
-      = hook(:javascript_epilogue, self)
+      = hook(:javascript_epilogue, self) {}

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

@@ -12,17 +12,7 @@
           #{t(:convert_lead_text, @lead.full_name)}
         %table
           %tr
-            %td
-              .label.req
-                #{t :account}
-                %span#account_create_title
-                  (#{t :create_new} #{t :or} <a href='#' onclick='crm.select_account(1); return false;'>#{t :select_existing}</a>):
-                %span#account_select_title
-                  (<a href='#' onclick='crm.create_account(1); return false;'>#{t :create_new}</a> #{t :or} #{t :select_existing}):
-                %span#account_disabled_title :
-
-              = collection_select :account, :id, @accounts, :id, :name, { :selected => (@account.id || 0), :include_blank => true }, { :style => "width:330px; display:none;" }
-              = a.text_field :name, :style => "width:324px; display:none;"
+            %td= account_select_or_create(a)
             %td= spacer
             %td
               .label.req #{t :assigned_to}:

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

@@ -5,16 +5,16 @@
     = t(:convert_lead_permissions_intro)
   #lead_convert_permissions{ hidden_if(collapsed) }
     .radio_box
-      = radio_button_tag "access", "Lead", true, :onclick => "$('people').hide(); $('account_access').value = $('opportunity_access').value = 'Lead'"
+      = radio_button_tag "access", "Lead", true, :onclick => "$('#people').hide(); $('#account_access').val('Lead'); $('#opportunity_access').val('Lead');"
       = 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'"
+      = radio_button_tag "access", "Private", false, :onclick => "$('#people').hide(); $('#account_access').val('Private'); $('#opportunity_access').val('Private');"
       = 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'"
+      = radio_button_tag "access", "Public", false, :onclick => "$('#people').hide(); $('#account_access').val('Public'); $('#opportunity_access').val('Public');"
       = 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'"
+      = radio_button_tag "access", "Shared", false, :onclick => "$('#people').show(); $('#account_access').val('Shared'); $('#opportunity_access').val('Shared');"
       = label :access, :Shared, t(:share_with), :style => "cursor:pointer"
 
     #people{ hidden_if(@lead.access != "Shared") }
@@ -24,13 +24,8 @@
             = 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

@@ -12,6 +12,7 @@
     = render "leads/web",            :f => f, :edit => true
     = render "fields/groups",        :f => f, :edit => true
     = render "entities/permissions", :f => f, :edit => true, :entity => @lead
+    = hook(:entity_form, self, {f: f, entity: @lead}) {}
 
     .buttonbar
       - if Setting.compound_address

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

@@ -38,4 +38,4 @@
         –
         == #{t :referred_by_small} #{lead.referred_by}
 
-    = hook(:lead_bottom, self, :lead => lead)
+    = hook(:lead_bottom, self, :lead => lead) {}

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

@@ -59,4 +59,4 @@
       %dt
         .tags= tags_for_index(lead)
 
-    = hook(:lead_bottom, self, :lead => lead)
+    = hook(:lead_bottom, self, :lead => lead) {}

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

@@ -3,4 +3,4 @@
   - leads = object.leads.order('updated_at desc').paginate(:page => 1, :per_page => 20)
   = render :partial => "leads/lead", :collection => object.leads.paginate(:page => 1, :per_page => 20)
 
-= will_paginate leads, :id => 'leads_pagination', :params => {:action => :leads}
+= paginate( collection: leads, id: 'leads_pagination', params: { action: 'leads' } )

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

@@ -13,6 +13,7 @@
   = render "leads/web",            :f => f
   = render "fields/groups",        :f => f
   = render "entities/permissions", :f => f, :entity => @lead
+  = hook(:entity_form, self, {f: f, entity: @lead}) {}
 
   .buttonbar
     - if Setting.compound_address

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

@@ -17,4 +17,4 @@
     %div{:style => "float:right;"}
       %b= @lead_status_total[:all]
     %b #{t :total_leads}
-  = hook(:index_lead_sidebar_bottom, self)
+  = hook(:index_lead_sidebar_bottom, self) {}

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

@@ -62,4 +62,4 @@
     %dt
       .tags= tags_for_index(@lead)
 
-  = hook(:show_lead_sidebar_bottom, self, :lead => @lead)
+  = hook(:show_lead_sidebar_bottom, self, :lead => @lead) {}

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

@@ -27,4 +27,4 @@
 
       = render :partial => "/shared/tags", :locals => {:f => f, :span => 3}
 
-      = hook(:lead_top_section_bottom, self, :f => f)
+      = hook(:lead_top_section_bottom, self, :f => f) {}

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

@@ -8,14 +8,14 @@
     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 ]) }');
+    $('##{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 ]) }');
+        $('##{dom_id(@previous)}').replaceWith('#{ j render(:partial => entity_name, :collection => [ @previous ]) }');
       - else
         crm.flick('#{entity_name}_#{@previous}', 'remove');
     -# Disable onMouseOver for the list item.
@@ -23,13 +23,13 @@
     -# Hide [Create] form if any.
     crm.hide_form('create_#{entity_name}')
     -# Show [Edit] form.
-    jQuery('##{id}').html('#{ j render(:partial => "convert") }');
+    $('##{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") }');
+    $('#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();
+  $('#new_#{entity_name} input[type!=hidden]').first().focus();

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

@@ -3,19 +3,19 @@
 - 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 });
+  $('##{create_id}_arrow').html(crm.COLLAPSED);
+  $('##{create_id}_title').html('#{ j t(entity_name.pluralize) }');
+  $('##{create_id}').slideUp(250);
+  $('##{entity_name.pluralize}').prepend('#{ j render(:partial => entity_name, :collection => [ @entity ]) }');
+  $('##{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") }');
+    $('#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();
+  $('##{create_id}').html('#{ j render(:partial => "new") }');
+  $('##{create_id}').effect("shake", { duration:250, distance: 6 });
+  $('#new_#{entity_name} input[type!=hidden]').first().focus();

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

@@ -1,9 +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);
+$('##{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") }');
+  $('#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

@@ -8,14 +8,14 @@
     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 ]) }');
+    $('##{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 ]) }');
+        $('##{dom_id(@previous)}').replaceWith('#{ j render(:partial => entity_name, :collection => [ @previous ]) }');
       - else
         crm.flick('#{entity_name}_#{@previous}', 'remove');
     -# Disable onMouseOver for the list item.
@@ -23,13 +23,13 @@
     -# Hide [Create] form if any.
     crm.hide_form('create_#{entity_name}');
     -# Show [Edit] form.
-    jQuery('##{id}').html('#{ j render(:partial => "edit") }');
+    $('##{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") }');
+    $('#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();
+  $('#new_#{entity_name} input[type!=hidden]').first().focus();

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

@@ -2,10 +2,10 @@
 - @entities = instance_variable_get("@#{entities}")
 
 - if @entities.any?
-  jQuery('##{entities}').html('#{ j render(@entities) }');
+  $('##{entities}').html('#{ j render(@entities) }');
 - else
-  jQuery('##{entities}').html('#{ j render(:partial => "shared/empty") }');
+  $('##{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)) }');
+$('#paginate').html('#{ j render(:partial => "shared/paginate_with_per_page") }');
+$('#export').html('#{ j render(:partial => "shared/export") }');
+$('#search_results_count').html('#{ j render(:text => t('search_results_count', :count => @search_results_count)) }');

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

@@ -5,7 +5,7 @@ crm.flick('empty', 'toggle');
 crm.flip_form('#{create_id}');
 
 - unless params[:cancel].true?
-  jQuery('##{create_id}').html('#{ j render(:partial => "new") }');
+  $('##{create_id}').html('#{ j render(:partial => "new") }');
   crm.set_title('#{create_id}', '#{ j t(create_id) }');
 - else
   crm.set_title('#{create_id}', '#{ j t(entity_name.pluralize) }');

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

@@ -8,19 +8,19 @@
     crm.set_title('convert_#{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 });
+    $('##{id}').replaceWith('#{ j render(:partial => entity_name, :collection => [ @entity ]) }');
+    $('##{id}').effect("highlight", { duration:1500 });
     - if called_from_index_page?
       = refresh_sidebar(:index, :filters)
     - elsif called_from_landing_page?("campaigns")
       = refresh_sidebar_for(:campaigns, :show, :summary)
       - if @opportunity.id # Make sure the opportunity has been saved.
-        jQuery('#opportunities').prepend('#{ j render(:partial => "opportunities/opportunity", :collection => [ @opportunity ]) }');
+        $('#opportunities').prepend('#{ j render(:partial => "opportunities/opportunity", :collection => [ @opportunity ]) }');
     - else
-      jQuery('#recently').replaceWith('#{ j render(:partial => "shared/recently") }');
+      $('#recently').replaceWith('#{ j render(:partial => "shared/recently") }');
 
 - else  
-  jQuery('##{id}').html('#{ j render(:partial => "convert") }');
+  $('##{id}').html('#{ j render(:partial => "convert") }');
   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();
+  $('##{id}').effect("shake", { duration:250, distance: 6 });
+  $('##{dom_id(@entity, :edit)} input[type!=hidden]').first().focus();