fat_free_crm 0.11.3 → 0.11.4

data/README.md

@@ -1,44 +1,42 @@
-# Fat Free CRM
+# Fat Free CRM [![TravisCI][travis-img-url]][travis-ci-url]
 
-[![TravisCI][travis-img]][travis-ci]
-
-[travis-img]: https://secure.travis-ci.org/fatfreecrm/fat_free_crm.png?branch=master
-[travis-ci]: http://travis-ci.org/fatfreecrm/fat_free_crm
-[gemnasium-img]: https://gemnasium.com/fatfreecrm/fat_free_crm.png?travis
-[gemnasium]: https://gemnasium.com/fatfreecrm/fat_free_crm
+[travis-img-url]: https://secure.travis-ci.org/fatfreecrm/fat_free_crm.png?branch=master
+[travis-ci-url]: http://travis-ci.org/fatfreecrm/fat_free_crm
 
 ### An open source, Ruby on Rails [customer relationship management][crm-wiki] platform (CRM).
 
 [crm-wiki]: http://en.wikipedia.org/wiki/Customer_relationship_management
 
-Out of the box it features group collaboration, campaign and lead management, contact lists, and opportunity tracking.
+
+Out of the box it features group collaboration, campaign and lead management,
+contact lists, and opportunity tracking.
 
 <table>
   <tr>
     <td align="center">
-      <a href="http://fatfreecrm.com/images/contact_create.png" target="_blank" title="Create Contacts">
-        <img src="http://fatfreecrm.com/images/contact_create_t.png" alt="Create Contacts">
+      <a href="https://github.com/fatfreecrm/fatfreecrm.github.com/raw/master/backup/images/contact_create.png" target="_blank" title="Create Contacts">
+        <img src="https://github.com/fatfreecrm/fatfreecrm.github.com/raw/master/backup/images/contact_create_t.png" alt="Create Contacts">
       </a>
       <br />
       <em>Contacts</em>
     </td>
     <td align="center">
-      <a href="http://fatfreecrm.com/images/contact_opportunity.png" target="_blank" title="Manage Opportunities">
-        <img src="http://fatfreecrm.com/images/contact_opportunity_t.png" alt="Manage Opportunities">
+      <a href="https://github.com/fatfreecrm/fatfreecrm.github.com/raw/master/backup/images/contact_opportunity.png" target="_blank" title="Manage Opportunities">
+        <img src="https://github.com/fatfreecrm/fatfreecrm.github.com/raw/master/backup/images/contact_opportunity_t.png" alt="Manage Opportunities">
       </a>
       <br />
       <em>Opportunities</em>
     </td>
     <td align="center">
-      <a href="http://fatfreecrm.com/images/account_edit.png" target="_blank" title="Edit Accounts">
-        <img src="http://fatfreecrm.com/images/account_edit_t.png" alt="Edit Accounts">
+      <a href="https://github.com/fatfreecrm/fatfreecrm.github.com/raw/master/backup/images/account_edit.png" target="_blank" title="Edit Accounts">
+        <img src="https://github.com/fatfreecrm/fatfreecrm.github.com/raw/master/backup/images/account_edit_t.png" alt="Edit Accounts">
       </a>
       <br />
       <em>Accounts</em>
     </td>
     <td align="center">
-      <a href="http://fatfreecrm.com/images/task_create.png" target="_blank" title="Create Tasks">
-        <img src="http://fatfreecrm.com/images/task_create_t.png" alt="Create Tasks">
+      <a href="https://github.com/fatfreecrm/fatfreecrm.github.com/raw/master/backup/images/task_create.png" target="_blank" title="Create Tasks">
+        <img src="https://github.com/fatfreecrm/fatfreecrm.github.com/raw/master/backup/images/task_create_t.png" alt="Create Tasks">
       </a>
       <br />
       <em>Tasks</em>
@@ -95,6 +93,8 @@ This is the best way to deploy Fat Free CRM if you need to add plugins or make a
 
 ## Upgrading from previous versions of Fat Free CRM
 
+If you are upgrading from version 0.11.3 (Dec 21st 2012) or below, please see an [important fix for country data](https://github.com/fatfreecrm/fat_free_crm/wiki/The-Countries-Problem-and-How-to-Fix-It)
+
 If you are upgrading from version 0.10.1 or below to the latest Rails 3.x version, your database schema
 needs to be updated.
 
@@ -134,6 +134,13 @@ the concepts:
 * http://github.com/michaeldv/crm_web_to_lead/tree/master
 * http://github.com/michaeldv/crm_tags/tree/master
 
+## Contributors
+
+* [Nathan Broadbent (@ndbroadbent)](https://github.com/ndbroadbent)
+* [Ben Tillman (@warp)](https://github.com/warp)
+* [Steve Kenworthy (@steveyken)](https://github.com/steveyken)
+
+See the [contributors graph](https://github.com/fatfreecrm/fat_free_crm/graphs/contributors) for further details.
 
 ## License
 

data/app/assets/javascripts/admin/fields.js.coffee

@@ -0,0 +1,62 @@
+###
+  Fat Free CRM
+  Copyright (C) 2008-2011 by Michael Dvorkin
+
+  This program is free software: you can redistribute it and/or modify
+  it under the terms of the GNU Affero General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or
+  (at your option) any later version.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU Affero General Public License for more details.
+
+  You should have received a copy of the GNU Affero General Public License
+  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+  ------------------------------------------------------------------------------
+###
+
+(($) ->
+
+  $('.fields select[name="field[as]"]').live 'change', ->
+    $.ajax(
+        url: '/admin/fields/subform?' + $(this).parents('form').serialize()
+        dataType: 'html'
+        context: $(this).closest('form').find('.subform')
+        success: (data) ->
+          $(this).html(data)
+          $(this).find('input').first().focus()
+    )
+
+  $('.fields a.create').live 'click', ->
+    $('.edit_field').hide()
+    field_group = $(this).closest('.field_group')
+    field_group.find('.empty').hide()
+    field_group.find('.arrow').html(crm.EXPANDED)
+    field_group.find('.create_field').slideDown().find('input[name="field[label]"]').focus()
+    false
+
+  $('.create_field a.close, .create_field a.cancel').live 'click', ->
+    $(this).closest('.create_field').hide()
+    $(this).closest('.field_group').find('.empty').show()
+    $(this).closest('.field_group').find('.arrow').html(crm.COLLAPSED)
+    false
+
+  $('.fields a.edit').live 'click', ->
+    $('.edit_field').hide()
+    $.ajax(
+        url: $(this).attr('href')
+        context: $(this).closest('li').find('div.edit_field')
+        success: (data) ->
+          $(this).replaceWith(data).first().focus()
+    )
+    false
+    
+  $('.edit_field a.close, .edit_field a.cancel').live 'click', ->
+    $(this).closest('.edit_field').hide()
+    false
+
+  false
+
+) jQuery

data/app/assets/javascripts/application.js.erb

@@ -18,6 +18,7 @@
 //= require jquery
 //= require jquery-ui
 //= require jquery-noconflict
+//= require select2
 //= require prototype
 //= require effects
 //= require controls
@@ -30,12 +31,18 @@
 //= require crm_fields
 //= require textarea_autocomplete
 //= require crm_textarea_autocomplete
-//= require calendar_date_select/calendar_date_select
 //= require event.simulate
 //= require ajax-chosen-prototype
 //= require crm_chosen
+//= require ransack_ui_jquery
 //= require search
 //= require lists
+//= require autocomplete-rails
+//= require datepicker
+//= require jquery.disable
+//= require jquery_ui_datepicker/jquery-ui-timepicker-addon
+//= require admin/fields
+//= require format_buttons
 //= require_self
 
 <%

data/app/assets/javascripts/crm.js

@@ -19,36 +19,10 @@ var crm = {
 
   EXPANDED      : "▼",
   COLLAPSED     : "►",
-  request       : null,
+  searchRequest : null,
   autocompleter : null,
   base_url      : "",
 
-  //----------------------------------------------------------------------------
-  date_select_popup: function(id, dropdown_id, show_time) {
-    $(id).observe("focus", function() {
-      if (!$(id).calendar_was_shown) {    // The field recieved initial focus, show the calendar.
-        var calendar = new CalendarDateSelect(this, { month_year: "label",  year_range: 10, time: show_time, before_close: function() { this.calendar_was_shown = true } });
-        if (dropdown_id) {
-          calendar.buttons_div.build("span", { innerHTML: " | ", className: "button_seperator" });
-          calendar.buttons_div.build("a", { innerHTML: "Back to List", href: "#", onclick: function() {
-            calendar.close();                   // Hide calendar popup.
-            $(id).hide();                       // Hide date edit field.
-            $(dropdown_id).show();              // Show dropdown.
-            $(dropdown_id).selectedIndex = 0;   // Select first dopdown item.
-            $(id).update("");                   // Reset date field value.
-            return false;
-          }.bindAsEventListener(this) });
-        }
-      } else {
-        $(id).calendar_was_shown = null;  // Focus is back from the closed calendar, make it show up again.
-      }
-    });
-
-    $(id).observe("blur", function() {
-      $(id).calendar_was_shown = null;    // Get the calendar ready if we loose focus.
-    });
-  },
-
   //----------------------------------------------------------------------------
   find_form: function(class_name) {
     var forms = $$('form.' + class_name);
@@ -71,14 +45,14 @@ var crm = {
   hide_form: function(id) {
     if($('facebook-list')) $('facebook-list').remove();
     var arrow = $(id + "_arrow") || $("arrow");
-    arrow.update(this.COLLAPSED);
+    if (arrow) arrow.update(this.COLLAPSED);
     $(id).hide().update("").setStyle({height: 'auto'});
   },
 
   //----------------------------------------------------------------------------
   show_form: function(id) {
     var arrow = $(id + "_arrow") || $("arrow");
-    arrow.update(this.EXPANDED);
+    if (arrow) arrow.update(this.EXPANDED);
     Effect.BlindDown(id, { duration: 0.25, afterFinish: function() {
         var input = $(id).down("input[type=text]");
         if (input) input.focus();
@@ -317,7 +291,7 @@ var crm = {
   //----------------------------------------------------------------------------
   reschedule_task: function(id, bucket) {
     $("task_bucket").value = bucket;
-    $("edit_task_" + id).onsubmit();
+    $$('#edit_task_' + id + ' input[type="submit"]')[0].click();
   },
 
   //----------------------------------------------------------------------------
@@ -348,6 +322,7 @@ var crm = {
   },
 
   //----------------------------------------------------------------------------
+  // Will be deprecated soon: html5 placeholder replaced it on address fields
   show_hint: function(el, hint) {
     if (el.value == '') {
       el.value = hint;
@@ -357,6 +332,7 @@ var crm = {
   },
 
   //----------------------------------------------------------------------------
+  // Will be deprecated soon: html5 placeholder replaced it on address fields
   hide_hint: function(el, value) {
     if (arguments.length == 2) {
       el.value = value;
@@ -370,6 +346,7 @@ var crm = {
   },
 
   //----------------------------------------------------------------------------
+  // Will be deprecated soon: html5 placeholder replaced it on address fields
   clear_all_hints: function() {
     $$("input[hint=true]").each( function(field) {
       field.value = '';
@@ -398,24 +375,25 @@ var crm = {
   },
 
   //----------------------------------------------------------------------------
+
   search: function(query, controller) {
-    if (!this.request) {
-      var list = controller;          // ex. "users"
-      if (list.indexOf("/") >= 0) {   // ex. "admin/users"
-        list = list.split("/")[1];
-      }
-      $("loading").show();
-      $(list).setStyle({ opacity: 0.4 });
-      new Ajax.Request(this.base_url + "/" + controller, {
-        method     : "get",
-        parameters : { query : query },
-        onSuccess  : function() {
-          $("loading").hide();
-          $(list).setStyle({ opacity: 1 });
-        },
-        onComplete : (function() { this.request = null; }).bind(this)
-      });
+    var list = controller;          // ex. "users"
+    if (list.indexOf("/") >= 0) {   // ex. "admin/users"
+      list = list.split("/")[1];
     }
+    $("loading").show();
+    $(list).setStyle({ opacity: 0.4 });
+    if (this.searchRequest && this.searchRequest.readyState != -4) { this.searchRequest.abort(); }
+    this.searchRequest = jQuery.ajax({
+      url: this.base_url + "/" + controller + '.js',
+      type: 'GET',
+      data: { query : query },
+      success  : function() {
+        $("loading").hide();
+        $(list).setStyle({ opacity: 1 });
+        this.searchRequest = null;
+      }
+    });
   },
 
   //----------------------------------------------------------------------------
@@ -439,6 +417,21 @@ var crm = {
     }
     this.autocompleter = new Ajax.Autocompleter("auto_complete_query", "auto_complete_dropdown", this.base_url + "/" + controller + "/auto_complete", {
       frequency: 0.25,
+      parameters: (related) ? ('related=' + related) : null,
+      onShow: function(element, update) {
+        // overridding onShow to include a fix for IE browsers
+        // see https://prototype.lighthouseapp.com/projects/8887/tickets/263-displayinline-fixes-positioning-of-autocomplete-results-div-in-ie8
+        update.style.display = (Prototype.Browser.IE) ? 'inline':'absolute';
+        // below is default onShow from controls.js
+        if(!update.style.position || update.style.position=='absolute') {
+          update.style.position = 'absolute';
+          Position.clone(element, update, {
+            setHeight: false,
+            offsetTop: element.offsetHeight
+          });
+        }
+        Effect.Appear(update,{duration:0.15});
+      },
       afterUpdateElement: function(text, el) {
         if (el.id) {      // Autocomplete entry found.
           if (related) {  // Attach to related asset.
@@ -484,6 +477,11 @@ document.observe("dom:loaded", function() {
         new Ajax.Request(el.href, { method: 'get' });
         e.stop();
       }
+      if (el.match('.per_page_options a')) {
+        el.up('.per_page_options').update(createSpinner());
+        new Ajax.Request(el.href, { method: 'post' });
+        e.stop();
+      }
     });
   }
 });

data/app/assets/javascripts/crm_chosen.js.coffee

@@ -8,8 +8,6 @@ crm.chosen_taglist = (asset, controller, id)->
       crm.remove_field_group(tag)
   }
 
-
-# Ensures initialization of ajaxChosen account selector
 crm.ensure_chosen_account = ->
   unless $("account_id_chzn")
     new ajaxChosen $("account_id"), {
@@ -20,9 +18,14 @@ crm.ensure_chosen_account = ->
       query_key: "auto_complete_query"
     }
 
+(($j) ->
+
+  # Initialize any chosen select lists after every Ajax response
+  Ajax.Responders.register({
+    onComplete: ->
+      $j("select[name*='assigned_to'], select[name*='[country]'], .chzn-select").each ->
+        unless $j(this).hasClass('chzn-done')
+          new Chosen this, { allow_single_deselect: true }
+  })
 
-# Initialize chosen select lists for certain fields
-crm.init_chosen_fields = ->
-  ['assigned_to', '[country]'].each (field) ->
-    $$("select[name*='"+field+"']").each (el) ->
-      new Chosen el, { allow_single_deselect: true }
+) (jQuery)

data/app/assets/javascripts/datepicker.js.coffee

@@ -0,0 +1,15 @@
+(($) ->
+
+  $('input.date').live 'click focus', ->
+    $(this).datepicker({
+      showOn: 'focus',
+      changeMonth: true,
+      dateFormat: 'yy-mm-dd'})
+
+  $('input.datetime').live 'click focus', ->
+    $(this).datetimepicker({
+      showOn: 'focus',
+      changeMonth: true,
+      dateFormat: 'yy-mm-dd'})
+
+) jQuery

data/app/assets/javascripts/format_buttons.js.coffee

@@ -0,0 +1,48 @@
+(($j) ->
+
+  $j('a[data-view]').live 'click', ->
+
+    if $j(this).data('context') == 'show'
+      # replace the '#main' div with the new 'show' contents
+      $j.ajax(
+        url: $j(this).data('url'),
+        dataType: "script"
+        data:
+          view: $j(this).data('view')
+        beforeSend: ->
+          $j('#loading').show()
+        complete: ->
+          $j('#loading').hide()
+      )
+    else 
+      # update the index view by firing off the searches again
+
+      if $j('#search .tabs li a[data-search-form="advanced_search"].active').length == 1
+        # handle view change via advanced search form by setting the hidden 'view' field
+        $j('#advanced_search_view').remove()
+        $j("#advanced_search form input:submit").before('<input id="advanced_search_view" name="view" type="hidden" value="' + $j(this).data('view') + '">')
+        $j("#advanced_search form input:submit").click()
+      else
+        # basic search
+        $j.ajax(
+          url: $j(this).data('url'),
+          type: "POST",
+          dataType: "script"
+          data:
+            view: $j(this).data('view')
+            query:   $('query').value
+          beforeSend: ->
+            $j('#contacts').css({ opacity: 0.4 })
+            $j('#loading').show()
+          complete: ->
+            $j('#contacts').css({ opacity: 1 })
+            $j('#loading').hide()
+        )
+
+    # TODO: code for when viewing a single contact, not just index
+    # need to refresh the page or just the segment
+
+    $j('a[data-view]').removeClass('active')
+    $j(this).addClass('active')
+
+) jQuery

data/app/assets/javascripts/lists.js.coffee

@@ -23,7 +23,7 @@
 
     $("input#save_list").live "click", ->
       # Set value of hidden list_url field to serialized search form
-      $("#list_url").val(window.location.pathname + '?' + $('form.advanced_search').serialize())
+      $("#list_url").val(window.location.pathname + '?' + $('form.ransack_search').serialize())
       true
 
     # When mouseover on li, change asset icons to delete buttons

data/app/assets/javascripts/search.js.coffee

@@ -1,40 +1,58 @@
 (($) ->
-  class @Search
-    constructor: (@templates = {}) ->
-
-    add_fields: (button, type, content) ->
-      new_id = new Date().getTime()
-      regexp = new RegExp('new_' + type, 'g')
-      $(button).closest('p').before(content.replace(regexp, new_id))
-
-    remove_fields: (button) ->
-      container = $(button).closest('.fields')
-      if (container.siblings().length > 1)
-        container.remove()
-      else
-        container.parent().closest('.fields').remove()
-
-  $(document).ready ->
-    search = new Search()
-
-    $(".add_fields").live "click", ->
-      search.add_fields this, $(this).data("fieldType"), $(this).data("content")
-      false
-
-    $(".remove_fields").live "click", ->
-      search.remove_fields this
-      false
-
-    $("select.predicate").live "change", ->
-      value_el = $('input#' + $(this).attr('id').slice(0, -1) + "v_0_value");
-      if $(this).val() in ["true", "false", "blank", "present", "null", "not_null"]
-        value_el.val("true")
-        value_el.hide()
-      else
-        unless value_el.is(":visible")
-          value_el.val("")
-          value_el.show()
-
-    # Fire change event for existing search form.
-    $("select.predicate").change()
+
+  $ ->
+    $("#advanced_search").ransack_search_form()
+
+    # For basic search, remove placeholder text on focus, restore on blur
+    $('#query').focusin (e) ->
+      $(this).data('placeholder', $(this).attr('placeholder')).attr('placeholder', '')
+    $('#query').focusout (e) ->
+      $(this).attr('placeholder', $(this).data('placeholder'))
+
+    # For advanced search we show a spinner and dim the page when loading results
+    # This method undoes that when the results are returned. Ideally, this should
+    # be converted to jQuery (using the 'live' method)
+    # but we have to move to jquery-ujs first as all ajax events are current
+    # registered with prototype
+    Event.observe document.body, 'ajax:complete', (e, el) ->
+      if e.findElement('.ransack_search')
+        $("#loading").hide()
+        $("#advanced_search").css('opacity', 1)
+
+    Event.observe document.body, 'ajax:failure', (e, el) ->
+      if e.findElement('.ransack_search')
+        $('#flash').html('An error occurred whilst trying to search') # no i18n
+        crm.flash('error')
+
+    # Search tabs
+    # -----------------------------------------------------
+    activate_search_form = (search_form) ->
+      # Hide all
+      $('#search .search_form').hide()
+      $('#search .tabs li a').removeClass('active')
+      # Show selected
+      $('#' + search_form).show()
+      $('a[data-search-form=' + search_form + ']').addClass('active')
+      # Run search for current query
+      switch search_form
+        when 'basic_search'
+          $('#lists .show_lists_save_form').hide()
+          query_input = $('#basic_search input#query')
+          if !query_input.is('.defaultTextActive')
+            value = query_input.val()
+          else
+            value = ""
+          crm.search(value, window.controller)
+          $('#filters').enable() # Enable filters panel (if present)
+
+        when 'advanced_search'
+          $('#lists .show_lists_save_form').show()
+          $("#advanced_search form input:submit").click()
+          $('#filters').disable() # Disable filters panel (if present)
+
+      return
+
+    $("#search .tabs a").click ->
+      activate_search_form($(this).data('search-form'))
+
 ) jQuery